From 1810986433e8ddce000c77876d52b44c8be5bd88 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 19 May 2024 00:39:31 -0700 Subject: [PATCH 1/4] coreboot-utils: 24.02 -> 24.05 Release notes: https://github.com/coreboot/coreboot/blob/main/Documentation/releases/coreboot-24.05-relnotes.md --- pkgs/tools/misc/coreboot-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index e13b97e0c3a0..60558a57777e 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchgit, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: let - version = "24.02"; + version = "24.05"; commonMeta = with lib; { description = "Various coreboot-related tools"; @@ -11,13 +11,13 @@ let platforms = platforms.linux; }; - generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec { + generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation ({ inherit pname version; src = fetchgit { url = "https://review.coreboot.org/coreboot"; - rev = "4845b69db29107ce8d9cd2969b4aad5c7daa6399"; - sha256 = "sha256-whALKP9MetyMJSmXVf0WYd9dP8AGa+ADAB8cmIqt4HU="; + rev = version; + hash = "sha256-Fq3tZje6QoMskxqWd61OstgI9Sj25yijf8S3LiTJuYc="; }; enableParallelBuilding = true; From 01ba455c791c76c75a7ed4474b92c9f3f6702693 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 19 May 2024 00:43:25 -0700 Subject: [PATCH 2/4] coreboot-utils: add jmbaur as maintainer --- pkgs/tools/misc/coreboot-utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 60558a57777e..0410a23221ea 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -7,7 +7,7 @@ let description = "Various coreboot-related tools"; homepage = "https://www.coreboot.org"; license = with licenses; [ gpl2Only gpl2Plus ]; - maintainers = with maintainers; [ felixsinger ]; + maintainers = with maintainers; [ felixsinger jmbaur ]; platforms = platforms.linux; }; From 7f3fe8138af963b0a919600799ae38b9573a50f4 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 19 May 2024 00:43:51 -0700 Subject: [PATCH 3/4] coreboot-toolchain: 24.02 -> 24.05 Release notes: https://github.com/coreboot/coreboot/blob/main/Documentation/releases/coreboot-24.05-relnotes.md --- .../tools/misc/coreboot-toolchain/default.nix | 4 ++-- .../tools/misc/coreboot-toolchain/stable.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 54f3f6e9b459..5b1738034861 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 (finalAttrs: { pname = "coreboot-toolchain-${arch}"; - version = "24.02"; + version = "24.05"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-fHulr7w5I9LzBwGt/ZVaN7A3XEd7uQ2eJJifxII7rtk="; + hash = "sha256-jTfMFvl3sG3BIVVkpZ81BQ20Bs+2ESE6RMh0fW86rKE="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 6f5160e033b7..6656e7822086 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -28,17 +28,17 @@ }; } { - name = "binutils-2.41.tar.xz"; + name = "binutils-2.42.tar.xz"; archive = fetchurl { - sha256 = "0l3l003dynq11ppr2h8p0cfc7zyky8ilfwg60sbfan9lwa4mg6mf"; - url = "mirror://gnu/binutils/binutils-2.41.tar.xz"; + sha256 = "0058hngi16793aja9ih623mfr98dcarmf549nw38nxzwslgx9r7n"; + url = "mirror://gnu/binutils/binutils-2.42.tar.xz"; }; } { - name = "R06_28_23.tar.gz"; + name = "acpica-unix-20230628.tar.gz"; archive = fetchurl { - sha256 = "0cadxihshyrjplrx01vna13r1m2f6lj1klw7mh8pg2m0gjdpjj12"; - url = "https://github.com/acpica/acpica/archive/refs/tags/R06_28_23.tar.gz"; + sha256 = "1kjwzyfrmw0fhawjvpqib3l5jxdlcpj3vv92sb7ls8ixbrs6m1w6"; + url = "https://downloadmirror.intel.com/783534/acpica-unix-20230628.tar.gz"; }; } { From a2afcbefac6437b8d9450d519ae67912add70463 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 19 May 2024 00:44:17 -0700 Subject: [PATCH 4/4] coreboot-toolchain: add jmbaur as maintainer --- pkgs/development/tools/misc/coreboot-toolchain/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 5b1738034861..51d80b6df9ae 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -63,7 +63,7 @@ let homepage = "https://www.coreboot.org"; description = "coreboot toolchain for ${arch} targets"; license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ]; - maintainers = with maintainers; [ felixsinger ]; + maintainers = with maintainers; [ felixsinger jmbaur ]; platforms = platforms.linux; }; })