Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2020-07-15 09:29:01 +02:00
261 changed files with 6973 additions and 5008 deletions

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "Wand";
version = "0.6.1";
version = "0.6.2";
src = fetchPypi {
inherit pname version;
sha256 = "1wg7dlz6mhjp7mkqm5f8a2ak87p1zn46b6i754ys8f29nnqq01yz";
sha256 = "0jm1jdrlmm0gkvaxhbwwqic48vfgv8d0j99y90calnjrid3hwi35";
};
postPatch = ''

View File

@@ -0,0 +1,27 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, six
, nose
, coverage
}:
buildPythonPackage rec {
pname = "aadict";
version = "0.2.3";
src = fetchPypi {
inherit pname version;
sha256 = "013pn9ii6mkql6khgdvsd1gi7zmya418fhclm5fp7dfvann2hwx7";
};
propagatedBuildInputs = [ six ];
checkInputs = [ nose coverage ];
meta = with stdenv.lib; {
homepage = "https://github.com/metagriffin/aadict";
description = "An auto-attribute dict (and a couple of other useful dict functions).";
maintainers = with maintainers; [ glittershark ];
license = licenses.gpl3;
};
}

View File

@@ -12,14 +12,14 @@
}:
buildPythonPackage rec {
version = "1.6.0";
version = "1.7.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "d10b74e783cff90d56360e61162afdd22276d62dc9467e657ae866449eae7648";
sha256 = "0p6pzpgfxr0c95gqr8ryq779an13x84vlm3zhvwlgx47l90a4vd6";
};
propagatedBuildInputs = [

View File

@@ -16,7 +16,7 @@ buildPythonPackage rec {
homepage = "https://github.com/nicolargo/batinfo";
description = "A simple Python lib to retrieve battery information";
license = licenses.lgpl3;
platforms = platforms.all;
platforms = platforms.linux;
maintainers = with maintainers; [ koral ];
};
}

View File

@@ -0,0 +1,37 @@
{ stdenv, buildPythonPackage, fetchPypi
, click, click-log, pure-pcapy3
, pyserial, pyserial-asyncio, voluptuous, zigpy
, asynctest, pytest, pytest-asyncio }:
let
pname = "bellows";
version = "0.17.0";
in buildPythonPackage rec {
inherit pname version;
src = fetchPypi {
inherit pname version;
sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6";
};
propagatedBuildInputs = [
click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy
];
checkInputs = [
asynctest pytest pytest-asyncio
];
prePatch = ''
substituteInPlace setup.py \
--replace "click-log==0.2.0" "click-log>=0.2.0"
'';
meta = with stdenv.lib; {
description = "A Python 3 project to implement EZSP for EmberZNet devices";
homepage = "https://github.com/zigpy/bellows";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
};
}

View File

@@ -0,0 +1,35 @@
{ lib, buildPythonPackage, fetchPypi
, pytest
}:
buildPythonPackage rec {
version = "1.0.3";
pname = "biplist";
src = fetchPypi {
inherit pname version;
sha256 = "1im45a9z7ryrfyp1v6i39qia5qagw6i1mhif0hl0praz9iv4j1ac";
};
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
meta = with lib; {
homepage = "https://bitbucket.org/wooster/biplist/src/master/";
description = "Binary plist parser/generator for Python";
longDescription = ''
Binary Property List (plist) files provide a faster and smaller
serialization format for property lists on OS X.
This is a library for generating binary plists which can be read
by OS X, iOS, or other clients.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ siriobalmelli ];
};
}

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "coloredlogs";
version = "10.0";
version = "14.0";
src = fetchFromGitHub {
owner = "xolox";
repo = "python-coloredlogs";
rev = version;
sha256 = "0rdvp4dfvzhx7z7s2jdl3fv7x1hazgpy5gc7bcf05bnbv2iia54a";
sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x";
};
# patch by risicle

View File

@@ -7,15 +7,15 @@
, crcmod
}:
buildPythonPackage {
buildPythonPackage rec {
pname = "fx2";
version = "unstable-2020-01-25";
version = "0.9";
src = fetchFromGitHub {
owner = "whitequark";
repo = "libfx2";
rev = "d3e37f640d706aac5e69ae4476f6cd1bd0cd6a4e";
sha256 = "1dsyknjpgf4wjkfr64lln1lcy7qpxdx5x3qglidrcswzv9b3i4fg";
rev = version;
sha256 = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk=";
};
nativeBuildInputs = [ sdcc ];

View File

@@ -18,15 +18,15 @@
buildPythonPackage rec {
pname = "glasgow";
version = "unstable-2020-02-08";
version = "unstable-2020-06-29";
# python software/setup.py --version
realVersion = "0.1.dev1352+g${lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "GlasgowEmbedded";
repo = "glasgow";
rev = "2a8bfc981b90ba5d86c310911dbd6ffe71acd498";
sha256 = "01v5269bv09ggvmq6lqyhr5am51hzmwya1p5n62h84b7rdwd8q9m";
rev = "f885790d7927b893e631c33744622d6ebc18b5e3";
sha256 = "sha256-fSorSEa5K09aPEOk4XPWOFRxYl1KGVy29jOBqIvs2hk=";
};
nativeBuildInputs = [ setuptools_scm sdcc ];

View File

@@ -0,0 +1,28 @@
{ stdenv
, pythonAtLeast
, buildPythonPackage
, fetchPypi
, nose
, coverage
}:
buildPythonPackage rec {
pname = "globre";
version = "0.1.5";
# https://github.com/metagriffin/globre/issues/7
disabled = pythonAtLeast "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf";
};
checkInputs = [ nose coverage ];
meta = with stdenv.lib; {
homepage = "https://github.com/metagriffin/globre";
description = "A python glob-like regular expression generation library.";
maintainers = with maintainers; [ glittershark ];
license = licenses.gpl3;
};
}

View File

@@ -0,0 +1,31 @@
{ lib, buildPythonPackage, fetchPypi
}:
buildPythonPackage rec {
version = "2.0.7";
pname = "mac_alias";
src = fetchPypi {
inherit pname version;
sha256 = "08z2i68mk5j0vfy8jqihjm9m6njp1lpjh1m91b60h0k0kpmy71f4";
};
# pypi package does not include tests;
# tests anyway require admin privileges to succeed
doCheck = false;
pythonImportsCheck = [ "mac_alias" ];
meta = with lib; {
homepage = "https://github.com/al45tair/mac_alias";
description = "Generate or read binary Alias and Bookmark records from Python code";
longDescription = ''
mac_alias lets you generate or read binary Alias and Bookmark records from Python code.
While it is written in pure Python, some OS X specific code is required
to generate a proper Alias or Bookmark record for a given file,
so this module currently is not portable to other platforms.
'';
license = licenses.mit;
maintainers = with maintainers; [ siriobalmelli ];
};
}

View File

@@ -1,4 +1,6 @@
{ buildPythonPackage, lib, fetchPypi
{ stdenv, lib, buildPythonPackage, pythonAtLeast
, fetchPypi
, libmaxminddb
, ipaddress
, mock
, nose
@@ -13,10 +15,15 @@ buildPythonPackage rec {
sha256 = "f4d28823d9ca23323d113dc7af8db2087aa4f657fafc64ff8f7a8afda871425b";
};
buildInputs = [ libmaxminddb ];
propagatedBuildInputs = [ ipaddress ];
checkInputs = [ nose mock ];
# Tests are broken for macOS on python38
doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8");
meta = with lib; {
description = "Reader for the MaxMind DB format";
homepage = "https://www.maxmind.com/en/home";

View File

@@ -18,7 +18,7 @@
}:
buildPythonPackage rec {
version = "0.6.13";
version = "0.6.17";
pname = "msrest";
# no tests in PyPI tarball
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz";
sha256 = "1f1cpl5x7q0f9lpwxc1pl9j5x5yrksfizl9k939iqklf95ssymff";
};
propagatedBuildInputs = [

View File

@@ -12,7 +12,7 @@
}:
buildPythonPackage rec {
version = "0.6.3";
version = "0.6.4";
pname = "msrestazure";
# Pypi tarball doesnt include tests
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Azure";
repo = "msrestazure-for-python";
rev = "v${version}";
sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8";
sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5";
};
propagatedBuildInputs = [ adal msrest ];

View File

@@ -4,13 +4,13 @@ let
py = python;
in buildPythonPackage rec {
pname = "mysql-connector";
version = "8.0.20";
version = "8.0.21";
src = fetchFromGitHub {
owner = "mysql";
repo = "mysql-connector-python";
rev = version;
sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw";
sha256 = "0ky7rn9259807gji3fhvkmdmrgyaps431l9l9y6gh66i84kw1b3l";
};
propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];

View File

@@ -0,0 +1,94 @@
{ lib
, fetchPypi
, python
, buildPythonPackage
, gfortran
, pytest
, blas
, lapack
, writeTextFile
, isPyPy
, cython
, setuptoolsBuildHook
}:
assert (!blas.isILP64) && (!lapack.isILP64);
let
cfg = writeTextFile {
name = "site.cfg";
text = (lib.generators.toINI {} {
${blas.implementation} = {
include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include";
library_dirs = "${blas}/lib:${lapack}/lib";
libraries = "lapack,lapacke,blas,cblas";
};
lapack = {
include_dirs = "${lib.getDev lapack}/include";
library_dirs = "${lapack}/lib";
};
blas = {
include_dirs = "${lib.getDev blas}/include";
library_dirs = "${blas}/lib";
};
});
};
in buildPythonPackage rec {
pname = "numpy";
version = "1.16.5";
format = "pyproject.toml";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c";
};
nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
buildInputs = [ blas lapack ];
patches = lib.optionals python.hasDistutilsCxxPatch [
# We patch cpython/distutils to fix https://bugs.python.org/issue1222585
# Patching of numpy.distutils is needed to prevent it from undoing the
# patch to distutils.
./numpy-distutils-C++_1.16.patch
];
preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
'';
preBuild = ''
ln -s ${cfg} site.cfg
'';
enableParallelBuilding = true;
doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
checkPhase = ''
runHook preCheck
pushd dist
${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)'
popd
runHook postCheck
'';
passthru = {
# just for backwards compatibility
blas = blas.provider;
blasImplementation = blas.implementation;
inherit cfg;
};
# Disable test
# - test_large_file_support: takes a long time and can cause the machine to run out of disk space
NOSE_EXCLUDE="test_large_file_support";
meta = {
description = "Scientific tools for Python";
homepage = "https://numpy.org/";
maintainers = with lib.maintainers; [ fridh ];
};
}

View File

@@ -0,0 +1,30 @@
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py
--- a/numpy/distutils/unixccompiler.py
+++ b/numpy/distutils/unixccompiler.py
@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
if opt not in llink_s:
self.linker_so = llink_s.split() + opt.split()
- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
-
# gcc style automatic dependencies, outputs a makefile (-MF) that lists
# all headers needed by a c file as a side effect of compilation (-MMD)
if getattr(self, '_auto_depends', False):
@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts
deps = []
try:
- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
- extra_postargs, display = display)
+ if self.detect_language(src) == 'c++':
+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src)
+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps +
+ extra_postargs, display = display)
+ else:
+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src)
+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps +
+ extra_postargs, display = display)
+
except DistutilsExecError:
msg = str(get_exception())
raise CompileError(msg)

View File

@@ -29,5 +29,6 @@ stdenv.mkDerivation {
# ensures not built on hydra
# https://github.com/NixOS/nixpkgs/pull/46846#issuecomment-436388048
hydraPlatforms = [ ];
broken = true; # cmake unable to find Qt5Core and other dependencies
};
}

View File

@@ -1,45 +1,25 @@
{ stdenv, buildPythonPackage, fetchpatch, fetchFromGitHub,
python, cmake, git, swig, boost, udev,
setuptools, enum34, wrapt, future }:
{ stdenv, fetchFromGitHub, cmake, git, swig, boost, udev, pc-ble-driver
, buildPythonPackage, enum34, wrapt, future, setuptools, scikit-build }:
buildPythonPackage rec {
pname = "pc-ble-driver-py";
version = "0.11.4";
disabled = python.isPy3k;
version = "0.14.2";
src = fetchFromGitHub {
owner = "NordicSemiconductor";
repo = "pc-ble-driver-py";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "0lgmcnrlcivmawmlcwnn4pdp6afdbnf3fyfgq22xzs6v72m9gp81";
sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m";
};
nativeBuildInputs = [ cmake swig git setuptools ];
buildInputs = [ boost udev ];
# doCheck tries to write to the global python directory to install things
doCheck = false;
nativeBuildInputs = [ cmake swig git setuptools scikit-build ];
buildInputs = [ boost udev pc-ble-driver ];
propagatedBuildInputs = [ enum34 wrapt future ];
patches = [
# build system expects case-insensitive file system
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/NordicSemiconductor/pc-ble-driver-py/pull/84.patch";
sha256 = "0ibx5g2bndr5h9sfnx51bk9b62q4jvpdwhxadbnj3da8kvcz13cy";
})
];
postPatch = ''
# do not force static linking of boost
sed -i /Boost_USE_STATIC_LIBS/d pc-ble-driver/cmake/*.cmake
cd python
'';
preBuild = ''
pushd ../build
cmake ..
make -j $NIX_BUILD_CORES
popd
'';
dontUseCmakeConfigure = true;
meta = with stdenv.lib; {
description = "Bluetooth Low Energy nRF5 SoftDevice serialization";

View File

@@ -22,7 +22,7 @@ buildPythonPackage rec {
checkPhase = ''
runHook preCheck
python -m pytest -v -x -W always
python -m pytest -v -x -W always${stdenv.lib.optionalString stdenv.isDarwin " --deselect=Tests/test_file_icns.py::TestFileIcns::test_save --deselect=Tests/test_imagegrab.py::TestImageGrab::test_grab"}
runHook postCheck
'';

View File

@@ -0,0 +1,41 @@
{ lib
, pythonOlder
, buildPythonPackage
, isPy3k
, fetchFromGitHub
, semver
# Check Inputs
, nose
}:
buildPythonPackage rec {
pname = "pkutils";
version = "1.1.1";
disabled = !isPy3k; # some tests using semver fail due to unicode errors on Py2.7
src = fetchFromGitHub {
owner = "reubano";
repo = "pkutils";
rev = "v${version}";
sha256 = "01yaq9sz6vyxk8yiss6hsmy70qj642cr2ifk0sx1mlh488flcm62";
};
propagatedBuildInputs = [ semver ];
# Remove when https://github.com/reubano/pkutils/pull/4 merged
postPatch = ''
substituteInPlace requirements.txt --replace "semver>=2.2.1,<2.7.3" "semver"
'';
checkInputs = [ nose ];
pythonImportsCheck = [ "pkutils" ];
checkPhase = "nosetests";
meta = with lib; {
description = "A Python packaging utility library";
homepage = "https://github.com/reubano/pkutils/";
license = licenses.mit;
maintainers = with maintainers; [ drewrisinger ];
};
}

View File

@@ -0,0 +1,18 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "pure-pcapy3";
version = "1.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "14panfklap6wwi9avw46gvd7wg9mkv9xbixvbvmi1m2adpqlb7mr";
};
meta = with stdenv.lib; {
description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement.";
homepage = "http://bitbucket.org/viraptor/pure-pcapy";
license = licenses.bsd2;
maintainers = with maintainers; [ etu ];
};
}

View File

@@ -0,0 +1,37 @@
{ stdenv
, pythonAtLeast
, isPy27
, buildPythonPackage
, fetchPypi
, blessings
, six
, nose
, coverage
}:
buildPythonPackage rec {
pname = "pxml";
version = "0.2.13";
disabled = pythonAtLeast "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "0c9zzfv6ciyf9qm7556wil45xxgykg1cj8isp1b88gimwcb2hxg4";
};
propagatedBuildInputs = [ blessings six ];
checkInputs = [ nose coverage ];
# test_prefixedWhitespace fails due to a python3 StringIO issue requiring
# bytes rather than str
checkPhase = ''
nosetests -e 'test_prefixedWhitespace'
'';
meta = with stdenv.lib; {
homepage = "https://github.com/metagriffin/pxml";
description = ''A python library and command-line tool to "prettify" and colorize XML.'';
maintainers = with maintainers; [ glittershark ];
license = licenses.gpl3;
};
}

View File

@@ -0,0 +1,36 @@
{ lib
, pythonOlder
, buildPythonPackage
, fetchFromGitHub
, pkutils
# Check Inputs
, pytestCheckHook
, nose
}:
buildPythonPackage rec {
pname = "pygogo";
version = "0.13.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "reubano";
repo = "pygogo";
rev = "v${version}";
sha256 = "19rdf4sjrm5lp1vq1bki21a9lrkzz8sgrfwgjdkq4sgy90hn1jn9";
};
nativeBuildInputs = [ pkutils ];
checkInputs = [ nose ];
checkPhase = "nosetests";
pythonImportsCheck = [ "pygogo" ];
meta = with lib; {
description = "A Python logging library with super powers";
homepage = "https://github.com/reubano/pygogo/";
license = licenses.mit;
maintainers = with maintainers; [ drewrisinger ];
};
}

View File

@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "python-dotenv";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
sha256 = "3b9909bc96b0edc6b01586e1eed05e71174ef4e04c71da5786370cebea53ad74";
sha256 = "0gf3r4xvqk9ai1k3ka8c4dlblqhs7286zbd1b20adn953fdcj44c";
};
propagatedBuildInputs = [ click ] ++ lib.optionals isPy27 [ typing ];

View File

@@ -110,7 +110,8 @@ in buildPythonPackage rec {
outputs = [
"out" # output standard python package
"dev" # output libtorch only
"dev" # output libtorch headers
"lib" # output libtorch libraries
];
src = fetchFromGitHub {
@@ -239,9 +240,11 @@ in buildPythonPackage rec {
];
postInstall = ''
mkdir $dev
cp -r $out/${python.sitePackages}/torch/lib $dev/lib
cp -r $out/${python.sitePackages}/torch/include $dev/include
cp -r $out/${python.sitePackages}/torch/share $dev/share
mkdir $lib
cp -r $out/${python.sitePackages}/torch/lib $lib/lib
'';
postFixup = stdenv.lib.optionalString stdenv.isDarwin ''

View File

@@ -32,16 +32,16 @@ let
};
in rustPlatform.buildRustPackage rec {
pname = "tokenizers";
version = "0.8.0";
version = "0.8.1.rc1";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "python-v${version}";
sha256 = "0f5r1wm5ybyk3jvihj1g98y7ihq0iklg0pwkaa11pk1gv0k869w3";
sha256 = "1bzvfffnjjskx8zlq1qsqfd47570my2wnbq4ip8i1hkz10q900qv";
};
cargoSha256 = "131bvf35q5n65mq6zws1rp5fn2qkfwfg9sbxi5y6if24n8fpdz4m";
cargoSha256 = "0s5z3g1njb7wlyb32ba6xas4zc62c3zhmp1mrvghmaxpvljp6k7b";
sourceRoot = "source/bindings/python";

View File

@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "transformers";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
sha256 = "1l8l82zi021sq5dnzlbjx3wx0n4yy7k96n3m2fr893y9lfkhhd8z";
sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6";
};
propagatedBuildInputs = [
@@ -44,7 +44,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "tokenizers == 0.8.0-rc4" "tokenizers>=0.8,<0.9"
--replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8"
'';
preCheck = ''

View File

@@ -1,6 +1,7 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, isPyPy
, setuptools_scm
}:
@@ -8,7 +9,7 @@
buildPythonPackage rec {
pname = "ujson";
version = "3.0.0";
disabled = isPyPy;
disabled = isPyPy || (!isPy3k);
src = fetchPypi {
inherit pname version;

View File

@@ -1,18 +1,20 @@
{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }:
{ stdenv, fetchPypi, buildPythonPackage
, nose, numpy, future
}:
buildPythonPackage rec {
pname = "uncertainties";
version = "3.1.2";
version = "3.1.4";
src = fetchPypi {
inherit pname version;
sha256 = "07kahmr0vfmncf8y4x6ldjrghnd4gsf0fwykgjj5ijvqi9xc21xs";
sha256 = "0s69kdhl8vhqazhxqdvb06l83x0iqdm0yr4vp3p52alzi6a8lm33";
};
buildInputs = [ nose numpy ];
propagatedBuildInputs = [ future ];
checkInputs = [ nose numpy ];
# No tests included
doCheck = false;
checkPhase = "python setup.py nosetests -sv";
meta = with stdenv.lib; {
homepage = "https://pythonhosted.org/uncertainties/";

View File

@@ -1,9 +1,7 @@
{ stdenv
, pythonAtLeast
, buildPythonPackage
, fetchPypi
, isPy27
, fetchpatch
, click
, click-log
, click-threading
@@ -11,25 +9,21 @@
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
, milksnake
, shippai
, hypothesis
, pytest
, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools_scm
}:
# Packaging documentation at:
# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst
buildPythonPackage rec {
version = "0.16.7";
version = "0.16.8";
pname = "vdirsyncer";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef";
sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
};
propagatedBuildInputs = [
@@ -46,43 +40,25 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytest
pytestCheckHook
pytest-localserver
pytest-subtesthack
];
patches = [
# Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779
(fetchpatch {
url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch";
sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
})
];
postPatch = ''
# Invalid argument: 'perform_health_check' is not a valid setting
substituteInPlace tests/conftest.py \
--replace "perform_health_check=False" ""
substituteInPlace tests/unit/test_repair.py \
--replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' ""
substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
'';
checkPhase = ''
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test
preCheck = ''
export DETERMINISTIC_TESTS=true
'';
# Tests started to fail lately, for any python version even as low as 3.5 but
# if you enable the check, you'll see even severer errors with a higher then
# 3.5 python version. Hence it's marked as broken for higher then 3.5 and the
# checks are disabled unconditionally. As a general end user advice, use the
# normal "unstable" `vdirsyncer` derivation, not this one.
doCheck = false;
disabledTests = [ "test_verbosity" ];
meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
license = licenses.mit;
# vdirsyncer (unstable) works with mainline python versions
broken = (pythonAtLeast "3.6");
maintainers = with maintainers; [ loewenheim ];
};
}

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "voluptuous-serialize";
version = "2.3.0";
version = "2.4.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l";
sha256 = "1r7avibzf009h5rlh7mbh1fc01daligvi2axjn5qxh810g5igfn6";
};
propagatedBuildInputs = [

View File

@@ -21,6 +21,6 @@ buildPythonPackage rec {
description = "A linter for YAML files";
homepage = "https://github.com/adrienverge/yamllint";
license = licenses.gpl3;
maintainers = with maintainers; [ mikefaille ];
maintainers = with maintainers; [ jonringer mikefaille ];
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, asynctest, pytest, pytest-asyncio }:
buildPythonPackage rec {
pname = "zigpy-cc";
version = "0.4.4";
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ asynctest pytest pytest-asyncio ];
src = fetchPypi {
inherit pname version;
sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl";
};
meta = with stdenv.lib; {
description = "A library which communicates with Texas Instruments CC2531 radios for zigpy";
homepage = "http://github.com/sanyatuning/zigpy-cc";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

View File

@@ -1,14 +1,13 @@
{ stdenv, buildPythonPackage, fetchPypi
, aiohttp, crccheck, pyserial, pyserial-asyncio, pycryptodome, zigpy
, pytest }:
, pyserial, pyserial-asyncio, zigpy
, pytest, pytest-asyncio, asynctest }:
buildPythonPackage rec {
pname = "zigpy-deconz";
version = "0.9.2";
nativeBuildInputs = [ pytest ];
buildInputs = [ aiohttp crccheck pycryptodome ];
propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest pytest-asyncio asynctest ];
src = fetchPypi {
inherit pname version;
@@ -19,7 +18,7 @@ buildPythonPackage rec {
description = "Library which communicates with Deconz radios for zigpy";
homepage = "https://github.com/zigpy/zigpy-deconz";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu ];
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, pytest }:
buildPythonPackage rec {
pname = "zigpy-xbee";
version = "0.12.1";
buildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "09488hl27qjv8shw38iiyzvzwcjkc0k4n00l2bfn1ac443xzw0vh";
};
meta = with stdenv.lib; {
description = "A library which communicates with XBee radios for zigpy";
homepage = "http://github.com/zigpy/zigpy-xbee";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

View File

@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, pyserial, pyserial-asyncio, zigpy
, pytest }:
buildPythonPackage rec {
pname = "zigpy-zigate";
version = "0.6.1";
buildInputs = [ pyserial pyserial-asyncio zigpy ];
checkInputs = [ pytest ];
src = fetchPypi {
inherit pname version;
sha256 = "0xxqv65drrr96b9ncwsx9ayd369lpwimj1jjb0d7j6l9lil0wmf5";
};
meta = with stdenv.lib; {
description = "A library which communicates with ZiGate radios for zigpy";
homepage = "http://github.com/doudz/zigpy-zigate";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}

View File

@@ -1,25 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
, aiohttp, crccheck, pycryptodome, pycrypto
, aiohttp, crccheck, pycryptodome, pycrypto, voluptuous
, pytest, pytest-asyncio, asynctest }:
buildPythonPackage rec {
pname = "zigpy-homeassistant";
version = "0.19.0";
pname = "zigpy";
version = "0.22.0";
nativeBuildInputs = [ pytest pytest-asyncio asynctest ];
buildInputs = [ aiohttp pycryptodome ];
propagatedBuildInputs = [ crccheck pycrypto ];
propagatedBuildInputs = [ aiohttp crccheck pycrypto pycryptodome voluptuous ];
checkInputs = [ pytest pytest-asyncio asynctest ];
src = fetchPypi {
inherit pname version;
sha256 = "779cff7affb86b7141aa641c188342b22be0ec766adee0d180c93e74e2b10adc";
sha256 = "1y8n96g5g6qsx8s2z028f1cyp2w8y7kksi8k2yyzpqvmanbxyjhc";
};
meta = with stdenv.lib; {
description = "Library implementing a ZigBee stack";
homepage = "https://github.com/zigpy/zigpy";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ etu ];
maintainers = with maintainers; [ etu mvnetbiz ];
platforms = platforms.linux;
};
}