Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-02-15 13:36:34 +01:00
parent f9e75352cf 1a52c7659d
commit 2aa6f262cb
302 changed files with 14276 additions and 4226 deletions
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {

    license = stdenv.lib.licenses.gpl2;

+    platforms = stdenv.lib.platforms.linux;
+
    maintainers = [ stdenv.lib.maintainers.shlevy ];
  };
 }