summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-01-14 22:22:05 +0000
committerGitHub <noreply@github.com>2018-01-14 22:22:05 +0000
commit890c8047edd4d9674cfadb046f442679a5859ea8 (patch)
tree755752512b9ab002792fd077102f52bc7865807d /pkgs
parent0ed9de25468515928415ac1bd9c7cceaa6bba6fa (diff)
parent898ac01eb8070c05624ecbd11c8329a307a258ef (diff)
downloadnixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar.gz
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar.bz2
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar.lz
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar.xz
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.tar.zst
nixlib-890c8047edd4d9674cfadb046f442679a5859ea8.zip
Merge pull request #33869 from dotlambda/spectre-meltdown-checker
spectre-meltdown-checker: 0.29 -> 0.31
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/security/spectre-meltdown-checker/default.nix13
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 9c12a4fa1060..65377538fc16 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, binutils-unwrapped }:
+{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, binutils-unwrapped }:
 
 stdenv.mkDerivation rec {
   name = "spectre-meltdown-checker-${version}";
-  version = "0.29";
+  version = "0.31";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     rev = "v${version}";
-    sha256 = "14i9gx1ngs3ixjirlx4qd87pmac916rvv9y61a5f7nl0dig4awl4";
-  };
-
-  patches = fetchpatch {
-    url = "https://github.com/speed47/spectre-meltdown-checker/pull/79.patch";
-    sha256 = "185kac5r97s3dnihgpwx4aashnzffb1f09xv9jw409g7i6cv2sq9";
+    sha256 = "14g5q2prd5w2zhwi7sr9pnalakd87zkvxk0vrzw4cv3x71d44nk2";
   };
 
   prePatch = ''
     substituteInPlace spectre-meltdown-checker.sh \
-      --replace /bin/echo echo
+      --replace /bin/echo ${coreutils}/bin/echo
   '';
 
   nativeBuildInputs = [ makeWrapper ];