Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/tools/security/bmrsa/11.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     description = "RSA utility";
     homepage = http://bmrsa.sourceforge.net/;
     license = licenses.gpl1;
+    platforms = platforms.linux;
   };
 }

pkgs/tools/security/chntpw/default.nix

@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "An utility to reset the password of any user that has a valid local account on a Windows system";
     maintainers = with stdenv.lib.maintainers; [ deepfire ];
     license = licenses.gpl2;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/security/dirmngr/default.nix

@@ -7,4 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
   buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

pkgs/tools/security/gnupg/1compat.nix

@@ -17,4 +17,8 @@ stdenv.mkDerivation {
     ${coreutils}/bin/ln -s gpg2 $out/bin/gpg
     ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv
   '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

pkgs/tools/security/metasploit/default.nix

@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Metasploit Framework - a collection of exploits";
     homepage = https://github.com/rapid7/metasploit-framework/wiki;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/security/mktemp/default.nix

@@ -11,4 +11,7 @@ stdenv.mkDerivation {
     sha256 = "1nfj89b0dv1c2fyqi1pg54fyzs3462cbp7jv7lskqsxvqy4mh9x1";
   };
   
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/tools/security/mpw/default.nix

@@ -39,4 +39,8 @@ in stdenv.mkDerivation {
     mkdir -p $out/bin
     mv mpw $out/bin/mpw
   '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/tools/security/ossec/default.nix

@@ -34,6 +34,7 @@ yes
     description = "Open soruce host-based instrusion detection system";
     homepage = http://www.ossec.net;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
 

pkgs/tools/security/pass/rofi-pass.nix

@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/carnager/rofi-pass;
     maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ];
     license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/security/prey/default.nix

@@ -43,5 +43,6 @@ in stdenv.mkDerivation rec {
     description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing";
     maintainers = with maintainers; [ domenkozar ];
     license = licenses.gpl3;
+    platforms = with platforms; linux;
   };
 }

pkgs/tools/security/seccure/default.nix

@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://point-at-infinity.org/seccure/;
     description = "Zero-configuration elliptic curve cryptography utility";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/security/secp256k1/default.nix

@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/bitcoin-core/secp256k1;
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ chris-martin ];
+    platforms = with platforms; unix;
   };
 }

pkgs/tools/security/ssss/default.nix

@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Shamir Secret Sharing Scheme";
     homepage = http://point-at-infinity.org/ssss/;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/security/steghide/default.nix

@@ -1,30 +1,30 @@
 { stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}:
 
-  stdenv.mkDerivation rec {
-    buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
-    version = "0.5.1";
-    name = "steghide-${version}";
+stdenv.mkDerivation rec {
+  buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ];
+  version = "0.5.1";
+  name = "steghide-${version}";
 
-    meta = with stdenv.lib; {
-        homepage = http://steghide.sourceforge.net/;
-        description = "Steganography program that is able to hide data in various kinds of image- and audio-files";
-        license = licenses.gpl2;
-    };
+  src = fetchurl {
+    url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
+    sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
+  };
 
-    src = fetchurl {
-      url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ;
-      sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b";
-    };
+  patches = [
+    ./patches/steghide-0.5.1-gcc34.patch
+    ./patches/steghide-0.5.1-gcc4.patch
+    ./patches/steghide-0.5.1-gcc43.patch
+  ];
 
-    patches = [
-      ./patches/steghide-0.5.1-gcc34.patch
-      ./patches/steghide-0.5.1-gcc4.patch
-      ./patches/steghide-0.5.1-gcc43.patch
-    ];
+  # AM_CXXFLAGS needed for automake
+  preConfigure = ''
+    export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
+  '';
 
-    # AM_CXXFLAGS needed for automake
-    preConfigure = ''
-      export AM_CXXFLAGS="$CXXFLAGS -std=c++0x"
-    '';
-
-  }
+  meta = with stdenv.lib; {
+    homepage = http://steghide.sourceforge.net/;
+    description = "Steganography program that is able to hide data in various kinds of image- and audio-files";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/security/super/default.nix

@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
         in /etc/super.tab); and 2) “setuid”, which allows root to
         execute a command under a different uid.
       '';
-  };  
+    platforms = stdenv.lib.platforms.linux;
+  };
 }