From e70c0170df4c8822825ed09feb53dacf22f0d14c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 11:26:47 +0200 Subject: [PATCH 1/3] 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, 90be4c2c7875c9487508d95b5c638d97e2903ada. 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. --- pkgs/development/python-modules/twisted/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 1c91dfc2b48..3b2c393b35b 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -41,7 +41,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 From 767c0b74feb6a2f26ec302405eaf5b044cccaa6e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 12:49:45 +0200 Subject: [PATCH 2/3] Revert "pythonPackages.twisted: disable python2" Builds fine now. This reverts commit a1a8c96d8f0d05cb6824a34e2b42c254a825c930. --- pkgs/development/python-modules/twisted/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 3b2c393b35b..a87cacdc29e 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -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; From af491cbb7d691b487bb9058338329913eac7d331 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 23 Oct 2019 15:54:07 +0200 Subject: [PATCH 3/3] openssl: use old method for configuring on i686, fixes #71786 unbreaks pkgsi686Linux.openssl_1_0_2 --- pkgs/development/libraries/openssl/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7a1ef557469..3ff156b9d2b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -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";