public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python2: 2.7.16 -> 2.7.17

Browse Source 
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
This commit is contained in:
Frederik Rietdijk 2019-10-20 11:14:16 +02:00 committed by Frederik Rietdijk
parent 56727dc1ff
commit 5b55013aa2
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -79,12 +79,6 @@ let
sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57"; sha256 = "0l9rw6r5r90iybdkp3hhl2pf0h0s1izc68h5d3ywrm92pq32wz57";
}) })
(fetchpatch {
url = "https://github.com/python/cpython/commit/979daae300916adb399ab5b51410b6ebd0888f13.patch";
name = "CVE-2018-20852.patch";
sha256 = "0p838ycssd6abxzby69rhngjqqm59cmlp07910mpjx7lmsz049pb";
})
# Fix race-condition during pyc creation. Has a slight backwards # Fix race-condition during pyc creation. Has a slight backwards
# incompatible effect: pyc symlinks will now be overridden # incompatible effect: pyc symlinks will now be overridden
# (https://bugs.python.org/issue17222). Included in python >= 3.4, # (https://bugs.python.org/issue17222). Included in python >= 3.4,

7
pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
View File

@ -93,8 +93,8 @@
_osx_support.customize_compiler(_config_vars) _osx_support.customize_compiler(_config_vars)
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ - (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', - get_config_vars('CC', 'CXX', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR', - 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS') - 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ + (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
@ -120,8 +120,7 @@
ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ: if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS'] cflags = cflags + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ: + if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS'] + cxxflags = os.environ['CXXFLAGS']

4
pkgs/development/interpreters/python/default.nix
View File

@ -52,10 +52,10 @@ in {
sourceVersion = { sourceVersion = {
major = "2"; major = "2";
minor = "7"; minor = "7";
patch = "16"; patch = "17";
suffix = ""; suffix = "";
}; };
sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj"; sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd";
inherit (darwin) CF configd; inherit (darwin) CF configd;
inherit passthruFun; inherit passthruFun;
}; };