diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-16 11:15:46 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-16 11:15:46 +0200 |
| commit | a28a9ac156b921f394882be3c282e906f4662af5 (patch) | |
| tree | d673d7f563445d1d7493734d3cbdfefecb4734bd /pkgs/top-level/python-packages.nix | |
| parent | e29cf290867c6781896bb191df057a6065fdf57b (diff) | |
| parent | 0ddb9e04957e372eacfd7aedd8135cd605bc7517 (diff) | |
| download | nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.gz nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.bz2 nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.lz nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.xz nixlib-a28a9ac156b921f394882be3c282e906f4662af5.tar.zst nixlib-a28a9ac156b921f394882be3c282e906f4662af5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ed5c7753f08..b8e85d775f5d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2712,7 +2712,7 @@ in { filelock = callPackage ../development/python-modules/filelock {}; - fiona = callPackage ../development/python-modules/fiona { gdal = pkgs.gdal; }; + fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; fitbit = callPackage ../development/python-modules/fitbit { }; @@ -4028,11 +4028,7 @@ in { pyotp = callPackage ../development/python-modules/pyotp { }; - pyproj = callPackage ../development/python-modules/pyproj { - # pyproj does *work* if you want to use a system supplied proj, but with the current version(s) the tests fail by - # a few decimal places, so caveat emptor. - proj = null; - }; + pyproj = callPackage ../development/python-modules/pyproj { }; pyqrcode = callPackage ../development/python-modules/pyqrcode { }; @@ -4230,7 +4226,9 @@ in { rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - rasterio = callPackage ../development/python-modules/rasterio { }; + rasterio = callPackage ../development/python-modules/rasterio { + gdal = pkgs.gdal_2; # gdal 3.0 not supported yet + }; radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; @@ -4637,6 +4635,8 @@ in { virtualenv = callPackage ../development/python-modules/virtualenv { }; + vsts = callPackage ../development/python-modules/vsts { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; webassets = callPackage ../development/python-modules/webassets { }; |