From cefb33646aee9e36f77e9f3f7a04b7487b137075 Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 3 May 2025 22:35:53 +0200 Subject: [PATCH 1/3] spectre-meltdown-checker: 0.46 -> 0.46-unstable-2024-08-04 --- pkgs/by-name/sp/spectre-meltdown-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix index 976647ff3e25..b71ef96afd80 100644 --- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix +++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spectre-meltdown-checker"; - version = "0.46"; + version = "0.46-unstable-2024-08-04"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; - rev = "v${finalAttrs.version}"; - hash = "sha256-M4ngdtp2esZ+CSqZAiAeOnKtaK8Ra+TmQfMsr5q5gkg="; + rev = "34c6095912d115551f69435a55d6e0445932fdf9"; + hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w="; }; prePatch = '' From 2da84ac31d69ddcdf70a9dff741d985fccccbabc Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 3 May 2025 22:36:22 +0200 Subject: [PATCH 2/3] spectre-meltdown-checker: use replace-fail --- pkgs/by-name/sp/spectre-meltdown-checker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix index b71ef96afd80..ed4fbb2e8693 100644 --- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix +++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' substituteInPlace spectre-meltdown-checker.sh \ - --replace /bin/echo ${coreutils}/bin/echo + --replace-fail /bin/echo ${coreutils}/bin/echo ''; nativeBuildInputs = [ makeBinaryWrapper ]; From ccb9ae1decb8350c88b63a88544b351caeca5e5f Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 3 May 2025 22:37:57 +0200 Subject: [PATCH 3/3] spectre-meltdown-checker: add updateScript --- .../by-name/sp/spectre-meltdown-checker/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix index ed4fbb2e8693..e54ee54ffbbe 100644 --- a/pkgs/by-name/sp/spectre-meltdown-checker/package.nix +++ b/pkgs/by-name/sp/spectre-meltdown-checker/package.nix @@ -1,10 +1,11 @@ { - lib, - stdenv, - fetchFromGitHub, - makeBinaryWrapper, - coreutils, binutils-unwrapped, + coreutils, + fetchFromGitHub, + lib, + makeBinaryWrapper, + stdenv, + unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { @@ -18,6 +19,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-m0f0+AFPrB2fPNd1SkSj6y9PElTdefOdI51Jgfi816w="; }; + passthru.updateScript = unstableGitUpdater { }; + prePatch = '' substituteInPlace spectre-meltdown-checker.sh \ --replace-fail /bin/echo ${coreutils}/bin/echo