From 844dd7dac76fa491a052df1d117a5d817cc8087c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 12 Oct 2023 10:11:00 -0300 Subject: gnu: python-metpy: Update to 1.5.1. * gnu/packages/geo.scm (python-metpy): Update to 1.5.1. --- 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 3c238cd62a..a33d446201 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1485,13 +1485,13 @@ (define-public imposm3 (define-public python-metpy (package (name "python-metpy") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (pypi-uri "MetPy" version)) (sha256 (base32 - "0g9m8qb920mvi0kqw7vbagj08xvv96zj6gjyc7dawlvh15vb55qq")))) + "1is6rradl97k04hf27dhzla4y4j98hibran3rbz6xh226q1r9vmb")))) (build-system pyproject-build-system) (arguments ;; Too many of the tests in the files below require online data. -- cgit v1.2.3 From ee748c1df093dd63da982e2f3cd0e11c6633d3d6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 08:25:26 +0200 Subject: gnu: Make webkitgtk-next the new webkitgtk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of version 2.42.0, the WebKit 6.0 typelib is considered stable. With GNOME itself moving to GTK4 as time marches on, we should reflect the fact that this is the preferred Webkit for future applications. * gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic… (webkitgtk): … here. Move old value … (webkitgtk-for-gtk3): … here. (webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3. * gnu/packages/geo.scm (gnome-maps): Adjust accordingly. * gnu/packages/gnome.scm (gnome-initial-setup, sushi) (cambalache, devhelp, devhelp-with-libsoup2, gnome-online-accounts) (gnome-online-accounts-3.44, evolution-data-server, evolution-data-server-3.44) (lollypop, evolution, gnome-boxes, geary, komikku): Likewise. * gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise. * gnu/packages/mail.scm (balsa): Likewise. * gnu/packages/mate.scm (atril): Likewise. * gnu/packages/music.scm (ctrlr): Likewise. * gnu/packages/rednotebook.scm (rednotebook): Likewise. * gnu/packages/syndication.scm (gfeeds): Likewise. * gnu/packages/telegram.scm (telegram-desktop): Likewise. * gnu/packages/vnc.scm (remmina): Likewise. * gnu/packages/web-browsers.scm (nyxt): Likewise. --- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 28 ++++++++++++++-------------- gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 27 ++++++++++++--------------- 13 files changed, 40 insertions(+), 42 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..bbf371a88c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -529,7 +529,7 @@ (define-public gnome-maps libsoup libxml2 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa71b216fb..f686636c5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup polkit rest-next upower - webkitgtk-next)) + webkitgtk)) (synopsis "Initial setup wizard for GNOME desktop") (description "This package provides a set-up wizard when a user logs into GNOME for the first time. It typically provides a @@ -1665,7 +1665,7 @@ (define-public sushi libmusicbrainz libxml2 neon - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "File previewer for the GNOME desktop") (description "Sushi is a DBus-activated service that allows applications to preview files on the GNOME desktop.") @@ -3369,7 +3369,7 @@ (define-public cambalache python-pygobject python-lxml webkitgtk - webkitgtk-next)) + webkitgtk)) (native-inputs (list `(,glib "bin") gobject-introspection @@ -6130,7 +6130,7 @@ (define-public devhelp pkg-config)) (inputs (list amtk - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") (description @@ -6143,7 +6143,7 @@ (define-public devhelp-with-libsoup2 (hidden-package (package/inherit devhelp (inputs (modify-inputs (package-inputs devhelp) - (replace "webkitgtk" webkitgtk-with-libsoup2)))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))) (define-public cogl (package @@ -8036,7 +8036,7 @@ (define-public gnome-online-accounts libsecret mit-krb5 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Single sign-on framework for GNOME") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") (description @@ -8069,7 +8069,7 @@ (define-public gnome-online-accounts-3.44 (delete 'disable-gtk-update-icon-cache))))) (inputs (modify-inputs (package-inputs gnome-online-accounts) (replace "rest" rest) - (replace "webkitgtk" webkitgtk-with-libsoup2))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))) (define-public evolution-data-server (package @@ -8155,7 +8155,7 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") (description @@ -8182,7 +8182,7 @@ (define-public evolution-data-server-3.44 (modify-inputs (package-inputs evolution-data-server) (replace "gnome-online-accounts" gnome-online-accounts-3.44) (replace "libgweather4" libgweather) - (replace "webkitgtk" webkitgtk-with-libsoup2))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))) (propagated-inputs (modify-inputs (package-propagated-inputs evolution-data-server) (delete "gtk") @@ -11315,7 +11315,7 @@ (define-public lollypop python-pygobject python-pylast totem-pl-parser - webkitgtk)) + webkitgtk-for-gtk3)) (propagated-inputs (list gst-plugins-good ;required to start lollypop gst-plugins-ugly)) ;required for streaming @@ -11784,7 +11784,7 @@ (define-public evolution libsoup nss openldap - webkitgtk + webkitgtk-for-gtk3 ytnef)) (home-page "https://gitlab.gnome.org/GNOME/evolution") (synopsis "Manage your email, contacts and schedule") @@ -12400,7 +12400,7 @@ (define-public gnome-boxes spice-gtk tracker vte - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and @@ -12474,7 +12474,7 @@ (define-public geary libstemmer libunwind sqlite - webkitgtk + webkitgtk-for-gtk3 ytnef)) (native-inputs (list appstream-glib @@ -13173,7 +13173,7 @@ (define-public komikku python-rarfile python-requests python-unidecode - webkitgtk-next)) + webkitgtk)) (native-inputs (list desktop-file-utils gettext-minimal diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fc52af4612..871d418bc2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3350,7 +3350,7 @@ (define-public guile-gi (guix build utils) (ice-9 popen) (ice-9 rdelim)) - #:disallowed-references ,(list gtk+ webkitgtk) + #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3) #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-dotted-circle-from-combining-character @@ -3396,7 +3396,7 @@ (define-public guile-gi (propagated-inputs (list gobject-introspection)) (inputs (list guile-3.0 glib ;; For tests, only relevant when compiling natively - gtk+ webkitgtk)) + gtk+ webkitgtk-for-gtk3)) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -3935,7 +3935,7 @@ (define-public nomad ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") - ("webkitgtk" ,webkitgtk) + ("webkitgtk" ,webkitgtk-for-gtk3) ("gtksourceview" ,gtksourceview-4) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("vte" ,vte) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5ba5c7d519..8cda1d00ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5039,7 +5039,7 @@ (define-public sbcl-cl-webkit (inputs `(("cffi" ,sbcl-cffi) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (native-inputs `(;; Tests seem to need Xorg. ;; ("xorg-server" ,xorg-server-for-tests) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..5e65ded3f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3915,7 +3915,7 @@ (define-public balsa libsecret openldap sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list compface `(,glib "bin") intltool pkg-config yelp-tools)) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5c3b4a265e..5a6c6b5b64 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -775,7 +775,7 @@ (define-public atril ;; Build libkpathsea as a shared library for DVI support. ;; ("libkpathsea" ,texlive-bin) ("poppler" ,poppler) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (home-page "https://mate-desktop.org") (synopsis "Document viewer for Mate") (description diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..f6d418ce81 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -538,7 +538,7 @@ (define-public ctrlr freetype libiberty libx11 - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list pkg-config)) (home-page "https://ctrlr.org/") diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index f63104ad32..a5dcc26efd 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -71,7 +71,8 @@ (define-public rednotebook `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) #t)))))) (inputs - (list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk)) + (list gtk+ gtksourceview-3 python-pyyaml python-pygobject + webkitgtk-for-gtk3)) ;; TODO: package the following for python3 (if possible), add them as ;; dependencies, and remove them from rednotebook source: ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ac00d396b5..ea42c579cb 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -622,7 +622,7 @@ (define-public gfeeds python-readability-lxml python-requests syndication-domination - webkitgtk-next)) + webkitgtk)) (home-page "https://gfeeds.gabmus.org/") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (description "Feeds is an RSS/Atom feed reader made with GTK+ diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d3276cbe7c..af90fc35eb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -531,7 +531,7 @@ (define-public telegram-desktop rnnoise wayland wayland-protocols - webkitgtk + webkitgtk-for-gtk3 webrtc-for-telegram-desktop xcb-util-keysyms xxhash diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 8ba1292e28..7b39aba58d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -151,7 +151,7 @@ (define-public remmina telepathy-glib vte ; for st plugin wayland - webkitgtk ; for www plugin + webkitgtk-for-gtk3 ; for www plugin libx11 libxext ; for xdmcp plugin xdg-utils diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d0b4e9f971..b5a29647bb 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -711,7 +711,7 @@ (define-public nyxt gsettings-desktop-schemas cl-gobject-introspection gtk+ ; For the main loop - webkitgtk ; Required when we use its typelib + webkitgtk-for-gtk3 ; Required when we use its typelib gobject-introspection pkg-config)) (synopsis "Extensible web-browser in Common Lisp") diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 100875dd52..a374711119 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,7 +126,7 @@ (define-public wpebackend-fdo (define-public webkitgtk (package - (name "webkitgtk") ; webkit2gtk4 + (name "webkitgtk") (version "2.42.1") (source (origin (method url-fetch) @@ -149,10 +149,8 @@ (define-public webkitgtk #:build-type "Release" #:configure-flags #~(list "-DPORT=GTK" - ;; GTKDOC will be removed upstream soon in favor of - ;; gi-docgen; it is normally disabled because the - ;; doc is rather expensive to build. - "-DENABLE_GTKDOC=ON" + "-DENABLE_INTROSPECTION=ON" + "-DUSE_GTK4=ON" ;; The minibrowser, not built by default, is a good ;; tool to validate the good operation of ;; webkitgtk. @@ -232,7 +230,7 @@ (define-public webkitgtk ruby-2.7 unifdef)) (propagated-inputs - (list gtk+ libsoup)) + (list gtk libsoup)) (inputs (list at-spi2-core bubblewrap @@ -251,7 +249,6 @@ (define-public webkitgtk libjpeg-turbo libjxl libmanette - libnotify libpng libseccomp libsecret @@ -284,28 +281,28 @@ (define-public webkitgtk license:bsd-2 license:bsd-3)))) -(define-public webkitgtk-next +(define-public webkitgtk-for-gtk3 (package (inherit webkitgtk) - (name "webkitgtk-next") ; webkit2gtk5 + (name "webkitgtk-for-gtk3") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) - #~(cons* "-DENABLE_INTROSPECTION=ON" - "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))))) + #~(cons* "-DENABLE_GTKDOC=ON" + (delete "-DENABLE_INTROSPECTION=ON" + (delete "-DUSE_GTK4=ON" #$flags)))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) - (replace "gtk+" gtk))) + (replace "gtk" gtk+))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "libnotify"))))) + (prepend libnotify))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: ;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218. (define-public webkitgtk-with-libsoup2 - (package/inherit webkitgtk + (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit v1.2.3 From 872174fb0b72d48f11e36f2f40e0f885957638dd Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:49:24 +0100 Subject: gnu: gnome-maps: Update to 44.5. * gnu/packages/geo.scm (gnome-maps): Update to 44.5. [inputs]: Replace gtk+ with gtk. Replace webkitgtk-for-gtk3 with webkitgtk. Remove libhandy. Change-Id: I8548878653120ea3cfc7554e2133880f46aeadf8 Signed-off-by: Liliana Marie Prikler --- gnu/packages/geo.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index f84fd12d86..a1992dec26 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -468,7 +468,7 @@ (define-public geos (define-public gnome-maps (package (name "gnome-maps") - (version "43.0") ;for libsoup 3 support + (version "44.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -476,7 +476,7 @@ (define-public gnome-maps name "-" version ".tar.xz")) (sha256 (base32 - "1r1l6ajs6zz316m8zac5r0l3qgdv616xh376bfn2fflcnz7wys08")))) + "026488yb6azwb2sm0yy0iaipk914l3agvb7d8azks4kyjqlslyb8")))) (build-system meson-build-system) (arguments (list @@ -518,18 +518,17 @@ (define-public gnome-maps glib-networking gnome-online-accounts gsettings-desktop-schemas - gtk+ + gtk libadwaita libgee libgweather4 - libhandy librsvg libsecret libshumate libsoup libxml2 rest-next - webkitgtk-for-gtk3)) + webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, -- cgit v1.2.3 From 23acd17cc64ffcd16bdfb991dcd39c3d7dd8ea47 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 25 Mar 2024 09:55:35 -0300 Subject: gnu: cdo: Update to 2.4.0. * gnu/packages/geo.scm (cdo): Update to 2.4.0. [source]: Update URL. [native-inputs]: Add python-wrapper. Change-Id: Ic2dad47e04d99b2903b3d7f53862e1ffa6e4d220 --- gnu/packages/geo.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 687effcace..e7a032640d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -225,15 +225,15 @@ (define-public eccodes (define-public cdo (package (name "cdo") - (version "2.1.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append - "https://code.mpimet.mpg.de/attachments/download/27481/cdo-" + "https://code.mpimet.mpg.de/attachments/download/29313/cdo-" version ".tar.gz")) (sha256 - (base32 "1k18llghpf3jnjn0xcnhmbg7arb1fiy854qqn9m5c1abjin38wdq")))) + (base32 "0b2d1d8r1lxs422dxajnmvjyhjwfichlkglv3yqm7wq7rjw0yyd4")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -258,7 +258,7 @@ (define-public cdo (inputs (list curl eccodes fftw hdf5 libxml2 netcdf proj udunits)) (native-inputs - (list pkg-config)) + (list pkg-config python-wrapper)) (home-page "https://code.mpimet.mpg.de/projects/cdo") (synopsis "Climate data operators") (description "@acronym{CDO, Climate Data Operators} is a collection of command-line -- cgit v1.2.3 From 2e2d37855170ef65e63af43e0f279ccaa1b66960 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 29 Mar 2024 18:41:44 -0300 Subject: gnu: gplates: Update to 2.4. * gnu/packages/geo.scm (gplates): Update to 2.4. [source]: Use git-fetch and fetch from GitHub. [arguments]: Remove #:configure-flags. [native-inputs]: Remove unzip. Change-Id: Idf7c7ffb902f98361a897ce122c076a1a2f7fdf2 --- gnu/packages/geo.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 601cd11bbd..e4296e9f54 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -3187,23 +3187,19 @@ (define-public python-haversine (define-public gplates (package (name "gplates") - ;; Note: use a pre-release to cope with newer Boost, ref - ;; https://discourse.gplates.org/t/compilation-error-with-boost-1-77/452/3 - (version "2.3.01-beta.3") + (version "2.4") (source (origin - (method url-fetch) - (uri "https://cloudstor.aarnet.edu.au/plus/s\ -/ojsYNOyUYE3evNp/download?path=%2F&files=gplates_2.3.1-beta.3_src.zip") - (file-name (string-append name "-" version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/GPlates/GPlates") + (commit (string-append "GPlates-" version)))) (sha256 (base32 - "06i87dfab0cq9gdi5mh6sf9wigawpp0d05zbyslv910443i26gwv")))) + "1awb4igchgpmrvj6blxd1w81c617bs66w6cfrwvf30n6rjlyn6q5")) + (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-DBoost_NO_BOOST_CMAKE=ON") - #:tests? #f)) ;no test target - (native-inputs - (list unzip)) ;for the beta + (list #:tests? #f)) ;no test target (inputs (list boost cgal -- cgit v1.2.3 From 570f5e567da69582f51e71fc589e644e17925347 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Mar 2024 11:54:12 -0300 Subject: gnu: gmt: Update to 6.5.0. * gnu/packages/geo.scm (gmt): Update to 6.5.0. Change-Id: Ib6d98494b9b67b23aedccaa50ff785999517c43d --- 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 e4296e9f54..8117b496df 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -141,7 +141,7 @@ (define-module (gnu packages geo) (define-public gmt (package (name "gmt") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -149,7 +149,7 @@ (define-public gmt "releases/download/" version "/gmt-" version "-src.tar.xz")) (sha256 - (base32 "0wh694cwcw2dz5rsh6pdn9irx08d65iih0vbxz350vzrkkjzyvml")))) + (base32 "07hlqg3adxrz7wqih8pydr44v7j40savcxfjlkaw3y9k82sas8j0")))) (build-system cmake-build-system) (arguments (list #:tests? #false)) ;tests need costline data and caches (inputs -- cgit v1.2.3 From 83da3a13bfb107e7274a91766efa9f41c9e692b3 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Wed, 13 Mar 2024 16:58:14 +0800 Subject: gnu: qtsensors: Rename package to qtsensors-5. * gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5 * gnu/packages/qt.scm (python-pyqt, python-pyside-2) * gnu/packages/geo.scm (openorienteering-mapper) * gnu/packages/kde-plasma.scm (kscreen) * gnu/packages/education.scm (gcompris-qt) Adjust inputs. Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba Signed-off-by: Maxim Cournoyer --- gnu/packages/education.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f67e83aa9f..d9d5c45cf9 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8117b496df..506180461d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2574,7 +2574,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 74dadf5c64..191c319f35 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1728,10 +1728,10 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) - (name "qtsensors") + (name "qtsensors-5") (version "5.15.10") (source (origin (method url-fetch) @@ -3835,7 +3835,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors-5" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4650,7 +4650,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml-5 - qtsensors + qtsensors-5 qtspeech qtsvg-5 qttools-5 @@ -4700,7 +4700,7 @@ (define-public python-pyside-2 "qtquickcontrols2" "qtscript" "qtscxml" - "qtsensors" + "qtsensors-5" "qtspeech" "qtsvg" "qttools" -- cgit v1.2.3 From 1c827ef19e853b694df85a60f8c7b0f4ca5a1fc6 Mon Sep 17 00:00:00 2001 From: Romain GARBAGE Date: Mon, 11 Mar 2024 12:07:15 +0100 Subject: gnu: grass: Remove dependency on lapack. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (grass): Remove dependency on lapack. Add 'fix-lapack build phase. Change-Id: I758a9b2434f0ad9f8b85a5c5cde6d0a80e6defb2 Signed-off-by: Ludovic Courtès --- gnu/packages/geo.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 506180461d..460f810d3e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2609,7 +2609,6 @@ (define-public grass ("gdal" ,gdal) ("geos" ,geos) ("glu" ,glu) - ("lapack" ,lapack) ("libpng" ,libpng) ("libtiff" ,libtiff) ("mesa" ,mesa) @@ -2643,6 +2642,11 @@ (define-public grass (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"))) -- cgit v1.2.3 From 33d8c6904a58e46413b87cda063b91ddb48f8c57 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 5 Feb 2023 11:56:51 -0300 Subject: gnu: Add libmseed. * gnu/packages/geo.scm (libmseed): New variable. Change-Id: I6feb414110c30da408069b36b46a421467d2ccad --- gnu/packages/geo.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 460f810d3e..4884a3803b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1911,6 +1911,34 @@ (define-public libspatialindex ") (license license:expat))) +(define-public libmseed + (package + (name "libmseed") + (version "3.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/EarthScope/libmseed") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05sk2h19c7ja98s75b7hbn2cwnjc5l6dr59c23fgnaimmad2rfn7")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://earthscope.github.io/libmseed/") + (synopsis "Library for the miniSEED data format") + (description "The miniSEED library provides a framework for manipulation +of SEED data records, a format for commonly used for seismological time +series and related data. The library includes the functionality to read +and write data records, in addition to reconstructing time series +from multiple records.") + (license license:asl2.0))) + (define-public python-rtree (package (name "python-rtree") -- cgit v1.2.3 From 50a72a08af37557575199b56bbee9f334d58575a Mon Sep 17 00:00:00 2001 From: Zac Berkowitz Date: Mon, 18 Mar 2024 12:02:40 -0400 Subject: gnu: qtserialport: Update to 6.6.3. * gnu/packages/qt.scm (qtserialport): Rename to ... * gnu/packages/qt.scm (qtserialport-5): ... this. * gnu/packages/qt.scm (qtserialport): New variable. * gnu/packages/engineering.scm (fritzing, candle) [inputs]: Replace qtserialport with qtserialport-5. * gnu/packages/geo.scm (qgis): Likewise. * gnu/packages/kde-utils.scm (atelier, libatcore): Likewise. * gnu/packages/qt.scm (qtserialbus, qtlocation, python-pyqt): Likewise. * gnu/packages/radio.scm (wsjtx, jtdx, js8call) (sdrangel, wfview, qdmr): Likewise. Change-Id: I8e0c8d2408ea0bf776b2efe58e23821cb653363c Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer --- gnu/packages/astronomy.scm | 2 +- gnu/packages/engineering.scm | 6 ++---- gnu/packages/geo.scm | 2 +- gnu/packages/kde-utils.scm | 4 ++-- gnu/packages/qt.scm | 42 +++++++++++++++++++++++++++++++++++++----- gnu/packages/radio.scm | 14 ++++++-------- 6 files changed, 49 insertions(+), 21 deletions(-) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index bc4bd55461..6cd0bb7348 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1388,7 +1388,7 @@ (define-public stellarium qtmultimedia-5 qtpositioning qtscript - qtserialport + qtserialport-5 qttranslations qtwebengine-5 qxlsx-qt5 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 95200f190e..6f42d674e5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -737,9 +737,7 @@ (define-public fritzing (list boost libgit2 qtbase-5 - ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is - ;; packed. - qtserialport + qtserialport-5 qtsvg-5 zlib)) (home-page "https://fritzing.org") @@ -4229,7 +4227,7 @@ (define-public candle "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) (build-system gnu-build-system) (native-inputs (list qttools-5)) - (inputs (list qtbase-5 qtserialport)) + (inputs (list qtbase-5 qtserialport-5)) (arguments (list #:tests? #f ; no tests. #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4884a3803b..ead7964562 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -3009,7 +3009,7 @@ (define-public qgis qtkeychain qtlocation qtmultimedia-5 - qtserialport + qtserialport-5 qtsvg-5 qwt ;; saga diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index b2b94b07d3..6001607ad6 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -152,7 +152,7 @@ (define-public atelier qtcharts qtdeclarative-5 qtmultimedia-5 - qtserialport)) + qtserialport-5)) (home-page "https://atelier.kde.org") (synopsis "Desktop interface to control 3D printers powered by AtCore") (description "Atelier provides interface to control and manage your printer. @@ -729,7 +729,7 @@ (define-public libatcore "1830r6ylpn3l7y2frl8cih5cpjgbkfrib9jq7jklf8aszhlsihf2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list qtcharts qtdeclarative-5 qtserialport)) + (inputs (list qtcharts qtdeclarative-5 qtserialport-5)) (home-page "https://invent.kde.org/libraries/atcore") (synopsis "Library for connection and management of 3D printers") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1440c6981c..dcc9bfeb62 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2054,7 +2054,7 @@ (define-public qtwayland (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtserialport +(define-public qtserialport-5 (package (inherit qtsvg-5) (name "qtserialport") @@ -2085,6 +2085,38 @@ (define-public qtserialport (description "The Qt Serial Port module provides the library for interacting with serial ports from within Qt."))) +(define-public qtserialport + (package + (name "qtserialport") + (version "6.6.3") + (source + (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-dlopen-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/serialport/qtudev_p.h" + ;; Use the absolute paths for dynamically loaded libs, + ;; otherwise the lib will be searched in LD_LIBRARY_PATH + ;; which typically is not set in guix. + (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")") + (format #f "setFileNameAndVersion(QStringLiteral(~s))" + (string-append #$(this-package-input "eudev") + "/lib/libudev"))))))))) + (native-inputs (list pkg-config)) + (inputs (list qtbase eudev)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Serial Port module") + (description "The Qt Serial Port module provides the library for +interacting with serial ports from within Qt.") + (license (package-license qtbase)))) + (define-public qtserialbus (package (inherit qtsvg-5) @@ -2107,7 +2139,7 @@ (define-public qtserialbus (format #f "QStringLiteral(~s)" (search-input-file inputs "lib/libsocketcan.so")))))))))) - (inputs (list libsocketcan qtbase-5 qtserialport)) + (inputs (list libsocketcan qtbase-5 qtserialport-5)) (synopsis "Qt Serial Bus module") (description "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, @@ -2258,7 +2290,7 @@ (define-public qtlocation (add-before 'check 'pre-check (lambda _ (setenv "HOME" "/tmp"))))))) - (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) + (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport-5)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") (description "The Qt Location module provides an interface for location, @@ -3918,8 +3950,8 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors-5" ,qtsensors-5) - ("qtserialport" ,qtserialport) + ("qtsensors" ,qtsensors-5) + ("qtserialport" ,qtserialport-5) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 938b786ae2..e2e9f192c3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1683,7 +1683,7 @@ (define-public wsjtx libusb qtbase-5 qtmultimedia-5 - qtserialport + qtserialport-5 wsjtx-hamlib)) (home-page "https://www.physics.princeton.edu/pulsar/k1jt/wsjtx.html") (synopsis "Weak-signal ham radio communication program") @@ -1721,7 +1721,7 @@ (define-public jtdx qtbase-5 qtwebsockets-5 qtmultimedia-5 - qtserialport)) + qtserialport-5)) (arguments `(#:tests? #f)) ; No test suite (synopsis "Weak-signal ham radio communication program, forked from WSJTX") @@ -1798,7 +1798,7 @@ (define-public js8call libusb qtbase-5 qtmultimedia-5 - qtserialport + qtserialport-5 wsjtx-hamlib)) (home-page "http://js8call.com/") (synopsis "Weak-signal ham radio communication program") @@ -2670,7 +2670,7 @@ (define-public sdrangel qtlocation qtmultimedia-5 qtquickcontrols2-5 - qtserialport + qtserialport-5 qtspeech-5 qtwebchannel-5 qtwebengine-5 @@ -2850,9 +2850,7 @@ (define-public wfview qtgamepad qtbase-5 qtmultimedia-5 - ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is - ;; packed. - qtserialport + qtserialport-5 rtaudio)) (home-page "https://wfview.org/") (synopsis "Software to control Icom radios") @@ -3221,7 +3219,7 @@ (define-public qdmr (substitute* "lib/CMakeLists.txt" (("(DESTINATION \")/etc/udev/" _ directive) (string-append directive #$output "/lib/udev/")))))))) - (inputs (list libusb qtbase-5 qtlocation qtserialport yaml-cpp)) + (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp)) (native-inputs (list qttools-5)) (home-page "https://dm3mat.darc.de/qdmr/") (synopsis "GUI application and command line tool to program DMR radios") -- cgit v1.2.3 From 51de844a0ff6ea224367a384092896bce6848b9f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 1 Apr 2024 14:32:54 -0300 Subject: gnu: Add pdal. * gnu/packages/geo.scm (pdal): New variable. Change-Id: I7c24fec69b4f0c19a1c246fab39b994e17e36f3a --- gnu/packages/geo.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ead7964562..c30f28d96f 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -101,6 +101,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages imagemagick) #:use-module (gnu packages java) #:use-module (gnu packages kde) + #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -1229,6 +1230,47 @@ (define-public spatialite-gui (home-page "https://www.gaia-gis.it/fossil/spatialite_gui/index") (license license:gpl3+))) +(define-public pdal + (package + (name "pdal") + (version "2.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PDAL/PDAL") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gg5lcshlmn3wwak42xr0b8a8gdr4572d7hrcvxn2291kp2c3096")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" ;; This test hangs. + "pdal_io_stac_reader_test"))))))) + (native-inputs (list python)) + (inputs (list gdal + h3 + libgeotiff + libunwind + libxml2 + nlohmann-json + openssl + proj + utfcpp + xz + `(,zstd "lib"))) + (home-page "https://pdal.io/") + (synopsis "Point Data Abstraction Library") + (description "PDAL is a C++ library for translating and manipulating point +cloud data. It is very much like the GDAL library which handles raster and +vector data.") + (license license:bsd-3))) + (define-public gdal (package (name "gdal") -- cgit v1.2.3 From b0fbb70521ff4f6c7cab0bdb9de33edae02f999c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 11 Apr 2024 09:44:45 +0000 Subject: gnu: Add python-verde. * gnu/packages/geo.scm (python-verde): New variable. Change-Id: I0d176a05a993b19224d22489dd3a8eca19e4f2e0 Signed-off-by: Christopher Baines --- gnu/packages/geo.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/geo.scm') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c30f28d96f..985fa77231 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -105,6 +105,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages machine-learning) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pcre) @@ -1388,6 +1389,42 @@ (define-public python-pyshp "The Python Shapefile Library (PyShp) reads and writes ESRI Shapefiles.") (license license:expat))) +(define-public python-verde + (package + (name "python-verde") + (version "1.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "verde" version)) + (sha256 + (base32 "1hnh91dsk2dxfbk7p2hv3hajaa396139pd6apabgdrp5b7s54k97")))) + (build-system pyproject-build-system) + (arguments + ;; Tests below fetch data remotely. + (list #:test-flags #~(list "-k" (string-append + "not test_minimal_integration_2d_gps" + " and not test_datasets_locate" + " and not test_fetch_texas_wind" + " and not test_fetch_baja_bathymetry" + " and not test_fetch_rio_magnetic" + " and not test_fetch_california_gps")))) + (native-inputs (list python-cartopy python-distributed)) + (propagated-inputs (list python-dask + python-numpy + python-pandas + python-pooch + python-scikit-learn + python-scipy + python-xarray)) + (home-page "https://github.com/fatiando/verde") + (synopsis "Processing and gridding spatial data, machine-learning style") + (description + "Verde is a Python library for processing spatial data (topography, point +clouds, bathymetry, geophysics surveys, etc) and interpolating them on a 2D +surface (i.e., gridding) with a hint of machine learning.") + (license license:bsd-3))) + (define-public python-cartopy (package (name "python-cartopy") -- cgit v1.2.3