Merge branch 'master' into stdenv-updates

Conflicts: pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
parent 70edf15997 a940651968
commit 76244ac2e2
300 changed files with 10324 additions and 23586 deletions
@@ -149,6 +149,12 @@ let
      deps = [ db4 ];
    };

+    crypt = buildInternalPythonModule {
+      moduleName = "crypt";
+      internalName = "crypt";
+      deps = [ ];
+    };
+
    curses = buildInternalPythonModule {
      moduleName = "curses";
      deps = [ ncurses ];