Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-11-05 14:18:08 +01:00
252 changed files with 5991 additions and 1658 deletions

View File

@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, zlib
, lzma
}:
buildPythonPackage rec {
pname = "deeptoolsintervals";
version = "0.1.9";
src = fetchPypi {
inherit pname version;
sha256 = "1xnl80nblysj6dylj4683wgrfa425rkx4dp5k65hvwdns9pw753x";
};
buildInputs = [ zlib lzma ];
checkInputs = [ pytest ];
meta = with lib; {
homepage = "https://deeptools.readthedocs.io/en/develop";
description = "Helper library for deeptools";
license = licenses.mit;
maintainers = with maintainers; [ scalavision ];
};
}

View File

@@ -0,0 +1,56 @@
{ stdenv
, lib
, buildPythonPackage
, pythonAtLeast
, fetchFromGitHub
, net_snmp
, openssl
, pytest
, pytestcov
, pytest-flake8
, pytest-sugar
, termcolor
}:
buildPythonPackage rec {
pname = "easysnmp";
version = "0.2.5";
# See https://github.com/kamakazikamikaze/easysnmp/issues/108
disabled = pythonAtLeast "3.7";
src = fetchFromGitHub {
owner = "kamakazikamikaze";
repo = pname;
rev = version;
sha256 = "1si9iyxqj6z22jzn6m93lwpinsqn20lix2py3jm3g3fmwawkd735";
};
checkInputs = [
pytest
pytestcov
pytest-flake8
pytest-sugar
termcolor
];
buildInputs = [
net_snmp
openssl
];
buildPhase = ''
python setup.py build bdist_wheel --basedir=${net_snmp}/bin
'';
# Unable to get tests to pass, even running by hand. The pytest tests have
# become stale.
doCheck = false;
meta = with lib; {
description = "A blazingly fast and Pythonic SNMP library based on the official Net-SNMP bindings";
homepage = https://easysnmp.readthedocs.io/en/latest/;
license = licenses.bsd3;
maintainers = with maintainers; [ WhittlesJr ];
};
}

View File

@@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytoml
, pytest
}:
buildPythonPackage rec {
pname = "intreehooks";
version = "1.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "87e600d3b16b97ed219c078681260639e77ef5a17c0e0dbdd5a302f99b4e34e1";
};
propagatedBuildInputs = [ pytoml ];
checkInputs = [ pytest ];
meta = {
description = "Load a PEP 517 backend from inside the source tree";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.fridh ];
homepage = https://github.com/takluyver/intreehooks;
};
}

View File

@@ -1,19 +1,19 @@
{ stdenv, fetchurl, buildPythonPackage, pycurl, six, rpm, dateutil }:
{ stdenv, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }:
buildPythonPackage rec {
pname = "koji";
version = "1.13.0";
version = "1.14.3";
format = "other";
src = fetchurl {
url = "https://releases.pagure.org/koji/${pname}-${version}.tar.bz2";
sha256 = "18b18rcbdqqw33g7h20hf5bpbci2ixdi05yda1fvpv30c1kkzd8w";
sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40";
};
propagatedBuildInputs = [ pycurl six rpm dateutil ];
# Judging from SyntaxError
#disabled = isPy3k;
disabled = isPy3k;
makeFlags = "DESTDIR=$(out)";
@@ -24,7 +24,9 @@ buildPythonPackage rec {
'';
meta = {
maintainers = [ ];
description = "An RPM-based build system";
homepage = https://pagure.io/koji;
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@@ -4,13 +4,13 @@
buildPythonPackage rec {
pname = "license-expression";
version = "0.999";
version = "1.0";
src = fetchFromGitHub {
owner = "nexB";
repo = "license-expression";
rev = "v${version}";
sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
sha256 = "15dk3j5sr8iypzqqa8wa12b2a84f6ssbfvam1c1vzz00y2y5v3ic";
};
postPatch = "patchShebangs ./configure";

View File

@@ -0,0 +1,42 @@
{ lib
, buildPythonPackage
, fetchPypi
, meson
, ninja
, intreehooks
, pytoml
, pythonOlder
}:
# TODO: offer meson as a Python package so we have dist-info folder.
buildPythonPackage rec {
pname = "mesonpep517";
version = "0.1.9999994";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "b5bcca61024164c4a51d29e6921ea1f756d54197c8f052e4c66a2b8399aa9349";
};
nativeBuildInputs = [ intreehooks ];
propagatedBuildInputs = [ pytoml ];
# postPatch = ''
# # Meson tries to detect ninja as well, so we should patch meson as well.
# substituteInPlace mesonpep517/buildapi.py \
# --replace "'meson'" "'${meson}/bin/meson'" \
# --replace "'ninja'" "'${ninja}/bin/ninja'"
# '';
propagatedNativeBuildInputs = [ meson ninja ];
meta = {
description = "Create pep517 compliant packages from the meson build system";
homepage = https://gitlab.com/thiblahute/mesonpep517;
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.fridh ];
};
}

View File

@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, numpy
, moderngl
, pyglet
, pillow
, pyrr
, pytest
}:
buildPythonPackage rec {
pname = "moderngl_window";
version = "1.2.0";
src = fetchFromGitHub {
owner = "moderngl";
repo = pname;
rev = version;
sha256 = "054w77lyc2nc0dyx76zsrbq2b3xbywdijhb62b2qqm99ldr1k1x5";
};
propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ];
disabled = !isPy3k;
# Tests need a display to run.
doCheck = false;
meta = with lib; {
homepage = "https://github.com/moderngl/moderngl_window";
description = "Cross platform helper library for ModernGL making window creation and resource loading simple";
license = licenses.mit;
platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks.
maintainers = with maintainers; [ c0deaddict ];
};
}

View File

@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "nix-prefetch-github";
version = "2.3.1";
version = "2.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "1jkvmj33xinff0sb47yg33n131yi93pyq86skqc78xd38j6c8q9s";
sha256 = "18xj618zjs13ib7f996fnl0xiqig0w48yns45nvy3xab55wximdx";
};
propagatedBuildInputs = [

View File

@@ -1,22 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytest, setuptools, structlog, pytest-asyncio, flaky, tornado, pycurl, pytest-httpbin }:
buildPythonPackage rec {
pname = "nvchecker";
version = "1.4.4";
version = "1.5";
src = fetchPypi {
inherit pname version;
sha256 = "6276ed2a897a30ccd71bfd7cf9e6b7842f37f3d5a86d7a70fe46f437c62b1875";
sha256 = "0973f7c3ea5ad65fb19837e8915882a9f2c2f21f5c2589005478697391fea2fd";
};
propagatedBuildInputs = [ setuptools structlog tornado pycurl ];
checkInputs = [ pytest pytest-asyncio flaky ];
# requires network access
doCheck = false;
checkInputs = [ pytest pytest-asyncio flaky pytest-httpbin ];
# disable `test_ubuntupkg` because it requires network
checkPhase = ''
py.test
py.test -m "not needs_net" --ignore=tests/test_ubuntupkg.py
'';
disabled = pythonOlder "3.5";

View File

@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "pg8000";
version = "1.13.2";
version = "1.12.5";
src = fetchPypi {
inherit pname version;
sha256 = "eebcb4176a7e407987e525a07454882f611985e0becb2b73f76efb93bbdc0aab";
sha256 = "1yc3knh28cx3rjb2ifg5kmqqa78yyyw2gzzslbm9fj0mzh5aq1sx";
};
propagatedBuildInputs = [ pytz six ];

View File

@@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, paste
, webob
, pyopenssl
}:
buildPythonPackage rec {
pname = "poster3";
version = "0.8.1";
format = "wheel"; # only redistributable available
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
format = "wheel";
python = "py3";
sha256 = "1b27d7d63e3191e5d7238631fc828e4493590e94dcea034e386c079d853cce14";
};
checkInputs = [
paste
webob
pyopenssl
];
meta = with lib; {
description = "Streaming HTTP uploads and multipart/form-data encoding";
homepage = https://atlee.ca/software/poster/;
license = licenses.mit;
maintainers = with maintainers; [ WhittlesJr ];
};
}

View File

@@ -14,12 +14,12 @@
buildPythonApplication rec {
pname = "pre-commit";
version = "1.18.3";
version = "1.20.0";
src = fetchPypi {
inherit version;
pname = "pre_commit";
sha256 = "0gqzx5n5kps7z45rgydciz0sq1m09b4g49vclhvybi57pn3hag0x";
sha256 = "0vmv3hrivm0sm81cn59n2pmw8h323sg4sgncl910djby2a3jc5cz";
};
propagatedBuildInputs = [

View File

@@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
}:
buildPythonPackage rec {
pname = "py2bit";
version = "0.3.0";
checkInput = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "1vw2nvw1yrl7ikkqsqs1pg239yr5nspvd969r1x9arms1k25a1a5";
};
meta = with lib; {
homepage = "https://github.com/deeptools/py2bit";
description = "File access to 2bit files";
longDescription = ''
A python extension, written in C, for quick access to 2bit files. The extension uses lib2bit for file access.
'';
license = licenses.mit;
maintainers = with maintainers; [ scalavision ];
};
}

View File

@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
}:
buildPythonPackage rec {
@@ -12,6 +13,8 @@ buildPythonPackage rec {
sha256 = "2c76740e5adbf8b14d8f41d4f84ce23c0e8e738b18b926dc60858c35bf2fa8f2";
};
propagatedBuildInputs = [ requests ];
# Upstream provides no unit tests.
doCheck = false;

View File

@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, numpy
, zlib
}:
buildPythonPackage rec {
pname = "pyBigWig";
version = "0.3.17";
src = fetchPypi {
inherit pname version;
sha256 = "157x6v48y299zm382krf1dw08fdxg95im8lnabhp5vc94s04zxj1";
};
buildInputs = [ zlib ];
checkInputs = [ numpy pytest ];
meta = with lib; {
homepage = "https://github.com/deeptools/pyBigWig";
description = "File access to bigBed files, and read and write access to bigWig files";
longDescription = ''
A python extension, written in C, for quick access to bigBed files
and access to and creation of bigWig files. This extension uses
libBigWig for local and remote file access.
'';
license = licenses.mit;
maintainers = with maintainers; [ scalavision ];
};
}

View File

@@ -8,6 +8,8 @@
, glibc
, gtk2-x11
, gdk-pixbuf
, fontconfig
, freetype
}:
buildPythonPackage rec {
@@ -43,6 +45,12 @@ buildPythonPackage rec {
path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}'
elif name == 'gdk_pixbuf-2.0':
path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
elif name == 'Xext':
path = '${xorg.libXext}/lib/libXext${ext}'
elif name == 'fontconfig':
path = '${fontconfig.lib}/lib/libfontconfig${ext}'
elif name == 'freetype':
path = '${freetype}/lib/libfreetype${ext}'
if path is not None:
return ctypes.cdll.LoadLibrary(path)
raise Exception("Could not load library {}".format(names))

View File

@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
pname = "pykde4";
src = fetchurl {
url = "mirror://kde/stable/${version}/src/${pname}-${version}-${version}.tar.xz";
url = "mirror://kde/stable/${version}/src/${pname}-${version}.tar.xz";
sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
};

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest }:
{ stdenv, buildPythonPackage, fetchPypi, contextlib2, pytest, mock }:
buildPythonPackage rec {
@@ -10,11 +10,19 @@ buildPythonPackage rec {
sha256 = "c9dc8f4624e287c7d1435f8fd758f6a0aabbb7eff442db9192cd46f0e2b6d959";
};
checkInputs = [ pytest ];
preConfigure = ''
substituteInPlace requirements.txt --replace '==' '>='
'';
propagatedBuildInputs = [ contextlib2 ];
checkInputs = [ pytest mock ];
checkPhase = "pytest ./test_schema.py";
meta = with stdenv.lib; {
description = "Library for validating Python data structures";
homepage = https://github.com/keleshev/schema;
license = licenses.mit;
maintainers = [ maintainers.tobim ];
};
}

View File

@@ -12,13 +12,13 @@
buildPythonPackage rec {
pname = "scikit-learn";
version = "0.21.2";
version = "0.21.3";
# UnboundLocalError: local variable 'message' referenced before assignment
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534
src = fetchPypi {
inherit pname version;
sha256 = "1nvj9j16y1hz9gm0qwzpnx2zmz55c63k1fai643migsyll9c7bqa";
sha256 = "eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003";
};
buildInputs = [

View File

@@ -1,21 +1,22 @@
{ lib, buildPythonPackage, fetchFromGitHub
{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
, click, ecdsa, fido2, intelhex, pyserial, pyusb, requests}:
buildPythonPackage rec {
pname = "solo-python";
version = "0.0.15";
version = "0.0.18";
format = "flit";
disabled = pythonOlder "3.6"; # only python>=3.6 is supported
src = fetchFromGitHub {
owner = "solokeys";
repo = pname;
rev = version;
sha256 = "14na9s65hxzx141bdv0j7rx1wi3cv85jzpdivsq1rwp6hdhiazr1";
sha256 = "01mgppjvxlr93vrgz7bzisghpg1vqyaj4cg5wngk0h499iyx4d9q";
};
# TODO: remove ASAP
# replaced pinned fido, with unrestricted fido version
patchPhase = ''
substituteInPlace pyproject.toml --replace "fido2 == 0.7.0" "fido2 >= 0.7.0"
sed -i '/fido2/c\"fido2",' pyproject.toml
'';
propagatedBuildInputs = [
@@ -28,6 +29,20 @@
requests
];
# allow for writable directory for darwin
preBuild = ''
export HOME=$TMPDIR
'';
# repo doesn't contain tests, ensure imports aren't broken
pythonImportsCheck = [
"solo"
"solo.cli"
"solo.commands"
"solo.fido2"
"solo.operations"
];
meta = with lib; {
description = "Python tool and library for SoloKeys";
homepage = "https://github.com/solokeys/solo-python";

View File

@@ -26,19 +26,13 @@
buildPythonPackage rec {
pname = "spacy";
version = "2.2.1";
version = "2.2.2";
src = fetchPypi {
inherit pname version;
sha256 = "1a833dx8i4s106fk42x4dnayaq5p3qxaxnc012xij991i09v2pxn";
sha256 = "193r7rrqxfj4jqzk4aqgbycficzmc606vkc4ffc46zs3myhlf6sa";
};
prePatch = ''
substituteInPlace setup.cfg \
--replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
--replace "thinc>=7.1.1,<7.2.0" "thinc~=7.0"
'';
propagatedBuildInputs = [
numpy
murmurhash

View File

@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "sqlalchemy-utils";
version = "0.34.2";
version = "0.35.0";
src = fetchPypi {
inherit version;
pname = "SQLAlchemy-Utils";
sha256 = "126c9p8rnnb043w57ah7idqfryczbz4vi9lzsz2cgiaig6fv52b6";
sha256 = "0phsdcnm21qvxd00zmjd6yxbm1s0i7b1q8zrgfy8cqv9xpmz1w01";
};
propagatedBuildInputs = [

View File

@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "srsly";
version = "0.1.0";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "1l9yjp1w2vrkrynxrlrc0v47i2iq9059k4ni44nz23573xbdrh2w";
sha256 = "0gha1xfh64mapvgn0sghnjsvmjdrh5rywhs3j3bhkvwk42kf40ma";
};
propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;

View File

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "telethon";
version = "1.9.0";
version = "1.10.8";
src = fetchPypi {
inherit version;
pname = "Telethon";
sha256 = "a8797ad5bfee2b350cfc9b73cbb30fc19c8f73c0db42471e0df1371b1a269edc";
sha256 = "1v0zq6kdvcff6pygi8syylqndamz884gaby4v16p5brg5rz6k25g";
};
propagatedBuildInputs = [

View File

@@ -28,11 +28,11 @@
buildPythonPackage rec {
pname = "thinc";
version = "7.2.0";
version = "7.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "808caccafab95aa74c21695248b26279792cd7d07d94fd97f181020f318f024a";
sha256 = "1f9bg7iyhwnk8jfras8d4wzq0ypn5na0bdbwkl7y2mr06yrdd0ff";
};
buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -65,11 +65,6 @@ buildPythonPackage rec {
pytest
];
prePatch = ''
substituteInPlace setup.py \
--replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6"
'';
# Cannot find cython modules.
doCheck = false;

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "wasabi";
version = "0.2.2";
version = "0.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0xxjc9bvvcaz1qq1jyhcxyl2v39jz8d8dz4zhpfbc7dz53kq6b7r";
sha256 = "0f18x27qrr29rgxyiy1k9b469i37n80h0x9vd9i22pyg8wxx67q5";
};
checkInputs = [

View File

@@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "willow";
version = "1.1";
version = "1.3";
disabled = pythonOlder "2.7";
src = fetchPypi {
pname = "Willow";
inherit version;
sha256 = "818ee11803c90a0a6d49c94b0453d6266be1ef83ae00de72731c45fae4d3e78c";
sha256 = "0dzc3cjkwp0h3v1n94c33zr5yw5fdd6dkm6vccp9i8dncmpw912g";
};
propagatedBuildInputs = [ six pillow ];

View File

@@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "wurlitzer";
version = "1.0.3";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0nab45pfgqdxhhyshf717xfzniss2h3bx19zdaq9gqr6v8lw6wpr";
sha256 = "0xndv47iwc9k8cp5r9r1z3r0xww0r5x5b7qsmn39gk2gsg0119c6";
};
checkInputs = [ mock pytest ];

View File

@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "xdis";
version = "4.0.4";
version = "4.1.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
sha256 = "1m54d61ka9wgq0iqlzmsikzxa6qmwvnwsgm2kxb3vw5ic1psv4pv";
sha256 = "0icqhafsnmcs6628cg3jjgq0d3x835nqmhljcz93yi457hfqd2lp";
};
checkInputs = [ pytest ];