dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #35904 from NixOS/python-unstable

Browse Source 
Python fixes
This commit is contained in:
Robert Schütz 2018-02-28 08:37:28 +01:00 committed by GitHub
commit ad17db3562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 143 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "aiohttp";
version = "3.0.4";
version = "3.0.5";
src = fetchPypi {
inherit pname version;
sha256 = "6569b8850103595be10fcfa1fa911b01f876651921f52d769017b21d822e5dc3";
sha256 = "bb873da531401416acb7045a8f0bdf6555e9c6866989cd977166fae3cbbb954b";
};
disabled = pythonOlder "3.4";

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

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "asynctest";
version = "0.11.1";
version = "0.12.0";
disabled = pythonOlder "3.4";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "Martiusweb";
repo = pname;
rev = "v${version}";
sha256 = "1vvh5vbq2fbz6426figs85z8779r7svb4dp2v3xynhhv05nh2y6v";
sha256 = "0rcb3kz2m0iwvgxpx2avfz9cqsd9xbaq93zykr2fki3ikmnp3vyg";
};
postPatch = ''

31
pkgs/development/python-modules/blinkstick/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib, buildPythonPackage, fetchPypi, fetchpatch, pyusb }:
buildPythonPackage rec {
pname = "BlinkStick";
version = "1.1.8";
src = fetchPypi {
inherit pname version;
sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
};
patches = [
(fetchpatch {
url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch;
sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f";
})
(fetchpatch {
url = https://github.com/arvydas/blinkstick-python/pull/54.patch;
sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl";
})
];
propagatedBuildInputs = [ pyusb ];
meta = with lib; {
description = "Python package to control BlinkStick USB devices";
homepage = https://pypi.python.org/pypi/BlinkStick/;
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
}

10
pkgs/development/python-modules/netdisco/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, requests, zeroconf, netifaces, pytest }:
buildPythonPackage rec {
pname = "netdisco";
@ -14,6 +14,12 @@ buildPythonPackage rec {
sha256 = "170s9py8rw07cfgwvv7mf69g8jjg32m2rgw8x3kbvjqlmrdijxmm";
};
# Allow newer zeroconf versions
patches = fetchpatch {
url = "${meta.homepage}/commit/78f83046a2a0d77527274c8be9c3fd75737c19d0.patch";
sha256 = "098zkwqg9181vavw97yhi9rsdsf023gnapg4gkr1n0awz3f3l9nm";
};
propagatedBuildInputs = [ requests zeroconf netifaces ];
checkInputs = [ pytest ];
@ -24,7 +30,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Python library to scan local network for services and devices";
homepage = https://github.com/home-assistant/netdisco/;
homepage = https://github.com/home-assistant/netdisco;
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ dotlambda ];

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

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytest-xdist";
version = "1.22.1";
version = "1.22.2";
src = fetchPypi {
inherit pname version;
sha256 = "fcd6f36bab93b0b24ec45ca12f798b9b3af71da826db0b0794b358d2f5c038de";
sha256 = "e8f5744acc270b3e7d915bdb4d5f471670f049b6fbd163d4cbd52203b075d30f";
};
nativeBuildInputs = [ setuptools_scm ];

23
pkgs/development/python-modules/python-daemon/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, mock, testscenarios, docutils, lockfile }:
buildPythonPackage rec {
pname = "python-daemon";
version = "2.1.2";
src = fetchPypi {
inherit pname version;
sha256 = "261c859be5c12ae7d4286dc6951e87e9e1a70a882a8b41fd926efc1ec4214f73";
};
# A test fail within chroot builds.
doCheck = false;
buildInputs = [ mock testscenarios ];
propagatedBuildInputs = [ docutils lockfile ];
meta = with lib; {
description = "Library to implement a well-behaved Unix daemon process";
homepage = https://alioth.debian.org/projects/python-daemon/;
license = [ licenses.gpl3Plus licenses.asl20 ];
};
}

20
pkgs/development/python-modules/tmdb3/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "tmdb3";
version = "0.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "9b6e043b8a65d159e7fc8f720badc7ffee5109296e38676c107454e03a895983";
};
# no tests implemented
doCheck = false;
meta = with lib; {
description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
homepage = https://pypi.python.org/pypi/tmdb3;
license = licenses.bsd3;
};
}

27
pkgs/development/python-modules/tunigo/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ lib, buildPythonPackage, fetchFromGitHub, requests, mock, responses, pytest }:
buildPythonPackage rec {
pname = "tunigo";
version = "1.0.0";
propagatedBuildInputs = [ requests ];
src = fetchFromGitHub {
owner = "trygveaa";
repo = "python-tunigo";
rev = "v${version}";
sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
};
checkInputs = [ mock responses pytest ];
checkPhase = ''
py.test
'';
meta = with lib; {
description = "Python API for the browse feature of Spotify";
homepage = https://github.com/trygveaa/python-tunigo;
license = licenses.asl20;
};
}

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

@ -3,7 +3,6 @@
, GeoIP}:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "txtorcon";
version = "0.20.0";
@ -19,13 +18,6 @@ buildPythonPackage rec {
sha256 = "dc80cb76b3ddacef6d671c0a088cb1a45274c0858554c32ce55d0f41421c740e";
};
# ipaddress isn't required for Python 3 although it's in requirements.txt.
# Because ipaddress doesn't install on Python 3, remove the requirement so the
# installation of this package doesn't fail on Python 3.
postPatch = "" + lib.optionalString isPy3k ''
substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" ""
'';
# Skip a failing test until fixed upstream:
# https://github.com/meejah/txtorcon/issues/250
checkPhase = ''

23
pkgs/development/python-modules/virtual-display/default.nix Normal file
View File

@ -0,0 +1,23 @@
{ lib, buildPythonPackage, fetchPypi, EasyProcess }:
buildPythonPackage rec {
pname = "PyVirtualDisplay";
version = "0.2.1";
propagatedBuildInputs = [ EasyProcess ];
src = fetchPypi {
inherit pname version;
sha256 = "012883851a992f9c53f0dc6a512765a95cf241bdb734af79e6bdfef95c6e9982";
};
# requires X server
doCheck = false;
meta = with lib; {
description = "Python wrapper for Xvfb, Xephyr and Xvnc";
homepage = "https://github.com/ponty/pyvirtualdisplay";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ layus ];
};
}

114
pkgs/top-level/python-packages.nix
View File

@ -15841,27 +15841,7 @@ in {
};
in if isPy3k then py3 else py2;
pythondaemon = buildPythonPackage rec {
name = "python-daemon-${version}";
version = "2.1.1";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-daemon/${name}.tar.gz";
sha256 = "17v80qb98p1gv4j9mq6wb55cv7hc4j1hzw5y2f4s5hrpxs3w3a2q";
};
# A test fail within chroot builds.
doCheck = false;
buildInputs = with self; [ mock testscenarios ];
propagatedBuildInputs = with self; [ docutils lockfile ];
meta = {
description = "Library to implement a well-behaved Unix daemon process";
homepage = https://alioth.debian.org/projects/python-daemon/;
license = [ licenses.gpl3Plus licenses.asl20 ];
};
};
pythondaemon = callPackage ../development/python-modules/python-daemon { };
sympy = callPackage ../development/python-modules/sympy { };
@ -16915,21 +16895,7 @@ in {
};
};
tmdb3 = buildPythonPackage rec {
name = "tmdb3-${version}";
version = "0.6.17";
src = pkgs.fetchurl {
url = "mirror://pypi/t/tmdb3/${name}.zip";
sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972";
};
meta = {
description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information";
homepage = https://pypi.python.org/pypi/tmdb3;
license = licenses.bsd3;
};
};
tmdb3 = callPackage ../development/python-modules/tmdb3 { };
toolz = callPackage ../development/python-modules/toolz { };
@ -17458,23 +17424,7 @@ in {
virtkey = callPackage ../development/python-modules/virtkey { };
virtual-display = buildPythonPackage rec {
name = "PyVirtualDisplay-0.1.5";
propagatedBuildInputs = with self; [ EasyProcess ];
src = pkgs.fetchurl {
url = "mirror://pypi/P/PyVirtualDisplay/${name}.tar.gz";
sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53";
};
meta = {
description = "Python wrapper for Xvfb, Xephyr and Xvnc";
homepage = "https://github.com/ponty/pyvirtualdisplay";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ layus ];
};
};
virtual-display = callPackage ../development/python-modules/virtual-display { };
virtualenv = callPackage ../development/python-modules/virtualenv { };
@ -18315,26 +18265,7 @@ EOF
propagatedBuildInputs = with self; [ requests webob ];
};
tunigo = buildPythonPackage rec {
name = "tunigo-${version}";
version = "1.0.0";
propagatedBuildInputs = with self; [ requests ];
src = pkgs.fetchFromGitHub {
owner = "trygveaa";
repo = "python-tunigo";
rev = "v${version}";
sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs";
};
buildInputs = with self; [ mock nose ];
meta = {
description = "Python API for the browse feature of Spotify";
homepage = https://github.com/trygveaa/python-tunigo;
license = licenses.asl20;
};
};
tunigo = callPackage ../development/python-modules/tunigo { };
screenkey = buildPythonPackage rec {
version = "0.2-b3634a2c6eb6d6936c3b2c1ef5078bf3a84c40c6";
@ -18738,30 +18669,7 @@ EOF
pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };
BlinkStick = buildPythonPackage rec {
name = "BlinkStick-${version}";
version = "1.1.8";
src = pkgs.fetchurl {
url = "mirror://pypi/B/BlinkStick/${name}.tar.gz";
sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
};
# Requires pyusb 1.0.0b1.
# Likely current pyusb will work but we need to patch the hard requirement then.
broken = true;
patchPhase = "substituteInPlace setup.py --replace pyusb==1.0.0b1 pyusb==1.0.0";
propagatedBuildInputs = with self; [ pyusb ];
meta = {
description = "Python package to control BlinkStick USB devices";
homepage = https://pypi.python.org/pypi/BlinkStick/;
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
};
BlinkStick = callPackage ../development/python-modules/blinkstick { };
usbtmc = callPackage ../development/python-modules/usbtmc {};
@ -21255,18 +21163,6 @@ EOF
whitenoise = callPackage ../development/python-modules/whitenoise { };
wp_export_parser = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "wp_export_parser";
version = "1.0";
src = pkgs.fetchFromGitHub {
owner = "RealGeeks";
repo = "wp_export_parser";
rev = "479211f6c5a7d034fd77762dfed381c3315cd773";
sha256 = "1ad0mkixc0s86djwsvhp1qlvcfs25086nh0qw7bys49gz8shczzi";
};
};
XlsxWriter = callPackage ../development/python-modules/XlsxWriter { };
yowsup = callPackage ../development/python-modules/yowsup { };