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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-05-05 19:51:09 +02:00
parent 320f79365d 73dc3fc400
commit 9875bbae75
372 changed files with 3551 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "autopep8";
version = "1.5.1";
version = "1.5.2";
src = fetchPypi {
inherit pname version;
sha256 = "1swr8ccm3mafcm3zpbwyn22kjs39lbqmg8w41sh7yb3gskgy2syc";
sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm";
};
propagatedBuildInputs = [ pycodestyle ];

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

@@ -7,7 +7,6 @@
, gzip
, bzip2
, gnutar
, p7zip
, cabextract
, lzma
, nose
@@ -29,7 +28,7 @@ buildPythonPackage {
sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc";
};
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ]
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ]
++ stdenv.lib.optional visualizationSupport pyqtgraph;
# setup.py only installs version.py during install, not test

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

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, isPy27, isPy34
, isPy27
, pylev, pastel, typing, enum34 }:
buildPythonPackage rec {
@@ -13,8 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
pylev pastel
] ++ lib.optional (isPy27 || isPy34) typing
++ lib.optional isPy27 enum34;
] ++ lib.optionals isPy27 [ typing enum34 ];
# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see

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

@@ -17,7 +17,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_interface zope_testing ];
# tests fail, see http://hydra.nixos.org/build/4316603/log/raw
# tests fail, see https://hydra.nixos.org/build/4316603/log/raw
doCheck = false;
meta = with stdenv.lib; {

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

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }:
{ lib, buildPythonPackage, fetchPypi, linuxHeaders }:
buildPythonPackage rec {
pname = "evdev";
@@ -17,8 +17,6 @@ buildPythonPackage rec {
doCheck = false;
disabled = isPy34; # see http://bugs.python.org/issue21121
meta = with lib; {
description = "Provides bindings to the generic input event interface in Linux";
homepage = "https://pythonhosted.org/evdev";

8
pkgs/development/python-modules/kombu/default.nix
View File

@@ -5,6 +5,8 @@
, pytest
, pytz
, sqlalchemy
, importlib-metadata
, pythonOlder
}:
buildPythonPackage rec {
@@ -23,7 +25,11 @@ buildPythonPackage rec {
--replace "amqp==2.5.1" "amqp~=2.5"
'';
propagatedBuildInputs = [ amqp ];
propagatedBuildInputs = [
amqp
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
checkInputs = [ pytest case pytz Pyro4 sqlalchemy ];
# test_redis requires fakeredis, which isn't trivial to package

7
pkgs/development/python-modules/langcodes/default.nix
View File

@@ -8,17 +8,16 @@
buildPythonPackage rec {
pname = "langcodes";
version = "1.4.1";
version = "2.0.0";
disabled = pythonOlder "3.3";
src = fetchPypi {
inherit pname version;
sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2";
sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz";
};
propagatedBuildInputs = [ marisa-trie ];
disabled = pythonOlder "3.3";
checkInputs = [ nose ];
checkPhase = ''

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

@@ -7,7 +7,6 @@
, singledispatch
, futures
, isPy27
, isPy33
}:
buildPythonPackage rec {
@@ -23,8 +22,7 @@ buildPythonPackage rec {
buildInputs = [ pkgs.makeWrapper ];
propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
++ stdenv.lib.optionals isPy27 [ singledispatch futures ]
++ stdenv.lib.optionals isPy33 [ singledispatch ];
++ stdenv.lib.optionals isPy27 [ singledispatch futures ];
postInstall = ''
wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin

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

@@ -31,6 +31,7 @@
, xvfbwrapper
, pytestcov
, codecov
, sphinx
# other dependencies
, which
, bash
@@ -49,11 +50,11 @@ in
buildPythonPackage rec {
pname = "nipype";
version = "1.3.1";
version = "1.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71";
sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786";
};
postPatch = ''
@@ -61,6 +62,10 @@ buildPythonPackage rec {
--replace "/usr/bin/env bash" "${bash}/bin/bash"
'';
nativeBuildInputs = [
sphinx
];
propagatedBuildInputs = [
click
dateutil
@@ -102,15 +107,14 @@ buildPythonPackage rec {
doCheck = !stdenv.isDarwin;
# ignore tests which incorrect fail to detect xvfb
checkPhase = ''
LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display'
LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display'
'';
pythonImportsCheck = [ "nipype" ];
meta = with stdenv.lib; {
homepage = "https://nipy.org/nipype/";
description = "Neuroimaging in Python: Pipelines and Interfaces";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman ];
# tests hang, blocking reviews of other packages
broken = isPy38;
};
}

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

@@ -4,7 +4,6 @@
, python
, buildPythonPackage
, isPy27
, isPy33
, isPy3k
, numpy
, llvmlite
@@ -26,7 +25,8 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch;
propagatedBuildInputs = [numpy llvmlite]
++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch];
# Copy test script into $out and run the test suite.
checkPhase = ''

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

@@ -1,5 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, callPackage
, isPy27, isPy34, pythonOlder
, isPy27
, pythonOlder
, cleo
, requests
, cachy
@@ -66,8 +67,7 @@ in buildPythonPackage rec {
pexpect
keyring
lockfile
] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ]
] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
postInstall = ''

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

@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }:
{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }:
buildPythonPackage rec {
pname = "pycairo";
@@ -6,8 +6,6 @@ buildPythonPackage rec {
format = "other";
disabled = isPy33;
src = fetchFromGitHub {
owner = "pygobject";
repo = "pycairo";

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

@@ -8,12 +8,12 @@
}:
buildPythonPackage rec {
version = "1.4.1";
version = "1.4.2";
pname = "pydicom";
src = fetchPypi {
inherit pname version;
sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8";
sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l";
};
propagatedBuildInputs = [ numpy pillow ];

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

@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, httpserver
, libftdi1
, libusb1
}:
@@ -16,14 +15,13 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
httpserver
libftdi1
libusb1
];
postPatch = ''
substituteInPlace pylibftdi/driver.py \
--replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \
--replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \
--replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')"
'';

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

@@ -102,7 +102,7 @@ buildPythonPackage rec {
})
];
# Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
# Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1
# for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
doCheck = !stdenv.isDarwin;

16
pkgs/development/python-modules/python-gitlab/default.nix
View File

@@ -1,22 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }:
{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }:
buildPythonPackage rec {
pname = "python-gitlab";
version = "1.15.0";
pname = "python-gitlab";
version = "2.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e";
sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2";
};
propagatedBuildInputs = [ requests six ];
propagatedBuildInputs = [ requests ];
checkInputs = [ mock httmock ];
disabled = pythonOlder "3.6";
meta = with stdenv.lib; {
description = "Interact with GitLab API";
homepage = "https://github.com/python-gitlab/python-gitlab";
license = licenses.lgpl3;
homepage = "https://github.com/python-gitlab/python-gitlab";
license = licenses.lgpl3;
maintainers = with maintainers; [ nyanloutre ];
};
}

28
pkgs/development/python-modules/python-telegram-bot/default.nix
View File

@@ -2,38 +2,36 @@
, fetchPypi
, buildPythonPackage
, certifi
, decorator
, future
, urllib3
, tornado
, pytest
, isPy3k
}:
buildPythonPackage rec {
pname = "python-telegram-bot";
version = "12.3.0";
version = "12.7";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21";
sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1";
};
prePatch = ''
rm -rf telegram/vendor
substituteInPlace telegram/utils/request.py \
--replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \
--replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \
--replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField"
touch LICENSE.dual
'';
checkInputs = [ pytest ];
propagatedBuildInputs = [ certifi future urllib3 tornado ];
propagatedBuildInputs = [ certifi future urllib3 tornado decorator ];
# --with-upstream-urllib3 is not working properly
postPatch = ''
rm -rf telegram/vendor
'';
setupPyGlobalFlags = "--with-upstream-urllib3";
# tests not included with release
doCheck = false;
pythonImportsCheck = [ "telegram" ];
meta = with stdenv.lib; {
description = "This library provides a pure Python interface for the Telegram Bot API.";

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

@@ -1,6 +1,5 @@
{ stdenv
, buildPythonPackage
, isPy33
, fetchgit
, cython
}:
@@ -8,7 +7,6 @@
buildPythonPackage {
pname = "rencode";
version = "git20150810";
disabled = isPy33;
src = fetchgit {
url = "https://github.com/aresch/rencode";

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

@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, isPy34, isPy35, isPy27
, isPy35, isPy27
, numpy, pytz, six, enum-compat, sentinel
}:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
# This is the list of officially supported versions. Other versions may work
# as well.
disabled = !(isPy35 || isPy34 || isPy27);
disabled = !(isPy27 || isPy35);
# Test Phase is only supported in development sources.
doCheck = false;

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

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
, maya
, requests
}:
@@ -6,6 +6,7 @@
buildPythonPackage rec {
version = "0.2.1";
pname = "secure";
disabled = isPy27;
src = fetchFromGitHub {
owner = "typeerror";

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

@@ -4,7 +4,6 @@
, lib
, python
, isPy27
, isPy33
, enum34
, attrs
, pytz
@@ -19,7 +18,7 @@ buildPythonPackage rec {
sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk";
};
propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ];
propagatedBuildInputs = lib.optionals isPy27 [ enum34 ];
checkInputs = [ attrs pytz ];
checkPhase = ''

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

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy27
, ptable
, click
, requests
@@ -17,6 +18,7 @@
buildPythonPackage rec {
pname = "softlayer-python";
version = "5.8.4";
disabled = isPy27;
propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ];

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

@@ -19,7 +19,7 @@
, opt-einsum
, backports_weakref
, tensorflow-estimator_2
, tensorflow-tensorboard
, tensorflow-tensorboard_2
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
@@ -77,7 +77,7 @@ in buildPythonPackage {
google-pasta
wrapt
tensorflow-estimator_2
tensorflow-tensorboard
tensorflow-tensorboard_2
keras-applications
keras-preprocessing
] ++ lib.optional (!isPy3k) mock
@@ -159,6 +159,14 @@ in buildPythonPackage {
done
'';
# Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
# and the propagated input tensorflow-tensorboard, which causes environment collisions.
# Another possibility would be to have tensorboard only in the buildInputs
# See https://github.com/NixOS/nixpkgs/pull/44381 for more information.
postInstall = ''
rm $out/bin/tensorboard
'';
pythonImportsCheck = [
"tensorflow"
"tensorflow.keras"

1
pkgs/development/python-modules/toggl-cli/default.nix
View File

@@ -19,6 +19,7 @@ buildPythonPackage rec {
substituteInPlace requirements.txt \
--replace "pendulum==2.0.4" "pendulum>=2.0.4" \
--replace "click-completion==0.5.0" "click-completion>=0.5.0" \
--replace "click==7.0" "click>=7.0" \
--replace "pbr==5.1.2" "pbr>=5.1.2" \
--replace "inquirer==2.5.1" "inquirer>=2.5.1"
'';

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

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34
{ lib, buildPythonPackage, fetchPypi, isPy27
, enum34, functools32, typing
}:
@@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs =
lib.optionals isPy27 [ enum34 functools32 ]
++ lib.optional (isPy27 || isPy34) typing;
++ lib.optional isPy27 typing;
# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see

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

@@ -4,7 +4,6 @@
, python
, pytest
, numpy
, isPy33
}:
buildPythonPackage rec {
@@ -28,7 +27,7 @@ buildPythonPackage rec {
# https://github.com/enthought/traits/issues/187
# https://github.com/enthought/traits/pull/188
# Furthermore, some tests fail due to being in a chroot
doCheck = isPy33;
doCheck = false;
meta = with stdenv.lib; {
description = "Explicitly typed attributes for Python";

27
pkgs/development/python-modules/wordfreq/default.nix
View File

@@ -11,34 +11,33 @@
, fetchFromGitHub
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "wordfreq";
version = "2.2.0";
version = "2.3.2";
disabled = pythonOlder "3";
src = fetchFromGitHub {
owner = "LuminosoInsight";
repo = "wordfreq";
# upstream don't tag by version
rev = "bc12599010c8181a725ec97d0b3990758a48da36";
sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m";
rev = "v${version}";
sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas";
};
propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];
# patch to relax version requirements for regex
# dependency to prevent break in upgrade
postPatch = ''
substituteInPlace setup.py --replace "regex ==" "regex >="
'';
checkInputs = [ pytest ];
checkPhase = ''
# These languages require additional dictionaries
pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related'
'';
propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ];
# patch to relax version requirements for regex
# dependency to prevent break in upgrade
postPatch = ''
substituteInPlace setup.py --replace "regex ==" "regex >="
'';
disabled = pythonOlder "3";
meta = with lib; {
description = "A library for looking up the frequencies of words in many languages, based on many sources of data";