diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-30 13:37:39 +0100 |
| commit | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (patch) | |
| tree | 38e753812c0ceba947d65ec0555a5a66c1a5aa4e /nixpkgs/pkgs/development/python-modules/fiona | |
| parent | 46cf147fc42b72f68ecd52b3b03a8bfd6077f42b (diff) | |
| parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) | |
| download | nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.gz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.bz2 nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.lz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.xz nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.tar.zst nixlib-7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769.zip | |
Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/fiona')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/fiona/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 1fe53065d9ee..8513c723bf00 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, cython +, cython_3 , gdal +, oldest-supported-numpy , setuptools , wheel , attrs @@ -20,8 +21,8 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.9.4.post1"; - format = "pyproject"; + version = "1.9.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,21 +30,13 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "Fiona"; rev = "refs/tags/${version}"; - hash = "sha256-CeGdWAmWteVtL0BoBQ1sB/+1AWkmxogtK99bL5Fpdbw="; + hash = "sha256-fq/BuyzuK4iOxdpE4h+KRH0CxOEk/wdmbb9KgCfJ1cw="; }; - postPatch = '' - # Remove after https://github.com/Toblerity/Fiona/pull/1225 is released - sed -i '/"oldest-supported-numpy"/d' pyproject.toml - - # Remove after https://github.com/Toblerity/Fiona/pull/1281 is released, - # after which cython also needs to be updated to cython_3 - sed -i 's/Cython~=/Cython>=/' pyproject.toml - ''; - nativeBuildInputs = [ - cython + cython_3 gdal # for gdal-config + oldest-supported-numpy setuptools wheel ]; |