tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

treewide: fix broken AlpineLinux repo links (#87892)

(cherry picked from commit 751729914624e57888e85e6e178fc258db004d9a)

authored by

Lila and committed by
Jörg Thalheim a8650ff9 ba86df00

+19 -19
unified split
+1 -1
pkgs/applications/misc/xterm/default.nix
··· 23 23 ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl 24 24 (fetchpatch { 25 25 name = "posix-ptys.patch"; 26 - url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; 26 + url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; 27 27 sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; 28 28 }); 29 29
+1 -1
pkgs/development/libraries/gamin/default.nix
··· 25 25 ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch 26 26 ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { 27 27 name = "fix-pthread-mutex.patch"; 28 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; 28 + url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; 29 29 sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; 30 30 }); 31 31
+3 -3
pkgs/development/libraries/libexecinfo/default.nix
··· 12 12 patches = [ 13 13 (fetchpatch { 14 14 name = "10-execinfo.patch"; 15 - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 15 + url = https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 16 16 sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; 17 17 }) 18 18 (fetchpatch { 19 19 name = "20-define-gnu-source.patch"; 20 - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 20 + url = https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 21 21 sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; 22 22 }) 23 23 (fetchpatch { 24 24 name = "30-linux-makefile.patch"; 25 - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 25 + url = https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; 26 26 sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; 27 27 }) 28 28 ];
+2 -2
pkgs/os-specific/linux/apparmor/default.nix
··· 39 39 40 40 patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ 41 41 (fetchpatch { 42 - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; 42 + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; 43 43 name = "0003-Added-missing-typedef-definitions-on-parser.patch"; 44 44 sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; 45 45 }) 46 46 (fetchpatch { 47 - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; 47 + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; 48 48 name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; 49 49 sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; 50 50 })
+3 -3
pkgs/os-specific/linux/lvm2/default.nix
··· 47 47 patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ 48 48 (fetchpatch { 49 49 name = "fix-stdio-usage.patch"; 50 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 50 + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 51 51 sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; 52 52 }) 53 53 (fetchpatch { 54 54 name = "mallinfo.patch"; 55 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 55 + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 56 56 sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; 57 57 }) 58 58 (fetchpatch { 59 59 name = "mlockall-default-config.patch"; 60 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 60 + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; 61 61 sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; 62 62 }) 63 63 ];
+2 -2
pkgs/os-specific/linux/musl/default.nix
··· 19 19 # iconv tool, implemented by musl author. 20 20 # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f 21 21 # We use copy from Alpine which fixes error messages, see: 22 - # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f 22 + # https://git.alpinelinux.org/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f 23 23 iconv_c = fetchurl { 24 24 name = "iconv.c"; 25 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; 25 + url = "https://git.alpinelinux.org/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; 26 26 sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; 27 27 }; 28 28
+2 -2
pkgs/os-specific/linux/pam/default.nix
··· 11 11 12 12 patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ 13 13 (fetchpatch { 14 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; 14 + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; 15 15 sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; 16 16 }) 17 17 (fetchpatch { 18 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; 18 + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; 19 19 sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; 20 20 }) 21 21 # From adelie's package repo, using local copy since it seems to be currently offline.
+1 -1
pkgs/os-specific/linux/powertop/default.nix
··· 17 17 patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( 18 18 fetchpatch { 19 19 name = "strerror_r.patch"; 20 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; 20 + url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; 21 21 sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; 22 22 } 23 23 ) ++ [
+1 -1
pkgs/servers/monitoring/net-snmp/default.nix
··· 11 11 12 12 patches = 13 13 let fetchAlpinePatch = name: sha256: fetchpatch { 14 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; 14 + url = "https://git.alpinelinux.org/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; 15 15 inherit name sha256; 16 16 }; 17 17 in [
+1 -1
pkgs/shells/tcsh/default.nix
··· 19 19 patches = stdenv.lib.optional stdenv.hostPlatform.isMusl 20 20 (fetchpatch { 21 21 name = "sysmalloc.patch"; 22 - url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; 22 + url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; 23 23 sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; 24 24 }); 25 25
+1 -1
pkgs/tools/misc/figlet/default.nix
··· 11 11 12 12 patches = [ 13 13 (fetchpatch { 14 - url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; 14 + url = https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; 15 15 name = "musl-fix-cplusplus-decls.patch"; 16 16 sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; 17 17 })
+1 -1
pkgs/tools/networking/vde2/default.nix
··· 17 17 }) 18 18 ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ 19 19 (fetchpatch { 20 - url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; 20 + url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; 21 21 sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; 22 22 }) 23 23 ];