diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/python-modules/fiona | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/fiona')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/fiona/default.nix | 63 |
1 files changed, 43 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 3cd8eef93277..3e9430ef318b 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -1,28 +1,46 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder -, attrs, click, cligj, click-plugins, six, munch, enum34 -, pytestCheckHook, boto3, mock, giflib, pytz -, gdal, certifi +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, cython +, gdal +, setuptools +, attrs +, certifi +, click +, click-plugins +, cligj +, munch +, shapely +, boto3 +, pytestCheckHook +, pytz }: buildPythonPackage rec { pname = "fiona"; - version = "1.8.21"; + version = "1.9.1"; - src = fetchPypi { - pname = "Fiona"; - inherit version; - sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w="; - }; + disabled = pythonOlder "3.7"; + + format = "pyproject"; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + src = fetchFromGitHub { + owner = "Toblerity"; + repo = "Fiona"; + rev = "refs/tags/${version}"; + hash = "sha256-2CGLkgnpCAh9G+ILol5tmRj9S6/XeKk8eLzGEODiyP8="; + }; nativeBuildInputs = [ + cython gdal # for gdal-config + setuptools ]; buildInputs = [ gdal - ] ++ lib.optionals stdenv.cc.isClang [ giflib ]; + ]; propagatedBuildInputs = [ attrs @@ -30,20 +48,22 @@ buildPythonPackage rec { click cligj click-plugins - six munch - pytz - ] ++ lib.optional (!isPy3k) enum34; + setuptools + ]; + + passthru.optional-dependencies = { + calc = [ shapely ]; + s3 = [ boto3 ]; + }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook - boto3 - ] ++ lib.optional (pythonOlder "3.4") mock; + pytz + ] ++ passthru.optional-dependencies.s3; preCheck = '' rm -r fiona # prevent importing local fiona - # disable gdal deprecation warnings - export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ @@ -51,7 +71,10 @@ buildPythonPackage rec { "http" "https" "wheel" ]; + pythonImportsCheck = [ "fiona" ]; + meta = with lib; { + changelog = "https://github.com/Toblerity/Fiona/blob/${src.rev}/CHANGES.txt"; description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; license = licenses.bsd3; |