Merge pull request #220067 from dotlambda/proj-9.2.0

proj: 9.1.1 -> 9.2.0

pkgs/development/libraries/gdal/default.nix

@@ -61,13 +61,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  version = "3.6.2";
+  version = "3.6.3";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     rev = "v${version}";
-    hash = "sha256-fdj/o+dm7V8QLrjnaQobaFX80+penn+ohx/yNmUryRA=";
+    hash = "sha256-Rg/dvSkq1Hn8NgZEE0ID92Vihyw7MA78OBnON8Riy38=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/proj/default.nix

@@ -17,22 +17,18 @@
 
 stdenv.mkDerivation (finalAttrs: rec {
   pname = "proj";
-  version = "9.1.1";
+  version = "9.2.0";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = version;
-    hash = "sha256-yw7eSm64qFFt9egJWKVyVo0e7xQRSmfUY7pk6Cwvwdk=";
+    hash = "sha256-NC5H7ufIXit+PVDwNDhz5cv44fduTytsdmNOWyqDDYQ=";
   };
 
   patches = [
     # https://github.com/OSGeo/PROJ/pull/3252
-    (fetchpatch {
-      name = "only-add-find_dependencyCURL-for-static-builds.patch";
-      url = "https://github.com/OSGeo/PROJ/commit/11f4597bbb7069bd5d4391597808703bd96df849.patch";
-      hash = "sha256-4w5Cu2m5VJZr6E2dUVRyWJdED2TyS8cI8G20EwfQ4u0=";
-    })
+    ./only-add-curl-for-static-builds.patch
   ];
 
   outputs = [ "out" "dev" ];
@@ -68,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   };
 
   meta = with lib; {
+    changelog = "https://github.com/OSGeo/PROJ/blob/${src.rev}/docs/source/news.rst";
     description = "Cartographic Projections Library";
     homepage = "https://proj.org/";
     license = licenses.mit;

pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch

@@ -0,0 +1,55 @@
+From 831063f8206cab1ad3e90b204a1c3f8c87c3d5cc Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Tue, 5 Jul 2022 19:40:53 +0200
+Subject: [PATCH] proj-config.cmake generation: only add find_dependency(CURL)
+ for static builds
+
+---
+ cmake/project-config.cmake.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
+index 40dbaaa2..c1ecd601 100644
+--- a/cmake/project-config.cmake.in
++++ b/cmake/project-config.cmake.in
+@@ -15,20 +15,24 @@ include(CMakeFindDependencyMacro)
+ 
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0012 NEW)
+-if("@ENABLE_TIFF@")
+-    find_dependency(TIFF)
++if(NOT "@BUILD_SHARED_LIBS@")
++    if("@ENABLE_TIFF@")
++        find_dependency(TIFF)
++    endif()
+ endif()
+-if("@CURL_ENABLED@")
+-  # Chainload CURL usage requirements
+-  find_dependency(CURL)
+-  # Target CURL::libcurl only defined since CMake 3.12
+-  if(NOT TARGET CURL::libcurl)
+-      add_library(CURL::libcurl INTERFACE IMPORTED)
+-      set_target_properties(CURL::libcurl PROPERTIES
+-        INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
+-        INTERFACE_LINK_LIBRARIES      "${CURL_LIBRARIES}"
+-      )
+-  endif()
++if(NOT "@BUILD_SHARED_LIBS@")
++    if("@CURL_ENABLED@")
++      # Chainload CURL usage requirements
++      find_dependency(CURL)
++      # Target CURL::libcurl only defined since CMake 3.12
++      if(NOT TARGET CURL::libcurl)
++          add_library(CURL::libcurl INTERFACE IMPORTED)
++          set_target_properties(CURL::libcurl PROPERTIES
++            INTERFACE_INCLUDE_DIRECTORIES "${CURL_INCLUDE_DIRS}"
++            INTERFACE_LINK_LIBRARIES      "${CURL_LIBRARIES}"
++          )
++      endif()
++    endif()
+ endif()
+ cmake_policy(POP)
+ 
+-- 
+2.39.2
+

pkgs/development/python-modules/affine/default.nix

@@ -1,21 +1,37 @@
-{ buildPythonPackage, pytest, lib, fetchPypi }:
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, flit-core
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "affine";
   version = "2.4.0";
 
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ok2BjWqDbBMZdtIvjCe408oy0K9kwdjSnet7r6TaHuo=";
   };
 
-  nativeCheckInputs = [ pytest ];
-  checkPhase = "py.test";
+  nativeBuildInputs = [
+    flit-core
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/rasterio/affine/blob/${version}/CHANGES.txt";
     description = "Matrices describing affine transformation of the plane";
     license = licenses.bsd3;
-    homepage = "https://github.com/sgillies/affine";
+    homepage = "https://github.com/rasterio/affine";
     maintainers = with maintainers; [ mredaelli ];
   };
 

pkgs/development/python-modules/basemap/default.nix

@@ -11,6 +11,7 @@
 , pyproj
 , pyshp
 , python
+, pythonRelaxDepsHook
 , setuptools
 }:
 
@@ -30,9 +31,12 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cython
     geos
+    pythonRelaxDepsHook
     setuptools
   ];
 
+  pythonRelaxDeps = true;
+
   propagatedBuildInputs = [
     basemap-data
     numpy

pkgs/development/python-modules/labelbox/default.nix

@@ -5,6 +5,8 @@
 , geojson
 , google-api-core
 , imagesize
+, nbconvert
+, nbformat
 , ndjson
 , numpy
 , opencv
@@ -42,7 +44,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pytest.ini \
-      --replace "-s -vv -x --reruns 5 --reruns-delay 10 --durations=20" "-s -vv -x --durations=20"
+      --replace "--reruns 5 --reruns-delay 10" ""
   '';
 
   nativeBuildInputs = [
@@ -79,6 +81,8 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    nbconvert
+    nbformat
     pytest-cases
     pytestCheckHook
   ] ++ passthru.optional-dependencies.data;
@@ -90,6 +94,11 @@ buildPythonPackage rec {
     "tests/data"
   ];
 
+  pytestFlagsArray = [
+    # see tox.ini
+    "-k 'not notebooks'"
+  ];
+
   pythonImportsCheck = [
     "labelbox"
   ];

pkgs/development/python-modules/pyproj/default.nix

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , python
 , proj
 , pythonOlder
@@ -34,6 +35,23 @@ buildPythonPackage rec {
       proj = proj;
       projdev = proj.dev;
     })
+    # update tests for PROJ 9.2
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/59d16f57387bbd09b4d61ab95ac520cfec103af1.patch";
+      hash = "sha256-pSDkb+c02KNNlGPwBN/9TQdVJorLr2xvvFB92h84OsQ=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/dd06b3fee4eaafe80da3414560107ecdda42f5e0.patch";
+      hash = "sha256-6CFVdtovfGqWGXq4auX2DtY7sT4Y0amTJ7phjq5emYM=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/9283f962e4792da2a7f05ba3735c1ed7f3479502.patch";
+      hash = "sha256-GVYXOAQBHL5WkAF7OczHyGxo7vq8LmT7I/R1jUPCxi4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/pyproj4/pyproj/commit/9dfbb2465296cc8f0de2ff1d68a9b65f7cef52e1.patch";
+      hash = "sha256-F+qS9JZF0JjqyapFhEhIcZ/WHJyfI3jiMC8K7uTpWUA=";
+    })
   ];
 
   nativeBuildInputs = [ cython ];