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
base: 33a3c279b324
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a7d4f484ba91
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. python.pkgs.twisted: move twisted cache generation to postFixup 

    The Python 2 build of twisted would fail when generating the cache. This
failure started occuring since the change was introduced that builds
setuptools as a wheel instead of as an egg,
90be4c2.

Turns out moving this step to postFixup solves the issue. I suppose it
is related to the order of site packages being evaluated, where
PYTHONPATH introduced additional ones.
    @FRidh
    FRidh committed Oct 23, 2019
    Copy the full SHA
    e70c017 View commit details
    Browse the repository at this point in the history

  2. Revert "pythonPackages.twisted: disable python2" 

    Builds fine now.

This reverts commit a1a8c96.
    @FRidh
    FRidh committed Oct 23, 2019
    Copy the full SHA
    767c0b7 View commit details
    Browse the repository at this point in the history

  3. openssl: use old method for configuring on i686, fixes #71786 

    unbreaks pkgsi686Linux.openssl_1_0_2
    @FRidh
    FRidh committed Oct 23, 2019
    Copy the full SHA
    af491cb View commit details
    Browse the repository at this point in the history

  4. Merge staging-next into staging

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