diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7521f48512..efc63f5c9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2020, 2021 Lars-Dominik Braun ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Antoine Côté -;;; Copyright © 2020 Arun Isaac +;;; Copyright © 2020, 2026 Arun Isaac ;;; Copyright © 2020 Magali Lemes ;;; Copyright © 2020-2023, 2025 Simon Tournier ;;; Copyright © 2020 Aniket Patil @@ -36703,7 +36703,7 @@ information about geometries.") openssh openssl pcre2 - proj + proj-9.3 sqlite zlib)) (propagated-inputs @@ -41216,7 +41216,7 @@ emphasize hidden group structures in networks or focus on specific nodes.") gdal geos pcre2 - proj + proj-9.3 sqlite onetbb zlib)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 082a1d97ec..7fee1aa639 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018 Björn Höfling ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2023-2025 Ricardo Wurmus -;;; Copyright © 2018, 2019 Arun Isaac +;;; Copyright © 2018, 2019, 2026 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller ;;; Copyright © 2019-2023, 2025 Guillaume Le Vaillant @@ -997,7 +997,7 @@ hydrology and waste deposition.") (define-public proj (package (name "proj") - (version "9.3.1") + (version "9.7.1") (source (origin (method url-fetch) @@ -1005,7 +1005,7 @@ hydrology and waste deposition.") version ".tar.gz")) (sha256 (base32 - "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh")))) + "03r6mspfv22fs4x4jcgv25v9gsj5k6zy8incvyf94qf50g47s2bc")))) (build-system cmake-build-system) (native-inputs (list googletest pkg-config)) (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc @@ -1025,6 +1025,19 @@ lets developers use the functionality of Proj in their own software.") ;; src/geodesic.*, src/tests/geodtest.cpp license:x11)))) +(define-public proj-9.3 + (package + (inherit proj) + (version "9.3.1") + (source + (origin + (method url-fetch) + (uri (string-append "http://download.osgeo.org/proj/proj-" + version ".tar.gz")) + (sha256 + (base32 + "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh")))))) + (define-public python-obspy (package (name "python-obspy") @@ -1179,7 +1192,7 @@ steps of converting to and from Python data types within Python.") ;; pyproj when running tests. (delete-file-recursively "pyproj")))))) (inputs - (list proj)) + (list proj-9.3)) (propagated-inputs (list python-certifi)) (native-inputs @@ -1776,7 +1789,7 @@ vector data.") openjpeg pcre2 postgresql ; libpq - proj + proj-9.3 qhull shapelib sqlite @@ -3964,7 +3977,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)") netcdf pdal postgresql - proj + proj-9.3 protobuf python python-chardet diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index ac1e314b38..9264df9359 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2025, 2026 Andreas Enge ;;; Copyright © 2025 dan ;;; Copyright © 2026 Cayetano Santos +;;; Copyright © 2026 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -456,7 +457,7 @@ many popular formats.") libpng libtiff openmpi - proj + proj-9.3 python ;("pugixml" ,pugixml) sqlite