diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 0a0ae87dc628..8fedba3ef08c 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.4.0"; + version = "9.4.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; + hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU="; }; patches = [ diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index f76fd0e0f4f5..4b3a6fedd030 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -2,17 +2,18 @@ lib, buildPythonPackage, fetchFromGitHub, - python, - proj, + fetchpatch, + pytestCheckHook, pythonOlder, substituteAll, - cython, - pytestCheckHook, - mock, + certifi, + cython, + mock, numpy, - shapely, pandas, + proj, + shapely, xarray, }: @@ -36,6 +37,12 @@ buildPythonPackage rec { proj = proj; projdev = proj.dev; }) + + # fix test failure caused by update of EPSG DB + (fetchpatch { + url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch"; + hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE="; + }) ]; nativeBuildInputs = [ cython ]; @@ -44,11 +51,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi ]; nativeCheckInputs = [ - pytestCheckHook mock numpy - shapely pandas + pytestCheckHook + shapely xarray ];