From d299ad031f198d344387f157502dc9dbb2545b28 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 1 Feb 2023 12:36:07 +0100 Subject: [PATCH] python3Packages.fiona: 1.8.22 -> 1.9.0 * update package to version 1.9.0 * drop patch which is applied by upstream * add cython to nativeBuildInputs * add pythonImportsCheck --- .../python-modules/fiona/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 852e0a18e91d..fec7fac990cd 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -1,31 +1,23 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder, cython , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz , gdal, certifi -, fetchpatch }: buildPythonPackage rec { pname = "fiona"; - version = "1.8.22"; + version = "1.9.0"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM="; + hash = "sha256-bkh8v7pahJ+98G5FFp/X4fFmL0Tz1xerS5RgRrJFfq4="; }; - patches = [ - # https://github.com/Toblerity/Fiona/pull/1122 - (fetchpatch { - url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch"; - hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY="; - }) - ]; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; nativeBuildInputs = [ + cython gdal # for gdal-config ]; @@ -62,6 +54,8 @@ buildPythonPackage rec { "test_no_append_driver_cannot_append" ]; + pythonImportsCheck = [ "fiona" ]; + meta = with lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/";