Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d15a31f88a26
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e01a1cb58ae8
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 20, 2019

  1. python2: 2.7.16 -> 2.7.17 

    Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
(cherry picked from commit 5b55013)
    @FRidh
    FRidh committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    angerman Moritz Angermann
    GPG key ID: A98C646D142C675F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0391c19 View commit details

Commits on Oct 24, 2019

  1. Merge staging-19.03 into release-19.03

    @FRidh
    FRidh committed Oct 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    angerman Moritz Angermann
    GPG key ID: A98C646D142C675F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e01a1cb View commit details
Showing with 5 additions and 6 deletions.
  1. +3 −4 pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
  2. +2 −2 pkgs/development/interpreters/python/default.nix
7 changes: 3 additions & 4 deletions pkgs/development/interpreters/python/cpython/2.7/python-2.7-distutils-C++.patch
View file
Original file line number Diff line number Diff line change
@@ -93,8 +93,8 @@
_osx_support.customize_compiler(_config_vars)
_config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'

- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
- (cc, cxx, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
- get_config_vars('CC', 'CXX', 'CFLAGS',
- 'CCSHARED', 'LDSHARED', 'SO', 'AR',
- 'ARFLAGS')
+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
@@ -120,8 +120,7 @@
ldshared = ldshared + ' ' + os.environ['LDFLAGS']
+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
if 'CFLAGS' in os.environ:
- cflags = opt + ' ' + os.environ['CFLAGS']
+ cflags = os.environ['CFLAGS']
cflags = cflags + ' ' + os.environ['CFLAGS']
ldshared = ldshared + ' ' + os.environ['CFLAGS']
+ if 'CXXFLAGS' in os.environ:
+ cxxflags = os.environ['CXXFLAGS']
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -50,10 +50,10 @@ in {
sourceVersion = {
major = "2";
minor = "7";
patch = "16";
patch = "17";
suffix = "";
};
sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj";
sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd";
inherit (darwin) CF configd;
inherit passthruFun;
};