diff --git a/tidepool/src/lib/default.nix b/tidepool/src/lib/default.nix index bf0af85..b0a79ec 100644 --- a/tidepool/src/lib/default.nix +++ b/tidepool/src/lib/default.nix @@ -1,5 +1,6 @@ { includes = [ + ./fetchurl.nix ./options.nix ./packages.nix ./platforms.nix diff --git a/tidepool/src/lib/fetchurl.nix b/tidepool/src/lib/fetchurl.nix new file mode 100644 index 0000000..43b4381 --- /dev/null +++ b/tidepool/src/lib/fetchurl.nix @@ -0,0 +1,73 @@ +{ + config = { + # This function is a vendored version of . It uses the (largely undocumented) builtin:fetchurl + # builder for derivations to give us a way to download files (eg. source tarballs) in the early bootstrap phase, + # before we have access to tools like curl. It functions almost identically to the builtins.fetchurl function, + # except it downloads files during the derivation's build, instead of during Nix evaluation, preventing evaluation + # from being blocked by downloads. + # + # Most packages should avoid using this function, and instead prefer using builders to download sources, such as + # (TODO: create these). + # + # Original source: https://git.lix.systems/lix-project/lix/src/commit/6599be1a9f76f0fba2a6905ea85235aeb7b7eae9/lix/libexpr/fetchurl.nix + lib.fetchurl = + { + # URL of file to download + url, + # SRI hash of downloaded file + hash ? "", + + # Legacy, base32-encoded hash specifications + md5 ? "", + sha1 ? "", + sha256 ? "", + sha512 ? "", + outputHash ? + if hash != "" then + hash + else if sha512 != "" then + sha512 + else if sha1 != "" then + sha1 + else if md5 != "" then + md5 + else + sha256, + outputHashAlgo ? + if hash != "" then + "" + else if sha512 != "" then + "sha512" + else if sha1 != "" then + "sha1" + else if md5 != "" then + "md5" + else + "sha256", + + name ? baseNameOf url, + # Make the downloaded file executable (ie. chmod 755) + executable ? false, + # If the downloaded file is an archive, extract it before adding to the store + # NOTE: Only appears to unpack .xz archives? + unpack ? false, + }: + builtins.derivation { + inherit + name + url + executable + unpack + ; + + builder = "builtin:fetchurl"; + system = "builtin"; + preferLocalBuild = true; + + inherit outputHashAlgo outputHash; + outputHashMode = if unpack || executable then "recursive" else "flat"; + + urls = [ url ]; + }; + }; +} diff --git a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix index c08eaa5..78b6f69 100644 --- a/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix +++ b/tidepool/src/packages/foundation/bash/versions/5.2.15-stage1.nix @@ -38,9 +38,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/bash/bash-${version}.tar.gz"; - sha256 = "132qng0jy600mv1fs95ylnlisx2wavkkgpb19c6kmz7lnmjhjwhk"; + hash = "sha256-E3IJZbX0/DoNS2HdN+dWXHQdqaW+JO3CrgAYL8GzWIw="; }; deps = { diff --git a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix index cd439fc..51e85a7 100644 --- a/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix +++ b/tidepool/src/packages/foundation/binutils/versions/2.41-stage1.nix @@ -77,9 +77,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/binutils/binutils-${version}.tar.xz"; - sha256 = "rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA="; + hash = "sha256-rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA="; }; deps = { diff --git a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix index 736385c..4383693 100644 --- a/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix +++ b/tidepool/src/packages/foundation/bison/versions/3.8.2-stage1.nix @@ -31,9 +31,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/bison/bison-${version}.tar.xz"; - sha256 = "m7oCFMz38QecXVkhAEUie89hlRmEDr+oDNOEnP9aW/I="; + hash = "sha256-m7oCFMz38QecXVkhAEUie89hlRmEDr+oDNOEnP9aW/I="; }; deps = { diff --git a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix index bb5251a..37e1ac0 100644 --- a/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix +++ b/tidepool/src/packages/foundation/bzip2/versions/1.0.8-stage1.nix @@ -40,9 +40,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"; - sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb"; + hash = "sha256-q1oDF27hBtPw+pDjgdpHjdrkBZGBU8yiSOaCzQxKImk="; }; deps = { diff --git a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix index d99aab6..27af9e0 100644 --- a/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix +++ b/tidepool/src/packages/foundation/coreutils/versions/9.4-stage1.nix @@ -44,9 +44,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/coreutils/coreutils-${version}.tar.gz"; - sha256 = "X2ANkJOXOwr+JTk9m8GMRPIjJlf0yg2V6jHHAutmtzk="; + hash = "sha256-X2ANkJOXOwr+JTk9m8GMRPIjJlf0yg2V6jHHAutmtzk="; }; deps = { diff --git a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix index 022dee0..30d7b22 100644 --- a/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix +++ b/tidepool/src/packages/foundation/diffutils/versions/3.10-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/diffutils/diffutils-${version}.tar.xz"; - sha256 = "kOXpPMck5OvhLt6A3xY0Bjx6hVaSaFkZv+YLVWyb0J4="; + hash = "sha256-kOXpPMck5OvhLt6A3xY0Bjx6hVaSaFkZv+YLVWyb0J4="; }; deps = { diff --git a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix index 905eba1..bf03205 100644 --- a/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix +++ b/tidepool/src/packages/foundation/findutils/versions/4.9.0-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/findutils/findutils-${version}.tar.xz"; - sha256 = "or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4="; + hash = "sha256-or+4wJ1DZ3DtxZ9Q+kg+eFsWGjt7nVR1c8sIBl/UYv4="; }; deps = { diff --git a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix index f054ad6..efa7278 100644 --- a/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix +++ b/tidepool/src/packages/foundation/gawk/versions/5.2.2-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/gawk/gawk-${version}.tar.gz"; - sha256 = "lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA="; + hash = "sha256-lFrvfM/xAfILIqEIArwAXplKsrjqPnJMwaGXxi9B9lA="; }; deps = { diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix index 414991c..62f93b9 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage0.nix @@ -81,29 +81,29 @@ in isl.version = "0.24"; src = { - gcc = builtins.fetchurl { + gcc = lib.fetchurl { url = "${mirrors.gnu}/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; - gmp = builtins.fetchurl { + gmp = lib.fetchurl { url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz"; - sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; + hash = "sha256-o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; }; - mpfr = builtins.fetchurl { + mpfr = lib.fetchurl { url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz"; - sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; }; - mpc = builtins.fetchurl { + mpc = lib.fetchurl { url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz"; - sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; + hash = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; - isl = builtins.fetchurl { + isl = lib.fetchurl { url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2"; - sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; + hash = "sha256-/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; }; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix index 576765c..e29d29c 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage1.nix @@ -102,29 +102,29 @@ in isl.version = "0.24"; src = { - gcc = builtins.fetchurl { + gcc = lib.fetchurl { url = "${mirrors.gnu}/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; - gmp = builtins.fetchurl { + gmp = lib.fetchurl { url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz"; - sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; + hash = "sha256-o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; }; - mpfr = builtins.fetchurl { + mpfr = lib.fetchurl { url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz"; - sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; }; - mpc = builtins.fetchurl { + mpc = lib.fetchurl { url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz"; - sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; + hash = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; - isl = builtins.fetchurl { + isl = lib.fetchurl { url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2"; - sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; + hash = "sha256-/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; }; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix index ff5741f..064ee8d 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage2.nix @@ -97,29 +97,29 @@ in isl.version = "0.24"; src = { - gcc = builtins.fetchurl { + gcc = lib.fetchurl { url = "${mirrors.gnu}/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; - gmp = builtins.fetchurl { + gmp = lib.fetchurl { url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz"; - sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; + hash = "sha256-o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; }; - mpfr = builtins.fetchurl { + mpfr = lib.fetchurl { url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz"; - sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; }; - mpc = builtins.fetchurl { + mpc = lib.fetchurl { url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz"; - sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; + hash = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; - isl = builtins.fetchurl { + isl = lib.fetchurl { url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2"; - sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; + hash = "sha256-/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; }; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix index aa34d28..c34ffda 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage3.nix @@ -98,29 +98,29 @@ in isl.version = "0.24"; src = { - gcc = builtins.fetchurl { + gcc = lib.fetchurl { url = "${mirrors.gnu}/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; - gmp = builtins.fetchurl { + gmp = lib.fetchurl { url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz"; - sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; + hash = "sha256-o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; }; - mpfr = builtins.fetchurl { + mpfr = lib.fetchurl { url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz"; - sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; }; - mpc = builtins.fetchurl { + mpc = lib.fetchurl { url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz"; - sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; + hash = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; - isl = builtins.fetchurl { + isl = lib.fetchurl { url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2"; - sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; + hash = "sha256-/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; }; }; diff --git a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix index 70ea098..db3f5f5 100644 --- a/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix +++ b/tidepool/src/packages/foundation/gcc/versions/13.2.0-stage4.nix @@ -84,29 +84,29 @@ in isl.version = "0.24"; src = { - gcc = builtins.fetchurl { + gcc = lib.fetchurl { url = "${mirrors.gnu}/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; - gmp = builtins.fetchurl { + gmp = lib.fetchurl { url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz"; - sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; + hash = "sha256-o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg="; }; - mpfr = builtins.fetchurl { + mpfr = lib.fetchurl { url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz"; - sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; + hash = "sha256-J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I="; }; - mpc = builtins.fetchurl { + mpc = lib.fetchurl { url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz"; - sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; + hash = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; - isl = builtins.fetchurl { + isl = lib.fetchurl { url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2"; - sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; + hash = "sha256-/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA="; }; }; diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix index 25f0cd7..d852406 100644 --- a/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix +++ b/tidepool/src/packages/foundation/glibc/versions/2.38-bootstrap.nix @@ -35,9 +35,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/libc/glibc-${version}.tar.xz"; - sha256 = "+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; + hash = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; }; deps = { diff --git a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix index 1c980df..b63d62c 100644 --- a/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix +++ b/tidepool/src/packages/foundation/glibc/versions/2.38-stage1.nix @@ -45,9 +45,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/libc/glibc-${version}.tar.xz"; - sha256 = "+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; + hash = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix index a20b012..30c8c0c 100644 --- a/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix +++ b/tidepool/src/packages/foundation/gnugrep/versions/3.11-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/grep/grep-${version}.tar.xz"; - sha256 = "HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs="; + hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix index 51432cc..9269fc2 100644 --- a/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix +++ b/tidepool/src/packages/foundation/gnum4/versions/1.4.19-stage1.nix @@ -31,9 +31,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/m4/m4-${version}.tar.xz"; - sha256 = "Y67eXG0zttmxNRHNC+LKwEby5w/QoHqpVzoEqCeDr5Y="; + hash = "sha256-Y67eXG0zttmxNRHNC+LKwEby5w/QoHqpVzoEqCeDr5Y="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix index e7833a5..865bfc5 100644 --- a/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix +++ b/tidepool/src/packages/foundation/gnumake/versions/4.4.1-stage1.nix @@ -42,9 +42,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/make/make-${version}.tar.gz"; - sha256 = "3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M="; + hash = "sha256-3Rb7HWe/q3mnL16DkHNcSePo5wtJRaFasfgd23hlj7M="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix index 24c5ead..d4153d2 100644 --- a/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix +++ b/tidepool/src/packages/foundation/gnupatch/versions/2.7-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/patch/patch-${version}.tar.xz"; - sha256 = "XCyR/kFUKWISbwvhUKpPo0lIXPLtwMfqfbwky4FxEa4="; + hash = "sha256-XCyR/kFUKWISbwvhUKpPo0lIXPLtwMfqfbwky4FxEa4="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix index e2db810..6918872 100644 --- a/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix +++ b/tidepool/src/packages/foundation/gnused/versions/4.9-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/sed/sed-${version}.tar.xz"; - sha256 = "biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE="; + hash = "sha256-biJrcy4c1zlGStaGK9Ghq6QteYKSLaelNRljHSSXUYE="; }; deps = { diff --git a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix index 6a71fcc..016a2d8 100644 --- a/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix +++ b/tidepool/src/packages/foundation/gnutar/versions/1.35-stage1.nix @@ -37,9 +37,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/tar/tar-${version}.tar.gz"; - sha256 = "FNVeMgY+qVJuBX+/Nfyr1TN452l4fv95GcN1WwLStX4="; + hash = "sha256-FNVeMgY+qVJuBX+/Nfyr1TN452l4fv95GcN1WwLStX4="; }; deps = { diff --git a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix index 27c3803..ec7a99c 100644 --- a/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix +++ b/tidepool/src/packages/foundation/gzip/versions/1.13-stage1.nix @@ -40,9 +40,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "${mirrors.gnu}/gzip/gzip-${version}.tar.xz"; - sha256 = "dFTraTXbF8ZlVXbC4bD6vv04tNCTbg+H9IzQYs6RoFc="; + hash = "sha256-dFTraTXbF8ZlVXbC4bD6vv04tNCTbg+H9IzQYs6RoFc="; }; deps = { diff --git a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix index 310009e..b468271 100644 --- a/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix +++ b/tidepool/src/packages/foundation/linux-headers/versions/6.5.6-stage1.nix @@ -25,9 +25,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://cdn.kernel.org/pub/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - sha256 = "eONtQhRUcFHCTfIUD0zglCjWxRWtmnGziyjoCUqV0vY="; + hash = "sha256-eONtQhRUcFHCTfIUD0zglCjWxRWtmnGziyjoCUqV0vY="; }; deps = { diff --git a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix index 8bd3526..47bf72c 100644 --- a/tidepool/src/packages/foundation/musl/versions/1.2.4.nix +++ b/tidepool/src/packages/foundation/musl/versions/1.2.4.nix @@ -27,9 +27,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://musl.libc.org/releases/musl-${config.version}.tar.gz"; - sha256 = "ejXq4z1TcqfA2hGI3nmHJvaIJVE7euPr6XqqpSEU8Dk="; + hash = "sha256-ejXq4z1TcqfA2hGI3nmHJvaIJVE7euPr6XqqpSEU8Dk="; }; deps = { diff --git a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix index 711379e..ee7ebaf 100644 --- a/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix +++ b/tidepool/src/packages/foundation/python/versions/3.12.0-stage1.nix @@ -31,9 +31,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "eVw09E30Wg6blxDIxxwVxnGHFSTNQSyhTe8hLozLFV0="; + hash = "sha256-eVw09E30Wg6blxDIxxwVxnGHFSTNQSyhTe8hLozLFV0="; }; deps = { diff --git a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix index 636ff34..f7714c3 100644 --- a/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix +++ b/tidepool/src/packages/foundation/xz/versions/5.4.3-stage1.nix @@ -39,9 +39,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.gz"; - sha256 = "HDguC8Lk4K9YOYqQPdYv/35RAXHS3keh6+BtFSjpt+k="; + hash = "sha256-HDguC8Lk4K9YOYqQPdYv/35RAXHS3keh6+BtFSjpt+k="; }; deps = { diff --git a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix index c61c1b1..6793fd5 100644 --- a/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix +++ b/tidepool/src/packages/foundation/zlib/versions/1.3-stage1.nix @@ -21,9 +21,9 @@ in builder = builders.foundation.basic; - src = builtins.fetchurl { + src = lib.fetchurl { url = "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.xz"; - sha256 = "ipuiiY4dDXdOymultGJ6EeVYi6hciFEzbrON5GgwUKc="; + hash = "sha256-ipuiiY4dDXdOymultGJ6EeVYi6hciFEzbrON5GgwUKc="; }; deps = {