movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-25 18:46:32 +03:00
Code Activity

Merge branch 'master' into staging

Browse source
This commit is contained in:
Vladimír Čunát 2018-06-30 01:41:59 +02:00
commit f7781f5293
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
998 changed files with 16512 additions and 10378 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/interpreters/python/cpython/3.6/default.nix
View file

@ -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}";
};

4
pkgs/development/interpreters/python/cpython/3.7/default.nix
View file

@ -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";