ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-04 01:42:53 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-10-23 15:56:58 +02:00
commit a7d4f484ba
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/openssl/default.nix
View File

@ -46,7 +46,6 @@ let
configureScript = { configureScript = {
armv6l-linux = "./Configure linux-armv4 -march=armv6"; armv6l-linux = "./Configure linux-armv4 -march=armv6";
armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
i686-linux = "./Configure linux-x86";
x86_64-darwin = "./Configure darwin64-x86_64-cc"; x86_64-darwin = "./Configure darwin64-x86_64-cc";
x86_64-linux = "./Configure linux-x86_64"; x86_64-linux = "./Configure linux-x86_64";
x86_64-solaris = "./Configure solaris64-x86_64-gcc"; x86_64-solaris = "./Configure solaris64-x86_64-gcc";

6
pkgs/development/python-modules/twisted/default.nix
View File

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, python , python
, isPy27
, zope_interface , zope_interface
, incremental , incremental
, automat , automat
@ -18,7 +17,6 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Twisted"; pname = "Twisted";
version = "19.7.0"; version = "19.7.0";
disabled = isPy27; # ruamel namespace now conflicts in python27
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
@ -41,7 +39,9 @@ buildPythonPackage rec {
# http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
# and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
# details. # details.
postInstall = "$out/bin/twistd --help > /dev/null"; postFixup = ''
$out/bin/twistd --help > /dev/null
'';
checkPhase = '' checkPhase = ''
${python.interpreter} -m unittest discover -s twisted/test ${python.interpreter} -m unittest discover -s twisted/test