diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-05-22 17:48:29 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-05-22 17:48:29 +0300 |
| commit | f9feacfc7c389bacb937e24d7cccfe013271efaa (patch) | |
| tree | 264c2e15652058f1f1dc16fa4739d453c533ba58 /pkgs/top-level/python-packages.nix | |
| parent | db4d77779c9b52a35c5a4306d36e2727cba1b162 (diff) | |
| parent | c8a4562f5966e90cbbe04195b4a37a5d4a334f60 (diff) | |
| download | nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.gz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.bz2 nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.lz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.xz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.zst nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c8a2dae4f93..f5428b63bcf7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -319,6 +319,8 @@ in { pyaes = callPackage ../development/python-modules/pyaes { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyarrow = callPackage ../development/python-modules/pyarrow { @@ -13039,15 +13041,7 @@ in { }; }; - timeout-decorator = buildPythonPackage rec { - name = "timeout-decorator-${version}"; - version = "0.3.2"; - - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/t/timeout-decorator/${name}.tar.gz"; - sha256 = "1x9l8bwdk72if2d5h5mi4lcaidbsmyh0iz114cfyyj1rzz5rxqaf"; - }; - }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; pid = buildPythonPackage rec { name = "pid-${version}"; @@ -18183,6 +18177,8 @@ EOF prometheus_client = callPackage ../development/python-modules/prometheus_client { }; pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + + pyogg = callPackage ../development/python-modules/pyogg { }; }); in fix' (extends overrides packages) |