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

Merge pull request #15477 from FRidh/pythonbuildinputs 

Python: be explicit about buildInputs
This commit is contained in:
Frederik Rietdijk 2016-05-16 12:11:39 +02:00
parent 68c73ada20 91834cfe3e
commit 022f5fdf83
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@ stdenv.mkDerivation {
pythonVersion = majorVersion; pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
inherit buildInputs;
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj";

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

@ -27,15 +27,27 @@ let
fullVersion = "${version}"; fullVersion = "${version}";
buildInputs = filter (p: p != null) [ buildInputs = filter (p: p != null) [
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto zlib
]; bzip2
lzma
gdbm
sqlite
db
readline
ncurses
openssl
tcl
tk
libX11
xproto
] ++ optionals stdenv.isDarwin [ CF configd ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python3-${fullVersion}"; name = "python3-${fullVersion}";
pythonVersion = majorVersion; pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
buildInputs = optionals stdenv.isDarwin [ CF configd ]; inherit buildInputs;
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";

18
pkgs/development/interpreters/python/3.5/default.nix
View File

@ -27,15 +27,27 @@ let
fullVersion = "${version}"; fullVersion = "${version}";
buildInputs = filter (p: p != null) [ buildInputs = filter (p: p != null) [
zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto zlib
]; bzip2
lzma
gdbm
sqlite
db
readline
ncurses
openssl
tcl
tk
libX11
xproto
] ++ optionals stdenv.isDarwin [ CF configd ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "python3-${fullVersion}"; name = "python3-${fullVersion}";
pythonVersion = majorVersion; pythonVersion = majorVersion;
inherit majorVersion version; inherit majorVersion version;
buildInputs = optionals stdenv.isDarwin [ CF configd ]; inherit buildInputs;
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";