Package: guix-patches;
Reported by: Vinicius Monego <monego <at> posteo.net>
Date: Thu, 30 May 2024 18:10:01 UTC
Severity: normal
Tags: patch
Done: Andreas Enge <andreas <at> enge.fr>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Andreas Enge <andreas <at> enge.fr> Cc: tracker <at> debbugs.gnu.org Subject: bug#71279: closed ([PATCH 1/3] gnu: grass: Improve package style.) Date: Mon, 31 Mar 2025 14:58:03 +0000
[Message part 1 (text/plain, inline)]
Your message dated Mon, 31 Mar 2025 16:57:18 +0200 with message-id <Z-qtTlZKVbo5dehj <at> jurong> and subject line Re: [PATCH v2 1/4] gnu: grass: Improve package style. has caused the debbugs.gnu.org bug report #71279, regarding [PATCH 1/3] gnu: grass: Improve package style. to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 71279: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=71279 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Vinicius Monego <monego <at> posteo.net> To: guix-patches <at> gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 1/3] gnu: grass: Improve package style. Date: Thu, 30 May 2024 18:08:50 +0000* gnu/packages/geo.scm (grass)[inputs, native-inputs]: Remove package labels. [arguments]: Use G-Expressions and Gexp variables. Remove trailing #t from phases. Change-Id: Ifa2d992da5ffb14ee178ad811046ab90d6ab87cd --- gnu/packages/geo.scm | 140 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 72 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c9152fb4f8..e79b2fc4b3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2744,106 +2744,102 @@ (define-public grass (base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms")))) (build-system gnu-build-system) (inputs - `(("bzip2" ,bzip2) - ("cairo" ,cairo) - ("fftw" ,fftw) - ("freetype" ,freetype) - ("gdal" ,gdal) - ("geos" ,geos) - ("glu" ,glu) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("mesa" ,mesa) - ("mariadb-dev" ,mariadb "dev") - ("mariadb-lib" ,mariadb "lib") - ("netcdf" ,netcdf) - ("openblas" ,openblas) - ("perl" ,perl) - ("postgresql" ,postgresql) - ("proj" ,proj) - ("python" ,python) - ("python-dateutil" ,python-dateutil) - ("python-numpy" ,python-numpy) - ("python-wxpython" ,python-wxpython) - ("readline" ,readline) - ("sqlite" ,sqlite) - ("wxwidgets" ,wxwidgets) - ("zlib" ,zlib) - ("zstd" ,zstd "lib"))) + (list bzip2 + cairo + fftw + freetype + gdal + geos + glu + libpng + libtiff + mesa + `(,mariadb "dev") + `(,mariadb "lib") + netcdf + openblas + perl + postgresql + proj + python + python-dateutil + python-numpy + python-wxpython + readline + sqlite + wxwidgets + zlib + `(,zstd "lib"))) (native-inputs - `(("bash" ,bash-minimal) - ("bison" ,bison) - ("flex" ,flex) - ("pkg-config" ,pkg-config))) + (list bash-minimal + bison + flex + pkg-config)) (arguments - `(#:tests? #f ; No tests - #:modules ((guix build gnu-build-system) + (list + #:tests? #f ; No tests + #:modules `((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules `(,@%gnu-build-system-modules (guix build python-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-lapack - (lambda _ - (substitute* "./configure" - (("-lblas") "-lopenblas") - (("-llapack") "-lopenblas")))) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((shell (search-input-file inputs "/bin/bash"))) - (setenv "SHELL" shell) - (setenv "CONFIG_SHELL" shell) - (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," - (assoc-ref outputs "out") - "/" ,grassxx "/lib"))) - (invoke "./configure" - (string-append "--prefix=" - (assoc-ref outputs "out")) - "--with-blas" - "--with-bzlib" - (string-append "--with-freetype-includes=" - (assoc-ref inputs "freetype") - "/include/freetype2") - (string-append "--with-freetype-libs=" - (assoc-ref inputs "freetype") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-lapack + (lambda _ + (substitute* "./configure" + (("-lblas") "-lopenblas") + (("-llapack") "-lopenblas")))) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((shell (search-input-file inputs "/bin/bash"))) + (setenv "SHELL" shell) + (setenv "CONFIG_SHELL" shell) + (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," + #$output + "/" #$grassxx "/lib"))) + (invoke "./configure" + (string-append "--prefix=" #$output) + "--with-blas" + "--with-bzlib" + (string-append "--with-freetype-includes=" + #$(this-package-input "freetype") + "/include/freetype2") + (string-append "--with-freetype-libs=" + #$(this-package-input "freetype") "/lib") "--with-geos" "--with-lapack" "--with-mysql" (string-append "--with-mysql-includes=" - (assoc-ref inputs "mariadb-dev") + (ungexp (this-package-input "mariadb") "dev") "/include/mysql") (string-append "--with-mysql-libs=" - (assoc-ref inputs "mariadb-lib") + (ungexp (this-package-input "mariadb") "lib") "/lib") "--with-netcdf" "--with-postgres" (string-append "--with-proj-share=" - (assoc-ref inputs "proj") + #$(this-package-input "proj") "/share/proj") "--with-pthread" "--with-readline" "--with-sqlite" "--with-wxwidgets"))) (add-after 'install 'install-links - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Put links for includes and libraries in the standard places. - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/" ,grassxx))) + (let* ((dir (string-append #$output "/" #$grassxx))) (symlink (string-append dir "/include") - (string-append out "/include")) + (string-append #$output "/include")) (symlink (string-append dir "/lib") - (string-append out "/lib"))) - #t)) + (string-append #$output "/lib"))))) (add-after 'install-links 'python:wrap (assoc-ref python:%standard-phases 'wrap)) (add-after 'python:wrap 'wrap-with-python-interpreter - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/" ,grassxx) - `("GRASS_PYTHON" = (,(which "python3")))) - #t)))))) + (lambda _ + (wrap-program (string-append #$output "/bin/" #$grassxx) + `("GRASS_PYTHON" = (,(which "python3"))))))))) (synopsis "GRASS Geographic Information System") (description "GRASS (Geographic Resources Analysis Support System), is a Geographic base-commit: dc8fb5672464b6386f6b4b94723f9b36edc4e625 prerequisite-patch-id: 773c85d1be2cd6c14792cefa3855e6c2f1962c73 prerequisite-patch-id: 40dee8ca9d21c3a433af58e9bf49422620721eb1 prerequisite-patch-id: da9af05380d56f1e7aab9c9ee3853d7361982d3c prerequisite-patch-id: 86a8d9abf4ed3884ce07df56d07f3e3ccedc06d2 prerequisite-patch-id: 1b8c747f40718f0e8ef37fdc1a313aef4046e55c prerequisite-patch-id: dbb183058bd531219603f0611a88e3faae7497f8 prerequisite-patch-id: 63ad2f6e26a7a7e6e28dd8ce5fb6422b66cd2e32 prerequisite-patch-id: ccd49dc6a0012f25b975b7de0b1b389d813c0ace prerequisite-patch-id: 3f6f0ed6801942cc8f124e3a0368af7291456f31 prerequisite-patch-id: c3a135b6c179a25a56cb5b7f0158d1907b2d1105 -- 2.39.2
[Message part 3 (message/rfc822, inline)]
From: Andreas Enge <andreas <at> enge.fr> To: Vinicius Monego <monego <at> posteo.net> Cc: 71279-done <at> debbugs.gnu.org Subject: Re: [PATCH v2 1/4] gnu: grass: Improve package style. Date: Mon, 31 Mar 2025 16:57:18 +0200Hello! Thanks for the update. I have taken the liberty to push it after verifying that its only dependency qgis still builds. In doing so I have noticed that there is a new minor version of qgis; if it also builds, I will push an update. Andreas
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.