diff options
author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2016-05-29 15:12:23 +0200 |
---|---|---|
committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2016-05-29 15:12:23 +0200 |
commit | c3ed3914bbde9c95c52d41a6732068e62b4ee65a (patch) | |
tree | 96c242a25397ae277523894ddf29429e58cfb993 /pkgs/development/interpreters/python | |
parent | 41fa133548517e0351c924ff55dc818e38f4a0f4 (diff) | |
download | nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar.gz nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar.bz2 nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar.lz nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar.xz nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.tar.zst nixlib-c3ed3914bbde9c95c52d41a6732068e62b4ee65a.zip |
python: add python.withPackages function
Fixes #15801
Diffstat (limited to 'pkgs/development/interpreters/python')
6 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 548b7bcecbc7..726e2aa6aca1 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }: +, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage +, python26Packages }: assert zlibSupport -> zlib != null; @@ -97,6 +98,7 @@ let isPy2 = true; isPy26 = true; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 2e94cb6874e0..a72377a47708 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, self, callPackage +{ stdenv, fetchurl, self, callPackage, python27Packages , bzip2, openssl, gettext , includeModules ? false @@ -151,6 +151,7 @@ let isPy2 = true; isPy27 = true; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 3c4580a061f1..8c16995d5cc4 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python33Packages }: assert readline != null -> ncurses != null; @@ -81,6 +82,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python3.3m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index b36eda67867b..197ad6fc95bc 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python34Packages , CF, configd }: @@ -104,6 +105,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python3.4m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 087b5988e26a..762ef1ab8be6 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -12,6 +12,7 @@ , zlib , callPackage , self +, python35Packages , CF, configd }: @@ -104,6 +105,7 @@ stdenv.mkDerivation { libPrefix = "python${majorVersion}"; executable = "python${majorVersion}m"; buildEnv = callPackage ../wrapper.nix { python = self; }; + withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/with-packages.nix b/pkgs/development/interpreters/python/with-packages.nix new file mode 100644 index 000000000000..e1de0b2ee4ca --- /dev/null +++ b/pkgs/development/interpreters/python/with-packages.nix @@ -0,0 +1,3 @@ +{ buildEnv, pythonPackages }: + +f: let packages = f pythonPackages; in buildEnv.override { extraLibs = packages; } |