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: 730f69ecf248
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 96c277d2f551
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 24, 2019

  1. python38: 3.8.0b3 -> 3.8.0rc1 

    (cherry picked from commit 1b8f8a6)
    @FRidh
    FRidh committed Oct 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    89e9ef1 View commit details

  2. python38: 3.8.0rc1 -> 3.8.0 

    (cherry picked from commit 911b053)
    @FRidh
    FRidh committed Oct 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dadada Tim Schubert
    GPG key ID: EEB8D1CE62C4DFEA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    854222b View commit details

  3. python38: fix build on macOS 

    Python 3.8 fails to build on macOS for two reasons:

* python-3.x-distutils-C++.patch fails to apply cleanly.
* An #include for <util.h> is missing, causing a build failure:

    ./Modules/posixmodule.c:6586:9: error: implicit declaration of function 'openpty' is invalid in C99
        if (openpty(&master_fd, &slave_fd, NULL, NULL, NULL) != 0)
            ^

Use the correct version of python-3.x-distutils-C++.patch, and add a
patch to #include <util.h>.

(cherry picked from commit 81d1594)
    @strager @FRidh
    strager authored and FRidh committed Oct 24, 2019
    Copy the full SHA
    96c277d View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −2 pkgs/development/interpreters/python/cpython/default.nix
  2. +3 −2 pkgs/development/interpreters/python/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ in with passthru; stdenv.mkDerivation {
] ++ optionals isPy35 [
# Backports support for LD_LIBRARY_PATH from 3.6
./3.5/ld_library_path.patch
] ++ optionals isPy37 [
] ++ optionals (isPy37 || isPy38) [
# Fix darwin build https://bugs.python.org/issue34027
(fetchpatch {
url = https://bugs.python.org/file47666/darwin-libutil.patch;
@@ -114,7 +114,7 @@ in with passthru; stdenv.mkDerivation {
(
if isPy35 then
./3.5/python-3.x-distutils-C++.patch
else if isPy37 then
else if isPy37 || isPy38 then
./3.7/python-3.x-distutils-C++.patch
else
fetchpatch {
5 changes: 3 additions & 2 deletions pkgs/development/interpreters/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ with pkgs;
isPy35 = pythonVersion == "3.5";
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@@ -104,9 +105,9 @@ in {
major = "3";
minor = "8";
patch = "0";
suffix = "b3";
suffix = "";
};
sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd";
sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk";
inherit (darwin) CF configd;
inherit passthruFun;
};