From 803d2e92b2e015f13564bebcfd080eaf8fe57e13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 14:38:44 +0000
Subject: [PATCH 1/3] proj: 9.4.1 -> 9.5.0

---
 pkgs/development/libraries/proj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 615d2590c023..217399deb1c3 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.1";
+  version = "9.5.0";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = finalAttrs.version;
-    hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU=";
+    hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM=";
   };
 
   patches = [

From 494502306d4eb9c264d638bd53b43f6554468802 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 1 Oct 2024 09:46:34 +0200
Subject: [PATCH 2/3] python3Packages.pyproj: 3.6.1 -> 3.7.0

---
 pkgs/development/python-modules/pyproj/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 4b3a6fedd030..56cbbf37bc7b 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pyproj";
-  version = "3.6.1";
+  version = "3.7.0";
   format = "setuptools";
   disabled = pythonOlder "3.9";
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "pyproj4";
     repo = "pyproj";
     rev = "refs/tags/${version}";
-    hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA=";
+    hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM=";
   };
 
   # force pyproj to use ${proj}
@@ -37,12 +37,6 @@ 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 ];

From c0f03388ef332178a95b6cb807d37ee6ff9c5694 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 1 Oct 2024 13:33:41 +0200
Subject: [PATCH 3/3] gdal: disable test failing with proj 9.5

---
 pkgs/development/libraries/gdal/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 6bddc8c6b5e5..02d983b9f495 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch";
       sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls=";
     })
+    # disable test failing with proj 9.5
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/bb9e5c0ec3e45b0f3e60c4d284e4082550448480.patch";
+      hash = "sha256-TpjlxTH/51aRZkogpJuiNlfz3RLCe80wQVD4i+5m+Pw=";
+    })
   ];
 
   nativeBuildInputs = [