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

Merge branch 'staging' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-31 03:59:58 +01:00
parent d6136b744a c5406e30b0
commit 0c2adc0fb1
352 changed files with 639 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/buildbot/default.nix
View File

@@ -44,10 +44,9 @@ let
autobahn
pyjwt
pyyaml
]
# tls
twisted.extras.tls
];
++ twisted.extras.tls;
checkInputs = [
treq

3
pkgs/development/python-modules/cffi/default.nix
View File

@@ -29,7 +29,8 @@ if isPyPy then null else buildPythonPackage rec {
'';
# The tests use -Werror but with python3.6 clang detects some unreachable code.
NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
"-Wno-unused-command-line-argument -Wno-unreachable-code";
doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
checkPhase = ''

2
pkgs/development/python-modules/msrestazure/default.nix
View File

@@ -27,7 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ adal msrest ];
checkInputs = [ httpretty mock pytest ]
++ lib.optional isPy3k [ pytest-asyncio ];
++ lib.optionals isPy3k [ pytest-asyncio ];
checkPhase = ''
pytest tests/

2
pkgs/development/python-modules/pivy/default.nix
View File

@@ -21,7 +21,7 @@ buildPythonPackage rec {
libXi libXext libSM libICE libX11
];
NIX_CFLAGS_COMPILE = [
NIX_CFLAGS_COMPILE = toString [
"-I${pkgs.qt5.qtbase.dev}/include/QtCore"
"-I${pkgs.qt5.qtbase.dev}/include/QtGui"
"-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL"

5
pkgs/development/python-modules/protobuf/default.nix
View File

@@ -9,10 +9,11 @@ buildPythonPackage {
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
NIX_CFLAGS_COMPILE =
NIX_CFLAGS_COMPILE = toString (
# work around python distutils compiling C++ with $CC
optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
);
propagatedBuildInputs = [ google_apputils ];
propagatedNativeBuildInputs = [ protobuf ]; # For protoc.

2
pkgs/development/python-modules/python-uinput/default.nix
View File

@@ -12,7 +12,7 @@ buildPythonPackage rec {
buildInputs = [ udev ];
NIX_CFLAGS_LINK = [ "-ludev" ];
NIX_CFLAGS_LINK = "-ludev";
meta = with stdenv.lib; {
description = "Pythonic API to Linux uinput kernel module";

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;

2
pkgs/development/python-modules/tensorflow/default.nix
View File

@@ -266,7 +266,7 @@ let
'';
# FIXME: Tensorflow uses dlopen() for CUDA libraries.
NIX_LDFLAGS = lib.optionals cudaSupport [ "-lcudart" "-lcublas" "-lcufft" "-lcurand" "-lcusolver" "-lcusparse" "-lcudnn" ];
NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn";
hardeningDisable = [ "format" ];

4
pkgs/development/python-modules/treq/default.nix
View File

@@ -17,9 +17,9 @@ buildPythonPackage rec {
incremental
service-identity
twisted
]
# twisted [tls] requirements (we should find a way to list "extras")
twisted.extras.tls
];
++ twisted.extras.tls;
checkInputs = [
pep8