From bcf9732059d4463e136f5f21e2784e4bc3fe6dee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 17:48:29 +0200 Subject: gnu: grass: Update to 7.8.4. * gnu/packages/geo.scm (grass): Update to 7.8.4. --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 84d1bd981f..b094b55c2a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1761,7 +1761,7 @@ track your position right from your laptop.") license:zlib)))) (define-public grass - (let* ((version "7.8.2") + (let* ((version "7.8.4") (majorminor (string-join (list-head (string-split version #\.) 2) "")) (grassxx (string-append "grass" majorminor))) (package @@ -1773,7 +1773,7 @@ track your position right from your laptop.") (uri (string-append "https://grass.osgeo.org/" grassxx "/source/grass-" version ".tar.gz")) (sha256 - (base32 "1fwsm99kz0bxvjk7442qq1h45ikrmhba8bqclafb61gqg1q6ymrk")))) + (base32 "1yfghvp522ijww3n3l5xarjbc21rm0gmlgr3lvwxrv23bvxmllyr")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- cgit v1.2.3 From 6c03d15d7d84c00b02efea0a60e91f55f5541b57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Oct 2020 21:07:06 +0200 Subject: gnu: grass: Fix start-up without python@3 in profile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (grass)[arguments]: Rename ‘wrap-python’ phase to ‘python:wrap’. Add ‘wrap-with-python-interpreter’ phase. --- gnu/packages/geo.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b094b55c2a..09afa658c7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1865,8 +1865,14 @@ track your position right from your laptop.") (symlink (string-append dir "/lib") (string-append out "/lib"))) #t)) - (add-after 'install-links 'wrap-python - (assoc-ref python:%standard-phases 'wrap))))) + (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)))))) (synopsis "GRASS Geographic Information System") (description "GRASS (Geographic Resources Analysis Support System), is a Geographic -- cgit v1.2.3