From 1628d57bb5c6ab30a04202c229de642b94faac85 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 30 Sep 2020 08:57:27 +0300 Subject: gnu: Fix package references. * gnu/packages/algebra.scm (iml)[inputs]: Correctly refer to package inputs. * gnu/packages/astronomy.scm (xplanet), * gnu/packages/audio.scm (redkite, libaudec, lv2lint, lv2toweb), * gnu/packages/bioconductor.scm (r-cummerbund), * gnu/packages/chicken.scm (chicken), * gnu/packages/conky.scm (conky), * gnu/packages/cran.scm (r-latex2exp), * gnu/packages/crates-io.scm (rust-rgb), * gnu/packages/databases.scm (mariadb), * gnu/packages/diffoscope.scm (reprotest), * gnu/packages/file-systems.scm (glusterfs), * gnu/packages/finance.scm (electron-cash), * gnu/packages/games.scm (rinutils, ksudoku, kdiamond, kigo), * gnu/packages/geo.scm (grass), * gnu/packages/gnome.scm (libmediaart, gnome-contacts, geoclue), * gnu/packages/gnucash.scm (aqbanking), * gnu/packages/image.scm (mtpaint), * gnu/packages/kde-internet.scm (kopete, ktorrent), * gnu/packages/kde-utils.scm (kmousetool, kmouth, kronometer), * gnu/packages/linphone.scm (liblinphone), * gnu/packages/maths.scm (ppl), * gnu/packages/mercury.scm (mercury-minimal), * gnu/packages/music.scm (bjumblr, bschaffl, lsp-plugins, spectacle-analyzer, helm, tap-lv2, wolf-shaper, shiru-lv2), * gnu/packages/networking.scm (restinio), * gnu/packages/prolog.scm (swi-prolog), * gnu/packages/python-web.scm (gunicorn), * gnu/packages/python-xyz.scm (python-docusign-esign), * gnu/packages/ruby.scm (ruby-cucumber, ruby_version, ruby-addressable), * gnu/packages/sagemath.scm (python-cypari2), * gnu/packages/skarnet.scm (s6-linux-init), * gnu/packages/vpn.scm (sshuttle), * gnu/packages/web.scm (libcyaml), * gnu/packages/xdisorg.scm (kbdd), * gnu/packages/xorg.scm (xpra): Same. --- gnu/packages/geo.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 291b928338..0605d84c0e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1776,7 +1776,7 @@ track your position right from your laptop.") (base32 "1fwsm99kz0bxvjk7442qq1h45ikrmhba8bqclafb61gqg1q6ymrk")))) (build-system gnu-build-system) (inputs - `(("bzip2", bzip2) + `(("bzip2" ,bzip2) ("cairo" ,cairo) ("fftw" ,fftw) ("freetype" ,freetype) -- cgit v1.2.3 From 2bfbe0787d1cc31ed6aebc7bbaec599312842622 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 3 Oct 2020 16:48:02 +0200 Subject: gnu: josm: Update to 17013. * gnu/packages/geo.scm (josm): Update to 17013. --- 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 0605d84c0e..84d1bd981f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1277,7 +1277,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "16812") + (version "17013") (source (origin (method svn-fetch) (uri (svn-reference @@ -1286,7 +1286,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "131ly6ah9ygrah1wq1h2199v4hyzgflnh62ychs4jqvy9wz0dal6")) + "12mcqswjijvx2n7hz7lnx83i3vjr5ib58cazqin10hczcwnd778q")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 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