Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-05-18 21:09:27 +02:00
501 changed files with 11984 additions and 6526 deletions

View File

@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "alot";
version = "0.9";
version = "0.9.1";
outputs = [ "out" ] ++ lib.optional withManpage "man";
disabled = !isPy3k;
@@ -16,18 +16,9 @@ buildPythonPackage rec {
owner = "pazz";
repo = "alot";
rev = version;
sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI=";
sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6";
};
patches = [
# can't compose email if signature is set: https://github.com/pazz/alot/issues/1468
(fetchpatch {
name = "envelope-body.patch";
url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch";
sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06";
})
];
nativeBuildInputs = lib.optional withManpage sphinx;
propagatedBuildInputs = [
@@ -70,6 +61,6 @@ buildPythonPackage rec {
description = "Terminal MUA using notmuch mail";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ geistesk ];
maintainers = with maintainers; [ aepsil0n ];
};
}

View File

@@ -18,13 +18,13 @@
buildPythonPackage rec {
pname = "ansible";
version = "2.9.7";
version = "2.9.9";
src = fetchFromGitHub {
owner = "ansible";
repo = "ansible";
rev = "v${version}";
sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s";
sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml";
};
prePatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
homepage = "http://www.ansible.com";
description = "Radically simple IT automation";
license = [ licenses.gpl3 ] ;
maintainers = with maintainers; [ joamaki costrouc ];
maintainers = with maintainers; [ joamaki costrouc hexa ];
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@@ -4,12 +4,12 @@
}:
buildPythonPackage rec {
version = "1.3.12";
version = "1.5.1";
pname = "bids-validator";
src = fetchPypi {
inherit pname version;
sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86";
sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3";
};
propagatedBuildInputs = [ ];

View File

@@ -3,7 +3,9 @@
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, google_api_python_client
, fetchpatch
, freezegun
, google_api_core
, matplotlib
, networkx
, numpy
@@ -16,6 +18,7 @@
, typing-extensions
# test inputs
, pytestCheckHook
, pytest-asyncio
, pytest-benchmark
, ply
, pydot
@@ -25,7 +28,7 @@
buildPythonPackage rec {
pname = "cirq";
version = "0.6.1";
version = "0.8.0";
disabled = pythonOlder "3.5";
@@ -33,25 +36,29 @@ buildPythonPackage rec {
owner = "quantumlib";
repo = "cirq";
rev = "v${version}";
sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f";
sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3";
};
# Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368
patches = [
(fetchpatch {
# Fixes serialization issues on certain versions of protobuf & numpy.
name = "cirq-pr-2986-protobuf-bools.patch";
url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch";
sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18";
})
];
# Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts
postPatch = ''
substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \
--replace "protobuf==3.8.0" "protobuf"
# Fix sympy 1.5 test failures. Should be fixed in v0.7
substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125"
substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t"
# Fix pandas >= 1.0 error, #2886
substituteInPlace cirq/experiments/t1_decay_experiment.py --replace "del tab.columns.name" 'tab.rename_axis(None, axis="columns", inplace=True)'
substituteInPlace requirements.txt \
--replace "networkx~=2.4" "networkx" \
--replace "protobuf==3.8.0" "protobuf" \
--replace "freezegun~=0.3.15" "freezegun"
'';
propagatedBuildInputs = [
google_api_python_client
freezegun
google_api_core
numpy
matplotlib
networkx
@@ -69,19 +76,26 @@ buildPythonPackage rec {
dontUseSetuptoolsCheck = true;
checkInputs = [
pytestCheckHook
pytest-asyncio
pytest-benchmark
ply
pydot
pyyaml
pygraphviz
];
# TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue
pytestFlagsArray = [
"--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope
"--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727
];
disabledTests = [
"test_serialize_sympy_constants" # fails due to small error in pi (~10e-7)
"test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2
# Newly disabled tests on cirq 0.8
# TODO: test & figure out why failing
"engine_job_test"
"test_health"
"test_run_delegation"
] ++ lib.optionals stdenv.isAarch64 [
# Seem to fail due to math issues on aarch64?
"expectation_from_wavefunction"

View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_core_components";
version = "1.9.1";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "0mi608d4q4clx5ikblqni5v67k051k894q0w5asa3jj1v0agawpa";
sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h";
};
# No tests in archive

View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_renderer";
version = "1.3.0";
version = "1.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g";
sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv";
};
# No tests in archive

View File

@@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "dash_table";
version = "4.6.2";
version = "4.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw";
sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm";
};
# No tests in archive

View File

@@ -16,13 +16,13 @@
buildPythonPackage rec {
pname = "dash";
version = "1.10.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "plotly";
repo = pname;
rev = "v${version}";
sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh";
sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy";
};
propagatedBuildInputs = [

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "evdev";
version = "1.2.0";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166";
sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi";
};
buildInputs = [ linuxHeaders ];

View File

@@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "google-api-python-client";
version = "1.8.2";
version = "1.8.3";
src = fetchPypi {
inherit pname version;
sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z";
sha256 = "10alijbbv3nsj7dfnv3fpx0gf1s9d4c7yjq0mv51szcx777qskmy";
};
# No tests included in archive

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "google-pasta";
version = "0.1.8";
version = "0.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb";
sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9";
};
propagatedBuildInputs = [
@@ -20,6 +20,8 @@ buildPythonPackage rec {
meta = {
description = "An AST-based Python refactoring library";
homepage = "https://github.com/google/pasta";
# Usually the tag message contains a one-line summary of the changes.
changelog = "https://github.com/google/pasta/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ timokau ];
};

View File

@@ -1,12 +1,12 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }:
buildPythonPackage rec {
version = "1.4.7";
version = "2.0.1";
pname = "kafka-python";
src = fetchPypi {
inherit pname version;
sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada";
sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5";
};
checkInputs = [ pytest six mock ];

View File

@@ -1,16 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, six }:
{ stdenv, buildPythonPackage, fetchPypi, six, pytest }:
buildPythonPackage rec {
pname = "latexcodec";
version = "1.0.7";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb";
sha256 = "0pyzhidpnc3q3rh9d5hxhzv99rl5limyyrll7xcyssci92fn8gyd";
};
propagatedBuildInputs = [ six ];
checkInputs = [ pytest ];
checkPhase = ''
pytest
'';
meta = {
homepage = "https://github.com/mcmtroffaes/latexcodec";
description = "Lexer and codec to work with LaTeX code in Python";

View File

@@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }:
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }:
buildPythonPackage rec {
pname = "pdfminer_six";
version = "20200402";
version = "20200517";
disabled = !isPy3k;
@@ -11,18 +11,9 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26";
sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2";
};
patches = [
# Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408
(fetchpatch {
url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch";
sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21";
excludes = [ "CHANGELOG.md" ];
})
];
propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ];
checkInputs = [ nose ];
@@ -37,4 +28,3 @@ buildPythonPackage rec {
maintainers = with maintainers; [ psyanticy marsam ];
};
}

View File

@@ -3,13 +3,13 @@
buildPythonPackage rec {
pname = "PlexAPI";
version = "3.2.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "pkkid";
repo = "python-plexapi";
rev = version;
sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf";
sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77";
};
propagatedBuildInputs = [ requests tqdm websocket_client ];

View File

@@ -13,7 +13,6 @@
, python
, mkDerivation
, stdenv
, isPy3k
}:
let
compyte = import ./compyte.nix {
@@ -29,11 +28,12 @@ buildPythonPackage rec {
sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a";
};
preConfigure = ''
preConfigure = with stdenv.lib.versions; ''
${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \
--boost-lib-dir=${boost}/lib \
--no-use-shipped-boost \
--boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"}
--boost-python-libname=boost_python${major python.version}${minor python.version} \
--cuda-root=${cudatoolkit}
'';
postInstall = ''

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, oset, pybtex, pybtex-docutils, sphinx
}:
@@ -6,6 +6,8 @@ buildPythonPackage rec {
version = "1.0.0";
pname = "sphinxcontrib-bibtex";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0";

View File

@@ -0,0 +1,109 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, isPy27
, fetchpatch
, rustPlatform
, pkg-config
, openssl
, CoreServices
, Security
, click
, click-log
, click-threading
, requests_toolbelt
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
, milksnake
, shippai
, hypothesis
, pytest
, pytest-localserver
, pytest-subtesthack
, setuptools_scm
}:
# Packaging documentation at:
# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
buildPythonPackage rec {
version = "unstable-2018-08-05";
pname = "vdirsyncer";
name = "${pname}-${version}";
disabled = isPy27;
src = fetchFromGitHub {
owner = "spk";
repo = pname;
# fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798
rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9";
sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28";
};
native = rustPlatform.buildRustPackage {
name = "${name}-native";
inherit src;
sourceRoot = "source/rust";
cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
};
propagatedBuildInputs = [
click click-log click-threading
requests_toolbelt
requests
requests_oauthlib # required for google oauth sync
atomicwrites
milksnake
shippai
];
nativeBuildInputs = [
setuptools_scm
];
checkInputs = [
hypothesis
pytest
pytest-localserver
pytest-subtesthack
];
patches = [
(fetchpatch {
url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch";
sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9";
})
];
postPatch = ''
# see https://github.com/pimutils/vdirsyncer/pull/805
substituteInPlace setup.cfg --replace --duration --durations
# for setuptools_scm:
echo 'Version: ${version}' >PKG-INFO
sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
# fixing test
sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
'';
preBuild = ''
mkdir -p rust/target/release
ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
'';
checkPhase = ''
rm -rf vdirsyncer
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test
'';
meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
maintainers = with maintainers; [ matthiasbeyer gebner ];
license = licenses.mit;
};
}

View File

@@ -0,0 +1,88 @@
{ stdenv
, pythonAtLeast
, buildPythonPackage
, fetchPypi
, isPy27
, fetchpatch
, click
, click-log
, click-threading
, requests_toolbelt
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
, milksnake
, shippai
, hypothesis
, pytest
, 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";
pname = "vdirsyncer";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef";
};
propagatedBuildInputs = [
click click-log click-threading
requests_toolbelt
requests
requests_oauthlib # required for google oauth sync
atomicwrites
];
nativeBuildInputs = [
setuptools_scm
];
checkInputs = [
hypothesis
pytest
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' ""
'';
checkPhase = ''
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test
'';
# 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;
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 ];
};
}