From 58ec2d47eafb3bb754790037852411b3eb15116f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 15 May 2016 13:37:29 +0200 Subject: [PATCH 1/3] Python 3.3: be explicit about buildInputs --- pkgs/development/interpreters/python/3.3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 60d56597ea0f..be770a85a1ec 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"; From 56e96b8b10ec2552eacb8c76a7df0960517f213b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 15 May 2016 13:37:51 +0200 Subject: [PATCH 2/3] Python 3.4: be explicit about buildInputs --- .../interpreters/python/3.4/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 517dfc3d8b27..1f6a929f9cdc 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"; From 91834cfe3e332903ae05723b638726811b09b233 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 15 May 2016 13:38:02 +0200 Subject: [PATCH 3/3] Python 3.5: be explicit about buildInputs --- .../interpreters/python/3.5/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 15e02d1ab3ed..91ad8fda8068 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";