Merge branch 'staging-next' into staging

3 files changed, 44 insertions, 16 deletions

diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix
new file mode 100644
index 000000000000..39c0c02890bd
--- /dev/null
+++ b/pkgs/tools/security/aws-iam-authenticator/default.nix
@@ -0,0 +1,27 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "aws-iam-authenticator-${version}";
+  # This is meant to be a stable release, but since the rename from
+  # heptio, there has been no release. Please pin this to an actual
+  # release once that happens.
+  version = "2018-07-29";
+  rev = "01dd27d77ec1e2ec640a010970f00b2f8074b0b5";
+
+  goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/kubernetes-sigs/aws-iam-authenticator";
+    sha256 = "1n7khd2qvl527x3ac6f89smf12za92g08d9v2j393i7n9l1rgw38";
+  };
+
+  meta = {
+    homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator";
+    description = "AWS IAM credentials for Kubernetes authentication";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.srhb ];
+  };
+}
diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix
index 4d90289f3f35..c406316940e4 100644
--- a/pkgs/tools/security/spectre-meltdown-checker/default.nix
+++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spectre-meltdown-checker-${version}";
-  version = "0.38";
+  version = "0.39";
 
   src = fetchFromGitHub {
     owner = "speed47";
     repo = "spectre-meltdown-checker";
     rev = "v${version}";
-    sha256 = "151w68i0bhryij79s9xny8wh2256zayc5gyrj0s5nwnhl9yxz0f1";
+    sha256 = "1llp6iyvbykn9w7vnz1jklmy6gmbksk234b46mzjfvg7mvg91dc5";
   };
 
   prePatch = ''
@@ -19,16 +19,20 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = with stdenv.lib; ''
-    install -D spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker
+    runHook preInstall
+
+    install -Dm755 spectre-meltdown-checker.sh $out/bin/spectre-meltdown-checker
     wrapProgram $out/bin/spectre-meltdown-checker \
       --prefix PATH : ${makeBinPath [ binutils-unwrapped ]}
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "Spectre & Meltdown vulnerability/mitigation checker for Linux";
     homepage = https://github.com/speed47/spectre-meltdown-checker;
     license = licenses.gpl3;
-    platforms = platforms.linux;
     maintainers = with maintainers; [ dotlambda ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index 50b16ad58399..1ff9c73d8b58 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name    = "ssdeep-${version}";
-  version = "2.13";
+  version = "2.14.1";
 
-  src = fetchurl {
-    url    = "mirror://sourceforge/ssdeep/${name}.tar.gz";
-    sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
+  src = fetchFromGitHub {
+    owner = "ssdeep-project";
+    repo = "ssdeep";
+    rev = "release-${version}";
+    sha256 = "1yx6yjkggshw5yl89m4kvyzarjdg2l3hs0bbjbrfzwp1lkfd8i0c";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" '';
 
-  # For some reason (probably a build system bug), the binary isn't
-  # properly linked to $out/lib to find libfuzzy.so
-  postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    rp=$(patchelf --print-rpath $out/bin/ssdeep)
-    patchelf --set-rpath $rp:$out/lib $out/bin/ssdeep
-  '';
-
   meta = {
     description = "A program for calculating fuzzy hashes";
     homepage    = "http://www.ssdeep.sf.net";