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"; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 1c91dfc2b48..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; @@ -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