diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-16 12:11:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-05-16 12:11:39 +0200 |
| commit | 022f5fdf83a5aa4ab35bada99511e15011f58d32 (patch) | |
| tree | 9c44f1ae1b9d300a46f512193778e4d1a880f28e | |
| parent | 68c73ada20fed1bcb2626705d3f5f7a3b1304054 (diff) | |
| parent | 91834cfe3e332903ae05723b638726811b09b233 (diff) | |
| download | nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar.gz nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar.bz2 nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar.lz nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar.xz nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.tar.zst nixpkgs-022f5fdf83a5aa4ab35bada99511e15011f58d32.zip | |
Merge pull request #15477 from FRidh/pythonbuildinputs
Python: be explicit about buildInputs
| -rw-r--r-- | pkgs/development/interpreters/python/3.3/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/3.4/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/3.5/default.nix | 18 |
3 files changed, 32 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 60d56597ea0..be770a85a1e 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { pythonVersion = majorVersion; inherit majorVersion version; + inherit buildInputs; + src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 517dfc3d8b2..1f6a929f9cd 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -27,15 +27,27 @@ let fullVersion = "${version}"; 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 stdenv.mkDerivation { name = "python3-${fullVersion}"; pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = optionals stdenv.isDarwin [ CF configd ]; + inherit buildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 15e02d1ab3e..91ad8fda806 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -27,15 +27,27 @@ let fullVersion = "${version}"; 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 stdenv.mkDerivation { name = "python3-${fullVersion}"; pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = optionals stdenv.isDarwin [ CF configd ]; + inherit buildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; |