Merge branch 'master' into staging.

Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/tools/security/gnupg/21.nix pkgs/top-level/all-packages.nix
2015-03-10 12:09:43 +01:00
parent de892761cf 8196130a1d
commit 6694ef42a9
155 changed files with 4594 additions and 4186 deletions
@@ -40,5 +40,6 @@ stdenv.mkDerivation {
    license     = stdenv.lib.licenses.bsd3;
    maintainers = [ stdenv.lib.maintainers.shlevy ];
    platforms   = stdenv.lib.platforms.all;
+    broken = true;
  };
 }