diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 0229aba0f38b..f204b28ee1df 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -19,12 +19,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.16"; + version = "4.19"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4="; + sha256 = "sha256-pGS+bfX2k/ot7sHL9aiaQpA0wtbHHZEObJ/h2JGF5/4="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' @@ -70,7 +70,7 @@ let ); in -lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [ +lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [ "i386" "x64" "arm" diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 64ee3da1ad92..f8b6bd0ea68e 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -7,10 +7,10 @@ }; } { - name = "mpfr-4.1.0.tar.xz"; + name = "mpfr-4.1.1.tar.xz"; archive = fetchurl { - sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; - url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz"; + sha256 = "0gf3ibi7kzz39zj72qc9r607clyhm80gs8wbp71zzfkxasyrblgz"; + url = "mirror://gnu/mpfr/mpfr-4.1.1.tar.xz"; }; } { @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20211217.tar.gz"; + name = "R10_20_22.tar.gz"; archive = fetchurl { - sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; + sha256 = "11iv3jrz27g7bv7ffyxsrgm4cq60cld2gkkl008p3lcwfyqpx88s"; + url = "https://github.com/acpica/acpica/archive/refs/tags//R10_20_22.tar.gz"; }; } { diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh index 3acf22e2cd7d..fc758e4ab021 100755 --- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -1,24 +1,26 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p nix cacert git getopt +# shellcheck shell=bash + if [ ! -d .git ]; then - echo "This script needs to be run from the root directory of nixpkgs. Exiting." - exit 1 + echo "This script needs to be run from the root directory of nixpkgs. Exiting." + exit 1 fi pkg_dir="$(dirname "$0")" src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" -urls=$($src/util/crossgcc/buildgcc -u) +urls=$("${src}/util/crossgcc/buildgcc" -u) tmp=$(mktemp) -echo '{ fetchurl }: [' > $tmp +echo '{ fetchurl }: [' >"$tmp" for url in $urls; do - name="$(basename $url)" - hash="$(nix-prefetch-url "$url")" + name="$(basename "$url")" + hash="$(nix-prefetch-url "$url")" - cat << EOF >> $tmp + cat <>"$tmp" { name = "$name"; archive = fetchurl { @@ -29,8 +31,8 @@ for url in $urls; do EOF done -echo ']' >> $tmp +echo ']' >>"$tmp" -sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp +sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp" -mv $tmp $pkg_dir/sources.nix +mv "$tmp" "${pkg_dir}/sources.nix"