diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-22 23:34:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-13 17:34:23 +0000 |
| commit | 41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e (patch) | |
| tree | 28aa38e222bc0ace9be6440cd66255b65690fb88 /nixpkgs/pkgs/top-level/python-packages.nix | |
| parent | 9b7e3c15392a628ca748f9452016e4a6b02fe98f (diff) | |
| parent | 373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c (diff) | |
| download | nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.gz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.bz2 nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.lz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.xz nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.tar.zst nixlib-41bbe979b4dbb8a67f2d4f8c0e4975debb90dd6e.zip | |
Merge commit '373488e6f4c3dc3bb51cabcb959e4a70eb5d7b2c'
Diffstat (limited to 'nixpkgs/pkgs/top-level/python-packages.nix')
| -rw-r--r-- | nixpkgs/pkgs/top-level/python-packages.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index e2b9c35b5323..770ca8b3d0cb 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -997,8 +997,6 @@ in { astor = callPackage ../development/python-modules/astor {}; - asyncio = callPackage ../development/python-modules/asyncio {}; - asyncssh = callPackage ../development/python-modules/asyncssh { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; @@ -1195,8 +1193,6 @@ in { csscompressor = callPackage ../development/python-modules/csscompressor {}; - csvkit = callPackage ../development/python-modules/csvkit { }; - cufflinks = callPackage ../development/python-modules/cufflinks { }; cupy = callPackage ../development/python-modules/cupy { @@ -1325,9 +1321,10 @@ in { canmatrix = callPackage ../development/python-modules/canmatrix {}; - cairocffi = let - inherit (callPackage ../development/python-modules/cairocffi {}) cairocffi_1_0 cairocffi_0_9; - in if isPy3k then cairocffi_1_0 else cairocffi_0_9; + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi {} + else + callPackage ../development/python-modules/cairocffi/0_9.nix {}; cairosvg = if isPy3k then callPackage ../development/python-modules/cairosvg {} |