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

Merge branch 'master' into staging

Browse Source 
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
This commit is contained in:
Vladimír Čunát
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,6 +93,7 @@ let
libPrefix = "python${majorVersion}";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
enableParallelBuilding = true;

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

@@ -101,6 +101,7 @@ let
libPrefix = "python${majorVersion}";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
enableParallelBuilding = true;

1
pkgs/development/interpreters/python/3.2/default.nix
View File

@@ -80,6 +80,7 @@ stdenv.mkDerivation {
isPy32 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
enableParallelBuilding = true;

1
pkgs/development/interpreters/python/3.3/default.nix
View File

@@ -81,6 +81,7 @@ stdenv.mkDerivation {
isPy33 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
enableParallelBuilding = true;

1
pkgs/development/interpreters/python/3.4/default.nix
View File

@@ -83,6 +83,7 @@ stdenv.mkDerivation {
isPy34 = true;
is_py3k = true; # deprecated
sitePackages = "lib/${libPrefix}/site-packages";
interpreter = "${self}/bin/${executable}";
};
enableParallelBuilding = true;