From 06960ac6a7b58af84aeccd208b663443b39a6600 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 9 Jul 2019 17:42:01 -0700 Subject: pythonPackages.pyproj: unstable-2018-11-13 -> 2.2.1 --- pkgs/top-level/python-packages.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5dac3b894f56..2150ed83c414 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4032,11 +4032,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 { }; -- cgit 1.4.1 From ca0fe27302a53daf935e8d5fb2b4d034e5b3b0eb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 13 Jul 2019 21:00:48 -0700 Subject: pythonPackages.fiona: pin gdal to gdal_2 --- pkgs/development/python-modules/fiona/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index ebd100037b25..6dd74742741e 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytest, boto3, mock -, gdal +, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745 }: buildPythonPackage rec { @@ -16,11 +16,11 @@ buildPythonPackage rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; nativeBuildInputs = [ - gdal # for gdal-config + gdal_2 # for gdal-config ]; buildInputs = [ - gdal + gdal_2 ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2150ed83c414..5e30355698a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2718,7 +2718,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 { }; -- cgit 1.4.1 From ca6afcb9dae021d08a6a10ce050a2e0fb86a9153 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 13 Jul 2019 23:30:57 -0700 Subject: pythonPackages.rasterio: fix to gdal_2 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e30355698a6..44cb3c6104db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4230,7 +4230,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 {}; -- cgit 1.4.1 From 2e1a90e5d018a5e6b1dc1b5b3c726d6be26b22f8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 15 Jun 2019 21:58:19 -0700 Subject: pythonPackages.vsts: init at 0.1.25 --- pkgs/development/python-modules/vsts/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/vsts/default.nix (limited to 'pkgs/top-level/python-packages.nix') diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix new file mode 100644 index 000000000000..0f49ffd05c60 --- /dev/null +++ b/pkgs/development/python-modules/vsts/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, lib +, python +, fetchPypi +, msrest +}: + +buildPythonPackage rec { + version = "0.1.25"; + pname = "vsts"; + + src = fetchPypi { + inherit pname version; + sha256 = "15sgwqa72ynpahj101r2kc15s3dnsafg5gqx0sz3hnqz29h925ys"; + }; + + propagatedBuildInputs = [ msrest ]; + + # Tests are highly impure + checkPhase = '' + ${python.interpreter} -c 'import vsts.version; print(vsts.version.VERSION)' + ''; + + meta = with lib; { + description = "Python APIs for interacting with and managing Azure DevOps"; + homepage = https://github.com/microsoft/azure-devops-python-api; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ed5c7753f08..7b95941d0649 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4637,6 +4637,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 { }; -- cgit 1.4.1