Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 27a5ddcf747f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 96c277d2f551
Choose a head ref
  • 8 commits
  • 5 files changed
  • 3 contributors

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
    Copy the full SHA
    05dfc50 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge release-19.09 in staging-19.09

    @FRidh
    FRidh committed Oct 21, 2019
    Copy the full SHA
    b8d9a04 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. systemd: additional logind fixes 

    See: NixOS/systemd#33
(cherry picked from commit 0c05c0a97db5aea117edc96664a30596239d8725)
    @worldofpeace
    worldofpeace committed Oct 22, 2019
    Copy the full SHA
    65ab17d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #71616 from worldofpeace/systemd-logind-fixes-19.09 

    [19.09] systemd: additional logind fixes
    @worldofpeace
    worldofpeace committed Oct 22, 2019
    Copy the full SHA
    b81dc1d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Merge staging-19.09 into release-19.09

    @FRidh
    FRidh committed Oct 24, 2019
    Copy the full SHA
    730f69e View commit details
    Browse the repository at this point in the history

  2. python38: 3.8.0b3 -> 3.8.0rc1 

    (cherry picked from commit 1b8f8a6)
    @FRidh
    FRidh committed Oct 24, 2019
    Copy the full SHA
    89e9ef1 View commit details
    Browse the repository at this point in the history

  3. python38: 3.8.0rc1 -> 3.8.0 

    (cherry picked from commit 911b053)
    @FRidh
    FRidh committed Oct 24, 2019
    Copy the full SHA
    854222b View commit details
    Browse the repository at this point in the history

  4. 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
    Browse the repository at this point in the history