diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-15 10:36:38 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-16 11:37:19 +0000 |
commit | d435710923ac6e6f9fc155534800745004f2ce93 (patch) | |
tree | 386f9401476f96bdc6ec25173a090198942b5d5b /nixpkgs/pkgs/development/tools/misc/coreboot-toolchain | |
parent | c725f0011e91ae49d351b981690eb66b862b6104 (diff) | |
parent | 3239fd2b8f728106491154b44625662e10259af2 (diff) | |
download | nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.gz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.bz2 nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.lz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.xz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.zst nixlib-d435710923ac6e6f9fc155534800745004f2ce93.zip |
Merge commit '3239fd2b8f728106491154b44625662e10259af2'
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/misc/coreboot-toolchain')
3 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index d746a6d1ff33..c49fb15610e3 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -17,12 +17,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.15"; + version = "4.16"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; + sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52"; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 9460353873e4..64ee3da1ad92 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20210331.tar.gz"; + name = "acpica-unix2-20211217.tar.gz"; archive = fetchurl { - sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz"; + sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; }; } { diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh index d4c348a5d0c7..3acf22e2cd7d 100755 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -8,7 +8,7 @@ fi pkg_dir="$(dirname "$0")" -src="$(nix-build . --no-out-link -A coreboot-toolchain.src)" +src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" urls=$($src/util/crossgcc/buildgcc -u) tmp=$(mktemp) |