refactor: use lib.fetchurl to download package sources

Performed by running: rg --files-with-matches "builtins\.fetchurl" | xargs sed -i -e
's/builtins\.fetchurl/lib\.fetchurl/g'
This commit is contained in:
Ruby Iris Juric 2025-10-04 00:35:47 +10:00
parent 24ae64d724
commit f763483699
Signed by: srxl
SSH key fingerprint: SHA256:zgspAKSFKA6vB30vPBY6QSa/osCDgrr8YASW+mNz13M
56 changed files with 107 additions and 107 deletions

View file

@ -55,7 +55,7 @@ in
aux.foundation.stages.stage1.bash.boot = {
version = "2.05b";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/bash/bash-${cfg.version}.tar.gz";
sha256 = "1r1z2qdw3rz668nxrzwa14vk2zcn00hw7mpjn384picck49d80xs";
};
@ -66,45 +66,45 @@ in
# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b/bash-2.05b.kaem
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/bash-2.05b";
main_mk = builtins.fetchurl {
main_mk = lib.fetchurl {
url = "${liveBootstrap}/mk/main.mk";
sha256 = "0hj29q3pq3370p18sxkpvv9flb7yvx2fs96xxlxqlwa8lkimd0j4";
};
common_mk = builtins.fetchurl {
common_mk = lib.fetchurl {
url = "${liveBootstrap}/mk/common.mk";
sha256 = "09rigxxf85p2ybnq248sai1gdx95yykc8jmwi4yjx389zh09mcr8";
};
builtins_mk = builtins.fetchurl {
builtins_mk = lib.fetchurl {
url = "${liveBootstrap}/mk/builtins.mk";
sha256 = "0939dy5by1xhfmsjj6w63nlgk509fjrhpb2crics3dpcv7prl8lj";
};
patches = [
# mes libc does not have locale support
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/mes-libc.patch";
sha256 = "0zksdjf6zbb3p4hqg6plq631y76hhhgab7kdvf7cnpk8bcykn12z";
})
# int name, namelen; is wrong for mes libc, it is char* name, so we modify tinycc
# to reflect this.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/tinycc.patch";
sha256 = "042d2kr4a8klazk1hlvphxr6frn4mr53k957aq3apf6lbvrjgcj2";
})
# add ifdef's for features we don't want
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/missing-defines.patch";
sha256 = "1q0k1kj5mrvjkqqly7ki5575a5b3hy1ywnmvhrln318yh67qnkj4";
})
# mes libc + setting locale = not worky
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/locale.patch";
sha256 = "1p1q1slhafsgj8x4k0dpn9h6ryq5fwfx7dicbbxhldbw7zvnnbx9";
})
# We do not have /dev at this stage of the bootstrap, including /dev/tty
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/dev-tty.patch";
sha256 = "1315slv5f7ziajqyxg4jlyanf1xwd06xw14y6pq7xpm3jzjk55j9";
})

View file

@ -64,7 +64,7 @@ in
aux.foundation.stages.stage1.bash = {
version = "5.2.15";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/bash/bash-${cfg.version}.tar.gz";
sha256 = "132qng0jy600mv1fs95ylnlisx2wavkkgpb19c6kmz7lnmjhjwhk";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.binutils = {
version = "2.41";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/binutils/binutils-${cfg.version}.tar.xz";
sha256 = "rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.bison = {
version = "3.8.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/bison/bison-${cfg.version}.tar.xz";
sha256 = "m7oCFMz38QecXVkhAEUie89hlRmEDr+oDNOEnP9aW/I=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage1.bzip2 = {
version = "1.0.8";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://sourceware.org/pub/bzip2/bzip2-${cfg.version}.tar.gz";
sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb";
};

View file

@ -28,7 +28,7 @@ in
aux.foundation.stages.stage1.coreutils.boot = {
version = "5.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/coreutils/coreutils-${cfg.version}.tar.gz";
sha256 = "10wq6k66i8adr4k08p0xmg87ff4ypiazvwzlmi7myib27xgffz62";
};
@ -39,7 +39,7 @@ in
# See https://github.com/fosslinux/live-bootstrap/blob/a8752029f60217a5c41c548b16f5cdd2a1a0e0db/sysa/coreutils-5.0/coreutils-5.0.kaem
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/a8752029f60217a5c41c548b16f5cdd2a1a0e0db/sysa/coreutils-5.0";
makefile = builtins.fetchurl {
makefile = lib.fetchurl {
url = "${liveBootstrap}/mk/main.mk";
sha256 = "0njg4xccxfqrslrmlb8ls7h6hlnfmdx42nvxwmca8flvczwrplfd";
};
@ -47,45 +47,45 @@ in
patches = [
# modechange.h uses functions defined in sys/stat.h, so we need to move it to
# after sys/stat.h include.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/modechange.patch";
sha256 = "04xa4a5w2syjs3xs6qhh8kdzqavxnrxpxwyhc3qqykpk699p3ms5";
})
# mbstate_t is a struct that is required. However, it is not defined by mes libc.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/mbstate.patch";
sha256 = "0rz3c0sflgxjv445xs87b83i7gmjpl2l78jzp6nm3khdbpcc53vy";
})
# strcoll() does not exist in mes libc, change it to strcmp.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/ls-strcmp.patch";
sha256 = "0lx8rz4sxq3bvncbbr6jf0kyn5bqwlfv9gxyafp0541dld6l55p6";
})
# getdate.c is pre-compiled from getdate.y
# At this point we don't have bison yet and in any case getdate.y does not
# compile when generated with modern bison.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/touch-getdate.patch";
sha256 = "1xd3z57lvkj7r8vs5n0hb9cxzlyp58pji7d335snajbxzwy144ma";
})
# touch: add -h to change symlink timestamps, where supported
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/touch-dereference.patch";
sha256 = "0wky5r3k028xwyf6g6ycwqxzc7cscgmbymncjg948vv4qxsxlfda";
})
# strcoll() does not exist in mes libc, change it to strcmp.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/expr-strcmp.patch";
sha256 = "19f31lfsm1iwqzvp2fyv97lmqg4730prfygz9zip58651jf739a9";
})
# strcoll() does not exist in mes libc, change it to strcmp.
# hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/sort-locale.patch";
sha256 = "0bdch18mpyyxyl6gyqfs0wb4pap9flr11izqdyxccx1hhz0a2i6c";
})
# don't assume fopen cannot return stdin or stdout.
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/uniq-fopen.patch";
sha256 = "0qs6shyxl9j4h34v5j5sgpxrr4gjfljd2hxzw416ghwc3xzv63fp";
})

View file

@ -58,7 +58,7 @@ in
aux.foundation.stages.stage1.coreutils = {
version = "9.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/coreutils/coreutils-${cfg.version}.tar.gz";
sha256 = "X2ANkJOXOwr+JTk9m8GMRPIjJlf0yg2V6jHHAutmtzk=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.diffutils = {
version = "3.8";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/diffutils/diffutils-${cfg.version}.tar.xz";
sha256 = "pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.findutils = {
version = "4.9.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/findutils/findutils-${cfg.version}.tar.xz";
sha256 = "or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4=";
};

View file

@ -29,7 +29,7 @@ in
aux.foundation.stages.stage1.gawk.boot = {
version = "3.0.6";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gawk/gawk-${cfg.version}.tar.gz";
sha256 = "1z4bibjm7ldvjwq3hmyifyb429rs2d9bdwkvs0r171vv1khpdwmb";
};

View file

@ -64,7 +64,7 @@ in
aux.foundation.stages.stage1.gawk = {
version = "5.2.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gawk/gawk-${cfg.version}.tar.gz";
sha256 = "lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA=";
};

View file

@ -116,14 +116,14 @@ in
aux.foundation.stages.stage1.gcc = {
version = "13.2.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-${cfg.version}.tar.xz";
sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
};
gmp = {
version = "6.3.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gmp/gmp-${cfg.gmp.version}.tar.xz";
sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
};
@ -131,7 +131,7 @@ in
mpfr = {
version = "4.2.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpfr/mpfr-${cfg.mpfr.version}.tar.xz";
sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
};
@ -139,7 +139,7 @@ in
mpc = {
version = "1.3.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
};
@ -147,7 +147,7 @@ in
isl = {
version = "0.24";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${cfg.isl.version}.tar.bz2";
sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA=";
};

View file

@ -72,13 +72,13 @@ in
aux.foundation.stages.stage1.gcc.v46.cxx = {
version = "4.6.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-core-${cfg.version}.tar.gz";
sha256 = "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75";
};
cc = {
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-g++-${cfg.version}.tar.gz";
sha256 = "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9";
};
@ -87,7 +87,7 @@ in
gmp = {
version = "4.3.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gmp/gmp-${cfg.gmp.version}.tar.gz";
sha256 = "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv";
};
@ -96,7 +96,7 @@ in
mpfr = {
version = "2.4.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpfr/mpfr-${cfg.mpfr.version}.tar.gz";
sha256 = "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94";
};
@ -105,7 +105,7 @@ in
mpc = {
version = "1.0.3";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
};

View file

@ -72,13 +72,13 @@ in
aux.foundation.stages.stage1.gcc.v46 = {
version = "4.6.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-core-${cfg.version}.tar.gz";
sha256 = "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75";
};
cc = {
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-g++-${cfg.version}.tar.gz";
sha256 = "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9";
};
@ -87,7 +87,7 @@ in
gmp = {
version = "4.3.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gmp/gmp-${cfg.gmp.version}.tar.gz";
sha256 = "15rwq54fi3s11izas6g985y9jklm3xprfsmym3v1g6xr84bavqvv";
};
@ -96,7 +96,7 @@ in
mpfr = {
version = "2.4.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpfr/mpfr-${cfg.mpfr.version}.tar.gz";
sha256 = "0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94";
};
@ -105,7 +105,7 @@ in
mpc = {
version = "1.0.3";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1";
};

View file

@ -83,7 +83,7 @@ in
aux.foundation.stages.stage1.gcc.v8 = {
version = "8.5.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-${cfg.version}.tar.xz";
sha256 = "0wiEGlEbuDCmEAOXsAQtskzhH2Qtq26m7kSELlMl7VA=";
};
@ -91,7 +91,7 @@ in
gmp = {
# last version to compile with gcc 4.6
version = "6.2.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gmp/gmp-${cfg.gmp.version}.tar.xz";
sha256 = "/UgpkSzd0S+EGBw0Ucx1K+IkZD6H+sSXtp7d2txJtPI=";
};
@ -99,7 +99,7 @@ in
mpfr = {
version = "4.2.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpfr/mpfr-${cfg.mpfr.version}.tar.xz";
sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
};
@ -107,7 +107,7 @@ in
mpc = {
version = "1.3.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
};
@ -115,7 +115,7 @@ in
isl = {
version = "0.24";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${cfg.isl.version}.tar.bz2";
sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA=";
};

View file

@ -61,7 +61,7 @@ in
aux.foundation.stages.stage1.gnugrep = {
version = "2.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/grep/grep-${cfg.version}.tar.gz";
sha256 = "05iayw5sfclc476vpviz67hdy03na0pz2kb5csa50232nfx34853";
};
@ -70,7 +70,7 @@ in
let
# Thanks to the live-bootstrap project!
# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/grep-2.4
makefile = builtins.fetchurl {
makefile = lib.fetchurl {
url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/grep-2.4/mk/main.mk";
sha256 = "08an9ljlqry3p15w28hahm6swnd3jxizsd2188przvvsj093j91k";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.gnum4 = {
version = "1.4.19";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/m4/m4-${cfg.version}.tar.xz";
sha256 = "Y67eXG0zttmxNRHNC+LKwEby5w/QoHqpVzoEqCeDr5Y=";
};

View file

@ -28,7 +28,7 @@ in
aux.foundation.stages.stage1.gnumake.boot = {
version = "4.4.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/make/make-${cfg.version}.tar.gz";
sha256 = "1cwgcmwdn7gqn5da2ia91gkyiqs9birr10sy5ykpkaxzcwfzn5nx";
};

View file

@ -58,7 +58,7 @@ in
aux.foundation.stages.stage1.gnumake = {
version = "4.4.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/make/make-${cfg.version}.tar.gz";
sha256 = "3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M=";
};

View file

@ -55,7 +55,7 @@ in
aux.foundation.stages.stage1.gnupatch = {
version = "2.5.9";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/patch/patch-${cfg.version}.tar.gz";
sha256 = "12nv7jx3gxfp50y11nxzlnmqqrpicjggw6pcsq0wyavkkm3cddgc";
};

View file

@ -28,7 +28,7 @@ in
aux.foundation.stages.stage1.gnused.boot = {
version = "4.0.9";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/sed/sed-${cfg.version}.tar.gz";
sha256 = "0006gk1dw2582xsvgx6y6rzs9zw8b36rhafjwm288zqqji3qfrf3";
};
@ -37,7 +37,7 @@ in
let
# Thanks to the live-bootstrap project!
# See https://github.com/fosslinux/live-bootstrap/blob/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/sed-4.0.9.kaem
makefile = builtins.fetchurl {
makefile = lib.fetchurl {
url = "https://github.com/fosslinux/live-bootstrap/raw/1bc4296091c51f53a5598050c8956d16e945b0f5/sysa/sed-4.0.9/mk/main.mk";
sha256 = "0w1f5ri0g5zla31m6l6xyzbqwdvandqfnzrsw90dd6ak126w3mya";
};

View file

@ -64,7 +64,7 @@ in
aux.foundation.stages.stage1.gnused = {
version = "4.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/sed/sed-${cfg.version}.tar.gz";
sha256 = "20XNY/0BDmUFN9ZdXfznaJplJ0UjZgbl5ceCk3Jn2YM=";
};

View file

@ -29,7 +29,7 @@ in
aux.foundation.stages.stage1.gnutar.boot = {
version = "1.12";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/tar/tar-${cfg.version}.tar.gz";
sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6";
};

View file

@ -67,7 +67,7 @@ in
aux.foundation.stages.stage1.gnutar = {
version = "1.35";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/tar/tar-${cfg.version}.tar.gz";
sha256 = "FNVeMgY+qVJuBX+/Nfyr1TN452l4fv95GcN1WwLStX4=";
};

View file

@ -29,7 +29,7 @@ in
aux.foundation.stages.stage1.gnutar.musl = {
version = "1.12";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/tar/tar-${cfg.version}.tar.gz";
sha256 = "xsN+iIsTbM76uQPFEUn0t71lnWnUrqISRfYQU6V6pgo=";
};

View file

@ -55,7 +55,7 @@ in
aux.foundation.stages.stage1.gzip = {
version = "1.2.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gzip/gzip-${cfg.version}.tar.gz";
sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w";
};

View file

@ -69,7 +69,7 @@ in
aux.foundation.stages.stage1.heirloom = {
version = "070715";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://downloads.sourceforge.net/heirloom/heirloom/${cfg.version}/heirloom-${cfg.version}.tar.bz2";
sha256 = "6zP3C8wBmx0OCkHx11UtRcV6FicuThxIY07D5ESWow8=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage1.heirloom.devtools = {
version = "070527";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://downloads.sourceforge.net/heirloom/heirloom-devtools/heirloom-devtools-${cfg.version}.tar.bz2";
sha256 = "9f233d8b78e4351fe9dd2d50d83958a0e5af36f54e9818521458a08e058691ba";
};
@ -75,12 +75,12 @@ in
patches = [
# Remove all kinds of wchar support. Mes Libc does not support wchar in any form
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/yacc_remove_wchar.patch";
sha256 = "0wgiz02bb7xzjy2gnbjp8y31qy6rc4b29v01zi32zh9lw54j68hc";
})
# Similarly to yacc, remove wchar. See yacc patch for further information
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/lex_remove_wchar.patch";
sha256 = "168dfngi51ljjqgd55wbvmffaq61gk48gak50ymnl1br92qkp4zh";
})

View file

@ -50,7 +50,7 @@ in
aux.foundation.stages.stage1.linux-headers = {
version = "6.5.6";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major cfg.version}.x/linux-${cfg.version}.tar.xz";
sha256 = "eONtQhRUcFHCTfIUD0zglCjWxRWtmnGziyjoCUqV0vY=";
};

View file

@ -28,7 +28,7 @@ in
aux.foundation.stages.stage1.mes = {
version = "0.25";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mes/mes-${cfg.version}.tar.gz";
sha256 = "MlJQs1Z+2SA7pwFhyDWvAQeec+vtl7S1u3fKUAuCiUA=";
};

View file

@ -29,7 +29,7 @@ in
aux.foundation.stages.stage1.musl.boot = {
version = "1.1.24";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://musl.libc.org/releases/musl-${cfg.version}.tar.gz";
sha256 = "E3DJqBKyzyp9koAlEMygBYzDfmanvt1wBR8KNAFQIqM=";
};
@ -40,42 +40,42 @@ in
# See https://github.com/fosslinux/live-bootstrap/blob/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24/musl-1.1.24.sh
liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24";
patches = [
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/avoid_set_thread_area.patch";
sha256 = "TsbBZXk4/KMZG9EKi7cF+sullVXrxlizLNH0UHGXsPs=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/avoid_sys_clone.patch";
sha256 = "/ZmH64J57MmbxdfQ4RNjamAiBdkImMTlHsHdgV4gMj4=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/fenv.patch";
sha256 = "vMVGjoN4deAJW5gsSqA207SJqAbvhrnOsGK49DdEiTI=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/makefile.patch";
sha256 = "03iYBAUnsrEdLIIhhhq5mM6BGnPn2EfUmIHu51opxbw=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/musl_weak_symbols.patch";
sha256 = "/d9a2eUkpe9uyi1ye6T4CiYc9MR3FZ9na0Gb90+g4v0=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/set_thread_area.patch";
sha256 = "RIZYqbbRSx4X/0iFUhriwwBRmoXVR295GNBUjf2UrM0=";
})
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/sigsetjmp.patch";
sha256 = "wd2Aev1zPJXy3q933aiup5p1IMKzVJBquAyl3gbK4PU=";
})
# FIXME: this patch causes the build to fail
# (builtins.fetchurl {
# (lib.fetchurl {
# url = "${liveBootstrap}/patches/stdio_flush_on_exit.patch";
# sha256 = "/z5ze3h3QTysay8nRvyvwPv3pmTcKptdkBIaMCoeLDg=";
# })
# HACK: always flush stdio immediately
./patches/always-flush.patch
(builtins.fetchurl {
(lib.fetchurl {
url = "${liveBootstrap}/patches/va_list.patch";
sha256 = "UmcMIl+YCi3wIeVvjbsCyqFlkyYsM4ECNwTfXP+s7vg=";
})

View file

@ -59,7 +59,7 @@ in
aux.foundation.stages.stage1.musl = {
version = "1.2.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://musl.libc.org/releases/musl-${cfg.version}.tar.gz";
sha256 = "ejXq4z1TcqfA2hGI3nmHJvaIJVE7euPr6XqqpSEU8Dk=";
};

View file

@ -51,7 +51,7 @@ in
config = {
aux.foundation.stages.stage1.nyacc = {
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://mirror.easyname.at/nongnu/nyacc/nyacc-${version}.tar.gz";
sha256 = "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.python = {
version = "3.12.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://www.python.org/ftp/python/${cfg.version}/Python-${cfg.version}.tar.xz";
sha256 = "eVw09E30Wg6blxDIxxwVxnGHFSTNQSyhTe8hLozLFV0=";
};

View file

@ -167,7 +167,7 @@ in
src =
let
tarball = builtins.fetchurl {
tarball = lib.fetchurl {
url = "https://gitlab.com/janneke/tinycc/-/archive/${cfg.revision}/tinycc-${cfg.revision}.tar.gz";
sha256 = "1a0cw9a62qc76qqn5sjmp3xrbbvsz2dxrw21lrnx9q0s74mwaxbq";
};

View file

@ -116,7 +116,7 @@ in
src =
let
tarball = builtins.fetchurl {
tarball = lib.fetchurl {
url = "https://repo.or.cz/tinycc.git/snapshot/${cfg.revision}.tar.gz";
sha256 = "11idrvbwfgj1d03crv994mpbbbyg63j1k64lw1gjy7mkiifw2xap";
};

View file

@ -27,7 +27,7 @@ in
};
src = lib.options.create {
type = lib.types.string;
type = lib.types.derivation;
description = "Source for the package.";
};
@ -145,7 +145,7 @@ in
{
revision = "fd6d2180c5c801bb0b4c5dde27d61503059fc97d";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://repo.or.cz/tinycc.git/snapshot/${cfg.revision}.tar.gz";
sha256 = "R81SNbEmh4s9FNQxCWZwUiMCYRkkwOHAdRf0aMnnRiA=";
};

View file

@ -59,7 +59,7 @@ in
aux.foundation.stages.stage1.xz = {
version = "5.4.3";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://tukaani.org/xz/xz-${cfg.version}.tar.gz";
sha256 = "HDguC8Lk4K9YOYqQPdYv/35RAXHS3keh6+BtFSjpt+k=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage1.zlib = {
version = "1.3";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://github.com/madler/zlib/releases/download/v${cfg.version}/zlib-${cfg.version}.tar.xz";
sha256 = "ipuiiY4dDXdOymultGJ6EeVYi6hciFEzbrON5GgwUKc=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage2.bash = {
version = "5.2.15";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/bash/bash-${cfg.version}.tar.gz";
sha256 = "132qng0jy600mv1fs95ylnlisx2wavkkgpb19c6kmz7lnmjhjwhk";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.binutils = {
version = "2.41";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/binutils/binutils-${cfg.version}.tar.xz";
sha256 = "rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage2.busybox = {
version = "1.36.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://busybox.net/downloads/busybox-${cfg.version}.tar.bz2";
sha256 = "uMwkyVdNgJ5yecO+NJeVxdXOtv3xnKcJ+AzeUOR94xQ=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage2.bzip2 = {
version = "1.0.8";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://sourceware.org/pub/bzip2/bzip2-${cfg.version}.tar.gz";
sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.coreutils = {
version = "9.4";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/coreutils/coreutils-${cfg.version}.tar.gz";
sha256 = "X2ANkJOXOwr+JTk9m8GMRPIjJlf0yg2V6jHHAutmtzk=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.diffutils = {
version = "3.10";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/diffutils/diffutils-${cfg.version}.tar.xz";
sha256 = "kOXpPMck5OvhLt6A3xY0Bjx6hVaSaFkZv+YLVWyb0J4=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.findutils = {
version = "4.9.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/findutils/findutils-${cfg.version}.tar.xz";
sha256 = "or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage2.gawk = {
version = "5.2.2";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gawk/gawk-${cfg.version}.tar.gz";
sha256 = "lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA=";
};

View file

@ -110,14 +110,14 @@ in
aux.foundation.stages.stage2.gcc = {
version = "13.2.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gcc/gcc-${cfg.version}/gcc-${cfg.version}.tar.xz";
sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
};
gmp = {
version = "6.3.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gmp/gmp-${cfg.gmp.version}.tar.xz";
sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
};
@ -125,7 +125,7 @@ in
mpfr = {
version = "4.2.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpfr/mpfr-${cfg.mpfr.version}.tar.xz";
sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
};
@ -133,7 +133,7 @@ in
mpc = {
version = "1.3.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/mpc/mpc-${cfg.mpc.version}.tar.gz";
sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
};
@ -141,7 +141,7 @@ in
isl = {
version = "0.24";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${cfg.isl.version}.tar.bz2";
sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage2.glibc = {
version = "2.38";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/libc/glibc-${cfg.version}.tar.xz";
sha256 = "+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage2.gnugrep = {
version = "3.11";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/grep/grep-${cfg.version}.tar.xz";
sha256 = "HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage2.gnumake = {
version = "4.4.1";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/make/make-${cfg.version}.tar.gz";
sha256 = "3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.gnupatch = {
version = "2.7";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/patch/patch-${cfg.version}.tar.xz";
sha256 = "XCyR/kFUKWISbwvhUKpPo0lIXPLtwMfqfbwky4FxEa4=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage2.gnused = {
version = "4.9";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/sed/sed-${cfg.version}.tar.xz";
sha256 = "biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE=";
};

View file

@ -62,7 +62,7 @@ in
aux.foundation.stages.stage2.gnutar = {
version = "1.35";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/tar/tar-${cfg.version}.tar.gz";
sha256 = "FNVeMgY+qVJuBX+/Nfyr1TN452l4fv95GcN1WwLStX4=";
};

View file

@ -56,7 +56,7 @@ in
aux.foundation.stages.stage2.gzip = {
version = "1.13";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "${config.aux.mirrors.gnu}/gzip/gzip-${cfg.version}.tar.xz";
sha256 = "dFTraTXbF8ZlVXbC4bD6vv04tNCTbg+H9IzQYs6RoFc=";
};

View file

@ -57,7 +57,7 @@ in
aux.foundation.stages.stage2.patchelf = {
version = "0.18.0";
src = builtins.fetchurl {
src = lib.fetchurl {
url = "https://github.com/NixOS/patchelf/releases/download/${cfg.version}/patchelf-${cfg.version}.tar.gz";
sha256 = "ZN4Q5Ma4uDedt+h/WAMPM26nR8BRXzgRMugQ2/hKhuc=";
};