diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2026-02-11 13:46:19 +0000 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2026-02-21 23:53:04 +0000 |
| commit | 2ce4c45f86f28d961cad9f09b07b902367ea3045 (patch) | |
| tree | 1cfbcd738b0d8bc481623d338a54fa257916c24d /gnu | |
| parent | 373384486d3cb85e7ac8acf173121cda7052b5c7 (diff) | |
gnu: proj: Update to 9.7.1.
* gnu/packages/geo.scm (proj): Update to 9.7.1.
(proj-9.3): New variable.
(gdal, python-pyproj, qgis)[inputs]: Replace proj with proj-9.3.
* gnu/packages/cran.scm (r-sf, r-terra)[inputs]: Replace proj with proj-9.3.
* gnu/packages/image-processing.scm (vtk)[inputs]: Replace proj with
proj-9.3.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cran.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/geo.scm | 25 | ||||
| -rw-r--r-- | gnu/packages/image-processing.scm | 3 |
3 files changed, 24 insertions, 10 deletions
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7521f485128..efc63f5c9b4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2020, 2021 Lars-Dominik Braun <ldb@leibniz-psychology.org> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net> -;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2020, 2026 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Magali Lemes <magalilemes00@gmail.com> ;;; Copyright © 2020-2023, 2025 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 Aniket Patil <aniket112.patil@gmail.com> @@ -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 082a1d97ec1..7fee1aa6399 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2023-2025 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2018, 2019, 2026 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com> ;;; Copyright © 2018, 2019, 2020, 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019-2023, 2025 Guillaume Le Vaillant <glv@posteo.net> @@ -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 ac1e314b383..9264df93590 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2025, 2026 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2025 dan <i@dan.games> ;;; Copyright © 2026 Cayetano Santos <csantosb@inventati.org> +;;; Copyright © 2026 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; 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 |
