diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-06-30 01:41:59 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-06-30 01:41:59 +0200 |
| commit | f7781f52933ff4a83d1396f6255dfa91e727dc7c (patch) | |
| tree | e76320ab79bb58dccf9c517c31aac209202217b5 /pkgs/development/interpreters/python | |
| parent | 3892a3e5a913af86f22888cf13552c229629d126 (diff) | |
| parent | 2059bf9e39bef62e9386291e1041371bdd8036ab (diff) | |
| download | nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.gz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.bz2 nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.lz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.xz nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.tar.zst nixlib-f7781f52933ff4a83d1396f6255dfa91e727dc7c.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.7/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 00b3a7f22c2c..c5fc3e8eb712 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -207,7 +207,7 @@ in stdenv.mkDerivation { withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; pkgs = pythonPackages; isPy3 = true; - isPy35 = true; + isPy36 = true; is_py3k = true; # deprecated interpreter = "${self}/bin/${executable}"; }; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index aae1041a224a..9cc0377f925f 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -28,7 +28,7 @@ with stdenv.lib; let majorVersion = "3.7"; minorVersion = "0"; - minorVersionSuffix = "rc1"; + minorVersionSuffix = ""; pythonVersion = majorVersion; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "python${majorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "1dqb1in7xlvq7959pvvxpm50nz5jk7ifxza2x4hfvqr31jvbkky9"; + sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; |