From 99d62657f5eefac06c177d3e9e777266a93f21d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 13 Apr 2026 10:51:17 -0700 Subject: [PATCH 1/2] proj: 9.8.0 -> 9.8.1 Diff: https://github.com/OSGeo/PROJ/compare/9.8.0...9.8.1 Changelog: https://github.com/OSGeo/PROJ/blob/9.8.1/NEWS.md --- pkgs/by-name/pr/proj/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix index daa00097c6df..cd72a4a99b79 100644 --- a/pkgs/by-name/pr/proj/package.nix +++ b/pkgs/by-name/pr/proj/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.8.0"; + version = "9.8.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; tag = finalAttrs.version; - hash = "sha256-LvzQ2sW+h5uHJg+6z8/Nf99EVIPUQfWoaNr0iFUpD/0="; + hash = "sha256-sOAxWihgU1TAMWcju5LN4cPenHHoGgd4oYJ4HA3F/Ks="; }; patches = [ From 9ee7d6e54c1c6e29e63f97addf941db119348d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 10 May 2026 12:08:02 -0700 Subject: [PATCH 2/2] python3Packages.pyproj: skip failing tests --- pkgs/development/python-modules/pyproj/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 08af3c39b38c..d4ceed75a4ca 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -43,14 +43,6 @@ buildPythonPackage rec { url = "https://github.com/pyproj4/pyproj/pull/1560.diff?full_index=1"; hash = "sha256-fr+lvDeVFDagc9aHzaQhyZtWK2sy5kR7iImJsuxW8Z4="; }) - (fetchpatch2 { - url = "https://github.com/pyproj4/pyproj/pull/1568.diff?full_index=1"; - hash = "sha256-fVFg3/ikOk6LiRHA/u14g+ZFsROGE7me878Vvq4mxG4="; - }) - (fetchpatch2 { - url = "https://github.com/pyproj4/pyproj/pull/1581.diff?full_index=1"; - hash = "sha256-EdzUCt4P99ENS2qCBU30FUNnJYD0B2CqcmZXwEYLdVA="; - }) ]; build-system = [ @@ -90,6 +82,10 @@ buildPythonPackage rec { "test_sync__source_id__list" "test_sync_download" "test_transformer_group__download_grids" + # https://github.com/pyproj4/pyproj/issues/1588 + "test_coordinate_operation__from_string" + "test_transformer_from_pipeline__input_types" + "test_transformer_from_pipeline__wkt_json" ]; pythonImportsCheck = [