diff options
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch | 6 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/default.nix | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch index ceb6047d31dd..243313f76548 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch +++ b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch @@ -83,8 +83,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ +- get_config_vars('CC', 'CXX', 'CFLAGS', - 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') + (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ + get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', @@ -108,7 +108,7 @@ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] +- cflags = cflags + ' ' + os.environ['CFLAGS'] + cflags = os.environ['CFLAGS'] ldshared = ldshared + ' ' + os.environ['CFLAGS'] + if 'CXXFLAGS' in os.environ: diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7f21d03fc3a5..42fcae5e179c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -77,10 +77,10 @@ in { sourceVersion = { major = "3"; minor = "6"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m"; + sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy"; inherit (darwin) CF configd; inherit passthruFun; }; @@ -90,10 +90,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "3"; + patch = "4"; suffix = ""; }; - sha256 = "066ka8csjwkycqpgyv424d8hhqhfd7r6svsp4sfcvkylci0baq6s"; + sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv"; inherit (darwin) CF configd; inherit passthruFun; }; |