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: 33a3c279b324
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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

  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

  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

  4. Merge staging-next into staging

    @FRidh
    FRidh committed Oct 23, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a7d4f48 View commit details
Showing with 3 additions and 4 deletions.
  1. +0 −1 pkgs/development/libraries/openssl/default.nix
  2. +3 −3 pkgs/development/python-modules/twisted/default.nix
1 change: 0 additions & 1 deletion pkgs/development/libraries/openssl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,6 @@ let
configureScript = {
armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
i686-linux = "./Configure linux-x86";
x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc";
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/twisted/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, python
, isPy27
, zope_interface
, incremental
, automat
@@ -18,7 +17,6 @@
buildPythonPackage rec {
pname = "Twisted";
version = "19.7.0";
disabled = isPy27; # ruamel namespace now conflicts in python27

src = fetchPypi {
inherit pname version;
@@ -41,7 +39,9 @@ buildPythonPackage rec {
# http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
# details.
postInstall = "$out/bin/twistd --help > /dev/null";
postFixup = ''
$out/bin/twistd --help > /dev/null
'';

checkPhase = ''
${python.interpreter} -m unittest discover -s twisted/test