diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
commit | 9548028a22f3fbc44a450d5ccedaa722479a23ec (patch) | |
tree | 4e405124ab321c69cd9997348fc4fec54540c1a2 /pkgs/top-level/python-packages.nix | |
parent | c08e4b9102f1b1bd7cd23cc84c61292f1f45aa7e (diff) | |
parent | da82aff2b05c684cc8239627b54a30002281e35b (diff) | |
download | nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.gz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.bz2 nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.lz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.xz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.zst nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/os-specific/linux/cpupower/default.nix
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb7718a0c07e..cc81116cf3e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -155,6 +155,8 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; + aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; ansicolor = callPackage ../development/python-modules/ansicolor { }; @@ -623,6 +625,8 @@ in { }; }; + asynctest = callPackage ../development/python-modules/asynctest { }; + async-timeout = callPackage ../development/python-modules/async_timeout { }; asn1ate = callPackage ../development/python-modules/asn1ate { }; @@ -2028,6 +2032,11 @@ in { doCheck = false; }); + can = callPackage ../development/python-modules/can {}; + + canopen = callPackage ../development/python-modules/canopen {}; + + canmatrix = callPackage ../development/python-modules/canmatrix {}; cairocffi = buildPythonPackage rec { name = "cairocffi-0.7.2"; @@ -2124,26 +2133,6 @@ in { }; }; - github-cli = buildPythonPackage rec { - version = "1.0.0"; - name = "github-cli-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jsmits"; - repo = "github-cli"; - rev = version; - sha256 = "16bwn42wqd76zs97v8p6mqk79p5i2mb06ljk67lf8gy6kvqc1x8y"; - }; - - buildInputs = with self; [ nose pkgs.git ]; - propagatedBuildInputs = with self; [ simplejson ]; - - # skipping test_issues_cli.py since it requires access to the github.com - patchPhase = "rm tests/test_issues_cli.py"; - checkPhase = "nosetests tests/"; - - meta.maintainers = with maintainers; [ garbas ]; - }; - case = buildPythonPackage rec { name = "case-${version}"; version = "1.5.2"; @@ -3797,7 +3786,8 @@ in { }; }); - nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; + nose-parameterized = warn "Warning: `nose-parameterized` is deprecated! Use `parameterized` instead." + (callPackage ../development/python-modules/nose-parameterized {}); neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; @@ -5222,6 +5212,8 @@ in { }; }; + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; version = "0.4.2.post1"; @@ -5568,6 +5560,8 @@ in { }; }; + luftdaten = callPackage ../development/python-modules/luftdaten { }; + m2r = callPackage ../development/python-modules/m2r { }; mailchimp = buildPythonPackage rec { @@ -12357,6 +12351,8 @@ in { }; }; + parameterized = callPackage ../development/python-modules/parameterized { }; + paramz = callPackage ../development/python-modules/paramz { }; parsel = buildPythonPackage rec { @@ -12780,6 +12776,8 @@ in { kmsxx = callPackage ../development/libraries/kmsxx { }; + pybase64 = callPackage ../development/python-modules/pybase64 { }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; |