public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/ghc/with-packages.nix
This commit is contained in:
Peter Simons
2013-08-16 22:51:13 +02:00
parent 70edf15997 a940651968
commit 76244ac2e2
300 changed files with 10324 additions and 23586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/python/2.6/default.nix
View File

@@ -149,6 +149,12 @@ let
deps = [ db4 ];
};
crypt = buildInternalPythonModule {
moduleName = "crypt";
internalName = "crypt";
deps = [ ];
};
curses = buildInternalPythonModule {
moduleName = "curses";
deps = [ ncurses ];

6
pkgs/development/interpreters/python/2.7/default.nix
View File

@@ -164,6 +164,12 @@ let
deps = [ ncurses ];
};
crypt = buildInternalPythonModule {
moduleName = "crypt";
internalName = "crypt";
deps = [ ];
};
gdbm = buildInternalPythonModule {
moduleName = "gdbm";
internalName = "gdbm";