public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: fix types for mkDerivation params

Browse Source
This commit is contained in:
Robin Gloster
2019-11-10 02:13:39 +01:00
committed by Jan Tojnar
parent 81ffabdf4f
commit 006242fd5a
18 changed files with 90 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/scapy/default.nix
View File

@@ -34,13 +34,13 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [ pycrypto ecdsa ]
++ lib.optional withOptionalDeps [ tcpdump ipython ]
++ lib.optional withCryptography [ cryptography ]
++ lib.optional withVoipSupport [ sox ]
++ lib.optional withPlottingSupport [ matplotlib ]
++ lib.optional withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ]
++ lib.optional (isPy3k && pythonOlder "3.4") [ enum34 ]
++ lib.optional doCheck [ mock ];
++ lib.optionals withOptionalDeps [ tcpdump ipython ]
++ lib.optional withCryptography cryptography
++ lib.optional withVoipSupport sox
++ lib.optional withPlottingSupport matplotlib
++ lib.optionals withGraphicsSupport [ pyx texlive.combined.scheme-minimal graphviz imagemagick ]
++ lib.optional (isPy3k && pythonOlder "3.4") enum34
++ lib.optional doCheck mock;
# Tests fail with Python 3.6 (seems to be an upstream bug, I'll investigate)
doCheck = if isPy3k then false else true;