Skip to content

Commit

Permalink
python35: 3.5.3 -> 3.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
FRidh committed Aug 8, 2017
1 parent 82a4c5e commit d6c5109
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions pkgs/development/interpreters/python/cpython/3.5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ with stdenv.lib;

let
majorVersion = "3.5";
minorVersion = "3";
minorVersion = "4";
minorVersionSuffix = "";
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
Expand All @@ -48,7 +48,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "1c6v1n9nz4mlx9mw1125fxpmbrgniqdbbx9hnqx44maqazb2mzpf";
sha256 = "0k68ai0a204piwibz013ds6ck7hgj9gk4nin2259y41vpgx3pncl";
};

NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
Expand All @@ -64,15 +64,6 @@ in stdenv.mkDerivation {
substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
'';

patches = [
(fetchpatch {
name = "glibc-2.25-enosys.patch";
url = https://github.com/python/cpython/commit/035ba5da3e53e.patch;
sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71";
})
./no-ldconfig.patch

This comment has been minimized.

Copy link
@knedlsepp

knedlsepp Aug 12, 2017

Member

Was the removal of the ./no-ldconfig.patch deliberate? I'm wondering, since it's still sitting there in the directory and 3.6 also still has it?

This comment has been minimized.

Copy link
@FRidh

FRidh Aug 12, 2017

Author Member

Nope, is wasn't. Good catch!
71615c1

];

postPatch = ''
# Determinism
substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
Expand Down

0 comments on commit d6c5109

Please sign in to comment.