From ecb91c993dcce7e6c3faa0d156013dac42380cc6 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Tue, 19 Jul 2022 20:36:53 -0400 Subject: gnu: libphonenumber: Build reproducibly. * gnu/packages/messaging.scm (libphonenumber): Add patch. * gnu/packages/patches/libphonenumber-reproducible-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. Signed-off-by: Jonathan Brielmaier --- gnu/packages/messaging.scm | 3 ++- .../libphonenumber-reproducible-build.patch | 25 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libphonenumber-reproducible-build.patch (limited to 'gnu/packages') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index eee082ed8e..f2e4d1f302 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2782,6 +2782,8 @@ (define-public libphonenumber (url "https://github.com/google/libphonenumber") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches + "libphonenumber-reproducible-build.patch")) (sha256 (base32 "06y3mh1d1mks6d0ynxp3980g712nkf8l5nyljpybsk326b246hg9")))) @@ -2803,7 +2805,6 @@ (define-public libphonenumber (home-page "https://github.com/google/libphonenumber") (license license:asl2.0))) - (define-public chatty (package (name "chatty") diff --git a/gnu/packages/patches/libphonenumber-reproducible-build.patch b/gnu/packages/patches/libphonenumber-reproducible-build.patch new file mode 100644 index 0000000000..6d8cf5a628 --- /dev/null +++ b/gnu/packages/patches/libphonenumber-reproducible-build.patch @@ -0,0 +1,25 @@ +Author: Antero Mejr +Upstream status: I didn't report upstream because they don't have an issue tracker and +PRs require signing the Google CLA. If someone willing to sign the CLA +wants to submit the patch, please go ahead. + +diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +index 021cf5c8..5948e140 100644 +--- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc ++++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +@@ -88,6 +88,7 @@ class DirEntry { + + const std::string& name() const { return name_; } + DirEntryKinds kind() const { return kind_; } ++ bool operator<(const DirEntry& d) { return name_ < d.name(); } + + private: + std::string name_; +@@ -115,6 +116,7 @@ bool ListDirectory(const string& path, vector* entries) { + errno = 0; + entry = readdir(dir); + if (entry == NULL) { ++ std::sort(entries->begin(), entries->end()); + return errno == 0; + } + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { -- cgit v1.2.3 From 3b1bac3b97da98111e409e0544967c0514b3de53 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 23 Jun 2022 16:17:23 +0200 Subject: gnu: Add cambalache. * gnu/packages/gnome.scm (cambalache): New variable. --- gnu/packages/gnome.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55fbe583ef..f4a4744633 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3204,6 +3204,98 @@ (define-public glade3 (variable "GLADE_MODULE_SEARCH_PATH") (files '("lib/glade/modules"))))))) +(define-public cambalache + (package + (name "cambalache") + (version "0.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/jpu/cambalache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `((guix build python-build-system) + ,@%meson-build-system-modules) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cambalache/cmb_view.py" + (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) + (string-append "'" + (search-input-file inputs + (string-append "/bin/" cmd)) + "'"))))) + (add-after 'unpack 'patch-build + (lambda _ + (substitute* "postinstall.py" + (("update-desktop-database") "true")))) + (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) + (delete 'check) + (add-after 'install 'add-install-to-pythonpath + (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))) + (add-after 'pre-check 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion ".." + (invoke "python3" "-m" "pytest"))))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (prog) + (unless (wrapped-program? prog) + (wrap-program prog + `("GI_TYPELIB_PATH" suffix + (,(string-append out "/lib/girepository-1.0") + ,(getenv "GI_TYPELIB_PATH"))) + ;; icons and schemas + `("XDG_DATA_DIRS" suffix + #$(map + (lambda (input) + (file-append (this-package-input input) "/share")) + '("adwaita-icon-theme" "hicolor-icon-theme" + "gsettings-desktop-schemas"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to + ;; load its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))) + (find-files (string-append out "/bin"))))))))) + (inputs (list bash-minimal + adwaita-icon-theme hicolor-icon-theme + gsettings-desktop-schemas + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + libadwaita + libhandy + (librsvg-for-system) + python python-pygobject python-lxml + webkitgtk-with-libsoup2)) + (native-inputs (list `(,glib "bin") gobject-introspection + gettext-minimal pkg-config + python-pytest xorg-server-for-tests)) + (home-page "https://gitlab.gnome.org/jpu/cambalache") + (synopsis "Rapid application development tool") + (description "Cambalache is a rapid application development (RAD) tool for +Gtk 4 and 3 with a clear model-view-controller (MVC) design and +data model first philosophy.") + (license (list license:lgpl2.1 + license:gpl2)))) ; tools + (define-public libcroco (package (name "libcroco") -- cgit v1.2.3 From 97285a431baa1f4ab4e78a52648f872326a01c92 Mon Sep 17 00:00:00 2001 From: Antero Mejr Date: Tue, 26 Jul 2022 16:48:58 -0400 Subject: gnu: Add grimshot. * gnu/packages/wm.scm (grimshot): New variable. Reviewed-by: Maxime Devos Signed-off-by: Liliana Marie Prikler --- gnu/packages/wm.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f27f8af8d4..fc5c173d00 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2799,3 +2799,46 @@ (define-public avizo "Avizo is a simple notification daemon for Sway, mainly intended to be used for multimedia keys.") (license license:gpl3+))) + +(define-public grimshot + (package + (inherit sway) + (name "grimshot") + (source (origin + (inherit (package-source sway)) + (snippet #~(delete-file "contrib/grimshot.1")))) + (build-system copy-build-system) + (arguments + (list #:install-plan #~`(("grimshot" "bin/") + ("grimshot.1" "usr/share/man/man1/")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "contrib"))) + (add-after 'chdir 'patch-script-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "grimshot" + (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b" + _ binary) + (search-input-file + inputs (string-append "bin/" binary)))))) + (add-after 'patch-script-dependencies 'build-man-page + (lambda _ + (with-input-from-file "grimshot.1.scd" + (lambda _ + (with-output-to-file "grimshot.1" + (lambda _ + (invoke "scdoc")))))))))) + (native-inputs (list scdoc)) + (inputs (list coreutils + grim + jq + libnotify + slurp + sway + wl-clipboard)) + (synopsis "Screenshot utility for the Sway window manager") + (description "Grimshot is a screenshot utility for @code{sway}. It provides +an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing +the screenshot either directly to the clipboard using @code{wl-copy} or to a +file."))) -- cgit v1.2.3 From e3ca4088d0ef0d876e6f8a255dcbd0fc1e70a306 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:04 +0200 Subject: gnu: btrbk: Add findutils to PATH. * gnu/packages/backup.scm (btrbk)[arguments]: Add findutils to WRAP-PROGRAM's PATH list. --- gnu/packages/backup.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7a361ce004..0067286d71 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1128,6 +1128,7 @@ (define btrbk (search-input-file outputs "bin/btrbk")) `("PATH" prefix ,(list (string-append #$btrfs-progs "/bin") (string-append #$coreutils "/bin") + (string-append #$findutils "/bin") (string-append #$mbuffer "/bin") (string-append #$openssh "/bin"))))))))) (native-inputs (list ruby-asciidoctor)) -- cgit v1.2.3 From c7a13d29a294e435da6c2a5dd665564be4d1bbd0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: btrbk: Update to 0.32.2. * gnu/packages/backup.scm (btrbk): Update to 0.32.2. --- gnu/packages/backup.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 0067286d71..eb6f6a6fa4 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2020 Eric Bavier ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015, 2016, 2017, 2021, 2022 Leo Famulari -;;; Copyright © 2017–2021 Tobias Geerinckx-Rice +;;; Copyright © 2017–2022 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2021 Arun Isaac ;;; Copyright © 2017 Kei Kebreau @@ -1091,14 +1091,14 @@ (define-public dump (define-public btrbk (package (name "btrbk") - (version "0.31.3") + (version "0.32.2") (source (origin (method url-fetch) (uri (string-append "https://digint.ch/download/btrbk/releases/" - name "-" version ".tar.xz")) + "btrbk-" version ".tar.xz")) (sha256 (base32 - "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2")))) + "0gi0j09fm4pgw3dq0z27lkpyvrs3ssyqg9b46v5ba794z63w753z")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From f1b727c263926a469e6035485e92cfe7a17e2497 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: btrbk: Use SEARCH-INPUT-FILES. * gnu/packages/backup.scm (btrbk)[arguments]: Use SEARCH-INPUT-FILE to construct the wrapper's PATH, rather than hard-coding package variables. --- gnu/packages/backup.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index eb6f6a6fa4..2c5fd4abd9 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1121,20 +1121,23 @@ (define btrbk (search-input-file outputs "bin/btrbk")) (string-append "program_name = " "$ENV{'BTRBK_PROGRAM_NAME'}"))) ;; Wrap the script, so that it works with SSH URI and - ;; finds mbuffer out of the box. + ;; finds mbuffer and other tools out of the box. (wrap-program btrbk #:sh (search-input-file inputs "bin/bash") '("BTRBK_PROGRAM_NAME" = ("$0")) `("PATH" prefix - ,(list (string-append #$btrfs-progs "/bin") - (string-append #$coreutils "/bin") - (string-append #$findutils "/bin") - (string-append #$mbuffer "/bin") - (string-append #$openssh "/bin"))))))))) + ,(map (lambda (command) + (dirname (search-input-file inputs command))) + (list "bin/btrfs" + "bin/cat" + "bin/find" + "bin/mbuffer" + "bin/ssh"))))))))) (native-inputs (list ruby-asciidoctor)) (inputs (list bash-minimal btrfs-progs coreutils + findutils mbuffer openssh perl)) -- cgit v1.2.3 From ea0f76c0d5885e23d9ba374e4fc37f0ec60afeff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: libkeyfinder: Update to 2.2.7. * gnu/packages/audio.scm (libkeyfinder): Update to 2.2.7. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 66654b99fc..d70f1e06b4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3597,16 +3597,16 @@ (define-public libsbsms (define-public libkeyfinder (package (name "libkeyfinder") - (version "2.2.6") + (version "2.2.7") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/mixxxdj/libkeyfinder") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s7nqjmv44q5qjynfcs0j6h4a6qcz4mxzandkkdjjbnwv5rxc3zg")))) + (base32 "0nvhdzy0m3bchk3dpnspv2f518p2v9fjcrv36z1sva1pv9a2g35w")))) (build-system cmake-build-system) (native-inputs (list catch-framework2)) -- cgit v1.2.3 From 01467df7919e3a6ce6117f6cb64c31166692c130 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: pegtl: Update to 3.2.7. * gnu/packages/cpp.scm (pegtl): Update to 3.2.7. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 8330f0d157..5b798f8625 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1042,7 +1042,7 @@ (define-public abseil-cpp (define-public pegtl (package (name "pegtl") - (version "3.2.2") + (version "3.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -1051,7 +1051,7 @@ (define-public pegtl (file-name (git-file-name name version)) (sha256 (base32 - "1viwrlsw5nwvbv8d88mf5r77syapgxx3xm1kv5kmn6drw8jgsmzf")))) + "01adjqqdr9yf4h379jl1x0526kvixfpqk4hdk9mna49qc4s5hpi1")))) (build-system cmake-build-system) (home-page "https://github.com/taocpp/PEGTL") (synopsis "Parsing Expression Grammar template library") -- cgit v1.2.3 From bad54d57dba74576bf24cd6e07e5865126201066 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: nanodbc: Update to 2.14.0. * gnu/packages/databases.scm (nanodbc): Update to 2.14.0. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 32c36fe337..4a28aa79cb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2323,7 +2323,7 @@ (define-public unixodbc (define-public nanodbc (package (name "nanodbc") - (version "2.13.0") + (version "2.14.0") (source (origin (method git-fetch) (uri @@ -2333,7 +2333,7 @@ (define-public nanodbc (file-name (git-file-name name version)) (sha256 (base32 - "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm")))) + "1253bnrmchga3ra99jqkd2p29bc5h2ip79xd8afblz6b1v00wmbm")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 054c001d265ac5b8189abdf6ea55e30a4d0c2436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: Add mce-inject. * gnu/packages/linux.scm (mce-inject): New public variable. --- gnu/packages/linux.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 81a7f99693..ad839ae45a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6630,6 +6630,65 @@ (define-public module-init-tools @code{modprobe}, @code{insmod}, @code{lsmod}, and more.") (license license:gpl2+))) +(define-public mce-inject + (let ((revision "0") ; no git tags :-/ + (commit "4cbe46321b4a81365ff3aafafe63967264dbfec5")) + (package + (name "mce-inject") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z")))) + (build-system gnu-build-system) + (arguments + ;; There is no test suite. There's a test/ directory, but it just holds + ;; example text files you could feed to the programme to crash something. + (list #:tests? #f + #:make-flags + #~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'install-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" #$name)) + (dir (string-append doc "/examples"))) + (copy-recursively "test" dir ))))))) + (native-inputs + (list bison flex)) + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page + "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git/about/") + (synopsis + "Inject x86 @acronym{MCEs, machine-check exceptions} into Linux") + (description + "This simple tool injects fake @acronym{MCEs, machine-check exceptions} +into a running Linux kernel, to debug or test the kernel's @acronym{EDAC, error +detection and correction}-handling code specific to x86 and x86_64 platforms. + +Real MCEs are internal CPU errors. Handling them correctly can be important to +system stability and even prevent physical damage. In contrast, simulated MCEs +produced by @command{mce-inject} are purely synthetic: injection happens only at +the software level, inside the kernel, and is not visible to the platform +hardware or firmware. + +A convenient feature of @command{mce-inject} is that the input language used to +describe MCEs is similar to the format used in Linux panic messages, with a few +extensions. In general, you should be able to pipe in any logged MCE panic to +simulate that same MCE. + +The target kernel must have the @code{CONFIG_X86_MCE_INJECT} option enabled and +the @code{mce-inject} module loaded if it exists.") + (license license:gpl2)))) + (define-public mcelog (package (name "mcelog") -- cgit v1.2.3 From 8fc748d054ee1370a4b7856abb672d4ceb3044d1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: duc: Update to 1.4.5. * gnu/packages/disk.scm (duc): Update to 1.4.5. --- gnu/packages/disk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 90035f7255..4587b558d2 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1357,7 +1357,7 @@ (define-public bmaptools (define-public duc (package (name "duc") - (version "1.4.4") + (version "1.4.5") (source (origin (method git-fetch) (uri (git-reference @@ -1366,7 +1366,7 @@ (define-public duc (file-name (git-file-name name version)) (sha256 (base32 - "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52")))) + "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f081f5691ec9bc12de544735073f561969c89708 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: duc: Run tests. * gnu/packages/disk.scm (duc)[arguments]: Replace the 'check phase to run tests. --- gnu/packages/disk.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 4587b558d2..69c02347c3 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1383,7 +1383,19 @@ (define-public duc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/" ,name "-" ,version))) - (copy-recursively "examples" (string-append doc "/examples")))))))) + (copy-recursively "examples" (string-append doc "/examples"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (substitute* "test.sh" + ;; Keep the test logs where --keep-failed can see them. + (("^(DUC_TEST_DIR=).*" _ assign) + (format #f "~a~a/test-directory~%" assign (getcwd))) + ;; XXX ‘actual size’ differed on my system (a consistent 348160 + ;; bytes where the tests expect 540672). However, the ‘apparent + ;; size’ matches, as does the actual test output. Good enough…? + ((" [0-9]*B actual") " [0-9]*B actual")) + (when tests? + (invoke "./test.sh"))))))) ; no ‘check’ target (native-inputs (list autoconf automake libtool pkg-config)) (inputs -- cgit v1.2.3 From 532bdeff3e1a804cf8d383b4640183afb986a8fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: console-setup: Update to 1.209. * gnu/packages/xorg.scm (console-setup): Update to 1.209. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c3e38314ce..1636880aaa 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6572,7 +6572,7 @@ (define-public bdfresize (define-public console-setup (package (name "console-setup") - (version "1.207") + (version "1.209") (source (origin (method git-fetch) @@ -6580,7 +6580,7 @@ (define-public console-setup (url "https://salsa.debian.org/installer-team/console-setup.git") (commit version))) (sha256 - (base32 "0fj93apsknx3lzbi2025pzr19q1gwnim8g4007aqqkhidc1msgx5")) + (base32 "0f1xac4wxkqdrqspmk803vr3z8flmjw5qiw3q31fmacp7nsjfc3x")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 54c6e3918805879bf04dec9c397ca622b66e52f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: console-setup: Fix cross-compilation. * gnu/packages/xorg.scm (console-setup)[inputs]: Add bash-minimal and coreutils. [arguments]: Use them in place of the native ones where appropriate. --- gnu/packages/xorg.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 1636880aaa..6ba5c32dcb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -66,6 +66,7 @@ (define-module (gnu packages xorg) #:use-module (gnu packages aidc) #:use-module (gnu packages anthy) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages check) @@ -6593,13 +6594,12 @@ (define-public console-setup (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'patch-file-names - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file ;; name. (substitute* '("Keyboard/ckbcomp") (("\"cat ") - (string-append "\"" (which "cat") - " "))))) + (format #f "\"~a " (search-input-file inputs "bin/cat")))))) (add-before 'build 'make-doubled-bdfs (lambda* (#:key native-inputs inputs #:allow-other-keys) (invoke "make" "-C" "Fonts" @@ -6621,10 +6621,12 @@ (define-public console-setup (list pkg-config bdftopcf bdfresize - sharutils ; for 'uuencode' + sharutils ; for 'uuencode' perl)) (inputs - (list perl)) ; used by 'ckbcomp' + (list bash-minimal + coreutils + perl)) ; used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") (description "console-setup provides the console with the same keyboard -- cgit v1.2.3 From a2bd3758c14b05038c861419b6b6816379514620 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: console-setup: Clean up #:make-flags. * gnu/packages/xorg.scm (console-setup)[arguments]: Properly set #:make-flags once. Use them across all phases. --- gnu/packages/xorg.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 6ba5c32dcb..ff633a192c 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6586,9 +6586,9 @@ (define-public console-setup (build-system gnu-build-system) (arguments '(#:make-flags - (let ((bash (assoc-ref %build-inputs "bash")) - (out (assoc-ref %outputs "out"))) - (list (string-append "SHELL=" bash "/bin/bash"))) + (list (string-append "SHELL=" (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f ; no tests #:phases (modify-phases %standard-phases @@ -6601,22 +6601,13 @@ (define-public console-setup (("\"cat ") (format #f "\"~a " (search-input-file inputs "bin/cat")))))) (add-before 'build 'make-doubled-bdfs - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (invoke "make" "-C" "Fonts" - "doubled_bdfs" - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) - "bash") - "/bin/bash")))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-C" "Fonts" "doubled_bdfs" + make-flags))) (replace 'install - (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) - (let ((out (assoc-ref %outputs "out"))) - (invoke "make" "install-linux" - (string-append "prefix=" out) - (string-append "SHELL=" - (assoc-ref (or native-inputs inputs) - "bash") - "/bin/bash")))))))) + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-linux" + make-flags)))))) (native-inputs (list pkg-config bdftopcf -- cgit v1.2.3 From 0bb061190eca6534951d6ab1ee2e9068f1f9dd20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: console-setup: Use G-expressions. * gnu/packages/xorg.scm (console-setup)[arguments]: Rewrite as G-expressions. --- gnu/packages/xorg.scm | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index ff633a192c..cbb1dc7779 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6585,29 +6585,30 @@ (define-public console-setup (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list (string-append "SHELL=" (assoc-ref %build-inputs "bash") - "/bin/bash") - (string-append "prefix=" (assoc-ref %outputs "out"))) - #:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'patch-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file - ;; name. - (substitute* '("Keyboard/ckbcomp") - (("\"cat ") - (format #f "\"~a " (search-input-file inputs "bin/cat")))))) - (add-before 'build 'make-doubled-bdfs - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "-C" "Fonts" "doubled_bdfs" - make-flags))) - (replace 'install - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-linux" - make-flags)))))) + (list #:make-flags + #~(list (string-append "SHELL=" (assoc-ref %build-inputs "bash") + "/bin/bash") + (string-append "prefix=" #$output)) + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; 'ckbcomp' calls out to 'cat' (!). Give it the right file + ;; name. + (substitute* '("Keyboard/ckbcomp") + (("\"cat ") + (format #f "\"~a " + (search-input-file inputs "bin/cat")))))) + (add-before 'build 'make-doubled-bdfs + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-C" "Fonts" "doubled_bdfs" + make-flags))) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-linux" + make-flags)))))) (native-inputs (list pkg-config bdftopcf -- cgit v1.2.3 From bdb2e262fcbea76de807cd829c2d2270661546a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: libpano13: Update to 2.9.21. * gnu/packages/photo.scm (libpano13): Update to 2.9.21. [native-inputs]: Add perl. --- gnu/packages/photo.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index eda9eadca2..313cc15dbf 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018–2021 Tobias Geerinckx-Rice +;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll @@ -347,7 +347,7 @@ (define-public perl-image-exiftool (define-public libpano13 (package (name "libpano13") - (version "2.9.20_rc3") + (version "2.9.21") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/panotools/libpano13/" @@ -356,8 +356,10 @@ (define-public libpano13 "/libpano13-" version ".tar.gz")) (sha256 (base32 - "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv")))) + "141mccp4klj0qdpvki97q5wjf5a1b7pj09s6c4lmwc4r452s3rbr")))) (build-system cmake-build-system) + (native-inputs + (list perl)) ; for pod2man (inputs (list libjpeg-turbo libpng libtiff zlib)) (home-page "http://panotools.sourceforge.net/") -- cgit v1.2.3 From 99d1122f8bf99ca8a87bda9c3f6996258131fa24 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Jul 2022 22:55:07 +0300 Subject: gnu: plink-ng: Update to 2.00a3.3. * gnu/packages/bioinformatics.scm (plink-ng): Update to 2.00a3.3. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 325c159df1..1ae88bd658 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6264,7 +6264,7 @@ (define-public plink (define-public plink-ng (package (inherit plink) (name "plink-ng") - (version "2.00a3-20220315") + (version "2.00a3.3") (source (origin (method git-fetch) @@ -6273,7 +6273,7 @@ (define-public plink-ng (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19inr47jwddkjb9kfb14yxc7xb16c73lkhgxj9sncb0fsiskb4x8")))) + (base32 "0m8wkyvbgvcr5kzc284w8fbhpxwglh2c1xq0yc3yv00a53gs7rv0")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3 From e6bdd94c38c125395456444451726f3ffee66bab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Jul 2022 23:47:40 +0300 Subject: gnu: plink-ng: Fix building on other architectures. * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Adjust make-flags to add simde includes to CFLAGS. [native-inputs]: Add simde. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1ae88bd658..95e91b47f3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6278,7 +6278,9 @@ (define-public plink-ng (arguments `(#:make-flags ,#~(list "BLASFLAGS=-llapack -lopenblas" - "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" + (string-append "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" + " -I" (search-input-directory + %build-inputs "include/simde")) "ZLIB=-lz" "BIN=plink prettify" (string-append "CC=" #$(cc-for-target)) @@ -6305,7 +6307,7 @@ (define-public plink-ng (inputs (list lapack openblas zlib)) (native-inputs - (list diffutils plink python)) ; for tests + (list diffutils plink python simde)) ; for tests (home-page "https://www.cog-genomics.org/plink/") (license license:gpl3+))) -- cgit v1.2.3 From 3a5e01aa7bf2ee1c22625bbd1686d931290734f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: hugin: Update to 2021.0.0. * gnu/packages/photo.scm (hugin): Update to 2021.0.0. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/photo.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 313cc15dbf..100bd4c60a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -690,7 +690,7 @@ (define-public entangle (define-public hugin (package (name "hugin") - (version "2020.0.0") + (version "2021.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" @@ -698,7 +698,7 @@ (define-public hugin "/hugin-" version ".tar.bz2")) (sha256 (base32 - "1jyazc0mbr9g7vrichpqqnfl72lj21244csk0z5i8ycs4l0pcgi8")))) + "1ngadsv22ii05kmvpzdivhwlks4pnv9ijz7j9srl8y54gy5flyh4")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -747,8 +747,7 @@ (define-public hugin (("wxT\\(\"enblend\"\\)") (string-append "wxT(\"" (which "enblend") "\")")) (("wxT\\(\"enfuse\"\\)") - (string-append "wxT(\"" (which "enfuse") "\")"))) - #t))))) + (string-append "wxT(\"" (which "enfuse") "\")")))))))) (home-page "http://hugin.sourceforge.net/") (synopsis "Panorama photo stitcher") (description -- cgit v1.2.3 From 893f58adcaeffb35fa836913a7dfda298c6705cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: hugin: Remove input labels. * gnu/packages/photo.scm (hugin)[native-inputs, inputs]: Remove input labels. --- gnu/packages/photo.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 100bd4c60a..45e951884b 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -701,29 +701,28 @@ (define-public hugin "1ngadsv22ii05kmvpzdivhwlks4pnv9ijz7j9srl8y54gy5flyh4")))) (build-system cmake-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + (list gettext-minimal pkg-config)) (inputs - `(("boost" ,boost) - ("enblend-enfuse" ,enblend-enfuse) - ("exiv2" ,exiv2) - ("fftw" ,fftw) - ("flann" ,flann) - ("freeglut" ,freeglut) - ("glew" ,glew) - ("lcms" ,lcms) - ("libjpeg" ,libjpeg-turbo) - ("libpano13" ,libpano13) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libxi" ,libxi) - ("libxmu" ,libxmu) - ("mesa" ,mesa) - ("openexr" ,openexr-2) - ("sqlite" ,sqlite) - ("vigra" ,vigra) - ("wxwidgets" ,wxwidgets) - ("zlib" ,zlib))) + (list boost + enblend-enfuse + exiv2 + fftw + flann + freeglut + glew + lcms + libjpeg-turbo + libpano13 + libpng + libtiff + libxi + libxmu + mesa + openexr-2 + sqlite + vigra + wxwidgets + zlib)) (arguments `(#:tests? #f ; no check target #:configure-flags -- cgit v1.2.3 From 607722a835e18493f71c64c95b1d65cf3b51668d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: eid-mw: Update to 5.1.6. * gnu/packages/security-token.scm (eid-mw): Update to 5.1.6. [inputs]: Remove libbsd as promised. --- gnu/packages/security-token.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 74ea57137f..9ffe4b185f 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -59,7 +59,6 @@ (define-module (gnu packages security-token) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) - #:use-module (gnu packages libbsd) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages man) @@ -119,8 +118,7 @@ (define-public ccid (define-public eid-mw (package (name "eid-mw") - ;; When updating, remove the short-lived libbsd input and module import! - (version "5.0.28") + (version "5.1.6") (source (origin (method git-fetch) @@ -129,7 +127,7 @@ (define-public eid-mw (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fmpdx09a60ndbsvy3m6w77naqy3j6k2ydq6jdcmdvxnr31z7fmf")))) + (base32 "19sq9bs1580zrjw0cxykdvrm1rwfw8n0vbvy9kdjnykjjnb7g6g1")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -142,7 +140,6 @@ (define-public eid-mw ("perl" ,perl))) (inputs (list curl - libbsd openssl gtk+ pcsc-lite -- cgit v1.2.3 From 4aa2a62345677d4c4161783777b4ea83cbdf0a76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: eid-mw: Remove input labels. * gnu/packages/security-token.scm (eid-mw)[native-inputs]: Remove input labels. --- gnu/packages/security-token.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 9ffe4b185f..ec79544367 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -130,14 +130,14 @@ (define-public eid-mw (base32 "19sq9bs1580zrjw0cxykdvrm1rwfw8n0vbvy9kdjnykjjnb7g6g1")))) (build-system glib-or-gtk-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("libtool" ,libtool) - ("libassuan" ,libassuan) - ("pkg-config" ,pkg-config) - ("perl" ,perl))) + (list autoconf + autoconf-archive + automake + gettext-minimal + libassuan + libtool + perl + pkg-config)) (inputs (list curl openssl -- cgit v1.2.3 From ca4d834c2f0264aa78b27df8de91e0c55f6fae9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: paprefs: Update to 1.2. * gnu/packages/pulseaudio.scm (paprefs): Update to 1.2. --- gnu/packages/pulseaudio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 559dc75288..4d05ce452c 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -436,15 +436,14 @@ (define-public pasystray (define-public paprefs (package (name "paprefs") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/pulseaudio/" - name "/" name "-" version ".tar.xz")) + "paprefs/paprefs-" version ".tar.xz")) (sha256 - (base32 - "189z5p20hk0xv9vwvym293503j4pwl03xqk9hl7cl6dwgv0l7wkf")))) + (base32 "0czn71vc2j59ass1axr8ij7bh53wq2q0z4gw7xgd2dirvi01xwmk")))) (build-system meson-build-system) (native-inputs (list gettext-minimal pkg-config)) -- cgit v1.2.3 From 15d55744fd15dd35545841677a6e8d223e68b7ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: pamixer: Update to 1.6. * gnu/packages/pulseaudio.scm (pamixer): Update to 1.6. [build-system]: Switch to Meson. [arguments]: Remove field. [native-inputs]: Add pkg-config. [inputs]: Remove boost; add cxxopts. --- gnu/packages/pulseaudio.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 4d05ce452c..1fb64fd8a6 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -48,8 +48,8 @@ (define-module (gnu packages pulseaudio) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) - #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cpp) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages freedesktop) @@ -370,7 +370,7 @@ (define-public pulsemixer (define-public pamixer (package (name "pamixer") - (version "1.5") + (version "1.6") (source (origin (method git-fetch) @@ -379,20 +379,12 @@ (define-public pamixer (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1d5arjbsh3q9z693pi2rq553ai9b18iz36ss7q8ff29m0hf62lzd")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no test suite - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-before 'install 'mkdir-bin - (lambda _ - (mkdir-p (string-append (assoc-ref %outputs "out") "/bin"))))))) + (base32 "0d0fcqv9fri1y2701lasscgmvljxzpyg95vy90b3d2ccdnqn3d1d")))) + (build-system meson-build-system) + (native-inputs + (list pkg-config)) (inputs - (list boost pulseaudio)) + (list cxxopts pulseaudio)) (home-page "https://github.com/cdemoulins/pamixer") (synopsis "PulseAudio command line mixer") (description -- cgit v1.2.3 From 090667a258a8d2b2268772dd74d7480c058b5adf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: lldpd: Update to 1.0.14. * gnu/packages/networking.scm (lldpd): Update to 1.0.14. [source]: Don't explicitly return #t from the snippet. --- gnu/packages/networking.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 85ded36804..0b961f4751 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4021,20 +4021,19 @@ (define-public haproxy (define-public lldpd (package (name "lldpd") - (version "1.0.13") + (version "1.0.14") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "00a7v24qhxw80yk2v79wrkfn7br4r8pcajyrpz8j0xx2v1zq4ffn")) + (base32 "1s0j5p0mjh1pda1aq5wm4hd41fh1m864jgbs82y5sshi9whijj57")) (modules '((guix build utils))) (snippet '(begin ;; Drop bundled library. - (delete-file-recursively "libevent") - #t)))) + (delete-file-recursively "libevent"))))) (arguments `(#:configure-flags (list -- cgit v1.2.3 From 943a5b1ee787c2a34fec8431b686a4387c1cc2de Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: lldpd: Use G-expressions. * gnu/packages/networking.scm (lldpd)[arguments]: Rewrite as G-expressions. --- gnu/packages/networking.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0b961f4751..33b702c8ec 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4035,17 +4035,16 @@ (define-public lldpd ;; Drop bundled library. (delete-file-recursively "libevent"))))) (arguments - `(#:configure-flags - (list - "--with-privsep-user=nobody" - "--with-privsep-group=nogroup" - "--localstatedir=/var" - "--enable-pie" - "--disable-static" - "--without-embedded-libevent" - (string-append "--with-systemdsystemunitdir=" - (assoc-ref %outputs "out") - "/lib/systemd/system")))) + (list #:configure-flags + #~(list + "--with-privsep-user=nobody" + "--with-privsep-group=nogroup" + "--localstatedir=/var" + "--enable-pie" + "--disable-static" + "--without-embedded-libevent" + (string-append "--with-systemdsystemunitdir=" + #$output "/lib/systemd/system")))) (build-system gnu-build-system) (inputs (list libevent libxml2 openssl readline)) -- cgit v1.2.3 From 0de6c3178bc4f5a3f7a896a4f8293b42e76478e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: nnn: Update to 4.6. * gnu/packages/admin.scm (nnn): Update to 4.6. --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7a37cdda61..c9377bd5da 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3972,14 +3972,14 @@ (define-public pfetch (define-public nnn (package (name "nnn") - (version "4.5") + (version "4.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1aj9hzhpwxl2v1dlf3jpd3rp81z689dq8iycbipc0024dnyibp7s")))) + (base32 "0gvyvynw957yirvc1aj65flzni7niaj5bvyk82ka5dfgi2dazb0m")))) (build-system gnu-build-system) (inputs (list ncurses readline)) -- cgit v1.2.3 From 34680d540688a8459d66ed3f7487e16c7645f4e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:03 +0200 Subject: gnu: libsocketcan: Update to 0.0.12. * gnu/packages/networking.scm (libsocketcan): Update to 0.0.12. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 33b702c8ec..3843e4641b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3044,7 +3044,7 @@ (define-public zyre (define-public libsocketcan (package (name "libsocketcan") - (version "0.0.11") + (version "0.0.12") (source (origin (method git-fetch) (uri (git-reference @@ -3053,7 +3053,7 @@ (define-public libsocketcan (file-name (git-file-name name version)) (sha256 (base32 - "17z2y2r9xkixhr9bxr50m77fh710afl30s7jdhbxrvf56vmal2jr")))) + "0nrav2yqxgb7jwnhrwirnxs9ycqqh90sqgv5a8lns837jf385jvq")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool)) -- cgit v1.2.3 From b849d7194e770cdf3e555fac9589411213d71e98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: libsocketcan: Omit duplicate LICENSE file. * gnu/packages/networking.scm (libsocketcan)[arguments]: Delete the default 'install-license-files phase. --- gnu/packages/networking.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3843e4641b..70efe33a74 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3055,6 +3055,11 @@ (define-public libsocketcan (base32 "0nrav2yqxgb7jwnhrwirnxs9ycqqh90sqgv5a8lns837jf385jvq")))) (build-system gnu-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; Upstream already puts (more) files in share/doc/libsocketcan. + (delete 'install-license-files)))) (native-inputs (list autoconf automake libtool)) (home-page "https://git.pengutronix.de/cgit/tools/libsocketcan") -- cgit v1.2.3 From 361b1eaeec867d6e68835cb43aa4d311491da745 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:04 +0200 Subject: gnu: nginx: Update to 1.23.1. * gnu/packages/web.scm (nginx): Update to 1.23.1. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 29526c8002..78ce60a494 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -381,14 +381,14 @@ (define-public nginx ;; Track the ‘mainline’ branch. Upstream considers it more reliable than ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) - (version "1.23.0") + (version "1.23.1") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1lacv4gb72n7f93smy098y122aaz9bxdxxkjksgbwwljbfiwl2l2")))) + "1qpibmnz5kjkd5z61abism1qn5z6dbrz2cjmlivr8fryqb8ipvjy")))) (build-system gnu-build-system) (inputs (list libxml2 libxslt openssl pcre zlib)) (arguments -- cgit v1.2.3 From d3d506a0d14cf5ad262cb7dfe80082c17ce333ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: nginx-documentation: Update to 1.23.1-2869-9383e934e546. * gnu/packages/web.scm (nginx-documentation): Update to 1.23.1-2869-9383e934e546. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 78ce60a494..34a2fea062 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -476,9 +476,9 @@ (define-public nginx (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.23.0") - (revision 2862) - (changeset "cf7551842617")) + (let ((version "1.23.1") + (revision 2869) + (changeset "9383e934e546")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -490,7 +490,7 @@ (define-public nginx-documentation (file-name (string-append name "-" version)) (sha256 (base32 - "1qfrcakj6dzdypn01dngjqvsi4b4fsbpxziy5m2x1rs1z6gv7ia3")))) + "0zq89cjj8vpxaanx378yaypvmcxk0my8c773acx545c5p75ghvbk")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit v1.2.3 From 2ac922a8ec7b76f1d22ed5b0fd4fe6ff592931b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:05 +0200 Subject: gnu: ipcalc: Update to 0.51. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (ipcalc): Update to 0.51. [source]: Use GIT-FETCH and GIT-FILE-NAME. [inputs]: Remove tar, gzip, and the bogus ‘tarball’. [arguments]: Adjust to build from Git. [home-page]: Update. --- gnu/packages/networking.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 70efe33a74..f6a49b9da9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3807,18 +3807,19 @@ (define-public pagekite (define-public ipcalc (package (name "ipcalc") - (version "0.41") - (source (origin - (method url-fetch) - (uri (string-append "http://jodies.de/ipcalc-archive/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "12if9sm8h2ac0pgwkw835cgyqjxm6h27k4kfn2vfas9krrqwbafx")))) - (inputs `(("perl" ,perl) - ("tar" ,tar) - ("gzip" ,gzip) - ("tarball" ,source))) + (version "0.51") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; This is the IPv6-capable continuation of the unmaintained + ;; . + (url "https://github.com/kjokjo/ipcalc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cnygb69vjmp3by75jcd2z4y3ybp1s7x4nl3d32xa49h8lkhdbfv")))) + (inputs `(("perl" ,perl))) (build-system trivial-build-system) ;no Makefile.PL (arguments `(#:modules ((guix build utils)) @@ -3829,25 +3830,21 @@ (define-public ipcalc (let* ((source (assoc-ref %build-inputs "source")) (perl (string-append (assoc-ref %build-inputs "perl") "/bin")) - (tar (assoc-ref %build-inputs "tar")) - (gz (assoc-ref %build-inputs "gzip")) (out (assoc-ref %outputs "out")) (bin (string-append out "/bin")) (doc (string-append out "/share/doc/ipcalc"))) - (setenv "PATH" (string-append gz "/bin")) - (invoke (string-append tar "/bin/tar") "xvf" source) - (chdir (string-append ,name "-" ,version)) + (copy-recursively source "source") + (chdir "source") (install-file "ipcalc" bin) - (patch-shebang (string-append bin "/ipcalc") (list perl)) - #t)))) + (patch-shebang (string-append bin "/ipcalc") (list perl)))))) (synopsis "Simple IP network calculator") (description "ipcalc takes an IP address and netmask and calculates the resulting broadcast, network, Cisco wildcard mask, and host range. By giving a second netmask, you can design subnets and supernets. It is also intended to be a teaching tool and presents the subnetting results as easy-to-understand binary values.") - (home-page "http://jodies.de/ipcalc") + (home-page "https://github.com/kjokjo/ipcalc") (license license:gpl2+))) (define-public tunctl -- cgit v1.2.3 From cbcda3965e409d3f34d3533c99288b974476a512 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:07 +0200 Subject: gnu: net-snmp: Update to 5.9.3. * gnu/packages/networking.scm (net-snmp): Update to 5.9.3. [source]: Don't explicitly return #t from the snippet. [arguments]: Likewise for phases. --- gnu/packages/networking.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f6a49b9da9..a48c4997ef 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3179,20 +3179,19 @@ (define-public shadowsocks (define-public net-snmp (package (name "net-snmp") - (version "5.9.1") + (version "5.9.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/net-snmp/net-snmp/" version "/net-snmp-" version ".tar.gz")) (sha256 (base32 - "0gwcyi9qk707jgfsgmdr9w2w3r892fnqaam9v7zxpkg69njd8zzb")) + "02pgl89s8qll5zhdp61rbn6vpl084gx55bjb1cqg3wqvgsdz55r0")) (modules '((guix build utils))) (snippet '(begin ;; Drop bundled libraries. - (delete-file-recursively "snmplib/openssl") - #t)))) + (delete-file-recursively "snmplib/openssl"))))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -3222,8 +3221,7 @@ (define-public net-snmp ;; These tests require network access. (for-each delete-file '("testing/fulltests/default/T070com2sec_simple" - "testing/fulltests/default/T071com2sec6_simple")) - #t)) + "testing/fulltests/default/T071com2sec6_simple")))) (add-after 'unpack 'patch-Makefile.PL (lambda* (#:key outputs #:allow-other-keys) (substitute* "Makefile.in" @@ -3231,8 +3229,7 @@ (define-public net-snmp (string-append "Makefile.PL PREFIX=" (assoc-ref outputs "out") " INSTALLDIRS=site" " NO_PERLLOCAL=1" - " -NET"))) - #t))))) + " -NET")))))))) (inputs (list libnl ncurses ; for the ‘apps’ openssl perl)) -- cgit v1.2.3 From 42c99f282c8df39fba275b7975258a30e33be48c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: mtools: Update to 4.0.40. * gnu/packages/mtools.scm (mtools): Update to 4.0.40. --- gnu/packages/mtools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mtools.scm b/gnu/packages/mtools.scm index 6aafa1eb48..c0977f0e17 100644 --- a/gnu/packages/mtools.scm +++ b/gnu/packages/mtools.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 John Darrington ;;; Copyright © 2015, 2019 Ludovic Courtès -;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice ;;; Copyright © 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -29,14 +29,14 @@ (define-module (gnu packages mtools) (define-public mtools (package (name "mtools") - (version "4.0.37") + (version "4.0.40") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mtools/mtools-" version ".tar.bz2")) (sha256 (base32 - "0hl3zbj0lyx2m0fyydv0wcgpmyqfg4khp098jqjn2yz44dz1k6vr")) + "1x2xknvyrbqjb6bv0h3p5s0bvss6ici1zxd7jcids4a06m1clbx2")) (patches (search-patches "mtools-mformat-uninitialized.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 119ac132d7d092dfe89312d5558059d9f6ff6cb8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 29 Jul 2022 08:44:34 +0200 Subject: gnu: sbcl-clss: Update to 20220728. * gnu/packages/lisp-xyz.scm (sbcl-clss): Update to 20220728. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 51d74bd8af..c57796a419 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10099,8 +10099,8 @@ (define-public ecl-pzmq (sbcl-package->ecl-package sbcl-pzmq)) (define-public sbcl-clss - (let ((revision "1") - (commit "2a8e8615ab55870d4ca01928f3ed3bbeb4e75c8d")) + (let ((revision "2") + (commit "f62b849189c5d1be378f0bd3d403cda8d4fe310b")) (package (name "sbcl-clss") (version (git-version "0.3.1" revision commit)) @@ -10112,7 +10112,7 @@ (define-public sbcl-clss (url "https://github.com/Shinmera/clss") (commit commit))) (sha256 - (base32 "0la4dbcda78x29szanylccrsljqrn9d1mhh569sqkyp44ni5fv91")) + (base32 "1033dchpanhcgxl5qfhr80aw9adbp9bvllhzvvy5p9mrfnidd1fv")) (file-name (git-file-name name version)))) (inputs (list sbcl-array-utils sbcl-plump)) -- cgit v1.2.3 From 06261a445adaf9d940651749e24dbcf8ee0b5402 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:02 +0200 Subject: gnu: mpd: Update to 0.23.8. * gnu/packages/mpd.scm (mpd): Update to 0.23.8. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 541326d5d3..728c7e3649 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -108,7 +108,7 @@ (define-public libmpdclient (define-public mpd (package (name "mpd") - (version "0.23.7") + (version "0.23.8") (source (origin (method url-fetch) (uri @@ -117,7 +117,7 @@ (define-public mpd "/mpd-" version ".tar.xz")) (sha256 (base32 - "04c2fr4akiylafb7wdjzn7r7d90rmzilbnagrifqyf3wf6ncn3cn")))) + "1kvq9shd6b7y02r386s1chjmvs44wij5bfzn6qgq46dmyfdmdfw6")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 986df4ec0f28ec769873093c808c8895514f2d45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: ncmpc: Update to 0.47. * gnu/packages/mpd.scm (ncmpc): Update to 0.47. --- gnu/packages/mpd.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 728c7e3649..8d87f8f261 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -226,7 +226,7 @@ (define-public mpd-mpc (define-public ncmpc (package (name "ncmpc") - (version "0.46") + (version "0.47") (source (origin (method url-fetch) (uri @@ -235,7 +235,7 @@ (define-public ncmpc "/ncmpc-" version ".tar.xz")) (sha256 (base32 - "0klkjaq6n05cmgcwiawjm6d3rn6mrncy72s3x0abjjnx177pfzqp")))) + "1714saz8m6y2chby0c1qh3vgqc3srlr1jq98vhzmjykcpjqj7nk1")))) (build-system meson-build-system) (inputs (list boost pcre libmpdclient ncurses)) (native-inputs -- cgit v1.2.3 From bd756d9c152df535ea433031c1a7efe16aa3ad0a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: libostree: Update to 2022.5. * gnu/packages/package-management.scm (libostree): Update to 2022.5. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 750e675e39..5ec85d8bc9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1823,7 +1823,7 @@ (define-public msitools (define-public libostree (package (name "libostree") - (version "2022.3") + (version "2022.5") (source (origin (method url-fetch) @@ -1831,7 +1831,7 @@ (define-public libostree "https://github.com/ostreedev/ostree/releases/download/v" (version-major+minor version) "/libostree-" version ".tar.xz")) (sha256 - (base32 "04pn4ibak8k7qlm0722im5ng8gyn1r5y5ggyz75ca0smrnfzs8xq")))) + (base32 "0gq53g601x09gc4ips6n3zmmdaz8zyv235xf63fxf4f17fclsk4i")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit v1.2.3 From 7a409a217c113dd55c44735331b4c4c1d60ad531 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: mtd-utils: Update to 2.1.4. * gnu/packages/linux.scm (mtd-utils): Update to 2.1.4. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ad839ae45a..906303175d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6735,7 +6735,7 @@ (define-public mcelog (define-public mtd-utils (package (name "mtd-utils") - (version "2.1.2") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append @@ -6743,7 +6743,7 @@ (define-public mtd-utils "mtd-utils-" version ".tar.bz2")) (sha256 (base32 - "1mp9fqgnz5r69s8ly98ry6k2blqnaqpllwi8m930dm0n8zrwbm4a")))) + "168vyzpfa0n66i8lcf626b9jczjr81rqbdk7735lfb18bp8i2rrc")))) (arguments (list #:configure-flags (if (%current-target-system) ; When cross-compiling. -- cgit v1.2.3 From 69eb84094516b56d7784aa1b8809cce0936e173e Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 29 Jul 2022 15:23:36 +0000 Subject: gnu: oil: Update to 0.12.0. * gnu/packages/shells.scm (oil): Update to 0.12.0. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a8a42f0544..1a5f8fca9f 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -848,7 +848,7 @@ (define-public mksh (define-public oil (package (name "oil") - (version "0.9.9") + (version "0.12.0") (source ;; oil's sources contain a modified version of CPython 2.7.13. ;; According to https://www.oilshell.org/blog/2017/05/05.html @@ -861,7 +861,7 @@ (define-public oil (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "1ymszq0wy7sy709yqx8dpmv7b37fkc57bdg02ah2gnjbvbk6s2z1")))) + (base32 "1sz5xb88773ass6ip5yxmnby9p6h0bz1d02n6n0cna3hdzqn7bpv")))) (build-system gnu-build-system) (arguments (list #:strip-binaries? #f ; strip breaks the binary -- cgit v1.2.3 From d1c6b8db5a30f9e428d018156dadb12927c485f8 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 29 Jul 2022 23:18:22 +0200 Subject: gnu: icedove: Update to 91.12.0. * gnu/packages/gnuzilla.scm (icedove): Update to 91.12.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 013e834d13..a914650506 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -977,11 +977,11 @@ (define (runpaths-of-input label) (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220624000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20220726000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "91.11.0") + (version "91.12.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1260,7 +1260,7 @@ (define-public icedove ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "da48e7ecf800ec7761a3b6e0ca81e0c90adc30f7")) + ,(let ((changeset "bd3da11e22d0070699026cb5f4e31b44b35580f0")) (origin (method hg-fetch) (uri (hg-reference @@ -1269,7 +1269,7 @@ (define-public icedove (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0lg8z0zk05w8jah364lm7vkc95j1nkg93gf46byz0kd4nslg05nx"))))) + "14na1n37sqjqcxmhbp0c56a1j70gnyqgrhlrk5jkblml47x4i35w"))))) ("cargo" ,rust "cargo") ("clang" ,clang) ("llvm" ,llvm) -- cgit v1.2.3 From 0565cde6892c4fcc503a86227e366d3500040076 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 25 Jun 2022 16:33:44 +0200 Subject: gnu: zlib: Support mingw cross-compilation. * gnu/packages/compression.scm (zlib): Only run configure if not mingw. Signed-off-by: Liliana Marie Prikler --- gnu/packages/compression.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5b31b0ad52..df056dd65a 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -113,7 +113,16 @@ (define-public zlib (build-system gnu-build-system) (outputs '("out" "static")) (arguments - `(#:phases + `(#:make-flags + ,(if (target-mingw?) + `(list ,(string-append "PREFIX=" (%current-target-system) "-") + "BINARY_PATH = $(prefix)/bin" + "INCLUDE_PATH = $(prefix)/include" + "LIBRARY_PATH = $(prefix)/lib" + "SHARED_MODE = 1" + (string-append "prefix = " (assoc-ref %outputs "out"))) + ''()) + #:phases (modify-phases %standard-phases (replace 'configure (lambda* (#:key outputs #:allow-other-keys) @@ -125,8 +134,10 @@ (define-public zlib ,@(if (%current-target-system) `((setenv "CHOST" ,(%current-target-system))) '()) - (invoke "./configure" - (string-append "--prefix=" out))))) + ,@(if (target-mingw?) + `((rename-file "win32/Makefile.gcc" "Makefile")) + `((invoke "./configure" + (string-append "--prefix=" out))))))) (add-after 'install 'move-static-library (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 638fb2da94bfb193e69d885096da76db6ac00db7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jul 2022 23:52:27 +0200 Subject: gnu: emacs-parsebib: Update to 4.2. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 4.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 702378c206..e892754826 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18865,7 +18865,7 @@ (define-public emacs-org-auto-expand (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "4.1") + (version "4.2") (source (origin (method git-fetch) @@ -18874,7 +18874,7 @@ (define-public emacs-parsebib (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1bsxhizwhri8ayryfq59ghkybrql611q2bnjd45hpj7armwq3s8m")))) + (base32 "0da4b6d65bq9xhyhq7h9g315zg6g5q9435vz870la966rgav5szd")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing @file{.bib} files") -- cgit v1.2.3 From 48dae20007a69a7d90af70464884fda146745b1b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jul 2022 23:53:43 +0200 Subject: gnu: emacs-tramp: Update to 2.5.3.1. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.3.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e892754826..1a0002f4d0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26776,14 +26776,14 @@ (define-public emacs-counsel-tramp (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.3") + (version "2.5.3.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7")))) + (base32 "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a")))) (build-system emacs-build-system) (arguments (list -- cgit v1.2.3 From 218add33da52ef42b88e9d29d1ac269d5455ea65 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jul 2022 23:54:40 +0200 Subject: gnu: emacs-devdocs: Update to 0.5. * gnu/packages/emacs-xyz.scm (emacs-devdocs): Update to 0.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1a0002f4d0..94bacad72a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26589,7 +26589,7 @@ (define-public emacs-counsel-dash (define-public emacs-devdocs (package (name "emacs-devdocs") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) @@ -26597,7 +26597,7 @@ (define-public emacs-devdocs "https://elpa.gnu.org/packages/" "devdocs-" version ".tar")) (sha256 - (base32 "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm")))) + (base32 "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka")))) (build-system emacs-build-system) (home-page "https://github.com/astoff/devdocs.el") (synopsis "Emacs viewer for DevDocs") -- cgit v1.2.3 From 0114c7b2df8360867e4ed1f08d1063fb3295c96f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jul 2022 23:56:19 +0200 Subject: gnu: emacs-org-jira: Update to 4.4.0. * gnu/packages/emacs-xyz.scm (emacs-org-jira): Update to 4.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 94bacad72a..24319e1437 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27839,7 +27839,7 @@ (define-public emacs-org-emms (define-public emacs-org-jira (package (name "emacs-org-jira") - (version "4.3.3") + (version "4.4.0") (source (origin (method git-fetch) @@ -27849,7 +27849,7 @@ (define-public emacs-org-jira (file-name (git-file-name name version)) (sha256 (base32 - "0awfz4c70pxfj401p4h4j1lxic4pqpgigkldy9wvdkcyhqbphswj")))) + "1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-request emacs-s emacs-dash emacs-org)) -- cgit v1.2.3 From 4d02b9c334e3373d24177a8ebeeff1815077fc05 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 31 Jul 2022 23:58:19 +0200 Subject: gnu: emacs-pabbrev: Update to 4.2.2. * gnu/packages/emacs-xyz.scm (emacs-pabbrev): Update to 4.2.2. [source]: Change file extension. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 24319e1437..bfc68a9180 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3723,14 +3723,14 @@ (define-public emacs-djvu3 (define-public emacs-pabbrev (package (name "emacs-pabbrev") - (version "4.2.1") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "pabbrev-" version ".el")) + "pabbrev-" version ".tar")) (sha256 - (base32 "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh")))) + (base32 "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/pabbrev.html") (synopsis "Predictive abbreviation expansion") -- cgit v1.2.3 From 7c1010f3261fcb74ab9b7702f59443ad89031a2f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 1 Aug 2022 00:00:00 +0200 Subject: gnu: emacs-dtrt-indent: Update to 1.8. * gnu/packages/emacs-xyz.scm (emacs-dtrt-indent): Update to 1.8. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bfc68a9180..217e90b8fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24780,7 +24780,7 @@ (define-public emacs-dtache (define-public emacs-dtrt-indent (package (name "emacs-dtrt-indent") - (version "1.7") + (version "1.8") (source (origin (method git-fetch) (uri (git-reference @@ -24789,7 +24789,7 @@ (define-public emacs-dtrt-indent (file-name (git-file-name name version)) (sha256 (base32 - "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh")))) + "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf")))) (build-system emacs-build-system) (home-page "https://github.com/jscheid/dtrt-indent") (synopsis "Minor mode that guesses the indentation offset") -- cgit v1.2.3 From a3a6931c75c899ad749e5bc8965ec5b5ed55451d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 Jul 2022 18:46:45 +0200 Subject: gnu: rottlog: Remove input labels. * gnu/packages/admin.scm (rottlog)[arguments]: In 'tweak-rc-weekly', use 'search-input-file' instead of 'assoc-ref'. [inputs]: Remove labels. --- gnu/packages/admin.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c9377bd5da..e66277ea92 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1830,18 +1830,15 @@ (define-public rottlog (lambda* (#:key inputs #:allow-other-keys) (substitute* "rc/weekly" (("/bin/kill") - (string-append (assoc-ref inputs "coreutils*") - "/bin/kill")) + (search-input-file inputs "/bin/kill")) (("syslogd\\.pid") ;; The file is called 'syslog.pid' (no 'd'). - "syslog.pid")) - #t)) + "syslog.pid")))) (add-after 'install 'install-info (lambda _ (invoke "make" "install-info")))))) (native-inputs (list texinfo automake util-linux)) ; for 'cal' - (inputs `(("coreutils*" ,coreutils) - ("mailutils" ,mailutils))) + (inputs (list coreutils mailutils)) (home-page "https://www.gnu.org/software/rottlog/") (synopsis "Log rotation and management") (description -- cgit v1.2.3 From ab59155c5a38dda7efaceb47c7528578fcf0def4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 Jul 2022 23:48:57 +0200 Subject: gnu: mtd-utils: Disable parallel tests. This is a followup to 7a409a217c113dd55c44735331b4c4c1d60ad531. * gnu/packages/linux.scm (mtd-utils)[arguments]: Add #:parallel-tests?. --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 906303175d..85a848dbde 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6748,7 +6748,9 @@ (define-public mtd-utils (list #:configure-flags (if (%current-target-system) ; When cross-compiling. #~(list) - #~(list "--enable-unit-tests")))) + #~(list "--enable-unit-tests")) + + #:parallel-tests? #f)) ;tests may fail when running in parallel (native-inputs (list cmocka pkg-config)) (inputs -- cgit v1.2.3 From 663f12ea2420227e50aff1485cbf0731a46ca021 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 12:13:12 -0400 Subject: gnu: qtbase: Patch /bin/pwd in executable scripts. * gnu/packages/qt.scm (qtbase)[phases]{patch-paths}: Patch /bin/pwd. [inputs]: Add coreutils-minimal. --- gnu/packages/qt.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ae68317492..fd26264892 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -622,6 +622,9 @@ (define-public qtbase (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "bin" "\\.in$") + (("/bin/pwd") + (search-input-file inputs "bin/pwd"))) (substitute* "src/gui/platform/unix/qgenericunixservices.cpp" (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) @@ -687,7 +690,7 @@ (define-public qtbase ninja wayland-protocols))) (inputs (modify-inputs (package-inputs qtbase-5) - (prepend bash-minimal libxcb md4c) + (prepend bash-minimal coreutils-minimal libxcb md4c) (replace "gtk+" gtk) ;use latest gtk (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths -- cgit v1.2.3 From d48c98cd129b86ae7d9307c3bb8d3db99bed24e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 18:52:17 -0400 Subject: gnu: qtbase: Honor CMAKE_PREFIX_PATH. * gnu/packages/qt.scm (qtbase)[phases]{honor-CMAKE_PREFIX_PATH}: New phase. --- gnu/packages/qt.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fd26264892..c2e509fcdf 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -618,6 +618,27 @@ (define-public qtbase "-DFEATURE_mips_dspr2=OFF"))) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'honor-CMAKE_PREFIX_PATH + (lambda _ + ;; The configuration files for other Qt packages are searched + ;; through a call to "find_package" in Qt5Config.cmake, which + ;; disables the use of CMAKE_PREFIX_PATH via the parameter + ;; "NO_DEFAULT_PATH". Re-enable it so that the different + ;; components can be installed in different places. + (substitute* (find-files "." "\\.cmake(\\.in)?$") + (("\\bNO_DEFAULT_PATH\\b") "")) + ;; Because Qt goes against the grain of CMake and set + ;; NO_DEFAULT_PATH, it needs to invent yet another variable + ;; to do what CMAKE_PREFIX_PATH could have done: + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH. Since we patch out + ;; the NO_DEFAULT_PATH, we can set the default value of + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH to that of + ;; CMAKE_PREFIX_PATH to ensure tools such as + ;; 'qmlimportscanner' from qtdeclarative work out of the + ;; box. + (substitute* "cmake/QtConfig.cmake.in" + (("(set\\(QT_ADDITIONAL_PACKAGES_PREFIX_PATH )\"\"" _ head) + (string-append head "\"$ENV{CMAKE_PREFIX_PATH}\""))))) (delete 'patch-bin-sh) (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths -- cgit v1.2.3 From de6f155426b7f1c8b38b8a1f92073eff3a04ecdc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 15:51:56 -0400 Subject: gnu: qtbase: Enable test suite. * gnu/packages/qt.scm (qtbase)[tests?]: Delete argument. [configure-flags]: Add "-DQT_BUILD_TESTS=ON". [phases]{check}: Move after the patch-prl-files phase and override. [native-inputs]: Add xvfb-run. --- gnu/packages/qt.scm | 112 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c2e509fcdf..001e6286fe 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -570,14 +570,10 @@ (define-public qtbase (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) - ;; XXX: There are many test failures, because the test suite - ;; requires a real X server (a virtual one such as Xvfb is not - ;; enough) or a functional network. It's also quite expensive to - ;; build and run. - ((#:tests? _ #f) #f) ((#:configure-flags _ ''()) `(let ((out (assoc-ref %outputs "out"))) (list "-GNinja" ;the build fails otherwise + "-DQT_BUILD_TESTS=ON" (string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6") (string-append "-DINSTALL_DATADIR=" out "/share/qt6") (string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6") @@ -664,6 +660,108 @@ (define-public qtbase (if parallel-build? `("--parallel" ,(number->string (parallel-job-count))) '())))) + (delete 'check) ;move after patch-prl-files + (add-after 'patch-prl-files 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? + ;; The tests expect to find the modules provided by this + ;; package; extend the environment variables needed to do so. + (setenv "CMAKE_PREFIX_PATH" + (string-append #$output + ":" (getenv "CMAKE_PREFIX_PATH"))) + (setenv "QMAKEPATH" (string-append #$output "/lib/qt6")) + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml")) + (setenv "QT_PLUGIN_PATH" + (string-append #$output "/lib/qt6/plugins")) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Skip tests known to fail on GNU/Linux, in a CI context or + ;; due to bitness (see: https://code.qt.io/cgit/qt/qtbase.git + ;; /tree/src/testlib/qtestblacklist.cpp). + (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") + (setenv "HOME" "/tmp") ;some tests require a writable HOME + (invoke + "xvfb-run" "ctest" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" ;disable problematic tests + (string-append + "(" + (string-join + (list + ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". + "tst_moc" + ;; The 'test_rcc' test fails on a comparison: + ;; <<<<<< actual + ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8, + ;; ====== + ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, + ;; >>>>>> expected + "tst_rcc" + ;; The 'tst_qtemporarydir' and 'tst_qtemporaryfile' + ;; tests depend on '/home' not being writable. + "tst_qtemporarydir" + "tst_qtemporaryfile" + ;; The 'tst_qdir' compares two directories which are + ;; unexpectedly different when inside the build + ;; container. + "tst_qdir" + ;; This checks the last modified time of '/', and fails + ;; because Epoch 0 is considered to be invalid. + "tst_qresourceengine" + ;; The 'tst_qfilesystemwatcher' installs a watcher on + ;; '/home', which doesn't exist in the build container. + "tst_qfilesystemwatcher" + ;; The 'mockplugins' test fail following error: "Unknown + ;; platform linux-g++", and the other plugin tests + ;; depend on it. + "mockplugins" + "test_plugin_flavor.*" + ;; The 'test_import_plugins' fails with "Could NOT find + ;; Qt6MockPlugins1". + "test_import_plugins" + ;; The 'tst_QTimeZone::systemZone' validates the + ;; currently set timezone and fails. + "tst_qtimezone" + ;; The 'tst_qdatetime' fails with: + ;; FAIL! : tst_QDateTime::offsetFromUtc() Compared values are not the same + ;; Actual (dt5.offsetFromUtc()): 0 + ;; Expected (46800) : 46800 + "tst_qdatetime" + ;; The 'tst_QSettings::fromFile' assumes the data + ;; location to be relative to the root directory and + ;; fails. + "tst_qsettings" + ;; The 'tst_qaddpreroutine', + ;; 'test_generating_cpp_exports' and + ;; 'test_static_resources' tests fail with: "Unknown + ;; platform linux-g++. + "tst_qaddpreroutine" + "test_generating_cpp_exports" + "test_static_resources" + ;; The 'tst_qfile' fails since there is no /home in the + ;; build container. + "tst_qfile" + ;; The 'tst_QGlyphRun::mixedScripts' test fails with: + ;; Actual (glyphRuns.size()): 1 + ;; Expected (2) : 2 + "tst_qglyphrun" + ;; The 'tst_qx11info' test fails with "Internal error: + ;; QPA plugin doesn't implement generatePeekerId", + ;; likely requires a real display. + "tst_qx11info" + ;; The 'tst_qgraphicswidget' test fails because "This + ;; plugin does not support propagateSizeHints". + "tst_qgraphicswidget" + ;; The 'tst_qdnslookup' test requires networking. + "tst_qdnslookup" + ;; The 'tst_qcompleter' and 'tst_QFiledialog::completer' + ;; attempt to complete paths they assume exist, such as + ;; "/home", "/etc" or "/root" and fail. + "tst_qcompleter" + "tst_qfiledialog") "|") + ")"))))) (replace 'install (lambda _ (invoke "cmake" "--install" "."))) @@ -708,7 +806,9 @@ (define-public qtbase (native-inputs (modify-inputs (package-native-inputs qtbase-5) (prepend gtk ;for GTK theme support - ninja wayland-protocols))) + ninja + wayland-protocols + xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) (prepend bash-minimal coreutils-minimal libxcb md4c) -- cgit v1.2.3 From 4af9984a4e77d42cd063de590c164044599b4062 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 20:57:09 -0400 Subject: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4). This revert the upgrade from GTK 3 to 4 in 8d7fdbe261e32a63df8c47f06b1a43095b6084c7. Qt doesn't yet support GTK 4. * gnu/packages/qt.scm (qtbase)[native-inputs]: Remove gtk. [inputs]: Do not replace gtk+ by gtk. --- gnu/packages/qt.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 001e6286fe..9cb6ae5893 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -805,14 +805,12 @@ (define-public qtbase (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (native-inputs (modify-inputs (package-native-inputs qtbase-5) - (prepend gtk ;for GTK theme support - ninja + (prepend ninja wayland-protocols xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) (prepend bash-minimal coreutils-minimal libxcb md4c) - (replace "gtk+" gtk) ;use latest gtk (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 1ef04fb2288dade3ad2883026ae286a68ef13a1e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 01:11:46 -0400 Subject: gnu: qtsvg: Rename variable to qtsvg-5. This is in preparation of the qtsvg update to version 6. This change was automated via the following command: git grep -l '\bqtsvg\b' | xargs sed 's/qtsvg/qtsvg-5/g' -i --- gnu/packages/admin.scm | 4 +- gnu/packages/animation.scm | 2 +- gnu/packages/audio.scm | 5 +- gnu/packages/backup.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 4 +- gnu/packages/electronics.scm | 2 +- gnu/packages/engineering.scm | 16 +++--- gnu/packages/finance.scm | 4 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 56 +++++++++--------- gnu/packages/geo.scm | 4 +- gnu/packages/gps.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/image-processing.scm | 2 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 12 ++-- gnu/packages/kde-multimedia.scm | 6 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/kde.scm | 18 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/lxqt.scm | 40 ++++++------- gnu/packages/maths.scm | 4 +- gnu/packages/messaging.scm | 12 ++-- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 22 +++---- gnu/packages/networking.scm | 2 +- gnu/packages/orange.scm | 4 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/pdf.scm | 2 +- gnu/packages/printers.scm | 2 +- gnu/packages/qt.scm | 118 +++++++++++++++++++------------------- gnu/packages/radio.scm | 4 +- gnu/packages/robotics.scm | 2 +- gnu/packages/security-token.scm | 4 +- gnu/packages/sync.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/tex.scm | 2 +- gnu/packages/text-editors.scm | 8 +-- gnu/packages/video.scm | 10 ++-- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 50 files changed, 210 insertions(+), 211 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e66277ea92..571271b5ab 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2137,7 +2137,7 @@ (define-public wpa-supplicant-gui (inherit wpa-supplicant) (name "wpa-supplicant-gui") (inputs (modify-inputs (package-inputs wpa-supplicant) - (prepend qtbase-5 qtsvg))) + (prepend qtbase-5 qtsvg-5))) (native-inputs ;; For icons. (modify-inputs (package-native-inputs wpa-supplicant) @@ -2157,7 +2157,7 @@ (define-public wpa-supplicant-gui (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (qt '("qtbase" "qtsvg"))) + (qt '("qtbase" "qtsvg-5"))) (install-file "wpa_gui" (string-append out "/bin")) (install-file "wpa_gui.desktop" (string-append out "/share/applications")) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c281772563..89079ceb6e 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -474,7 +474,7 @@ (define-public pencil2d "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg)) + (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d70f1e06b4..9c246cddc5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ (define-public supercollider yaml-cpp qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebsockets)) (propagated-inputs ;to get native-search-path @@ -5852,9 +5852,8 @@ (define-public qpwgraph `(#:tests? #f)) ;; no tests (inputs (list alsa-lib pipewire-0.3 - ;; qtsvg is still on version 5; use qtbase-5 to match qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config)) (synopsis "PipeWire graph manager") (description diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 2c5fd4abd9..06a8ac59eb 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1339,7 +1339,7 @@ (define-public vorta python-pyqt-without-qtwebkit python-secretstorage ;; This is included so that the qt-wrap phase picks it up. - qtsvg)) + qtsvg-5)) (home-page "https://github.com/borgbase/vorta") (synopsis "Graphical backup client based on BorgBackup") (description "Vorta is a graphical backup client based on the Borg backup diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95e91b47f3..e9f7ab9e98 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11264,7 +11264,7 @@ (define-public bandage (install-file "Bandage" (string-append out "/bin")) #t)))))) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (native-inputs (list imagemagick)) (home-page "https://rrwick.github.io/Bandage/") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index bc0364d87c..fe235d4b3b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -477,7 +477,7 @@ (define-public qbittorrent ("openssl" ,openssl) ("python" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (home-page "https://www.qbittorrent.org/") (synopsis "Graphical BitTorrent client") diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 64375b8cfc..71d8fae7f1 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -93,7 +93,7 @@ (define-public sddm qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 shadow wayland)) (arguments diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 339a72ef91..5d864da281 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -293,7 +293,7 @@ (define-public calibre (setenv "CI" "true") ;; The Qt test complains about being unable to load all image ;; plugins, and I notice the available plugins list it shows - ;; lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how + ;; lacks 'svg'. Adding qtsvg-5 doesn't fix it, so I'm not sure how ;; to fix it. TODO: Fix test and remove this. (setenv "SKIP_QT_BUILD_TEST" "true"))) (add-after 'install 'install-rapydscript diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 9e5a17a6ae..0e3c8feaf9 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -185,7 +185,7 @@ (define-public gcompris-qt qtmultimedia qtquickcontrols qtsensors - qtsvg + qtsvg-5 qtxmlpatterns)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") @@ -560,7 +560,7 @@ (define-public openboard qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtxmlpatterns diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 70d960aaab..342294de13 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -381,7 +381,7 @@ (define-public pulseview libsigrok libsigrokdecode qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bf32187dde..8037ccb565 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -213,7 +213,7 @@ (define-public librecad (copy-recursively "unix/resources" share)) #t))))) (inputs - (list boost muparser freetype qtbase-5 qtsvg)) + (list boost muparser freetype qtbase-5 qtsvg-5)) (native-inputs (list pkg-config which)) (home-page "https://librecad.org/") @@ -710,7 +710,7 @@ (define-public fritzing (inputs `(("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) ("zlib" ,zlib) @@ -764,7 +764,7 @@ (define-public qelectrotech (native-inputs (list pkg-config qttools)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg sqlite)) + (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") (synopsis "CAD/CAE editor focusing on schematics drawing features") (description "QElectroTech, or QET in short, is a desktop application to @@ -1246,7 +1246,7 @@ (define-public valeronoi mpfr openssl qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/ccoors/Valeronoi") (synopsis "WiFi mapping companion application for Valetudo") (description @@ -2118,7 +2118,7 @@ (define-public librepcb (base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtsvg zlib)) + (list qtbase-5 qtsvg-5 zlib)) (native-inputs (list qttools ; for lrelease unzip)) @@ -2278,7 +2278,7 @@ (define-public cutter (list pkg-config)) (inputs (list qtbase-5 - qtsvg + qtsvg-5 openssl ;; Depends on radare2 4.5.1 officially, builds and works fine with ;; radare2 5.0.0 but fails to build with radare2 5.1.1. @@ -2491,7 +2491,7 @@ (define-public freecad python-wrapper qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtx11extras @@ -3426,7 +3426,7 @@ (define-public uranium qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg)) + qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. #:tests? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index adceb98f83..f59fb56f7a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -651,7 +651,7 @@ (define-public electron-cash python-requests python-stem python-trezor - qtsvg + qtsvg-5 zlib)) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") @@ -807,7 +807,7 @@ (define-public monero-gui ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:tests? #f ; No tests diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 30512dcc80..f9e8baffd4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ (define-public tiled "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtsvg zlib)) + (list qtbase-5 qtdeclarative qtsvg-5 zlib)) (native-inputs (list qttools)) (arguments diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d55a2ee867..cc246551a3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -994,7 +994,7 @@ (define-public cockatrice (list protobuf qtbase-5 qtmultimedia - qtsvg + qtsvg-5 qttools qtwebsockets xz @@ -7199,7 +7199,7 @@ (define-public the-butterfly-effect ;; with multiple "QPainter:: ... Painter not active" warnings. #:tests? #f)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (native-inputs `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) @@ -9271,7 +9271,7 @@ (define-public flightgear plib qtbase-5 qtdeclarative - qtsvg + qtsvg-5 simgear speexdsp sqlite @@ -10153,7 +10153,7 @@ (define-public q5go (native-inputs (list pkg-config)) (inputs - (list qtbase-5 qtmultimedia qtsvg)) + (list qtbase-5 qtmultimedia qtsvg-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -10249,7 +10249,7 @@ (define-public ktuberling qtbase-5 qtmultimedia qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and @@ -10295,7 +10295,7 @@ (define-public picmi libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Number logic game") (description "Picmi is a number logic game in which cells in a grid have @@ -10376,7 +10376,7 @@ (define-public libkmahjongg ki18n kwidgetsaddons qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Shared library for kmahjongg and kshisen") (description "Shared library and common files for kmahjongg, kshisen and @@ -10409,7 +10409,7 @@ (define-public kmahjongg libkmahjongg qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") (description "In KMahjongg the tiles are scrambled and staked on top of @@ -10506,7 +10506,7 @@ (define-public kajongg python-pyqt python-zope-interface qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classical Mah Jongg game for 4 players") (description "Kajongg is the ancient Chinese board game for 4 players. @@ -10623,7 +10623,7 @@ (define-public konquest libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple turn-based strategy game") (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players @@ -10662,7 +10662,7 @@ (define-public kbounce libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") (description "KBounce is a single player arcade game with the elements of @@ -10700,7 +10700,7 @@ (define-public kblocks libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") (description "KBlocks is the classic Tetris-like falling blocks game. @@ -10743,7 +10743,7 @@ (define-public ksudoku glu qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") (description "KSudoku is a Sudoku game and solver, supporting a range of @@ -10920,7 +10920,7 @@ (define-public kfourinline libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") (description "KFourInLine is a board game for two players based on the @@ -10959,7 +10959,7 @@ (define-public kblackbox libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") (description "KBlackbox is a game of hide and seek played on a grid of @@ -11082,7 +11082,7 @@ (define-public granatier libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -11118,7 +11118,7 @@ (define-public ksirk qca qtbase-5 qtdeclarative - qtsvg + qtsvg-5 zlib)) (home-page "https://games.kde.org/") (synopsis "Computerized version of the well known strategy board game @@ -11179,7 +11179,7 @@ (define-public palapeli libkdegames qtbase-5 qtdeclarative - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") (synopsis "Jigsaw puzzle game") @@ -11259,7 +11259,7 @@ (define-public kigo libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Go board game") (description "Kigo is an open-source implementation of the popular Go @@ -11304,7 +11304,7 @@ (define-public kubrick libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") (description "Kubrick is a game based on the Rubik's Cube puzzle. @@ -11344,7 +11344,7 @@ (define-public lskat libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -11382,7 +11382,7 @@ (define-public kapman libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") (description "Kapman is a clone of the well known game Pac-Man. @@ -11421,7 +11421,7 @@ (define-public kspaceduel libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") (description "KSpaceduel is a space battle game for one or two players, @@ -11454,7 +11454,7 @@ (define-public bovo libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five @@ -11534,7 +11534,7 @@ (define-public ksnakeduel libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") (description "KSnakeDuel is a fast action game where you steer a snake @@ -11650,7 +11650,7 @@ (define-public kreversi libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") (description "KReversi is a simple one player strategy game played @@ -11727,7 +11727,7 @@ (define-public kjumpingcube libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple tactical game for number-crunchers") (description "KJumpingcube is a simple tactical game for one or two @@ -11885,7 +11885,7 @@ (define-public chessx (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia qtspeech qtsvg zlib)) + (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a05b86219e..0c98d57821 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2622,7 +2622,7 @@ (define-public qgis qtkeychain qtlocation qtserialport - qtsvg + qtsvg-5 qwt ;;("saga" ,saga) sqlite)) @@ -2764,7 +2764,7 @@ (define-public gplates python-3 python-numpy qtbase-5 - qtsvg + qtsvg-5 qtxmlpatterns qwt zlib)) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 853361bd61..b117ff4222 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -194,7 +194,7 @@ (define-public gpxsee (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - (list qtbase-5 qtlocation qtsvg)) + (list qtbase-5 qtlocation qtsvg-5)) (native-inputs (list qttools)) (home-page "https://www.gpxsee.org") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c193be1efb..915d9d79e1 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1966,7 +1966,7 @@ (define-public drawpile qtbase-5 qtkeychain qtmultimedia - qtsvg + qtsvg-5 qtx11extras)) (home-page "https://drawpile.net") (synopsis "Collaborative drawing program") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index bcb1d7a2f6..98d30d54ed 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1231,7 +1231,7 @@ (define-public scantailor-advanced ("libpng" ,libpng) ("libtiff" ,libtiff) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:phases diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d4d2351c3..2d3b8aa46f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -520,7 +520,7 @@ (define-public luminance-hdr (inputs (list qtbase-5 qtdeclarative - qtsvg + qtsvg-5 boost eigen ;; gtest @@ -673,7 +673,7 @@ (define-public qview (native-inputs (list qttools)) (inputs - (list qtbase-5 qtimageformats qtsvg)) + (list qtbase-5 qtimageformats qtsvg-5)) (home-page "https://interversehq.com/qview/") (synopsis "Convenient and minimal image viewer") (description "qView is a Qt image viewer designed with visually @@ -921,7 +921,7 @@ (define-public nomacs ("python" ,python-wrapper) ("quazip" ,quazip-0) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7afe96d149..90554143d0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1830,7 +1830,7 @@ (define-public flameshot (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (arguments `(#:tests? #f)) ;no tests (home-page "https://github.com/flameshot-org/flameshot") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 5fc69cab3b..e7ace9e6c4 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -136,7 +136,7 @@ (define-public quassel qtbase-5 qtmultimedia qtscript - qtsvg + qtsvg-5 snorenotify sonnet zlib)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b8210bcc1e..726221b1e5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -604,7 +604,7 @@ (define-public jami libnotify network-manager qrencode - qtsvg + qtsvg-5 qtwebengine qtwebchannel qtmultimedia diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9f957692cb..0f1799edb2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -712,7 +712,7 @@ (define-public kgraphviewer graphviz kiconthemes kparts - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) (home-page "https://apps.kde.org/en/kgraphviewer") @@ -877,7 +877,7 @@ (define-public kirigami qtbase-5 qtdeclarative qtquickcontrols2 - qtsvg + qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) (home-page "https://community.kde.org/Frameworks") @@ -2546,7 +2546,7 @@ (define-public kiconthemes kitemviews kwidgetsaddons qtbase-5 - qtsvg)) + qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -3339,7 +3339,7 @@ (define-public plasma-framework ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (arguments @@ -3548,7 +3548,7 @@ (define-public kdelibs4support libsm networkmanager-qt openssl - qtsvg + qtsvg-5 qttools qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and @@ -3700,7 +3700,7 @@ (define-public kjsembed (native-inputs (list extra-cmake-modules kdoctools qttools)) (inputs - (list ki18n kjs qtbase-5 qtsvg)) + (list ki18n kjs qtbase-5 qtsvg-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") (description "KJSEmbed provides a method of binding Javascript objects to diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 265dcef625..5b0d841445 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -177,7 +177,7 @@ (define-public elisa qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt vlc)) @@ -269,7 +269,7 @@ (define-public juk phonon phonon-backend-gstreamer qtbase-5 - qtsvg + qtsvg-5 taglib)) (home-page "https://kde.org/applications/multimedia/org.kde.juk") (synopsis "Music jukebox / music player") @@ -625,7 +625,7 @@ (define-public kmplayer phonon qtbase-5 cairo - qtsvg + qtsvg-5 qtx11extras xcb-util xcb-util-cursor diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 3fab9089f3..4e6cd1d6e1 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -346,7 +346,7 @@ (define-public yakuake kwidgetsaddons kwindowsystem qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (home-page "https://www.kde.org/applications/system/yakuake/") (synopsis "Quad-style terminal emulator for KDE") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index b56b63e784..2dfd1348e7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -292,7 +292,7 @@ (define-public kdenlive qtquickcontrols qtquickcontrols2 qtscript - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") @@ -438,7 +438,7 @@ (define-public kdiagram (native-inputs (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") (description "This package provides libraries for integrating business @@ -541,7 +541,7 @@ (define-public krita qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtx11extras quazip-0 zlib)) @@ -577,7 +577,7 @@ (define-public massif-visualizer kio ki18n qtbase-5 - qtsvg + qtsvg-5 qtxmlpatterns)) (home-page "https://apps.kde.org/en/massif-visualizer") (synopsis "Visualize massif data generated by Valgrind") @@ -828,7 +828,7 @@ (define-public labplot kwidgetsaddons kxmlgui qtbase-5 - qtsvg + qtsvg-5 shared-mime-info ;; Optional. cfitsio @@ -978,7 +978,7 @@ (define-public libkdegames openal qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1027,7 +1027,7 @@ (define-public marble-qt qtdeclarative qtlocation qtserialport - qtsvg + qtsvg-5 qtwebchannel qtwebengine shapelib @@ -1095,7 +1095,7 @@ (define-public okular poppler-qt5 qca qtdeclarative - qtsvg + qtsvg-5 threadweaver kcrash kjs)) @@ -1225,7 +1225,7 @@ (define-public kuserfeedback ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative qtsvg)) + (list qtbase-5 qtcharts qtdeclarative qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 504b494563..0beac88d32 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -856,7 +856,7 @@ (define-public linphone-desktop qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg)) + qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over IP calling (VoIP) and instant messaging. Amongst its features are: diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a0a3a0f15b..9ff1de942c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -187,7 +187,7 @@ (define-public libqtxdg #t))))) (propagated-inputs ;; required by Qt5XdgIconLoader.pc - (list glib qtbase-5 qtsvg)) + (list glib qtbase-5 qtsvg-5)) (native-inputs (list lxqt-build-tools pkg-config)) (home-page "https://github.com/lxqt/libqtxdg") @@ -231,7 +231,7 @@ (define-public liblxqt libqtxdg libxscrnsaver polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -284,7 +284,7 @@ (define-public lxqt-about liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -326,7 +326,7 @@ (define-public lxqt-admin liblxqt libqtxdg polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -375,7 +375,7 @@ (define-public lxqt-config libxcursor libxi qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xf86-input-libinput @@ -443,7 +443,7 @@ (define-public lxqt-globalkeys liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -489,7 +489,7 @@ (define-public lxqt-notificationd liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -534,7 +534,7 @@ (define-public lxqt-openssh-askpass liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -584,7 +584,7 @@ (define-public lxqt-panel pcre pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xcb-util @@ -646,7 +646,7 @@ (define-public lxqt-policykit pcre polkit-qt qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config polkit lxqt-build-tools qttools)) @@ -692,7 +692,7 @@ (define-public lxqt-powermanagement libqtxdg lxqt-globalkeys qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid)) (native-inputs @@ -739,7 +739,7 @@ (define-public lxqt-qtplugin libfm-qt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -779,7 +779,7 @@ (define-public lxqt-runner muparser pcre qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -825,7 +825,7 @@ (define-public lxqt-session libqtxdg procps qtbase-5 - qtsvg + qtsvg-5 qtx11extras xdg-user-dirs)) (native-inputs @@ -893,7 +893,7 @@ (define-public lxqt-sudo liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras sudo)) (native-inputs @@ -1068,7 +1068,7 @@ (define-public lximage-qt (base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f")))) (build-system cmake-build-system) (inputs - (list libexif libfm-qt qtbase-5 qtsvg qtx11extras)) + (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config lxqt-build-tools qttools)) (arguments @@ -1225,7 +1225,7 @@ (define-public screengrab (base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r")))) (build-system cmake-build-system) (inputs - (list kwindowsystem libqtxdg qtbase-5 qtsvg qtx11extras)) + (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config perl qttools)) (arguments @@ -1283,7 +1283,7 @@ (define-public lxqt-connman-applet (inputs (list kwindowsystem qtbase-5 - qtsvg + qtsvg-5 liblxqt qtx11extras libqtxdg)) @@ -1332,9 +1332,9 @@ (define-public lxqt xdg-user-dirs xdg-utils ;; Base - ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it + ;; TODO: qtsvg-5 is needed for lxqt apps to display icons. Maybe it ;; should be added to their propagated-inputs? - qtsvg + qtsvg-5 ;; Core lxqt-about lxqt-admin diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a84f47468..72a8957200 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3064,7 +3064,7 @@ (define-public veusz (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/veusz") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list pkg-config @@ -3076,7 +3076,7 @@ (define-public veusz python-h5py ;optional, for HDF5 data python-pyqt qtbase-5 - qtsvg)) + qtsvg-5)) (propagated-inputs (list python-numpy)) (home-page "https://veusz.github.io/") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f2e4d1f302..07f6bc17cb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -233,7 +233,7 @@ (define-public psi ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) @@ -1480,7 +1480,7 @@ (define-public kaidan qtgraphicaleffects qtlocation qtquickcontrols2 - qtsvg + qtsvg-5 qtmultimedia qtxmlpatterns qqc2-desktop-style @@ -1826,7 +1826,7 @@ (define-public qtox openal qrencode qtbase-5 - qtsvg + qtsvg-5 sqlcipher)) (home-page "https://qtox.github.io/") (synopsis "Tox chat client using Qt") @@ -2462,7 +2462,7 @@ (define-public nheko qtgraphicaleffects qtmultimedia qtquickcontrols2 - qtsvg + qtsvg-5 spdlog single-application-qt5 xcb-util-wm @@ -2501,7 +2501,7 @@ (define-public quaternion qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qttools xdg-utils)) (arguments @@ -3041,7 +3041,7 @@ (define-public psi-plus ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) ("x11" ,libx11) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 8d87f8f261..e83c78e4d2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -464,7 +464,7 @@ (define-public cantata mpg123 qtbase-5 qtmultimedia - qtsvg + qtsvg-5 taglib zlib)) (synopsis "Graphical MPD Client") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 520d64d33c..2246da84be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2264,7 +2264,7 @@ (define-public mixxx qtdeclarative qtkeychain qtscript - qtsvg + qtsvg-5 qtx11extras rubberband soundtouch @@ -2301,7 +2301,7 @@ (define-public synthv1 new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://synthv1.sourceforge.io") @@ -2334,7 +2334,7 @@ (define-public drumkv1 new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://drumkv1.sourceforge.io") @@ -2367,7 +2367,7 @@ (define-public samplv1 new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://samplv1.sourceforge.io") @@ -2400,7 +2400,7 @@ (define-public padthv1 liblo fftwf qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://padthv1.sourceforge.io") @@ -2928,7 +2928,7 @@ (define-public drumstick "/manpages/docbook.xsl"))) #t))))) (inputs - (list qtbase-5 qtsvg qttools alsa-lib)) + (list qtbase-5 qtsvg-5 qttools alsa-lib)) (native-inputs (list pkg-config libxslt ; for xsltproc @@ -2972,7 +2972,7 @@ (define-public vmpk "/manpages/docbook.xsl"))) #t))))) (inputs - (list drumstick qtbase-5 qtsvg qtx11extras)) + (list drumstick qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list libxslt ;for xsltproc docbook-xsl qttools pkg-config)) @@ -4761,7 +4761,7 @@ (define-public musescore qtgraphicaleffects qtquickcontrols2 qtscript - qtsvg + qtsvg-5 qtxmlpatterns)) (native-inputs (list pkg-config qttools)) @@ -4828,7 +4828,7 @@ (define-public muse-sequencer pcre pulseaudio ; required by rtaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio rubberband sord)) @@ -5550,7 +5550,7 @@ (define-public fmit ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtmultimedia" "qtsvg"))) + '("qtbase" "qtmultimedia" "qtsvg-5"))) `("QML2_IMPORT_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) @@ -5564,7 +5564,7 @@ (define-public fmit portaudio qtbase-5 qtmultimedia - qtsvg)) + qtsvg-5)) (native-inputs `(("gettext" ,gettext-minimal) ("hicolor-icon-theme" ,hicolor-icon-theme) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a48c4997ef..c39123ddfa 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1637,7 +1637,7 @@ (define-public wireshark minizip qtbase-5 qtmultimedia - qtsvg + qtsvg-5 sbc snappy zlib diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index d579442902..367c9cc288 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -137,7 +137,7 @@ (define-public orange (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/orange-canvas") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list python-cython)) @@ -172,7 +172,7 @@ (define-public orange python-xlrd python-xlsxwriter qtbase-5 - qtsvg + qtsvg-5 xdg-utils)) (home-page "https://orangedatamining.com/") (synopsis "Component-based data mining framework") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index da140b29ad..7db592549d 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -179,7 +179,7 @@ (define-public keepassxc pcsc-lite qrencode qtbase-5 - qtsvg + qtsvg-5 qtx11extras quazip-0 ; XC_KEESHARE readline @@ -699,7 +699,7 @@ (define-public qtpass (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (home-page "https://qtpass.org") (synopsis "GUI for password manager password-store") (description diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f269449a92..39266a2822 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -869,7 +869,7 @@ (define-public qpdfview libspectre poppler-qt5 qtbase-5 - qtsvg)) + qtsvg-5)) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index f78923966c..e7761070e0 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -58,7 +58,7 @@ (define-public robocut (inputs `(("libusb" ,libusb) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qmake" ,qtbase-5))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9cb6ae5893..07fc6128c2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -187,7 +187,7 @@ (define-public qt5ct (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (synopsis "Qt5 Configuration Tool") (description "Qt5CT is a program that allows users to configure Qt5 settings (such as icons, themes, and fonts) in desktop environments or @@ -829,7 +829,7 @@ (define-public qtbase (variable "XDG_CONFIG_DIRS") (files '("etc/xdg"))))))) -(define-public qtsvg +(define-public qtsvg-5 (package (inherit qtbase-5) (name "qtsvg") (version "5.15.2") @@ -900,7 +900,7 @@ (define-public qtsvg contents of SVG files."))) (define-public qtimageformats - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtimageformats") (version "5.15.2") (source (origin @@ -915,7 +915,7 @@ (define-public qtimageformats (delete-file-recursively "src/3rdparty") #t)))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-build @@ -938,7 +938,7 @@ (define-public qtimageformats support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtx11extras") (version "5.15.2") (source (origin @@ -948,7 +948,7 @@ (define-public qtx11extras (base32 "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl)) (inputs @@ -958,7 +958,7 @@ (define-public qtx11extras from within Qt 5."))) (define-public qtxmlpatterns - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtxmlpatterns") (version "5.15.2") (source (origin @@ -968,7 +968,7 @@ (define-public qtxmlpatterns (base32 "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) `(modify-phases ,phases @@ -985,7 +985,7 @@ (define-public qtxmlpatterns xmlpatternsvalidator."))) (define-public qtdeclarative - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") (source (origin @@ -995,7 +995,7 @@ (define-public qtdeclarative (base32 "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:phases phases) `(modify-phases ,phases @@ -1013,7 +1013,7 @@ (define-public qtdeclarative pkg-config python python-wrapper - qtsvg + qtsvg-5 vulkan-headers)) (inputs (list mesa qtbase-5)) @@ -1025,7 +1025,7 @@ (define-public qtdeclarative with JavaScript and C++."))) (define-public qtconnectivity - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtconnectivity") (version "5.15.2") (source (origin @@ -1043,7 +1043,7 @@ (define-public qtconnectivity with Bluetooth and NFC."))) (define-public qtwebsockets - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebsockets") (version "5.15.2") (source (origin @@ -1053,7 +1053,7 @@ (define-public qtwebsockets (base32 "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative)) @@ -1066,7 +1066,7 @@ (define-public qtwebsockets consume data received from the server, or both."))) (define-public qtsensors - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtsensors") (version "5.15.2") (source (origin @@ -1076,7 +1076,7 @@ (define-public qtsensors (base32 "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:phases phases) `(modify-phases ,phases @@ -1095,7 +1095,7 @@ (define-public qtsensors recognition API for devices."))) (define-public qtmultimedia - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtmultimedia") (version "5.15.2") (source (origin @@ -1114,7 +1114,7 @@ (define-public qtmultimedia (("spectrum") "#")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (replace 'configure @@ -1140,7 +1140,7 @@ (define-public qtmultimedia set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwayland") (version "5.15.2") (source (origin @@ -1150,7 +1150,7 @@ (define-public qtwayland (base32 "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-failing-tests @@ -1189,7 +1189,7 @@ (define-public qtwayland compositor libraries."))) (define-public qtserialport - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtserialport") (version "5.15.2") (source (origin @@ -1202,7 +1202,7 @@ (define-public qtserialport (inputs (list qtbase-5 eudev)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'patch-dlopen-paths @@ -1219,7 +1219,7 @@ (define-public qtserialport interacting with serial ports from within Qt."))) (define-public qtserialbus - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtserialbus") (version "5.15.2") (source (origin @@ -1229,7 +1229,7 @@ (define-public qtserialbus (base32 "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'unpack 'patch-libsocketcan-reference @@ -1249,7 +1249,7 @@ (define-public qtserialbus and others."))) (define-public qtwebchannel - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") (source (origin @@ -1268,7 +1268,7 @@ (define-public qtwebchannel popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebglplugin") (version "5.15.2") (source (origin @@ -1278,7 +1278,7 @@ (define-public qtwebglplugin (base32 "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-network-tests @@ -1297,7 +1297,7 @@ (define-public qtwebglplugin OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebview") (version "5.15.2") (source (origin @@ -1316,7 +1316,7 @@ (define-public qtwebview native APIs where it makes sense."))) (define-public qtlocation - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtlocation") (version "5.15.2") (source (origin @@ -1329,7 +1329,7 @@ (define-public qtlocation (base32 "184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative qtquickcontrols qtserialport)) @@ -1340,7 +1340,7 @@ (define-public qtlocation positioning and geolocation plugins."))) (define-public qttools - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qttools") (version "5.15.2") (source (origin @@ -1350,7 +1350,7 @@ (define-public qttools (base32 "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative vulkan-headers)) @@ -1362,7 +1362,7 @@ (define-public qttools that helps in Qt development."))) (define-public qtscript - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtscript") (version "5.15.2") (source (origin @@ -1382,7 +1382,7 @@ (define-public qtscript ECMAScript and Qt."))) (define-public qtquickcontrols - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") (source (origin @@ -1392,7 +1392,7 @@ (define-public qtquickcontrols (base32 "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1402,7 +1402,7 @@ (define-public qtquickcontrols can be used to build complete interfaces in Qt Quick."))) (define-public qtquickcontrols2 - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtquickcontrols2") (version "5.15.2") (source (origin @@ -1412,7 +1412,7 @@ (define-public qtquickcontrols2 (base32 "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1423,7 +1423,7 @@ (define-public qtquickcontrols2 not available."))) (define-public qtgraphicaleffects - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgraphicaleffects") (version "5.15.2") (source (origin @@ -1433,7 +1433,7 @@ (define-public qtgraphicaleffects (base32 "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1446,7 +1446,7 @@ (define-public qtgraphicaleffects coloring, and many more."))) (define-public qtgamepad - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgamepad") (version "5.15.2") (source (origin @@ -1472,7 +1472,7 @@ (define-public qtgamepad and mobile applications targeting TV-like form factors."))) (define-public qtscxml - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtscxml") (version "5.15.2") (source (origin @@ -1499,7 +1499,7 @@ (define-public qtscxml also contains functionality to support data models and executable content."))) (define-public qtpurchasing - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtpurchasing") (version "5.15.2") (source (origin @@ -1515,7 +1515,7 @@ (define-public qtpurchasing purchasing goods and services."))) (define-public qtcharts - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtcharts") (version "5.15.2") (source (origin @@ -1525,7 +1525,7 @@ (define-public qtcharts (base32 "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1538,7 +1538,7 @@ (define-public qtcharts (license license:gpl3))) (define-public qtdatavis3d - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdatavis3d") (version "5.15.2") (source (origin @@ -1548,7 +1548,7 @@ (define-public qtdatavis3d (base32 "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1561,7 +1561,7 @@ (define-public qtdatavis3d (license license:gpl3))) (define-public qtnetworkauth - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtnetworkauth") (version "5.15.2") (source (origin @@ -1571,7 +1571,7 @@ (define-public qtnetworkauth (base32 "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'remove-failing-test @@ -1587,7 +1587,7 @@ (define-public qtnetworkauth implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtremoteobjects") (version "5.15.2") (source (origin @@ -1597,7 +1597,7 @@ (define-public qtremoteobjects (base32 "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'remove-failing-test @@ -1620,7 +1620,7 @@ (define-public qtremoteobjects processes or computers."))) (define-public qtspeech - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtspeech") (version "5.15.2") (source (origin @@ -1631,7 +1631,7 @@ (define-public qtspeech "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5)) @@ -1676,7 +1676,7 @@ (define-public qtspell (define-public qtwebengine (package - (inherit qtsvg) + (inherit qtsvg-5) (name "qtwebengine") (version (package-version qtbase-5)) (source @@ -1970,7 +1970,7 @@ (define (delete-unwanted-files child stat flag base level) vulkan-headers xcb-util)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:modules modules '()) `((guix build gnu-build-system) (guix build utils) @@ -2203,7 +2203,7 @@ (define-public python-pyqt ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) @@ -2307,7 +2307,7 @@ (define-public python-pyqtwebengine ("python-sip" ,python-sip) ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) @@ -2693,7 +2693,7 @@ (define-public qwt (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtsvg qttools)) + (list qtbase-5 qtsvg-5 qttools)) (arguments `(#:phases (modify-phases %standard-phases @@ -3019,7 +3019,7 @@ (define-public python-pyside-2 qtscxml qtsensors qtspeech - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtwebsockets @@ -3068,7 +3068,7 @@ (define-public python-pyside-2 "qtscxml" "qtsensors" "qtspeech" - "qtsvg" + "qtsvg-5" "qttools" "qtwebchannel" "qtwebengine" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index a694bc0050..d9f8e1002d 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -926,7 +926,7 @@ (define-public gqrx portaudio pulseaudio qtbase-5 - qtsvg + qtsvg-5 spdlog volk)) (arguments @@ -1861,7 +1861,7 @@ (define-public dream opus pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtwebkit qwt speexdsp diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index aedc8b8c5f..7266aa81f3 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -118,7 +118,7 @@ (define-public aseba enki protobuf-3.5 ;for logging qtbase-5 - qtsvg + qtsvg-5 qttools ;for libQt5Help, needed by "studio" qtwebkit qtx11extras diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index ec79544367..930c7431a3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -789,7 +789,7 @@ (define-public nitrokey-app libnitrokey libusb qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/Nitrokey/nitrokey-app") (synopsis "GUI tool for Nitrokey devices") (description @@ -856,7 +856,7 @@ (define-public ausweisapp2 (list pkg-config qttools)) (inputs (list qtbase-5 - qtsvg + qtsvg-5 qtdeclarative qtwebsockets qtgraphicaleffects diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 3dfaf40796..ff38928846 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -194,7 +194,7 @@ (define-public nextcloud-client qtkeychain qtquickcontrols2 qtsolutions - qtsvg + qtsvg-5 qtwebchannel qtwebsockets sqlite diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c5efc50b9..d62dc831b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -566,7 +566,7 @@ (define-public telegram-desktop ("pulseaudio" ,pulseaudio) ("qrcodegen" ,qrcodegen-cpp) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qt5ct" ,qt5ct) ("qtimageformats" ,qtimageformats) ("qtwayland" ,qtwayland) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e3071d9b75..82f2b2717b 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -646,7 +646,7 @@ (define-public mumble protobuf pulseaudio qtbase-5 - qtsvg + qtsvg-5 speech-dispatcher speex ; avoid bundled speexdsp ; avoid bundled diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ddcd0043c4..ff38c97c5d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8099,7 +8099,7 @@ (define-public lyx mythes python qtbase-5 - qtsvg + qtsvg-5 zlib)) (propagated-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-ec))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0c8531cc4d..41e55db9c2 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -670,7 +670,7 @@ (define-public ghostwriter qtdeclarative qtmultimedia qtquickcontrols - qtsvg + qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path (list qtwebengine)) @@ -695,7 +695,7 @@ (define-public ghostwriter ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins/")) - '("qtsvg" "qtmultimedia")))))))))) + '("qtsvg-5" "qtmultimedia")))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description @@ -770,7 +770,7 @@ (define-public manuskript #:icon "manuskript" #:categories "Office;WordProcessor;")))))))) (inputs - (list pandoc python-lxml python-markdown python-pyqt qtsvg)) + (list pandoc python-lxml python-markdown python-pyqt qtsvg-5)) (home-page "http://www.theologeek.ch/manuskript/") (synopsis "Tool for writers") (description "Manuskript provides a rich environment to help @@ -870,7 +870,7 @@ (define-public texmacs perl python-wrapper qtbase-5 - qtsvg + qtsvg-5 sqlite)) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index af658ea8d7..c53cfe96d3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1971,7 +1971,7 @@ (define-public vlc pulseaudio python-wrapper qtbase-5 - qtsvg + qtsvg-5 qtx11extras samba sdl @@ -3194,7 +3194,7 @@ (define-public mlt libsamplerate pulseaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio sdl2 sdl2-image @@ -3362,7 +3362,7 @@ (define-public obs pipewire-0.3 pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras qtwayland speexdsp @@ -4740,7 +4740,7 @@ (define-public openshot python-pyqt python-pyzmq python-requests - qtsvg)) + qtsvg-5)) (arguments `(#:modules ((guix build python-build-system) (guix build qt-utils) @@ -4862,7 +4862,7 @@ (define-public shotcut qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtwebkit qtwebsockets qtx11extras diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 3ab7dc6be9..24f0682e01 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -260,7 +260,7 @@ (define-public bitmask ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter go-github-com-apparentlymart-go-openvpn-mgmt diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b327338cd5..1c308ffbdf 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -454,7 +454,7 @@ (define-public kristall openssl qtbase-5 qtmultimedia - qtsvg)) + qtsvg-5)) (home-page "https://kristall.random-projects.net") (synopsis "Small-internet graphical client") (description "Graphical small-internet client with with many features diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 6100008393..5b54d02e2e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -370,7 +370,7 @@ (define-public copyq `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) ; Test suite is a rather manual process. (inputs - (list qtbase-5 qtscript qtsvg qtx11extras)) + (list qtbase-5 qtscript qtsvg-5 qtx11extras)) (synopsis "Clipboard manager with advanced features") (description "CopyQ is clipboard manager with editing and scripting features. CopyQ monitors system clipboard and saves its content in customized -- cgit v1.2.3 From 580b033a508c567852469e73fe85b236c11ae0b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 01:29:54 -0400 Subject: gnu: qtsvg-5: Fix indentation. * gnu/packages/qt.scm (qtsvg-5): Fix indentation. --- gnu/packages/qt.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 07fc6128c2..8dc4e06329 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -830,15 +830,16 @@ (define-public qtbase (files '("etc/xdg"))))))) (define-public qtsvg-5 - (package (inherit qtbase-5) + (package + (inherit qtbase-5) (name "qtsvg") (version "5.15.2") (source (origin - (method url-fetch) - (uri (qt5-urls name version)) - (sha256 - (base32 - "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs -- cgit v1.2.3 From 49f673415ff8a03e63c66293a5f0ddc0944dc14d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 11:21:16 -0400 Subject: gnu: Add qtsvg, version 6.3.1. * gnu/packages/qt.scm (qtsvg): New variable. --- gnu/packages/qt.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8dc4e06329..2d4a3cc6ea 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -900,6 +900,37 @@ (define-public qtsvg-5 (description "The QtSvg module provides classes for displaying the contents of SVG files."))) +(define-public qtsvg + (package + (name "qtsvg") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-display + (lambda _ + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs (list perl)) + (inputs (list libxkbcommon mesa qtbase zlib)) + (synopsis "Qt module for displaying SVGs") + (description "The QtSvg module provides classes for displaying the + contents of SVG files.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtimageformats (package (inherit qtsvg-5) (name "qtimageformats") -- cgit v1.2.3 From 6165dd3c72f2e06c8d9fa8e1cea3030596f63297 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 11:23:06 -0400 Subject: gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input. * gnu/packages/audio.scm (qpwgraph)[inputs]: Replace qtbase-5 with qtbase, qtsvg-5 with qtsvg. Add libxkbcommon. --- gnu/packages/audio.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9c246cddc5..87da0a965e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -125,6 +125,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -5848,12 +5849,12 @@ (define-public qpwgraph (base32 "1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94")))) (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ;; no tests + (arguments (list #:tests? #f)) ;; no tests (inputs (list alsa-lib + libxkbcommon pipewire-0.3 - qtbase-5 - qtsvg-5)) + qtbase + qtsvg)) (native-inputs (list pkg-config)) (synopsis "PipeWire graph manager") (description -- cgit v1.2.3 From 1d65ff8fdeb20cc2db956093f0ecb1f3f72afc0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 20:39:53 -0400 Subject: gnu: Add qtshadertools. * gnu/packages/qt.scm (qtshadertools): New variable. --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2d4a3cc6ea..82c2d5fa23 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1171,6 +1171,35 @@ (define-public qtmultimedia record media, and manage a collection of media content. It also contains a set of plugins for interacting with pulseaudio and GStreamer."))) +(define-public qtshadertools + (package + (name "qtshadertools") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + ;; Note: the source bundles *patched* glslang and SPIRV-Cross + ;; sources. + (sha256 + (base32 + "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (add-before 'check 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (native-inputs (list perl)) + (inputs (list glslang libxkbcommon qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Shader pipeline API and and tools for Qt") + (description "The @code{qtshadertools} module provides APIs and tools +supporting shader pipeline functionality as offered in Qt Quick to operate on +Vulkan, OpenGL and other main graphic APIs.") + (license (package-home-page qtbase)))) + (define-public qtwayland (package (inherit qtsvg-5) (name "qtwayland") -- cgit v1.2.3 From 5f228543394244f479b6a460326fa5f1a4a40998 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 19:00:48 -0400 Subject: gnu: qtmultimedia: Rename to qtmultimedia-5. Automated via: git grep -l qtmultimedia | xargs sed 's/qtmultimedia/qtmultimedia-5/g' -i git checkout NEWS --- gnu/packages/animation.scm | 6 +++--- gnu/packages/astronomy.scm | 2 +- gnu/packages/education.scm | 8 ++++---- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/games.scm | 8 ++++---- gnu/packages/graphics.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-multimedia.scm | 6 +++--- gnu/packages/kde.scm | 6 +++--- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 8 ++++---- gnu/packages/networking.scm | 2 +- gnu/packages/qt.scm | 19 ++++++++++--------- gnu/packages/radio.scm | 14 +++++++------- gnu/packages/text-editors.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- gnu/packages/web-browsers.scm | 2 +- 21 files changed, 59 insertions(+), 58 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 89079ceb6e..c7f80a4b6a 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -435,7 +435,7 @@ (define-public papagayo (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (qt '("qt" "qtmultimedia"))) + (qt '("qt" "qtmultimedia-5"))) (wrap-program (string-append out "/bin/Papagayo") `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (label) @@ -445,7 +445,7 @@ (define-public papagayo #t)))))) (inputs `(("qt" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("libsndfile" ,libsndfile))) (native-inputs (list qttools)) @@ -474,7 +474,7 @@ (define-public pencil2d "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5)) + (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e84eb188ff..95659104ce 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -607,7 +607,7 @@ (define-public stellarium (inputs (list qtbase-5 qtlocation - qtmultimedia + qtmultimedia-5 qtscript qtserialport zlib)) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0e3c8feaf9..998867918e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -182,7 +182,7 @@ (define-public gcompris-qt qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtsensors qtsvg-5 @@ -302,7 +302,7 @@ (define-public tipp10 ;; Recreate Makefile (invoke "qmake"))))))) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (home-page "https://www.tipp10.com/") (synopsis "Touch typing tutor") (description "Tipp10 is a touch typing tutor. The ingenious thing about @@ -559,7 +559,7 @@ (define-public openboard poppler qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtsvg-5 qtwebchannel qtwebengine @@ -995,7 +995,7 @@ (define-public qolibri (inputs (list libeb qtbase-5 - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtdeclarative qtwebchannel diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5cff92ac89..ba7fa1dbe2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -755,7 +755,7 @@ (define-public mgba minizip ncurses qtbase-5 - qtmultimedia + qtmultimedia-5 sdl2 sqlite zlib)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8037ccb565..bcf024e437 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2356,7 +2356,7 @@ (define-public openscad ("opencsg" ,opencsg) ("qscintilla" ,qscintilla) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia))) + ("qtmultimedia-5" ,qtmultimedia-5))) (native-inputs `(("bison" ,bison) ("flex" ,flex) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cc246551a3..ceac1d3390 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -993,7 +993,7 @@ (define-public cockatrice (inputs (list protobuf qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 qttools qtwebsockets @@ -10153,7 +10153,7 @@ (define-public q5go (native-inputs (list pkg-config)) (inputs - (list qtbase-5 qtmultimedia qtsvg-5)) + (list qtbase-5 qtmultimedia-5 qtsvg-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -10247,7 +10247,7 @@ (define-public ktuberling libkdegames python-wrapper qtbase-5 - qtmultimedia + qtmultimedia-5 qtdeclarative qtsvg-5)) (home-page "https://games.kde.org/") @@ -11885,7 +11885,7 @@ (define-public chessx (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 915d9d79e1..f7307e8f61 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1965,7 +1965,7 @@ (define-public drawpile ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason qtbase-5 qtkeychain - qtmultimedia + qtmultimedia-5 qtsvg-5 qtx11extras)) (home-page "https://drawpile.net") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e7ace9e6c4..67a86cbfc1 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -134,7 +134,7 @@ (define-public quassel perl qca qtbase-5 - qtmultimedia + qtmultimedia-5 qtscript qtsvg-5 snorenotify diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 726221b1e5..8f4c56842b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -607,7 +607,7 @@ (define-public jami qtsvg-5 qtwebengine qtwebchannel - qtmultimedia + qtmultimedia-5 qtdeclarative qtgraphicaleffects qtquickcontrols diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0f1799edb2..3dffcdf813 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1715,7 +1715,7 @@ (define-public kfilemetadata karchive kcoreaddons ki18n - qtmultimedia + qtmultimedia-5 qtbase-5 ;; Required run-time packages catdoc diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 5b0d841445..b60b4ee489 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -174,7 +174,7 @@ (define-public elisa qtbase-5 qtdeclarative qtgraphicaleffects ; not listed as dependency - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 @@ -336,7 +336,7 @@ (define-public kid3 libvorbis qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 readline taglib zlib)) @@ -698,7 +698,7 @@ (define-public kwave oxygen-icons ; default icon set pulseaudio qtbase-5 - qtmultimedia + qtmultimedia-5 zlib)) (home-page "https://kde.org/applications/multimedia/org.kde.kwave") (synopsis "Sound editor for KDE") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2dfd1348e7..ff02723ab1 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -287,7 +287,7 @@ (define-public kdenlive qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtnetworkauth qtquickcontrols qtquickcontrols2 @@ -540,7 +540,7 @@ (define-public krita poppler-qt5 qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtsvg-5 qtx11extras quazip-0 @@ -747,7 +747,7 @@ (define-public kdeconnect qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtx11extras)) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 07f6bc17cb..77aba8ee8a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -232,7 +232,7 @@ (define-public psi ("libidn" ,libidn) ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) @@ -1481,7 +1481,7 @@ (define-public kaidan qtlocation qtquickcontrols2 qtsvg-5 - qtmultimedia + qtmultimedia-5 qtxmlpatterns qqc2-desktop-style qxmpp @@ -2325,7 +2325,7 @@ (define-public libqmatrixclient (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) (build-system cmake-build-system) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") #:tests? #f)) ; no tests @@ -2460,7 +2460,7 @@ (define-public nheko qtdeclarative qtkeychain qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtsvg-5 spdlog @@ -2498,7 +2498,7 @@ (define-public quaternion (list libqmatrixclient qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 @@ -3040,7 +3040,7 @@ (define-public psi-plus ("qite" ,qite) ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e83c78e4d2..046471f32d 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -463,7 +463,7 @@ (define-public cantata libmtp mpg123 qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 taglib zlib)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2246da84be..c413be2bb3 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -253,7 +253,7 @@ (define-public audacious (inputs (list dbus qtbase-5 - qtmultimedia + qtmultimedia-5 ;; Plugin dependencies alsa-lib curl @@ -5550,12 +5550,12 @@ (define-public fmit ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtmultimedia" "qtsvg-5"))) + '("qtbase" "qtmultimedia-5" "qtsvg-5"))) `("QML2_IMPORT_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/qml")) - '("qtmultimedia")))) + '("qtmultimedia-5")))) #t)))))) (inputs (list alsa-lib @@ -5563,7 +5563,7 @@ (define-public fmit jack-1 portaudio qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5)) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c39123ddfa..7c6d0757ea 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1636,7 +1636,7 @@ (define-public wireshark `(,nghttp2 "lib") minizip qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 sbc snappy diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 82c2d5fa23..461180c5a3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -140,7 +140,7 @@ (define-public qite (chdir "libqite") #t))))) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (home-page "https://github.com/Ri0n/qite/") (synopsis "Qt Interactive Text Elements") (description "Qite manages interactive elements on QTextEdit.") @@ -1126,8 +1126,9 @@ (define-public qtsensors and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices."))) -(define-public qtmultimedia - (package (inherit qtsvg-5) +(define-public qtmultimedia-5 + (package + (inherit qtsvg-5) (name "qtmultimedia") (version "5.15.2") (source (origin @@ -1697,7 +1698,7 @@ (define-public qtspeech (inputs (list qtbase-5)) (native-inputs - (list perl qtdeclarative qtmultimedia qtxmlpatterns)) + (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users @@ -2022,7 +2023,7 @@ (define (delete-unwanted-files child stat flag base level) pulseaudio qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtwebchannel re2 snappy @@ -2261,7 +2262,7 @@ (define-public python-pyqt ("qtconnectivity" ,qtconnectivity) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) @@ -2842,7 +2843,7 @@ (define-public qtwebkit ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) ("qtwebchannel" ,qtwebchannel) ("libxml2" ,libxml2) @@ -3073,7 +3074,7 @@ (define-public python-pyside-2 qtdatavis3d qtdeclarative qtlocation - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtscript @@ -3122,7 +3123,7 @@ (define-public python-pyside-2 '("qtdatavis3d" "qtdeclarative" "qtlocation" - "qtmultimedia" + "qtmultimedia-5" "qtquickcontrols" "qtquickcontrols2" "qtscript" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d9f8e1002d..8749a2be0e 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1298,7 +1298,7 @@ (define-public wsjtx ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtserialport" ,qtserialport))) (arguments `(#:tests? #f)) ; No test suite @@ -1337,7 +1337,7 @@ (define-public jtdx libusb qtbase-5 qtwebsockets - qtmultimedia + qtmultimedia-5 qtserialport)) (arguments `(#:tests? #f)) ; No test suite @@ -1381,7 +1381,7 @@ (define-public js8call ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtserialport" ,qtserialport))) (arguments `(#:tests? #f ; No test suite @@ -1747,7 +1747,7 @@ (define-public kochmorse (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (arguments `(#:tests? #f)) ; No test suite (home-page "https://dm3mat.darc.de/kochmorse/") @@ -1930,7 +1930,7 @@ (define-public welle-io qtcharts qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols2 soapysdr)) (arguments @@ -2161,7 +2161,7 @@ (define-public sdrangel qtcharts qtdeclarative qtlocation - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtserialport qtspeech @@ -2293,7 +2293,7 @@ (define-public wfview (base32 "1kpkwxhcacgmprbr8xz840rj9a22513vxrh2q7d3js5i1dva8j2z")))) (build-system qt-build-system) (inputs - (list opus qcustomplot qtbase-5 qtmultimedia qtserialport)) + (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport)) (arguments `(#:tests? #f ; No test suite. #:phases diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 41e55db9c2..2e569ac17a 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -668,7 +668,7 @@ (define-public ghostwriter (list hunspell qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtquickcontrols qtsvg-5 qtwebchannel)) @@ -695,7 +695,7 @@ (define-public ghostwriter ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins/")) - '("qtsvg-5" "qtmultimedia")))))))))) + '("qtsvg-5" "qtmultimedia-5")))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c53cfe96d3..2ebbe8afcf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1000,7 +1000,7 @@ (define-public mkvtoolnix pcre2 pugixml qtbase-5 - qtmultimedia + qtmultimedia-5 utfcpp zlib)) (native-inputs @@ -4687,7 +4687,7 @@ (define-public libopenshot jsoncpp libopenshot-audio qtbase-5 - qtmultimedia + qtmultimedia-5 zeromq)) (arguments `(#:configure-flags @@ -4859,7 +4859,7 @@ (define-public shotcut qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1c308ffbdf..751478c3d1 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -453,7 +453,7 @@ (define-public kristall font-openmoji openssl qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5)) (home-page "https://kristall.random-projects.net") (synopsis "Small-internet graphical client") -- cgit v1.2.3 From 983a061e984c227feb2199a2ca37f9af2e594364 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 20:50:16 -0400 Subject: gnu: Add qtmultimedia, version 6.3.1. * gnu/packages/qt.scm (qtmultimedia): New variable. --- gnu/packages/qt.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 461180c5a3..f4e689cf6f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1201,6 +1201,71 @@ (define-public qtshadertools Vulkan, OpenGL and other main graphic APIs.") (license (package-home-page qtbase)))) +(define-public qtmultimedia + (package + (name "qtmultimedia") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively + "examples/multimedia/spectrum/3rdparty") + ;; We also prevent the spectrum example from being built. + (substitute* "examples/multimedia/multimedia.pro" + (("spectrum") "#")))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON" + "-DQT_FEATURE_pulseaudio=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-integration-tests + (lambda _ + ;; XXX: The tst_qaudiodecoderbackend, tst_qaudiodevice, + ;; tst_qaudiosource, tst_qmediaplayerbackend and + ;; tst_qcamerabackend tests fail, presumably because they + ;; require a functional pulseaudio daemon (which requires a dbus + ;; session bus, which requires an X11 server, and then is still + ;; unhappy). + (substitute* "tests/auto/CMakeLists.txt" + (("add_subdirectory\\(integration)") "")))) + (add-before 'check 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs + (list perl + pkg-config + qtshadertools + vulkan-headers)) + (inputs + (list alsa-lib + glib + gstreamer + gst-plugins-base ;gstreamer-gl + gst-plugins-good ;camera support, additional plugins + gst-libav ;ffmpeg plugin + libxkbcommon + mesa + qtbase + qtdeclarative + pulseaudio)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Multimedia module") + (description "The Qt Multimedia module provides set of APIs to play and +record media, and manage a collection of media content. It also contains a +set of plugins for interacting with pulseaudio and GStreamer.") + (license (package-license qtbase)))) + (define-public qtwayland (package (inherit qtsvg-5) (name "qtwayland") -- cgit v1.2.3 From 735d340ae461751eaebf177334dec537da7cfec2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 21:03:18 -0400 Subject: gnu: qtdeclarative: Rename to qtdeclarative-5. Automated via the following commands: git grep -l '\bqtdeclarative\b' | xargs sed -E 's/qtdeclarative/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 4 +-- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 8 ++--- gnu/packages/engineering.scm | 4 +-- gnu/packages/fcitx5.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/game-development.scm | 4 +-- gnu/packages/games.scm | 72 +++++++++++++++++++-------------------- gnu/packages/geo.scm | 4 +-- gnu/packages/image-processing.scm | 4 +-- gnu/packages/image-viewers.scm | 4 +-- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 38 ++++++++++----------- gnu/packages/kde-multimedia.scm | 6 ++-- gnu/packages/kde-pim.scm | 10 +++--- gnu/packages/kde-plasma.scm | 6 ++-- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 20 +++++------ gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 8 ++--- gnu/packages/music.scm | 4 +-- gnu/packages/qt.scm | 62 ++++++++++++++++----------------- gnu/packages/radio.scm | 4 +-- gnu/packages/scribus.scm | 2 +- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/telephony.scm | 4 +-- gnu/packages/terminals.scm | 4 +-- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web.scm | 2 +- 33 files changed, 149 insertions(+), 149 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 87da0a965e..601e6e8734 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ (define-public supercollider boost-sync yaml-cpp qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebsockets)) @@ -5455,7 +5455,7 @@ (define-public ableton-link python ;for running tests portaudio ;for portaudio examples qtbase-5 ;for Qt examples - qtdeclarative + qtdeclarative-5 qttools)) (inputs (list jack-1 ;for JACK examples diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 71d8fae7f1..e19935daa8 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -86,7 +86,7 @@ (define-public sddm libxkbcommon linux-pam qtbase-5 - qtdeclarative + qtdeclarative-5 ;; Some user-defined themes use QtQuick components internally. Adding ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9f87e67043..74356318a1 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -382,7 +382,7 @@ (define-public zeal `(("libarchive" ,libarchive) ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 998867918e..690de4d7de 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -180,7 +180,7 @@ (define-public gcompris-qt (list openssl python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -558,7 +558,7 @@ (define-public openboard opus poppler qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtwebchannel @@ -672,7 +672,7 @@ (define-public ktouch libxcb libxkbfile qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtx11extras @@ -997,7 +997,7 @@ (define-public qolibri qtbase-5 qtmultimedia-5 qtquickcontrols2 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine zlib)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bcf024e437..3a757deddf 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2490,7 +2490,7 @@ (define-public freecad python-shiboken-2 python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebengine @@ -3422,7 +3422,7 @@ (define-public uranium python-trimesh python-zeroconf qtbase - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ca2d8f6827..749c170fc7 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -392,7 +392,7 @@ (define-public fcitx5-chinese-addons ("opencc" ,opencc) ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (native-inputs diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f59fb56f7a..3b3cd70257 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -803,7 +803,7 @@ (define-public monero-gui ("libgcrypt" ,libgcrypt) ("monero" ,monero) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f9e8baffd4..f426532cb1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ (define-public tiled "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtsvg-5 zlib)) + (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib)) (native-inputs (list qttools)) (arguments @@ -2623,7 +2623,7 @@ (define-public warsow-qfusion ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("sdl2" ,sdl2) ("uuid.h" ,util-linux "lib") ("zlib" ,zlib))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ceac1d3390..51dec55bd7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9270,7 +9270,7 @@ (define-public flightgear openscenegraph plib qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 simgear speexdsp @@ -10248,7 +10248,7 @@ (define-public ktuberling python-wrapper qtbase-5 qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") @@ -10294,7 +10294,7 @@ (define-public picmi kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Number logic game") @@ -10332,7 +10332,7 @@ (define-public kolf ktextwidgets libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Miniature golf game") (description "Kolf is a miniature golf game for one to ten players. The @@ -10408,7 +10408,7 @@ (define-public kmahjongg libkdegames libkmahjongg qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") @@ -10451,7 +10451,7 @@ (define-public kshisen libkdegames libkmahjongg qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Shisen-Sho solitaire game") (description "KShisen is a solitaire-like game played using the standard @@ -10548,7 +10548,7 @@ (define-public kbreakout kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -10586,7 +10586,7 @@ (define-public kmines kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Classical mine sweeper game") (description "KMines is a classic Minesweeper game. The idea is to @@ -10622,7 +10622,7 @@ (define-public konquest kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple turn-based strategy game") @@ -10661,7 +10661,7 @@ (define-public kbounce kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") @@ -10699,7 +10699,7 @@ (define-public kblocks kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") @@ -10742,7 +10742,7 @@ (define-public ksudoku libkdegames glu qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") @@ -10798,7 +10798,7 @@ (define-public klines kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (description "KLines is a simple but highly addictive one player game. @@ -10841,7 +10841,7 @@ (define-public kgoldrunner kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Action and puzzle solving game") (description "KGoldrunner is an action game where the hero runs through a @@ -10884,7 +10884,7 @@ (define-public kdiamond kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Three-in-a-row game") (description "KDiamond is a three-in-a-row game like Bejeweled. It @@ -10919,7 +10919,7 @@ (define-public kfourinline kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") @@ -10958,7 +10958,7 @@ (define-public kblackbox kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") @@ -10999,7 +10999,7 @@ (define-public knetwalk kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Turn the board pieces to get all computers connected") (description "KNetWalk is a small game where you have to build up a @@ -11037,7 +11037,7 @@ (define-public bomber kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -11081,7 +11081,7 @@ (define-public granatier kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") @@ -11117,7 +11117,7 @@ (define-public ksirk phonon qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 zlib)) (home-page "https://games.kde.org/") @@ -11178,7 +11178,7 @@ (define-public palapeli kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") @@ -11219,7 +11219,7 @@ (define-public kiriki kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -11258,7 +11258,7 @@ (define-public kigo kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Go board game") @@ -11303,7 +11303,7 @@ (define-public kubrick kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") @@ -11343,7 +11343,7 @@ (define-public lskat kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") @@ -11381,7 +11381,7 @@ (define-public kapman kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") @@ -11420,7 +11420,7 @@ (define-public kspaceduel kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") @@ -11453,7 +11453,7 @@ (define-public bovo kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") @@ -11492,7 +11492,7 @@ (define-public killbots kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Port of the classic BSD console game robots") (description "Killbots is a simple game of evading killer robots. @@ -11533,7 +11533,7 @@ (define-public ksnakeduel kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") @@ -11570,7 +11570,7 @@ (define-public kollision kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Simple ball dodging game") (description "In Kollision you use mouse to control a small blue ball in a @@ -11610,7 +11610,7 @@ (define-public knavalbattle kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Battleship board game with built-in game server") (description "KBattleship is a Battle Ship game for KDE. @@ -11649,7 +11649,7 @@ (define-public kreversi kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") @@ -11690,7 +11690,7 @@ (define-public ksquares kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -11726,7 +11726,7 @@ (define-public kjumpingcube kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple tactical game for number-crunchers") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0c98d57821..0eaa64375d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1958,7 +1958,7 @@ (define-public qmapshack libjpeg-turbo proj qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtwebchannel qtwebengine @@ -2618,7 +2618,7 @@ (define-public qgis qca qscintilla qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtlocation qtserialport diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 98d30d54ed..d4b13cc90e 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1091,7 +1091,7 @@ (define-public itk-snap ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative")))))))))) + '("qtbase" "qtdeclarative-5")))))))))) (inputs (list curl fftw @@ -1104,7 +1104,7 @@ (define-public itk-snap insight-toolkit-4.12 vtk-7 qtbase-5 - qtdeclarative + qtdeclarative-5 vxl-1 zlib)) (native-inputs diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2d3b8aa46f..2a472fb633 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -519,7 +519,7 @@ (define-public luminance-hdr (list pkg-config qttools)) (inputs (list qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 boost eigen @@ -532,7 +532,7 @@ (define-public luminance-hdr lcms openexr-2 qtwebengine - qtdeclarative + qtdeclarative-5 qtwebchannel fftwf gsl diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8f4c56842b..181068cc24 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -608,7 +608,7 @@ (define-public jami qtwebengine qtwebchannel qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2)) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3dffcdf813..1c10183f29 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -304,7 +304,7 @@ (define-public bluez-qt (native-inputs (list dbus extra-cmake-modules)) (inputs - ;; TODO: qtdeclarative (yields one failing test) + ;; TODO: qtdeclarative-5 (yields one failing test) (list qtbase-5)) (arguments (list #:configure-flags @@ -775,7 +775,7 @@ (define-public kholidays (native-inputs (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") (description "This library provides a C++ API that determines holiday and @@ -802,7 +802,7 @@ (define-public ki18n (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (arguments `(#:phases (modify-phases %standard-phases @@ -875,7 +875,7 @@ (define-public kirigami ;; introducing a recursive dependency. ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2 qtsvg-5 ;; Run-time dependency @@ -904,7 +904,7 @@ (define-public kitemmodels (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -1306,7 +1306,7 @@ (define-public pulseaudio-qt (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list glib pulseaudio qtdeclarative qtbase-5)) + (list glib pulseaudio qtdeclarative-5 qtbase-5)) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1341,7 +1341,7 @@ (define-public qqc2-desktop-style kiconthemes ; optional kirigami qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1376,7 +1376,7 @@ (define-public solid (list bison dbus extra-cmake-modules flex qttools)) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("udev" ,eudev))) ;; TODO: Add runtime-only dependency MediaPlayerInfo (home-page "https://community.kde.org/Frameworks") @@ -1476,7 +1476,7 @@ (define-public kactivities kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") @@ -2053,7 +2053,7 @@ (define-public baloo kxmlgui lmdb qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2108,7 +2108,7 @@ (define-public kactivities-stats (native-inputs (list extra-cmake-modules)) (inputs - (list boost kactivities kconfig qtbase-5 qtdeclarative)) + (list boost kactivities kconfig qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Access usage statistics collected by the activity manager") (description "The KActivitiesStats library provides a querying mechanism for @@ -2205,7 +2205,7 @@ (define-public kcmutils kwidgetsaddons kxmlgui qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for KDE System Settings modules") (description "KCMUtils provides various classes to work with KCModules. @@ -2293,7 +2293,7 @@ (define-public kdeclarative kxmlgui libepoxy qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2761,7 +2761,7 @@ (define-public knewstuff ktextwidgets kwidgetsaddons qtbase-5 - qtdeclarative + qtdeclarative-5 solid sonnet)) (arguments @@ -2897,7 +2897,7 @@ (define-public kpeople kservice kwidgetsaddons qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") @@ -2947,7 +2947,7 @@ (define-public krunner kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid threadweaver)) (arguments @@ -3078,7 +3078,7 @@ (define-public ktexteditor libgit2 perl qtbase-5 - qtdeclarative + qtdeclarative-5 qtscript qtxmlpatterns solid @@ -3337,7 +3337,7 @@ (define-public plasma-framework ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) @@ -3384,7 +3384,7 @@ (define-public purpose kio kirigami qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f ;; seem to require network; don't find QTQuick components #:phases diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index b60b4ee489..1c79cd16bc 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -172,7 +172,7 @@ (define-public elisa oxygen-icons ; default icon set phonon qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols @@ -335,7 +335,7 @@ (define-public kid3 kxmlgui libvorbis qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 readline taglib @@ -529,7 +529,7 @@ (define-public kamoso oxygen-icons ; default icon set purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 ; not listed as dependency diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a5acbb0da8..06da6db29a 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -724,7 +724,7 @@ (define-public kdepim-runtime ;; TODO: libkolab qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtnetworkauth qtspeech qtwebchannel @@ -1070,7 +1070,7 @@ (define-public kmail oxygen-icons ; default icon set, required for tests qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine sonnet)) @@ -1322,7 +1322,7 @@ (define-public kmessagelib qca qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine qtwebkit @@ -1848,7 +1848,7 @@ (define-public libkgapi kwallet kwindowsystem qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments @@ -1931,7 +1931,7 @@ (define-public libksieve kwindowsystem libkdepim qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2317cbec5a..da6912affe 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -78,7 +78,7 @@ (define-public breeze kwayland ; optional kwindowsystem qtbase-5 - qtdeclarative ; optional + qtdeclarative-5 ; optional qtx11extras)) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") @@ -209,7 +209,7 @@ (define-public kscreenlocker ("linux-pam" ,linux-pam) ("logind" ,elogind) ;optional loginctl support ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("wayland" ,wayland) @@ -276,7 +276,7 @@ (define-public libksysguard ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index ec3470aa0a..512c2acfef 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -531,7 +531,7 @@ (define-public smb4k oxygen-icons ;; default icon set plasma-framework qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://kde.org/applications/utilities/org.kde.smb4k") (synopsis "Samba (SMB) share advanced browser") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ff02723ab1..a0d73b5252 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -205,7 +205,7 @@ (define-public akregator libkleo qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine syndication)) @@ -285,7 +285,7 @@ (define-public kdenlive mlt purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtnetworkauth @@ -345,7 +345,7 @@ (define-public kdevelop ("libkomparediff2" ,libkomparediff2) ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) @@ -539,7 +539,7 @@ (define-public krita perl poppler-qt5 qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtx11extras @@ -745,7 +745,7 @@ (define-public kdeconnect pulseaudio-qt qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -863,7 +863,7 @@ (define-public kqtquickcharts (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://phabricator.kde.org/source/kqtquickcharts/") (synopsis "Interactive charts for Qt Quick") (description @@ -977,7 +977,7 @@ (define-public libkdegames libsndfile openal qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") @@ -1024,7 +1024,7 @@ (define-public marble-qt phonon protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtserialport qtsvg-5 @@ -1094,7 +1094,7 @@ (define-public okular phonon poppler-qt5 qca - qtdeclarative + qtdeclarative-5 qtsvg-5 threadweaver kcrash @@ -1225,7 +1225,7 @@ (define-public kuserfeedback ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative qtsvg-5)) + (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0beac88d32..d30f598c7e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -852,7 +852,7 @@ (define-public linphone-desktop mediastreamer2 ortp qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 77aba8ee8a..cc2525aa57 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1476,7 +1476,7 @@ (define-public kaidan (inputs (list kirigami knotifications qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtlocation qtquickcontrols2 @@ -2457,7 +2457,7 @@ (define-public nheko mtxclient openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtgraphicaleffects qtmultimedia-5 @@ -2497,7 +2497,7 @@ (define-public quaternion (inputs (list libqmatrixclient qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtquickcontrols2 @@ -2911,7 +2911,7 @@ (define-public movim-desktop "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c413be2bb3..ed188da94a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2261,7 +2261,7 @@ (define-public mixxx portmidi protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtscript qtsvg-5 @@ -4757,7 +4757,7 @@ (define-public musescore portmidi pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtscript diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f4e689cf6f..25f65d0a90 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -258,7 +258,7 @@ (define-public grantlee ;; Optional: lcov and cccc, both are for code coverage (list doxygen)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (build-system cmake-build-system) (arguments `(#:phases @@ -1009,14 +1009,14 @@ (define-public qtxmlpatterns (("qxmlquery") "# qxmlquery") (("xmlpatterns ") "# xmlpatterns")) #t)))))) - (native-inputs (list perl qtdeclarative)) + (native-inputs (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) -(define-public qtdeclarative +(define-public qtdeclarative-5 (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") @@ -1035,7 +1035,7 @@ (define-public qtdeclarative (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen - ;; is provided by qtdeclarative. + ;; is provided by qtdeclarative-5. (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" (("\\$\\{_qt5Core_install_prefix\\}") out))) @@ -1067,7 +1067,7 @@ (define-public qtconnectivity (base32 "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003")))) (native-inputs - (list perl pkg-config qtdeclarative)) + (list perl pkg-config qtdeclarative-5)) (inputs (list bluez qtbase-5)) (synopsis "Qt Connectivity module") @@ -1088,7 +1088,7 @@ (define-public qtwebsockets (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Web Sockets module") (description "WebSocket is a web-based protocol designed to enable two-way @@ -1119,7 +1119,7 @@ (define-public qtsensors (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test #t)))))) (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Sensors module") (description "The Qt Sensors API provides access to sensor hardware via QML @@ -1158,7 +1158,7 @@ (define-public qtmultimedia-5 (string-append "PREFIX=" out))))))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl pkg-config python qtdeclarative)) + (list perl pkg-config python qtdeclarative-5)) (inputs (list alsa-lib mesa @@ -1297,7 +1297,7 @@ (define-public qtwayland (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) (native-inputs - (list glib perl pkg-config qtdeclarative)) + (list glib perl pkg-config qtdeclarative-5)) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -1386,7 +1386,7 @@ (define-public qtwebchannel (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs - (list perl qtdeclarative qtwebsockets)) + (list perl qtdeclarative-5 qtwebsockets)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication @@ -1414,7 +1414,7 @@ (define-public qtwebglplugin #t)))))) (native-inputs '()) (inputs - (list mesa qtbase-5 qtdeclarative qtwebsockets zlib)) + (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib)) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -1436,7 +1436,7 @@ (define-public qtwebview (native-inputs (list perl)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Display web content in a QML application") (description "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using @@ -1459,7 +1459,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1480,7 +1480,7 @@ (define-public qttools (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative vulkan-headers)) + (list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") @@ -1522,7 +1522,7 @@ (define-public qtquickcontrols (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls and other Quick modules") (description "The QtScript module provides classes for making Qt applications scriptable. This module provides a set of extra components that @@ -1542,7 +1542,7 @@ (define-public qtquickcontrols2 (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls 2 and other Quick 2 modules") (description "The Qt Quick Controls 2 module contains the Qt Labs Platform module that provides platform integration: native dialogs, menus and menu bars, @@ -1563,7 +1563,7 @@ (define-public qtgraphicaleffects (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Graphical Effects module") (description "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces. @@ -1590,7 +1590,7 @@ (define-public qtgamepad ("libxrender" ,libxrender) ("sdl2" ,sdl2) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative-5" ,qtdeclarative-5))) (synopsis "Qt Gamepad module") (description "The Qt Gamepad module is an add-on library that enables Qt applications to support the use of gamepad hardware and in some cases remote @@ -1617,7 +1617,7 @@ (define-public qtscxml (("scion") "#")) #t)))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt SCXML module") (description "The Qt SCXML module provides functionality to create state machines from SCXML files. This includes both dynamically creating state @@ -1636,7 +1636,7 @@ (define-public qtpurchasing (base32 "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) @@ -1655,7 +1655,7 @@ (define-public qtcharts (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Charts module") (description "The Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be @@ -1678,7 +1678,7 @@ (define-public qtdatavis3d (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Data Visualization module") (description "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs. It is especially useful for @@ -1739,7 +1739,7 @@ (define-public qtremoteobjects "integration_multiprocess")) #t)))))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Remote Objects module") (description "The Qt Remote Objects module is an @dfn{inter-process communication} (IPC) module developed for Qt. The idea is to extend existing @@ -1763,7 +1763,7 @@ (define-public qtspeech (inputs (list qtbase-5)) (native-inputs - (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns)) + (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users @@ -2087,7 +2087,7 @@ (define (delete-unwanted-files child stat flag base level) protobuf pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtwebchannel re2 @@ -2325,7 +2325,7 @@ (define-public python-pyqt `(("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2435,7 +2435,7 @@ (define-public python-pyqtwebengine ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments @@ -2906,7 +2906,7 @@ (define-public qtwebkit ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2970,7 +2970,7 @@ (define-public dotherside (native-inputs (list qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") (description @@ -3137,7 +3137,7 @@ (define-public python-pyside-2 clang-toolchain qtbase-5 qtdatavis3d - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols @@ -3186,7 +3186,7 @@ (define-public python-pyside-2 (string-append (assoc-ref inputs name) "/include/qt5")) '("qtdatavis3d" - "qtdeclarative" + "qtdeclarative-5" "qtlocation" "qtmultimedia-5" "qtquickcontrols" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 8749a2be0e..1438d4fd7d 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1928,7 +1928,7 @@ (define-public welle-io rtl-sdr qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols2 @@ -2159,7 +2159,7 @@ (define-public sdrangel pulseaudio qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols2 diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 8669ed0db5..6f557d2b2b 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -88,7 +88,7 @@ (define-public scribus poppler python ;need Python library qtbase-5 - qtdeclarative + qtdeclarative-5 zlib)) (native-inputs (list pkg-config qttools util-linux)) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 930c7431a3..11f9674720 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -857,7 +857,7 @@ (define-public ausweisapp2 (inputs (list qtbase-5 qtsvg-5 - qtdeclarative + qtdeclarative-5 qtwebsockets qtgraphicaleffects qtquickcontrols2 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index ff38928846..23294e39f6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -189,7 +189,7 @@ (define-public nextcloud-client libzip openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtkeychain qtquickcontrols2 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 82f2b2717b..5ef93fc3f1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -120,7 +120,7 @@ (define-public phonesim (native-inputs (list automake autoconf pkg-config)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Phone Simulator for modem testing") (description "Phonesim is a modem emulator that oFono uses for development and @@ -706,7 +706,7 @@ (define-public twinkle libsndfile libxml2 qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols readline speex diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 4dfc51b283..2d43cfa493 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ (define-public cool-retro-term (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -805,7 +805,7 @@ (define-public cool-retro-term (,(string-append out qml) ,@(map (lambda (i) (string-append (assoc-ref inputs i) qml)) - '("qtdeclarative" + '("qtdeclarative-5" "qtgraphicaleffects" "qtquickcontrols2")))))))) (add-after 'install 'add-alternate-name diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2e569ac17a..7abf5b6328 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -667,7 +667,7 @@ (define-public ghostwriter (inputs (list hunspell qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtsvg-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ebbe8afcf..30ff377cee 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4857,7 +4857,7 @@ (define-public shotcut mlt pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 24f0682e01..6d9dcfb53f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -256,7 +256,7 @@ (define-public bitmask ("procps" ,procps) ("python" ,python) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 34a2fea062..5492383882 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8091,7 +8091,7 @@ (define-public kiwix-desktop libzim pugixml qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine xapian -- cgit v1.2.3 From 397d05a4bf680372e3ebdb83e388c9f672a0e90b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 21:21:43 -0400 Subject: gnu: Add qtdeclarative, version 6.3.1. * gnu/packages/qt.scm (qtdeclarative): New variable. --- gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 25f65d0a90..708de406c4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1056,6 +1056,134 @@ (define-public qtdeclarative-5 developers to extend the QML language with custom types and integrate QML code with JavaScript and C++."))) +(define-public qtdeclarative + (package + (name "qtdeclarative") + (version "6.3.1") + ;; TODO: Package 'masm' and unbundle from sources. + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-GNinja" ;about twice as fast! + "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'honor-cmake-install-rpath + ;; The build system goes out of its way to compute a runpath it + ;; thinks makes more sense, and fails. Revert to the default + ;; behavior, which is to honor CMAKE_INSTALL_RPATH. + (lambda _ + (substitute* "src/qml/Qt6QmlMacros.cmake" + (("set_target_properties.*PROPERTIES.*INSTALL_RPATH.*" all) + (string-append "# " all))))) + (add-after 'unpack 'patch-qlibraryinfo-paths + (lambda _ + ;; The QLibraryInfo paths are hard-coded to point to the qtbase + ;; installation, but all the tools used in the test suite come + ;; from this package. + (substitute* (find-files "tests" "\\.cpp$") + (("QLibraryInfo::path\\(QLibraryInfo::BinariesPath)") + (string-append "QStringLiteral(\"" #$output "/bin\")")) + (("QLibraryInfo::path\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QStringLiteral(\"" #$output + "/lib/qt6/libexec\")")) + (("QLibraryInfo::path\\(QLibraryInfo::QmlImportsPath)") + (string-append "QStringLiteral(\"" #$output + "/lib/qt6/qml\")"))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (apply invoke "cmake" "--build" "." + (if parallel-build? + `("--parallel" ,(number->string (parallel-job-count))) + '())))) + (delete 'check) ;move after the install phase + (replace 'install + (lambda _ + (invoke "cmake" "--install" "."))) + (add-after 'install 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? + ;; The tests expect to find the modules provided by this + ;; package; extend the environment variables needed to do so. + ;(setenv "CMAKE_PREFIX_PATH" #$output) + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml")) + (setenv "QT_PLUGIN_PATH" + (string-append #$output "/lib/qt6/plugins:" + (getenv "QT_PLUGIN_PATH"))) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Skip tests known to fail on GNU/Linux, in a CI context or + ;; due to bitness (see: https://code.qt.io/cgit/qt/qtbase.git + ;; /tree/src/testlib/qtestblacklist.cpp). + (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") + (setenv "HOME" "/tmp") ;a few tests require a writable HOME + (invoke + "ctest" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" ;exclude some tests by regex + (string-append + "(" + (string-join + (list + ;; This test is marked as flaky upstream (see: + ;; https://bugreports.qt.io/browse/QTBUG-101488). + "tst_qquickfiledialogimpl" + ;; These tests all fail because 'test_overlappingHandles' + ;; (see: https://bugreports.qt.io/browse/QTBUG-95750). + "tst_basic" + "tst_fusion" + "tst_imagine" + "tst_material" + "tst_universal" + ;; Fails due to using the wrong lib/qt6/qml prefix: + ;; "Warning: Failed to find the following builtins: + ;; builtins.qmltypes, jsroot.qmltypes (so will use + ;; qrc). Import paths used: + ;; /gnu/store/...-qtbase-6.3.1/lib/qt6/qml" + "tst_qmltc_qprocess" + ;; These test fail when running qmlimportscanner; perhaps + ;; an extra CMAKE_PREFIX_PATH location is missing to + ;; correctly locate the imports. + "empty_qmldir" + "qtquickcompiler" + "cmake_tooling_imports" + ;; This test seems to hangs for a long time, possibly + ;; waiting for a killed process, which becomes a zombie in + ;; the build container (perhaps solved after + ;; fixing/applying #30948). + "tst_qqmlpreview") "|") + ")"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs + (list ninja + perl + pkg-config + python + qtshadertools + vulkan-headers)) + (inputs + (list libxkbcommon + mesa + qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Qt QML module (Quick 2)") + (description "The Qt QML module provides a framework for developing +applications and libraries with the QML language. It defines and implements +the language and engine infrastructure, and provides an API to enable +application developers to extend the QML language with custom types and +integrate QML code with JavaScript and C++.") + (license (package-license qtbase)))) + (define-public qtconnectivity (package (inherit qtsvg-5) (name "qtconnectivity") -- cgit v1.2.3 From 65e5e85d284ef78bc245b3779c7fcdc733ed60a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:47:28 -0400 Subject: gnu: qtquickcontrols: Rename to qtquickcontrols-5. Automated via: git grep -l qtquickcontrols | xargs sed 's/\bqtquickcontrols\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 8 ++++---- gnu/packages/telephony.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 601e6e8734..0bb607abfc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5459,7 +5459,7 @@ (define-public ableton-link qttools)) (inputs (list jack-1 ;for JACK examples - qtquickcontrols)) ;for Qt examples + qtquickcontrols-5)) ;for Qt examples (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include '. diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index e19935daa8..7e0218dbb7 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -91,7 +91,7 @@ (define-public sddm ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 shadow diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 74356318a1..2f4755de55 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -385,7 +385,7 @@ (define-public zeal ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 690de4d7de..cb0d71cc54 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -183,7 +183,7 @@ (define-public gcompris-qt qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsensors qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3a757deddf..7ad1873a85 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3424,7 +3424,7 @@ (define-public uranium qtbase qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (arguments diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3b3cd70257..ff6efa0a84 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -805,7 +805,7 @@ (define-public monero-gui ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 181068cc24..8d8d29c0db 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -610,7 +610,7 @@ (define-public jami qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2)) (home-page "https://jami.net") (synopsis "Qt Jami client") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 1c79cd16bc..34da2ef3f2 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -175,7 +175,7 @@ (define-public elisa qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtx11extras @@ -531,7 +531,7 @@ (define-public kamoso qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 ; not listed as dependency qtx11extras)) (arguments diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a0d73b5252..143cb3b6a9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -289,7 +289,7 @@ (define-public kdenlive qtgraphicaleffects qtmultimedia-5 qtnetworkauth - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtsvg-5 @@ -346,7 +346,7 @@ (define-public kdevelop ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -748,7 +748,7 @@ (define-public kdeconnect qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d30f598c7e..a488fc3244 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -854,7 +854,7 @@ (define-public linphone-desktop qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cc2525aa57..13246d0fbe 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2499,7 +2499,7 @@ (define-public quaternion qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qttools diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 708de406c4..fb6fb5245c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1587,7 +1587,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative-5 qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1636,7 +1636,7 @@ (define-public qtscript The following guides and references cover aspects of programming with ECMAScript and Qt."))) -(define-public qtquickcontrols +(define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") @@ -3268,7 +3268,7 @@ (define-public python-pyside-2 qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtscxml @@ -3317,7 +3317,7 @@ (define-public python-pyside-2 "qtdeclarative-5" "qtlocation" "qtmultimedia-5" - "qtquickcontrols" + "qtquickcontrols-5" "qtquickcontrols2" "qtscript" "qtscxml" diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5ef93fc3f1..c711c3512f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -707,7 +707,7 @@ (define-public twinkle libxml2 qtbase-5 qtdeclarative-5 - qtquickcontrols + qtquickcontrols-5 readline speex speexdsp diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7abf5b6328..6642620155 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -669,7 +669,7 @@ (define-public ghostwriter qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 30ff377cee..347e84db6f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4860,7 +4860,7 @@ (define-public shotcut qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtwebkit diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6d9dcfb53f..71444d6bb6 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -258,7 +258,7 @@ (define-public bitmask ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs -- cgit v1.2.3 From 1130fc59917e4ea0244ea58fdf1b5ef49e30a5d5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:49:07 -0400 Subject: gnu: qtquickcontrols2: Rename to qtquickcontrols2-5. Automated via: git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' -i git checkout NEWS --- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 6 +++--- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 4 ++-- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7e0218dbb7..32ec5c3141 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -92,7 +92,7 @@ (define-public sddm ;; 'wrap-qt-program'. qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 shadow wayland)) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index cb0d71cc54..6a9de32ffb 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -674,7 +674,7 @@ (define-public ktouch qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras qtxmlpatterns)) (home-page "https://edu.kde.org/ktouch/") @@ -996,7 +996,7 @@ (define-public qolibri (list libeb qtbase-5 qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtdeclarative-5 qtwebchannel qtwebengine diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7ad1873a85..d8d3e481d2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3425,7 +3425,7 @@ (define-public uranium qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ff6efa0a84..b7937a310a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -806,7 +806,7 @@ (define-public monero-gui ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2",qtquickcontrols2) + ("qtquickcontrols2-5",qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8d8d29c0db..97475063dc 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -611,7 +611,7 @@ (define-public jami qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1c10183f29..6fc0b5f10c 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -876,7 +876,7 @@ (define-public kirigami ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 qtdeclarative-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) @@ -1342,7 +1342,7 @@ (define-public qqc2-desktop-style kirigami qtbase-5 qtdeclarative-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") (description "This is a style for QtQuickControls2 which is using @@ -3338,7 +3338,7 @@ (define-public plasma-framework ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 34da2ef3f2..ac86489a95 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -176,7 +176,7 @@ (define-public elisa qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt @@ -532,7 +532,7 @@ (define-public kamoso qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 ; not listed as dependency + qtquickcontrols2-5 ; not listed as dependency qtx11extras)) (arguments (list #:tests? #f ; test program gets built, but is not found diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 143cb3b6a9..f11419afb9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -290,7 +290,7 @@ (define-public kdenlive qtmultimedia-5 qtnetworkauth qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 shared-mime-info)) @@ -347,7 +347,7 @@ (define-public kdevelop ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement - ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -749,7 +749,7 @@ (define-public kdeconnect qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index a488fc3244..47fb94dc68 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -855,7 +855,7 @@ (define-public linphone-desktop qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over IP calling diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 13246d0fbe..836b503784 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1479,7 +1479,7 @@ (define-public kaidan qtdeclarative-5 qtgraphicaleffects qtlocation - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtmultimedia-5 qtxmlpatterns @@ -2461,7 +2461,7 @@ (define-public nheko qtkeychain qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 spdlog single-application-qt5 @@ -2500,7 +2500,7 @@ (define-public quaternion qtdeclarative-5 qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qttools xdg-utils)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ed188da94a..1147512980 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4759,7 +4759,7 @@ (define-public musescore qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fb6fb5245c..061c9a5a1e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1656,7 +1656,7 @@ (define-public qtquickcontrols-5 applications scriptable. This module provides a set of extra components that can be used to build complete interfaces in Qt Quick."))) -(define-public qtquickcontrols2 +(define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2") (version "5.15.2") @@ -3269,7 +3269,7 @@ (define-public python-pyside-2 qtlocation qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtscxml qtsensors @@ -3318,7 +3318,7 @@ (define-public python-pyside-2 "qtlocation" "qtmultimedia-5" "qtquickcontrols-5" - "qtquickcontrols2" + "qtquickcontrols2-5" "qtscript" "qtscxml" "qtsensors" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 1438d4fd7d..989d5670f4 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1931,7 +1931,7 @@ (define-public welle-io qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 soapysdr)) (arguments `(#:configure-flags '("-DRTLSDR=ON" @@ -2162,7 +2162,7 @@ (define-public sdrangel qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtserialport qtspeech qtwebsockets diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 11f9674720..3c8d6d3321 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -860,7 +860,7 @@ (define-public ausweisapp2 qtdeclarative-5 qtwebsockets qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 pcsc-lite openssl)) (arguments diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 23294e39f6..f364195341 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -192,7 +192,7 @@ (define-public nextcloud-client qtdeclarative-5 qtgraphicaleffects qtkeychain - qtquickcontrols2 + qtquickcontrols2-5 qtsolutions qtsvg-5 qtwebchannel diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 2d43cfa493..7e5016f08f 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ (define-public cool-retro-term (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2-5 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -807,7 +807,7 @@ (define-public cool-retro-term (string-append (assoc-ref inputs i) qml)) '("qtdeclarative-5" "qtgraphicaleffects" - "qtquickcontrols2")))))))) + "qtquickcontrols2-5")))))))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 347e84db6f..29a3e651c9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4861,7 +4861,7 @@ (define-public shotcut qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtwebkit qtwebsockets diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 71444d6bb6..a884feabf4 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -259,7 +259,7 @@ (define-public bitmask ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter -- cgit v1.2.3 From d90031f799f6c56fa456dc7afe5bfdb59680f258 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:52:19 -0400 Subject: gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative. * gnu/packages/qt.scm (qtquickcontrols2): New variable. --- gnu/packages/qt.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 061c9a5a1e..d71b2991ad 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1677,6 +1677,12 @@ (define-public qtquickcontrols2-5 and tray icons. It falls back to Qt Widgets when a native implementation is not available."))) +(define-public qtquickcontrols2 + ;; qtquickcontrols2 still exist, but was merged into qtdeclarative. + ;; Unfortunately that hasn't been well communicated at all (see: + ;; https://bugreports.qt.io/browse/QTBUG-79454). + (deprecated-package "qtquickcontrols2" qtdeclarative)) + (define-public qtgraphicaleffects (package (inherit qtsvg-5) (name "qtgraphicaleffects") -- cgit v1.2.3 From d15258d991767ec83450fc6ebdb8ff2f60870501 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 00:06:03 -0400 Subject: gnu: qtwebsockets: Rename to qtwebsockets-5. Automated via: git grep -l qtwebsockets | xargs sed 's/\bqtwebsockets\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/qt.scm | 12 ++++++------ gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0bb607abfc..de3ed5b387 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3235,7 +3235,7 @@ (define-public supercollider qtdeclarative-5 qtsvg-5 qtwebchannel - qtwebsockets)) + qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) (home-page "https://github.com/supercollider/supercollider") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 51dec55bd7..a851a6853a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -996,7 +996,7 @@ (define-public cockatrice qtmultimedia-5 qtsvg-5 qttools - qtwebsockets + qtwebsockets-5 xz zlib)) (home-page "https://cockatrice.github.io") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d71b2991ad..d8838ec239 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1202,7 +1202,7 @@ (define-public qtconnectivity (description "The Qt Connectivity modules provides modules for interacting with Bluetooth and NFC."))) -(define-public qtwebsockets +(define-public qtwebsockets-5 (package (inherit qtsvg-5) (name "qtwebsockets") (version "5.15.2") @@ -1514,7 +1514,7 @@ (define-public qtwebchannel (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs - (list perl qtdeclarative-5 qtwebsockets)) + (list perl qtdeclarative-5 qtwebsockets-5)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication @@ -1542,7 +1542,7 @@ (define-public qtwebglplugin #t)))))) (native-inputs '()) (inputs - (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib)) + (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib)) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -2468,7 +2468,7 @@ (define-public python-pyqt ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) - ("qtwebsockets" ,qtwebsockets) + ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments @@ -3283,7 +3283,7 @@ (define-public python-pyside-2 qtsvg-5 qtwebchannel qtwebengine - qtwebsockets + qtwebsockets-5 qtx11extras qtxmlpatterns)) (propagated-inputs @@ -3333,7 +3333,7 @@ (define-public python-pyside-2 "qttools" "qtwebchannel" "qtwebengine" - "qtwebsockets" + "qtwebsockets-5" "qtx11extras" "qtxmlpatterns")))) (substitute* "cmake/Macros/PySideModules.cmake" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 989d5670f4..5f9767c896 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1336,7 +1336,7 @@ (define-public jtdx jtdx-hamlib libusb qtbase-5 - qtwebsockets + qtwebsockets-5 qtmultimedia-5 qtserialport)) (arguments @@ -2165,7 +2165,7 @@ (define-public sdrangel qtquickcontrols2-5 qtserialport qtspeech - qtwebsockets + qtwebsockets-5 rtl-sdr serialdv soapysdr diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3c8d6d3321..5d95aebf14 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -858,7 +858,7 @@ (define-public ausweisapp2 (list qtbase-5 qtsvg-5 qtdeclarative-5 - qtwebsockets + qtwebsockets-5 qtgraphicaleffects qtquickcontrols2-5 pcsc-lite diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index f364195341..40385124fd 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -196,7 +196,7 @@ (define-public nextcloud-client qtsolutions qtsvg-5 qtwebchannel - qtwebsockets + qtwebsockets-5 sqlite xdg-utils zlib)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 29a3e651c9..184dca8eff 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4864,7 +4864,7 @@ (define-public shotcut qtquickcontrols2-5 qtsvg-5 qtwebkit - qtwebsockets + qtwebsockets-5 qtx11extras sdl2)) (home-page "https://www.shotcut.org/") -- cgit v1.2.3 From 573055b7ef93fa5fe0885ed3cca281983bf35eff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:46:04 -0400 Subject: gnu: Add qtwebsockets, version 6.3.1. * gnu/packages/qt.scm (qtwebsockets): New variable. --- gnu/packages/qt.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d8838ec239..106396a571 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1225,6 +1225,45 @@ (define-public qtwebsockets-5 to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both."))) +(define-public qtwebsockets + (package + (name "qtwebsockets") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (delete 'check) ;move after install + (add-after 'install 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'prepare-for-tests 'check + (assoc-ref %standard-phases 'check)) + (add-after 'check 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs (list perl)) + (inputs (list qtbase qtdeclarative)) + (synopsis "Qt Web Sockets module") + (description "WebSocket is a web-based protocol designed to enable two-way +communication between a client application and a remote host. The Qt +WebSockets module provides C++ and QML interfaces that enable Qt applications +to act as a server that can process WebSocket requests, or a client that can +consume data received from the server, or both.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtsensors (package (inherit qtsvg-5) (name "qtsensors") -- cgit v1.2.3 From 0938c3e34a9004948baa56bb21017d20fb9c9c26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 00:02:58 -0400 Subject: gnu: qtwebchannel: Rename to qtwebchannel-5. Automated via: git grep -l qtwebchannel | xargs sed 's/\bqtwebchannel\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 10 +++++----- gnu/packages/kde.scm | 4 ++-- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 14 +++++++------- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/web.scm | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index de3ed5b387..e3ee3dbfb7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3234,7 +3234,7 @@ (define-public supercollider qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 2f4755de55..32dc26868d 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -383,7 +383,7 @@ (define-public zeal ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6a9de32ffb..5551fd0594 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -561,7 +561,7 @@ (define-public openboard qtdeclarative-5 qtmultimedia-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns quazip-0 @@ -998,7 +998,7 @@ (define-public qolibri qtmultimedia-5 qtquickcontrols2-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine zlib)) (synopsis "EPWING dictionary reader") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d8d3e481d2..c8d075f5d1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2492,7 +2492,7 @@ (define-public freecad qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtx11extras qtxmlpatterns diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 749c170fc7..ea7f1be752 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -393,7 +393,7 @@ (define-public fcitx5-chinese-addons ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (native-inputs (list extra-cmake-modules pkg-config)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0eaa64375d..324178181c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1960,7 +1960,7 @@ (define-public qmapshack qtbase-5 qtdeclarative-5 qtlocation - qtwebchannel + qtwebchannel-5 qtwebengine quazip routino diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2a472fb633..81b097df07 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -533,7 +533,7 @@ (define-public luminance-hdr openexr-2 qtwebengine qtdeclarative-5 - qtwebchannel + qtwebchannel-5 fftwf gsl libtiff)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 97475063dc..2583a59a26 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -606,7 +606,7 @@ (define-public jami qrencode qtsvg-5 qtwebengine - qtwebchannel + qtwebchannel-5 qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 06da6db29a..b78c4b8c45 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -727,7 +727,7 @@ (define-public kdepim-runtime qtdeclarative-5 qtnetworkauth qtspeech - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns)) (arguments @@ -1071,7 +1071,7 @@ (define-public kmail qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine sonnet)) (arguments @@ -1323,7 +1323,7 @@ (define-public kmessagelib qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebkit sonnet)) @@ -1849,7 +1849,7 @@ (define-public libkgapi kwindowsystem qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail @@ -1932,7 +1932,7 @@ (define-public libksieve libkdepim qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index f11419afb9..6e9d9d125f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -206,7 +206,7 @@ (define-public akregator qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine syndication)) (home-page "https://apps.kde.org/en/akregator") @@ -1028,7 +1028,7 @@ (define-public marble-qt qtlocation qtserialport qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine shapelib shared-mime-info diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 836b503784..034648d02c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2911,7 +2911,7 @@ (define-public movim-desktop "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative-5 qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 106396a571..ce2e3ad8cc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1542,7 +1542,7 @@ (define-public qtserialbus access the various industrial serial buses and protocols, such as CAN, ModBus, and others."))) -(define-public qtwebchannel +(define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") @@ -2262,7 +2262,7 @@ (define (delete-unwanted-files child stat flag base level) qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtwebchannel + qtwebchannel-5 re2 snappy eudev @@ -2505,7 +2505,7 @@ (define-public python-pyqt ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) @@ -2609,7 +2609,7 @@ (define-public python-pyqtwebengine ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) @@ -3083,7 +3083,7 @@ (define-public qtwebkit ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libx11" ,libx11) @@ -3320,7 +3320,7 @@ (define-public python-pyside-2 qtsensors qtspeech qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebsockets-5 qtx11extras @@ -3370,7 +3370,7 @@ (define-public python-pyside-2 "qtspeech" "qtsvg-5" "qttools" - "qtwebchannel" + "qtwebchannel-5" "qtwebengine" "qtwebsockets-5" "qtx11extras" diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 40385124fd..10aef0c83a 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -195,7 +195,7 @@ (define-public nextcloud-client qtquickcontrols2-5 qtsolutions qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5 sqlite xdg-utils diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 6642620155..acf0400b75 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -671,7 +671,7 @@ (define-public ghostwriter qtmultimedia-5 qtquickcontrols-5 qtsvg-5 - qtwebchannel)) + qtwebchannel-5)) (propagated-inputs ; To get native-search-path (list qtwebengine)) (arguments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5492383882..f6c618478f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8092,7 +8092,7 @@ (define-public kiwix-desktop pugixml qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine xapian zlib -- cgit v1.2.3 From ef648459df868be6a44c7bfdb491e8e50bb9bfc6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:49:35 -0400 Subject: gnu: Add qtwebchannel, version 6.3.1. * gnu/packages/qt.scm (qtwebchannel): New variable. --- gnu/packages/qt.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce2e3ad8cc..3f1f468b7e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1561,6 +1561,43 @@ (define-public qtwebchannel-5 application). The transport mechanism is supported out of the box by the two popular web engines, Qt WebKit 2 and Qt WebEngine."))) +(define-public qtwebchannel + (package + (name "qtwebchannel") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (delete 'check) ;move after install + (add-after 'install 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH"))))) + (add-after 'prepare-for-tests 'check + (assoc-ref %standard-phases 'check)) + (add-after 'check 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs (list perl)) + (inputs (list qtbase qtdeclarative qtwebsockets)) + (home-page (package-home-page qtbase)) + (synopsis "Web communication library for Qt") + (description "The Qt WebChannel module enables peer-to-peer communication +between the host (QML/C++ application) and the client (HTML/JavaScript +application).") + (license (package-license qtbase)))) + (define-public qtwebglplugin (package (inherit qtsvg-5) (name "qtwebglplugin") -- cgit v1.2.3 From a0beb297a352930b89051ff258a06d78f224d6b9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:57:16 -0400 Subject: gnu: qtwebengine: Rename to qtwebengine-5. Automated with: git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 4 ++-- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 10 +++++----- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 12 ++++++------ gnu/packages/kde.scm | 6 +++--- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 14 +++++++------- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/vpn.scm | 4 ++-- gnu/packages/web-browsers.scm | 8 ++++---- gnu/packages/web.scm | 4 ++-- 19 files changed, 42 insertions(+), 42 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3ee3dbfb7..f0ffeed210 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3237,7 +3237,7 @@ (define-public supercollider qtwebchannel-5 qtwebsockets-5)) (propagated-inputs ;to get native-search-path - (list qtwebengine)) + (list qtwebengine-5)) (home-page "https://github.com/supercollider/supercollider") (synopsis "Synthesis engine and programming language") (description "SuperCollider is a synthesis engine (@code{scsynth} or diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 32dc26868d..6f24149b5d 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -371,7 +371,7 @@ (define-public zeal (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/zeal")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -384,7 +384,7 @@ (define-public zeal ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine-5" ,qtwebengine-5) ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 5d864da281..ccc0bdf88d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -202,7 +202,7 @@ (define-public calibre python-regex speech-dispatcher python-zeroconf - qtwebengine + qtwebengine-5 sqlite)) (arguments (list diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 5551fd0594..aabf3dfc21 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -448,7 +448,7 @@ (define-public toutenclic (define-public openboard ;; The last release builds from qtwebkit, which is planned for removal in ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with - ;; qtwebengine. + ;; qtwebengine-5. (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311 (revision "1")) (package @@ -562,7 +562,7 @@ (define-public openboard qtmultimedia-5 qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtxmlpatterns quazip-0 sdl @@ -807,9 +807,9 @@ (define-public anki ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) ("python-sip" ,python-sip) - ;; `qtwebengine' is included in `pyqtwebengine', included here for easy + ;; `qtwebengine-5' is included in `pyqtwebengine', included here for easy ;; wrapping. - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (home-page "https://apps.ankiweb.net/") (synopsis "Powerful, intelligent flash cards") (description "Anki is a program which makes remembering things @@ -999,7 +999,7 @@ (define-public qolibri qtquickcontrols2-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 zlib)) (synopsis "EPWING dictionary reader") (description "qolibri is a dictionary viewer for the EPWING dictionary diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 217e90b8fb..3804ef402a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13111,7 +13111,7 @@ (define-public emacs-org-contrib (sha256 (base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc")) ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on - ;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+ + ;; SuperCollider and qtwebengine-5. This will be unnecessary in 0.4+ ;; release as the file is going to be removed from the repository. ;; XXX: org-contacts.el is now maintained in a separate repository and diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c8d075f5d1..303dd0b737 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2493,7 +2493,7 @@ (define-public freecad qtdeclarative-5 qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtx11extras qtxmlpatterns sqlite diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ea7f1be752..00648ea963 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -394,7 +394,7 @@ (define-public fcitx5-chinese-addons ("fcitx5-qt" ,fcitx5-qt) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (native-inputs (list extra-cmake-modules pkg-config)) (outputs '("out" "gui")) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 324178181c..b8125ffe6e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1961,7 +1961,7 @@ (define-public qmapshack qtdeclarative-5 qtlocation qtwebchannel-5 - qtwebengine + qtwebengine-5 quazip routino sqlite ; See wrap phase diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 81b097df07..045fdae882 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -531,7 +531,7 @@ (define-public luminance-hdr libjpeg-turbo lcms openexr-2 - qtwebengine + qtwebengine-5 qtdeclarative-5 qtwebchannel-5 fftwf diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2583a59a26..22d2f0c5ce 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -605,7 +605,7 @@ (define-public jami network-manager qrencode qtsvg-5 - qtwebengine + qtwebengine-5 qtwebchannel-5 qtmultimedia-5 qtdeclarative-5 diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index b78c4b8c45..f0f5683ac5 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -728,7 +728,7 @@ (define-public kdepim-runtime qtnetworkauth qtspeech qtwebchannel-5 - qtwebengine + qtwebengine-5 qtxmlpatterns)) (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with @@ -1072,7 +1072,7 @@ (define-public kmail qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 sonnet)) (arguments `(#:phases @@ -1324,7 +1324,7 @@ (define-public kmessagelib qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtwebkit sonnet)) (arguments @@ -1656,7 +1656,7 @@ (define-public kpimcommon libxslt purpose qtbase-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:tests? #f)) ;; TODO tests hang (home-page "https://invent.kde.org/pim/pimcommon") @@ -1850,7 +1850,7 @@ (define-public libkgapi qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail (home-page "https://invent.kde.org/pim/libkgapi") @@ -1933,7 +1933,7 @@ (define-public libksieve qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6e9d9d125f..c43758ef7f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -170,7 +170,7 @@ (define-public akregator (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/akregator")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -207,7 +207,7 @@ (define-public akregator qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 syndication)) (home-page "https://apps.kde.org/en/akregator") (synopsis "KDE Feed Reader") @@ -1029,7 +1029,7 @@ (define-public marble-qt qtserialport qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 shapelib shared-mime-info zlib)) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 034648d02c..e5dd078561 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2913,7 +2913,7 @@ (define-public movim-desktop (inputs (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs - (list qtwebengine)) + (list qtwebengine-5)) (home-page "https://movim.eu/") (synopsis "Desktop Application for Movim") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3f1f468b7e..3450efe08b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2011,7 +2011,7 @@ (define-public qtspell ;; COPYING file specify GPL3, but source code files all refer to GPL2+. (license license:gpl2+))) -(define-public qtwebengine +(define-public qtwebengine-5 (package (inherit qtsvg-5) (name "qtwebengine") @@ -2206,7 +2206,7 @@ (define (delete-unwanted-files child stat flag base level) (_ #t))) (with-directory-excursion "src/3rdparty" - ;; TODO: Try removing "gn" too for future versions of qtwebengine. + ;; TODO: Try removing "gn" too for future versions of qtwebengine-5. (delete-file-recursively "ninja") (with-directory-excursion "chromium" @@ -2324,7 +2324,7 @@ (define (delete-unwanted-files child stat flag base level) (display "\ngn_args += use_system_openh264=true\n" out))) ;; Qtwebengine is not installed into the same prefix as ;; qtbase. Some qtbase QTLibraryInfo constants will not - ;; work. Replace with the full path to the qtwebengine + ;; work. Replace with the full path to the qtwebengine-5 ;; translations and locales in the store. (substitute* "src/core/web_engine_library_info.cpp" (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") @@ -2354,7 +2354,7 @@ (define (delete-unwanted-files child stat flag base level) (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" "--webengine-printing-and-pdf=no" "--webengine-ffmpeg=system" - ;; FIXME: Building qtwebengine 5.12.2 with + ;; FIXME: Building qtwebengine-5 5.12.2 with ;; icu4c >= 68 fails. ;;"--webengine-icu=system" "--webengine-pepper-plugins=no" @@ -2647,7 +2647,7 @@ (define-public python-pyqtwebengine ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (arguments `(#:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) @@ -3358,7 +3358,7 @@ (define-public python-pyside-2 qtspeech qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtwebsockets-5 qtx11extras qtxmlpatterns)) @@ -3408,7 +3408,7 @@ (define-public python-pyside-2 "qtsvg-5" "qttools" "qtwebchannel-5" - "qtwebengine" + "qtwebengine-5" "qtwebsockets-5" "qtx11extras" "qtxmlpatterns")))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 10aef0c83a..5b82e0ca3d 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -201,7 +201,7 @@ (define-public nextcloud-client xdg-utils zlib)) (propagated-inputs - (list qtwebengine)) + (list qtwebengine-5)) (synopsis "Desktop sync client for Nextcloud") (description "Nextcloud-Desktop is a tool to synchronize files from Nextcloud Server with your computer.") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index acf0400b75..345454bd62 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -673,7 +673,7 @@ (define-public ghostwriter qtsvg-5 qtwebchannel-5)) (propagated-inputs ; To get native-search-path - (list qtwebengine)) + (list qtwebengine-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a884feabf4..17dd163c53 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -737,7 +737,7 @@ (define-public openconnect-sso (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/openconnect-sso")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin #:sh (search-input-file inputs "bin/bash") @@ -757,7 +757,7 @@ (define-public openconnect-sso python-pyxdg python-structlog python-toml - qtwebengine)) + qtwebengine-5)) (native-inputs (list python-pytest python-setuptools-scm)) (home-page "https://github.com/vlaci/openconnect-sso") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 751478c3d1..f47db2e752 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -492,11 +492,11 @@ (define-public qutebrowser ;; that it's __init__.py is used first. python-pyqtwebengine python-pyqt-without-qtwebkit - ;; While qtwebengine is provided by python-pyqtwebengine, it's + ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - qtwebengine)) + qtwebengine-5)) (arguments - `(;; FIXME: With the existance of qtwebengine, tests can now run. But + `(;; FIXME: With the existance of qtwebengine-5, tests can now run. But ;; they are still disabled because test phase hangs. It's not readily ;; apparent as to why. #:tests? #f @@ -543,7 +543,7 @@ (define-public qutebrowser (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/qutebrowser")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6c618478f..8b41477014 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8078,7 +8078,7 @@ (define-public kiwix-desktop (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/kiwix-desktop")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -8093,7 +8093,7 @@ (define-public kiwix-desktop qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 xapian zlib `(,zstd "lib"))) -- cgit v1.2.3 From f1e126c03b25a9d20c3543d082b1f5a7d756e0f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 23:13:46 -0400 Subject: gnu: Add qtwebengine, version 6.3.1. * gnu/packages/qt.scm (qtwebengine): New variable. --- gnu/packages/qt.scm | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3450efe08b..ce5df74f7d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -88,6 +88,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages markup) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) + #:use-module (gnu packages node) #:use-module (gnu packages nss) #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) @@ -98,6 +99,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages regex) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) @@ -2376,6 +2378,349 @@ (define (delete-unwanted-files child stat flag base level) and binaries removed, and adds modular support for using system libraries.") (license license:lgpl2.1+))) +(define-public qtwebengine + (package + (name "qtwebengine") + (version "6.3.1") + (source + (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd")) + (modules '((ice-9 ftw) + (ice-9 match) + (srfi srfi-1) + (srfi srfi-26) + (guix build utils))) + (snippet + '(begin + (let ((preserved-third-party-files + '("base/third_party/double_conversion" + "base/third_party/cityhash" + "base/third_party/cityhash_v103" + "base/third_party/dynamic_annotations" + "base/third_party/icu" + "base/third_party/libevent" + "base/third_party/nspr" + "base/third_party/superfasthash" + "base/third_party/symbolize" + "base/third_party/xdg_mime" + "base/third_party/xdg_user_dirs" + "net/third_party/mozilla_security_manager" + "net/third_party/nss" + "net/third_party/quiche" + "net/third_party/uri_template" + "third_party/abseil-cpp" + "third_party/angle" + "third_party/angle/src/common/third_party/base" + "third_party/angle/src/common/third_party/smhasher" + "third_party/angle/src/common/third_party/xxhash" + "third_party/axe-core" + "third_party/blink" + "third_party/boringssl" + "third_party/boringssl/src/third_party/fiat" + "third_party/breakpad" + "third_party/brotli" + "third_party/ced" + "third_party/cld_3" + "third_party/closure_compiler" + "third_party/crashpad" + "third_party/crashpad/crashpad/third_party/lss" + "third_party/crashpad/crashpad/third_party/zlib" + "third_party/crc32c" + "third_party/dav1d" + "third_party/dawn" + "third_party/devtools-frontend" + "third_party/devtools-frontend/src/front_end/third_party/lighthouse" + "third_party/devtools-frontend/src/front_end/third_party/wasmparser" + "third_party/emoji-segmenter" + "third_party/ffmpeg" + "third_party/googletest" + "third_party/harfbuzz-ng/utils" + "third_party/hunspell" + "third_party/iccjpeg" + "third_party/icu" + "third_party/inspector_protocol" + "third_party/jinja2" + "third_party/jsoncpp" + "third_party/jstemplate" + "third_party/khronos" + "third_party/leveldatabase" + "third_party/libaddressinput" + "third_party/libgifcodec" + "third_party/libjingle_xmpp" + "third_party/libjpeg_turbo" + "third_party/libpng" + "third_party/libsrtp" + "third_party/libsync" + "third_party/libudev" + "third_party/libvpx" + "third_party/libwebm" + "third_party/libwebp" + "third_party/libxml" + "third_party/libxslt" + "third_party/libyuv" + "third_party/lss" + "third_party/mako" + "third_party/markupsafe" + "third_party/mesa_headers" + "third_party/metrics_proto" + "third_party/modp_b64" + "third_party/nasm" + "third_party/one_euro_filter" + "third_party/openh264/src/codec/api/svc" + "third_party/opus" + "third_party/ots" + "third_party/pdfium" + "third_party/pdfium/third_party/agg23" + "third_party/pdfium/third_party/base" + "third_party/pdfium/third_party/freetype" + "third_party/pdfium/third_party/lcms" + "third_party/pdfium/third_party/libopenjpeg20" + "third_party/pdfium/third_party/skia_shared" + "third_party/perfetto" + "third_party/pffft" + "third_party/ply" + "third_party/polymer" + "third_party/protobuf" + "third_party/protobuf/third_party/six" + "third_party/pyjson5" + "third_party/re2" + "third_party/rnnoise" + "third_party/skia" + "third_party/skia/include/third_party/skcms/skcms.h" + "third_party/skia/include/third_party/vulkan" + "third_party/skia/third_party/skcms" + "third_party/skia/third_party/vulkanmemoryallocator" + "third_party/smhasher" + "third_party/snappy" + "third_party/sqlite" + "third_party/usb_ids" + "third_party/usrsctp" + "third_party/web-animations-js" + "third_party/webrtc" + "third_party/webrtc/common_audio/third_party/ooura" + "third_party/webrtc/common_audio/third_party/spl_sqrt_floor" + "third_party/webrtc/modules/third_party/fft" + "third_party/webrtc/modules/third_party/g711" + "third_party/webrtc/modules/third_party/g722" + "third_party/webrtc/rtc_base/third_party/base64" + "third_party/webrtc/rtc_base/third_party/sigslot" + "third_party/webrtc_overrides" + "third_party/widevine/cdm/widevine_cdm_common.h" + "third_party/widevine/cdm/widevine_cdm_version.h" + "third_party/woff2" + "third_party/zlib" + "url/third_party/mozilla" + "v8/src/third_party/utf8-decoder" + "v8/src/third_party/valgrind" + "v8/src/third_party/siphash" + "v8/third_party/v8/builtins" + "v8/third_party/inspector_protocol")) + (protected (make-regexp "\\.(gn|gyp)i?$"))) + (define preserved-club + (map (lambda (member) + (string-append "./" member)) + preserved-third-party-files)) + (define (empty? dir) + (equal? (scandir dir) '("." ".."))) + (define (third-party? file) + (string-contains file "third_party/")) + (define (useless? file) + (any (cute string-suffix? <> file) + '(".zip" ".so" ".dll" ".exe" ".jar"))) + (define (parents child) + ;; Return all parent directories of CHILD up to and including + ;; the closest "third_party". + (let* ((dirs (match (string-split child #\/) + ((dirs ... last) dirs))) + (closest (list-index (lambda (dir) + (string=? "third_party" dir)) + (reverse dirs))) + (delim (- (length dirs) closest))) + (fold (lambda (dir prev) + (cons (string-append (car prev) "/" dir) + prev)) + (list (string-join (list-head dirs delim) "/")) + (list-tail dirs delim)))) + (define (remove-loudly file) + (format #t "deleting ~a...~%" file) + (force-output) + (delete-file file)) + (define (delete-unwanted-files child stat flag base level) + (match flag + ((or 'regular 'symlink 'stale-symlink) + (when (third-party? child) + (unless (or (member child preserved-club) + (any (cute member <> preserved-club) + (parents child)) + (regexp-exec protected child)) + (remove-loudly child))) + (when (and (useless? child) (file-exists? child)) + (remove-loudly child))) + ('directory-processed + (when (empty? child) + (rmdir child))) + (_ #t))) + + (with-directory-excursion "src/3rdparty" + (delete-file-recursively "ninja") + + (with-directory-excursion "chromium" + ;; Delete bundled software and binaries that were not + ;; explicitly preserved above. + (nftw "." delete-unwanted-files 'depth 'physical) + + ;; Assert that each preserved item is present to catch + ;; removals. + (for-each (lambda (third-party) + (unless (file-exists? third-party) + (error (format #f "~s does not exist!~%" + third-party)))) + preserved-club) + + ;; Use relative header locations instead of hard coded ones. + (substitute* + "base/third_party/dynamic_annotations/dynamic_annotations.c" + (("base/third_party/valgrind") "valgrind")) + (substitute* "third_party/breakpad/breakpad/src/common/\ +linux/libcurl_wrapper.h" + (("third_party/curl") "curl")) + (substitute* + '("components/viz/common/gpu/vulkan_context_provider.h" + "gpu/config/gpu_util.cc") + (("third_party/vulkan/include/") + "")) + + ;; Replace Google Analytics bundle with an empty file and + ;; hope no one notices. + (mkdir-p "third_party/analytics") + (call-with-output-file + "third_party/analytics/google-analytics-bundle.js" + (lambda (port) + (const #t))))) + ;; Do not enable support for loading the Widevine DRM plugin. + (substitute* "src/core/CMakeLists.txt" + (("enable_widevine=true") + "enable_widevine=false"))))))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: The test suite is not built by default; leave it off to save + ;; some build time and resources. + #:tests? #f + #:configure-flags + ;; Use the CMake ninja generator, otherwise the build fails (see: + ;; https://bugreports.qt.io/browse/QTBUG-96897). + #~(list "-GNinja" ; + ;; Manually add the NSS library prefix to the linker + ;; search path, otherwise it fails to be linked (see: + ;; https://bugreports.qt.io/browse/QTBUG-105053). + (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-L" + (search-input-directory %build-inputs "lib/nss")) + + ;; The PDF renderer plugin fails to build with errors such as + ;; "src/3rdparty/chromium/components/pdf + ;; /renderer/pdf_accessibility_tree.cc:1373:39: + ;; error: use of undeclared identifier 'IDS_PDF_PAGE_INDEX'"; + ;; disable it. + "-DQT_FEATURE_webengine_printing_and_pdf=OFF" + "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine + "-DQT_FEATURE_system_ffmpeg=ON" + ;; Do not artificially limit codec support; video decoding is + ;; done by ffmpeg. + "-DQT_FEATURE_webengine_proprietary_codecs=ON" + "-DQT_FEATURE_webengine_system_alsa=ON" + "-DQT_FEATURE_webengine_system_icu=ON" + "-DQT_FEATURE_webengine_system_libxml=ON" + "-DQT_FEATURE_webengine_system_libpci=ON" + "-DQT_FEATURE_webengine_system_libpng=ON" + "-DQT_FEATURE_webengine_system_pulseaudio=ON" + "-DQT_FEATURE_webengine_system_zlib=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Qtwebengine is not installed into the same prefix as qtbase. + ;; Some qtbase QTLibraryInfo constants will not work. Replace + ;; with the full path to the qtwebengine translations and + ;; locales in the store. + (substitute* "src/core/web_engine_library_info.cpp" + (("QLibraryInfo::path\\(QLibraryInfo::TranslationsPath)") + (string-append "QLatin1String(\"" #$output + "/share/qt6/translations\")")) + (("QLibraryInfo::path\\(QLibraryInfo::DataPath)") + (string-append "QLatin1String(\"" #$output + "/share/qt6\")"))) + ;; Substitute full dynamic library path for nss. + (substitute* "src/3rdparty/chromium/crypto/nss_util.cc" + (("libnssckbi.so") + (search-input-file inputs "lib/nss/libnssckbi.so"))) + ;; Substitute full dynamic library path for udev. + (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc" + (("libudev.so.1") + (search-input-file inputs "lib/libudev.so.1"))) + ;; Patch the location of the X11 keywoard layouts, otherwise + ;; webengine *crashes* at run time when the default directory, + ;; '/usr/share/X11/xkb' is empty (see: + ;; https://bugreports.qt.io/browse/QTBUG-105124). + (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\ +/xkb_keyboard_layout_engine.cc" + (("/usr/share/X11/xkb") + (search-input-directory inputs "share/X11/xkb"))))) + (add-before 'configure 'prepare-build-environment + (lambda _ + ;; Avoids potential race conditions. + (setenv "PYTHONDONTWRITEBYTECODE" "1") + (setenv "NINJAFLAGS" + (string-append + "-k1" ;less verbose build output + ;; Respect the '--cores' option of 'guix build'. + " -j" (number->string (parallel-job-count)))) + ;; Use Clang/LDD to help tame the memory requirements and hasten + ;; the build. + (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm") + (setenv "CC" "clang") (setenv "CXX" "clang++"))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (apply invoke "cmake" "--build" "." + (if parallel-build? + `("--parallel" ,(number->string (parallel-job-count))) + '())))) + (replace 'install + (lambda _ + (invoke "cmake" "--install" ".")))))) + (native-inputs + (modify-inputs (package-native-inputs qtwebengine-5) + (delete "python2" "python2-six") + (append clang-14 + lld-as-ld-wrapper + node-lts + python-wrapper + python-html5lib))) + (inputs + (modify-inputs (package-inputs qtwebengine-5) + (replace "qtbase" qtbase) + (replace "qtdeclarative" qtdeclarative) + (replace "qtmultimedia" qtmultimedia) + (replace "qtwebchannel" qtwebchannel) + (append libxkbfile xkeyboard-config))) + (native-search-paths + (list (search-path-specification + (file-type 'regular) + (separator #f) + (variable "QTWEBENGINEPROCESS_PATH") + (files '("lib/qt5/libexec/QtWebEngineProcess"))))) + (home-page "https://wiki.qt.io/QtWebEngine") + (synopsis "Qt WebEngine module") + (description "The Qt WebEngine module provides support for web +applications using the Chromium browser project. The Chromium source code has +Google services and binaries removed, and adds modular support for using +system libraries.") + (license license:lgpl2.1+))) + (define-public single-application-qt5 ;; Change in function signature, nheko requires at least this commit (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053")) -- cgit v1.2.3 From de20b74fc2debed186edbd613c7afe6a992c02b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 23:54:41 -0400 Subject: gnu: Add qt5compat. * gnu/packages/qt.scm (qt5compat): New variable. --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce5df74f7d..488cfa6120 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -831,6 +831,35 @@ (define-public qtbase (variable "XDG_CONFIG_DIRS") (files '("etc/xdg"))))))) +(define-public qt5compat + (package + (name "qt5compat") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (native-inputs (list perl)) + (inputs (list icu4c libxkbcommon qtbase qtdeclarative qtshadertools)) + (home-page (package-home-page qtbase)) + (synopsis "Legacy Qt 5 APIs ported to Qt 6") + (description "The @code{qt5compat} package includes application +programming interfaces (APIs) from Qt 5 that were ported to Qt 6, to ease +migration. It provides for example the @code{GraphicalEffects} module that +came with the @{qtgraphicaleffects} Qt 5 package.") + (license (list license:gpl2+ license:lgpl3+)))) ;dual licensed + (define-public qtsvg-5 (package (inherit qtbase-5) -- cgit v1.2.3 From eef8e2ec46c4155980815e00a394428c0c3de075 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 16:52:05 -0400 Subject: gnu: qttools: Rename to qttools-5. Automated with: git grep -l qttools | xargs sed 's/\bqttools\b/\0-5/g' -i git checkout NEWS --- gnu/packages/animation.scm | 2 +- gnu/packages/astronomy.scm | 2 +- gnu/packages/audio.scm | 10 ++-- gnu/packages/benchmark.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/connman.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/djvu.scm | 2 +- gnu/packages/education.scm | 6 +- gnu/packages/electronics.scm | 2 +- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 8 +-- gnu/packages/finance.scm | 24 ++++---- gnu/packages/game-development.scm | 4 +- gnu/packages/games.scm | 12 ++-- gnu/packages/geo.scm | 8 +-- gnu/packages/gps.scm | 4 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hardware.scm | 4 +- gnu/packages/image-processing.scm | 6 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 66 +++++++++++----------- gnu/packages/kde-multimedia.scm | 2 +- gnu/packages/kde-pim.scm | 20 +++---- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 16 +++--- gnu/packages/lego.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/lxqt.scm | 52 ++++++++--------- gnu/packages/maths.scm | 8 +-- gnu/packages/messaging.scm | 6 +- gnu/packages/music.scm | 36 ++++++------ gnu/packages/networking.scm | 2 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/patches/xygrib-fix-finding-data.patch | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 26 ++++----- gnu/packages/radio.scm | 8 +-- gnu/packages/robotics.scm | 2 +- gnu/packages/scribus.scm | 2 +- gnu/packages/security-token.scm | 6 +- gnu/packages/sync.scm | 4 +- gnu/packages/synergy.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 4 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 8 +-- guix/lint.scm | 4 +- 53 files changed, 207 insertions(+), 207 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c7f80a4b6a..ba8ce00fbd 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -448,7 +448,7 @@ (define-public papagayo ("qtmultimedia-5" ,qtmultimedia-5) ("libsndfile" ,libsndfile))) (native-inputs - (list qttools)) + (list qttools-5)) (home-page "https://www.lostmarble.com/papagayo/") (synopsis "Lip-syncing for animations") (description diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 95659104ce..acac8449ab 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -615,7 +615,7 @@ (define-public stellarium `(("gettext" ,gettext-minimal) ; xgettext is used at compile time ("perl" ,perl) ; for pod2man ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (arguments `(#:test-target "test" #:configure-flags (list "-DENABLE_TESTING=1" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f0ffeed210..aad86bac06 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -587,7 +587,7 @@ (define-public alsa-modular-synth liblo qtbase-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") (description @@ -3097,7 +3097,7 @@ (define-public qjackctl (inputs (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://qjackctl.sourceforge.io/") (synopsis "Jack server control application") (description "Control a Jack server. Allows you to plug various sources @@ -3218,7 +3218,7 @@ (define-public supercollider (string-append ide "/bin")) (delete-file scide))))))) (native-inputs - (list ableton-link pkg-config qttools xorg-server-for-tests)) + (list ableton-link pkg-config qttools-5 xorg-server-for-tests)) (inputs (list jack-1 libsndfile fftw @@ -3903,7 +3903,7 @@ (define-public qsynth (arguments `(#:tests? #f)) ; no "check" phase (native-inputs - (list qttools pkg-config)) + (list qttools-5 pkg-config)) (inputs (list fluidsynth qtbase-5 qtx11extras)) (home-page "https://qsynth.sourceforge.io") @@ -5456,7 +5456,7 @@ (define-public ableton-link portaudio ;for portaudio examples qtbase-5 ;for Qt examples qtdeclarative-5 - qttools)) + qttools-5)) (inputs (list jack-1 ;for JACK examples qtquickcontrols-5)) ;for Qt examples diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4ea12e4cf3..7be932f528 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -499,7 +499,7 @@ (define-public kdiskmark (substitute* "src/benchmark.cpp" (("\"fio\"") (format #f "~s" (search-input-file inputs "bin/fio"))))))))) - (native-inputs (list extra-cmake-modules qttools)) + (native-inputs (list extra-cmake-modules qttools-5)) (inputs (list fio qtbase-5)) (home-page "https://github.com/JonMagon/KDiskMark") (synopsis "Simple disk benchmark tool") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fe235d4b3b..43fc287b95 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -470,7 +470,7 @@ (define-public qbittorrent (wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) #t))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs `(("boost" ,boost) ("libtorrent-rasterbar" ,libtorrent-rasterbar) diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 71dff3588f..f4e6e43ec8 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -165,7 +165,7 @@ (define-public cmst (inputs (list qtbase-5)) (native-inputs - (list qttools)) + (list qttools-5)) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4a28aa79cb..9535b65dbd 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4782,7 +4782,7 @@ (define-public sqlitebrowser qscintilla qtbase-5 sqlite)) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (home-page "https://sqlitebrowser.org/") (synopsis "Database browser for SQLite") (description "Sqlitebrowser is a high quaility, visual, open source tool to diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 32ec5c3141..efeea2924d 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -78,7 +78,7 @@ (define-public sddm "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list elogind glib diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index b85193ccdb..92b4b6dce7 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -107,7 +107,7 @@ (define-public djview (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - (list autoconf automake libtool pkg-config qttools)) + (list autoconf automake libtool pkg-config qttools-5)) (inputs (list djvulibre glib libxt libtiff qtbase-5)) (arguments diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index aabf3dfc21..c5666fb02e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -174,7 +174,7 @@ (define-public gcompris-qt gettext-minimal kdoctools perl - qttools + qttools-5 xorg-server-for-tests)) (inputs (list openssl @@ -540,7 +540,7 @@ (define-public openboard (symlink (string-append openboard "/OpenBoard") (string-append bin "/openboard"))))))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list alsa-lib coreutils-minimal ;for patched 'env' shebang @@ -991,7 +991,7 @@ (define-public qolibri (arguments '(#:tests? #f)) ; no test target (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list libeb qtbase-5 diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 342294de13..15e7318926 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -373,7 +373,7 @@ (define-public pulseview (rmdir "doc/pulseview") (rmdir "doc")))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list boost glib diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ba7fa1dbe2..386e127e1e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -744,7 +744,7 @@ (define-public mgba (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ffmpeg libedit diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 303dd0b737..57efaee50b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -762,7 +762,7 @@ (define-public qelectrotech (substitute* "qelectrotech.pro" (("\\/usr\\/local") out)) (invoke "qmake"))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") @@ -2120,7 +2120,7 @@ (define-public librepcb (inputs (list qtbase-5 qtsvg-5 zlib)) (native-inputs - (list qttools ; for lrelease + (list qttools-5 ; for lrelease unzip)) (arguments `(#:phases @@ -2452,7 +2452,7 @@ (define-public freecad (native-inputs (list doxygen graphviz - qttools + qttools-5 pkg-config python-pyside-2-tools swig)) @@ -3715,7 +3715,7 @@ (define-public candle (base32 "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) (build-system gnu-build-system) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (inputs (list qtbase-5 qtserialport)) (arguments (list #:tests? #f ; no tests. diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b7937a310a..5ff345acc0 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -143,7 +143,7 @@ (define-public bitcoin-core-0.21 pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-4.8 ; 4.8 required for compatibility boost @@ -159,12 +159,12 @@ (define-public bitcoin-core-0.21 (assoc-ref %build-inputs "boost")) ;; XXX: The configure script looks up Qt paths by ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick - ;; up executables residing in 'qttools', so we specify them here. + ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lupdate")) #:phases (modify-phases %standard-phases @@ -698,7 +698,7 @@ (define-public monero pkg-config protobuf python - qttools)) + qttools-5)) (inputs (list boost cppzmq @@ -1543,7 +1543,7 @@ (define-public bitcoin-abc (list pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-5.3 boost @@ -1657,7 +1657,7 @@ (define-public bitcoin-unlimited pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-4.8 boost @@ -1677,12 +1677,12 @@ (define-public bitcoin-unlimited (assoc-ref %build-inputs "boost")) ;; XXX: The configure script looks up Qt paths by ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick - ;; up executables residing in 'qttools', so we specify them here. + ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lupdate") "--disable-static") #:phases @@ -1731,7 +1731,7 @@ (define-public fulcrum (string-append "PREFIX=" %output) "features=")))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list python qtbase-5 rocksdb zlib)) (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") @@ -1798,7 +1798,7 @@ (define-public flowee openssl qtbase-5)) (native-inputs - (list pkg-config qttools util-linux)) ; provides the hexdump command for tests + (list pkg-config qttools-5 util-linux)) ; provides the hexdump command for tests (home-page "https://flowee.org") (synopsis "Flowee infrastructure tools and services") (description diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f426532cb1..70bd4c0251 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -522,7 +522,7 @@ (define-public tiled (inputs (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib)) (native-inputs - (list qttools)) + (list qttools-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -531,7 +531,7 @@ (define-public tiled (substitute* "translations/translations.pro" (("LRELEASE =.*") (string-append "LRELEASE = " - (assoc-ref inputs "qttools") + (assoc-ref inputs "qttools-5") "/bin/lrelease\n"))) (let ((out (assoc-ref outputs "out"))) (invoke "qmake" diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a851a6853a..8b655cc0e4 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -995,7 +995,7 @@ (define-public cockatrice qtbase-5 qtmultimedia-5 qtsvg-5 - qttools + qttools-5 qtwebsockets-5 xz zlib)) @@ -2504,7 +2504,7 @@ (define-public solarus (setenv "XDG_RUNTIME_DIR" (getcwd)) #t))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs `(("glm" ,glm) ("libmodplug" ,libmodplug) @@ -7203,7 +7203,7 @@ (define-public the-butterfly-effect (native-inputs `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (synopsis "Realistic physics puzzle game") (description "The Butterfly Effect (tbe) is a game that uses realistic physics simulations to combine lots of simple mechanical @@ -9279,7 +9279,7 @@ (define-public flightgear (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("flightgear-data" ,(origin (method url-fetch) @@ -9407,7 +9407,7 @@ (define-public hedgewars ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) (native-inputs - (list clang-9 ghc pkg-config qttools)) + (list clang-9 ghc pkg-config qttools-5)) (home-page "https://hedgewars.org/") (synopsis "Turn-based artillery game featuring fighting hedgehogs") (description @@ -11883,7 +11883,7 @@ (define-public chessx (base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) (arguments diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b8125ffe6e..fe2174b106 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1495,7 +1495,7 @@ (define-public xygrib (string-append "\"" font "/share/fonts/\""))))))) #:tests? #f)) ; no tests (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list bzip2 font-liberation @@ -1952,7 +1952,7 @@ (define-public qmapshack (base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys")))) (build-system qt-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list gdal libjpeg-turbo @@ -2199,7 +2199,7 @@ (define-public openorienteering-mapper ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (home-page "https://www.openorienteering.org/apps/mapper/") (synopsis "OpenOrienteering Mapper (OOM)") (description @@ -2634,7 +2634,7 @@ (define-public qgis pkg-config python-mock python-nose2 - qttools + qttools-5 shellcheck xorg-server-for-tests)) (home-page "https://qgis.org") diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index b117ff4222..e528807de7 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -84,7 +84,7 @@ (define-public gpsbabel (inputs (list expat libusb qtbase-5 zlib)) (native-inputs - (list which qttools libxml2)) ;'xmllint' needed for the KML tests + (list which qttools-5 libxml2)) ;'xmllint' needed for the KML tests (home-page "https://www.gpsbabel.org/") (synopsis "Convert and exchange data with GPS and map programs") (description @@ -196,7 +196,7 @@ (define-public gpxsee (inputs (list qtbase-5 qtlocation qtsvg-5)) (native-inputs - (list qttools)) + (list qttools-5)) (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f7307e8f61..38e6533a43 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1438,7 +1438,7 @@ (define-public brdf-explorer (chmod "brdf" #o555))) #t))))) (native-inputs - (list qttools)) ;for 'qmake' + (list qttools-5)) ;for 'qmake' (inputs (list qtbase-5 mesa glew freeglut zlib)) (home-page "https://www.disneyanimation.com/technology/brdf.html") diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 27567bb38e..68c4667662 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -453,7 +453,7 @@ (define-public ckb-next (wrap-qt-program "ckb-next" #:output out #:inputs inputs))))))) - (native-inputs (list qttools pkg-config)) + (native-inputs (list qttools-5 pkg-config)) (inputs (list qtbase-5 zlib libdbusmenu-qt @@ -534,7 +534,7 @@ (define-public ddcui (arguments '(#:tests? #f)) ; No test suite (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ddcutil glib qtbase-5)) (home-page "https://www.ddcutil.com/") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index d4b13cc90e..158d470828 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -770,7 +770,7 @@ (define-public gmic-qt (add-after 'unpack 'qt-chdir (lambda _ (chdir "gmic-qt") #t)))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (modify-inputs (package-inputs gmic) (prepend gmic qtbase-5))) @@ -1109,7 +1109,7 @@ (define-public itk-snap zlib)) (native-inputs `(("googletest" ,googletest) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("pkg-config" ,pkg-config) ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") @@ -1224,7 +1224,7 @@ (define-public scantailor-advanced "0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs `(("boost" ,boost) ("libjpeg" ,libjpeg-turbo) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 045fdae882..88dbba866b 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -516,7 +516,7 @@ (define-public luminance-hdr "188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp")))) (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list qtbase-5 qtdeclarative-5 @@ -671,7 +671,7 @@ (define-public qview (invoke "qmake" "tests.pro") (invoke "make" "tests")))))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtimageformats qtsvg-5)) (home-page "https://interversehq.com/qview/") @@ -924,7 +924,7 @@ (define-public nomacs ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (synopsis "Image viewer supporting all common formats") (description "Nomacs is a simple to use image lounge featuring semi-transparent widgets that display additional information such as metadata, diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 90554143d0..4b31ba41a0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1828,7 +1828,7 @@ (define-public flameshot "1p7gqs5vqzbddlgl38lbanchwb14m6lx8f2cn2c5p0vyqwvqqv52")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (arguments diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 67a86cbfc1..efb32a39e0 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -126,7 +126,7 @@ (define-public quassel (let ((inxi (search-input-file inputs "/bin/inxi"))) (symlink inxi "data/scripts/inxi"))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list boost inxi-minimal diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 22d2f0c5ce..e5c29981d3 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -598,7 +598,7 @@ (define-public jami (("Qt::AA_UseOpenGLES") "Qt::AA_UseDesktopOpenGL"))))))) (native-inputs - (list pkg-config python qttools doxygen graphviz)) + (list pkg-config python qttools-5 doxygen graphviz)) (inputs (list jami-libclient libnotify diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6fc0b5f10c..391db94f3a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -185,7 +185,7 @@ (define-public phonon (native-inputs ;; TODO: Think about adding pulseaudio. Is it required for sound? ;; TODO: Add building the super experimental QML support - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list qtbase-5)) (arguments @@ -222,7 +222,7 @@ (define-public phonon-backend-gstreamer "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list qtbase-5 phonon @@ -489,7 +489,7 @@ (define-public kcodecs "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules gperf qttools)) + (list extra-cmake-modules gperf qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -523,7 +523,7 @@ (define-public kconfig "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools + (list dbus extra-cmake-modules inetutils qttools-5 xorg-server-for-tests)) (inputs (list qtbase-5)) @@ -585,7 +585,7 @@ (define-public kcoreaddons "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info + (list extra-cmake-modules qttools-5 shared-mime-info ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam xorg-server-for-tests)) ; for the tests (inputs @@ -641,7 +641,7 @@ (define-public kdbusaddons (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus qttools)) + (list extra-cmake-modules dbus qttools-5)) (inputs (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (arguments @@ -681,7 +681,7 @@ (define-public kdnssd "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list avahi ; alternativly dnssd could be used qtbase-5)) @@ -773,7 +773,7 @@ (define-public kholidays (display "[testDefaultRegions]\n*\n"))) #t))))) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5 qtdeclarative-5)) (home-page "https://invent.kde.org/frameworks/kholidays") @@ -868,7 +868,7 @@ (define-public kirigami (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kwindowsystem ;; TODO: Find a way to activate this optional include without @@ -952,7 +952,7 @@ (define-public kitemviews "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -977,7 +977,7 @@ (define-public kplotting "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -1004,7 +1004,7 @@ (define-public ksyntaxhighlighting "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl qttools + (list extra-cmake-modules perl qttools-5 ;; Optional, for compile-time validation of syntax definition files: qtxmlpatterns)) (inputs @@ -1088,7 +1088,7 @@ (define-public kwidgetsaddons "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools xorg-server-for-tests)) + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) (inputs (list qtbase-5)) (arguments @@ -1127,7 +1127,7 @@ (define-public kwindowsystem pkg-config dbus ; for the tests openbox ; for the tests - qttools + qttools-5 xorg-server-for-tests)) ; for the tests (inputs `(("libxrender" ,libxrender) @@ -1373,7 +1373,7 @@ (define-public solid (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "ctest" ".")))))) (native-inputs - (list bison dbus extra-cmake-modules flex qttools)) + (list bison dbus extra-cmake-modules flex qttools-5)) (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) @@ -1401,7 +1401,7 @@ (define-public sonnet "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list hunspell ;; TODO: hspell (for Hebrew), Voikko (for Finish) @@ -1503,7 +1503,7 @@ (define-public kauth "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules qttools)) + (list dbus extra-cmake-modules qttools-5)) (inputs (list kcoreaddons polkit-qt qtbase-5)) (arguments @@ -1546,7 +1546,7 @@ (define-public kcompletion "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kwidgetsaddons qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -1800,7 +1800,7 @@ (define-public kjobwidgets "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras)) (home-page "https://community.kde.org/Frameworks") @@ -1824,7 +1824,7 @@ (define-public knotifications "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus qttools)) + (list extra-cmake-modules dbus qttools-5)) (inputs (list kcodecs kconfig @@ -2134,7 +2134,7 @@ (define-public kbookmarks (propagated-inputs (list kwidgetsaddons)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kauth kcodecs @@ -2236,7 +2236,7 @@ (define-public kconfigwidgets ki18n ;; todo: PythonModuleGeneration qtbase-5 - qttools)) + qttools-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -2362,7 +2362,7 @@ (define-public kdesignerplugin "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kcoreaddons @@ -2431,7 +2431,7 @@ (define-public kdewebkit "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kcoreaddons @@ -2500,7 +2500,7 @@ (define-public kglobalaccel "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list kconfig kcrash @@ -2534,7 +2534,7 @@ (define-public kiconthemes "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info)) + (list extra-cmake-modules qttools-5 shared-mime-info)) (inputs (list karchive kauth @@ -2661,7 +2661,7 @@ (define-public kio kxmlgui solid)) (native-inputs - (list dbus qttools extra-cmake-modules)) + (list dbus qttools-5 extra-cmake-modules)) (inputs `(;; TODO: LibACL , ("krb5" ,mit-krb5) @@ -3133,7 +3133,7 @@ (define-public ktextwidgets (propagated-inputs (list ki18n sonnet)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kauth kcodecs @@ -3213,7 +3213,7 @@ (define-public kxmlgui (propagated-inputs (list kconfig kconfigwidgets)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list attica kauth @@ -3549,7 +3549,7 @@ (define-public kdelibs4support networkmanager-qt openssl qtsvg-5 - qttools + qttools-5 qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt @@ -3698,7 +3698,7 @@ (define-public kjsembed (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list ki18n kjs qtbase-5 qtsvg-5)) (home-page "https://community.kde.org/Frameworks") @@ -3722,7 +3722,7 @@ (define-public kmediaplayer (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list kcompletion kcoreaddons @@ -3758,7 +3758,7 @@ (define-public kross (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list kcompletion kcoreaddons diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ac86489a95..39295f589d 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -322,7 +322,7 @@ (define-public kid3 kdoctools libxslt python-wrapper - qttools)) + qttools-5)) (inputs (list chromaprint flac diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f0f5683ac5..faf5e702f3 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -58,7 +58,7 @@ (define-public akonadi "akonadi-not-relocatable.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info)) + (list extra-cmake-modules qttools-5 shared-mime-info)) (inputs (list boost kconfig @@ -537,7 +537,7 @@ (define-public kcalendarsupport (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-calendar @@ -769,7 +769,7 @@ (define-public keventviews (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-calendar @@ -1108,7 +1108,7 @@ (define-public kmailcommon (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus gnupg qttools)) + (list extra-cmake-modules dbus gnupg qttools-5)) (inputs (list akonadi akonadi-contacts @@ -1496,7 +1496,7 @@ (define-public korganizer (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus qttools kdoctools)) + (list extra-cmake-modules dbus qttools-5 kdoctools)) (inputs (list akonadi akonadi-calendar @@ -1620,7 +1620,7 @@ (define-public kpimcommon (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list karchive akonadi @@ -1678,7 +1678,7 @@ (define-public kpimtextedit (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list grantlee kcodecs @@ -1791,7 +1791,7 @@ (define-public libkdepim (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-contacts @@ -1838,7 +1838,7 @@ (define-public libkgapi (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list cyrus-sasl ki18n @@ -1873,7 +1873,7 @@ (define-public libkleo (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list boost gpgme diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 512c2acfef..98bc8f7b86 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -407,7 +407,7 @@ (define-public okteta (base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools shared-mime-info)) + (list extra-cmake-modules kdoctools qttools-5 shared-mime-info)) (inputs (list kbookmarks kcmutils diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c43758ef7f..933bfcd04b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -261,7 +261,7 @@ (define-public kdenlive `("MLT_PREFIX" ":" = (,#$(this-package-input "mlt")))))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list bash-minimal breeze ; make dark them available easily @@ -318,7 +318,7 @@ (define-public kdevelop (base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config shared-mime-info qttools)) + (list extra-cmake-modules pkg-config shared-mime-info qttools-5)) (inputs `(("boost" ,boost) ("clang" ,clang) @@ -436,7 +436,7 @@ (define-public kdiagram "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (home-page "https://invent.kde.org/graphics/kdiagram") @@ -690,7 +690,7 @@ (define-public snorenotify (inputs (list qtbase-5)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (home-page "https://techbase.kde.org/Projects/Snorenotify") (synopsis "Qt notification framework") (description "Snorenotify is a multi platform Qt notification framework. @@ -804,7 +804,7 @@ (define-public labplot ("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list breeze ;for dark themes breeze-icons ;for icons @@ -917,7 +917,7 @@ (define-public kcachegrind "0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl python qttools kdoctools)) + (list extra-cmake-modules perl python qttools-5 kdoctools)) (inputs (list qtbase-5 karchive ki18n kio kdbusaddons)) ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on @@ -1007,7 +1007,7 @@ (define-public marble-qt "-DBUILD_TOUCH=YES" "-DBUILD_MARBLE_TESTS=FALSE"))) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) ;; One optional dependency missing: libwlocate. (inputs (list gpsd @@ -1216,7 +1216,7 @@ (define-public kuserfeedback (build-system qt-build-system) (native-inputs (list extra-cmake-modules - qttools + qttools-5 ;; For optional component "Survey target expression parser" bison flex diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 19a4a5eba0..39823dfee8 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -113,7 +113,7 @@ (define-public leocad "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq")))) (build-system gnu-build-system) (native-inputs - (list qttools)) ; for lrelease + (list qttools-5)) ; for lrelease (inputs (list mesa qtbase-5 zlib)) (arguments diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 47fb94dc68..7b5efeb588 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -843,7 +843,7 @@ (define-public linphone-desktop (symlink (string-append liblinphone "/share/belr/grammars") grammar-dest))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list bctoolbox belcard diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 9ff1de942c..eab9a24d1d 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -234,7 +234,7 @@ (define-public liblxqt qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (home-page "https://lxqt-project.org") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the @@ -287,7 +287,7 @@ (define-public lxqt-about qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -329,7 +329,7 @@ (define-public lxqt-admin qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -382,7 +382,7 @@ (define-public lxqt-config xkeyboard-config zlib)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) ;; XXX: This is a workaround so libkscreen can find the backends as we ;; dont have a way specify them. We may want to patch like Nix does. (propagated-inputs @@ -446,7 +446,7 @@ (define-public lxqt-globalkeys qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -492,7 +492,7 @@ (define-public lxqt-notificationd qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no test target #:phases @@ -537,7 +537,7 @@ (define-public lxqt-openssh-askpass qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -590,7 +590,7 @@ (define-public lxqt-panel xcb-util xkeyboard-config)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (propagated-inputs ;; Propagating KWINDOWSYSTEM so that the list of opened applications ;; shows up in lxqt-panel's taskbar plugin. @@ -649,7 +649,7 @@ (define-public lxqt-policykit qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config polkit lxqt-build-tools qttools)) + (list pkg-config polkit lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no test target #:phases @@ -696,7 +696,7 @@ (define-public lxqt-powermanagement qtx11extras solid)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -742,7 +742,7 @@ (define-public lxqt-qtplugin qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -782,7 +782,7 @@ (define-public lxqt-runner qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -829,7 +829,7 @@ (define-public lxqt-session qtx11extras xdg-user-dirs)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments `(#:tests? #f #:phases @@ -897,7 +897,7 @@ (define-public lxqt-sudo qtx11extras sudo)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -978,7 +978,7 @@ (define-public libfm-qt qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (home-page "https://lxqt-project.org") (synopsis "Qt binding for libfm") (description "libfm-qt is the Qt port of libfm, a library providing @@ -1000,7 +1000,7 @@ (define-public pcmanfm-qt (inputs (list libfm-qt qtbase-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -1038,7 +1038,7 @@ (define-public compton-conf (inputs (list libconfig qtbase-5)) (native-inputs - (list lxqt-build-tools pkg-config qttools)) + (list lxqt-build-tools pkg-config qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -1070,7 +1070,7 @@ (define-public lximage-qt (inputs (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1103,7 +1103,7 @@ (define-public obconf-qt qtbase-5 qtx11extras)) (native-inputs - (list lxqt-build-tools pkg-config qttools)) + (list lxqt-build-tools pkg-config qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1127,7 +1127,7 @@ (define-public pavucontrol-qt (inputs (list glib pcre pulseaudio qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1156,7 +1156,7 @@ (define-public qps qtbase-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1180,7 +1180,7 @@ (define-public qtermwidget (inputs (list qtbase-5 utf8proc)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1203,7 +1203,7 @@ (define-public qterminal (inputs (list qtbase-5 qtx11extras qtermwidget)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1227,7 +1227,7 @@ (define-public screengrab (inputs (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config perl qttools)) + (list pkg-config perl qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1252,7 +1252,7 @@ (define-public lxqt-archiver (inputs (list glib json-glib libfm-qt qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) (home-page "https://lxqt-project.org") @@ -1289,7 +1289,7 @@ (define-public lxqt-connman-applet libqtxdg)) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 72a8957200..89f98ec2b6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2783,7 +2783,7 @@ (define-public octave ("qt" ,qtbase-5) ,@(package-inputs octave-cli))) (native-inputs - `(("qttools" , qttools) ;for lrelease + `(("qttools-5" , qttools-5) ;for lrelease ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))) ; for texi2dvi ,@(package-native-inputs octave-cli))) (arguments @@ -3069,7 +3069,7 @@ (define-public veusz (native-inputs (list pkg-config ;;("python-astropy" ,python-astropy) ;; FIXME: Package this. - qttools python-sip-4)) + qttools-5 python-sip-4)) (inputs (list ghostscript ;optional, for EPS/PS output python-dbus @@ -5468,7 +5468,7 @@ (define-public xaos (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("qtbase" ,qtbase-5) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list libx11 zlib libpng gsl)) ;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; not enough for this package to install properly. These phases fix that. @@ -7147,7 +7147,7 @@ (define-public speedcrunch "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk")))) (build-system cmake-build-system) (inputs (list qtbase-5)) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e5dd078561..58ac95f42c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1810,7 +1810,7 @@ (define-public qtox ,(list (search-input-directory inputs "lib/qt5/plugins/")))))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ffmpeg filteraudio @@ -2468,7 +2468,7 @@ (define-public nheko xcb-util-wm zlib)) (native-inputs - (list asciidoc doxygen graphviz pkg-config qttools)) + (list asciidoc doxygen graphviz pkg-config qttools-5)) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") (description "@code{Nheko} want to provide a native desktop app for the @@ -2502,7 +2502,7 @@ (define-public quaternion qtquickcontrols-5 qtquickcontrols2-5 qtsvg-5 - qttools + qttools-5 xdg-utils)) (arguments `(#:tests? #f)) ; no tests diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1147512980..844e756094 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -435,7 +435,7 @@ (define-public clementine `(("gettext" ,gettext-minimal) ("googletest" ,googletest) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list boost chromaprint @@ -529,7 +529,7 @@ (define-public strawberry `(("gettext" ,gettext-minimal) ("googletest" ,googletest) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools) + ("qtlinguist" ,qttools-5) ("xorg-server" ,xorg-server-for-tests))) (inputs (list alsa-lib @@ -768,7 +768,7 @@ (define-public hydrogen (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list alsa-lib jack-1 @@ -2226,7 +2226,7 @@ (define-public mixxx (list benchmark googletest python-wrapper - qttools + qttools-5 xorg-server-for-tests)) (inputs (list bash-minimal @@ -2303,7 +2303,7 @@ (define-public synthv1 qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://synthv1.sourceforge.io") (synopsis "Polyphonic subtractive synthesizer") (description @@ -2336,7 +2336,7 @@ (define-public drumkv1 qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://drumkv1.sourceforge.io") (synopsis "Drum-kit sampler synthesizer with stereo effects") (description @@ -2369,7 +2369,7 @@ (define-public samplv1 qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://samplv1.sourceforge.io") (synopsis "Polyphonic sampler synthesizer with stereo effects") (description @@ -2402,7 +2402,7 @@ (define-public padthv1 qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://padthv1.sourceforge.io") (synopsis "Polyphonic additive synthesizer") (description @@ -2928,7 +2928,7 @@ (define-public drumstick "/manpages/docbook.xsl"))) #t))))) (inputs - (list qtbase-5 qtsvg-5 qttools alsa-lib)) + (list qtbase-5 qtsvg-5 qttools-5 alsa-lib)) (native-inputs (list pkg-config libxslt ; for xsltproc @@ -2975,7 +2975,7 @@ (define-public vmpk (list drumstick qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list libxslt ;for xsltproc - docbook-xsl qttools pkg-config)) + docbook-xsl qttools-5 pkg-config)) (home-page "https://vmpk.sourceforge.io/") (synopsis "Virtual MIDI piano keyboard") (description @@ -3316,7 +3316,7 @@ (define-public qtractor suil zlib)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://qtractor.org/") (synopsis "Audio/MIDI multi-track sequencer") (description @@ -4423,7 +4423,7 @@ (define-public qmidiarp (inputs (list qtbase-5 alsa-lib jack-1 liblo lv2)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://qmidiarp.sourceforge.net/") (synopsis "MIDI arpeggiator") (description "QMidiArp is an advanced MIDI arpeggiator, programmable step @@ -4449,7 +4449,7 @@ (define-public qmidiroute (inputs (list qtbase-5 alsa-lib)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://alsamodular.sourceforge.net/") (synopsis "MIDI event router and filter") (description "QMidiRoute is a MIDI event router and filter. MIDI note, @@ -4592,7 +4592,7 @@ (define-public lmms "\""))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ;; rpmalloc is a public domain memory allocator. This version specified ;; below is the version required by LMMS. ;; To get the new commit of rpmalloc to use here, run @@ -4764,7 +4764,7 @@ (define-public musescore qtsvg-5 qtxmlpatterns)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (synopsis "Music composition and notation software") (description "MuseScore is a music score typesetter. Its main purpose is the creation @@ -4836,7 +4836,7 @@ (define-public muse-sequencer `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (home-page "https://muse-sequencer.github.io/") (synopsis "MIDI/Audio sequencer") (description "MusE is a MIDI/Audio sequencer with recording and editing @@ -5021,7 +5021,7 @@ (define-public rosegarden wavpack zlib)) (native-inputs - (list pkg-config qttools)) ;for qtlinguist + (list pkg-config qttools-5)) ;for qtlinguist (synopsis "Music composition and editing environment based around a MIDI sequencer") (description "Rosegarden is a music composition and editing environment @@ -5569,7 +5569,7 @@ (define-public fmit `(("gettext" ,gettext-minimal) ("hicolor-icon-theme" ,hicolor-icon-theme) ("itstool" ,itstool) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (synopsis "Musical instrument tuner") (description "FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features.") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7c6d0757ea..7ea5cd7d20 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1650,7 +1650,7 @@ (define-public wireshark perl pkg-config python-wrapper - qttools)) + qttools-5)) (synopsis "Network traffic analyzer") (description "Wireshark is a network protocol analyzer, or @dfn{packet sniffer}, that lets you capture and interactively browse the contents of diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 7db592549d..0069fdd74c 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -165,7 +165,7 @@ (define-public keepassxc (lambda* (#:key inputs #:allow-other-keys) (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs)))))) (native-inputs - (list qttools ruby-asciidoctor)) + (list qttools-5 ruby-asciidoctor)) (inputs (list argon2 botan @@ -697,7 +697,7 @@ (define-public qtpass (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (home-page "https://qtpass.org") diff --git a/gnu/packages/patches/xygrib-fix-finding-data.patch b/gnu/packages/patches/xygrib-fix-finding-data.patch index 0b718b0eff..d1db2d8807 100644 --- a/gnu/packages/patches/xygrib-fix-finding-data.patch +++ b/gnu/packages/patches/xygrib-fix-finding-data.patch @@ -124,7 +124,7 @@ index 2c9d3ab4da03..1190cc780182 100644 +- GEN_TRANSLATION (DEFAULT: ON) +``` +Create targets to generate translation files. -+Turning this off removes the need for qt-linguist, part of qttools qt5 submodule, during build. ++Turning this off removes the need for qt-linguist, part of qttools-5 qt5 submodule, during build. +``` ### macOS diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 45e951884b..19c171a9bb 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -609,7 +609,7 @@ (define-public photoflare (string-append "PREFIX=" out) "Photoflare.pro"))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list graphicsmagick libomp qtbase-5)) (home-page "https://photoflare.io") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac7c0d6066..216970ace9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25034,7 +25034,7 @@ (define-public offlate python-translation-finder python-watchdog)) (native-inputs - (list qttools fontforge)) + (list qttools-5 fontforge)) (home-page "https://framagit.org/tyreunom/offlate") (synopsis "Offline translation interface for online translation tools") (description "Offlate offers a unified interface for different translation diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 488cfa6120..f0278c00a0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -187,7 +187,7 @@ (define-public qt5ct (add-after 'install 'qt-wrap (assoc-ref qt:%standard-phases 'qt-wrap))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (synopsis "Qt5 Configuration Tool") @@ -1701,7 +1701,7 @@ (define-public qtlocation (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) -(define-public qttools +(define-public qttools-5 (package (inherit qtsvg-5) (name "qttools") (version "5.15.2") @@ -1735,7 +1735,7 @@ (define-public qtscript "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs - (list perl qttools)) + (list perl qttools-5)) (inputs (list qtbase-5)) (synopsis "Qt Script module") @@ -2031,7 +2031,7 @@ (define-public qtspell (arguments `(#:tests? #f)) ;no test (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list enchant qtbase-5)) (home-page "https://github.com/manisandro/qtspell") @@ -2915,7 +2915,7 @@ (define-public python-pyqt ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) @@ -3260,7 +3260,7 @@ (define-public qtkeychain "1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk")))) (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list libsecret qtbase-5)) (arguments @@ -3404,7 +3404,7 @@ (define-public qwt (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtsvg-5 qttools)) + (list qtbase-5 qtsvg-5 qttools-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -3552,7 +3552,7 @@ (define-public dotherside "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m")))) (build-system cmake-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtdeclarative-5)) (home-page "https://filcuc.github.io/DOtherSide/index.html") @@ -3589,7 +3589,7 @@ (define-public qtcolorwidgets (build-system cmake-build-system) (arguments `(#:tests? #f)) ; There are no tests (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5)) (home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets") @@ -3741,7 +3741,7 @@ (define-public python-pyside-2 (native-inputs `(("cmake" ,cmake-minimal) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("which" ,which))) (arguments `(#:tests? #f @@ -3780,7 +3780,7 @@ (define-public python-pyside-2 "qtsensors" "qtspeech" "qtsvg-5" - "qttools" + "qttools-5" "qtwebchannel-5" "qtwebengine-5" "qtwebsockets-5" @@ -3873,7 +3873,7 @@ (define-public libqglviewer (lambda* (#:key make-flags #:allow-other-keys) (apply invoke (cons "qmake" make-flags))))))) (native-inputs - (list qtbase-5 qttools)) + (list qtbase-5 qttools-5)) (inputs (list glu)) (home-page "http://libqglviewer.com") @@ -3928,7 +3928,7 @@ (define-public qhexedit (install-file file include-dir)) (find-files "." "\\.h$")))))))) (inputs (list qtbase-5)) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (home-page "https://simsys.github.io") (synopsis "Binary editor widget for Qt") (description diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5f9767c896..9cd64999a1 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1290,7 +1290,7 @@ (define-public wsjtx (base32 "0nciw9smrfcsirlwyny5r9h7sk2zvm40m56y1hxpgpmbnh6mqikh")))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs `(("boost" ,boost) ("fftw" ,fftw) @@ -1327,7 +1327,7 @@ (define-public jtdx (base32 "1lw9q7ggh2jlasipl3v5pkbabysjr6baw15lnmg664ah3fwdrvnx")))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs (list boost @@ -1373,7 +1373,7 @@ (define-public js8call #t)))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs `(("boost" ,boost) ("fftw" ,fftw) @@ -1745,7 +1745,7 @@ (define-public kochmorse (base32 "1s1aj223n57rpc95rih98z08xnyhq2zp02byzrc3f7s01fv3nj0l")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtmultimedia-5)) (arguments diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 7266aa81f3..0b0ecaf027 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -119,7 +119,7 @@ (define-public aseba protobuf-3.5 ;for logging qtbase-5 qtsvg-5 - qttools ;for libQt5Help, needed by "studio" + qttools-5 ;for libQt5Help, needed by "studio" qtwebkit qtx11extras eudev diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 6f557d2b2b..a1d81f5697 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -91,7 +91,7 @@ (define-public scribus qtdeclarative-5 zlib)) (native-inputs - (list pkg-config qttools util-linux)) + (list pkg-config qttools-5 util-linux)) (home-page "https://www.scribus.net") (synopsis "Desktop publishing and page layout program") (description diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 5d95aebf14..84bd92b6f7 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -759,7 +759,7 @@ (define-public cppcodec (build-system cmake-build-system) (arguments '(#:configure-flags (list "-DBUILD_TESTING=on"))) - (native-inputs (list pkg-config qttools)) + (native-inputs (list pkg-config qttools-5)) (inputs (list catch-framework2)) (home-page "https://github.com/tplgy/cppcodec") (synopsis "Header library to encode/decode base64, base64url, etc.") @@ -783,7 +783,7 @@ (define-public nitrokey-app (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test suite - (native-inputs (list pkg-config qttools)) + (native-inputs (list pkg-config qttools-5)) (inputs (list cppcodec hidapi libnitrokey @@ -853,7 +853,7 @@ (define-public ausweisapp2 (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list qtbase-5 qtsvg-5 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 5b82e0ca3d..8c174c98ba 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -174,7 +174,7 @@ (define-public nextcloud-client ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("ruby" ,ruby))) (inputs (list appstream @@ -347,7 +347,7 @@ (define-public owncloud-client ("extra-cmake-modules" ,extra-cmake-modules) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list qtbase-5 qtkeychain sqlite zlib)) (home-page "https://owncloud.org") diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index df109e862b..bae784d65c 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -73,7 +73,7 @@ (define-public synergy (("/usr") out)) #t)))))) (native-inputs - (list qttools)) ; for Qt5LinguistTools + (list qttools-5)) ; for Qt5LinguistTools (inputs `(("avahi" ,avahi) ("python" ,python-wrapper) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d62dc831b3..873ff6246b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -383,7 +383,7 @@ (define-public telegram-desktop ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs `(("alsa" ,alsa-lib) ("c++-gsl" ,c++-gsl) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index c711c3512f..14c7087125 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -653,7 +653,7 @@ (define-public mumble ;; xiph-rnnoise ; TODO: unbundle rnnoise )) (native-inputs - (list pkg-config python qttools)) + (list pkg-config python qttools-5)) (synopsis "Low-latency, high quality voice chat software") (description "Mumble is an low-latency, high quality voice chat @@ -695,7 +695,7 @@ (define-public twinkle "-DWITH_G729=On" ; For G729 Codec Support "-DWITH_SPEEX=On"))) ; For Speex Codec Support (native-inputs - (list bison flex qttools)) + (list bison flex qttools-5)) (inputs (list alsa-lib bcg729 diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 345454bd62..485661fe6b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -663,7 +663,7 @@ (define-public ghostwriter "19cf55b86yj2b5hdazbyw4iyp6xq155243aiyg4m0vhwh0h79nwh")))) (build-system gnu-build-system) (native-inputs - (list pkg-config qttools)) ; for lrelease + (list pkg-config qttools-5)) ; for lrelease (inputs (list hunspell qtbase-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 184dca8eff..04049fd9c8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1012,7 +1012,7 @@ (define-public mkvtoolnix ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("ruby" ,ruby))) (arguments `(#:configure-flags @@ -2242,7 +2242,7 @@ (define-public smplayer "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list bash-minimal qtbase-5 zlib mpv)) (arguments @@ -2875,7 +2875,7 @@ (define-public avidemux `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("yasm" ,yasm))) ;; FIXME: Once packaged, add libraries not found during the build. (inputs @@ -4844,7 +4844,7 @@ (define-public shotcut (native-inputs `(("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list bash-minimal ffmpeg diff --git a/guix/lint.scm b/guix/lint.scm index 73581b518f..edba1c2663 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -492,7 +492,7 @@ (define (check-inputs-should-be-native package) "kdoctools" "libtool" "m4" - "qttools" + "qttools-5" "yasm" "nasm" "fasm" "python-coverage" "python-cython" @@ -507,7 +507,7 @@ (define (check-inputs-should-be-native package) "scdoc" "swig" "qmake" - "qttools" + "qttools-5" "texinfo" "xorg-server-for-tests" "yelp-tools"))) -- cgit v1.2.3 From a4784b32731f7289a045515486adf26d001c45ef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 16:54:06 -0400 Subject: gnu: Add qttools, version 6.3.1. * gnu/packages/qt.scm (qttools): New variable. --- gnu/packages/qt.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f0278c00a0..342b872275 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1723,6 +1723,33 @@ (define-public qttools-5 the documentation, translate applications, generate help files and other stuff that helps in Qt development."))) +(define-public qttools + (package + (name "qttools") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4")))) + (build-system cmake-build-system) + (arguments + (list + ;; The build system attempts to fetch online resources and fails when + ;; building the test suite. + #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF"))) + (native-inputs (list perl qtdeclarative vulkan-headers)) + (inputs (list libxkbcommon mesa qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Tools and Designer modules") + (description "The Qt Tools module provides a set of applications to browse +the documentation, translate applications, generate help files and other stuff +that helps in Qt development.") + ;; GPL 3 only with Qt GPL exception 1.0 (see: + ;; LICENSES/Qt-GPL-exception-1.0.txt). + (license (list license:gpl3)))) + (define-public qtscript (package (inherit qtsvg-5) (name "qtscript") -- cgit v1.2.3 From 2e27ccec8307961feabbb85589ace67431672c70 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 20:23:12 -0400 Subject: gnu: qtnetworkauth: Rename to qtnetworkauth-5. Automated with: git grep -l qtnetworkauth | xargs sed 's/\bqtnetworkauth\b/\0-5/g' -i --- gnu/packages/kde-internet.scm | 2 +- gnu/packages/kde-pim.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 9de2c54ad3..35d41887c2 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -88,7 +88,7 @@ (define-public choqok qca qoauth qtbase-5 - qtnetworkauth + qtnetworkauth-5 sonnet)) (home-page "https://kde.org/applications/internet/org.kde.choqok") (synopsis "Micro-Blogging Client") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index faf5e702f3..f5b0c008ce 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -725,7 +725,7 @@ (define-public kdepim-runtime qca qtbase-5 qtdeclarative-5 - qtnetworkauth + qtnetworkauth-5 qtspeech qtwebchannel-5 qtwebengine-5 diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 933bfcd04b..aa742df80f 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -288,7 +288,7 @@ (define-public kdenlive qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtnetworkauth + qtnetworkauth-5 qtquickcontrols-5 qtquickcontrols2-5 qtscript diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 342b872275..daed19085d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1955,7 +1955,7 @@ (define-public qtdatavis3d customized by using themes or by adding custom items and labels to them.") (license license:gpl3))) -(define-public qtnetworkauth +(define-public qtnetworkauth-5 (package (inherit qtsvg-5) (name "qtnetworkauth") (version "5.15.2") -- cgit v1.2.3 From d9e8d7f4aa55877d81e1b6f276e5c26f28fef453 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 20:30:07 -0400 Subject: gnu: Add qtnetworkauth, version 6.3.1. * gnu/packages/qt.scm (qtnetworkauth): New variable. --- gnu/packages/qt.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daed19085d..16ce44035a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1981,6 +1981,26 @@ (define-public qtnetworkauth-5 (description "The Qt Network Authorization module provides an implementation of OAuth and OAuth2 authenticathon methods for Qt."))) +(define-public qtnetworkauth + (package + (name "qtnetworkauth") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn")))) + (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"))) + (native-inputs (list perl)) + (inputs (list qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Network Authorization module") + (description "The Qt Network Authorization module provides an +implementation of OAuth and OAuth2 authenticathon methods for Qt.") + (license (package-license qtbase)))) + (define-public qtremoteobjects (package (inherit qtsvg-5) (name "qtremoteobjects") -- cgit v1.2.3 From a13a687989814380b65233f82a967c5475e33ad6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 17:34:45 -0400 Subject: gnu: Add qtpositioning. * gnu/packages/qt.scm (qtpositioning): New variable. --- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 16ce44035a..dc51e18c45 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1893,6 +1893,36 @@ (define-public qtscxml generating a C++ file that has a class implementing the state machine. It also contains functionality to support data models and executable content."))) +(define-public qtpositioning + (package + (name "qtpositioning") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively + (string-append #$output "/tests"))))))) + (inputs (list perl qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "QML and C++ positioning information API") + (description "The Qt Positioning API provides positioning information via +QML and C++ interfaces. The Qt Positioning API lets you to determine a +position by using a variety of possible sources, including satellite, wifi, or +text files. That information can then be used to, for example, determine a +position on a map. In addition, you can use to the API to retrieve satellite +information and perform area based monitoring.") + (license (package-license qtbase)))) + (define-public qtpurchasing (package (inherit qtsvg-5) (name "qtpurchasing") -- cgit v1.2.3 From bdf0fce88e9aeec059be60acc3e94aa4ac785997 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 12:20:21 -0400 Subject: gnu: libjami: Update to 20220726.1515.da8d1da. * gnu/packages/patches/jami-fix-crash-on-quit.patch: Delete file. * gnu/packages/patches/jami-images-loading.patch: Likewise. * gnu/packages/patches/jami-libclient-audio-managers.patch: Likewise. * gnu/packages/patches/jami-memory-usage.patch: Likewise. * gnu/local.mk (dist_patch_DATA): De-register removed patches. * gnu/packages/jami.scm (%jami-version): Update to 20220726.1515.da8d1da. (libjami)[configure-flags]: Add '--disable-static'. (jami-apply-custom-patches): Adjust for top directory renaming. (%ffmpeg-default-configure-flags): Add muxer support for g726 and g726le. Add demuxer support for g723_1, g726 and g726le. Add encoder/decoder support for g726, g726le and g723_1. Add decoder support for g729. (ffmpeg-jami)[patches]: Add 'libopusenc-reload-packet-loss-at-encode'. (jami-libclient)[native-inputs]: New field. [inputs]: Add ffmpeg-jami and libxkbcommon. [propagated-inputs]: Replace qtbase-5 with qtbase. --- gnu/local.mk | 4 - gnu/packages/jami.scm | 48 ++++--- gnu/packages/patches/jami-fix-crash-on-quit.patch | 34 ----- gnu/packages/patches/jami-images-loading.patch | 152 --------------------- .../patches/jami-libclient-audio-managers.patch | 23 ---- gnu/packages/patches/jami-memory-usage.patch | 70 ---------- 6 files changed, 29 insertions(+), 302 deletions(-) delete mode 100644 gnu/packages/patches/jami-fix-crash-on-quit.patch delete mode 100644 gnu/packages/patches/jami-images-loading.patch delete mode 100644 gnu/packages/patches/jami-libclient-audio-managers.patch delete mode 100644 gnu/packages/patches/jami-memory-usage.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 72637761d5..4f44e2f103 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1307,10 +1307,6 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \ - %D%/packages/patches/jami-fix-crash-on-quit.patch \ - %D%/packages/patches/jami-images-loading.patch \ - %D%/packages/patches/jami-memory-usage.patch \ - %D%/packages/patches/jami-libclient-audio-managers.patch \ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e5c29981d3..43bfb9dabe 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -51,7 +51,9 @@ (define-module (gnu packages jami) #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages webkit) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (gnu packages) @@ -64,7 +66,7 @@ (define-module (gnu packages jami) #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20211223.2.37be4c3") +(define %jami-version "20220726.1515.da8d1da") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the @@ -85,14 +87,10 @@ (define %jami-sources (for-each delete-file-recursively '("client-android" "client-ios" "client-macosx" - "client-uwp")))) - (patches (search-patches "jami-libclient-audio-managers.patch" - "jami-fix-crash-on-quit.patch" - "jami-images-loading.patch" - "jami-memory-usage.patch")) + "plugins")))) (sha256 (base32 - "12h4a0nj3gh05w64gkywrrb64agrhn6y3q4b9cqnhvr1vdkzlj0h")))) + "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg")))) ;; Jami maintains a set of patches for some key dependencies (currently ;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream. @@ -104,7 +102,7 @@ (define jami-apply-custom-patches (invoke "tar" "-xvf" #$%jami-sources "-C" patches-directory "--strip-components=5" - (string-append "ring-project/daemon/contrib/src/" + (string-append "jami-project/daemon/contrib/src/" dep-name)) (for-each (lambda (file) @@ -178,6 +176,8 @@ (define %ffmpeg-default-configure-flags "--disable-muxers" "--enable-muxer=rtp" "--enable-muxer=g722" + "--enable-muxer=g726" + "--enable-muxer=g726le" "--enable-muxer=h263" "--enable-muxer=h264" "--enable-muxer=hevc" @@ -202,6 +202,9 @@ (define %ffmpeg-default-configure-flags "--enable-demuxer=wav" "--enable-demuxer=ac3" "--enable-demuxer=g722" + "--enable-demuxer=g723_1" + "--enable-demuxer=g726" + "--enable-demuxer=g726le" "--enable-demuxer=pcm_mulaw" "--enable-demuxer=pcm_alaw" "--enable-demuxer=pcm_s16be" @@ -222,6 +225,13 @@ (define %ffmpeg-default-configure-flags ;; Encoders/decoders. "--enable-encoder=adpcm_g722" "--enable-decoder=adpcm_g722" + "--enable-encoder=adpcm_g726" + "--enable-decoder=adpcm_g726" + "--enable-encoder=adpcm_g726le" + "--enable-decoder=adpcm_g726le" + "--enable-decoder=g729" + "--enable-encoder=g723_1" + "--enable-decoder=g723_1" "--enable-encoder=rawvideo" "--enable-decoder=rawvideo" "--enable-encoder=libx264" @@ -387,7 +397,7 @@ (define-public ffmpeg-jami "change-RTCP-ratio" "rtp_ext_abs_send_time" "libopusdec-enable-FEC" - "libopusenc-enable-FEC" + "libopusenc-reload-packet-loss-at-encode" "screen-sharing-x11-fix")))))))))) (define-public libjami @@ -405,12 +415,13 @@ (define-public libjami #:tests? #f ;; The agent links the daemon binary with libguile, which enables the ;; execution of test plans described in Scheme. It may be useful in - ;; user scripts too, until more generalized Scheme bindings are made - ;; (see: test/agent/README.md). - ;; FIXME: Fails to link when building libjami as a shared library: - ;; bindings.cpp:(.text+0x24): undefined reference to `jami::Logger::log - ;; [...]. - #:configure-flags #~(list "--disable-agent" "--enable-debug") + ;; user scripts too, until more general purpose Scheme bindings are made + ;; available (see: test/agent/README.md). + #:configure-flags #~(list "--disable-agent" + "--enable-debug" + ;; Disable static libraries to avoid + ;; installing a 98 MiB archive. + "--disable-static") #:make-flags #~(list "V=1") ;build verbosely #:phases #~(modify-phases %standard-phases @@ -489,10 +500,9 @@ (define-public jami-libclient (lambda _ ;; Allow building from the tarball or a git checkout. (false-if-exception (chdir "lrc"))))))) - (inputs - (list libjami network-manager)) - (propagated-inputs - (list qtbase-5)) ;Qt is included in several installed headers + (native-inputs (list qttools vulkan-headers)) + (inputs (list ffmpeg-jami libjami libxkbcommon network-manager)) + (propagated-inputs (list qtbase)) ;qt included in several installed headers (synopsis "Jami client library") (description "This package provides a library common to all Jami clients. Jami is a secure and distributed voice, video and chat communication platform diff --git a/gnu/packages/patches/jami-fix-crash-on-quit.patch b/gnu/packages/patches/jami-fix-crash-on-quit.patch deleted file mode 100644 index c25bce588a..0000000000 --- a/gnu/packages/patches/jami-fix-crash-on-quit.patch +++ /dev/null @@ -1,34 +0,0 @@ -Retrieved from: -https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/83f68573324a453a6d26e025fd6439f175a79d1b.diff. - -With the 'client-qt' prefix added to match the file hierarchy of the release tarball. - -diff --git a/client-qt/src/mainapplication.cpp b/client-qt/src/mainapplication.cpp -index 0c3209fc6fa7c528bec197f1cf9332758170441c..278f19287b86dd2c916935ab0930cbe0abb35d26 100644 ---- a/client-qt/src/mainapplication.cpp -+++ b/client-qt/src/mainapplication.cpp -@@ -155,7 +155,11 @@ MainApplication::MainApplication(int& argc, char** argv) - QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); }); - } - --MainApplication::~MainApplication() {} -+MainApplication::~MainApplication() -+{ -+ engine_.reset(); -+ lrcInstance_.reset(); -+} - - bool - MainApplication::init() -diff --git a/src/mainapplication.h b/src/mainapplication.h -index 51306be829478b9fbc1c61a08aeb96938be26dac..4047e3abb3cfd3e6250387a37fa5a896e9bc4161 100644 ---- a/client-qt/src/mainapplication.h -+++ b/client-qt/src/mainapplication.h -@@ -80,7 +80,6 @@ private: - private: - QScopedPointer debugFile_; - QScopedPointer engine_; -- - QScopedPointer lrcInstance_; - - QScopedPointer connectivityMonitor_; diff --git a/gnu/packages/patches/jami-images-loading.patch b/gnu/packages/patches/jami-images-loading.patch deleted file mode 100644 index caf9e1e198..0000000000 --- a/gnu/packages/patches/jami-images-loading.patch +++ /dev/null @@ -1,152 +0,0 @@ -From be9dd0d0d8cb4556cd930edd783c0a1699565ac0 Mon Sep 17 00:00:00 2001 -From: kkostiuk -Date: Mon, 1 Nov 2021 17:39:23 -0400 -Subject: [PATCH] conversation: fix long loading time for images - -Change-Id: Id88cfbd571f4b504f258758bd13b4e4a91bf1b49 ---- - .../DataTransferMessageDelegate.qml | 52 +++++++++++++++++-- - src/messagesadapter.cpp | 20 +++++-- - src/messagesadapter.h | 2 +- - 3 files changed, 66 insertions(+), 8 deletions(-) - -diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -index 7875e01..2e7dcc0 100644 ---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -@@ -252,10 +252,11 @@ Loader { - Loader { - id: localMediaCompLoader - anchors.right: isOutgoing ? parent.right : undefined -+ asynchronous: true - width: sourceComponent.width - height: sourceComponent.height - sourceComponent: mediaInfo.isImage !== undefined ? -- imageComp : -+ imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp : - avComp - Component { - id: avComp -@@ -302,9 +303,9 @@ Loader { - } - } - Component { -- id: imageComp -+ id: animatedImageComp - AnimatedImage { -- id: img -+ id: animatedImg - anchors.right: isOutgoing ? parent.right : undefined - property real minSize: 192 - property real maxSize: 256 -@@ -327,6 +328,51 @@ Loader { - anchors.fill: parent - } - layer.enabled: true -+ layer.effect: OpacityMask { -+ maskSource: MessageBubble { -+ out: isOutgoing -+ type: seq -+ width: animatedImg.width -+ height: animatedImg.height -+ radius: msgRadius -+ } -+ } -+ HoverHandler { -+ target : parent -+ onHoveredChanged: { -+ localMediaMsgItem.hoveredLink = hovered ? animatedImg.source : "" -+ } -+ cursorShape: Qt.PointingHandCursor -+ } -+ } -+ } -+ -+ Component { -+ id: imageComp -+ Image { -+ id: img -+ anchors.right: isOutgoing ? parent.right : undefined -+ property real minSize: 192 -+ property real maxSize: 256 -+ cache: true -+ fillMode: Image.PreserveAspectCrop -+ mipmap: true -+ antialiasing: true -+ autoTransform: false -+ asynchronous: true -+ source: "file:///" + Body -+ property real aspectRatio: implicitWidth / implicitHeight -+ property real adjustedWidth: Math.min(maxSize, -+ Math.max(minSize, -+ innerContent.width - senderMargin)) -+ width: adjustedWidth -+ height: Math.ceil(adjustedWidth / aspectRatio) -+ Rectangle { -+ color: JamiTheme.previewImageBackgroundColor -+ z: -1 -+ anchors.fill: parent -+ } -+ layer.enabled: true - layer.effect: OpacityMask { - maskSource: MessageBubble { - out: isOutgoing -diff --git a/client-qt/src/messagesadapter.cpp b/client-qt/src/messagesadapter.cpp -index 91f8eed..ba38e53 100644 ---- a/client-qt/src/messagesadapter.cpp -+++ b/client-qt/src/messagesadapter.cpp -@@ -458,13 +458,24 @@ MessagesAdapter::conversationTypersUrlToName(const QSet& typersSet) - return nameList; - } - --bool -+QVariantMap - MessagesAdapter::isLocalImage(const QString& msg) - { - QImageReader reader; - reader.setDecideFormatFromContent(true); - reader.setFileName(msg); -- return !reader.read().isNull(); -+ QByteArray fileFormat = reader.format(); -+ if (fileFormat == "gif") { -+ return {{"isAnimatedImage", true}}; -+ } -+ QList supportedFormats = reader.supportedImageFormats(); -+ auto iterator = std::find_if(supportedFormats.begin(), -+ supportedFormats.end(), -+ [fileFormat](QByteArray format) { return format == fileFormat; }); -+ if (iterator != supportedFormats.end()) { -+ return {{"isImage", true}}; -+ } -+ return {{"isImage", false}}; - } - - QVariantMap -@@ -476,8 +487,9 @@ MessagesAdapter::getMediaInfo(const QString& msg) - "<%1 style='width:100%;height:%2;outline:none;background-color:#f1f3f4;" - "object-fit:cover;' " - "controls controlsList='nodownload' src='file://%3' type='%4'/>"; -- if (isLocalImage(msg)) { -- return {{"isImage", true}}; -+ QVariantMap fileInfo = isLocalImage(msg); -+ if (fileInfo["isImage"].toBool() || fileInfo["isAnimatedImage"].toBool()) { -+ return fileInfo; - } - QRegularExpression vPattern("[^\\s]+(.*?)\\.(avi|mov|webm|webp|rmvb)$", - QRegularExpression::CaseInsensitiveOption); -diff --git a/client-qt/src/messagesadapter.h b/client-qt/src/messagesadapter.h -index bfa4e62..1965c5e 100644 ---- a/client-qt/src/messagesadapter.h -+++ b/client-qt/src/messagesadapter.h -@@ -101,7 +101,7 @@ protected: - Q_INVOKABLE void deleteInteraction(const QString& interactionId); - Q_INVOKABLE void copyToDownloads(const QString& interactionId, const QString& displayName); - Q_INVOKABLE void userIsComposing(bool isComposing); -- Q_INVOKABLE bool isLocalImage(const QString& msg); -+ Q_INVOKABLE QVariantMap isLocalImage(const QString& msg); - Q_INVOKABLE QVariantMap getMediaInfo(const QString& msg); - Q_INVOKABLE bool isRemoteImage(const QString& msg); - Q_INVOKABLE QString getFormattedTime(const quint64 timestamp); --- -GitLab - diff --git a/gnu/packages/patches/jami-libclient-audio-managers.patch b/gnu/packages/patches/jami-libclient-audio-managers.patch deleted file mode 100644 index 1f8a5585e6..0000000000 --- a/gnu/packages/patches/jami-libclient-audio-managers.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f5e4619d02526d961c14012a6cae1a091aa149d4 Mon Sep 17 00:00:00 2001 -From: Sébastien Blin -Date: Thu, 27 Jan 2022 13:48:32 -0500 -Subject: [PATCH] misc: link getSupportedAudioManagers -q -Change-Id: I897e49cd131d3cbffef9fb1d5c9be3c0bc9bcb3f -GitLab: #495 ---- - -diff --git a/lrc/src/qtwrapper/configurationmanager_wrap.h b/lrc/src/qtwrapper/configurationmanager_wrap.h -index a680138..2807f8a 100644 ---- a/lrc/src/qtwrapper/configurationmanager_wrap.h -+++ b/lrc/src/qtwrapper/configurationmanager_wrap.h -@@ -526,8 +526,7 @@ - - QStringList getSupportedAudioManagers() - { -- QStringList temp; -- return temp; -+ return convertStringList(DRing::getSupportedAudioManagers()); - } - - QStringList getSupportedTlsMethod() diff --git a/gnu/packages/patches/jami-memory-usage.patch b/gnu/packages/patches/jami-memory-usage.patch deleted file mode 100644 index 75fcde8d0a..0000000000 --- a/gnu/packages/patches/jami-memory-usage.patch +++ /dev/null @@ -1,70 +0,0 @@ -From e796b3325d95b5ddd6162b5513c8325210f41fc5 Mon Sep 17 00:00:00 2001 -From: Sébastien Blin -Date: Wed, 26 Jan 2022 11:37:07 -0500 -Subject: [PATCH] datatransferimage: improve memory usage - -+ Reduce listview caching' size by 50% -+ use sourceSize to compress images and speedup loading -+ use autoTransform: true to rotate images when needed - -Change-Id: Idf1babdc73f43aa6a79b89428c25c5d06856c0ef -GitLab: #649 ---- - -diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -index d017c03..ca5913e 100644 ---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml -@@ -255,9 +255,13 @@ - asynchronous: true - width: sourceComponent.width - height: sourceComponent.height -- sourceComponent: mediaInfo.isImage !== undefined ? -- imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp : -- avComp -+ sourceComponent: { -+ if (mediaInfo.isImage) -+ return imageComp -+ if (mediaInfo.isAnimatedImage) -+ return animatedImageComp -+ return avComp -+ } - Component { - id: avComp - WebEngineView { -@@ -316,7 +320,7 @@ - fillMode: Image.PreserveAspectCrop - mipmap: true - antialiasing: true -- autoTransform: false -+ autoTransform: true - asynchronous: true - source: "file:///" + Body - property real aspectRatio: implicitWidth / implicitHeight -@@ -361,8 +365,10 @@ - fillMode: Image.PreserveAspectCrop - mipmap: true - antialiasing: true -- autoTransform: false -+ autoTransform: true - asynchronous: true -+ sourceSize.width: width -+ sourceSize.height: height - source: "file:///" + Body - property real aspectRatio: implicitWidth / implicitHeight - property real adjustedWidth: Math.min(maxSize, -diff --git a/client-qt/src/mainview/components/MessageListView.qml b/client-qt/src/mainview/components/MessageListView.qml -index 2b7c326..f65e67b 100644 ---- a/client-qt/src/mainview/components/MessageListView.qml -+++ b/client-qt/src/mainview/components/MessageListView.qml -@@ -174,8 +174,8 @@ - width: parent.width - // this offscreen caching is pretty huge - // displayMarginEnd may be removed -- displayMarginBeginning: 4096 -- displayMarginEnd: 4096 -+ displayMarginBeginning: 2048 -+ displayMarginEnd: 2048 - maximumFlickVelocity: 2048 - verticalLayoutDirection: ListView.BottomToTop - boundsBehavior: Flickable.StopAtBounds -- cgit v1.2.3 From 3d812fea06432db6ae31e5cc1ca454097cc09d60 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 15:49:35 -0400 Subject: gnu: libjami: Enable test agent. * gnu/packages/jami.scm (libjami)[configure-flags]: Add '--enable-agent' and remove FIXME. [tests?]: Update comment. --- gnu/packages/jami.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 43bfb9dabe..7269b06a33 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -409,15 +409,17 @@ (define-public libjami (build-system gnu-build-system) (arguments (list - ;; The test suite fails to link when building libjami as a shared library: - ;; "testAccount_factory.cpp:(.text+0xc52): undefined reference to - ;; `jami::AccountFactory::AccountFactory()'. + ;; The test suite fails to link when building libjami as a shared + ;; library: "sip_account/sip_empty_offer.cpp:228:1: error: no + ;; declaration matches ‘void + ;; jami::test::SipEmptyOfferTest::onCallStateChange(const string&, const + ;; string&, jami::test::CallData&)’". #:tests? #f ;; The agent links the daemon binary with libguile, which enables the ;; execution of test plans described in Scheme. It may be useful in ;; user scripts too, until more general purpose Scheme bindings are made ;; available (see: test/agent/README.md). - #:configure-flags #~(list "--disable-agent" + #:configure-flags #~(list "--enable-agent" "--enable-debug" ;; Disable static libraries to avoid ;; installing a 98 MiB archive. -- cgit v1.2.3 From 46f5623cc19805c8d65011b2650be85156769c86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 16:41:55 -0400 Subject: gnu: Remove jami-libclient. * gnu/packages/jami.scm (jami-libclient): Delete variable. (libringclient): Likewise. (jami-gnome)[inputs]: Remove jami-libclient. (jami)[inputs]: Likewise. --- gnu/packages/jami.scm | 48 +----------------------------------------------- 1 file changed, 1 insertion(+), 47 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 7269b06a33..de80c8a64f 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -474,50 +474,6 @@ (define-public libjami (define-public libring (deprecated-package "libring" libjami)) -;;; Note: this package will eventually be absorbed into jami itself (the Qt -;;; client). -(define-public jami-libclient - (package - (name "jami-libclient") - (version %jami-version) - (source %jami-sources) - (build-system cmake-build-system) - (outputs '("out" "debug")) - (arguments - (list - #:tests? #f ;no test suite - #:configure-flags - #~(list (string-append "-DRING_XML_INTERFACES_DIR=" - #$(this-package-input "libjami") - "/share/dbus-1/interfaces") - (string-append "-DRING_BUILD_DIR=" - #$(this-package-input "libjami") - "/include") - ;; Call to the libraries directly instead of going through DBus - ;; to avoid issues (see: https://issues.guix.gnu.org/48538). - "-DENABLE_LIBWRAP=true") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory/maybe - (lambda _ - ;; Allow building from the tarball or a git checkout. - (false-if-exception (chdir "lrc"))))))) - (native-inputs (list qttools vulkan-headers)) - (inputs (list ffmpeg-jami libjami libxkbcommon network-manager)) - (propagated-inputs (list qtbase)) ;qt included in several installed headers - (synopsis "Jami client library") - (description "This package provides a library common to all Jami clients. -Jami is a secure and distributed voice, video and chat communication platform -that requires no centralized server and leaves the power of privacy in the -hands of the user. It supports the SIP and IAX protocols, as well as -decentralized calling using P2P-DHT.") - (home-page "https://jami.net") - (license license:gpl3+))) - -;;; Remove when 2023 comes. -(define-public libringclient - (deprecated-package "libringclient" jami-libclient)) - (define-public jami-gnome (package (name "jami-gnome") @@ -557,7 +513,6 @@ (define-public jami-gnome (list clutter clutter-gtk gtk+ - jami-libclient libcanberra libappindicator libnotify @@ -612,8 +567,7 @@ (define-public jami (native-inputs (list pkg-config python qttools-5 doxygen graphviz)) (inputs - (list jami-libclient - libnotify + (list libnotify network-manager qrencode qtsvg-5 -- cgit v1.2.3 From f80f1667f1fe199fe89202da29da056195ca301b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 16:42:49 -0400 Subject: gnu: Deprecate jami-gnome for jami. * gnu/packages/jami.scm (jami-gnome): Delete package, deprecating it for jami. --- gnu/packages/jami.scm | 63 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index de80c8a64f..f99cd2f14c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -474,65 +474,6 @@ (define-public libjami (define-public libring (deprecated-package "libring" libjami)) -(define-public jami-gnome - (package - (name "jami-gnome") - (version %jami-version) - (source %jami-sources) - (outputs '("out" "debug")) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ;no test suite - #:imported-modules (,@%cmake-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix gtk:) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory/maybe - (lambda _ - ;; Allow building from the tarball or a git checkout. - (false-if-exception (chdir "client-gnome")))) - (add-after 'change-directory/maybe 'fix-webkit-detection - (lambda _ - (substitute* "CMakeLists.txt" - (("WEBKIT webkit2gtk-4.0") - "WEBKIT webkit2gtk-4.1")))) - (add-after 'change-directory/maybe 'fix-version-string - (lambda _ - (substitute* "CMakeLists.txt" - (("^# Set VERSION.*" anchor) - (string-append anchor - "set(PROJECT_VERSION \"" ,version "\")\n"))))) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap))))) - (inputs - (list clutter - clutter-gtk - gtk+ - libcanberra - libappindicator - libnotify - network-manager - qrencode - sqlite - webkitgtk)) - (native-inputs - (list pkg-config - gettext-minimal - `(,glib "bin"))) ;for glib-compile-resources - (synopsis "Jami client for GNOME") - (description "This package provides a Jami client for the GNOME desktop. -Jami is a secure and distributed voice, video and chat communication platform -that requires no centralized server and leaves the power of privacy in the -hands of the user. It supports the SIP and IAX protocols, as well as -decentralized calling using P2P-DHT.") - (home-page "https://jami.net") - (license license:gpl3+))) - (define-public jami (package (name "jami") @@ -587,6 +528,10 @@ (define-public jami P2P-DHT.") (license license:gpl3+))) +;;; Remove when 2023 comes. +(define-public jami-gnome + (deprecated-package "jami-gnome" jami)) + ;;; Remove when 2023 comes. (define-public jami-qt (deprecated-package "jami-qt" jami)) -- cgit v1.2.3 From ccf6401d050ab90afba35d6491692338d84c9f4d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 16:46:42 -0400 Subject: gnu: jami: Update to 20220726.1515.da8d1da. * gnu/packages/jami.scm (jami): Update to 20220726.1515.da8d1da. [configure-flags]: New argument. [phases]{fix-version-string}: Adjust file name. {use-desktop-opengl}: Delete obsolete phase. {patch-source}: New phase. [native-inputs]: Add googletest and vulkan-headers. Replace qttools-5 with qttools. [inputs]: Add libxkbcommon, qt5compat, qtnetworkauth, qtpositioning and vulkan-loader. Remove qtwebengine-5, qtwebchannel-5, qtgraphicaleffects, qtquickcontrols-5 and qtquickcontrols2-5. Update qtsvg-5, qtmultimedia-5 and qtdeclarative-5 to their Qt 6 equivalent. --- gnu/packages/jami.scm | 91 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 33 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index f99cd2f14c..26afed0cc5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -482,43 +482,68 @@ (define-public jami (build-system qt-build-system) (outputs '("out" "debug")) (arguments - `(#:tests? #f ;no test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'change-directory/maybe - (lambda _ - ;; Allow building from the tarball or a git checkout. - (false-if-exception (chdir "client-qt")))) - (add-after 'change-directory/maybe 'fix-version-string - (lambda _ - (substitute* "src/version.h" - (("VERSION_STRING") - "BUILD_DATE") ;to avoid a redefinition error - (("// clang-format on.*" anchor) - (string-append "const char VERSION_STRING[] = \"" - ,version "\";\n" - anchor))))) - (add-after 'change-directory/maybe 'use-desktop-opengl - ;; TODO: Remove after next release; this is no longer specified in - ;; the source following the update to Qt 6. - (lambda _ - (substitute* "src/main.cpp" - (("Qt::AA_UseOpenGLES") - "Qt::AA_UseDesktopOpenGL"))))))) + (list + #:qtbase qtbase + #:tests? #f ;see comment below + #:configure-flags + ;; The test suite fails to build with: + ;; "../../../client-qt/src/app/utils.h:29:10: fatal error: QLabel: No + ;; such file or directory". + #~(list "-DENABLE_TESTS=OFF" + "-DWITH_WEBENGINE=OFF" ;reduce transitive closure size by 450 MiB + ;; Use libwrap to link directly to libjami instead of + ;; communicating via D-Bus to jamid, the Jami daemon. + "-DENABLE_LIBWRAP=ON" + (string-append "-DLIBJAMI_XML_INTERFACES_DIR=" + #$(this-package-input "libjami") + "/share/dbus-1/interfaces") + (string-append "-DLIBJAMI_INCLUDE_DIR=" + #$(this-package-input "libjami") "/include/jami")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory/maybe + (lambda _ + ;; Allow building from the tarball or a git checkout. + (false-if-exception (chdir "client-qt")))) + (add-after 'change-directory/maybe 'fix-version-string + (lambda _ + (substitute* "src/app/version.h" + (("VERSION_STRING") + "BUILD_DATE") ;to avoid a redefinition error + (("// clang-format on.*" anchor) + (string-append "const char VERSION_STRING[] = \"" + #$version "\";\n" + anchor))))) + (add-after 'change-directory/maybe 'patch-source + (lambda _ + (substitute* "src/libclient/CMakeLists.txt" + ;; Fix submitted upstream (see: + ;; https://review.jami.net/c/jami-client-qt/+/21830). + (("target_link_libraries\\(\\$\\{LIBCLIENT_NAME} qtwrapper.*" all) + (string-append + all " target_link_libraries(${LIBCLIENT_NAME} avutil)\n")))))))) (native-inputs - (list pkg-config python qttools-5 doxygen graphviz)) + (list googletest + pkg-config + python + qttools + doxygen + graphviz + vulkan-headers)) (inputs - (list libnotify + (list ffmpeg-jami + libjami + libnotify + libxkbcommon network-manager qrencode - qtsvg-5 - qtwebengine-5 - qtwebchannel-5 - qtmultimedia-5 - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols-5 - qtquickcontrols2-5)) + qt5compat + qtdeclarative + qtmultimedia + qtnetworkauth + qtpositioning + qtsvg + vulkan-loader)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure -- cgit v1.2.3 From 3a656ea836f87f30f1b34852cb4efc911363d2b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 31 Jul 2022 23:07:13 -0400 Subject: gnu: jami: Apply upstream patch that fixes a usability issue. * gnu/packages/patches/jami-fix-esc-bug.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/jami.scm (%jami-sources): Apply it. --- gnu/local.mk | 1 + gnu/packages/jami.scm | 3 ++- gnu/packages/patches/jami-fix-esc-bug.patch | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/jami-fix-esc-bug.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 4f44e2f103..bba9f08bbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1304,6 +1304,7 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ + %D%/packages/patches/jami-fix-esc-bug.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/jsoncpp-pkg-config-version.patch \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 26afed0cc5..95c0052841 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -90,7 +90,8 @@ (define %jami-sources "plugins")))) (sha256 (base32 - "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg")))) + "1zx0i9aw8jsba3bjc5r4pkkybm8c0lyz420ciq89vsswd48gfdhg")) + (patches (search-patches "jami-fix-esc-bug.patch")))) ;; Jami maintains a set of patches for some key dependencies (currently ;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream. diff --git a/gnu/packages/patches/jami-fix-esc-bug.patch b/gnu/packages/patches/jami-fix-esc-bug.patch new file mode 100644 index 0000000000..6d78542f1e --- /dev/null +++ b/gnu/packages/patches/jami-fix-esc-bug.patch @@ -0,0 +1,24 @@ +This fixes the issue where pressing the ESC key would hide the Jami +GUI on systems lacking a notification tray. + +From 47fd4c38ddd8bd350319ce9bb750ca496826e655 Mon Sep 17 00:00:00 2001 +From: Sébastien Blin +Date: Fri, 29 Jul 2022 21:24:01 -0400 +Subject: [PATCH] layoutmanager: fix popFullScreenItem + +Change-Id: I79780d4ad570846e6f3c52734dd627bcd0e11327 +--- + +diff --git a/src/app/LayoutManager.qml b/src/app/LayoutManager.qml +index 98516ce..87f13ac 100644 +--- a/client-qt/src/app/LayoutManager.qml ++++ b/client-qt/src/app/LayoutManager.qml +@@ -176,7 +176,7 @@ + + // Only leave fullscreen mode if our window isn't in fullscreen + // mode already. +- if (priv.fullScreenItems.length === 0) { ++ if (priv.fullScreenItems.length === 0 && priv.windowedVisibility !== Window.Hidden) { + // Simply recall the last visibility state. + visibility = priv.windowedVisibility + } -- cgit v1.2.3 From a69f2cd0769d2f1323773dfb921c527037e9d5ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Aug 2022 12:44:04 +0200 Subject: gnu: python-umap-learn: Set NUMBA_CACHE_DIR. * gnu/packages/machine-learning.scm (python-umap-learn)[arguments]: Add phase to set NUMBA_CACHE_DIR. --- gnu/packages/machine-learning.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index b19af8a1d5..1f85aa290f 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2750,6 +2750,10 @@ (define-public python-umap-learn (list #:phases #~(modify-phases %standard-phases + ;; Numba needs a writable dir to cache functions. + (add-before 'check 'set-numba-cache-dir + (lambda _ + (setenv "NUMBA_CACHE_DIR" "/tmp"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- cgit v1.2.3 From 9b1a2dcd5be13c89efff8c448c1a861d81d221ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Aug 2022 12:44:44 +0200 Subject: gnu: python-umap-learn: Disable unreliable test. * gnu/packages/machine-learning.scm (python-umap-learn)[arguments]: Disable test_densmap_trustworthiness_on_iris_supervised. --- gnu/packages/machine-learning.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 1f85aa290f..cd0640cd27 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2758,7 +2758,10 @@ (define-public python-umap-learn (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") - (invoke "pytest" "-vv" "umap"))))))) + (invoke "pytest" "-vv" "umap" + ;; This test can fail because trust may only be + ;; 0.9679405204460967 >= 0.97 + "-k" "not test_densmap_trustworthiness_on_iris_supervised"))))))) (native-inputs (list python-pytest)) (propagated-inputs (list python-numba -- cgit v1.2.3 From dc3ad40c6b1023785352bd995fd1bee2ba9e2770 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Aug 2022 12:45:22 +0200 Subject: gnu: python-bbknn: Set NUMBA_CACHE_DIR. * gnu/packages/bioinformatics.scm (python-bbknn)[arguments]: Add phase 'set-numba-cache-dir. --- gnu/packages/bioinformatics.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e9f7ab9e98..4a8a743eba 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11857,6 +11857,10 @@ (define-public python-bbknn `(#:tests? #f ; no tests are included #:phases (modify-phases %standard-phases + ;; Numba needs a writable dir to cache functions. + (add-before 'check 'set-numba-cache-dir + (lambda _ + (setenv "NUMBA_CACHE_DIR" "/tmp"))) (add-after 'unpack 'do-not-fail-to-find-sklearn (lambda _ ;; XXX: I have no idea why it cannot seem to find sklearn. -- cgit v1.2.3 From 5a96748a9975e5144f07ad8178097f8e6146f197 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Aug 2022 11:17:40 +0200 Subject: gnu: gnutls: Add 3.7.7. * gnu/packages/tls.scm (gnutls-latest): New variable. --- gnu/packages/tls.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 1ee5400a9c..697d9d1d36 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -329,6 +329,23 @@ (define-public gnutls (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +(define-public gnutls-latest + ;; Version 3.7.7 introduces 'set-session-record-port-close!', which allows + ;; us to get rid of the wrapper port in 'tls-wrap'. + (package + (inherit gnutls) + (version "3.7.7") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + (patches (search-patches "gnutls-skip-trust-store-test.patch" + "gnutls-cross.patch")) + (sha256 + (base32 + "01i1gl15k6qwvxmxx0by1mn9nlmcmym18wdpm7dn9awfsp8474dy")))))) + (define-public gnutls/guile-2.0 ;; GnuTLS for Guile 2.0. (package/inherit gnutls -- cgit v1.2.3 From 6ad9a094c1a25a4aa1df559943f9bc6ca8870752 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Jul 2022 22:00:44 +0100 Subject: gnu: Add libsep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm: (libsep): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index acac8449ab..7718e92efa 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1131,6 +1131,48 @@ (define-public libnova (license (list license:lgpl2.0+ license:gpl2+)))) ; examples/transforms.c & lntest/*.c +(define-public libsep + (package + (name "libsep") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kbarbary/sep") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sag96am6r1ffh9860yq40js874362v3132ahlm6sq7padczkicf")))) + (build-system cmake-build-system) + (arguments + (list + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (chdir "../source") + (invoke "make" + (string-append "CC=" #$(cc-for-target)) + "test"))))))) + (native-inputs + (list python-wrapper)) + (home-page "https://github.com/kbarbary/sep") + (synopsis "Astronomical source extraction and photometry library") + (description + "SEP makes the core algorithms of +@url{https://www.astromatic.net/software/sextractor/, sextractor} available as a +library of stand-alone functions and classes. These operate directly on +in-memory arrays (no FITS files or configuration files). The code is derived +from the Source Extractor code base (written in C) and aims to produce results +compatible with Source Extractor whenever possible. SEP consists of a C library +with no dependencies outside the standard library, and a Python module that +wraps the C library in a Pythonic API. The Python wrapper operates on NumPy +arrays with NumPy as its only dependency.") + (license (list license:expat license:lgpl3+ license:bsd-3)))) + (define-public libskry (package (name "libskry") -- cgit v1.2.3 From d790ec21e8530f230a371d542686f5caf956438e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Jul 2022 22:12:30 +0100 Subject: gnu: python-sep: Update to 1.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm: (python-sep): Update to 1.2.1. Inherit from libsep Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 7718e92efa..b721bd03ec 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1650,27 +1650,18 @@ (define-public python-pyerfa (define-public python-sep (package + (inherit libsep) (name "python-sep") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sep" version)) - (sha256 - (base32 "0wxdqn92q1grv8k7xi7h88ac6wnznw4xh5bdlz1vz6za2dgsyj4m")))) (build-system python-build-system) + (arguments + (strip-keyword-arguments + '(#:make-flags) (package-arguments libsep))) (native-inputs - (list python-cython python-pytest)) - (inputs - (list python-numpy)) - (home-page "https://github.com/kbarbary/sep") - (synopsis "Astronomical source extraction and photometry library") - (description - "SEP makes the core algorithms of Source Extractor available as a library -of stand-alone functions and classes.") - (license (list license:bsd-3 - license:expat - license:lgpl3+)))) + (modify-inputs (package-inputs libsep) + (prepend python-cython))) + (propagated-inputs + (modify-inputs (package-inputs libsep) + (prepend python-numpy))))) (define-public python-asdf (package -- cgit v1.2.3 From 4f57da766812ce9ce0c9b924c04a6ad907022a24 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 24 Jul 2022 02:09:14 +0200 Subject: gnu: Add cardpeek. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (cardpeek): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/security-token.scm | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 84bd92b6f7..ef7085d35e 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2021 Ahmad Jarara ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Petr Hodina +;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,12 +56,14 @@ (define-module (gnu packages security-token) #:use-module (gnu packages documentation) #:use-module (gnu packages dns) #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages networking) #:use-module (gnu packages cyrus-sasl) @@ -919,3 +922,48 @@ (define-public libfido2 libfido2 supports the FIDO U2F (CTAP 1) and FIDO 2.0 (CTAP 2) protocols.") (license license:bsd-2) (home-page "https://github.com/Yubico/libfido2"))) + +(define-public cardpeek + (package + (name "cardpeek") + (version "0.8.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/L1L1/cardpeek") + (commit (string-append "cardpeek-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588")))) + (inputs (list curl + gtk+ + lua-5.2 + openssl + pcsc-lite + readline)) + (native-inputs (list autoconf + automake + `(,glib "bin") ;for glib-compile-resources + libtool + pkg-config)) + (build-system gnu-build-system) + (synopsis "Tool to read the contents of various smart cards") + (description + "Cardpeek is a graphical tool to read the contents of ISO7816 smart cards. +It is extensible with the LUA scripting language. + +It supports the following type of cards: +@itemize +@item Bank cards (VISA, MasterCard, CB and UK Post Office Account cards) +@item Passports and the Belgian identity card +@item Transport cards (Navigo, MOBIB, RavKav and VIVA cards) +@item Older GSM SIM cards without USIM data +@item Vitale 2 Health card +@item Moneo Electronic purse card +@item Driver Tachograph cards +@item OpenPGP Cards (beta) +@end itemize +It also has limited support for Mifare Classic compatible cards (Thalys card)") + (license license:gpl3+) + (home-page "http://pannetrat.com/Cardpeek"))) -- cgit v1.2.3 From 49000523d22e31334525fedb9a8913dd8f2e21a0 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 24 Jul 2022 03:33:51 +0200 Subject: gnu: xdot: Build with librsvg-for-system. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graphviz.scm (xdot)[inputs]: Replace librsvg with librsvg-for-system. Signed-off-by: Ludovic Courtès --- gnu/packages/graphviz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 68d0741957..a49fe348e8 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Giacomo Leidi ;;; Copyright © 2021 Justin Veilleux +;;; Copyright © 2021 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -350,7 +351,7 @@ (define-public xdot (,(dirname (search-input-file inputs "bin/dot")))))))))) (inputs (list atk - librsvg + (librsvg-for-system) harfbuzz graphviz gtk+ -- cgit v1.2.3 From dee64d4776e6d97f10b71d3484dff5f350af63c3 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Sun, 24 Jul 2022 19:34:31 +0800 Subject: gnu: guile-lens: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-lens) [phases]{run-hall}: replace "dist" to "build-system". Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0717acf83b..dd28e38a20 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2022 Taiju HIGASHI +;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3944,7 +3945,7 @@ (define-public guile-lens (add-after 'unpack 'run-hall (lambda _ (setenv "HOME" "/tmp") ; for ~/.hall - (invoke "hall" "dist" "-x")))))) + (invoke "hall" "build-system" "-x")))))) (native-inputs (list autoconf automake -- cgit v1.2.3 From e0de48f0e4a88a095bef9981df8dd3fd1f55b03e Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 24 Jul 2022 12:11:36 +0000 Subject: gnu: hdf5-1.8: Add missing comma to linker flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (hdf5-1.8)[arguments]<#:phases>: Add missing comma to linker flag. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 89f98ec2b6..0795222ca8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1324,7 +1324,7 @@ (define-public hdf5-1.8 (("/bin/mv") "mv")) (substitute* "fortran/src/Makefile.in" (("libhdf5_fortran_la_LDFLAGS =") - (string-append "libhdf5_fortran_la_LDFLAGS = -Wl-rpath=" + (string-append "libhdf5_fortran_la_LDFLAGS = -Wl,-rpath=" (assoc-ref outputs "fortran") "/lib"))) (substitute* "hl/fortran/src/Makefile.in" (("libhdf5hl_fortran_la_LDFLAGS =") -- cgit v1.2.3 From d1b60cb65b6cb31e814bbbe19c5ece6b1edd21cc Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 24 Jul 2022 12:19:41 +0000 Subject: gnu: Add comma after “i.e.” in descriptions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioconductor.scm (r-anota)[description]: Add comma after “i.e.”. * gnu/packages/code.scm (xenon)[description]: Same. * gnu/packages/cran.scm (r-crosstalk)[description]: Same. * gnu/packages/python-xyz.scm (python-radon)[description]: Same. * gnu/packages/statistics.scm (r-logspline)[description]: Same. * gnu/packages/suckless.scm (tabbed)[description]: Same. Signed-off-by: Ludovic Courtès --- gnu/packages/bioconductor.scm | 2 +- gnu/packages/code.scm | 2 +- gnu/packages/cran.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/suckless.scm | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 31484799b2..8a3a38b36f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8834,7 +8834,7 @@ (define-public r-anota the mRNA level (e.g. cytosolic mRNA level) and the level of mRNA actively involved in translation (the actively translating mRNA level) for each mRNA. The standard analysis of such data strives towards identifying differential -translational between two or more sample classes - i.e. differences in +translational between two or more sample classes - i.e., differences in actively translated mRNA levels that are independent of underlying differences in cytosolic mRNA levels. This package allows for such analysis using partial variances and the random variance model. As 10s of thousands of mRNAs are diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 64040270eb..11df6fd4b2 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1067,7 +1067,7 @@ (define-public xenon "Xenon is a monitoring tool based on Radon. It monitors code complexity. Ideally, @code{xenon} is run every time code is committed. Through command line options, various thresholds can be set for the complexity of code. It -will fail (i.e. it will exit with a non-zero exit code) when any of these +will fail (i.e., it will exit with a non-zero exit code) when any of these requirements is not met.") (license license:expat))) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 731facb4e5..a677360700 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3315,7 +3315,7 @@ (define-public r-crosstalk (synopsis "Inter-widget interactivity for HTML widgets") (description "This package provides building blocks for allowing HTML widgets to -communicate with each other, with Shiny or without (i.e. static @code{.html} +communicate with each other, with Shiny or without (i.e., static @code{.html} files). It currently supports linked brushing and filtering.") (license license:expat))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 216970ace9..8f409a4b7d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19659,7 +19659,7 @@ (define-public python-radon Supported metrics are: @itemize @bullet @item raw metrics: SLOC, comment lines, blank lines, &c. - @item Cyclomatic Complexity (i.e. McCabe’s Complexity) + @item Cyclomatic Complexity (i.e., McCabe’s Complexity) @item Halstead metrics (all of them) @item the Maintainability Index (a Visual Studio metric) @end itemize") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0e977698d7..1ef7efe266 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6624,7 +6624,7 @@ (define-public r-logspline (description "Contains routines for logspline density estimation. The function @code{oldlogspline()} uses the same algorithm as the logspline package version -1.0.x; i.e. the Kooperberg and Stone (1992) algorithm (with an improved +1.0.x; i.e., the Kooperberg and Stone (1992) algorithm (with an improved interface). The recommended routine @code{logspline()} uses an algorithm from @url{doi:10.1214/aos/1031594728,Stone et al (1997)}.") (license license:asl2.0))) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 8dd8f76143..460e8bfc0f 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -122,7 +122,7 @@ (define-public tabbed (synopsis "Tab interface for application supporting Xembed") (description "Tabbed is a generic tabbed frontend to xembed-aware applications. It was originally designed for surf but also usable with many -other applications, i.e. st, uzbl, urxvt and xterm.") +other applications, i.e., st, uzbl, urxvt and xterm.") (license ;; Dual-licensed. (list -- cgit v1.2.3 From 432ea6446dd52a5ce04ef9a1c6874656c4c3dc84 Mon Sep 17 00:00:00 2001 From: Danial Behzadi Date: Mon, 25 Jul 2022 12:33:51 +0430 Subject: gnu: tractor: Update to 3.14. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tor.scm (tractor): Update to 3.14. Signed-off-by: Ludovic Courtès --- gnu/packages/tor.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 452e41bf83..613575ae0e 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 André Batista -;;; Copyright © 2021 Danial Behzadi +;;; Copyright © 2021-2022 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -427,14 +427,14 @@ (define-public nyx (define-public tractor (package (name "tractor") - (version "3.13") + (version "3.14") (source (origin (method url-fetch) (uri (pypi-uri "traxtor" version)) (sha256 (base32 - "0r8zzaia1s678d39cpqjfpb72fwc46lfwnz1rb043hi6grd39jl7")))) + "06jhsg179rfckagrpk9r8wqp44anf1bchm3ins2saf5806f0n5lw")))) (build-system python-build-system) (native-inputs `(("glib:bin" ,glib "bin"))) ; for glib-compile-schemas. -- cgit v1.2.3 From d7ab54cdb1021e003bb335baa2aee9cc32d747c7 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:39:23 -0400 Subject: gnu: Add python-biblib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-biblib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8f409a4b7d..6fd18bfa35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -124,6 +124,7 @@ ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ +;;; Copyright © 2022 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -30203,3 +30204,32 @@ (define-public python-bsdiff4 binary diff utility. It also provides two command-line tools, @code{bsdiff4} and @code{bspatch4}.") (license license:bsd-2))) + +(define-public python-biblib + (let ((upstream-version "0.1.0") + (commit "ab0e857b9198fe425ec9b02fcc293b5d9fd0c406") + (revision "1")) + (package + (name "python-biblib") + (version (git-version upstream-version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aclements/biblib") + (commit commit))) + (sha256 + (base32 "1ym1gwxys9gl5a7fjs6xh5z9w50pnq4z3rs6fx7kpv78hlrbjlip")) + (file-name (git-file-name name version)))) + (build-system python-build-system) + (home-page "https://github.com/aclements/biblib") + (synopsis "BibTeX parsing and transformation library") + (description + "Biblib provides a simple, standalone Python 3 package for parsing +BibTeX bibliographic databases, as well as algorithms for manipulating BibTeX +entries in BibTeX-y ways. Biblib's parser is derived directly from the WEB +source code for BibTeX and hence (barring bugs in translation) should be fully +compatible with BibTeX's own parser.") + ;; N.B. It seems the parser was translated from WEB by hand: this + ;; package does not contain any generated files. + (license license:expat)))) -- cgit v1.2.3 From b8df15b748024128e09cebb4d7ebae42be5df788 Mon Sep 17 00:00:00 2001 From: Marcel van der Boom Date: Mon, 25 Jul 2022 21:47:33 +0200 Subject: gnu: exiv2: Fix test failure on ppc64le and aarch64. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ppc64 and aarch64 do not raise exception and thus output and exit code for test is different. See: https://github.com/Exiv2/exiv2/issues/365 and https://github.com/Exiv2/exiv2/issues/933 * gnu/packages/image.scm (exiv2)[arguments]: Add 'adjust-tests' phase. Co-authored-by: Ludovic Courtès --- gnu/packages/image.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4b31ba41a0..1b88c7be83 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1346,7 +1346,7 @@ (define-public exiv2 (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")))) (build-system cmake-build-system) (arguments - '(#:test-target "tests" + `(#:test-target "tests" #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" ;; darktable needs BMFF to support ;; CR3 files. @@ -1357,7 +1357,19 @@ (define-public exiv2 (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) - (for-each delete-file (find-files lib "\\.a$")))))))) + (for-each delete-file (find-files lib "\\.a$"))))) + + ,@(if (or (target-ppc64le?) (target-aarch64?)) + '((add-after 'unpack 'adjust-tests + (lambda _ + ;; Adjust test on ppc64 and aarch64, where no exception + ;; is raised and thus the return value is different. See + ;; and + ;; . + (substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" + (("\\$uncaught_exception \\$addition_overflow_message\n") "") + (("retval = \\[1\\]") "retval = [0]"))))) + '())))) (propagated-inputs (list expat zlib)) (native-inputs -- cgit v1.2.3 From 8d7a7214001967dd3b8732acc04da87a5687c91b Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Wed, 27 Jul 2022 10:17:42 +0200 Subject: gnu: Add r-millefy. * gnu/packages/bioinformatics.scm (r-millefy): New variable. --- gnu/packages/bioinformatics.scm | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4a8a743eba..edbae757e2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2017, 2021, 2022 Arun Isaac ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019, 2020, 2021 Mădălin Ionel Patrașcu +;;; Copyright © 2018, 2019, 2020, 2021, 2022 Mădălin Ionel Patrașcu ;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 Brett Gilio @@ -7525,6 +7525,41 @@ (define-public r-scde ;; See https://github.com/hms-dbmi/scde/issues/38 (license license:gpl2))) +(define-public r-millefy + (package + (name "r-millefy") + (version "0.1.9-beta") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yuifu/millefy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0z2y0x99f761pxvg6n37cmnyrnj699jhjk43pvk05sa86iykgizl")))) + (properties `((upstream-name . "millefy"))) + (build-system r-build-system) + (propagated-inputs + (list r-data-table + r-destiny + r-dplyr + r-genomicranges + r-iranges + r-magrittr + r-rsamtools + r-rtracklayer + r-tidyr)) + (home-page "https://github.com/yuifu/millefy") + (synopsis "Make millefy plot with single-cell RNA-seq data") + (description "@code{Millefy} is a tool for visualizing read coverage of +@dfn{scRNA-seq}(single-cell RNA sequencing) datasets in genomic contexts. By +dynamically and automatically reorder single cells based on locus-specific +pseudo time, @code{Millefy} highlights cell-to-cell heterogeneity in read coverage +of scRNA-seq data.") + (license license:expat))) + (define-public r-misha (package (name "r-misha") -- cgit v1.2.3 From aea756ea3312ba7e8229804492ba12001c8de568 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Aug 2022 09:12:39 -0400 Subject: gnu: qutebrowser: Fix build. Fixes , which is a regression introduced with a0beb297a352930b89051ff258a06d78f224d6b9. * gnu/packages/web-browsers.scm (qutebrowser) [phases]{wrap-qt-process-path}: Do not use the (no longer valid) "qtwebengine-5" label; instead, locate QtWebEngineProcess via 'search-input-file'. Reported-by: Jack Hill --- gnu/packages/web-browsers.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index f47db2e752..03d5311131 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -540,13 +540,10 @@ (define-public qutebrowser (string-append out "/share/qutebrowser/userscripts"))))))) (add-after 'wrap 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/qutebrowser")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (wrap-program (search-input-file outputs "bin/qutebrowser") + `("QTWEBENGINEPROCESS_PATH" = + (,(search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))))))))) (home-page "https://qutebrowser.org/") (synopsis "Minimal, keyboard-focused, vim-like web browser") (description "qutebrowser is a keyboard-focused browser with a minimal -- cgit v1.2.3 From c454cf6343cf32a542f9593df9318b4f5ca9b019 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Aug 2022 09:15:40 -0400 Subject: gnu: qutebrowser: Fix indentation. * gnu/packages/web-browsers.scm (qutebrowser): Fix indentation. --- gnu/packages/web-browsers.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 03d5311131..4a8333fae4 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -479,7 +479,7 @@ (define-public qutebrowser (base32 "1g7dfrnjgifvbmz1523iq9qxhrsciajr8dv3pak6dlacm235i276")))) (build-system python-build-system) (native-inputs - (list python-attrs)) ; for tests + (list python-attrs)) ; for tests (inputs (list bash-minimal python-colorama @@ -506,9 +506,9 @@ (define-public qutebrowser (lambda* (#:key outputs #:allow-other-keys) (substitute* "qutebrowser/commands/userscripts.py" (("os.path.join.*system=True)") - (string-append "os.path.join(\"" - (assoc-ref outputs "out") - "\", \"share\", \"qutebrowser\""))))) + (string-append "os.path.join(\"" + (assoc-ref outputs "out") + "\", \"share\", \"qutebrowser\""))))) (add-before 'check 'set-env-offscreen (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen"))) @@ -530,14 +530,14 @@ (define-public qutebrowser "/site-packages:" (getenv "GUIX_PYTHONPATH")))) (for-each - (lambda (file) - (wrap-program file - `("GUIX_PYTHONPATH" ":" prefix (,path)))) - (append - (find-files - (string-append out "/share/qutebrowser/scripts") "\\.py$") - (find-files - (string-append out "/share/qutebrowser/userscripts"))))))) + (lambda (file) + (wrap-program file + `("GUIX_PYTHONPATH" ":" prefix (,path)))) + (append + (find-files + (string-append out "/share/qutebrowser/scripts") "\\.py$") + (find-files + (string-append out "/share/qutebrowser/userscripts"))))))) (add-after 'wrap 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/qutebrowser") -- cgit v1.2.3 From 7e3234cb709076c8f4514f8b9320a0585dd9c958 Mon Sep 17 00:00:00 2001 From: muradm Date: Mon, 1 Aug 2022 16:11:59 +0300 Subject: gnu: mu: Update to 1.8.7. * gnu/packages/mail.scm (mu): Update to 1.8.7. [source]: Fetch from git. [build-system]: Use meson-build-system. [native-inputs]: Remove glib:bin and tzdata; add gnupg and texinfo; use new style. [inputs]: Remove guile. [arguments]: Remove obsolete 'patch-configure, 'fix-ffi, and 'check-tz-setup phases. Rename 'patch-bin-sh-in-tests to 'patch-bin-references and update it. Signed-off-by: Ricardo Wurmus --- gnu/packages/mail.scm | 66 ++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 556c5b4305..ca4b3e819e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2022 Justin Veilleux ;;; Copyright © 2022 Thiago Jung Bauermann ;;; Copyright © 2022 Guillaume Le Vaillant +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -1161,57 +1162,42 @@ (define-public emacs-mew (define-public mu (package (name "mu") - (version "1.6.11") + (version "1.8.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" version "/" - "mu-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/djcb/mu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13gchks9znyw0axw1wlks7f7h4442rfagmj7kx0jm3qhvi0b5sk0")))) - (build-system gnu-build-system) + "0yfbw234yqnqfnsn5bj1hqwpy78pkxn05vl18z8nvsqdmpzal4gx")))) + (build-system meson-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester - ("emacs" ,emacs-minimal) - ("tzdata" ,tzdata-for-tests))) ; for mu/test/test-mu-query.c + (list pkg-config + emacs-minimal + gnupg ; for tests + texinfo)) (inputs - (list xapian guile-3.0 glib gmime)) + (list glib gmime xapian)) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules + `(#:modules ((guix build meson-build-system) + (guix build emacs-utils) + (guix build utils)) + #:imported-modules (,@%meson-build-system-modules (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-configure - ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e", - ;; so our Emacs package can't find it. Setting "--with-lispdir" - ;; configure flag doesn't help because "mu4e" will be added to - ;; the lispdir anyway, so we have to modify "configure.ac". - (lambda _ - (substitute* "configure" - (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")))) - (add-after 'unpack 'patch-bin-sh-in-tests + (add-after 'unpack 'patch-bin-references (lambda _ (substitute* '("guile/tests/test-mu-guile.cc" - "mu/test-mu-cmd.cc" - "mu/test-mu-cmd-cfind.cc" - "mu/test-mu-query.cc") - (("/bin/sh") (which "sh"))))) - (add-before 'install 'fix-ffi - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "guile/mu.scm" - (("\"libguile-mu\"") - (format #f "\"~a/lib/libguile-mu\"" - (assoc-ref outputs "out")))))) - (add-before 'check 'check-tz-setup - (lambda* (#:key inputs #:allow-other-keys) - ;; For mu/test/test-mu-query.c - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")))) + "mu/tests/test-mu-cmd.cc" + "mu/tests/test-mu-cmd-cfind.cc" + "mu/tests/test-mu-query.cc") + (("/bin/sh") (which "sh"))) + (substitute* '("lib/tests/bench-indexer.cc" + "lib/utils/mu-utils.cc") + (("/bin/rm") (which "rm"))))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads -- cgit v1.2.3 From c6800aa31efbda2590bc75a96595e8bce3cce41e Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 28 Jul 2022 12:18:00 +0200 Subject: gnu: Add r-muscat. * gnu/packages/bioconductor.scm (r-muscat): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8a3a38b36f..9517cee52e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4629,6 +4629,56 @@ (define-public r-motifrg throughput genetic sequencing data sets using regression methods.") (license license:artistic2.0))) +(define-public r-muscat + (package + (name "r-muscat") + (version "1.10.1") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "muscat" version)) + (sha256 + (base32 + "1j3zkhqgza92vdykb1yia1jjwsdqra6q9c0jk6p5p2x0778xqgfd")))) + (properties `((upstream-name . "muscat"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocparallel + r-blme + r-complexheatmap + r-data-table + r-deseq2 + r-dplyr + r-edger + r-ggplot2 + r-glmmtmb + r-limma + r-lme4 + r-lmertest + r-matrix + r-matrixstats + r-progress + r-purrr + r-s4vectors + r-scales + r-scater + r-sctransform + r-scuttle + r-singlecellexperiment + r-summarizedexperiment + r-variancepartition + r-viridis)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/HelenaLC/muscat") + (synopsis "Multi-sample multi-group scRNA-seq data analysis tools") + (description + "This package @code{muscat} provides various methods and visualization tools +for @dfn{DS}(differential splicing) analysis in multi-sample, multi-group, +multi-(cell-)subpopulation scRNA-seq data, including cell-level mixed models and +methods based on aggregated \"pseudobulk\" data, as well as a flexible simulation +platform that mimics both single and multi-sample scRNA-seq data.") + (license license:gpl3))) + (define-public r-mutationalpatterns (package (name "r-mutationalpatterns") -- cgit v1.2.3 From bbf5e033d466b12c555e88434bd3d236ff9e6f4d Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:11:54 +0000 Subject: gnu: trilinos-for-dealii-openmpi: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs]: Add gcc-7 to fix the failing build with newer versions of gcc. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0795222ca8..6c789622f8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5152,7 +5152,10 @@ (define trilinos-for-dealii-openmpi (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) (build-system cmake-build-system) (native-inputs - `(("gfortran" ,gfortran) + `(;; The build fails with the current gcc. + ;; Use the version from when Trilinos was added. + ("gcc" ,gcc-7) + ("gfortran" ,gfortran) ;; Trilinos's repository contains several C-shell scripts, but adding ;; tcsh to the native inputs does not result in the check phase running ;; any more tests than without it (nor is tcsh required to build -- cgit v1.2.3 From 6a15bd031f819f8589fcddcddd19c654099fc93f Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:12:02 +0000 Subject: gnu: dealii: Use G-expressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dealii)[snippet, arguments]: Use G-expressions. (dealii-openmpi)[arguments]: Same. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 60 +++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 28 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6c789622f8..017ee82b0c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5286,7 +5286,7 @@ (define-public dealii (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. - '(delete-file-recursively "bundled")))) + #~(delete-file-recursively "bundled")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs @@ -5314,32 +5314,36 @@ (define-public dealii sundials-5 tbb)) (arguments - `(#:build-type "DebugRelease" ; Supports only Debug, Release and DebugRelease. - ;; The tests take too long and must be explicitly enabled with "make - ;; setup_tests". - ;; See https://www.dealii.org/developer/developers/testsuite.html. - ;; (They can also be run for an already installed deal.II.) - #:tests? #f - #:configure-flags - (let ((doc (string-append (assoc-ref %outputs "doc") - "/share/doc/" ,name "-" ,version))) - `("-DDEAL_II_COMPONENT_DOCUMENTATION=ON" - ,(string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) - ,(string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") - ;; Don't compile the examples because the source and CMakeLists.txt - ;; are installed anyway, allowing users to do so for themselves. - "-DDEAL_II_COMPILE_EXAMPLES=OFF" - ,(string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc "/examples"))) - #:phases - (modify-phases %standard-phases - (add-after 'install 'remove-build-logs - ;; These build logs leak the name of the build directory by storing - ;; the values of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version))) - (for-each delete-file (map (lambda (f) (string-append doc "/" f)) - '("detailed.log" "summary.log"))))))))) + (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease. + ;; The tests take too long and must be explicitly enabled with + ;; "make setup_tests". + ;; See https://www.dealii.org/developer/developers/testsuite.html. + ;; (They can also be run for an already installed deal.II.) + #:tests? #f + #:configure-flags + #~(let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (list "-DDEAL_II_COMPONENT_DOCUMENTATION=ON" + (string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) + (string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") + ;; Don't compile the examples because the source and + ;; CMakeLists.txt are installed anyway, allowing users to + ;; do so for themselves. + "-DDEAL_II_COMPILE_EXAMPLES=OFF" + (string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc + "/examples"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-build-logs + ;; These build logs leak the name of the build directory by + ;; storing the values of CMAKE_SOURCE_DIR and + ;; CMAKE_BINARY_DIR. + (lambda _ + (let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (for-each delete-file + (map (lambda (f) (string-append doc "/" f)) + '("detailed.log" "summary.log"))))))))) (home-page "https://www.dealii.org/") (synopsis "Finite element library") (description @@ -5372,7 +5376,7 @@ (define-public dealii-openmpi (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags flags) - `(cons "-DDEAL_II_WITH_MPI=ON" ,flags)))) + #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)))) (synopsis "Finite element library (with MPI support)"))) (define-public flann -- cgit v1.2.3 From a42730183a6eeb381c4251890586848bedbac79a Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:12:08 +0000 Subject: gnu: dealii: Update to 9.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (dealii): Update to 9.4.0. [propagated-inputs]: Replace sundials-5 with sundials. (dealii-openmpi)[propagated-inputs]: Replace sundials-openmpi-5 with sundials-openmpi. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 017ee82b0c..99b5e36ff6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5275,14 +5275,14 @@ (define trilinos-for-dealii-openmpi (define-public dealii (package (name "dealii") - (version "9.3.3") + (version "9.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.gz")) (sha256 - (base32 "0a8s4yxcbvzmfgv5qcg27h2ss4fcnyhrhhs35glqj59l9cbmkysx")) + (base32 "0v73q6f35f2yrjihaq6vh9lma07qc4cdv75nwmc3c5yrdh07g1i3")) (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. @@ -5310,8 +5310,7 @@ (define-public dealii (list boost hdf5 suitesparse ; For UMFPACK. - ;; SUNDIALS 6.0.0 and later will be supported in deal.II 9.4.0. - sundials-5 + sundials tbb)) (arguments (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease. @@ -5371,7 +5370,7 @@ (define-public dealii-openmpi p4est-openmpi petsc-openmpi slepc-openmpi - sundials-openmpi-5 + sundials-openmpi trilinos-for-dealii-openmpi))) (arguments (substitute-keyword-arguments (package-arguments dealii) -- cgit v1.2.3 From 32bcadc98c146d373db20c4154cd0acfb12de6e1 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:12:16 +0000 Subject: gnu: trilinos-for-dealii-openmpi: Remove input labels. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[native-inputs, inputs, propagated-inputs]: Remove labels. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 99b5e36ff6..e3cc3c993e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5152,34 +5152,35 @@ (define trilinos-for-dealii-openmpi (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) (build-system cmake-build-system) (native-inputs - `(;; The build fails with the current gcc. - ;; Use the version from when Trilinos was added. - ("gcc" ,gcc-7) - ("gfortran" ,gfortran) - ;; Trilinos's repository contains several C-shell scripts, but adding - ;; tcsh to the native inputs does not result in the check phase running - ;; any more tests than without it (nor is tcsh required to build - ;; Trilinos). - ;; It seems that Trilinos has replaced its use of C-shell test scripts - ;; with CMake's testing facilities. - ;; For example, - ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] - ;; states that Zoltan's C-shell test script - ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now - ;; performed through CMake. - ;; - ;; Perl is required for some Zoltan tests and Python 2 for one ML test. - ;; - ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html - ("perl" ,perl) - ("python" ,python-2))) + (list + ;; The build fails with the current gcc. + ;; Use the version from when Trilinos was added. + gcc-7 + gfortran + ;; Trilinos's repository contains several C-shell scripts, but adding + ;; tcsh to the native inputs does not result in the check phase running + ;; any more tests than without it (nor is tcsh required to build + ;; Trilinos). + ;; It seems that Trilinos has replaced its use of C-shell test scripts + ;; with CMake's testing facilities. + ;; For example, + ;; packages/zoltan/doc/Zoltan_html/dev_html/dev_test_script.html [1] + ;; states that Zoltan's C-shell test script + ;; packages/zoltan/test/test_zoltan has been obsoleted by the tests now + ;; performed through CMake. + ;; + ;; Perl is required for some Zoltan tests and Python 2 for one ML test. + ;; + ;; [1]: https://cs.sandia.gov/zoltan/dev_html/dev_test_script.html + perl + python-2)) (inputs - `(("blas" ,openblas) - ("lapack" ,lapack) - ("mumps" ,mumps-openmpi) - ("scalapack" ,scalapack))) + (list openblas + lapack + mumps-openmpi + scalapack)) (propagated-inputs - `(("mpi" ,openmpi))) + (list openmpi)) (arguments `(#:build-type "Release" #:configure-flags -- cgit v1.2.3 From 18d998ffdb8a64478f984bac479734e3fcc90cc3 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 25 Jul 2022 15:12:24 +0000 Subject: gnu: trilinos-for-dealii-openmpi: Use G-expressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (trilinos-for-dealii-openmpi)[arguments]: Use G-expressions. <#:phases>: Remove trailing boolean. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 162 +++++++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 79 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3cc3c993e..8d71bf324f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5182,85 +5182,89 @@ (define trilinos-for-dealii-openmpi (propagated-inputs (list openmpi)) (arguments - `(#:build-type "Release" - #:configure-flags - `("-DBUILD_SHARED_LIBS=ON" - ;; Obtain the equivalent of RelWithDebInfo but with -O3 (the Release - ;; default) rather than -O2 (the RelWithDebInfo default), to conform - ;; to candi's trilinos.package's compilation flags, which are -g -O3. - "-DCMAKE_C_FLAGS=-g" - "-DCMAKE_CXX_FLAGS=-g" - "-DCMAKE_Fortran_FLAGS=-g" - - ;; Trilinos libraries that deal.II can interface with. - "-DTrilinos_ENABLE_Amesos=ON" - "-DTrilinos_ENABLE_AztecOO=ON" - "-DTrilinos_ENABLE_Epetra=ON" - "-DTrilinos_ENABLE_EpetraExt=ON" - "-DTrilinos_ENABLE_Ifpack=ON" - "-DTrilinos_ENABLE_ML=ON" - "-DTrilinos_ENABLE_MueLu=ON" - "-DTrilinos_ENABLE_ROL=ON" - ;; Optional; required for deal.II's GridIn::read_exodusii, but - ;; depends on netcdf. - ;; Enable if and when someone needs it. - ;;"-DTrilinos_ENABLE_SEACAS=ON" - "-DTrilinos_ENABLE_Sacado=ON" - "-DTrilinos_ENABLE_Teuchos=ON" - "-DTrilinos_ENABLE_Tpetra=ON" - "-DTrilinos_ENABLE_Zoltan=ON" - - ;; Third-party libraries (TPLs) that Trilinos can interface with. - "-DBLAS_LIBRARY_NAMES=openblas" - "-DTPL_ENABLE_MPI=ON" - "-DTPL_ENABLE_MUMPS=ON" - "-DTPL_ENABLE_SCALAPACK=ON" - - ;; Enable the tests but not the examples (which are enabled by - ;; default when enabling tests). - ;; Although some examples are run as tests, they are otherwise - ;; unnecessary since this is a private package meant for - ;; dealii-openmpi. - ;; Besides, some MueLu and ROL examples require a lot of memory to - ;; compile. - ;; - ;; (For future reference, note that some ROL and SEACAS examples - ;; require removing gfortran from CPLUS_INCLUDE_PATH as in the - ;; dune-istl, dune-localfunctions and dune-alugrid packages.) - "-DTrilinos_ENABLE_TESTS=ON" - "-DTrilinos_ENABLE_EXAMPLES=OFF" - ;; MueLu tests require considerably more time and memory to compile - ;; than the rest of the tests. - "-DMueLu_ENABLE_TESTS=OFF" - - ;; The following options were gleaned from candi's trilinos.package. - ;; (We do not enable the complex instantiations, which are anyway - ;; provided only as an option in trilinos.package, because they are - ;; costly in compilation time and memory usage, and disk space [1].) - ;; - ;; [1]: https://www.docs.trilinos.org/files/TrilinosBuildReference.html#enabling-float-and-complex-scalar-types - "-DTrilinos_ENABLE_Ifpack2=OFF" - "-DTeuchos_ENABLE_FLOAT=ON" - "-DTpetra_INST_INT_LONG=ON" - "-DTPL_ENABLE_Boost=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'configure 'fix-kokkos-config - (lambda _ - ;; GNU Make 4.3 accidentally leaves the backslash preceding the - ;; number sign in strings containing a literal backslash–number - ;; sign (\#) [1, 2]. - ;; This is still an issue in Trilinos 13.0.1, but should be fixed - ;; in the following version. - ;; (The latest versions of Kokkos incorporate the fix [2].) - ;; - ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136 - ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441 - (substitute* "KokkosCore_config.h" - (("\\\\#") "#")) - #t)) - (add-before 'check 'mpi-setup - ,%openmpi-setup)))) + (list #:build-type "Release" + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + ;; Obtain the equivalent of RelWithDebInfo but with -O3 + ;; (the Release default) rather than -O2 (the + ;; RelWithDebInfo default), to conform to candi's + ;; trilinos.package's compilation flags, which are -g -O3. + "-DCMAKE_C_FLAGS=-g" + "-DCMAKE_CXX_FLAGS=-g" + "-DCMAKE_Fortran_FLAGS=-g" + + ;; Trilinos libraries that deal.II can interface with. + "-DTrilinos_ENABLE_Amesos=ON" + "-DTrilinos_ENABLE_AztecOO=ON" + "-DTrilinos_ENABLE_Epetra=ON" + "-DTrilinos_ENABLE_EpetraExt=ON" + "-DTrilinos_ENABLE_Ifpack=ON" + "-DTrilinos_ENABLE_ML=ON" + "-DTrilinos_ENABLE_MueLu=ON" + "-DTrilinos_ENABLE_ROL=ON" + ;; Optional; required for deal.II's GridIn::read_exodusii, + ;; but depends on netcdf. + ;; Enable if and when someone needs it. + ;;"-DTrilinos_ENABLE_SEACAS=ON" + "-DTrilinos_ENABLE_Sacado=ON" + "-DTrilinos_ENABLE_Teuchos=ON" + "-DTrilinos_ENABLE_Tpetra=ON" + "-DTrilinos_ENABLE_Zoltan=ON" + + ;; Third-party libraries (TPLs) that Trilinos can interface + ;; with. + "-DBLAS_LIBRARY_NAMES=openblas" + "-DTPL_ENABLE_MPI=ON" + "-DTPL_ENABLE_MUMPS=ON" + "-DTPL_ENABLE_SCALAPACK=ON" + + ;; Enable the tests but not the examples (which are enabled + ;; by default when enabling tests). + ;; Although some examples are run as tests, they are + ;; otherwise unnecessary since this is a private package + ;; meant for dealii-openmpi. + ;; Besides, some MueLu and ROL examples require a lot of + ;; memory to compile. + ;; + ;; (For future reference, note that some ROL and SEACAS + ;; examples require removing gfortran from + ;; CPLUS_INCLUDE_PATH as in the dune-istl, + ;; dune-localfunctions and dune-alugrid packages.) + "-DTrilinos_ENABLE_TESTS=ON" + "-DTrilinos_ENABLE_EXAMPLES=OFF" + ;; MueLu tests require considerably more time and memory to + ;; compile than the rest of the tests. + "-DMueLu_ENABLE_TESTS=OFF" + + ;; The following options were gleaned from candi's + ;; trilinos.package. + ;; (We do not enable the complex instantiations, which are + ;; anyway provided only as an option in trilinos.package, + ;; because they are costly in compilation time and memory + ;; usage, and disk space [1].) + ;; + ;; [1]: https://www.docs.trilinos.org/files/TrilinosBuildReference.html#enabling-float-and-complex-scalar-types + "-DTrilinos_ENABLE_Ifpack2=OFF" + "-DTeuchos_ENABLE_FLOAT=ON" + "-DTpetra_INST_INT_LONG=ON" + "-DTPL_ENABLE_Boost=OFF") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'fix-kokkos-config + (lambda _ + ;; GNU Make 4.3 accidentally leaves the backslash preceding + ;; the number sign in strings containing a literal + ;; backslash–number sign (\#) [1, 2]. + ;; This is still an issue in Trilinos 13.0.1, but should be + ;; fixed in the following version. + ;; (The latest versions of Kokkos incorporate the fix [2].) + ;; + ;; [1]: https://github.com/GEOSX/thirdPartyLibs/issues/136 + ;; [2]: https://github.com/kokkos/kokkos/blob/3.4.00/Makefile.kokkos#L441 + (substitute* "KokkosCore_config.h" + (("\\\\#") "#")))) + (add-before 'check 'mpi-setup + #$%openmpi-setup)))) (home-page "https://trilinos.github.io/") (synopsis "Algorithms for engineering and scientific problems") (description -- cgit v1.2.3 From d7e7494bc4d69de9db49488ee812e572c3250211 Mon Sep 17 00:00:00 2001 From: muradm Date: Sun, 17 Jul 2022 05:30:40 +0300 Subject: gnu: Add fail2ban. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (fail2ban): New variable. * gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch, gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch, gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch, gnu/packages/patches/fail2ban-paths-guix-conf.patch, gnu/packages/patches/fail2ban-python310-server-action.patch, gnu/packages/patches/fail2ban-python310-server-actions.patch, gnu/packages/patches/fail2ban-python310-server-jails.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. Co-authored-by: Ludovic Courtès --- gnu/local.mk | 7 + gnu/packages/admin.scm | 217 +++++++++++++++++++++ .../patches/fail2ban-0.11.2_CVE-2021-32749.patch | 155 +++++++++++++++ .../fail2ban-0.11.2_fix-setuptools-drop-2to3.patch | 64 ++++++ .../patches/fail2ban-0.11.2_fix-test-suite.patch | 48 +++++ .../patches/fail2ban-paths-guix-conf.patch | 32 +++ .../patches/fail2ban-python310-server-action.patch | 27 +++ .../fail2ban-python310-server-actions.patch | 25 +++ .../patches/fail2ban-python310-server-jails.patch | 25 +++ 9 files changed, 600 insertions(+) create mode 100644 gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch create mode 100644 gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch create mode 100644 gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch create mode 100644 gnu/packages/patches/fail2ban-paths-guix-conf.patch create mode 100644 gnu/packages/patches/fail2ban-python310-server-action.patch create mode 100644 gnu/packages/patches/fail2ban-python310-server-actions.patch create mode 100644 gnu/packages/patches/fail2ban-python310-server-jails.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index bba9f08bbe..10c3192ade 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1049,6 +1049,13 @@ dist_patch_DATA = \ %D%/packages/patches/exercism-disable-self-update.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ + %D%/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch \ + %D%/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch \ + %D%/packages/patches/fail2ban-0.11.2_fix-test-suite.patch \ + %D%/packages/patches/fail2ban-paths-guix-conf.patch \ + %D%/packages/patches/fail2ban-python310-server-action.patch \ + %D%/packages/patches/fail2ban-python310-server-actions.patch \ + %D%/packages/patches/fail2ban-python310-server-jails.patch \ %D%/packages/patches/farstream-gupnp.patch \ %D%/packages/patches/farstream-make.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 571271b5ab..146423d068 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -100,6 +100,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages cross-base) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dns) #:use-module (gnu packages elf) @@ -134,6 +135,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages mcrypt) #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) + #:use-module (gnu packages networking) #:use-module (gnu packages openldap) #:use-module (gnu packages patchutils) #:use-module (gnu packages pciutils) @@ -152,6 +154,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages ruby) #:use-module (gnu packages selinux) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) @@ -5230,3 +5233,217 @@ (define-public seatd mediate access to shared devices, such as graphics and input, for applications that require it.") (license license:expat))) + +(define-public fail2ban + (package + (name "fail2ban") + (version "0.11.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fail2ban/fail2ban") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00d9q8m284q2wy6q462nipzszplfbvrs9fhgn0y3imwsc24kv1db")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Get rid of absolute file names. + (substitute* "setup.py" + (("/etc/fail2ban") + "etc/fail2ban") + (("/var/lib/fail2ban") + "var/lib/fail2ban") + (("\"/usr/bin/\"") + "\"usr/bin/\"") + (("\"/usr/lib/fail2ban/\"") + "\"usr/lib/fail2ban/\"") + (("'/usr/share/doc/fail2ban'") + "'usr/share/doc/fail2ban'")) + ;; disable tests performing unacceptable side-effects + (let ((make-suite (lambda (t) + (string-append + "tests.addTest.unittest.makeSuite." + t "..")))) + (substitute* "fail2ban/tests/utils.py" + (((make-suite "actiontestcase.CommandActionTest")) + "") + (((make-suite "misctestcase.SetupTest")) + "") + (((make-suite + "filtertestcase.DNSUtilsNetworkTests")) + "") + (((make-suite "filtertestcase.IgnoreIPDNS")) + "") + (((make-suite "filtertestcase.GetFailures")) + "") + (((make-suite + "fail2banclienttestcase.Fail2banServerTest")) + "") + (((make-suite + "servertestcase.ServerConfigReaderTests")) + ""))))) + (patches (search-patches + "fail2ban-0.11.2_fix-setuptools-drop-2to3.patch" + "fail2ban-python310-server-action.patch" + "fail2ban-python310-server-actions.patch" + "fail2ban-python310-server-jails.patch" + "fail2ban-0.11.2_fix-test-suite.patch" + "fail2ban-0.11.2_CVE-2021-32749.patch" + "fail2ban-paths-guix-conf.patch")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'invoke-2to3 + (lambda _ + (invoke "./fail2ban-2to3"))) + (add-before 'install 'fix-default-config + (lambda* (#:key outputs #:allow-other-keys) + (substitute* '("config/paths-common.conf" + "fail2ban/tests/utils.py" + "fail2ban/client/configreader.py" + "fail2ban/client/fail2bancmdline.py" + "fail2ban/client/fail2banregex.py") + (("/etc/fail2ban") + (string-append (assoc-ref outputs "out") + "/etc/fail2ban"))))) + (add-after 'fix-default-config 'set-action-dependencies + (lambda* (#:key inputs #:allow-other-keys) + ;; deleting things that are not feasible to fix + ;; or won't be used any way + (with-directory-excursion "config" + (for-each delete-file + '("paths-arch.conf" + "paths-debian.conf" + "paths-fedora.conf" + "paths-freebsd.conf" + "paths-opensuse.conf" + "paths-osx.conf"))) + (with-directory-excursion "config/action.d" + (for-each delete-file + '("apf.conf" + "bsd-ipfw.conf" + "dshield.conf" + "ipfilter.conf" + "ipfw.conf" + "firewallcmd-allports.conf" + "firewallcmd-common.conf" + "firewallcmd-ipset.conf" + "firewallcmd-multiport.conf" + "firewallcmd-new.conf" + "firewallcmd-rich-logging.conf" + "firewallcmd-rich-rules.conf" + "osx-afctl.conf" + "osx-ipfw.conf" + "pf.conf" + "nginx-block-map.conf" + "npf.conf" + "shorewall.conf" + "shorewall-ipset-proto6.conf" + "ufw.conf"))) + (let* ((lookup-cmd (lambda (i) + (search-input-file inputs i))) + (bin (lambda (i) + (lookup-cmd (string-append "/bin/" i)))) + (sbin (lambda (i) + (lookup-cmd (string-append "/sbin/" i)))) + (ip (sbin "ip")) + (sendmail (sbin "sendmail"))) + (substitute* (find-files "config/action.d" "\\.conf$") + ;; TODO: deal with geoiplookup .. + (("(awk|curl|dig|jq)" all cmd) + (bin cmd)) + (("(cat|echo|grep|head|printf|wc) " all + cmd) + (string-append (bin cmd) " ")) + ((" (date|rm|sed|tail|touch|tr) " all + cmd) + (string-append " " + (bin cmd) " ")) + (("cut -d") + (string-append (bin "cut") " -d")) + (("`date`") + (string-append "`" + (bin "date") "`")) + (("id -") + (string-append (bin "id") " -")) + (("ip -([46]) addr" all ver) + (string-append ip " -" ver " addr")) + (("ip route") + (string-append ip " route")) + (("ipset ") + (string-append (sbin "ipset") " ")) + (("(iptables|ip6tables) <" all cmd) + (string-append (sbin cmd) " <")) + (("/usr/bin/nsupdate") + (bin "nsupdate")) + (("mail -E") + (string-append sendmail " -E")) + (("nftables = nft") + (string-append "nftables = " (sbin "nft"))) + (("perl -e") + (string-append (bin "perl") " -e")) + (("/usr/sbin/sendmail") + sendmail) + (("test -e") + (string-append (bin "test") " -e")) + (("_whois = whois") + (string-append "_whois = " (bin "whois"))))) + (substitute* "config/jail.conf" + (("before = paths-debian.conf") + "before = paths-guix.conf")))) + (add-after 'install 'copy-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (let* ((man (string-append (assoc-ref outputs "out") + "/man")) + (install-man (lambda (m) + (lambda (f) + (install-file (string-append f + "." m) + (string-append man + "/man" m))))) + (install-man1 (install-man "1")) + (install-man5 (install-man "5"))) + (with-directory-excursion "man" + (for-each install-man1 + '("fail2ban" + "fail2ban-client" + "fail2ban-python" + "fail2ban-regex" + "fail2ban-server" + "fail2ban-testcases")) + (for-each install-man5 + '("jail.conf"))))))))) + (inputs (list gawk + coreutils-minimal + curl + grep + jq + iproute + ipset + iptables + `(,isc-bind "utils") + nftables + perl + python-pyinotify + sed + sendmail + sqlite + whois)) + (home-page "http://www.fail2ban.org") + (synopsis "Daemon to ban hosts that cause multiple authentication errors") + (description + "Fail2Ban scans log files like @file{/var/log/auth.log} and bans IP +addresses conducting too many failed login attempts. It does this by updating +system firewall rules to reject new connections from those IP addresses, for a +configurable amount of time. Fail2Ban comes out-of-the-box ready to read many +standard log files, such as those for sshd and Apache, and is easily +configured to read any log file of your choosing, for any error you wish. + +Though Fail2Ban is able to reduce the rate of incorrect authentication +attempts, it cannot eliminate the risk presented by weak authentication. Set +up services to use only two factor, or public/private authentication +mechanisms if you really want to protect services.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch b/gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch new file mode 100644 index 0000000000..d3c677918c --- /dev/null +++ b/gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch @@ -0,0 +1,155 @@ +From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Mon, 21 Jun 2021 17:12:53 +0200 +Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable + (default tilde) stops consider "~" char after new-line as composing escape + sequence + +--- + config/action.d/complain.conf | 2 +- + config/action.d/dshield.conf | 2 +- + config/action.d/mail-buffered.conf | 8 ++++---- + config/action.d/mail-whois-lines.conf | 2 +- + config/action.d/mail-whois.conf | 6 +++--- + config/action.d/mail.conf | 6 +++--- + 6 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/config/action.d/complain.conf b/config/action.d/complain.conf +index 3a5f882c9f..4d73b05859 100644 +--- a/config/action.d/complain.conf ++++ b/config/action.d/complain.conf +@@ -102,7 +102,7 @@ logpath = /dev/null + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Option: mailargs + # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: +diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf +index c128bef348..3d5a7a53a9 100644 +--- a/config/action.d/dshield.conf ++++ b/config/action.d/dshield.conf +@@ -179,7 +179,7 @@ tcpflags = + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Option: mailargs + # Notes.: Additional arguments to mail command. e.g. for standard Unix mail: +diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf +index 325f185b2f..79b841049c 100644 +--- a/config/action.d/mail-buffered.conf ++++ b/config/action.d/mail-buffered.conf +@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Output will be buffered until lines are available.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -28,13 +28,13 @@ actionstop = if [ -f ]; then + These hosts have been banned by Fail2Ban.\n + `cat ` + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : Summary from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary from " + rm + fi + printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: ( failures)\n" >> + These hosts have been banned by Fail2Ban.\n + `cat ` + \nRegards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : Summary" ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : Summary" + rm + fi + +diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf +index 3a3e56b2c7..d2818cb9b9 100644 +--- a/config/action.d/mail-whois-lines.conf ++++ b/config/action.d/mail-whois-lines.conf +@@ -72,7 +72,7 @@ actionunban = + # Notes.: Your system mail command. Is passed 2 args: subject and recipient + # Values: CMD + # +-mailcmd = mail -s ++mailcmd = mail -E 'set escape' -s + + # Default name of the chain + # +diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf +index 7fea34c40d..ab33b616dc 100644 +--- a/config/action.d/mail-whois.conf ++++ b/config/action.d/mail-whois.conf +@@ -20,7 +20,7 @@ norestored = 1 + actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n + actionstop = printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n + Here is more information about :\n + `%(_whois_command)s`\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : banned from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " + + # Option: actionunban + # Notes.: command executed when unbanning an IP. Take care that the +diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf +index 5d8c0e154c..f4838ddcb6 100644 +--- a/config/action.d/mail.conf ++++ b/config/action.d/mail.conf +@@ -16,7 +16,7 @@ norestored = 1 + actionstart = printf %%b "Hi,\n + The jail has been started successfully.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : started on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : started on " + + # Option: actionstop + # Notes.: command executed at the stop of jail (or at the end of Fail2Ban) +@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n + actionstop = printf %%b "Hi,\n + The jail has been stopped.\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : stopped on " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : stopped on " + + # Option: actioncheck + # Notes.: command executed once before each actionban command +@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n + The IP has just been banned by Fail2Ban after + attempts against .\n + Regards,\n +- Fail2Ban"|mail -s "[Fail2Ban] : banned from " ++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] : banned from " + + # Option: actionunban + # Notes.: command executed when unbanning an IP. Take care that the diff --git a/gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch b/gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch new file mode 100644 index 0000000000..b0b14364b1 --- /dev/null +++ b/gnu/packages/patches/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch @@ -0,0 +1,64 @@ +From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001 +From: sebres +Date: Sun, 19 Sep 2021 18:49:18 +0200 +Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup + command: use_2to3 is invalid (setuptools 58+) + +--- + setup.py | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/setup.py b/setup.py +index f4c2550f6f..98413273c5 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,7 +48,7 @@ + from glob import glob + + from fail2ban.setup import updatePyExec +- ++from fail2ban.version import version + + source_dir = os.path.realpath(os.path.dirname( + # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): +@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): + # Wrapper to specify fail2ban own options: + class install_command_f2b(install): + user_options = install.user_options + [ +- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'), + ('without-tests', None, 'without tests files installation'), + ] + def initialize_options(self): +- self.disable_2to3 = None + self.without_tests = not with_tests + install.initialize_options(self) + def finalize_options(self): +- global _2to3 +- ## in the test cases 2to3 should be already done (fail2ban-2to3): +- if self.disable_2to3: +- _2to3 = False +- if _2to3: +- cmdclass = self.distribution.cmdclass +- cmdclass['build_py'] = build_py_2to3 +- cmdclass['build_scripts'] = build_scripts_2to3 + if self.without_tests: + self.distribution.scripts.remove('bin/fail2ban-testcases') + +@@ -178,7 +168,6 @@ def run(self): + if setuptools: + setup_extra = { + 'test_suite': "fail2ban.tests.utils.gatherTests", +- 'use_2to3': True, + } + else: + setup_extra = {} +@@ -202,9 +191,6 @@ def run(self): + ('/usr/share/doc/fail2ban', doc_files) + ) + +-# Get version number, avoiding importing fail2ban. +-# This is due to tests not functioning for python3 as 2to3 takes place later +-exec(open(join("fail2ban", "version.py")).read()) + + setup( + name = "fail2ban", diff --git a/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch b/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch new file mode 100644 index 0000000000..91d973e72e --- /dev/null +++ b/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch @@ -0,0 +1,48 @@ +From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001 +From: sebres +Date: Mon, 4 Jan 2021 02:42:38 +0100 +Subject: [PATCH] fixes century selector of %ExY and %Exy in datepattern for + tests, considering interval from 2005 (alternate now) to now; + better + grouping algorithm for resulting century RE + +--- + fail2ban/server/strptime.py | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py +index 1464a96d1f..39fc795865 100644 +--- a/fail2ban/server/strptime.py ++++ b/fail2ban/server/strptime.py +@@ -36,10 +36,30 @@ def _getYearCentRE(cent=(0,3), distance=3, now=(MyTime.now(), MyTime.alternateNo + Thereby respect possible run in the test-cases (alternate date used there) + """ + cent = lambda year, f=cent[0], t=cent[1]: str(year)[f:t] ++ def grp(exprset): ++ c = None ++ if len(exprset) > 1: ++ for i in exprset: ++ if c is None or i[0:-1] == c: ++ c = i[0:-1] ++ else: ++ c = None ++ break ++ if not c: ++ for i in exprset: ++ if c is None or i[0] == c: ++ c = i[0] ++ else: ++ c = None ++ break ++ if c: ++ return "%s%s" % (c, grp([i[len(c):] for i in exprset])) ++ return ("(?:%s)" % "|".join(exprset) if len(exprset[0]) > 1 else "[%s]" % "".join(exprset)) \ ++ if len(exprset) > 1 else "".join(exprset) + exprset = set( cent(now[0].year + i) for i in (-1, distance) ) + if len(now) and now[1]: +- exprset |= set( cent(now[1].year + i) for i in (-1, distance) ) +- return "(?:%s)" % "|".join(exprset) if len(exprset) > 1 else "".join(exprset) ++ exprset |= set( cent(now[1].year + i) for i in xrange(-1, now[0].year-now[1].year+1, distance) ) ++ return grp(sorted(list(exprset))) + + timeRE = TimeRE() + diff --git a/gnu/packages/patches/fail2ban-paths-guix-conf.patch b/gnu/packages/patches/fail2ban-paths-guix-conf.patch new file mode 100644 index 0000000000..8c2a5747ba --- /dev/null +++ b/gnu/packages/patches/fail2ban-paths-guix-conf.patch @@ -0,0 +1,32 @@ +From ef28dcf7a5bdbfd8ba586bb066d5ec53188a6bf9 Mon Sep 17 00:00:00 2001 +From: muradm +Date: Fri, 15 Jul 2022 20:08:14 +0300 +Subject: [PATCH] Add paths-guix.conf file. + +--- + config/paths-guix.conf | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + create mode 100644 config/paths-guix.conf + +diff --git a/config/paths-guix.conf b/config/paths-guix.conf +new file mode 100644 +index 00000000..b4a2e9f5 +--- /dev/null ++++ b/config/paths-guix.conf +@@ -0,0 +1,13 @@ ++# Guix ++ ++[INCLUDES] ++ ++before = paths-common.conf ++after = paths-overrides.local ++ ++ ++[DEFAULT] ++ ++syslog_authpriv = /var/log/secure ++syslog_mail = /var/log/maillog ++syslog_mail_warn = /var/log/maillog +-- +2.36.1 + diff --git a/gnu/packages/patches/fail2ban-python310-server-action.patch b/gnu/packages/patches/fail2ban-python310-server-action.patch new file mode 100644 index 0000000000..723d7f7aa6 --- /dev/null +++ b/gnu/packages/patches/fail2ban-python310-server-action.patch @@ -0,0 +1,27 @@ +From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:19:24 +0100 +Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes` + moved to the :mod:`collections.abc` module + +(since 3.10-alpha.5 `MutableMapping` is missing in collections module) +--- + fail2ban/server/action.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py +index 3bc48fe046..f0f1e6f59a 100644 +--- a/fail2ban/server/action.py ++++ b/fail2ban/server/action.py +@@ -30,7 +30,10 @@ + import threading + import time + from abc import ABCMeta +-from collections import MutableMapping ++try: ++ from collections.abc import MutableMapping ++except ImportError: ++ from collections import MutableMapping + + from .failregex import mapTag2Opt + from .ipdns import DNSUtils diff --git a/gnu/packages/patches/fail2ban-python310-server-actions.patch b/gnu/packages/patches/fail2ban-python310-server-actions.patch new file mode 100644 index 0000000000..e31316d28b --- /dev/null +++ b/gnu/packages/patches/fail2ban-python310-server-actions.patch @@ -0,0 +1,25 @@ +From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:25:45 +0100 +Subject: [PATCH] amend for `Mapping` + +--- + fail2ban/server/actions.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py +index b7b95b445a..897d907c1a 100644 +--- a/fail2ban/server/actions.py ++++ b/fail2ban/server/actions.py +@@ -28,7 +28,10 @@ + import os + import sys + import time +-from collections import Mapping ++try: ++ from collections.abc import Mapping ++except ImportError: ++ from collections import Mapping + try: + from collections import OrderedDict + except ImportError: diff --git a/gnu/packages/patches/fail2ban-python310-server-jails.patch b/gnu/packages/patches/fail2ban-python310-server-jails.patch new file mode 100644 index 0000000000..e5873c415e --- /dev/null +++ b/gnu/packages/patches/fail2ban-python310-server-jails.patch @@ -0,0 +1,25 @@ +From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +Date: Mon, 8 Feb 2021 17:35:59 +0100 +Subject: [PATCH] amend for `Mapping` (jails) + +--- + fail2ban/server/jails.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py +index 972a8c4bd2..27e12ddf65 100644 +--- a/fail2ban/server/jails.py ++++ b/fail2ban/server/jails.py +@@ -22,7 +22,10 @@ + __license__ = "GPL" + + from threading import Lock +-from collections import Mapping ++try: ++ from collections.abc import Mapping ++except ImportError: ++ from collections import Mapping + + from ..exceptions import DuplicateJailException, UnknownJailException + from .jail import Jail -- cgit v1.2.3 From f1b9ae8c20ef0b9c85e4d801ae85accbe6654ff5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 1 Aug 2022 17:45:09 +0200 Subject: gnu: python-bbknn: Update to 1.5.1. * gnu/packages/bioinformatics.scm (python-bbknn): Update to 1.5.1. [propagated-inputs]: Add python-pandas. --- gnu/packages/bioinformatics.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index edbae757e2..d39e08c08c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11879,14 +11879,14 @@ (define-public python-scanpy (define-public python-bbknn (package (name "python-bbknn") - (version "1.3.6") + (version "1.5.1") (source (origin (method url-fetch) (uri (pypi-uri "bbknn" version)) (sha256 (base32 - "1jbsh01f57zj4bhvjr3jh4532zznqd6nccmgrl3qi9gnhkf7c4y0")))) + "0q11xdmjr2kf6f179a6kjizj3lllfrq743gslgw67qyzimvrrnhn")))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests are included @@ -11905,6 +11905,7 @@ (define-public python-bbknn (list python-annoy python-cython python-numpy + python-pandas python-scikit-learn python-scipy python-umap-learn)) -- cgit v1.2.3 From 4637de6a4144d99efd999c6e95d88d272b7c8193 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Aug 2022 17:00:17 -0400 Subject: gnu: Add qtlottie. * gnu/packages/qt.scm (qtlottie): New variable. --- gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dc51e18c45..f74f84f2ac 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1701,6 +1701,38 @@ (define-public qtlocation (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) +(define-public qtlottie + (package + (name "qtlottie") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after install + (add-after 'install 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH")))))))) + (native-inputs (list perl)) + (inputs (list libxkbcommon qtbase qtdeclarative)) + (home-page (package-home-page qtbase)) + (synopsis "QML API for rendering Bodymovin graphics and animations") + (description "Qt Lottie Animation provides a QML API for rendering +graphics and animations that are exported in JSON format by the Bodymovin +plugin for Adobe After Effects.") + (license (package-license qtbase)))) + (define-public qttools-5 (package (inherit qtsvg-5) (name "qttools") -- cgit v1.2.3 From 1085514a1899f24e8a17f46c186e55169337272d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Aug 2022 23:30:10 +0300 Subject: gnu: node-lts: Build with icu4c-71. * gnu/packages/node.scm (node-lts)[inputs]: Replace icu4c-70 with icu4c-71. [native-inputs]: Same. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index c8d81fbd22..2839348554 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -864,7 +864,7 @@ (define-public node-lts (list ;; Runtime dependencies for binaries used as a bootstrap. c-ares-for-node brotli - icu4c-70 + icu4c-71 libuv-for-node `(,nghttp2 "lib") openssl @@ -879,7 +879,7 @@ (define-public node-lts (list bash-minimal coreutils c-ares-for-node - icu4c-70 + icu4c-71 libuv-for-node llhttp-bootstrap brotli -- cgit v1.2.3 From 5baa37b56cbde873b8dedca343dd9c8d8c080528 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 28 Jul 2022 23:38:58 +0200 Subject: gnu: Add r-phyclust. * gnu/packages/cran.scm (r-phyclust): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a677360700..fc7fd0467e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11699,6 +11699,31 @@ (define-public r-nleqslv singular or ill-conditioned Jacobian.") (license license:gpl2+))) +(define-public r-phyclust + (package + (name "r-phyclust") + (version "0.1-30") + (source (origin + (method url-fetch) + (uri (cran-uri "phyclust" version)) + (sha256 + (base32 + "0fy9q95vmlm9idpax7alhpfwn30gflnc9md72g91jypyxkx5nr7p")))) + (properties `((upstream-name . "phyclust"))) + (build-system r-build-system) + (propagated-inputs (list r-ape)) + (home-page "https://snoweye.github.io/phyclust/") + (synopsis "Studying phyloclustering and exploring DNA sequence data") + (description + "@dfn{Phylogenetic clustering} (phyloclustering) is an evolutionary continuous +time Markov Chain model-based approach to identify population structure from +molecular data without assuming linkage equilibrium. The package @code{phyclust} +provides a convenient implementation of phyloclustering for DNA and SNP data, +capable of clustering individuals into subpopulations and identifying molecular +sequences representative of those subpopulations. It is designed in @code{C} for +performance and interfaced with @code{R} for visualization.") + (license license:gpl2+))) + (define-public r-physicalactivity (package (name "r-physicalactivity") -- cgit v1.2.3 From af207dd46d0dff09736fa87131387f32ac811024 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 28 Jul 2022 23:38:59 +0200 Subject: gnu: Add r-infercnv. * gnu/packages/bioconductor.scm (r-infercnv): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 60 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9517cee52e..d2a296ff66 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -49,6 +49,7 @@ (define-module (gnu packages bioconductor) #:use-module (gnu packages image) #:use-module (gnu packages maths) #:use-module (gnu packages netpbm) + #:use-module (gnu packages python) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages statistics) @@ -2647,6 +2648,65 @@ (define-public r-ideoviz arbitrary genomic intervals along chromosomal ideogram.") (license license:gpl2))) +(define-public r-infercnv + (package + (name "r-infercnv") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "infercnv" version)) + (sha256 + (base32 + "01f021fdxm058733rky46dlvqg7dmf5mn5x9lnq0fspp5665w3bl")))) + (properties `((upstream-name . "infercnv"))) + (build-system r-build-system) + (inputs (list python)) + (propagated-inputs + (list r-ape + r-argparse + r-biocgenerics + r-catools + r-coda + r-coin + r-digest + r-doparallel + r-dplyr + r-edger + r-fastcluster + r-fitdistrplus + r-foreach + r-futile-logger + r-future + r-ggplot2 + r-gplots + r-gridextra + r-hiddenmarkov + r-leiden + r-matrix + r-paralleldist + r-phyclust + r-rann + r-rcolorbrewer + r-reshape + r-rjags + r-singlecellexperiment + r-summarizedexperiment + r-tidyr)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/broadinstitute/inferCNV/wiki") + (synopsis "Infer copy number variation from single-cell RNA-Seq data") + (description + "@code{InferCNV} is used to explore tumor single cell RNA-Seq data to identify +evidence for somatic large-scale chromosomal copy number alterations, such as gains +or deletions of entire chromosomes or large segments of chromosomes. This is done +by exploring expression intensity of genes across positions of a tumor genome in +comparison to a set of reference \"normal\" cells. A heatmap is generated +illustrating the relative expression intensities across each chromosome, and it +often becomes readily apparent as to which regions of the tumor genome are +over-abundant or less-abundant as compared to that of normal cells.") + (license license:bsd-3))) + (define-public r-iranges (package (name "r-iranges") -- cgit v1.2.3 From a1f7d98a9c7380be5815fd13b519bbab145757c2 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Mon, 1 Aug 2022 16:11:41 -0400 Subject: gnu: kicad: Update to 6.0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad): Update to 6.0.7. Signed-off-by: 宋文武 --- gnu/packages/engineering.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 57efaee50b..0e28a0c428 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -945,7 +945,7 @@ (define-public inspekt3d (define-public kicad (package (name "kicad") - (version "6.0.6") + (version "6.0.7") (source (origin (method git-fetch) (uri (git-reference @@ -953,7 +953,7 @@ (define-public kicad (commit version))) (sha256 (base32 - "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j")) + "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1007,17 +1007,17 @@ (define-public kicad (variable "KICAD") ;to find kicad-doc (files '(""))) (search-path-specification - (variable "KICAD_TEMPLATE_DIR") + (variable "KICAD6_TEMPLATE_DIR") (files '("share/kicad/template"))) (search-path-specification - (variable "KICAD_SYMBOL_DIR") ;symbol path - (files '("share/kicad/library"))) + (variable "KICAD6_SYMBOL_DIR") + (files '("share/kicad/symbols"))) (search-path-specification - (variable "KISYSMOD") ;footprint path - (files '("share/kicad/modules"))) + (variable "KICAD6_FOOTPRINT_DIR") + (files '("share/kicad/footprints"))) (search-path-specification - (variable "KISYS3DMOD") ;3D model path - (files '("share/kicad/modules/packages3d"))))) + (variable "KICAD6_3DMODEL_DIR") + (files '("share/kicad/3dmodels"))))) (native-inputs (list boost desktop-file-utils gettext-minimal @@ -1060,7 +1060,7 @@ (define-public kicad-doc (file-name (git-file-name name version)) (sha256 (base32 - "1kxv0j3nx6zn45znrhqq6bdqrsd60mgmgvr1gjv5p8g3cbkkslrx")))) + "15arkjjbzd4k09crhsrizmj8ljwpv6xjm59k58pfbd5pmqkklh2d")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1094,7 +1094,7 @@ (define-public kicad-symbols (file-name (git-file-name name version)) (sha256 (base32 - "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d")))) + "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1123,7 +1123,7 @@ (define-public kicad-footprints (file-name (git-file-name name version)) (sha256 (base32 - "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c")))) + "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1140,7 +1140,7 @@ (define-public kicad-packages3d (file-name (git-file-name name version)) (sha256 (base32 - "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya")))) + "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) -- cgit v1.2.3 From ead27209b5e6e474bea93b010a96644dbae487b4 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 31 Jul 2022 16:51:32 +0200 Subject: gnu: strawberry: Update to 1.0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (strawberry): Update to 1.0.7. Signed-off-by: 宋文武 --- gnu/packages/music.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 844e756094..dcc1a43d2d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -476,7 +476,7 @@ (define-public clementine (define-public strawberry (package (name "strawberry") - (version "1.0.3") + (version "1.0.7") (source (origin (method git-fetch) (uri (git-reference @@ -485,7 +485,7 @@ (define-public strawberry (file-name (git-file-name name version)) (sha256 (base32 - "14fr2bm51k4n5byc9pwh3ba6v15s9jmqxigl1y9h00l7cvmfpbn1")) + "17mfavbbzx7hp7j5n9i7c3rajy16jicarabrl174p4gjv4zpy2sc")) (modules '((guix build utils) (ice-9 regex))) (snippet -- cgit v1.2.3 From fde477442ec0460d646db13077e57dd3f878c687 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Aug 2022 11:20:51 +0200 Subject: gnu: emacs-clojure-mode: Update to 5.15.1. * gnu/packages/emacs-xyz.scm (emacs-clojure-mode): Update to 5.15.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3804ef402a..7a060783f8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10178,7 +10178,7 @@ (define-public emacs-lpy (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.14.0") + (version "5.15.1") (source (origin (method git-fetch) @@ -10187,7 +10187,7 @@ (define-public emacs-clojure-mode (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn")))) + (base32 "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd")))) (build-system emacs-build-system) (native-inputs (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) -- cgit v1.2.3 From b4d9493ceb101cb773298bdc89375e2a0778ab08 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Aug 2022 11:52:54 +0200 Subject: gnu: scummvm: Update to 2.6.0. * gnu/packages/emulators.scm (scummvm): Update to 2.6.0. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 386e127e1e..92af9adced 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1505,14 +1505,14 @@ (define-public retroarch (define-public scummvm (package (name "scummvm") - (version "2.5.1") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "https://downloads.scummvm.org/frs/scummvm/" version "/scummvm-" version ".tar.xz")) (sha256 - (base32 "00az0dm85kh8rq0yqj74x0c5zrq4ybvwvnilijzl8qa5whwdpn4z")))) + (base32 "05zw9xqdix88f8p3py2rfnyiaxr2sbifkqi9s5gy3nf9s3l3h50w")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;require "git" -- cgit v1.2.3 From e7bac8584b94372b5d9f81c658b26240e7f9a0cb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 2 Aug 2022 11:07:06 +0200 Subject: gnu: monero: Update to 0.18.0.0. * gnu/packages/finance.scm (monero): Update to 0.18.0.0. [source]: Update snippet. [arguments]: Use gexps. --- gnu/packages/finance.scm | 109 +++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 55 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5ff345acc0..54dbd87b64 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -671,7 +671,7 @@ (define-public monero ;; the system's dynamically linked library. (package (name "monero") - (version "0.17.3.2") + (version "0.18.0.0") (source (origin (method git-fetch) @@ -687,10 +687,9 @@ (define-public monero ;; Delete bundled dependencies. (for-each delete-file-recursively - '("external/miniupnp" "external/rapidjson" - "external/unbound")))) + '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "19sgcbli7fc1l6ms7ma6hcz1mmpbnd296lc8a19rl410acpv45zy")))) + (base32 "1jq2v2dg50gl3cf9s61jssny5rraclxqj4cc4y0sl00ip8icj08v")))) (build-system cmake-build-system) (native-inputs (list doxygen @@ -716,57 +715,57 @@ (define-public monero xz zeromq)) (arguments - `(#:out-of-source? #t - #:configure-flags - (list "-DARCH=default" - "-DBUILD_TESTS=ON" - (string-append "-DReadline_ROOT_DIR=" - (assoc-ref %build-inputs "readline"))) - #:phases - (modify-phases %standard-phases - ;; tests/core_tests need a valid HOME - (add-before 'configure 'set-home - (lambda _ - (setenv "HOME" (getcwd)))) - (add-after 'set-home 'change-log-path - (lambda _ - (substitute* "contrib/epee/src/mlog.cpp" - (("epee::string_tools::get_current_module_folder\\(\\)") - "\".bitmonero\"") - (("return \\(") - "return ((std::string(getenv(\"HOME\"))) / ")))) - (add-after 'change-log-path 'fix-file-permissions-for-tests - (lambda _ - (for-each make-file-writable - (find-files "tests/data/" "wallet_9svHk1.*")))) - ;; Only try tests that don't need access to network or system - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Core tests sometimes fail, at least on i686-linux. - ;; Let's disable them for now and just try hash tests - ;; and unit tests. - ;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) - (when tests? - (invoke "make" "ARGS=-R 'hash' --verbose" "test")))) - (add-after 'check 'unit-tests - (lambda _ - (let ((excluded-unit-tests - (string-join - '("AddressFromURL.Success" - "AddressFromURL.Failure" - "DNSResolver.IPv4Success" - "DNSResolver.DNSSECSuccess" - "DNSResolver.DNSSECFailure" - "DNSResolver.GetTXTRecord" - "is_hdd.linux_os_root") - ":"))) - (invoke "tests/unit_tests/unit_tests" - (string-append "--gtest_filter=-" - excluded-unit-tests))))) - (add-after 'install 'delete-unused-files - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/include")))))))) + (list #:out-of-source? #t + #:configure-flags + #~(list "-DARCH=default" + "-DBUILD_TESTS=ON" + (string-append "-DReadline_ROOT_DIR=" + #$(this-package-input "readline"))) + #:phases + #~(modify-phases %standard-phases + ;; tests/core_tests need a valid HOME + (add-before 'configure 'set-home + (lambda _ + (setenv "HOME" (getcwd)))) + (add-after 'set-home 'change-log-path + (lambda _ + (substitute* "contrib/epee/src/mlog.cpp" + (("epee::string_tools::get_current_module_folder\\(\\)") + "\".bitmonero\"") + (("return \\(") + "return ((std::string(getenv(\"HOME\"))) / ")))) + (add-after 'change-log-path 'fix-file-permissions-for-tests + (lambda _ + (for-each make-file-writable + (find-files "tests/data/" "wallet_9svHk1.*")))) + ;; Only try tests that don't need access to network or system + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; Core tests sometimes fail, at least on i686-linux. + ;; Let's disable them for now and just try hash tests + ;; and unit tests. + ;; (invoke "make" "ARGS=-R 'hash|core_tests' --verbose" "test"))) + (when tests? + (invoke "make" "ARGS=-R 'hash' --verbose" "test")))) + (add-after 'check 'unit-tests + (lambda _ + (let ((excluded-unit-tests + (string-join + '("AddressFromURL.Success" + "AddressFromURL.Failure" + "DNSResolver.IPv4Success" + "DNSResolver.DNSSECSuccess" + "DNSResolver.DNSSECFailure" + "DNSResolver.GetTXTRecord" + "is_hdd.linux_os_root") + ":"))) + (invoke "tests/unit_tests/unit_tests" + (string-append "--gtest_filter=-" + excluded-unit-tests))))) + (add-after 'install 'delete-unused-files + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively + (string-append #$output "/include"))))))) (home-page "https://web.getmonero.org/") (synopsis "Command-line interface to the Monero currency") (description -- cgit v1.2.3 From d4b7aae9f406ab9732f6c46b9ff276e8e2c9a35a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 2 Aug 2022 12:15:13 +0200 Subject: gnu: monero-gui: Update to 0.18.0.0. * gnu/packages/finance.scm (monero-gui): Update to 0.18.0.0. [inputs]: remove labels. [arguments]: Use gexps. --- gnu/packages/finance.scm | 97 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 49 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 54dbd87b64..bb1e1a48cf 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -776,7 +776,7 @@ (define-public monero (define-public monero-gui (package (name "monero-gui") - (version "0.17.3.2") + (version "0.18.0.0") (source (origin (method git-fetch) @@ -792,60 +792,59 @@ (define-public monero-gui ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "12x0d981fkb43inx7zqjr3ny53dih9g8k03cmaflxqwviinb1k4b")))) + (base32 "14rbw9803h3g7ld3d24vc3i9n55n09x13frkmd128xx5jw17v5sr")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) ("monero-source" ,(package-source monero)))) (inputs - `(,@(package-inputs monero) - ("libgcrypt" ,libgcrypt) - ("monero" ,monero) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2-5",qtquickcontrols2-5) - ("qtsvg-5" ,qtsvg-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + (modify-inputs (package-inputs monero) + (append libgcrypt + monero + qtbase-5 + qtdeclarative-5 + qtgraphicaleffects + qtquickcontrols-5 + qtquickcontrols2-5 + qtsvg-5 + qtxmlpatterns))) (arguments - `(#:tests? #f ; No tests - #:configure-flags - ,#~(list "-DARCH=default" - "-DENABLE_PASS_STRENGTH_METER=ON" - (string-append "-DReadline_ROOT_DIR=" - #$(this-package-input "readline"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'extract-monero-sources - ;; Some of the monero package source code is required - ;; to build the GUI. - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "monero") - (copy-recursively (assoc-ref inputs "monero-source") - "monero"))) - (add-after 'extract-monero-sources 'fix-build - (lambda _ - (substitute* "src/version.js.in" - (("@VERSION_TAG_GUI@") - ,version)) - (substitute* "external/CMakeLists.txt" - (("add_library\\(quirc" all) - (string-append - "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n" - all))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) - (mkdir-p bin) - (install-file "../build/bin/monero-wallet-gui" bin)))) - (add-after 'qt-wrap 'install-monerod-link - ;; The monerod program must be available so that monero-wallet-gui - ;; can start a Monero daemon if necessary. - (lambda* (#:key inputs outputs #:allow-other-keys) - (symlink (search-input-file inputs "/bin/monerod") - (string-append (assoc-ref outputs "out") - "/bin/monerod"))))))) + (list #:tests? #f ; No tests + #:configure-flags + #~(list "-DARCH=default" + "-DENABLE_PASS_STRENGTH_METER=ON" + (string-append "-DReadline_ROOT_DIR=" + #$(this-package-input "readline"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'extract-monero-sources + ;; Some of the monero package source code is required + ;; to build the GUI. + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "monero") + (copy-recursively (assoc-ref inputs "monero-source") + "monero"))) + (add-after 'extract-monero-sources 'fix-build + (lambda _ + (substitute* "src/version.js.in" + (("@VERSION_TAG_GUI@") + #$version)) + (substitute* "external/CMakeLists.txt" + (("add_library\\(quirc" all) + (string-append + "set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\")\n" + all))))) + (replace 'install + (lambda _ + (let ((bin (string-append #$output "/bin"))) + (mkdir-p bin) + (install-file "../build/bin/monero-wallet-gui" bin)))) + (add-after 'qt-wrap 'install-monerod-link + ;; The monerod program must be available so that + ;; monero-wallet-gui can start a Monero daemon if necessary. + (lambda* (#:key inputs #:allow-other-keys) + (symlink (search-input-file inputs "/bin/monerod") + (string-append #$output "/bin/monerod"))))))) (home-page "https://web.getmonero.org/") (synopsis "Graphical user interface for the Monero currency") (description -- cgit v1.2.3 From d4b0dc047f9a1d44a1448d24794befcfc6ae90a4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 13:50:55 +0200 Subject: gnu: Add python-fbpca. * gnu/packages/python-science.scm (python-fbpca): New variable. --- gnu/packages/python-science.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 57c9325f49..2f4f1818f3 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -544,6 +544,26 @@ (define-public python-baycomp higher scores.") (license license:expat))) +(define-public python-fbpca + (package + (name "python-fbpca") + (version "1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "fbpca" version)) + (sha256 + (base32 + "1lbjqhqsdmqk86lb86q3ywf7561zmdny1dfvgwqkyrkr4ij7f1hm")))) + (build-system python-build-system) + (propagated-inputs + (list python-numpy python-scipy)) + (home-page "https://fbpca.readthedocs.io/") + (synopsis "Functions for principal component analysis and accuracy checks") + (description + "This package provides fast computations for @dfn{principal component +analysis} (PCA), SVD, and eigendecompositions via randomized methods") + (license license:bsd-3))) + (define-public python-xarray (package (name "python-xarray") -- cgit v1.2.3 From 4bc130dcc0608ad01fcf13934a101498018cba99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 13:51:11 +0200 Subject: gnu: Add python-geosketch. * gnu/packages/python-science.scm (python-geosketch): New variable. --- gnu/packages/python-science.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 2f4f1818f3..ff82a97fc9 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -564,6 +564,29 @@ (define-public python-fbpca analysis} (PCA), SVD, and eigendecompositions via randomized methods") (license license:bsd-3))) +(define-public python-geosketch + (package + (name "python-geosketch") + (version "1.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "geosketch" version)) + (sha256 + (base32 + "0knch5h0p8xpm8bi3b5mxyaf1ywwimrsdmbnc1xr5icidcv9gzmv")))) + (build-system python-build-system) + (arguments '(#:tests? #false)) ;there are none + (propagated-inputs (list python-fbpca python-numpy python-scikit-learn)) + (home-page "https://github.com/brianhie/geosketch") + (synopsis "Geometry-preserving random sampling") + (description "geosketch is a Python package that implements the geometric +sketching algorithm described by Brian Hie, Hyunghoon Cho, Benjamin DeMeo, +Bryan Bryson, and Bonnie Berger in \"Geometric sketching compactly summarizes +the single-cell transcriptomic landscape\", Cell Systems (2019). This package +provides an example implementation of the algorithm as well as scripts +necessary for reproducing the experiments in the paper.") + (license license:expat))) + (define-public python-xarray (package (name "python-xarray") -- cgit v1.2.3 From c69c2c1c4d127aed8537eab0cc787062b988be10 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 14:35:28 +0200 Subject: gnu: python-intervaltree: Update to 3.1.0. * gnu/packages/bioinformatics.scm (python-intervaltree): Update to 3.1.0. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d39e08c08c..17e33c34c1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12102,14 +12102,14 @@ (define-public intervaltree (define-public python-intervaltree (package (name "python-intervaltree") - (version "3.0.2") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "intervaltree" version)) (sha256 (base32 - "0wz234g6irlm4hivs2qzmnywk0ss06ckagwh15nflkyb3p462kyb")))) + "0bcm6c6r4ck9nfj9xwz4rm2swc5lrjvmw3lyl6rgj639jf41nawh")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 03858a79084515eb808bb3275cb2078a4dde3909 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 14:35:42 +0200 Subject: gnu: Add python-scanorama. * gnu/packages/bioinformatics.scm (python-scanorama): New variable. --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 17e33c34c1..00238531db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12475,6 +12475,35 @@ (define-public python-hic2cool matrices.") (license license:expat))) +(define-public python-scanorama + (package + (name "python-scanorama") + (version "1.7.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "scanorama" version)) + (sha256 + (base32 + "0il7bf4c7vli2dm2jx7dskh3ymgv8nmk0y90jzgfrnqjzh250x5w")))) + (build-system python-build-system) + (propagated-inputs + (list python-annoy + python-fbpca + python-geosketch + python-intervaltree + python-matplotlib + python-numpy + python-scikit-learn + python-scipy)) + (home-page "https://github.com/brianhie/scanorama") + (synopsis "Panoramic stitching of heterogeneous single cell transcriptomic data") + (description + "Scanorama enables batch-correction and integration of heterogeneous +scRNA-seq datasets, which is described in the paper \"Efficient integration of +heterogeneous single-cell transcriptomes using Scanorama\" by Brian Hie, Bryan +Bryson, and Bonnie Berger.") + (license license:expat))) + (define-public r-pore (package (name "r-pore") -- cgit v1.2.3 From 20f9473532dd288c536581df2573ece2079f7a27 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 15:12:01 +0200 Subject: gnu: Add r-phylotools. * gnu/packages/cran.scm (r-phylotools): New variable. --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fc7fd0467e..e8f21b7567 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14592,6 +14592,27 @@ (define-public r-phylobase methods, incorporating one or more trees and trait data.") (license license:gpl2+))) +(define-public r-phylotools + (package + (name "r-phylotools") + (version "0.2.2") + (source (origin + (method url-fetch) + (uri (cran-uri "phylotools" version)) + (sha256 + (base32 + "1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w")))) + (properties `((upstream-name . "phylotools"))) + (build-system r-build-system) + (propagated-inputs (list r-ape)) + (home-page "https://github.com/helixcn/phylotools") + (synopsis "Phylogenetic tools for eco-phylogenetics") + (description + "This package provides a collection of tools for building RAxML +supermatrix using PHYLIP or aligned FASTA files. These functions will be +useful for building large phylogenies using multiple markers.") + (license license:gpl2))) + (define-public r-rnexml (package (name "r-rnexml") -- cgit v1.2.3 From d5ba31c19accdf14bca23ebc0c3baf1c5b08fb5f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Aug 2022 15:12:10 +0200 Subject: gnu: Add r-rcppalgos. * gnu/packages/cran.scm (r-rcppalgos): New variable. --- gnu/packages/cran.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e8f21b7567..094dd4e449 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13484,6 +13484,38 @@ (define-public r-weights address a bug.") (license license:gpl2+))) +(define-public r-rcppalgos + (package + (name "r-rcppalgos") + (version "2.5.3") + (source (origin + (method url-fetch) + (uri (cran-uri "RcppAlgos" version)) + (sha256 + (base32 + "1ndibdf3k02bpcgackzviczramzkay9idn071nix3dhs5miq1ai8")))) + (properties `((upstream-name . "RcppAlgos"))) + (build-system r-build-system) + (inputs (list gmp)) + (propagated-inputs (list r-cpp11 r-gmp)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/jwood000/RcppAlgos") + (synopsis + "High performance tools for combinatorics and computational mathematics") + (description + "This package provides optimized functions and flexible combinatorial +iterators implemented in C++ for solving problems in combinatorics and +computational mathematics. It utilizes the @code{RMatrix} class from +@code{RcppParallel} for thread safety. There are combination/permutation +functions with constraint parameters that allow for generation of all results +of a vector meeting specific criteria. It is capable of generating specific +combinations/permutations which sets up nicely for parallelization as well as +random sampling. Gmp support permits exploration where the total number of +results is large. Additionally, there are several high performance number +theoretic functions that are useful for problems common in computational +mathematics.") + (license license:gpl2+))) + (define-public r-rcppannoy (package (name "r-rcppannoy") -- cgit v1.2.3 From 6f52d3aec1531c64728e9b5cf7aff61b3641689b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Aug 2022 18:55:26 +0300 Subject: gnu: parallel: Update to 20220722. * gnu/packages/parallel.scm (parallel): Update to 20220722. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index f4ba6c3c9b..8f41d1956d 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -62,14 +62,14 @@ (define-module (gnu packages parallel) (define-public parallel (package (name "parallel") - (version "20220622") + (version "20220722") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "186mbzz5dn2ka8fqk9r8v8fpmh17clh2c6xln0czs81vynl1bgd4")) + (base32 "06gh7bj274qzxdlr5bx36b4jrpdnyfcbzpy6k12l63451nn86h0f")) (snippet '(begin (use-modules (guix build utils)) -- cgit v1.2.3 From 51a6dd170b6d1d085863e831b1c826d7bcf6f8cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Aug 2022 19:04:36 +0300 Subject: gnu: parallel: Add bash-minimal. * gnu/packages/parallel.scm (parallel)[inputs]: Add bash-minimal. --- gnu/packages/parallel.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 8f41d1956d..d2fb340d26 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -43,6 +43,7 @@ (define-module (gnu packages parallel) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages flex) #:use-module (gnu packages freeipmi) @@ -112,7 +113,7 @@ (define-public parallel (native-inputs (list perl)) (inputs - (list perl procps)) + (list bash-minimal perl procps)) (home-page "https://www.gnu.org/software/parallel/") (synopsis "Build and execute command lines in parallel") (description -- cgit v1.2.3 From e1fb703e3ecebcbd0b81177e55ad917e7a5ceb19 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Aug 2022 19:09:22 +0300 Subject: gnu: nano: Update to 6.4. * gnu/packages/nano.scm (nano): Update to 6.4. --- gnu/packages/nano.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nano.scm b/gnu/packages/nano.scm index 40d79a508e..e77ef720db 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -31,13 +31,13 @@ (define-module (gnu packages nano) (define-public nano (package (name "nano") - (version "6.3") + (version "6.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "11w6dxg8159bhcap9gzv11nlcnl8mfx5ss0ga05p6wjnk2j2slzb")))) + (base32 "1h318vrpscfcarmq3s870cn92iyw46w426nyavg9cxwaly6ax6a1")))) (build-system gnu-build-system) (inputs (list gettext-minimal ncurses)) -- cgit v1.2.3 From 29c51c6525d8e03765f641a769aed15a5be66b9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Aug 2022 19:47:50 +0300 Subject: gnu: wcalc: Remove pre-generated files. * gnu/packages/maths.scm (wcalc)[source]: Add snippet to remove files generated by bison and flex. [native-inputs]: Add bison, flex. --- gnu/packages/maths.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8d71bf324f..a3825e5433 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015–2022 Ricardo Wurmus ;;; Copyright © 2015 Sou Bunnbu ;;; Copyright © 2015, 2018 Mark H Weaver -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner +;;; Copyright © 2015-2022 Efraim Flashner ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018, 2020, 2021 Kei Kebreau @@ -5448,11 +5448,19 @@ (define-public wcalc (uri (string-append "mirror://sourceforge/w-calc/Wcalc/" version "/" "wcalc-" version ".tar.bz2")) (sha256 - (base32 - "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f")))) + (base32 + "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f")) + (snippet + #~(begin + (for-each delete-file + (list "src/common/scanner.c" + "src/common/parser.c" + "src/common/parser.h")))))) (build-system gnu-build-system) (inputs (list mpfr readline)) + (native-inputs + (list bison flex)) (home-page "http://w-calc.sourceforge.net/index.php") (synopsis "Flexible command-line scientific calculator") (description "Wcalc is a very capable calculator. It has standard functions -- cgit v1.2.3 From 44c7098809e1f9293ffb6b92bfcf7251332ea84d Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 19 Jul 2022 16:34:56 +0000 Subject: gnu: gnuplot: Remove input labels. * gnu/packages/maths.scm (gnuplot)[inputs]: Move below native-inputs and sort. [native-inputs]: Remove labels. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a3825e5433..c647c06c8a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1130,10 +1130,10 @@ (define-public gnuplot (sha256 (base32 "112dplskbkdbaqi935m2xlk1xsw8s5l568wm7xad75hgp6x9py2i")))) (build-system gnu-build-system) - (inputs (list readline cairo pango gd lua)) (native-inputs - `(("pkg-config" ,pkg-config) - ("texlive" ,texlive-tiny))) + (list pkg-config texlive-tiny)) + (inputs + (list cairo gd lua pango readline)) (arguments `(#:configure-flags (list (string-append "--with-texdir=" %output "/texmf-local/tex/latex/gnuplot")) -- cgit v1.2.3 From a53bc4003682d9371fb8beda6d202e9a8c9556f2 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 19 Jul 2022 16:35:00 +0000 Subject: gnu: gnuplot: Use G-expressions. * gnu/packages/maths.scm (gnuplot)[arguments]: Use G-expressions. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c647c06c8a..777486227f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1134,11 +1134,12 @@ (define-public gnuplot (list pkg-config texlive-tiny)) (inputs (list cairo gd lua pango readline)) - (arguments `(#:configure-flags (list (string-append - "--with-texdir=" %output - "/texmf-local/tex/latex/gnuplot")) - ;; Plot on a dumb terminal during tests. - #:make-flags '("GNUTERM=dumb"))) + (arguments + (list #:configure-flags + #~(list (string-append "--with-texdir=" #$output + "/texmf-local/tex/latex/gnuplot")) + ;; Plot on a dumb terminal during tests. + #:make-flags #~'("GNUTERM=dumb"))) (home-page "http://www.gnuplot.info") (synopsis "Command-line driven graphing utility") (description "Gnuplot is a portable command-line driven graphing -- cgit v1.2.3 From 797f3de592ba911802a72ac12f4f1c76514922a9 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 19 Jul 2022 16:35:09 +0000 Subject: gnu: gnuplot: Update to 5.4.4. * gnu/packages/maths.scm (gnuplot): Update to 5.4.4. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 777486227f..2901d290ef 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1121,14 +1121,14 @@ (define-public giza (define-public gnuplot (package (name "gnuplot") - (version "5.4.3") + (version "5.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" version "/gnuplot-" version ".tar.gz")) (sha256 - (base32 "112dplskbkdbaqi935m2xlk1xsw8s5l568wm7xad75hgp6x9py2i")))) + (base32 "00h97y8njhvfjbdvc0njw0znxbrlfynd1iazn8w3anvzhsvh08rp")))) (build-system gnu-build-system) (native-inputs (list pkg-config texlive-tiny)) -- cgit v1.2.3 From 7e130543733f7a0ffc4e7c68d7ab6619509083d7 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Tue, 19 Jul 2022 16:14:11 +0000 Subject: gnu: python-pyvista: Update to 0.35.2. * gnu/packages/python-science.scm (python-pyvista): Update to 0.35.2. Signed-off-by: Efraim Flashner --- gnu/packages/python-science.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index ff82a97fc9..95f60aae7b 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1226,7 +1226,7 @@ (define-public python-numpy-groupies (define-public python-pyvista (package (name "python-pyvista") - (version "0.35.1") + (version "0.35.2") (source ;; The PyPI tarball does not contain the tests. ;; (However, we don't yet actually run the tests.) @@ -1237,7 +1237,7 @@ (define-public python-pyvista (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1rwwn8a4j3i22il6dxr2qzrnnz3n1gjbpa2p8gfzrjmzp5lzzk81")))) + (base32 "1qmxrhqm3ag736yb761jy1himwlr3p676xyqbry61h97dj11n6sq")))) (build-system python-build-system) (propagated-inputs (list python-appdirs -- cgit v1.2.3 From f0be1b82dc7d92059995e2e6b0a90667d7a9358e Mon Sep 17 00:00:00 2001 From: andy Tai Date: Tue, 12 Jul 2022 21:48:01 -0700 Subject: gnu: xpra: Update to 4.3.4 gnu/packages/xorg.scm (xpra): Update to 4.3.4 Signed-off-by: Efraim Flashner --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index cbb1dc7779..ea89d87fe0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6207,14 +6207,14 @@ (define-public xcompmgr (define-public xpra (package (name "xpra") - (version "4.3.1") + (version "4.3.4") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "1adp790v9lq3v9pnkyf4skv69n2pd7fjqikzw145swhq9aginh5z")) + (base32 "1rh4wx4af27xjcxdxrw950wkydgkvm5p3aaiqfmdij6sh6i14xcl")) (patches (search-patches "xpra-4.2-systemd-run.patch" "xpra-4.2-install_libs.patch")))) (build-system python-build-system) -- cgit v1.2.3 From 3685939f1b0e463e8d68d8e193d5d30a12064e6a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 14:57:15 -0400 Subject: gnu: rpm: Make popt a propagated input. * gnu/packages/package-management.scm (rpm)[inputs]: Move popt... [propagated-inputs]: ... to here. --- gnu/packages/package-management.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5ec85d8bc9..ea671c0760 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -887,11 +887,13 @@ (define-public rpm lua nspr nss - popt python sqlite xz zlib)) + (propagated-inputs + ;; popt is listed in the 'Requires' of rpm.pc. + (list popt)) (home-page "https://rpm.org/") (synopsis "The RPM Package Manager") (description -- cgit v1.2.3 From b316ddbd832922645986e9b50854fc491e68473b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 15:05:05 -0400 Subject: gnu: rpm: Update to 4.17.1. * gnu/packages/package-management.scm (rpm): Update to 4.17.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ea671c0760..c22c9f7a43 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -850,7 +850,7 @@ (define-public xstow (define-public rpm (package (name "rpm") - (version "4.17.0") + (version "4.17.1") (source (origin (method url-fetch) (uri (string-append "http://ftp.rpm.org/releases/rpm-" @@ -858,7 +858,7 @@ (define-public rpm version ".tar.bz2")) (sha256 (base32 - "0sjyqs6hc57k46f45b68dfxnp985s0gar0fi1s0ig6vl4h5j439f")))) + "0pbfj94ha59lbnd8dk0aqyxjv37xixfdcazq3y2mhwkf8s9vf48c")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-db" ;use the system's bdb -- cgit v1.2.3 From 5ee30cfa84a7d66cab5803c334e81579f6797200 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 14:58:39 -0400 Subject: gnu: libmodulemd: Fix build and use new style inputs and gexps. * gnu/packages/rpm.scm (libmodulemd) [arguments]: Use gexps. [phases]{fix-glib-doc-prefix}: Use search-input-directory. {fix-docbook-references}: Use search-input-file. {move-documentation}: Use search-input-directory. [native-inputs]: Use new style. Add python. [inputs]: Use new style. --- gnu/packages/rpm.scm | 80 +++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm index 96c6776d1a..431c2b8e5d 100644 --- a/gnu/packages/rpm.scm +++ b/gnu/packages/rpm.scm @@ -86,52 +86,50 @@ (define-public libmodulemd (build-system meson-build-system) (outputs '("out" "doc")) ;2.6 MiB of HTML documentation (arguments - `(#:configure-flags - (list (string-append "-Dgobject_overrides_dir_py3=" - (python:site-packages %build-inputs %outputs))) - #:imported-modules (,@%meson-build-system-modules + (list + #:configure-flags + #~(list (string-append "-Dgobject_overrides_dir_py3=" + (python:site-packages %build-inputs %outputs))) + #:imported-modules `(,@%meson-build-system-modules (guix build python-build-system)) - #:modules ((guix build meson-build-system) + #:modules '((guix build meson-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-glib-doc-prefix - (lambda* (#:key inputs #:allow-other-keys) - (let ((glib:doc (assoc-ref inputs "glib:doc"))) - (substitute* "meson.build" - (("glib_docpath = .*") - (format #f "glib_docpath = '~a'~%" - (string-append glib:doc - "/share/gtk-doc/html"))))))) - (add-after 'unpack 'fix-docbook-references - ;; gtk-doc doesn't seem to honor DocBook 4.1.2's docbook.cat's - ;; catalog file, even when adding it to XML_CATALOG_FILES. Work - ;; around it by adjusting the DocBook references directly. - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "modulemd/modulemd-docs.xml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd"))))) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (src (string-append out "/share/gtk-doc")) - (dst (string-append doc "/share/gtk-doc"))) - (mkdir-p (dirname dst)) - (rename-file src dst))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-glib-doc-prefix + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "meson.build" + (("glib_docpath = .*") + (format #f "glib_docpath = '~a'~%" + (search-input-directory (or native-inputs inputs) + "share/gtk-doc/html")))))) + (add-after 'unpack 'fix-docbook-references + ;; gtk-doc doesn't seem to honor DocBook 4.1.2's docbook.cat's + ;; catalog file, even when adding it to XML_CATALOG_FILES. Work + ;; around it by adjusting the DocBook references directly. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "modulemd/modulemd-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (search-input-file inputs "xml/dtd/docbook/docbookx.dtd"))))) + (add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((dst (string-append #$output:doc "/share/gtk-doc"))) + (mkdir-p (dirname dst)) + (rename-file (search-input-directory outputs "share/gtk-doc") + dst))))))) (native-inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("glib:bin" ,glib "bin") - ("glib:doc" ,glib-with-documentation "doc") - ("gobject-introspection" ,gobject-introspection) ;for g-ir-scanner - ("gtk-doc" ,gtk-doc) - ("help2man" ,help2man) - ("pkg-config" ,pkg-config))) + (list docbook-xml-4.1.2 + `(,glib "bin") + `(,glib-with-documentation "doc") + gobject-introspection ;for g-ir-scanner + gtk-doc + help2man + pkg-config + python)) ;for 'site-packages' call (inputs - `(("gtk" ,gtk+) - ("python-pygobject" ,python-pygobject))) + (list gtk+ + python-pygobject)) (propagated-inputs ;; glib and gobject are listed as 'Requires' in modulemd-2.0.pc. (list glib -- cgit v1.2.3 From c162dc379ccbfebcd15ae98791ce4e68249322b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 14:29:52 -0400 Subject: gnu: createrepo-c: Use gexps. * gnu/packages/rpm.scm (createrepo-c) [phases]: Use gexps. --- gnu/packages/rpm.scm | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm index 431c2b8e5d..0a785382d5 100644 --- a/gnu/packages/rpm.scm +++ b/gnu/packages/rpm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,6 +19,7 @@ (define-module (gnu packages rpm) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system cmake) @@ -157,25 +158,26 @@ (define-public createrepo-c "175na06mjyr8ws5pkknaicpziayj6p0xaanv62d54c6zxl4w484w")))) (build-system cmake-build-system) (arguments - `(#:imported-modules (,@%cmake-build-system-modules + (list + #:imported-modules `(,@%cmake-build-system-modules (guix build python-build-system)) - #:modules ((guix build cmake-build-system) + #:modules '((guix build cmake-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-python-site-prefix - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "src/python/CMakeLists.txt" - (("EXECUTE_PROCESS.*OUTPUT_VARIABLE PYTHON_INSTALL_DIR.*") - (format #f "set (PYTHON_INSTALL_DIR ~a)~%" - (python:site-packages inputs outputs)))))) - (add-after 'unpack 'fix-bash-completion-prefix - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*") - (format #f "set (BASHCOMP_DIR ~a\ -/share/bash-completion/completions)~%" (assoc-ref outputs "out"))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-python-site-prefix + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/python/CMakeLists.txt" + (("EXECUTE_PROCESS.*OUTPUT_VARIABLE PYTHON_INSTALL_DIR.*") + (format #f "set (PYTHON_INSTALL_DIR ~a)~%" + (python:site-packages inputs outputs)))))) + (add-after 'unpack 'fix-bash-completion-prefix + (lambda _ + (substitute* "CMakeLists.txt" + (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*") + (format #f "set (BASHCOMP_DIR ~a\ +/share/bash-completion/completions)~%" #$output)))))))) (native-inputs (list bash-completion pkg-config python)) (inputs -- cgit v1.2.3 From da96de3b661723954a6469b70d9cb9cc00e031b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 15:08:56 -0400 Subject: gnu: drpm: Update to 0.5.1. * gnu/packages/rpm.scm (drpm): Update to 0.5.1. --- gnu/packages/rpm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm index 0a785382d5..ab67f6c132 100644 --- a/gnu/packages/rpm.scm +++ b/gnu/packages/rpm.scm @@ -44,7 +44,7 @@ (define-module (gnu packages rpm) (define-public drpm (package (name "drpm") - (version "0.5.0") + (version "0.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -53,7 +53,7 @@ (define-public drpm (file-name (git-file-name name version)) (sha256 (base32 - "0m269nl8s31yjyz7kknv4jl9mx12xjpx2ly6wf66zs5613m4rj1z")))) + "0czg69crs2idnd8zsr7p01cd02f981gb5hq15m3qkwd25zxxd1l0")))) (build-system cmake-build-system) (native-inputs (list cmocka pkg-config)) -- cgit v1.2.3 From de40c03a750e069a554353bc58dddd634595b1fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 15:09:01 -0400 Subject: gnu: zchunk: Update to 1.2.2. * gnu/packages/compression.scm (zchunk): Update to 1.2.2. --- gnu/packages/compression.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index df056dd65a..6070c5beb1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2346,7 +2346,7 @@ (define-public quazip (define-public zchunk (package (name "zchunk") - (version "1.1.16") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -2355,7 +2355,7 @@ (define-public zchunk (file-name (git-file-name name version)) (sha256 (base32 - "0nlzwnv6wh2yjyyv27f81jnvmk7psgpbnw7dsdp7frfkya569hgv")))) + "0q0avb0397xkmidl8rxasfywp0r7w3awk6271pa2d9xl9p1n82zy")))) (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 1a5384e9a702c366f3b14ed1ac3db8d3eb6640e2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 2 Aug 2022 15:06:29 -0400 Subject: gnu: createrepo-c: Update to 0.20.1. * gnu/packages/rpm.scm (createrepo-c): Update to 0.20.1. --- gnu/packages/rpm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm index ab67f6c132..0b6cacadef 100644 --- a/gnu/packages/rpm.scm +++ b/gnu/packages/rpm.scm @@ -146,7 +146,7 @@ (define-public libmodulemd (define-public createrepo-c (package (name "createrepo-c") - (version "0.17.6") + (version "0.20.1") (source (origin (method git-fetch) (uri (git-reference @@ -155,7 +155,7 @@ (define-public createrepo-c (file-name (git-file-name name version)) (sha256 (base32 - "175na06mjyr8ws5pkknaicpziayj6p0xaanv62d54c6zxl4w484w")))) + "07d89s6kknf79phzan3d2vy1rq64ih49qk2w51hsmfn73qins9wy")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From c67635f5077768537d033fa67e3ebeef9b25b201 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 23 Jul 2022 15:58:17 +0800 Subject: gnu: Add font-lxgw-wenkai. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts.scm (font-lxgw-wenkai): New variable. Signed-off-by: Hilton Chain Signed-off-by: 宋文武 --- gnu/packages/fonts.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index a381f061af..5ffebb35eb 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2021 Liliana Marie Prikler ;;; Copyright © 2022 Jose G Perez Taveras +;;; Copyright © 2022 Hilton Chain ;;; ;;; This file is part of GNU Guix. ;;; @@ -2709,3 +2710,22 @@ (define-public font-atui-feather icon is designed on a 24x24 grid with an emphasis on simplicity, consistency, and readability. This package bundles those icons into a font.") (license license:expat)))) + +(define-public font-lxgw-wenkai + (package + (name "font-lxgw-wenkai") + (version "1.235.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/lxgw/LxgwWenKai/releases/download/v" + version "/lxgw-wenkai-v" version ".tar.gz")) + (sha256 + (base32 + "17li3xry4j4ccdnwz2pcnf0gv7c5mwq0h5fwvl7ar28brn2qgdbk")))) + (build-system font-build-system) + (home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/") + (synopsis "LXGW Wenkai / 霞鹜文楷") + (description + "An open-source Chinese font derived from Fontworks' Klee One.") + (license license:silofl1.1))) -- cgit v1.2.3 From ebdd3523010d2deb8158448dc54784a7a3c60f8f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 23 Jul 2022 15:59:52 +0800 Subject: gnu: Add font-lxgw-wenkai-tc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts (font-lxgw-wenkai-tc): New variable. Signed-off-by: Hilton Chain Signed-off-by: 宋文武 --- gnu/packages/fonts.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5ffebb35eb..9ff2035a10 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2729,3 +2729,21 @@ (define-public font-lxgw-wenkai (description "An open-source Chinese font derived from Fontworks' Klee One.") (license license:silofl1.1))) + +(define-public font-lxgw-wenkai-tc + (package + (name "font-lxgw-wenkai-tc") + (version "0.920") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v" + version "/lxgw-wenkai-tc-v" version ".tar.gz")) + (sha256 + (base32 + "1kysqzi19ldd1a3pd9axmggcbm1719myq6i6q6fdb1afscn272cp")))) + (build-system font-build-system) + (home-page "https://github.com/lxgw/LxgwWenKaitc") + (synopsis "LXGW WenKai TC / 霞鶩文楷 TC") + (description "The Traditional Chinese Version of LXGW WenKai.") + (license license:silofl1.1))) -- cgit v1.2.3 From 3d727b8334e88d641a8dc16314a7dd0cb5ccf66e Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Tue, 2 Aug 2022 22:00:02 -0400 Subject: gnu: qt5ct: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/qt.scm (qt5ct)[build-system]: Change to qt-build-system. [arguments]: Adjust accordingly. [inputs]: Remove qtbase-5. Signed-off-by: 宋文武 --- gnu/packages/qt.scm | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f74f84f2ac..86f5d11714 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -159,37 +159,22 @@ (define-public qt5ct (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) (sha256 (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))) - (build-system gnu-build-system) + (build-system qt-build-system) (arguments - `(#:tests? #f ; No target - #:imported-modules - (,@%qt-build-system-modules) - #:modules - ((guix build gnu-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qt5ct.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") - (search-input-file inputs "/bin/lrelease"))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "PREFIX=" out) - (string-append "BINDIR=" out "/bin") - (string-append "DATADIR=" out "/share") - (string-append "PLUGINDIR=" out "/lib/qt5/plugins"))))) - (add-after 'install 'qt-wrap - (assoc-ref qt:%standard-phases 'qt-wrap))))) + (list + #:tests? #f ; No target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt" + "src/qt5ct-style/CMakeLists.txt") + (("\\$\\{PLUGINDIR\\}") + (string-append #$output "/lib/qt5/plugins")))))))) (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtsvg-5)) + (list qtsvg-5)) (synopsis "Qt5 Configuration Tool") (description "Qt5CT is a program that allows users to configure Qt5 settings (such as icons, themes, and fonts) in desktop environments or -- cgit v1.2.3 From 94f801a4269a774e1d4bafb4ea2db75f5d68504a Mon Sep 17 00:00:00 2001 From: FELŠÖCI Marek Date: Fri, 29 Jul 2022 15:45:02 +0200 Subject: gnu: python-dill: Update to 0.3.5.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dill): Update to 0.3.5.1. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6fd18bfa35..b53609ebb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -125,6 +125,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2022 Philip McGrath +;;; Copyright © 2022 Marek Felšöci ;;; ;;; This file is part of GNU Guix. ;;; @@ -22653,13 +22654,13 @@ (define-public python-anndata (define-public python-dill (package (name "python-dill") - (version "0.3.1.1") + (version "0.3.5.1") (source (origin (method url-fetch) (uri (pypi-uri "dill" version)) (sha256 - (base32 "1704g8z70d210ksgbccs2v545v9w0wc6lx15m296alb7jf0yzn22")))) + (base32 "11lc40x37cx2i8qqbc5qklifm65dyjl6prrqsycybvpixzrl2pnp")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e2020eb24ad0eddd228ce4a26463d881c4e79d0b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:26 -0400 Subject: gnu: Add ocaml-luv. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-luv): New variable. Signed-off-by: 宋文武 --- gnu/packages/ocaml.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ff24861eb0..895b99320e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -2624,6 +2625,48 @@ (define-public ocaml-lwt locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml-luv + (package + (name "ocaml-luv") + (version "0.5.11") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/aantron/luv/releases/download/" + version "/luv-" version ".tar.gz")) + (sha256 + (base32 + "0hrsi8n2l31bcwgj847df4chjgqb9lmwkaky8fvvi15k25rz9v6c")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled configure and libuv. + (delete-file-recursively "src/c/vendor") + #t)))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-system-libuv + (lambda _ + (setenv "LUV_USE_SYSTEM_LIBUV" "yes"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "--no-buffer" "--force"))))))) + (inputs (list libuv)) + (propagated-inputs (list ocaml-ctypes ocaml-result ocaml-odoc)) + (native-inputs (list ocaml-base ocaml-alcotest)) + (home-page "https://github.com/aantron/luv") + (synopsis "Binding to libuv: cross-platform asynchronous I/O") + (description + "Luv is a binding to libuv, the cross-platform C library that does +asynchronous I/O in Node.js and runs its main loop. Besides asynchronous I/O, +libuv also supports multiprocessing and multithreading. Multiple event loops +can be run in different threads. libuv also exposes a lot of other +functionality, amounting to a full OS API, and an alternative to the standard +module Unix.") + (license license:expat))) + (define-public ocaml-lwt-react (package (inherit ocaml-lwt) -- cgit v1.2.3 From dca0a3ac9380f0d9fe9ef80092e4c997b239243a Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:45 -0400 Subject: gnu: Add ocaml-ptmap. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-ptmap): New variable. Signed-off-by: 宋文武 --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 895b99320e..da7086ab2b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4407,6 +4407,34 @@ (define-public ocaml4.07-utop ("ocaml-zed" ,ocaml-zed))) (properties '())))) +(define-public ocaml-ptmap + (package + (name "ocaml-ptmap") + (version "2.0.5") + (source (origin + (method url-fetch) + (uri + (string-append "https://github.com/backtracking/ptmap/releases/download/" + version "/ptmap-" version ".tbz")) + (sha256 + (base32 + "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb")))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest"))))))) + (propagated-inputs (list ocaml-stdlib-shims ocaml-seq)) + (home-page "https://github.com/backtracking/ptmap") + (synopsis "Maps of integers implemented as Patricia trees") + (description + "An implementation inspired by Okasaki & Gill's paper 'Fast Mergeable +Integer Maps.'") + (license license:lgpl2.1))) ; with linking exception + (define-public ocaml-integers (package (name "ocaml-integers") -- cgit v1.2.3 From c99487c2356e6385425cd891db82810d333fa096 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:31:57 -0400 Subject: gnu: Add ocaml-sha. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-sha): New variable. Signed-off-by: 宋文武 --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index da7086ab2b..8620d2bde3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5930,6 +5930,28 @@ (define-public ocaml-octavius (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) +(define-public ocaml-sha + (package + (name "ocaml-sha") + (version "1.15.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/djs55/ocaml-sha/releases/download/" + version "/sha-" version ".tbz")) + (sha256 + (base32 + "1dzzhchknnbrpp5s81iqbvmqp4s0l75yrq8snj70ch3wkarmgg9z")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-stdlib-shims ocaml-odoc)) + (native-inputs (list ocaml-ounit2)) + (home-page "https://github.com/djs55/ocaml-sha") + (synopsis "OCaml binding to the SHA cryptographic functions") + (description + "This is the binding for SHA interface code in OCaml, offering the same +interface as the MD5 digest included in the OCaml standard library. It +currently provides SHA1, SHA256 and SHA512 hash functions.") + (license license:isc))) + (define-public ocaml-ppx-hash (package (name "ocaml-ppx-hash") -- cgit v1.2.3 From 1b5d4bf4be78d0d1fc980a91d846bc577f69e9ab Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:04 -0400 Subject: gnu: Add ocaml-xml-light. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (ocaml-xml-light): New variable. Signed-off-by: 宋文武 --- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8620d2bde3..c532e2a8b5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2812,6 +2812,45 @@ (define-public ocaml-bos run command line programs.") (license license:isc))) +(define-public ocaml-xml-light + (package + (name "ocaml-xml-light") + (version "2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ncannasse/xml-light") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "089ywjz84y4p5iln94y54vh03b5fm2zrl2dld1398dyrby96dp6s")))) + (build-system ocaml-build-system) + (arguments + (list #:tests? #f ; There are no tests. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prefix + (lambda _ + (substitute* "Makefile" + (("`\\$\\(OCAMLC\\) -where`") + (string-append #$output "/lib/ocaml/site-lib/xml-light"))))) + (delete 'configure) ; no configure + (add-before 'install 'mkdir + (lambda _ + (mkdir-p (string-append #$output "/lib/ocaml/site-lib/xml-light")))) + (replace 'install + (lambda _ + (invoke "make" "install_ocamlfind")))))) + (home-page "https://github.com/ncannasse/xml-light") + (synopsis "Minimal XML parser & printer for OCaml") + (description + "Xml-Light provides functions to parse an XML document into an OCaml data +structure, work with it, and print it back to an XML document. It also +supports DTD parsing and checking, and is entirely written in OCaml, hence it +does not require additional C libraries.") + (license license:lgpl2.1+))) ; with linking exception + (define-public ocaml-xmlm (package (name "ocaml-xmlm") -- cgit v1.2.3 From bf74f708d35b704ad2ead82890fb3dde50849d56 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:42 -0400 Subject: gnu: Add mikktspace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graphics.scm (mikktspace): New variable. Signed-off-by: 宋文武 --- gnu/packages/graphics.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 38e6533a43..fc90c72bed 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -584,6 +584,45 @@ (define-public assimp more.") (license license:bsd-3))) +(define-public mikktspace + ;; The latest commit is used as there is no release. + (let ((commit "3e895b49d05ea07e4c2133156cfa94369e19e409") + (revision "0")) + (package + (name "mikktspace") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmikk/MikkTSpace") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rjh9zflx51hdhnfadal87v4hhkrbprkv692hjkg9wkxx0ch39zi")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (invoke #$(cc-for-target) "mikktspace.c" "-O2" "-g" "-fPIC" + "-shared" "-o" "libmikktspace.so"))) + (replace 'install + (lambda _ + (install-file "mikktspace.h" + (string-append #$output "/include")) + (install-file "libmikktspace.so" + (string-append #$output "/lib"))))))) + (home-page "http://www.mikktspace.com/") + (synopsis "Library for a common standard for tangent spaces") + (description + "This package provides a common standard tangent space library used in +baking tools to produce normal maps.") + (license license:zlib)))) + (define-public openshadinglanguage (package (name "openshadinglanguage") -- cgit v1.2.3 From cb14d802aef0aaa475147e0a5cc36ff71e631a62 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:32:54 -0400 Subject: gnu: Add minimp3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mp3.scm (minimp3): New variable. Signed-off-by: 宋文武 --- gnu/packages/mp3.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 4a8bdad711..275468d343 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,7 @@ (define-module (gnu packages mp3) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system cmake)) @@ -247,6 +249,35 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public minimp3 + ;; The latest commit is used as there is no release. + (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") + (revision "0")) + (package + (name "minimp3") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lieff/minimp3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0brgrbij8swhp7lac21xnnrr5l0371lkr5vz6h9x0dbz1qq2xhsj")))) + ;; TODO: minimp3 has many more files for at least tests with scripts to + ;; run them, although it is unclear how to easily package them. + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("minimp3.h" "include/") + ("minimp3_ex.h" "include/")))) + (home-page "https://github.com/lieff/minimp3") + (synopsis "Minimalistic MP3 decoder header library") + (description + "Minimp3 is a header-only MP3 decoder library.") + (license license:cc0)))) + (define-public mp3info (package (name "mp3info") -- cgit v1.2.3 From e2ad0b0f8b9cdea88211827b40a5b46aa4d9f062 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 2 Aug 2022 17:23:05 +0200 Subject: gnu: nsis: Update to 3.08. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/nsis-source-date-epoch.patch: Drop this patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/patches/nsis-env-passthru.patch: Adjust the patch. * gnu/packages/installers.scm (make-nsis): Update to 3.08. Signed-off-by: 宋文武 --- gnu/local.mk | 1 - gnu/packages/installers.scm | 9 ++++----- gnu/packages/patches/nsis-env-passthru.patch | 17 ++++++++--------- gnu/packages/patches/nsis-source-date-epoch.patch | 23 ----------------------- 4 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/nsis-source-date-epoch.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 10c3192ade..2e02af8b71 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1550,7 +1550,6 @@ dist_patch_DATA = \ %D%/packages/patches/nginx-socket-cloexec.patch \ %D%/packages/patches/nnpack-system-libraries.patch \ %D%/packages/patches/nsis-env-passthru.patch \ - %D%/packages/patches/nsis-source-date-epoch.patch \ %D%/packages/patches/nss-getcwd-nonnull.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-3.56-pkgconfig.patch \ diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 01ad03e6af..30cd0e4e6c 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,16 +34,15 @@ (define (make-nsis machine target-arch nsis-target-type) (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.05") + (version "3.08") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn")) - (patches (search-patches "nsis-env-passthru.patch" - "nsis-source-date-epoch.patch")))) + "11qy1n1qdcqwal9hn8cmzm7gxjdyx7by6w14rfz2l646afnp0lm8")) + (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) ("xbinutils" ,xbinutils) @@ -125,7 +124,7 @@ (define (mingw-path? path) (lambda _ ;; NSIS target detection is screwed up, manually change ;; it ourselves - (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI") + (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86UNICODE") (string-append "m_target_type=" ,nsis-target-type)))))))) (home-page "https://nsis.sourceforge.io/Main_Page") (synopsis "System to create Windows installers") diff --git a/gnu/packages/patches/nsis-env-passthru.patch b/gnu/packages/patches/nsis-env-passthru.patch index 36b4092230..22b186f55a 100644 --- a/gnu/packages/patches/nsis-env-passthru.patch +++ b/gnu/packages/patches/nsis-env-passthru.patch @@ -1,12 +1,11 @@ ---- nsis-3.04-src/SConstruct 2019-05-30 14:53:30.276775332 -0400 -+++ nsis-3.04-src/SConstruct 2019-05-30 14:54:17.901232914 -0400 -@@ -77,6 +77,9 @@ - if not toolset and not path: - defenv = Environment(TARGET_ARCH = arch) +--- nsis-3.08-src/SConstruct 2021-01-15 17:31:10.000000000 +0100 ++++ nsis-3.08-src/SConstruct-passthru 2022-08-02 17:11:12.414702282 +0200 +@@ -71,7 +71,7 @@ -+import os; -+defenv['ENV'] = os.environ -+ - Export('defenv') + defenv = { + 'TARGET_ARCH': ARGUMENTS.get('TARGET_ARCH', 'x86'), +- 'ENV': {} ++ 'ENV': os.environ.copy() + } ###################################################################### diff --git a/gnu/packages/patches/nsis-source-date-epoch.patch b/gnu/packages/patches/nsis-source-date-epoch.patch deleted file mode 100644 index 744c2a8011..0000000000 --- a/gnu/packages/patches/nsis-source-date-epoch.patch +++ /dev/null @@ -1,23 +0,0 @@ -Honour SOURCE_DATE_EPOCH for VERSION default - -Merged upstream as cd3f1024a37a332f1d4fa96a817ca80dfa2a478c, but not yet in a -release. GitHub PR: https://github.com/kichik/nsis/pull/13 - -Python snippet from: https://reproducible-builds.org/docs/source-date-epoch/#python - - -diff --git a/SConstruct b/SConstruct -index e8252c9..41786f2 100755 ---- a/SConstruct -+++ b/SConstruct -@@ -95,8 +95,8 @@ default_doctype = 'html' - if defenv.WhereIs('hhc', os.environ['PATH']): - default_doctype = 'chm' - --from time import strftime, gmtime --cvs_version = strftime('%d-%b-%Y.cvs', gmtime()) -+import time -+cvs_version = time.strftime('%d-%b-%Y.cvs', time.gmtime(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))) - - opts = Variables() - -- cgit v1.2.3 From a4c131a749941bf590b108f751fe8e540e475819 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:34:42 -0400 Subject: gnu: Add neko. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haxe.scm: New module. (neko): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Add new module. Signed-off-by: 宋文武 --- gnu/local.mk | 2 + gnu/packages/haxe.scm | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 gnu/packages/haxe.scm (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2e02af8b71..d273708ee4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -50,6 +50,7 @@ # Copyright © 2022 Daniel Meißner # Copyright © 2022 Remco van 't Veer # Copyright © 2022 Artyom V. Poptsov +# Copyright © 2022 John Kehayias # # This file is part of GNU Guix. # @@ -301,6 +302,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/haskell-crypto.scm \ %D%/packages/haskell-web.scm \ %D%/packages/haskell-xyz.scm \ + %D%/packages/haxe.scm \ %D%/packages/heads.scm \ %D%/packages/hexedit.scm \ %D%/packages/hugs.scm \ diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm new file mode 100644 index 0000000000..6d8d9caca1 --- /dev/null +++ b/gnu/packages/haxe.scm @@ -0,0 +1,107 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 John Kehayias +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages haxe) + #:use-module (gnu packages) + #:use-module (gnu packages apr) + #:use-module (gnu packages audio) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages gl) + #:use-module (gnu packages graphics) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libevent) + #:use-module (gnu packages mp3) + #:use-module (gnu packages ocaml) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) + #:use-module (gnu packages xiph) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix build-system dune) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) + +(define-public neko + (package + (name "neko") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/neko") + (commit (string-append + "v" + (string-map (lambda (x) (if (char=? x #\.) #\- x)) version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xgw646pghsjjbzd8qlaq17vq96swlrazpivrvyrhdj36vb3sci3")))) + (build-system cmake-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prefix + (lambda _ + (substitute* "CMakeLists.txt" + (("\\\\\\$ORIGIN") + (string-append #$output "/lib")))))))) + (inputs (list apr + apr-util + gtk+-2 + httpd + libgc + mbedtls-apache + mysql + openssl + pcre + sqlite + zlib)) + (native-inputs (list git pkg-config)) ; git for source_archive and applying patch + (home-page "https://nekovm.org/") + (synopsis "High-level dynamically typed programming language and virtual +machine") + (description + "The Neko programming language is a high-level dynamically typed +programming language. It can be used as an embedded scripting language. It +has been designed to provide a common runtime for several different languages. +You can easily extend the language with C libraries. You can also write +generators from your own language to Neko and then use the Neko Runtime to +compile, run, and access existing libraries. + +Neko has a compiler and a virtual machine. The Virtual Machine is both very +lightweight and well optimized, so it can run very quickly. The VM can be +easily embedded into any application and your libraries can be accessed using +the C foreign function interface. + +You can use the compiler as standalone command line executable separate from +the VM, or as a Neko library to perform compile-and-run funtions for +interactive languages.") + (license license:expat))) -- cgit v1.2.3 From 0dba452898dc4fdbe1b3c2e64f6451ee2000a366 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:43:32 -0400 Subject: gnu: Add haxe. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haxe.scm (haxelib-src): New variable. (haxe): New variable. Signed-off-by: 宋文武 --- gnu/packages/haxe.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 6d8d9caca1..95de4c5e4b 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -105,3 +105,87 @@ (define-public neko the VM, or as a Neko library to perform compile-and-run funtions for interactive languages.") (license license:expat))) + +(define haxelib-src + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/haxelib") + ;; This should match the haxelib submodule in haxe. + (commit "4b27f91d8a4ff279d9903091680fee2c93a0d574") + ;; This repo includes some Haxe libs as well. + (recursive? #t))) + (sha256 + (base32 + "0mwrm6gxgclwziiprfiswmjbz6z3dnvdwl8gq3gaym18pvx4p3ny")))) + +(define-public haxe + (package + (name "haxe") + (version "4.2.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/haxe") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pl8vpyb7gl2yqjg85yc4zxq9c3ipvw4yrrpliaxs25ynrj3l51n")))) + (build-system dune-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; Needs the haxelib sources for haxelib client + (add-after 'unpack 'copy-haxelib-src + (lambda _ + (copy-recursively #$haxelib-src + "extra/haxelib_src"))) + ;; Change the default directory for the haxelib package + ;; manager to be something writeable for a user. + (add-after 'copy-haxelib-src 'change-default-dir + (lambda _ + (substitute* "extra/haxelib_src/src/haxelib/client/Main.hx" + (("'/usr/lib/haxe/\\$REPNAME'") + "Path.addTrailingSlash( getHomePath() ) + '.haxe/$REPNAME'")))) + (add-after 'unpack 'prefix + (lambda _ + (substitute* "Makefile" + (("/usr/local") + (string-append #$output))))) + ;; Haxe uses a straight forward make, dune runtest, and make + ;; install process. + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (invoke "make" "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest")))) + (replace 'install + (lambda _ + (invoke "make" "install")))))) + (inputs (list libuv + mbedtls-apache + neko + ocaml-extlib + ocaml-luv + ocaml-ptmap + ocaml-sedlex + ocaml-sha + ocaml-xml-light + pcre + zlib)) + (native-inputs (list ocaml-findlib camlp5)) + (home-page "https://haxe.org/") + (synopsis "Multi-target universal programming language") + (description + "Haxe is a toolkit based on a modern, high level, static-typed +programming language, a cross-compiler, a complete cross-platform standard +library and ways to access each platform's native capabilities. This package +includes the compiler and library manager.") + (license (list license:gpl2+ ; the compiler itself + license:expat)))) ; the standard library + -- cgit v1.2.3 From 0ff99893bd90b0f38650fe577ebcf44dfabf627f Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Wed, 27 Jul 2022 23:45:22 -0400 Subject: gnu: Add hashlink. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haxe.scm (hashlink): New variable. Signed-off-by: 宋文武 --- gnu/packages/haxe.scm | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm index 95de4c5e4b..6876dbdc6f 100644 --- a/gnu/packages/haxe.scm +++ b/gnu/packages/haxe.scm @@ -189,3 +189,96 @@ (define-public haxe (license (list license:gpl2+ ; the compiler itself license:expat)))) ; the standard library +(define-public hashlink + (package + (name "hashlink") + (version "1.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HaxeFoundation/hashlink") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i5f1mxpgjcdirx60kxrw0r0y15qh3j16a6fj8mzkq3k7j2hc982")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled libraries (mainly used for Windows build). + (delete-file-recursively "include") + #t)))) + (build-system gnu-build-system) + (arguments + ;; Looks like there are tests with CMake, but there is confusion if this + ;; is a supported way to build on Linux. See, e.g. + ;; https://github.com/HaxeFoundation/hashlink/issues/397. Also, the + ;; CMake build requires running the library manager haxelib in the build + ;; process for the tests, likely requiring network access. + ;; TODO: Use cmake-build-system instead and enable tests? + (list #:tests? #f + #:make-flags + ;; The built hdll libraries need help finding libhl.so. + #~(list (string-append "LIBFLAGS=-Wl,-rpath=" #$output "/lib")) + #:phases + #~(modify-phases %standard-phases + ;; Don't try to build the (removed) bundled libraries pcre, + ;; minimp3, and mikktspace. Provide the approriate paths and + ;; linking options. + (add-after 'unpack 'use-system-libs + (lambda _ + (substitute* "Makefile" + (("\\$\\{PCRE\\}") "") + (("-lpthread") "-lpthread -lpcre16") + (("include/minimp3") + (string-append #$(this-package-input "minimp3") "/include")) + (("include/mikktspace ") + (string-append #$(this-package-input "mikktspace") "/include ")) + (("include/mikktspace/mikktspace.o") "") + (("-lpng") "-lpng -lmikktspace")))) + (replace 'configure + (lambda* _ + (setenv "CC" #$(cc-for-target)) + (setenv "PREFIX" #$output))) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + make-flags)))))) + (inputs (list glu + haxe + libjpeg-turbo + libpng + libuv + libvorbis + mbedtls-apache + mikktspace + minimp3 + openal + pcre + sdl2 + sqlite + zlib)) + (native-inputs (list pkg-config)) + (home-page "https://hashlink.haxe.org/") + (synopsis "Virtual machine for the Haxe language") + (description + "HashLink (HL) is a virtual machine for the Haxe language. It can run +bytecode produced by the Haxe compiler, or converted to C by HL. The HashLink runtime +includes the following features: +@itemize +@item Fully compatible with the Haxe specification +@item Support file I/O, regular expressions, network, etc. +@item Unicode strings by default +@item Mark-and-not-sweep Garbage Collector +@item x86 and x86-64 HL/C compilation +@item x86 and x86-64 HL/JIT compilation +@end itemize + +While the standard HL runtime provides support for Haxe standard library, +HashLink also provides several libraries that can optionally be used to build +HL-specific applications. This includes the FMT library for compression and +image support and SDL for mouse, keyboard, and game controller support, +OpenGL, and more.") + (license license:expat))) -- cgit v1.2.3 From fab316f7ec2805c38f0b9ac39ae5d8ac2e782018 Mon Sep 17 00:00:00 2001 From: "André A. Gomes" Date: Sat, 21 May 2022 14:42:12 +0100 Subject: gnu: emacs: Suppress loading messages for guix emacs packages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/aux-files/emacs/guix-emacs.el (guix-emacs-autoload-packages): Pass NOMESSAGE as t for 'load'. Signed-off-by: 宋文武 --- gnu/packages/aux-files/emacs/guix-emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index eff44bfe90..56dbcb8d67 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -56,7 +56,7 @@ The files in the list do not have extensions (.el, .elc)." (let ((autoloads (mapcan #'guix-emacs-find-autoloads (guix-emacs--non-core-load-path)))) (mapc (lambda (f) - (load f 'noerror)) + (load f 'noerror t)) autoloads))) ;;;###autoload -- cgit v1.2.3 From 30e89f47d1492a48a3203d5b5f2bfa384722324e Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 3 Aug 2022 14:55:15 +0800 Subject: gnu: Add font-chiron-sung-hk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts (font-chiron-sung-hk): New variable. Signed-off-by: Hilton Chain Signed-off-by: 宋文武 --- gnu/packages/fonts.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9ff2035a10..0d70e4460b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2747,3 +2747,24 @@ (define-public font-lxgw-wenkai-tc (synopsis "LXGW WenKai TC / 霞鶩文楷 TC") (description "The Traditional Chinese Version of LXGW WenKai.") (license license:silofl1.1))) + +(define-public font-chiron-sung-hk + (package + (name "font-chiron-sung-hk") + (version "1.005") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chiron-fonts/chiron-sung-hk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0iqlnb7825kisg2avhr9hwwvb4jw8f642vvmms5dw6m9czzydpgw")))) + (build-system font-build-system) + (home-page "https://chiron-fonts.github.io/") + (synopsis "昭源宋體") + (description + "Chiron Sung HK (昭源宋體) is a Traditional Chinese serif + typeface based on Adobe’s Source Han Serif (a.k.a. Google’s Noto Sans CJK).") + (license license:silofl1.1))) -- cgit v1.2.3 From ae0c11f9209b1e09997c224b3df645f7ed4d6804 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 3 Aug 2022 14:55:57 +0800 Subject: gnu: Add font-chiron-hei-hk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fonts (font-chiron-hei-hk): New variable. Signed-off-by: Hilton Chain Signed-off-by: 宋文武 --- gnu/packages/fonts.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0d70e4460b..53548ce827 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2768,3 +2768,22 @@ (define-public font-chiron-sung-hk "Chiron Sung HK (昭源宋體) is a Traditional Chinese serif typeface based on Adobe’s Source Han Serif (a.k.a. Google’s Noto Sans CJK).") (license license:silofl1.1))) + +(define-public font-chiron-hei-hk + (package + (name "font-chiron-hei-hk") + (version "2.502") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chiron-fonts/chiron-hei-hk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wk1yladmwflkwrmj374avpml8shyrgd622f7mbvw5ln7fi70d2l")))) + (build-system font-build-system) + (home-page "https://chiron-fonts.github.io/") + (synopsis "昭源黑體") + (description "The complementary sans-serif typeface for Chiron Sung HK.") + (license license:silofl1.1))) -- cgit v1.2.3 From b13966a907e763b41715b9cb3dda7d7b88af2b9f Mon Sep 17 00:00:00 2001 From: Ontje Lünsdorf Date: Mon, 27 Jun 2022 11:51:10 +0200 Subject: gnu: fenics: Do not mpirun tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/simulation.scm (fenics)[phases]: Do not use mpirun for tests and skip failing XDMF test. Signed-off-by: Ludovic Courtès --- gnu/packages/simulation.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 9e92fbcc5b..b1bbb7f996 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -665,15 +665,13 @@ (define-public fenics (lambda* (#:key tests? #:allow-other-keys) (when tests? (with-directory-excursion "test" - ;; Note: The test test_snes_set_from_options() in the file - ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. - ;; Limit the number of jobs to 3 as 500 MiB of memory is used - ;; per process. - (invoke "mpirun" "-np" (number->string - (min 3 (parallel-job-count))) - "python" "-B" "-m" - "pytest" "unit" "--ignore" - "unit/nls/test_PETScSNES_solver.py"))))) + (invoke + "pytest" "unit" + ;; The test test_snes_set_from_options() in the file + ;; unit/nls/test_PETScSNES_solver.py fails and is ignored. + "--ignore" "unit/nls/test_PETScSNES_solver.py" + ;; Fails with a segfault. + "--ignore" "unit/io/test_XDMF.py"))))) (add-after 'install 'install-demo-files (lambda* (#:key outputs #:allow-other-keys) (let* ((demos (string-append -- cgit v1.2.3 From 4e9818db34d1910aafb5b8a795d9e3c7d697301e Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 15 Jul 2022 13:37:29 -0400 Subject: gnu: Add android-file-transfer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/android.scm (android-file-transfer): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/android.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 04dc4b6499..91aaba089f 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -34,6 +34,7 @@ (define-module (gnu packages android) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system android-ndk) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) @@ -54,6 +55,8 @@ (define-module (gnu packages android) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) + #:use-module (gnu packages readline) #:use-module (gnu packages selinux) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) @@ -1268,3 +1271,30 @@ (define-public enjarify applications. Enjarify can translate the Dalvik bytecode back to equivalent Java bytecode, which simplifies the analysis of Android applications.") (license license:asl2.0))) + +(define-public android-file-transfer + (package + (name "android-file-transfer") + (version "4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/whoozle/android-file-transfer-linux/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f)) ;there are no tests + (inputs (list qtbase-5 fuse-3 libxkbcommon)) + (native-inputs (list qttools-5 openssl readline)) + (home-page "https://whoozle.github.io/android-file-transfer-linux/") + (synopsis "MTP client for Android devices") + (description + "This package provides a Qt graphical interface for transferring files +with Android devices using MTP. It also allows the Android device to be +mounted via FUSE.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 815710cf374ae1dbd8a8440aa03e9225503d6696 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 13 Jul 2022 20:55:17 +0800 Subject: gnu: font-sarasa-gothic: Update to 0.36.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 46bc3dcc324074b633c5bb3e1c1bdb5f209f5c15 Mon Sep 17 00:00:00 2001 * gnu/packages/fonts.scm (font-sarasa-gothic): Update to 0.36.6. Signed-off-by: Hilton Chain Signed-off-by: Ludovic Courtès --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 53548ce827..ae9d79c1b8 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1579,7 +1579,7 @@ (define-public font-iosevka-etoile (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") - (version "0.36.0") + (version "0.36.6") (source (origin (method url-fetch) @@ -1587,7 +1587,7 @@ (define-public font-sarasa-gothic "/releases/download/v" version "/sarasa-gothic-ttc-" version ".7z")) (sha256 - (base32 "0rr6qrf49zx3cl1pv7063l12nnj2nm9p4di3frp0p4ci9l7b4xmw")))) + (base32 "1sns6589h3wwppykqgz5w9jy4n9cbkwk56cc4gz3j3zm8wqsn0jq")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 28e523cc327b9f5b33b769f11de492859e4cd32e Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 16 Jul 2022 09:51:26 +0300 Subject: gnu: Add evtest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (evtest): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85a848dbde..a94e5c9bc9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9342,3 +9342,57 @@ (define-public touchegg gestures you make on your touchpad or touchscreen into visible actions in your desktop.") (license license:gpl3+))) + +(define-public evtest + (package + (name "evtest") + (version "1.35") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libevdev/evtest") + (commit (string-append "evtest-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "164prnw35kda6jfykl7h52lfzy99ma2lk029zscyqk766k19spf4")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;No tests exist + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'generate-doc + (lambda _ + (invoke "asciidoc" "-d" "manpage" + "-b" "docbook" + "-o" "evtest.1.xml" + "evtest.txt") + (invoke "xsltproc" "--nonet" + (string-append + #$(this-package-native-input "docbook-xsl") + "/xml/xsl/docbook-xsl-" + #$(package-version + (this-package-native-input "docbook-xsl")) + "/manpages/docbook.xsl") + "evtest.1.xml"))) + (replace 'bootstrap + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + (invoke "autoreconf" "-fi")))))) + (native-inputs (list autoconf + automake + bash-minimal + xmlto + docbook-xsl + libxslt + asciidoc)) + (home-page "https://gitlab.freedesktop.org/libevdev/evtest") + (synopsis "Kernel evdev device information and monitor") + (description + "@code{evtest} is a tool to print @code{evdev} kernel events. It reads +directly from the kernel device and prints a device description and the events +with the value and the symbolic name.") + (license license:gpl2+))) -- cgit v1.2.3 From 45456595ac4ba613c8a61ff4f51088efd4157e6e Mon Sep 17 00:00:00 2001 From: r0man Date: Sat, 16 Jul 2022 11:13:54 +0200 Subject: gnu: xscreensaver: Update to 6.04. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (xscreensaver): Update to 6.04. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5b54d02e2e..42f61ad0ce 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1627,7 +1627,7 @@ (define-public gammastep (define-public xscreensaver (package (name "xscreensaver") - (version "5.45") + (version "6.04") (source (origin (method url-fetch) @@ -1635,7 +1635,7 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) + (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1646,9 +1646,24 @@ (define-public xscreensaver (substitute* '("driver/Makefile.in" "po/Makefile.in.in") (("@GTK_DATADIR@") "@datadir@") (("@PO_DATADIR@") "@datadir@")) - #t))) - #:configure-flags '("--with-pam" "--with-proc-interrupts" - "--without-readdisplay") + #t)) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + ;; The tarball uses a very old version of autconf. It does not + ;; understand extra flags like `--enable-fast-install', so + ;; we need to invoke it with just what it understands. + (let ((out (assoc-ref outputs "out"))) + ;; 'configure' doesn't understand '--host'. + ,@(if (%current-target-system) + `((setenv "CHOST" ,(%current-target-system))) + '()) + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "SHELL" (which "bash")) + (invoke "./configure" + (string-append "--prefix=" out) + "--with-pam" + "--with-proc-interrupts" + "--without-readdisplay"))))) #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") "/lib/X11/app-defaults")))) @@ -1668,6 +1683,7 @@ (define-public xscreensaver ("libjpeg" ,libjpeg-turbo) ("linux-pam" ,linux-pam) ("pango" ,pango) + ("gdk-pixbuf-xlib", gdk-pixbuf-xlib) ("gtk+" ,gtk+) ("perl" ,perl) ("cairo" ,cairo) -- cgit v1.2.3 From c4e58c119d637ef434c4b52437f677dfb69eb091 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Aug 2022 12:21:05 +0200 Subject: gnu: xscreensaver: Remove input labels. * gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Remove labels. --- gnu/packages/xdisorg.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 42f61ad0ce..5635f45d4c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1670,27 +1670,27 @@ (define-public xscreensaver (native-inputs (list pkg-config intltool)) (inputs - `(("libx11" ,libx11) - ("libxext" ,libxext) - ("libxi" ,libxi) - ("libxt" ,libxt) - ("libxft" ,libxft) - ("libxmu" ,libxmu) - ("libxpm" ,libxpm) - ("libglade" ,libglade) - ("libxml2" ,libxml2) - ("libsm" ,libsm) - ("libjpeg" ,libjpeg-turbo) - ("linux-pam" ,linux-pam) - ("pango" ,pango) - ("gdk-pixbuf-xlib", gdk-pixbuf-xlib) - ("gtk+" ,gtk+) - ("perl" ,perl) - ("cairo" ,cairo) - ("bc" ,bc) - ("libxrandr" ,libxrandr) - ("glu" ,glu) - ("glib" ,glib))) + (list libx11 + libxext + libxi + libxt + libxft + libxmu + libxpm + libglade + libxml2 + libsm + libjpeg-turbo + linux-pam + pango + gdk-pixbuf-xlib + gtk+ + perl + cairo + bc + libxrandr + glu + glib)) (home-page "https://www.jwz.org/xscreensaver/") (synopsis "Classic screen saver suite supporting screen locking") (description -- cgit v1.2.3 From 4b7cca1b45824f425908831c272496f5e040ba33 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 1 Jul 2022 18:20:18 +0200 Subject: gnu: sbcl-cl-gamepad: Remove asdf:compile-system workaround. * gnu/packages/lisp-xyz.scm (sbcl-cl-gamepad)[arguments]: Remove 'build phase patch now that asdf-build-system/sbcl builds using asdf:load-system which fixes the bug. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c57796a419..c34dfdf5a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2018, 2020, 2021 Pierre Neidhardt +;;; Copyright © 2018, 2020, 2021, 2022 Pierre Neidhardt ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve @@ -18072,35 +18072,7 @@ (define-public sbcl-cl-gamepad (substitute* "evdev-cffi.lisp" (("libevdev.so" all) (string-append (assoc-ref inputs "libevdev") - "/lib/" all))))) - ;; Here we use a custom build phase to work around a compilation bug. - ;; Using 'asdf:compile-system' fails, but using 'asdf:load-system' - ;; succeeds (and also compiles the system). - ;; See https://github.com/Shirakumo/cl-gamepad/issues/8 - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (source-path (string-append out - "/share/common-lisp/" - (%lisp-type))) - (translations `((,source-path - :**/ :*.*.*) - (,(string-append out - "/lib/common-lisp/" - (%lisp-type)) - :**/ :*.*.*)))) - (setenv "ASDF_OUTPUT_TRANSLATIONS" - (format #f "~S" `(:output-translations - ,translations - :inherit-configuration))) - (setenv "HOME" (assoc-ref outputs "out")) - (with-directory-excursion (string-append source-path - "/cl-gamepad") - (invoke (%lisp-type) - "--eval" "(require :asdf)" - "--eval" "(asdf:load-asd (truename \"cl-gamepad.asd\"))" - "--eval" "(asdf:load-system :cl-gamepad)" - "--eval" "(quit)")))))))) + "/lib/" all)))))))) (inputs `(("cffi" ,sbcl-cffi) ("documentation-utils" ,sbcl-documentation-utils) -- cgit v1.2.3 From e2562197fb2db4fdadfbe1c9d904a444d78e14e1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 1 Jul 2022 20:41:37 +0200 Subject: gnu: Remove obsolete references to asd-files and test-asd-file. In a previous commit we've update the build system to let ASDF locate the .asd files for us, so package definition no longer need to provide this information. * gnu/packages/lisp-check.scm: Do it. * gnu/packages/lisp-xyz.scm: Do it. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-check.scm | 8 +- gnu/packages/lisp-xyz.scm | 202 ++++++++++---------------------------------- 2 files changed, 46 insertions(+), 164 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index 39f7d8ca61..8c850ee850 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2018, 2020 Efraim Flashner -;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt +;;; Copyright © 2018, 2019, 2020, 2021, 2022 Pierre Neidhardt ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Katherine Cox-Buday @@ -116,8 +116,7 @@ (define-public sbcl-checkl ;; Error while trying to load definition for system checkl-test from ;; pathname [...]/checkl-test.asd: The function CHECKL:DEFINE-TEST-OP ;; is undefined. - '(#:asd-files '("checkl.asd") - #:tests? #f)) + '(#:tests? #f)) (native-inputs (list sbcl-fiveam)) (inputs @@ -881,8 +880,7 @@ (define-public sbcl-try sbcl-mgl-pax sbcl-trivial-gray-streams)) (arguments - `(#:asd-files '("try.asdf.asd" "try.asd") - ;; FIXME: Get tests to work + `(;; FIXME: Get tests to work #:tests? #f)) (home-page "https://github.com/melisgl/try") (synopsis "Common Lisp test framework") diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c34dfdf5a6..2fab55af13 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -266,12 +266,6 @@ (define-public sbcl-asdf-finalizers (native-inputs `(("fare-utils" ,sbcl-fare-utils) ("hu.dwim.stefil" ,sbcl-hu.dwim.stefil))) - (arguments - `(#:asd-files '("asdf-finalizers.asd" - "list-of.asd" - "asdf-finalizers-test.asd") - #:asd-systems '("asdf-finalizers" - "list-of"))) (home-page "https://gitlab.common-lisp.net/asdf/asdf-finalizers") (synopsis "Enforced calling of finalizers for Lisp code") (description "This library allows you to implement and enforce proper @@ -374,10 +368,8 @@ (define-public sbcl-cl-irc ("split-sequence" ,sbcl-split-sequence) ("usocket" ,sbcl-usocket))) (arguments - `(#:asd-systems '("cl-irc") ;; Some inexisting "c" system is - ;; found by guix otherwise. - #:asd-files '("cl-irc.asd") - #:test-asd-file "test/cl-irc-test.asd")) + ;; Some inexisting "c" system is found by guix otherwise. + `(#:asd-systems '("cl-irc"))) (synopsis "IRC client library for Common Lisp") (description "@code{cl-irc} is a Common Lisp IRC client library that features (partial) DCC, CTCP and all relevant commands from the IRC @@ -868,8 +860,7 @@ (define-public sbcl-cl-ppcre-unicode (inputs (list sbcl-cl-ppcre sbcl-cl-unicode)) (arguments - `(#:tests? #f ; tests fail with "Component :CL-PPCRE-TEST not found" - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'disable-ppcre ;; cl-ppcre and cl-ppcre-unicode are put in different packages @@ -997,8 +988,7 @@ (define-public sbcl-spatial-trees "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa")))) (build-system asdf-build-system/sbcl) (arguments - '(#:tests? #f ; spatial-trees.test requires spatial-trees.nns - #:test-asd-file "spatial-trees.test.asd")) + '(#:tests? #f)) ; spatial-trees.test requires spatial-trees.nns (native-inputs (list sbcl-fiveam)) (home-page "https://github.com/rpav/spatial-trees") @@ -1450,8 +1440,7 @@ (define-public sbcl-trivial-features (base32 "0jsqah1znzqilxnw5vannb083ayk0d7phkackqzwwqkyg5hpn6pq")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-files '("trivial-features.asd") - ;; FIXME: Tests disabled because of a circular dependency between + '(;; FIXME: Tests disabled because of a circular dependency between ;; trivial-features and cffi. #:tests? #f)) ;; (native-inputs @@ -2383,9 +2372,7 @@ (define-public sbcl-mgl-pax sbcl-pythonic-string-reader sbcl-slime-swank)) (arguments - `(#:asd-files '("mgl-pax.asdf.asd" - "mgl-pax.asd") - #:asd-systems '("mgl-pax" + `(#:asd-systems '("mgl-pax" "mgl-pax/navigate" "mgl-pax/document" "mgl-pax/transcribe") @@ -3032,11 +3019,6 @@ (define-public sbcl-cffi (string-append (assoc-ref outputs "out") "/include/grovel"))))) - #:asd-files '("cffi.asd" - "cffi-toolchain.asd" - "cffi-grovel.asd" - "cffi-libffi.asd" - "cffi-uffi-compat.asd") #:asd-systems '("cffi" "cffi-libffi" "cffi-uffi-compat"))) @@ -3397,16 +3379,7 @@ (define-public sbcl-cl-cffi-gtk ("trivial-features" ,sbcl-trivial-features) ("trivial-garbage" ,sbcl-trivial-garbage))) (arguments - `(#:asd-files '("gtk/cl-cffi-gtk.asd" - "glib/cl-cffi-gtk-glib.asd" - "gobject/cl-cffi-gtk-gobject.asd" - "gio/cl-cffi-gtk-gio.asd" - "cairo/cl-cffi-gtk-cairo.asd" - "pango/cl-cffi-gtk-pango.asd" - "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" - "gdk/cl-cffi-gtk-gdk.asd") - #:test-asd-file "test/cl-cffi-gtk-test.asd" - ;; TODO: Tests fail with memory fault. + `(;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. #:tests? #f #:phases @@ -4777,8 +4750,7 @@ (define-public sbcl-fast-io ;; Error while trying to load definition for system fast-io-test from ;; pathname [...]/fast-io-test.asd: The function CHECKL:DEFINE-TEST-OP ;; is undefined. - '(#:tests? #f - #:asd-files '("fast-io.asd"))) + '(#:tests? #f)) (native-inputs (list sbcl-fiveam sbcl-checkl)) (inputs @@ -4947,7 +4919,6 @@ (define-public sbcl-lack "lack-util" "lack-middleware-backtrace" "lack-middleware-static") - #:test-asd-file "t-lack.asd" ;; XXX: Component :CLACK not found #:tests? #f)) (home-page "https://github.com/fukamachi/lack") @@ -5675,8 +5646,6 @@ (define-public sbcl-fare-utils (base32 "01wsr1aap3jdzhn4hrqjbhsjx6qci9dbd3gh4gayv1p49rbg8aqr")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:test-asd-file "test/fare-utils-test.asd")) (native-inputs (list sbcl-hu.dwim.stefil)) (synopsis "Collection of utilities and data structures") @@ -5887,12 +5856,7 @@ (define-public sbcl-iolib ("split-sequence" ,sbcl-split-sequence) ("swap-bytes" ,sbcl-swap-bytes))) (arguments - '(#:asd-files '("iolib.asdf.asd" - "iolib.conf.asd" - "iolib.common-lisp.asd" - "iolib.base.asd" - "iolib.asd") - #:asd-systems '("iolib" + '(#:asd-systems '("iolib" "iolib/os") #:phases (modify-phases %standard-phases @@ -6224,8 +6188,7 @@ (define-public sbcl-lisp-namespace (native-inputs (list sbcl-fiveam)) (arguments - `(#:test-asd-file "lisp-namespace.test.asd" - ;; XXX: Component LISP-NAMESPACE-ASD::LISP-NAMESPACE.TEST not found + `(;; XXX: Component LISP-NAMESPACE-ASD::LISP-NAMESPACE.TEST not found #:tests? #f)) (synopsis "LISP-N, or extensible namespaces in Common Lisp") (description "Common Lisp already has major 2 namespaces, function @@ -6378,8 +6341,6 @@ (define-public sbcl-type-i ("trivia.trivial" ,sbcl-trivia.trivial))) (native-inputs (list sbcl-fiveam)) - (arguments - `(#:test-asd-file "type-i.test.asd")) (synopsis "Type inference utility on unary predicates for Common Lisp") (description "This library tries to provide a way to detect what kind of type the given predicate is trying to check. This is different from inferring @@ -6421,8 +6382,7 @@ (define-public sbcl-optima (list sbcl-eos)) (arguments ;; XXX: Circular dependencies: tests depend on optima.ppcre which depends on optima. - `(#:tests? #f - #:test-asd-file "optima.test.asd")) + `(#:tests? #f)) (synopsis "Optimized pattern matching library for Common Lisp") (description "Optima is a fast pattern matching library which uses optimizing techniques widely used in the functional programming world.") @@ -6560,7 +6520,6 @@ (define-public sbcl-trivia "trivia.quasiquote" "trivia.cffi" "trivia.fset") - #:test-asd-file "trivia.test.asd" #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-build @@ -6635,8 +6594,7 @@ (define-public sbcl-cl-str (native-inputs (list sbcl-prove)) (arguments - `(#:asd-systems '("str") - #:test-asd-file "str.test.asd")) + `(#:asd-systems '("str"))) (synopsis "Modern, consistent and terse Common Lisp string manipulation library") (description "A modern and consistent Common Lisp string manipulation library that focuses on modernity, simplicity and discoverability: @@ -7032,8 +6990,7 @@ (define-public sbcl-cl-containers (inputs `(("metatilities-base" ,sbcl-metatilities-base))) (arguments - '(#:asd-files '("cl-containers.asd") - #:phases + '(#:phases (modify-phases %standard-phases (add-after 'unpack 'relax-version-checks (lambda _ @@ -7085,9 +7042,6 @@ (define-public sbcl-cambl ("cl-containers" ,sbcl-cl-containers) ("local-time" ,sbcl-local-time) ("periods" ,sbcl-periods))) - (arguments - '(#:asd-files '("fprog.asd" - "cambl.asd"))) (synopsis "Commoditized amounts and balances for Common Lisp") (description "CAMBL is a Common Lisp library providing a convenient facility for @@ -7429,9 +7383,6 @@ (define-public sbcl-cl-slug (sha256 (base32 "1asdq6xllmsvfw5fky9wblqcx9isac9jrrlkfl7vyxcq1wxrnflx")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:asd-files '("cl-slug-test.asd" "cl-slug.asd") - #:asd-systems '("cl-slug-test" "cl-slug"))) (native-inputs (list sbcl-prove)) (inputs @@ -7789,8 +7740,6 @@ (define-public sbcl-cl-heap (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-xlunit)) - (arguments - `(#:test-asd-file "cl-heap-tests.asd")) (synopsis "Heap and priority queue data structures for Common Lisp") (description "CL-HEAP provides various implementations of heap data structures (a @@ -8761,8 +8710,6 @@ (define-public sbcl-vas-string-metrics (sha256 (base32 "11fcnd03ybzz37rkg3z0wsb727yqgcd9gn70sccfb34l89ia279k")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:test-asd-file "test.vas-string-metrics.asd")) (home-page "https://github.com/vsedach/vas-string-metrics") (synopsis "String distance algorithms for Common Lisp") (description @@ -9595,8 +9542,7 @@ (define-public sbcl-hdf5-cffi (native-inputs (list sbcl-fiveam)) (arguments - `(#:test-asd-file "hdf5-cffi.test.asd" - ;; Tests depend on hdf5-cffi.examples.asd in addition to hdf5-cffi.asd, + `(;; Tests depend on hdf5-cffi.examples.asd in addition to hdf5-cffi.asd, ;; I don't know if there is a way to tell asdf-build-system to load ;; an additional system first, so tests are disabled. #:tests? #f @@ -9782,9 +9728,7 @@ (define-public sbcl-type-r `(("trivia" ,sbcl-trivia) ("alexandria" ,sbcl-alexandria))) (native-inputs - (list sbcl-fiveam)) - (arguments - `(#:test-asd-file "type-r.test.asd"))))) + (list sbcl-fiveam))))) (define-public cl-type-r (sbcl-package->cl-source-package sbcl-type-r)) @@ -9824,8 +9768,7 @@ (define-public sbcl-trivialib-type-unify (native-inputs (list sbcl-fiveam)) (arguments - `(#:asd-systems '("trivialib.type-unify") - #:test-asd-file "trivialib.type-unify.test.asd"))))) + `(#:asd-systems '("trivialib.type-unify")))))) (define-public cl-trivialib-type-unify (sbcl-package->cl-source-package sbcl-trivialib-type-unify)) @@ -9907,10 +9850,7 @@ (define-public sbcl-specialized-function ("trivial-cltl2" ,sbcl-trivial-cltl2) ("type-r" ,sbcl-type-r))) (native-inputs - (list sbcl-fiveam)) - (arguments - `(#:asd-files '("specialized-function.asd") - #:test-asd-file "specialized-function.test.asd"))))) + (list sbcl-fiveam))))) (define-public cl-specialized-function (sbcl-package->cl-source-package sbcl-specialized-function)) @@ -9947,10 +9887,7 @@ (define-public sbcl-constantfold ("iterate" ,sbcl-iterate) ("lisp-namespace" ,sbcl-lisp-namespace))) (native-inputs - (list sbcl-fiveam)) - (arguments - `(#:asd-files '("constantfold.asd") - #:test-asd-file "constantfold.test.asd"))))) + (list sbcl-fiveam))))) (define-public cl-constantfold (sbcl-package->cl-source-package sbcl-constantfold)) @@ -9988,10 +9925,7 @@ (define-public sbcl-gtype ("iterate" ,sbcl-iterate) ("type-r" ,sbcl-type-r))) (native-inputs - (list sbcl-fiveam)) - (arguments - `(#:asd-files '("gtype.asd") - #:test-asd-file "gtype.test.asd"))))) + (list sbcl-fiveam))))) (define-public cl-gtype (sbcl-package->cl-source-package sbcl-gtype)) @@ -10022,9 +9956,7 @@ (define-public sbcl-numcl (base32 "15m4spbgayawnw5jjz04zfp0jnk9g6hgq5fmr648hzjzj50j1d78")))) (build-system asdf-build-system/sbcl) (arguments - `(#:test-asd-file "numcl.test.asd" - #:asd-files '("numcl.asd") - ;; Tests often fail because they require a dynamic-space-size much + `(;; Tests often fail because they require a dynamic-space-size much ;; bigger than the default one. Disable them for now. #:tests? #f)) (native-inputs @@ -10412,7 +10344,6 @@ (define-public sbcl-uffi (build-system asdf-build-system/sbcl) (arguments `(#:tests? #f ; TODO: Fix use of deprecated ASDF functions - #:asd-files '("uffi.asd") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-permissions @@ -10487,13 +10418,8 @@ (define-public sbcl-clsql ("uffi" ,sbcl-uffi) ("zlib" ,zlib))) (arguments - `(#:asd-files '("clsql.asd" - "clsql-uffi.asd" - "clsql-sqlite3.asd" - "clsql-postgresql.asd" - "clsql-postgresql-socket3.asd" - "clsql-mysql.asd") - #:asd-systems '("clsql" + `(#:asd-systems '("clsql" + "clsql-uffi" "clsql-sqlite3" "clsql-postgresql" "clsql-postgresql-socket3" @@ -10596,8 +10522,8 @@ (define-public ecl-clsql (alist-delete "uffi" (package-inputs pkg))) (arguments (substitute-keyword-arguments (package-arguments pkg) - ((#:asd-files asd-files '()) - `(cons "clsql-cffi.asd" ,asd-files))))))) + ((#:asd-systems asd-systems '()) + `(cons "clsql-cffi" ,asd-systems))))))) (define-public sbcl-sycamore (let ((commit "fd2820fec165ad514493426dea209728f64e6d18")) @@ -10788,10 +10714,6 @@ (define-public sbcl-modularize (sha256 (base32 "1zys29rfkb649rkgl3snxhajk8d5yf7ryxkrwy020kwdh7zdsg7d")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:test-asd-file "modularize-test-module.asd" - #:asd-files '("modularize.asd" "modularize-test-module.asd") - #:asd-systems '("modularize" "modularize-test-module"))) (inputs `(("documentation-utils" ,sbcl-documentation-utils) ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames))) @@ -11012,7 +10934,9 @@ (define-public sbcl-quantile-estimator "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-files '("quantile-estimator.asd"))) + '(#:asd-test-systems '("quantile-estimator.test") + ;; TODO: Tests need https://github.com/sharplispers/mw-equiv. + #:tests? #f)) (inputs `(("alexandria" ,sbcl-alexandria))) (home-page "https://github.com/deadtrickster/quantile-estimator.cl") @@ -11059,13 +10983,7 @@ (define-public sbcl-prometheus ("split-sequence" ,sbcl-split-sequence) ("trivial-utf-8" ,sbcl-trivial-utf-8))) (arguments - '(#:asd-files '("prometheus.asd" - "prometheus.collectors.sbcl.asd" - "prometheus.collectors.process.asd" - "prometheus.formats.text.asd" - "prometheus.exposers.hunchentoot.asd" - "prometheus.pushgateway.asd") - #:asd-systems '("prometheus" + '(#:asd-systems '("prometheus" "prometheus.collectors.sbcl" "prometheus.collectors.process" "prometheus.formats.text" @@ -11460,8 +11378,7 @@ (define-public sbcl-cl-online-learning `(("cl-libsvm-format" ,sbcl-cl-libsvm-format) ("cl-store" ,sbcl-cl-store))) (arguments - `(#:test-asd-file "cl-online-learning-test.asd" - #:asd-systems '("cl-online-learning-test" + `(#:asd-systems '("cl-online-learning-test" "cl-online-learning"))) (home-page "https://github.com/masatoi/cl-online-learning") (synopsis "Online Machine Learning for Common Lisp") @@ -11499,8 +11416,7 @@ (define-public sbcl-cl-mpg123 #t)))) (build-system asdf-build-system/sbcl) (arguments - `(#:asd-files '("cl-mpg123.asd" "cl-mpg123-example.asd") - #:asd-systems '("cl-mpg123" "cl-mpg123-example") + `(#:asd-systems '("cl-mpg123" "cl-mpg123-example") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -12099,8 +12015,6 @@ (define-public sbcl-opticl sbcl-retrospectiff sbcl-skippy sbcl-zpng)) - (arguments - '(#:asd-files '("opticl.asd"))) (home-page "https://github.com/slyrus/opticl") (synopsis "Image processing library for Common Lisp") (description @@ -12477,8 +12391,7 @@ (define-public sbcl-hu.dwim.defclass-star ;; ("hu.dwim.stefil" ,cl-hu.dwim.stefil) sbcl-hu.dwim.asdf)) (arguments - `(#:test-asd-file "hu.dwim.defclass-star.test.asd" - ;; Tests require a circular dependency: hu.dwim.stefil -> hu.dwim.def + `(;; Tests require a circular dependency: hu.dwim.stefil -> hu.dwim.def ;; -> hu.dwim.util -> hu.dwim.defclass-star. #:tests? #f)) (home-page "https://github.com/hu-dwim/hu.dwim.defclass-star") @@ -12820,8 +12733,7 @@ (define-public sbcl-cl-project ("prove" ,sbcl-prove))) (arguments ;; Tests depend on caveman, which in turns depends on cl-project. - '(#:tests? #f - #:asd-files '("cl-project.asd"))) + '(#:tests? #f)) (synopsis "Generate a skeleton for modern Common Lisp projects") (description "This library provides a modern project skeleton generator. In contract with other generators, CL-Project generates one package per file @@ -12868,12 +12780,7 @@ (define-public sbcl-caveman ("trivial-types" ,sbcl-trivial-types) ("prove" ,sbcl-prove))) (arguments - `(#:asd-files '("caveman2.asd" - "caveman2-db.asd" - "caveman2-test.asd" - "caveman-middleware-dbimanager.asd") - #:test-asd-file "caveman2-test.asd" - #:asd-systems '("caveman2" + `(#:asd-systems '("caveman2" "caveman2-db" "caveman2-test" "caveman-middleware-dbimanager") @@ -13127,8 +13034,7 @@ (define-public sbcl-custom-hash-table (base32 "1k4mvrpbqqds2fwjxp1bxmrfmr8ch4dkwhnkbw559knbqshvrlj5")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-files '("cl-custom-hash-table.asd") - #:asd-systems '("cl-custom-hash-table"))) + '(#:asd-systems '("cl-custom-hash-table"))) (home-page "https://github.com/metawilm/cl-custom-hash-table") (synopsis "Custom hash tables for Common Lisp") (description "This library allows creation of hash tables with arbitrary @@ -13391,10 +13297,6 @@ (define-public sbcl-deploy (sha256 (base32 "07pfkibaridihg8lbq2czwa4iqifqk24n6rx7bfnv7i49p1ppja1")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:test-asd-file "deploy-test.asd" - #:asd-files '("deploy.asd" - "deploy-test.asd"))) (native-inputs `(("cl-mpg123" ,sbcl-cl-mpg123) ("cl-out123" ,sbcl-cl-out123))) @@ -15098,8 +15000,7 @@ (define-public sbcl-cl-difflib ;; Due to the age of this library tests use some deprecated ;; functionality and keep failing. (arguments - '(#:tests? #f - #:asd-files '("cl-difflib.asd"))) + '(#:tests? #f)) (home-page "https://github.com/wiseman/cl-difflib") (synopsis "Compute differences between pairs of sequences") (description @@ -15715,8 +15616,6 @@ (define-public sbcl-quickproject (inputs `(("cl-fad" ,sbcl-cl-fad) ("html-template" ,sbcl-html-template))) - (arguments - '(#:asd-files '("quickproject.asd"))) (home-page "https://xach.com/lisp/quickproject/") (synopsis "Create Common Lisp project skeletons") (description @@ -15821,7 +15720,7 @@ (define-public sbcl-cl-conspack ;; failing test where it's in use. (arguments '(#:tests? #f - #:asd-files '("cl-conspack.asd"))) + #:asd-test-systems '("cl-conspack-test"))) (native-inputs (list sbcl-checkl)) (inputs @@ -16971,8 +16870,7 @@ (define-public sbcl-parser-combinators (arguments ;; FIXME: (Sharlatan-20210523T184237+0100): Tests require `femlisp', which ;; is quite chunky not packaged system yet, enable them when it's packed. - `(#:tests? #f - #:test-asd-file "parser-combinators-tests.asd")) + `(#:tests? #f)) ;; (native-inputs ;; `(("hu.dwim.stefil" ,sbcl-hu.dwim.stefil) ;; ("infix" ,sbcl-femlisp))) @@ -17277,11 +17175,9 @@ (define-public sbcl-flow (sha256 (base32 "0ysw1kwiqlf8kzllhnz8v3q40dmvwf83fzq8bfkbmwy5hfjh3pxp")))) (build-system asdf-build-system/sbcl) - (arguments - ;; FIXME: (Sharlatan-20210527T203118+0100): FLOW-VISUALIZER requires - ;; COMMONQT which is not packed yet and required tweaks with QT. Remove - ;; this when it's ready. - `(#:asd-files '("flow.asd"))) + ;; FIXME: (Sharlatan-20210527T203118+0100): FLOW-VISUALIZER requires + ;; COMMONQT which is not packed yet and required tweaks with QT. Remove + ;; this when it's ready. (inputs `(("closer-mop" ,sbcl-closer-mop) ("documentation-utils" ,sbcl-documentation-utils))) @@ -17410,8 +17306,6 @@ (define-public sbcl-cepl (sha256 (base32 "0izbw2advqm3wailj3dpq6zqfrfirwn14pw5qmqh8i71r51xwmm2")))) (build-system asdf-build-system/sbcl) - (arguments - `(#:asd-files '("cepl.asd" "cepl.build.asd"))) (inputs `(("alexandria" ,sbcl-alexandria) ("bordeaux-threads" ,sbcl-bordeaux-threads) @@ -17809,8 +17703,7 @@ (define-public sbcl-cl-posix-mqueue (base32 "04519rg8vc782z097dzlb8nx0skab2fy2zd0m60r6mz2nw8xdvh6")))) (build-system asdf-build-system/sbcl) (arguments - `(#:test-asd-file "cl-posix-mqueue-tests.asd" - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-librt-path (lambda* (#:key inputs #:allow-other-keys) @@ -20130,10 +20023,6 @@ (define-public sbcl-bit-smasher (inputs `(("cl-base64" ,sbcl-cl-base64) ("cl-base58" ,sbcl-cl-base58))) - ;; Load order matters for tests, both for file reading and evaluation. - (arguments - `(#:asd-systems '("bit-smasher-test" "bit-smasher") - #:asd-files '("bit-smasher.asd" "bit-smasher-test.asd"))) (home-page "https://github.com/thephoeron/bit-smasher/") (synopsis "Handle bit vectors, bit vector arithmetic, and type conversions") (description @@ -20187,8 +20076,7 @@ (define-public sbcl-overlord (native-inputs (list sbcl-fiveam)) (arguments - `(#:asd-files '("overlord.asd") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'include-overlord/net (lambda _ @@ -20946,9 +20834,6 @@ (define-public sbcl-asd-generator (base32 "0yiybl7b9x1f85v0drj0yw9821y3yfhya4n6gycnv5vvx6jp9by4")) (file-name (git-file-name "cl-asd-generator" commit)))) (build-system asdf-build-system/sbcl) - (arguments - `(#:asd-systems '("asd-generator") - #:asd-files '("asd-generator.asd"))) (inputs (list sbcl-cl-fad sbcl-iterate @@ -21428,8 +21313,7 @@ (define-public sbcl-jzon (base32 "1048f6prz2lp859nxwcgghn6n38pc2pb580azzxpdhfcdi0034mj")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-files '("src/com.inuoe.jzon.asd" "test/com.inuoe.jzon-tests.asd") - #:asd-systems '("com.inuoe.jzon" "com.inuoe.jzon-tests"))) + '(#:asd-systems '("com.inuoe.jzon" "com.inuoe.jzon-tests"))) (native-inputs (list sbcl-alexandria sbcl-fiveam -- cgit v1.2.3 From f3e71d7b8ec01d9ce778963e32255c07aca428f9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 3 Aug 2022 11:02:36 +0200 Subject: gnu: sbcl-quri: Remove obsolete test workaround. * gnu/packages/lisp-xyz.scm (sbcl-quri)[arguments]: Remove. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2fab55af13..c1812723f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4507,12 +4507,6 @@ (define-public sbcl-quri (sha256 (base32 "1wrrhbj3r4lph5y3hhfbv4g2pvg24hbgl06irq9lyiycy3bgai4w")))) (build-system asdf-build-system/sbcl) - (arguments - ;; Test system must be loaded before, otherwise tests fail with: - ;; Component QURI-ASD::QURI-TEST not found, required by #. - '(#:asd-systems '("quri-test" - "quri"))) (native-inputs (list sbcl-prove)) (inputs (list sbcl-babel sbcl-split-sequence sbcl-cl-utilities sbcl-alexandria)) -- cgit v1.2.3 From 7f352340020b3064d4f7727fa8133e95e2a50ecd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 19:03:48 +0200 Subject: gnu: sbcl-cl-reexport: Remove obsolete test workaround. * gnu/packages/lisp-xyz.scm (sbcl-cl-reexport)[arguments]: Remove. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c1812723f9..5591dfb688 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6033,11 +6033,6 @@ (define-public sbcl-cl-reexport (list sbcl-alexandria)) (native-inputs (list sbcl-prove)) - (arguments - ;; FIXME: Test fails with the following, why? - ;; Component "cl-reexport-test" not found, required by - ;; # - `(#:tests? #f)) (synopsis "Reexport external symbols in other Common Lisp packages") (description "Cl-reexport makes a package reexport symbols which are external -- cgit v1.2.3 From 1fb04c20976c71ff986f480066e497fb0e5ad38a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 19:11:31 +0200 Subject: gnu: Add cl-legion. * gnu/packages/lisp-xyz.scm (cl-legion, ecl-legion, sbcl-legion): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5591dfb688..895cf3f4b9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4763,6 +4763,41 @@ (define-public cl-fast-io (define-public ecl-fast-io (sbcl-package->ecl-package sbcl-fast-io)) +(define-public sbcl-legion + (let ((commit "599cca19f0e34246814621f7fe90322221c2e263") + (revision "1")) + (package + (name "sbcl-legion") + (version (git-version "0.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/legion/") + (commit commit))) + (file-name (git-file-name "cl-legion" version)) + (sha256 + (base32 "0583pw0mf8bd4dj42w2xrlzcwfkl8q28n1bh8dpxxfg93crx4si6")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-prove sbcl-local-time)) + (inputs + (list + sbcl-bordeaux-threads + sbcl-cl-speedy-queue + sbcl-vom)) + (home-page "https://github.com/fukamachi/legion") + (synopsis "Simple multithreading worker mechanism for Common Lisp") + (description + "This library provides a simple multithreading worker mechanism.") + (license license:bsd-3)))) + +(define-public cl-legion + (sbcl-package->cl-source-package sbcl-legion)) + +(define-public ecl-legion + (sbcl-package->ecl-package sbcl-legion)) + (define-public sbcl-jonathan (let ((commit "1f448b4f7ac8265e56e1c02b32ce383e65316300") (revision "1")) -- cgit v1.2.3 From c4157fd02deae63e396f245c8862d93ac37f61c6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 19:13:40 +0200 Subject: gnu: sbcl-jonathan: Fix tests. * gnu/packages/lisp-xyz.scm (sbcl-jonathan)[native-inputs]: Add missing sbcl-legion input. [arguments]: Enable tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 895cf3f4b9..06a96aaf3c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4814,12 +4814,8 @@ (define-public sbcl-jonathan (sha256 (base32 "14x4iwz3mbag5jzzzr4sb6ai0m9r4q4kyypbq32jmsk2dx1hi807")))) (build-system asdf-build-system/sbcl) - (arguments - ;; Tests fail with: Component JONATHAN-ASD::JONATHAN-TEST not found, - ;; required by #. Why? - `(#:tests? #f)) (native-inputs - (list sbcl-prove)) + (list sbcl-prove sbcl-legion)) (inputs (list sbcl-cl-syntax sbcl-fast-io sbcl-proc-parse sbcl-cl-ppcre)) (home-page "https://rudolph-miller.github.io/jonathan/overview.html") -- cgit v1.2.3 From a768436cda4155474320340eb054a3365783f3c9 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 19:21:53 +0200 Subject: gnu: sbcl-cl-irc: Fix tests. * gnu/packages/lisp-xyz.scm (sbcl-cl-irc)[arguments]: Specify test system. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 06a96aaf3c..17a1298595 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -360,7 +360,6 @@ (define-public sbcl-cl-irc (base32 "1b3nqbb4pj377lxl47rfgrs82pidadnrc65l48bk553c2f59b52w")))) (build-system asdf-build-system/sbcl) (native-inputs - ;; Tests only. (list sbcl-rt)) (inputs `(("cl+ssl" ,sbcl-cl+ssl) @@ -368,8 +367,7 @@ (define-public sbcl-cl-irc ("split-sequence" ,sbcl-split-sequence) ("usocket" ,sbcl-usocket))) (arguments - ;; Some inexisting "c" system is found by guix otherwise. - `(#:asd-systems '("cl-irc"))) + `(#:asd-test-systems '("cl-irc-test"))) (synopsis "IRC client library for Common Lisp") (description "@code{cl-irc} is a Common Lisp IRC client library that features (partial) DCC, CTCP and all relevant commands from the IRC -- cgit v1.2.3 From 64030b3978cbe01bfb6a87ff7348e93a606039ed Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 19:58:10 +0200 Subject: gnu: sbcl-spatial-trees: Build spatial-trees.nss and fix tests. * gnu/packages/lisp-xyz.scm (sbcl-spatial-trees)[arguments]: Do it. [inputs] Add sbcl-alexandria, sbcl-optima, sbcl-iterate. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 17a1298595..936133251d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -986,7 +986,11 @@ (define-public sbcl-spatial-trees "11rhc6h501dwcik2igkszz7b9n515cr99m5pjh4r2qfwgiri6ysa")))) (build-system asdf-build-system/sbcl) (arguments - '(#:tests? #f)) ; spatial-trees.test requires spatial-trees.nns + ;; We cannot build "spatial-trees-viz" here because it depends on + ;; mcclim which depends on spatial-trees. FIXME: Break the circle. + '(#:asd-systems '("spatial-trees" "spatial-trees.nns"))) + (inputs + (list sbcl-alexandria sbcl-optima sbcl-iterate)) (native-inputs (list sbcl-fiveam)) (home-page "https://github.com/rpav/spatial-trees") -- cgit v1.2.3 From 664be491a4272a693f98bb09f2eac1b346354753 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 20:13:02 +0200 Subject: gnu: sbcl-lisp-namespace: Enable tests. * gnu/packages/lisp-xyz.scm (sbcl-lisp-namespace)[arguments]: Enable tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 936133251d..e3b1e2ab9d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6209,9 +6209,6 @@ (define-public sbcl-lisp-namespace `(("alexandria" ,sbcl-alexandria))) (native-inputs (list sbcl-fiveam)) - (arguments - `(;; XXX: Component LISP-NAMESPACE-ASD::LISP-NAMESPACE.TEST not found - #:tests? #f)) (synopsis "LISP-N, or extensible namespaces in Common Lisp") (description "Common Lisp already has major 2 namespaces, function namespace and value namespace (or variable namespace), but there are actually -- cgit v1.2.3 From 95010a12262bceeed54ff3d07f1141f4362fb3d6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 20:30:32 +0200 Subject: gnu: sbcl-cl-heap: Re-enable tests. * gnu/packages/lisp-xyz.scm (sbcl-cl-heap)[arguments]: Specify the name of the test system. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e3b1e2ab9d..dd2c6d3e1d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7759,6 +7759,8 @@ (define-public sbcl-cl-heap (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-xlunit)) + (arguments + '(#:asd-test-systems '("cl-heap-tests"))) (synopsis "Heap and priority queue data structures for Common Lisp") (description "CL-HEAP provides various implementations of heap data structures (a -- cgit v1.2.3 From 440372efcdd48e8150c324387a0748b2ac754c63 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 20:46:24 +0200 Subject: gnu: sbcl-vas-string-metrics: Re-enable tests. * gnu/packages/lisp-xyz.scm (sbcl-vas-string-metrics)[arguments]: Specify the name of the test system and fix the .asd file to actually do something. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index dd2c6d3e1d..5fc107f1ce 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -8731,6 +8731,18 @@ (define-public sbcl-vas-string-metrics (sha256 (base32 "11fcnd03ybzz37rkg3z0wsb727yqgcd9gn70sccfb34l89ia279k")))) (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-test-systems '("test.vas-string-metrics") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test-asd + (lambda _ + (substitute* "test.vas-string-metrics.asd" + ((":depends-on") + (string-append + ":perform (test-op (op c) (symbol-call :vas-string-metrics :run-tests))" + "\n" + " :depends-on")))))))) (home-page "https://github.com/vsedach/vas-string-metrics") (synopsis "String distance algorithms for Common Lisp") (description -- cgit v1.2.3 From c1b4608ac5247938ccae30ad90ac82d1d23eff43 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 20:50:06 +0200 Subject: gnu: sbcl-hdf5-cffi: Enable tests. * gnu/packages/lisp-xyz.scm (sbcl-hdf5-cffi)[arguments]: Do it. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5fc107f1ce..946b68cdf1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9575,11 +9575,7 @@ (define-public sbcl-hdf5-cffi (native-inputs (list sbcl-fiveam)) (arguments - `(;; Tests depend on hdf5-cffi.examples.asd in addition to hdf5-cffi.asd, - ;; I don't know if there is a way to tell asdf-build-system to load - ;; an additional system first, so tests are disabled. - #:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From bcb33357162ccd7423c6355ec48f43e35b90fbf8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 21:09:52 +0200 Subject: gnu: Add cl-mw-equiv. * gnu/packages/lisp-xyz.scm (cl-mw-equiv, ecl-mw-equiv, sbcl-mw-equiv): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 946b68cdf1..3305e36d02 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10947,6 +10947,58 @@ (define-public cl-clx-xembed (define-public ecl-clx-xembed (sbcl-package->ecl-package sbcl-clx-xembed)) +(define-public sbcl-mw-equiv + (let ((commit "3ae871458685b1ef7cd6a996ee22c8c5e738a03d") + (revision "1")) + (package + (name "sbcl-mw-equiv") + (version (git-version "0.1.2" revision commit)) + (home-page "https://github.com/sharplispers/mw-equiv/") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/mw-equiv/") + (commit commit))) + (file-name (git-file-name "cl-mw-equiv" version)) + (sha256 + (base32 "1fl90wp0jp7l90mps53fq0kzb28f10qfr739527h03xwqccyylad")))) + (build-system asdf-build-system/sbcl) + (synopsis "Extensible object equivalence protocol for Common Lisp") + (description "Common Lisp comes with quite some functions to compare +objects for equality, yet none is applicable in every situation and in general +this is hard, as equality of objects depends on the semantics of operations on +them. As consequence, users find themselves regularly in a situation where +they have to roll their own specialized equality test. + +This module provides one of many possible equivalence relations between +standard Common Lisp objects. However, it can be extended for new objects +through a simple CLOS protocol. The rules when two objects are considered +equivalent distinguish between @emph{mutating} and @emph{frozen objects}. A +frozen object is promised not to be mutated in the future in a way that +operations on it can notice the difference. + +We have chosen to compare mutating objects only for identity (pointer +equality), to avoid various problems. Equivalence for frozen objects on the +other hand is established by recursing on the objects' constituent parts and +checking their equivalence. Hence, two objects are equivalent under the +@code{OBJECT=} relation, if they are either identical, or if they are frozen +and structurally equivalent, i.e. their constituents are point-wise +equivalent. + +Since many objects are potentially mutable, but are not necessarily mutated +from a certain point in their life time on, it is possible to promise to the +equivalence relation that they remain frozen for the rest of their life time, +thus enabling coarser equivalence than the often too fine-grained pointer +equality.") + (license license:bsd-2)))) + +(define-public cl-mw-equiv + (sbcl-package->cl-source-package sbcl-mw-equiv)) + +(define-public ecl-mw-equiv + (sbcl-package->ecl-package sbcl-mw-equiv)) + (define-public sbcl-quantile-estimator (package (name "sbcl-quantile-estimator") -- cgit v1.2.3 From b6355dc2c4324535d76d0a8dd9cff1295cd82039 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 21:10:05 +0200 Subject: gnu: sbcl-quantile-estimator: Enable tests. * gnu/packages/lisp-xyz.scm (sbcl-quantile-estimator)[arguments]: Do it. [native-inputs]: Add sbcl-mw-equiv, sbcl-prove, sbcl-log4cl. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3305e36d02..02b2de8c5b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11015,11 +11015,11 @@ (define-public sbcl-quantile-estimator "0rlswkf0siaabsvvch3dgxmg45fw5w8pd9b7ri2w7a298aya52z9")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-test-systems '("quantile-estimator.test") - ;; TODO: Tests need https://github.com/sharplispers/mw-equiv. - #:tests? #f)) + '(#:asd-test-systems '("quantile-estimator.test"))) (inputs - `(("alexandria" ,sbcl-alexandria))) + (list sbcl-alexandria)) + (native-inputs + (list sbcl-mw-equiv sbcl-prove sbcl-log4cl)) (home-page "https://github.com/deadtrickster/quantile-estimator.cl") (synopsis "Effective computation of biased quantiles over data streams") -- cgit v1.2.3 From 81fe659aad194681068f847aa56504001e8da3e0 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 21:12:26 +0200 Subject: gnu: sbcl-cl-online-learning: Remove unnecessary arguments. The updated build system is now able to find the system on its own. * gnu/packages/lisp-xyz.scm (sbcl-cl-online-learning)[arguments]: Do it. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 02b2de8c5b..bfde1e4e89 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11458,9 +11458,6 @@ (define-public sbcl-cl-online-learning (inputs `(("cl-libsvm-format" ,sbcl-cl-libsvm-format) ("cl-store" ,sbcl-cl-store))) - (arguments - `(#:asd-systems '("cl-online-learning-test" - "cl-online-learning"))) (home-page "https://github.com/masatoi/cl-online-learning") (synopsis "Online Machine Learning for Common Lisp") (description -- cgit v1.2.3 From 369377a0fb113b0f26fb518c7f8653cbd997e23a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 4 Jul 2022 21:46:56 +0200 Subject: gnu: sbcl-jzon: Enable tests. * gnu/packages/lisp-xyz.scm (sbcl-jzon)[arguments]: Move test system to #:asd-test-systems. Add phase to fix test .asd to actually run the tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bfde1e4e89..20841bd397 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -21391,7 +21391,19 @@ (define-public sbcl-jzon (base32 "1048f6prz2lp859nxwcgghn6n38pc2pb580azzxpdhfcdi0034mj")))) (build-system asdf-build-system/sbcl) (arguments - '(#:asd-systems '("com.inuoe.jzon" "com.inuoe.jzon-tests"))) + '(#:asd-systems '("com.inuoe.jzon") + #:asd-test-systems '("com.inuoe.jzon-tests") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-test-asd + (lambda _ + (substitute* "test/com.inuoe.jzon-tests.asd" + ((":depends-on") + (string-append + ":perform (test-op (op c) (symbol-call :fiveam :run!" + " (find-symbol \"JZON\" :com.inuoe.jzon-tests)))" + "\n" + " :depends-on")))))))) (native-inputs (list sbcl-alexandria sbcl-fiveam -- cgit v1.2.3 From c2a747a60d2d890a2f848dc8f96089fe69148b4b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 12:13:39 +0200 Subject: gnu: sbcl-stumpwm-kbd-layouts: Fix build. * gnu/packages/wm.scm (sbcl-stumpwm-kbd-layouts)[arguments]: Set 'asd-operation' parameter to "compile-system". --- gnu/packages/wm.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fc5c173d00..3cf992620d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2115,6 +2115,7 @@ (define-public sbcl-stumpwm-kbd-layouts (name "sbcl-stumpwm-kbd-layouts") (arguments '(#:asd-systems '("kbd-layouts") + #:asd-operation "compile-system" #:tests? #f #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 45c257379f241aa98fac54bb0ac8f1b4b16cf4e5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 14:29:30 +0200 Subject: gnu: sbcl-glop: Remove obsolete test-asd-file parameter. * gnu/packages/lisp-xyz.scp (sbcl-glop)[arguments]: Remove 'test-asd-file' parameter. --- gnu/packages/lisp-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 20841bd397..2db615a7d1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17828,8 +17828,7 @@ (define-public sbcl-glop (base32 "1nm35kvigflfjlmsa8zwdajc61f02fh4sq08jv0wnqylhx8yg2bv")))) (build-system asdf-build-system/sbcl) (arguments - (list #:test-asd-file "glop-test.asd" - #:phases + (list #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-lib-paths (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 18f1befba35bd0006d94661bd2150eb5eb1f019e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 15:20:07 +0200 Subject: gnu: ecl-legion: Disable tests. * gnu/packages/lisp-xyz.scm (ecl-legion)[parameters]: Disable tests. --- gnu/packages/lisp-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2db615a7d1..03e474831d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4798,7 +4798,11 @@ (define-public cl-legion (sbcl-package->cl-source-package sbcl-legion)) (define-public ecl-legion - (sbcl-package->ecl-package sbcl-legion)) + (package + (inherit (sbcl-package->ecl-package sbcl-legion)) + (arguments + ;; Tests get stuck forever + (list #:tests? #f)))) (define-public sbcl-jonathan (let ((commit "1f448b4f7ac8265e56e1c02b32ce383e65316300") -- cgit v1.2.3 From f2d86db81d028b751bb9742f0ab495f2b44543b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Aug 2022 14:56:38 +0200 Subject: gnu: xscreensaver: Remove custom 'configure' phase. This is a followup to 45456595ac4ba613c8a61ff4f51088efd4157e6e, which was based on an incorrect diagnosis. * gnu/packages/xdisorg.scm (xscreensaver)[source]: Add 'snippet'. [arguments]: Remove custom 'configure' phase. Reintroduce #:configure-flags. --- gnu/packages/xdisorg.scm | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 5635f45d4c..1ce0886c2f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Alex Kost -;;; Copyright © 2013, 2015, 2017, 2018, 2019, 2021 Ludovic Courtès +;;; Copyright © 2013, 2015, 2017-2019, 2021-2022 Ludovic Courtès ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2015 Alexander I.Grafov ;;; Copyright © 2015 Andy Wingo @@ -1635,7 +1635,15 @@ (define-public xscreensaver (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")))) + (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")) + (modules '((guix build utils))) + (snippet + ;; 'configure.ac' checks for $ac_unrecognized_opts and exits if it's + ;; non-empty. Since the default 'configure' phases passes options + ;; that may or may not be recognized, such as '--enable-fast-install', + ;; these need to be tolerated, hence this snippet. + '(substitute* "configure" + (("exit 2") "true"))))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -1646,24 +1654,9 @@ (define-public xscreensaver (substitute* '("driver/Makefile.in" "po/Makefile.in.in") (("@GTK_DATADIR@") "@datadir@") (("@PO_DATADIR@") "@datadir@")) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - ;; The tarball uses a very old version of autconf. It does not - ;; understand extra flags like `--enable-fast-install', so - ;; we need to invoke it with just what it understands. - (let ((out (assoc-ref outputs "out"))) - ;; 'configure' doesn't understand '--host'. - ,@(if (%current-target-system) - `((setenv "CHOST" ,(%current-target-system))) - '()) - (setenv "CONFIG_SHELL" (which "bash")) - (setenv "SHELL" (which "bash")) - (invoke "./configure" - (string-append "--prefix=" out) - "--with-pam" - "--with-proc-interrupts" - "--without-readdisplay"))))) + #t))) + #:configure-flags '("--with-pam" "--with-proc-interrupts" + "--without-readdisplay") #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") "/lib/X11/app-defaults")))) -- cgit v1.2.3 From e8ed95ddf884d1b958eed0da37d5b843c5e40dfe Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 3 Aug 2022 15:33:32 +0200 Subject: gnu: xscreensaver: Don't read /proc/interrupts at configure time. Fixes a bug whereby, on some machines, ./configure would fail with: Warning: Checking of /proc/interrupts was requested, but it's bogus. * gnu/packages/xdisorg.scm (xscreensaver)[arguments]: Pass '--without-proc-interrupts'. --- gnu/packages/xdisorg.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 1ce0886c2f..7d0c4d3482 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1655,7 +1655,13 @@ (define-public xscreensaver (("@GTK_DATADIR@") "@datadir@") (("@PO_DATADIR@") "@datadir@")) #t))) - #:configure-flags '("--with-pam" "--with-proc-interrupts" + #:configure-flags '("--with-pam" + + ;; Don't check /proc/interrupts in the build + ;; environment to avoid non-deterministic failures + ;; of the 'configure' script. + "--without-proc-interrupts" + "--without-readdisplay") #:make-flags (list (string-append "AD_DIR=" (assoc-ref %outputs "out") -- cgit v1.2.3 From 6815bdb95c1ed8c6d522623d51bda7d8059e4967 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 10:15:42 +0100 Subject: gnu: Add texlive-mdframed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-mdframed): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ff38c97c5d..b2e49e3a2e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Thiago Jung Bauermann ;;; Copyright © 2022 Jack Hill +;;; Copyright © 2022 Fabio Natali ;;; ;;; This file is part of GNU Guix. ;;; @@ -11082,3 +11083,23 @@ (define-public texlive-babel-danish Danish in @code{babel}. It provides all the necessary macros, definitions and settings to typeset Danish documents.") (license license:lppl1.3c+)))) + +(define-public texlive-mdframed + (package + (inherit + (simple-texlive-package + "texlive-mdframed" + (list + "doc/latex/mdframed/" + "source/latex/mdframed/" + "tex/latex/mdframed/") + (base32 "1i5rm946wg43rjckxlfhx79zfx5cgd3bxk71206hd1dqkrgpdpa8") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/mdframed") + (synopsis "Framed environments that can split at page boundaries") + (description + "The @code{mdframed} package develops the facilities of @code{framed} in +providing breakable framed and coloured boxes. The user may instruct the +package to perform its operations using default LaTeX commands, PStricks or +TikZ.") + (license license:lppl))) -- cgit v1.2.3 From 772db83faaebee82f6462878d1b3ac21b248e918 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:24:08 +0100 Subject: gnu: Add texlive-setspace. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-setspace): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index b2e49e3a2e..9cfe673695 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11103,3 +11103,21 @@ (define-public texlive-mdframed package to perform its operations using default LaTeX commands, PStricks or TikZ.") (license license:lppl))) + +(define-public texlive-setspace + (package + (inherit + (simple-texlive-package + "texlive-setspace" + (list "doc/latex/setspace/" "tex/latex/setspace/") + (base32 "00ik8qgkw3ivh3z827zjf7gbwkbsmdcmv22c6ap543mpgaqqjcfm") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/setspace") + (synopsis "Set space between lines") + (description + "The @code{setspace} package provides support for setting the spacing between +lines in a document. Package options include @code{singlespacing}, +@code{onehalfspacing}, and @code{doublespacing}. Alternatively the spacing +can be changed as required with the @code{\\singlespacing}, +@code{\\onehalfspacing}, and @code{\\doublespacing} commands. Other size +spacings also available."))) -- cgit v1.2.3 From 96e50a219d206436ed5d06cfdec88f175b992530 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:28:07 +0100 Subject: gnu: Add texlive-pgfgantt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-pgfgantt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 9cfe673695..15f411da56 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11121,3 +11121,23 @@ (define-public texlive-setspace can be changed as required with the @code{\\singlespacing}, @code{\\onehalfspacing}, and @code{\\doublespacing} commands. Other size spacings also available."))) + +(define-public texlive-pgfgantt + (package + (inherit + (simple-texlive-package + "texlive-pgfgantt" + (list + "doc/latex/pgfgantt/" + "source/latex/pgfgantt/" + "tex/latex/pgfgantt/") + (base32 "0bm034iizk4sd7p5x7vkj7v57dc0bf2lswpsb32s4qlg4s7h6jqz") + #:trivial? #t)) + (propagated-inputs (list texlive-pgf)) + (home-page "https://ctan.org/graphics/pgf/contrib/pgfgantt") + (synopsis "Draw Gantt charts with TikZ") + (description + "The @code{pgfgantt} package provides an environment for drawing Gantt charts +that contain various elements (titles, bars, milestones, groups and links). +Several keys customize the appearance of the chart elements.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 79faefb8afdd0b6aab3e04fe64bba91abfcf333b Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:36:03 +0100 Subject: gnu: Add texlive-pdflscape. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-pdflscape): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 15f411da56..5948ab3451 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11141,3 +11141,22 @@ (define-public texlive-pgfgantt that contain various elements (titles, bars, milestones, groups and links). Several keys customize the appearance of the chart elements.") (license license:lppl1.3+))) + +(define-public texlive-pdflscape + (package + (inherit + (simple-texlive-package + "texlive-pdflscape" + (list "doc/latex/pdflscape/" + "source/latex/pdflscape/" + "tex/latex/pdflscape/") + (base32 "05vvmwd8vlzs2x2rm6pfzlvrrihqf924d7krlrkvc6giiwyfsic4") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/pdflscape") + (synopsis "Make landscape pages display as landscape") + (description + "The @code{pdflscape} package adds PDF support to the @code{landscape} +environment of package @code{lscape}, by setting the PDF @code{/Rotate} page +attribute. Pages with this attribute will be displayed in landscape +orientation by conforming PDF viewers.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 1730148f7c6b1d79f0ce318b2bda5c707b06807d Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:42:01 +0100 Subject: gnu: Add texlive-datetime2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-datetime2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5948ab3451..8578c8fe56 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11160,3 +11160,28 @@ (define-public texlive-pdflscape attribute. Pages with this attribute will be displayed in landscape orientation by conforming PDF viewers.") (license license:lppl1.3+))) + +(define-public texlive-datetime2 + (package + (inherit + (simple-texlive-package + "texlive-datetime2" + (list "doc/latex/datetime2/" + "source/latex/datetime2/" + "tex/latex/datetime2/") + (base32 "0yjkpfic1ni4j2g61rrjj5hjyd43shc9c0sg1aivbbsmqh30dn33") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/datetime2") + (synopsis "Formats for dates, times and time zones") + (description + "The @code{datetime2} package provides commands for formatting dates, times +and time zones and redefines @code{\\today} to use the same formatting style. +In addition to @code{\\today}, you can also use +@code{\\DTMcurrenttime} (current time) or @code{\\DTMnow} (current date and +time). Dates and times can be saved for later use. The accompanying +@code{datetime2-calc} package can be used to convert date-times to UTC+00:00. +Language and regional support is provided by independently maintained and +installed modules. The @code{datetime2-calc} package uses the +@code{pgfcalendar} package (part of the PGF/TikZ bundle). This package +replaces @code{datetime.sty} which is now obsolete.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 69d2ca4035b85445533768ca082399e55c4f6d41 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:44:03 +0100 Subject: gnu: Add texlive-tracklang. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-tracklang): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8578c8fe56..0cd10e25ea 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11185,3 +11185,25 @@ (define-public texlive-datetime2 @code{pgfcalendar} package (part of the PGF/TikZ bundle). This package replaces @code{datetime.sty} which is now obsolete.") (license license:lppl1.3+))) + +(define-public texlive-tracklang + (package + (inherit + (simple-texlive-package + "texlive-tracklang" + (list "doc/generic/tracklang/" + "source/latex/tracklang/" + "tex/generic/tracklang/" + "tex/latex/tracklang/") + (base32 "1386sg25y6zb4ixvrbdv6n1gp54h18mjd984bnwwqda6jafxx4zr") + #:trivial? #t)) + (home-page "https://ctan.org/macros/generic/tracklang") + (synopsis "Language and dialect tracker") + (description + "The @code{tracklang} package is provided for package developers who want a +simple interface to find out which languages the user has requested through +packages such as @code{babel} or @code{polyglossia}. This package does not +provide any translations! Its purpose is simply to track which languages have +been requested by the user. Generic TeX code is in @code{tracklang.tex} for +non-LaTeX users.") + (license license:lppl1.3+))) -- cgit v1.2.3 From 734805d15d6397dd050c4befbefbd646bd32b7bb Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:45:10 +0100 Subject: gnu: Add texlive-ltablex. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-ltablex): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0cd10e25ea..2f2cb3a697 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11207,3 +11207,20 @@ (define-public texlive-tracklang been requested by the user. Generic TeX code is in @code{tracklang.tex} for non-LaTeX users.") (license license:lppl1.3+))) + +(define-public texlive-ltablex + (package + (inherit + (simple-texlive-package + "texlive-ltablex" + (list "doc/latex/ltablex/" "tex/latex/ltablex/") + (base32 "14lmgj820j6zwj1xnd6ad38kzb9w132kp7sp55cv5bk9vhx3621w") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/ltablex") + (synopsis "Table package extensions") + (description + "The @code{ltablex} package modifies the @code{tabularx} environment to +combine the features of the @code{tabularx} package (auto-sized columns in a +fixed-width table) with those of the @code{longtable} package (multi-page +tables).") + (license license:lppl))) -- cgit v1.2.3 From aceb696cb0d701b364514b68dc04de3398b8e5bc Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:46:18 +0100 Subject: gnu: Add texlive-ragged2e. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-ragged2e): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2f2cb3a697..2d6425773c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11224,3 +11224,23 @@ (define-public texlive-ltablex fixed-width table) with those of the @code{longtable} package (multi-page tables).") (license license:lppl))) + +(define-public texlive-ragged2e + (package + (inherit + (simple-texlive-package + "texlive-ragged2e" + (list "doc/latex/ragged2e/" + "source/latex/ragged2e/" + "tex/latex/ragged2e/") + (base32 "1cxj5jdgvr3xk1inrb3yzpm3l386jjawgpqiwsz53k6yshb6yfml") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/ragged2e") + (synopsis "Alternative versions of \"ragged\"-type commands") + (description + "The @code{ragged2e} package defines new commands @code{\\Centering}, @code{\\RaggedLeft}, +and @code{\\RaggedRight} and new environments @code{Center}, @code{FlushLeft}, +and @code{FlushRight}, which set ragged text and are easily configurable to +allow hyphenation (the corresponding commands in LaTeX, all of whose names are +lower-case, prevent hyphenation altogether).") + (license license:lppl1.3c))) -- cgit v1.2.3 From 212f8e4bbc9dd92bdd526ad7f6f529ea253a0eea Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 16 Jul 2022 15:47:56 +0100 Subject: gnu: Add texlive-everysel. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-everysel): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2d6425773c..ca80405de2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11244,3 +11244,25 @@ (define-public texlive-ragged2e allow hyphenation (the corresponding commands in LaTeX, all of whose names are lower-case, prevent hyphenation altogether).") (license license:lppl1.3c))) + +(define-public texlive-everysel + (package + (inherit + (simple-texlive-package + "texlive-everysel" + (list "doc/latex/everysel/" + "source/latex/everysel/" + "tex/latex/everysel/") + (base32 "0skzm2qsk5vpjxgslclp4pvbbcrrnm1w3df8xfvfq252dyd7w8s5") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/everysel") + (synopsis "Provides hooks into @code{\\selectfont}") + (description + "The @code{everysel} package provided hooks whose arguments are executed just +after LaTeX has loaded a new font by means of @code{\\selectfont}. It has +become obsolete with LaTeX versions 2021/01/05 or newer, since LaTeX now +provides its own hooks to fulfill this task. For newer versions of LaTeX +@code{everysel} only provides macros using LaTeX's hook management due to +compatibility reasons. See @code{lthooks-doc.pdf} for instructions how to use +@code{lthooks} instead of @code{everysel}.") + (license license:lppl1.3c))) -- cgit v1.2.3 From b3f1666dd61df4cbb07d0e3d7ae0876d49ddf916 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Thu, 28 Jul 2022 15:51:36 +0100 Subject: gnu: Add texlive-everyshi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tex.scm (texlive-everyshi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ca80405de2..fe90d15124 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -11266,3 +11266,26 @@ (define-public texlive-everysel compatibility reasons. See @code{lthooks-doc.pdf} for instructions how to use @code{lthooks} instead of @code{everysel}.") (license license:lppl1.3c))) + +(define-public texlive-everyshi + (package + (inherit + (simple-texlive-package + "texlive-everyshi" + (list "doc/latex/everyshi/" + "source/latex/everyshi/" + "tex/latex/everyshi/") + (base32 "11y6xazv1nk0m2hzsainjr8ijn5cff04xfccm6a65hzg7ipggraj") + #:trivial? #t)) + (home-page "https://ctan.org/pkg/everyshi") + (synopsis "Take action at every @code{\\shipout}") + (description + "The @code{everyshi} package provides hooks into @code{\\sshipout} called +@code{\\EveryShipout} and @code{\\AtNextShipout} analogous to +@code{\\AtBeginDocument}. With the introduction of the LaTeX hook management +this package became obsolete in 2020 and is only provided for backwards +compatibility. For current versions of LaTeX it is only mapping the hooks to +the original @code{everyshi} macros. In case you use an older LaTeX format, +@code{everyshi} will automatically fall back to its old implementation by +loading @code{everyshi-2001-05-15}.") + (license license:lppl1.3c))) -- cgit v1.2.3 From 5791736e5ee194deb9d241cb47feb1cef80da525 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Mon, 18 Jul 2022 18:52:19 +0000 Subject: gnu: mingw: Update to 10.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mingw.scm (mingw): Update to 10.0.0. [arguments] Disable parallel building to avoid failures trying to access empty .a files. Signed-off-by: Ludovic Courtès --- gnu/packages/mingw.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 87a565059e..161fd4ff93 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -46,7 +46,7 @@ (define* (make-mingw-w64 machine (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "8.0.0") + (version "10.0.0") (source (origin (method url-fetch) @@ -54,7 +54,7 @@ (define* (make-mingw-w64 machine "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4")) + (base32 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs")) (patches (search-patches "mingw-w64-6.0.0-gcc.patch" "mingw-w64-dlltool-temp-prefix.patch" @@ -108,6 +108,7 @@ (define* (make-mingw-w64 machine xlibc "/lib" ":" xlibc "/" ,triplet "/lib")))))))) #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") + #:parallel-build? #f ; parallel builds often fail with empty .a files #:tests? #f ; compiles and includes glibc headers #:strip-binaries? #f)) (home-page "https://mingw-w64.org") -- cgit v1.2.3 From 5c585a7ff19f172595f09da9354e4fc540352855 Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Mon, 18 Jul 2022 18:52:31 +0000 Subject: gnu: mingw-w64-tools: Update to 10.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mingw.scm (mingw-w64-tools): Update to 10.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/mingw.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 161fd4ff93..ae8bea1009 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -144,7 +144,7 @@ (define-public mingw-w64 mingw-w64-i686) (define-public mingw-w64-tools (package (name "mingw-w64-tools") - (version "8.0.0") + (version "10.0.0") (source (origin (method url-fetch) @@ -152,7 +152,7 @@ (define-public mingw-w64-tools "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "0qjpb9rviasfshk337j5r32ncmrwml8sv6qnmb1lp4mkdbm41is4")))) + (base32 "15089y4rlj6g1m2m3cm3awndw3rbzhznl7skd0vkmikjxl546sxs")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit v1.2.3 From bce64b41804432aea96ceb3e49b8b53de58a2d90 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 1 Aug 2022 06:55:14 -0400 Subject: gnu: libunwind: Fix license. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The license of libunwind is Expat, not X11: see . * gnu/packages/libunwind.scm (libunwind)[license]: Fix it. Signed-off-by: Ludovic Courtès --- gnu/packages/libunwind.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index 9eaf26fca8..03412edd25 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -52,4 +52,6 @@ (define-public libunwind call-chain (non-local goto). The API supports both local (same-process) and remote (across-process) operation. As such, the API is useful in a number of applications.") - (license x11))) + ;; Do not believe : + ;; see . + (license expat))) -- cgit v1.2.3 From 2eb2501d66d4f0d40e77aac6b0a15d5872f5848b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 26 Jul 2022 17:02:16 +0000 Subject: gnu: Add gdb-12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gdb.scm (gdb-12): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gdb.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index aa9e479e46..7d8416c7c5 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -149,6 +149,18 @@ (define-public gdb-11 written in C, C++, Ada, Objective-C, Pascal and more.") (license gpl3+))) +(define-public gdb-12 + (package + (inherit gdb-11) + (version "12.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdb/gdb-" + version ".tar.xz")) + (sha256 + (base32 + "1vczsqcbh5y0gx7qrclpna0qzx26sk7lra6y8qzxam1biyzr65qf")))))) + (define-public gdb ;; This is the fixed version that packages depend on. Update it rarely ;; enough to avoid massive rebuilds. -- cgit v1.2.3 From b5d81028c0c7bf1f695f081288885db6107737da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Aug 2022 18:11:38 +0200 Subject: gnu: emacs-modus-themes: Update to 2.5.0. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 2.5.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7a060783f8..853e348ff5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -28080,7 +28080,7 @@ (define-public emacs-doom-themes (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "2.4.1") + (version "2.5.0") (source (origin (method git-fetch) @@ -28089,7 +28089,7 @@ (define-public emacs-modus-themes (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b4y8dzyc9qwwaf2ngqiwyfcnhwlr49kxhc96laqk20lvjlfsrnx")))) + (base32 "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz")))) (native-inputs (list texinfo)) (build-system emacs-build-system) (arguments -- cgit v1.2.3 From 8fa40bf0ed2b10d91ff69fa38f9c805b198f8bd1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Aug 2022 18:13:16 +0200 Subject: gnu: emacs-elfeed-protocol: Update to 0.8.1. * gnu/packages/emacs-xyz.scm (emacs-elfeed-protocol): Update to 0.8.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 853e348ff5..00b52f75be 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11011,7 +11011,7 @@ (define-public emacs-elfeed-org (define-public emacs-elfeed-protocol (package (name "emacs-elfeed-protocol") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) @@ -11020,7 +11020,7 @@ (define-public emacs-elfeed-protocol (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp")))) + (base32 "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2")))) (build-system emacs-build-system) (propagated-inputs (list emacs-elfeed)) -- cgit v1.2.3 From bea272b0ba1a062185bd5bfe36cccdbbe204d871 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Aug 2022 18:32:21 +0200 Subject: gnu: naev: Update to 0.9.4. * gnu/packages/games.scm (naev): Update to 0.9.4. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8b655cc0e4..7d2ba0344b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7994,7 +7994,7 @@ (define-public frotz (define-public naev (package (name "naev") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) @@ -8004,7 +8004,7 @@ (define-public naev (recursive? #t))) ; for game data (file-name (git-file-name name version)) (sha256 - (base32 "0hvgxzvph9s5gdzlj5kjnz2d2j7bi8s11k7i6540837mnppah18j")))) + (base32 "0isswidhxhs2q5c4cxryjr8y8ibfxckpfyccly3b4lg1nxvm5gjv")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. -- cgit v1.2.3 From 78d417b8577e51f231a18c9505f18845650e9b2b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Aug 2022 18:35:08 +0200 Subject: gnu: lagrange: Update to 1.13.7. * gnu/packages/web-browsers.scm (lagrange): Update to 1.13.7. --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 4a8333fae4..68d27a838b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -705,7 +705,7 @@ (define-public nyxt (define-public lagrange (package (name "lagrange") - (version "1.13.6") + (version "1.13.7") (source (origin (method url-fetch) @@ -713,7 +713,7 @@ (define-public lagrange (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "19xaw6lspl4mjx1wls0s15l97dzfkv20gph652yzwk6ia3ly92bs")) + (base32 "051f7ym1z1hjsxnlvk7gx7b4v12x42i3g9gi49qwy3x8rw30vrvz")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 0aa98e064668767793d9437d27999b58a16f7309 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 18:32:10 +0200 Subject: gnu: python-pyside-2: Fix build. * gnu/packages/qt.scm (python-pyside-2)[arguments]: Use the correct names for Qt inputs in the 'fix-qt-module-detection' phase. --- gnu/packages/qt.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 86f5d11714..7d0f1b4971 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3864,20 +3864,20 @@ (define-public python-pyside-2 (string-append (assoc-ref inputs name) "/include/qt5")) '("qtdatavis3d" - "qtdeclarative-5" + "qtdeclarative" "qtlocation" - "qtmultimedia-5" - "qtquickcontrols-5" - "qtquickcontrols2-5" + "qtmultimedia" + "qtquickcontrols" + "qtquickcontrols2" "qtscript" "qtscxml" "qtsensors" "qtspeech" - "qtsvg-5" + "qtsvg" "qttools-5" - "qtwebchannel-5" - "qtwebengine-5" - "qtwebsockets-5" + "qtwebchannel" + "qtwebengine" + "qtwebsockets" "qtx11extras" "qtxmlpatterns")))) (substitute* "cmake/Macros/PySideModules.cmake" -- cgit v1.2.3 From 85e2a79a3e86f6981c01372be31279451280c2fe Mon Sep 17 00:00:00 2001 From: Trevor Richards Date: Wed, 3 Aug 2022 18:19:16 +0300 Subject: gnu: nim: Build and install nimble. * gnu/packages/nim.scm (nim)[arguments]: Adjust custom 'patch-installer, 'patch-more-shebangs, 'build and 'install phases to build and install nimble and associated helper binaries. Co-authored-by: Efraim Flashner --- gnu/packages/nim.scm | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 8d1f5d0dd0..321f4d3e3e 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -1,9 +1,10 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 José Miguel Sánchez García -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2022 Efraim Flashner ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2022 (unmatched parenthesis +;;; Copyright © 2022 Trevor Richards ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,7 @@ (define-public nim (base32 "0lm4450ig8k4l3rzxv6kcqji5l1lzicsw76ckwxm0q9qdz713cb7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests. + `(#:tests? #f ; TODO: Investigate tests failures. #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -47,26 +48,36 @@ (define-public nim (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "install.sh" - (("1/nim") "1")) - #t))) + (("/usr/local") out) + (("/opt/nimble") (string-append out "/share/nimble")) + (("configdir=/etc/nim") + (string-append "configdir=" out "/etc/nim")))))) (add-after 'patch-source-shebangs 'patch-more-shebangs (lambda _ (let ((sh (which "sh"))) (substitute* '("tests/stdlib/tosprocterminate.nim" - "lib/pure/osproc.nim") + "tests/stdlib/tstrscans.nim" + "lib/pure/osproc.nim" + "lib/pure/strscans.nim") (("/bin/sh") sh)) - (substitute* (find-files "c_code" "stdlib_osproc.c") - (("\"/bin/sh\", 7") (format #f "~s, ~s" sh (string-length sh))))) - #t)) + (substitute* (find-files "c_code" "stdlib_osproc\\.nim\\.c") + (("\"/bin/sh\", 7") (format #f "~s, ~s" sh (string-length sh))))))) (replace 'build (lambda _ + (setenv "XDG_CACHE_HOME" "./cache-home") + (mkdir-p "./cache-home") (invoke "sh" "build.sh") - #t)) + (invoke "./bin/nim" "c" "-d:release" "koch") + (invoke "./koch" "boot" "-d:release") + (invoke "./koch" "tools"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./install.sh" out) - #t)))))) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p bin) + (invoke "./install.sh" bin) + (for-each (lambda (file) + (install-file file bin)) + (delete "testament" (find-files "bin"))))))))) (home-page "https://nim-lang.org") (synopsis "Statically-typed, imperative programming language") (description "Nim (formerly known as Nimrod) is a statically-typed, -- cgit v1.2.3 From d50f8b7ddc913a0d89af891846564777bdf1bc9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Aug 2022 18:20:53 +0300 Subject: gnu: nim: Install shell completions. * gnu/packages/nim.scm (nim)[arguments]: Add custom 'install-completions phase to install shell completion scripts. --- gnu/packages/nim.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 321f4d3e3e..cf6d19c518 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -77,7 +77,22 @@ (define-public nim (invoke "./install.sh" bin) (for-each (lambda (file) (install-file file bin)) - (delete "testament" (find-files "bin"))))))))) + (delete "testament" (find-files "bin")))))) + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((share (string-append (assoc-ref outputs "out") "/share")) + (bash (string-append share "/bash-completion/completions")) + (zsh (string-append share "/zsh/vendor_completions"))) + (mkdir-p bash) + (mkdir-p zsh) + (copy-file "tools/nim.bash-completion" + (string-append bash "/nim")) + (copy-file "dist/nimble/nimble.bash-completion" + (string-append bash "/nimble")) + (copy-file "tools/nim.zsh-completion" + (string-append zsh "/_nim")) + (copy-file "dist/nimble/nimble.bash-completion" + (string-append zsh "/_nimble")))))))) (home-page "https://nim-lang.org") (synopsis "Statically-typed, imperative programming language") (description "Nim (formerly known as Nimrod) is a statically-typed, -- cgit v1.2.3 From 68b6eaf1d9b05c87c6d8abbe8c4d0b45d9b723ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Aug 2022 18:22:21 +0300 Subject: gnu: nim: Prepare for running tests. * gnu/packages/nim.scm (nim)[arguments]: Replace default 'check phase. [native-inputs]: Add nss-certs. --- gnu/packages/nim.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index cf6d19c518..179a6ea0e3 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -25,7 +25,8 @@ (define-module (gnu packages nim) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (gnu packages certs)) (define-public nim (package @@ -70,6 +71,10 @@ (define-public nim (invoke "./bin/nim" "c" "-d:release" "koch") (invoke "./koch" "boot" "-d:release") (invoke "./koch" "tools"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./koch" "tests")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) @@ -93,6 +98,7 @@ (define-public nim (string-append zsh "/_nim")) (copy-file "dist/nimble/nimble.bash-completion" (string-append zsh "/_nimble")))))))) + (native-inputs (list nss-certs)) (home-page "https://nim-lang.org") (synopsis "Statically-typed, imperative programming language") (description "Nim (formerly known as Nimrod) is a statically-typed, -- cgit v1.2.3 From 6bc9c73f722a29552bd86bbc0b8a9de908397ff7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Aug 2022 18:25:06 +0300 Subject: gnu: nim: Patch dynamically loaded libraries. * gnu/packages/nim.scm (nim)[arguments]: Add custom 'patch-dynamic-libraries phase to patch some dynamically loaded libraries. [inputs]: Add libgc, openssl, pcre and sqlite. --- gnu/packages/nim.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index 179a6ea0e3..c31659fdc9 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -26,7 +26,11 @@ (define-module (gnu packages nim) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (gnu packages certs)) + #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages certs) + #:use-module (gnu packages pcre) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls)) (define-public nim (package @@ -53,6 +57,42 @@ (define-public nim (("/opt/nimble") (string-append out "/share/nimble")) (("configdir=/etc/nim") (string-append "configdir=" out "/etc/nim")))))) + (add-after 'unpack 'patch-dynamic-libraries + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;(substitute* "compiler/nodejs.nim" + ; (("nodejs") + ; (search-input-file (or native-inputs inputs) + ; "/bin/nodejs")) + ; (("node") + ; (search-input-file (or native-inputs inputs) + ; "/bin/node"))) + (substitute* "lib/system.nim" + (("libgc\\.so") + (search-input-file (or native-inputs inputs) + "/lib/libgc.so"))) + ;(substitute* "lib/wrappers/mysql.nim" + ; (("\(libmysqlclient|libmariadbclient\)\\.so") + ; (search-input-file (or native-inputs inputs) + ; "/lib/libmariadbclient.so"))) + (substitute* "lib/wrappers/openssl.nim" + (("libssl\\.so") + (search-input-file (or native-inputs inputs) + "/lib/libssl.so")) + (("libcrypto\\.so") + (search-input-file (or native-inputs inputs) + "/lib/libcrypto.so"))) + (substitute* "lib/wrappers/pcre.nim" + (("libpcre\\.so") + (search-input-file (or native-inputs inputs) + "/lib/libpcre.so"))) + ;(substitute* "lib/wrappers/postgres.nim" + ; (("libpg\\.so") + ; (search-input-file (or native-inputs inputs) + ; "/lib/libpg.so"))) + (substitute* "lib/wrappers/sqlite3.nim" + (("libsqlite3\\.so") + (search-input-file (or native-inputs inputs) + "/lib/libsqlite3.so"))))) (add-after 'patch-source-shebangs 'patch-more-shebangs (lambda _ (let ((sh (which "sh"))) @@ -98,6 +138,7 @@ (define-public nim (string-append zsh "/_nim")) (copy-file "dist/nimble/nimble.bash-completion" (string-append zsh "/_nimble")))))))) + (inputs (list libgc openssl pcre sqlite)) (native-inputs (list nss-certs)) (home-page "https://nim-lang.org") (synopsis "Statically-typed, imperative programming language") -- cgit v1.2.3 From 4d41dad4bae14e3855d83d7097317a153f1ac4e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Aug 2022 19:59:37 +0300 Subject: gnu: nim: Enable parallel building. * gnu/packages/nim.scm (nim)[arguments]: Adjust custom 'build phase to add parallel flag. [native-inputs]: Add parallel. --- gnu/packages/nim.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/nim.scm b/gnu/packages/nim.scm index c31659fdc9..6da382119f 100644 --- a/gnu/packages/nim.scm +++ b/gnu/packages/nim.scm @@ -28,6 +28,7 @@ (define-module (gnu packages nim) #:use-module (guix packages) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages certs) + #:use-module (gnu packages parallel) #:use-module (gnu packages pcre) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) @@ -104,10 +105,16 @@ (define-public nim (substitute* (find-files "c_code" "stdlib_osproc\\.nim\\.c") (("\"/bin/sh\", 7") (format #f "~s, ~s" sh (string-length sh))))))) (replace 'build - (lambda _ + (lambda* (#:key (parallel-build? #t) #:allow-other-keys) (setenv "XDG_CACHE_HOME" "./cache-home") + (setenv "HOME" "./cache-home") (mkdir-p "./cache-home") - (invoke "sh" "build.sh") + (invoke "sh" "build.sh" + "--parallel" + (if parallel-build? + (number->string (parallel-job-count)) + "1")) + (sleep 5) ; Wait for the parallel builds to finish. (invoke "./bin/nim" "c" "-d:release" "koch") (invoke "./koch" "boot" "-d:release") (invoke "./koch" "tools"))) @@ -139,7 +146,7 @@ (define-public nim (copy-file "dist/nimble/nimble.bash-completion" (string-append zsh "/_nimble")))))))) (inputs (list libgc openssl pcre sqlite)) - (native-inputs (list nss-certs)) + (native-inputs (list nss-certs parallel)) (home-page "https://nim-lang.org") (synopsis "Statically-typed, imperative programming language") (description "Nim (formerly known as Nimrod) is a statically-typed, -- cgit v1.2.3 From 18c5f002678588f7e5afc3e050fa7e0f13fdcfef Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 22:22:57 +0200 Subject: gnu: bitcoin-core: Fix build. * gnu/packages/finance.scm (bitcoin-core)[arguments]: Fix reference to qttools in 'configure-flags'. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index bb1e1a48cf..8b02ff412b 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -161,10 +161,10 @@ (define-public bitcoin-core-0.21 ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools-5") + (assoc-ref %build-inputs "qttools") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools-5") + (assoc-ref %build-inputs "qttools") "/bin/lupdate")) #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 47a38d09696b309f6174b585465e621352444ddb Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 22:26:58 +0200 Subject: gnu: bitcoin-unlimited: Fix build. * gnu/packages/finance.scm (bitcoin-unlimited)[arguments]: Fix reference to qttools in 'configure-flags'. --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 8b02ff412b..4b5ab2924b 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1677,10 +1677,10 @@ (define-public bitcoin-unlimited ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools-5") + (assoc-ref %build-inputs "qttools") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools-5") + (assoc-ref %build-inputs "qttools") "/bin/lupdate") "--disable-static") #:phases -- cgit v1.2.3 From dbbb1dcd656211a45f421f44bf49c6a3d11bd11f Mon Sep 17 00:00:00 2001 From: Pavel Shlyak Date: Sun, 31 Jul 2022 01:19:07 +0300 Subject: gnu: Add feathernotes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/task-management.scm (feathernotes): New variable. Signed-off-by: 宋文武 --- gnu/packages/task-management.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index f8f52a8ccd..c0b3cd963c 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -1,10 +1,13 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020 Hamzeh Nasajpour ;;; Copyright © 2021 Eric Bavier ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 LibreMiami +;;; Copyright © 2021 Reza Alizadeh Majd ;;; Copyright © 2022 Foo Chuan Wei +;;; Copyright © 2022 Pavel Shlyak ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +35,7 @@ (define-module (gnu packages task-management) #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages libreoffice) ;for hunspell #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) @@ -39,6 +43,7 @@ (define-module (gnu packages task-management) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (guix download) @@ -49,7 +54,8 @@ (define-module (gnu packages task-management) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (guix build-system qt)) (define-public clikan (let ((commit "55ab29e68263c6fed2844aef96fbebacda3eba9b") @@ -281,6 +287,33 @@ (define-public blanket You can also use it to fall asleep in a noisy environment.") (license license:gpl3+))) +(define-public feathernotes + (package + (name "feathernotes") + (version "0.10.0") + (home-page "https://github.com/tsujan/FeatherNotes") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "V" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "122pbbxvi0mmhbz8m8far71vm72090r5cafss4hvrsjmq52a0y4k")))) + (build-system qt-build-system) + (arguments (list #:tests? #f)) ; no upstream tests + (native-inputs (list pkg-config qttools-5)) ; for lrelease + (inputs (list hunspell qtsvg-5 qtx11extras qtbase-5)) + (synopsis "GUI hierarchical notes-manager") + (description + "FeatherNotes is a GUI hierarchical notes-manager for Linux. +It is independent of any desktop environment and has rich text formatting, +image embedding and inserting editable tables, spell checking, searchable +tags, drag and drop support, tray icon, node icons, hyperlinks, pdf and html +export, password protection and auto-saving.") + (license license:gpl3+))) + (define-public wtime (package (name "wtime") -- cgit v1.2.3 From adbdd07e45a7e9a5bad395ce84ef1835b31891b8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Aug 2022 16:58:48 -0400 Subject: gnu: lightdm: Install documentation. * gnu/packages/display-managers.scm (lightdm) [configure-flags]: Add --enable-gtk-doc. --- gnu/packages/display-managers.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index efeea2924d..f24e8ed8d4 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -276,6 +276,7 @@ (define-public lightdm '(#:parallel-tests? #f ; fails when run in parallel #:configure-flags (list "--localstatedir=/var" + "--enable-gtk-doc" ;; Otherwise the test suite fails on such a warning. "CFLAGS=-Wno-error=missing-prototypes") #:phases -- cgit v1.2.3 From 6aeabba2baa11b4a0a778fc353e62d0fe2f6b5ec Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Wed, 3 Aug 2022 17:04:32 -0400 Subject: gnu: lightdm: Build AccountsService files. * gnu/packages/display-managers.scm (lightdm) [native-inputs]: Add accountsservice. Signed-off-by: Maxim Cournoyer --- gnu/packages/display-managers.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index f24e8ed8d4..b65533074f 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -313,7 +313,8 @@ (define-public lightdm libgcrypt libxcb)) (native-inputs - (list autoconf + (list accountsservice + autoconf automake gobject-introspection gtk-doc -- cgit v1.2.3 From e1375a9b64e3d840cae21197dcf661f9b4d52c85 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Aug 2022 17:07:16 -0400 Subject: gnu: lightdm: Enable XDMCP support. * gnu/packages/display-managers.scm (lightdm)[inputs]: Add libxdmcp. --- gnu/packages/display-managers.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index b65533074f..264c1a92ec 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -311,7 +311,8 @@ (define-public lightdm linux-pam shadow ;for sbin/nologin libgcrypt - libxcb)) + libxcb + libxdmcp)) (native-inputs (list accountsservice autoconf -- cgit v1.2.3 From a8f53d544b00ba80f98c1c65e3cb67ce9110ae93 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Aug 2022 21:50:32 -0400 Subject: gnu: lightdm: Update to 1.32.0. * gnu/packages/display-managers.scm (lightdm): Update to 1.32.0. --- gnu/packages/display-managers.scm | 158 ++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 82 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 264c1a92ec..1ff2bf7ddd 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -255,89 +255,83 @@ (define-public sugar-light-sddm-theme (license license:gpl3+))) (define-public lightdm - ;; Use the latest commit, as the current official release doesn't build with - ;; glib >= 2.33. - (let ((revision "0") - (commit "b7fc3214cbaed09c73e963847443a0d648dfd896")) - (package - (name "lightdm") - (version (git-version "1.30.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/canonical/lightdm") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0378jacazpmdgdjkiilk3mbikz3iysb4s9q40hg9zv4yngwsix1m")))) - (build-system gnu-build-system) - (arguments - '(#:parallel-tests? #f ; fails when run in parallel - #:configure-flags - (list "--localstatedir=/var" - "--enable-gtk-doc" - ;; Otherwise the test suite fails on such a warning. - "CFLAGS=-Wno-error=missing-prototypes") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/shared-data-manager.c" - (("/bin/rm") - (search-input-file inputs "bin/rm"))) - (substitute* '("data/users.conf" - "common/user-list.c") - (("/bin/false") - (search-input-file inputs "bin/false")) - (("/usr/sbin/nologin") - (search-input-file inputs "sbin/nologin"))) - (substitute* "src/seat.c" - (("/bin/sh") - (search-input-file inputs "bin/sh"))))) - (add-before 'check 'pre-check - ;; Run test-suite under a dbus session. - (lambda _ - (wrap-program "tests/src/test-python-greeter" - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) - - ;; Avoid printing locale warnings, which trip up the text - ;; matching tests. - (unsetenv "LC_ALL")))))) - (inputs - (list audit - coreutils ;for cross-compilation - linux-pam - shadow ;for sbin/nologin - libgcrypt - libxcb - libxdmcp)) - (native-inputs - (list accountsservice - autoconf - automake - gobject-introspection - gtk-doc - pkg-config - itstool - intltool - libtool - vala ;for Vala bindings - ;; For tests - dbus - python-wrapper - python-pygobject - which - yelp-tools)) - ;; Required by liblightdm-gobject-1.pc. - (propagated-inputs - (list glib libx11 libxklavier)) - (home-page "https://www.freedesktop.org/wiki/Software/LightDM/") - (synopsis "Lightweight display manager") - (description "The Light Display Manager (LightDM) is a cross-desktop + (package + (name "lightdm") + (version "1.32.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/canonical/lightdm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wr60c946p8jz9kb8zi4cd8d4mkcy7infbvlfzwajiglc22nblxn")))) + (build-system gnu-build-system) + (arguments + '(#:parallel-tests? #f ; fails when run in parallel + #:configure-flags + (list "--localstatedir=/var" + "--enable-gtk-doc" + ;; Otherwise the test suite fails on such a warning. + "CFLAGS=-Wno-error=missing-prototypes") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/shared-data-manager.c" + (("/bin/rm") + (search-input-file inputs "bin/rm"))) + (substitute* '("data/users.conf" + "common/user-list.c") + (("/bin/false") + (search-input-file inputs "bin/false")) + (("/usr/sbin/nologin") + (search-input-file inputs "sbin/nologin"))) + (substitute* "src/seat.c" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) + (add-before 'check 'pre-check + (lambda _ + (wrap-program "tests/src/test-python-greeter" + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) + ;; Avoid printing locale warnings, which trip up the text + ;; matching tests. + (unsetenv "LC_ALL")))))) + (inputs + (list audit + coreutils ;for cross-compilation + linux-pam + shadow ;for sbin/nologin + libgcrypt + libxcb + libxdmcp)) + (native-inputs + (list accountsservice + autoconf + automake + gobject-introspection + gtk-doc + pkg-config + itstool + intltool + libtool + vala ;for Vala bindings + ;; For tests + dbus + python-wrapper + python-pygobject + which + yelp-tools)) + ;; Required by liblightdm-gobject-1.pc. + (propagated-inputs + (list glib libx11 libxklavier)) + (home-page "https://www.freedesktop.org/wiki/Software/LightDM/") + (synopsis "Lightweight display manager") + (description "The Light Display Manager (LightDM) is a cross-desktop display manager which supports different greeters.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public lightdm-gtk-greeter (package -- cgit v1.2.3 From 90b705ea447548c71950ba758bfe3453814a839e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Aug 2022 21:24:41 -0400 Subject: gnu: lightdm-gtk-greeter: Use gexps and new style inputs. * gnu/packages/display-managers.scm (lightdm-gtk-greeter)[arguments]: Use gexps. [configure-flags]: Use search-input-file. [phases]{fix-.desktop-file}: Likewise. {wrap-program}: Use search-input-file and this-package-input. [inputs]: Use new style. Add glib. --- gnu/packages/display-managers.scm | 73 +++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 34 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 1ff2bf7ddd..b259bd508c 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -348,43 +348,48 @@ (define-public lightdm-gtk-greeter "04q62mvr97l9gv8h37hfarygqc7p0498ig7xclcg4kxkqw0b7yxy")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "--enable-at-spi-command=" - (assoc-ref %build-inputs "at-spi2-core") - "/libexec/at-spi-bus-launcher")) - #:phases - (modify-phases %standard-phases - (add-after 'install 'fix-.desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* (string-append - out "/share/xgreeters/lightdm-gtk-greeter.desktop") - (("Exec=lightdm-gtk-greeter") - (string-append "Exec=" out "/sbin/lightdm-gtk-greeter"))) - #t))) - (add-after 'fix-.desktop-file 'wrap-program - ;; Mimic glib-or-gtk build system - ;; which doesn't wrap files in /sbin - (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((gtk (assoc-ref inputs "gtk+"))) - (wrap-program (string-append (assoc-ref outputs "out") - "/sbin/lightdm-gtk-greeter") - `("XDG_DATA_DIRS" ":" prefix - ,(cons "/run/current-system/profile/share" - (map (lambda (pkg) - (string-append (assoc-ref inputs pkg) "/share")) - '("gtk+" "shared-mime-info" "glib")))) - `("GTK_PATH" ":" prefix (,gtk)) - `("GIO_EXTRA_MODULES" ":" prefix (,gtk)))) - #t))))) + (list + #:configure-flags + #~(list (string-append "--enable-at-spi-command=" + (search-input-file + %build-inputs "libexec/at-spi-bus-launcher"))) + + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'fix-.desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (search-input-file + outputs + "share/xgreeters/lightdm-gtk-greeter.desktop") + (("Exec=lightdm-gtk-greeter") + (string-append "Exec=" + (search-input-file + outputs "sbin/lightdm-gtk-greeter")))))) + (add-after 'fix-.desktop-file 'wrap-program + ;; Mimic glib-or-gtk build system which doesn't wrap files in + ;; /sbin. + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((gtk #$(this-package-input "gtk+")) + (shared-mime-info #$(this-package-input "shared-mime-info")) + (glib #$(this-package-input "glib"))) + (wrap-program (search-input-file + outputs "sbin/lightdm-gtk-greeter") + `("XDG_DATA_DIRS" ":" prefix + ,(cons "/run/current-system/profile/share" + (map (lambda (pkg) + (string-append pkg "/share")) + (list gtk shared-mime-info glib)))) + `("GTK_PATH" ":" prefix (,gtk)) + `("GIO_EXTRA_MODULES" ":" prefix (,gtk))))))))) (native-inputs (list exo intltool pkg-config xfce4-dev-tools)) (inputs - `(("bash" ,bash-minimal) ; for wrap-program - ("lightdm" ,lightdm) - ("shared-mime-info" ,shared-mime-info) - ("at-spi2-core" ,at-spi2-core) - ("gtk+" ,gtk+))) + (list bash-minimal ;for wrap-program + lightdm + shared-mime-info + at-spi2-core + glib + gtk+)) (synopsis "GTK+ greeter for LightDM") (home-page "https://github.com/xubuntu/lightdm-gtk-greeter") (description "This package provides a LightDM greeter implementation using -- cgit v1.2.3 From af2d160c010b1287bef4d10fc06e64b10e359828 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Wed, 3 Aug 2022 21:33:35 -0400 Subject: gnu: lightdm-gtk-greeter: Disable indicator services. * gnu/packages/display-managers.scm (lightdm-gtk-greeter) [configure-flags]: Add '--disable-indicator-services-command'. Signed-off-by: Maxim Cournoyer --- gnu/packages/display-managers.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index b259bd508c..8eba4aeb4e 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -350,7 +350,8 @@ (define-public lightdm-gtk-greeter (arguments (list #:configure-flags - #~(list (string-append "--enable-at-spi-command=" + #~(list "--disable-indicator-services-command" ;requires upstart + (string-append "--enable-at-spi-command=" (search-input-file %build-inputs "libexec/at-spi-bus-launcher"))) -- cgit v1.2.3 From 525688e9f3b2798c25fca35686174b4f3dd90b47 Mon Sep 17 00:00:00 2001 From: L p R n d n Date: Wed, 3 Aug 2022 21:37:19 -0400 Subject: gnu: lightdm-gtk-greeter: Set XCURSOR_PATH in wrapper. * gnu/packages/display-managers.scm (lightdm-gtk-greeter) [phases]{wrap-program}: Set XCURSOR_PATH to the current system share/icons. Signed-off-by: Maxim Cournoyer --- gnu/packages/display-managers.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 8eba4aeb4e..1b837bc4de 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -381,7 +381,9 @@ (define-public lightdm-gtk-greeter (string-append pkg "/share")) (list gtk shared-mime-info glib)))) `("GTK_PATH" ":" prefix (,gtk)) - `("GIO_EXTRA_MODULES" ":" prefix (,gtk))))))))) + `("GIO_EXTRA_MODULES" ":" prefix (,gtk)) + '("XCURSOR_PATH" ":" prefix + ("/run/current-system/profile/share/icons"))))))))) (native-inputs (list exo intltool pkg-config xfce4-dev-tools)) (inputs -- cgit v1.2.3 From 34c0cb5d6305ff7cc56318fbaa649afbe83464c7 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Sat, 2 Apr 2022 22:01:28 -0500 Subject: gnu: tint2: Update to 17.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (tint2): Update to 17.0.2. Signed-off-by: 宋文武 --- gnu/packages/xdisorg.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 7d0c4d3482..8360708445 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Derek Chuank +;;; Copyright © 2022 Wamm K. D. ;;; ;;; This file is part of GNU Guix. ;;; @@ -1901,27 +1902,20 @@ (define-public rofi-calc (define-public tint2 (package (name "tint2") - (version "0.14.6") + (version "17.0.2") (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/o9000/" name - "/repository/archive.tar.gz?ref=" version)) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url (string-append "https://gitlab.com/o9000/" name "/")) + (commit version))) (sha256 (base32 - "1kwzwxy4myagybm3rc7dgynfgp75742n348qibn1p2an9ggyivda")))) + "123apmgs6x2zfv1q57dyl4mwqf0vsw5ndh5jsg6p3fvhr66l1aja")))) (build-system cmake-build-system) (arguments - '(#:tests? #f ;no test target - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-installation-prefix - (lambda _ - (substitute* "CMakeLists.txt" - (("/etc") "${CMAKE_INSTALL_PREFIX}/etc")) - #t))))) + '(#:tests? #f)) ;no test target (inputs - (list gtk+-2 + (list gtk+ imlib2 librsvg libxcomposite -- cgit v1.2.3 From f3d33ba9f78d0367404a9bc434349f5d7b535d5b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 4 Aug 2022 10:51:55 +0800 Subject: gnu: workrave: Update to 1.10.50. * gnu/packages/gnome.scm (workrave): Update to 1.10.50. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4a4744633..0044bb33fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10943,7 +10943,7 @@ (define-public soundconverter (define-public workrave (package (name "workrave") - (version "1.10.48") + (version "1.10.50") (source (origin (method git-fetch) @@ -10954,7 +10954,7 @@ (define-public workrave version))))) (file-name (git-file-name name version)) (sha256 - (base32 "0qcknxylk9mr0xzszsd1rkgh2zpnix20m998dfclkm9x8zh9pvyr")))) + (base32 "0fj3fqmdn4nsjgvbbvzpxw2mgiihcr1zpb08amg2p6hg9n11y9bx")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. -- cgit v1.2.3 From 06cd4a84f721ecbd1ee4a9371fe94b0057f36cfa Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 26 Jul 2022 17:04:48 +0000 Subject: gnu: lldb: Update to 14.0.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (lldb): Update to 14.0.6. [source]: Fetch using LLVM-MONOREPO. [phases]: Add phase to change to source subdirectory. [inputs]: Change from LLVM-13 and CLANG-13 to LLVM-14 and CLANG-14. Signed-off-by: 宋文武 --- gnu/packages/llvm.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5a2f411eb2..2a139f0471 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1374,21 +1374,22 @@ (define-public lld-as-ld-wrapper (define-public lldb (package (name "lldb") - (version "13.0.1") - (source (origin - (method url-fetch) - (uri (llvm-uri "lldb" version)) - (sha256 - (base32 - "05nvcbgb4rx860r3jzsbpvcbzpd0i7nsm5qrpkyfhg5vrh5mj32a")))) + (version "14.0.6") + (source (llvm-monorepo version)) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_CXX_COMPILER=clang++"))) + (list + #:configure-flags #~(list "-DOPENMP_TEST_CXX_COMPILER=clang++") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir-to-source + (lambda _ + (chdir "lldb")))))) (native-inputs (list pkg-config swig)) (inputs - (list clang-13 - llvm-13 + (list clang-14 + llvm-14 ;; Optional (but recommended) inputs. ncurses libedit -- cgit v1.2.3 From a44a762a513a78cac54383c1d0508ca70a1b87b1 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 22 Jul 2022 16:31:18 +0000 Subject: gnu: gperftools: Update to 2.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (gperftools): Update to 2.10. Signed-off-by: 宋文武 --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5b798f8625..1c9e57fb1c 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -727,7 +727,7 @@ (define-public spscqueue (define-public gperftools (package (name "gperftools") - (version "2.8.1") + (version "2.10") (source (origin (method git-fetch) @@ -735,7 +735,7 @@ (define-public gperftools (url "https://github.com/gperftools/gperftools") (commit (string-append "gperftools-" version)))) (sha256 - (base32 "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1")) + (base32 "0s9qhx940s8q6glc8sw74k5gs8hdhjfigq20zci92qawgm7zsicm")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From b8b8df9122510671f01940d35cf06e673f3afa4f Mon Sep 17 00:00:00 2001 From: muradm Date: Fri, 22 Jul 2022 06:38:16 +0300 Subject: gnu: mako: Update to 1.7.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (mako): Update to 1.7.1. [inputs]: Replace elogind with basu. Signed-off-by: 宋文武 --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3cf992620d..f4dcbf742e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1776,7 +1776,7 @@ (define-public wlr-randr (define-public mako (package (name "mako") - (version "1.6") + (version "1.7.1") (source (origin (method git-fetch) @@ -1785,9 +1785,9 @@ (define-public mako (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vbx2r01rq3r9zc6kflah44ms1fzf4z857zmq3qxnfsyjdkz1hs5")))) + (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz")))) (build-system meson-build-system) - (inputs (list cairo elogind gdk-pixbuf pango wayland)) + (inputs (list basu cairo gdk-pixbuf pango wayland)) (native-inputs (list pkg-config scdoc wayland-protocols)) (home-page "https://wayland.emersion.fr/mako") (synopsis "Lightweight Wayland notification daemon") -- cgit v1.2.3 From d921cf8d279daa67406445aed5828564f059600c Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 20 Jul 2022 11:25:31 -0400 Subject: gnu: sshfs: Update to 3.7.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (sshfs): Update to 3.7.3. [build-system]: Replace gnu-build-system with meson-build-system. [native-inputs]: Add dependencies to generate man page. Signed-off-by: 宋文武 --- gnu/packages/linux.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a94e5c9bc9..a9594905d9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3472,20 +3472,25 @@ (define-public unionfs-fuse/static (define-public sshfs (package (name "sshfs") - (version "2.10") + (version "3.7.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/libfuse/sshfs/releases/" "download/sshfs-" version "/sshfs-" version - ".tar.gz")) + ".tar.xz")) (sha256 (base32 - "00fir2iykdx11g8nv5gijg0zjrp2g3ldypnv0yi6lq3h5pg5v13h")))) - (build-system gnu-build-system) + "169fkilv060afgp9h7hvsbkg02bd1y77kmx06x0s7q1cvmxww62j")))) + (build-system meson-build-system) + (arguments + ;; XXX: tests are skipped: FUSE kernel module does not seem to be loaded + '(#:tests? #f)) (inputs - (list fuse glib)) + (list fuse-3 glib)) (native-inputs - (list pkg-config)) + (list pkg-config + ;; man page + python-docutils)) (home-page "https://github.com/libfuse/sshfs") (synopsis "Mount remote file systems over SSH") (description -- cgit v1.2.3 From 933d3cf7f7fe7ed6eae130ae8275176573af1638 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Aug 2022 11:38:43 +0200 Subject: gnu: python-shapely: Update to 1.8.2. * gnu/packages/python-xyz.scm (python-shapely): Update to 1.8.2. [source]: Remove snippet. --- gnu/packages/python-xyz.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b53609ebb3..cf1f009a7f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -59,7 +59,7 @@ ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill -;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant +;;; Copyright © 2019, 2020, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald @@ -1184,20 +1184,13 @@ (define-public python-psutil (define-public python-shapely (package (name "python-shapely") - (version "1.7.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (pypi-uri "Shapely" version)) (sha256 - (base32 - "0adiz4jwmwxk7k1awqifb1a9bj5x4nx4gglb5dz9liam21674h8n")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file "shapely/speedups/_speedups.c") - (delete-file "shapely/vectorized/_vectorized.c") - #t)))) + (base32 "1dpbjw0w2l1r9s5drmi4cyr1yd5h2a4m9vip7qhy7mbg03azjajp")))) (build-system python-build-system) (native-inputs (list python-cython python-matplotlib python-pytest -- cgit v1.2.3 From 18e00988176162ac736c873dc6cb06169b0aaa3b Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 10 Mar 2022 18:28:08 +0100 Subject: gnu: python-args: Patch reference to basestring. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hi Maxime, I **totally** forgot about this one! Seems like no one is using it. `python2-args` also builds. But no package seems to depend on it anyway. Regards, Tanguy * gnu/packages/python-xyz.scm (python-args)[source]: Use the latest version from the git repository to get the test suite. [home-page]: Update URL. [native-inputs]: Add python-nose. [arguments]: Replace reference to basestring with str. Invoke nosetests. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf1f009a7f..1be295b140 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14056,21 +14056,36 @@ (define-public python-icalendar (license license:bsd-2))) (define-public python-args - (package - (name "python-args") - (version "0.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "args" version)) - (sha256 - (base32 - "057qzi46h5dmxdqknsbrssn78lmqjlnm624iqdhrnpk26zcbi1d7")))) - (build-system python-build-system) - (home-page "https://github.com/kennethreitz/args") - (synopsis "Command-line argument parser") - (description - "This library provides a Python module to parse command-line arguments.") - (license license:bsd-3))) + (let ((commit "9460f1a35eb3055e9e4de1f0a6932e0883c72d65") (revision "0")) + (package + (name "python-args") + (version (git-version "0.1.0" revision commit)) + (home-page "https://github.com/kennethreitz-archive/args") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zfxpbp9vldqdrjmd0c6y3wisl35mx5v8zlyp3nhwpy1730wrc9j")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-args.py + (lambda _ + (substitute* "args.py" + (("basestring") "str")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "nosetests" "-v"))))))) + (native-inputs (list python-nose)) + (synopsis "Command-line argument parser") + (description + "This library provides a Python module to parse command-line arguments.") + (license license:bsd-3)))) (define-public python-clint (package -- cgit v1.2.3 From 23cc276aaa34f54fd045befd4097517c21b1b943 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 26 Jun 2022 08:54:39 +0200 Subject: gnu: Add barony. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (barony): New variable. * gnu/packages/patches/barony-fix-textures.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/games.scm | 54 ++++++ gnu/packages/patches/barony-fix-textures.patch | 237 +++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100644 gnu/packages/patches/barony-fix-textures.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index d273708ee4..2484320038 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -888,6 +888,7 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-4.3-fno-common.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/azr3.patch \ + %D%/packages/patches/barony-fix-textures.patch \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7d2ba0344b..06084d1167 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -504,6 +504,60 @@ (define-public astromenace ;; BY-SA 4.0, and fonts to OFL1.1. (license (list license:gpl3+ license:cc-by-sa4.0 license:silofl1.1)))) +(define-public barony + (package + (name "barony") + (version "3.3.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TurningWheel/Barony") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y72k6zrqqhib3p05zkdklays2d218v51n87k7k68m0s7nnxa4vy")) + ;; Fix textures for SDL 2.0.14. + ;; See . + (patches (search-patches "barony-fix-textures.patch")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + (list "-DOPENAL_ENABLED=ON" ; enable sound + "-DEDITOR_EXE_NAME=barony-editor") ; instead of generic "editor" + #:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-installation + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_CURRENT_BINARY_DIR\\}/lang") + "${CMAKE_SOURCE_DIR}/lang"))))))) + (inputs + (list glu + libpng + libvorbis + openal + physfs + rapidjson + sdl2 + sdl2-image + sdl2-net + sdl2-ttf + zlib)) + (native-inputs + (list pkg-config)) + (home-page "http://baronygame.com") + (synopsis "3D first-person roguelike game") + (description + "Barony is a first-person roguelike role-playing game with cooperative +play. The player must descend a dark dungeon and destroy an undead lich while +avoiding traps and fighting monsters. The game features randomly generated +dungeons, 13 character classes, hundreds of items and artifacts, and +cooperative multiplayer for up to four players. This package does @emph{not} +provide the game assets.") + (license license:bsd-2))) + (define-public bastet (package (name "bastet") diff --git a/gnu/packages/patches/barony-fix-textures.patch b/gnu/packages/patches/barony-fix-textures.patch new file mode 100644 index 0000000000..712f0d63c6 --- /dev/null +++ b/gnu/packages/patches/barony-fix-textures.patch @@ -0,0 +1,237 @@ +From: Sylvain +Date: Sat, 10 Apr 2021 21:33:29 +0200 +Subject: [PATCH] Fixed bug 580 - Use 'userdata' instead of 'refcount' + 'refcount' is a private SDL_Surface field + +--- + src/draw.cpp | 22 +++++++++++----------- + src/files.cpp | 2 +- + src/opengl.cpp | 26 +++++++++++++------------- + src/savepng.cpp | 2 +- + 4 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/src/draw.cpp b/src/draw.cpp +index 08f95343f..4e62c751a 100644 +--- a/src/draw.cpp ++++ b/src/draw.cpp +@@ -443,7 +443,7 @@ void drawImageRotatedAlpha( SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos, re + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, alpha / 255.1); + glBegin(GL_QUADS); + glTexCoord2f(1.0 * ((real_t)src->x / image->w), 1.0 * ((real_t)src->y / image->h)); +@@ -492,7 +492,7 @@ void drawImageColor( SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos, Uint32 co + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + real_t r = ((Uint8)(color >> mainsurface->format->Rshift)) / 255.f; + real_t g = ((Uint8)(color >> mainsurface->format->Gshift)) / 255.f; + real_t b = ((Uint8)(color >> mainsurface->format->Bshift)) / 255.f; +@@ -546,7 +546,7 @@ void drawImageAlpha( SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos, Uint8 alp + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, alpha / 255.1); + glPushMatrix(); + glBegin(GL_QUADS); +@@ -596,7 +596,7 @@ void drawImage( SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos ) + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, 1); + glPushMatrix(); + glBegin(GL_QUADS); +@@ -646,7 +646,7 @@ void drawImageRing(SDL_Surface* image, SDL_Rect* src, int radius, int thickness, + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, alpha / 255.f); + glPushMatrix(); + +@@ -771,7 +771,7 @@ void drawImageScaled( SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos ) + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, 1); + glPushMatrix(); + glBegin(GL_QUADS); +@@ -826,7 +826,7 @@ void drawImageScaledPartial(SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos, fl + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + glColor4f(1, 1, 1, 1); + glPushMatrix(); + glBegin(GL_QUADS); +@@ -889,7 +889,7 @@ void drawImageScaledColor(SDL_Surface* image, SDL_Rect* src, SDL_Rect* pos, Uint + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + real_t r = ((Uint8)(color >> mainsurface->format->Rshift)) / 255.f; + real_t g = ((Uint8)(color >> mainsurface->format->Gshift)) / 255.f; + real_t b = ((Uint8)(color >> mainsurface->format->Bshift)) / 255.f; +@@ -985,7 +985,7 @@ void drawImageFancy( SDL_Surface* image, Uint32 color, real_t angle, SDL_Rect* s + } + + // draw a textured quad +- glBindTexture(GL_TEXTURE_2D, texid[image->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)image->userdata]); + real_t r = ((Uint8)(color >> mainsurface->format->Rshift)) / 255.f; + real_t g = ((Uint8)(color >> mainsurface->format->Gshift)) / 255.f; + real_t b = ((Uint8)(color >> mainsurface->format->Bshift)) / 255.f; +@@ -2186,7 +2186,7 @@ void drawWindowFancy(int x1, int y1, int x2, int y2) + glVertex2f(x2 - 1, yres - y1 - 1); + glEnd(); + glColor3f(.75, .75, .75); +- glBindTexture(GL_TEXTURE_2D, texid[fancyWindow_bmp->refcount]); // wood texture ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)fancyWindow_bmp->userdata]); // wood texture + glBegin(GL_QUADS); + glTexCoord2f(0, 0); + glVertex2f(x1 + 2, yres - y1 - 2); +@@ -2322,7 +2322,7 @@ SDL_Rect ttfPrintTextColor( TTF_Font* font, int x, int y, Uint32 color, bool out + SDL_BlitSurface(textSurf, NULL, surf, &pos); + // load the text outline surface as a GL texture + allsurfaces[imgref] = surf; +- allsurfaces[imgref]->refcount = imgref; ++ allsurfaces[imgref]->userdata = (void*) imgref; + glLoadTexture(allsurfaces[imgref], imgref); + imgref++; + // store the surface in the text surface cache +diff --git a/src/files.cpp b/src/files.cpp +index 2beb9a6b9..389ade6d1 100644 +--- a/src/files.cpp ++++ b/src/files.cpp +@@ -591,7 +591,7 @@ SDL_Surface* loadImage(char const * const filename) + + // load the new surface as a GL texture + allsurfaces[imgref] = newSurface; +- allsurfaces[imgref]->refcount = imgref + 1; ++ allsurfaces[imgref]->userdata = (void *)(imgref); + glLoadTexture(allsurfaces[imgref], imgref); + + // free the translated surface +diff --git a/src/opengl.cpp b/src/opengl.cpp +index f5b81e77a..3ac225825 100644 +--- a/src/opengl.cpp ++++ b/src/opengl.cpp +@@ -500,7 +500,7 @@ void glDrawSprite(view_t* camera, Entity* entity, int mode) + } + if ( mode == REALCOLORS ) + { +- glBindTexture(GL_TEXTURE_2D, texid[sprite->refcount]); ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)sprite->userdata]); + } + else + { +@@ -586,7 +586,7 @@ void glDrawSpriteFromImage(view_t* camera, Entity* entity, std::string text, int + //int x, y; + real_t s = 1; + SDL_Surface* image = sprites[0]; +- GLuint textureId = texid[sprites[0]->refcount]; ++ GLuint textureId = texid[(long int)sprites[0]->userdata]; + char textToRetrieve[128]; + + if ( text.compare("") == 0 ) +@@ -603,7 +603,7 @@ void glDrawSpriteFromImage(view_t* camera, Entity* entity, std::string text, int + textToRetrieve[std::min(static_cast(strlen(text.c_str())), 22)] = '\0'; + if ( (image = ttfTextHashRetrieve(ttfTextHash, textToRetrieve, ttf12, true)) != NULL ) + { +- textureId = texid[image->refcount]; ++ textureId = texid[(long int)image->userdata]; + } + else + { +@@ -627,7 +627,7 @@ void glDrawSpriteFromImage(view_t* camera, Entity* entity, std::string text, int + SDL_BlitSurface(textSurf, NULL, image, &pos); + // load the text outline surface as a GL texture + allsurfaces[imgref] = image; +- allsurfaces[imgref]->refcount = imgref; ++ allsurfaces[imgref]->userdata = (void *)((long int)imgref); + glLoadTexture(allsurfaces[imgref], imgref); + imgref++; + // store the surface in the text surface cache +@@ -635,7 +635,7 @@ void glDrawSpriteFromImage(view_t* camera, Entity* entity, std::string text, int + { + printlog("warning: failed to store text outline surface with imgref %d\n", imgref - 1); + } +- textureId = texid[image->refcount]; ++ textureId = texid[(long int)image->userdata]; + } + // setup projection + glMatrixMode(GL_PROJECTION); +@@ -864,7 +864,7 @@ void glDrawWorld(view_t* camera, int mode) + + // first (higher) sky layer + glColor4f(1.f, 1.f, 1.f, .5); +- glBindTexture(GL_TEXTURE_2D, texid[tiles[cloudtile]->refcount]); // sky tile ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)tiles[cloudtile]->userdata]); // sky tile + glBegin( GL_QUADS ); + glTexCoord2f((real_t)(ticks % 60) / 60, (real_t)(ticks % 60) / 60); + glVertex3f(-CLIPFAR * 16, 64, -CLIPFAR * 16); +@@ -881,7 +881,7 @@ void glDrawWorld(view_t* camera, int mode) + + // second (closer) sky layer + glColor4f(1.f, 1.f, 1.f, .5); +- glBindTexture(GL_TEXTURE_2D, texid[tiles[cloudtile]->refcount]); // sky tile ++ glBindTexture(GL_TEXTURE_2D, texid[(long int)tiles[cloudtile]->userdata]); // sky tile + glBegin( GL_QUADS ); + glTexCoord2f((real_t)(ticks % 240) / 240, (real_t)(ticks % 240) / 240); + glVertex3f(-CLIPFAR * 16, 32, -CLIPFAR * 16); +@@ -954,13 +954,13 @@ void glDrawWorld(view_t* camera, int mode) + { + if ( map.tiles[index] < 0 || map.tiles[index] >= numtiles ) + { +- new_tex = texid[sprites[0]->refcount]; +- //glBindTexture(GL_TEXTURE_2D, texid[sprites[0]->refcount]); ++ new_tex = texid[(long int)sprites[0]->userdata]; ++ //glBindTexture(GL_TEXTURE_2D, texid[(long int)sprites[0]->userdata]); + } + else + { +- new_tex = texid[tiles[map.tiles[index]]->refcount]; +- //glBindTexture(GL_TEXTURE_2D, texid[tiles[map.tiles[index]]->refcount]); ++ new_tex = texid[(long int)tiles[map.tiles[index]]->userdata]; ++ //glBindTexture(GL_TEXTURE_2D, texid[(long int)tiles[map.tiles[index]]->userdata]); + } + } + else +@@ -1282,8 +1282,8 @@ void glDrawWorld(view_t* camera, int mode) + // bind texture + if ( mode == REALCOLORS ) + { +- new_tex = texid[tiles[mapceilingtile]->refcount]; +- //glBindTexture(GL_TEXTURE_2D, texid[tiles[50]->refcount]); // rock tile ++ new_tex = texid[(long int)tiles[mapceilingtile]->userdata]; ++ //glBindTexture(GL_TEXTURE_2D, texid[(long int)tiles[50]->userdata]); // rock tile + if (cur_tex!=new_tex) + { + glEnd(); +diff --git a/src/savepng.cpp b/src/savepng.cpp +index fa7a5d4e2..59e052a5c 100644 +--- a/src/savepng.cpp ++++ b/src/savepng.cpp +@@ -59,7 +59,7 @@ SDL_Surface* SDL_PNGFormatAlpha(SDL_Surface* src) + /* NO-OP for images < 32bpp and 32bpp images that already have Alpha channel */ + if (src->format->BitsPerPixel <= 24 || src->format->Amask) + { +- src->refcount++; ++ src->userdata = (void *)((long int) src->userdata + 1); + return src; + } + -- cgit v1.2.3 From 4ccd4176a2f63004fe10c9e8c9ccc8ba46b9d408 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 26 Jun 2022 18:25:12 +0100 Subject: gnu: Add aocommon. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm (aocommon): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b721bd03ec..336ef02d66 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -69,6 +69,7 @@ (define-module (gnu packages astronomy) #:use-module (gnu packages xorg) #:use-module (gnu packages) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) @@ -79,6 +80,33 @@ (define-module (gnu packages astronomy) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define-public aocommon + (let ((commit "7329a075271edab8f6264db649e81e62b2b6ae5e") + (revision "1")) + (package + (name "aocommon") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/aroffringa/aocommon") + (commit commit))) + (sha256 + (base32 "0qcfax6pbzs0yigy0x8xibrkk539wm2pbvjsb4lh50fybir02nix")) + (file-name (git-file-name name version)))) + (build-system copy-build-system) + (arguments + (list #:install-plan + #~'(("include/aocommon" "include/aocommon")))) + (home-page "https://gitlab.com/aroffringa/aocommon") + (synopsis "Collection of functionality that is reused in astronomical applications") + (description + "This package provides source-only AOCommon collection of functionality that is +reused in several astronomical applications, such as @code{wsclean}, +@code{aoflagger}, @code{DP3} and @code{everybeam}.") + (license license:gpl3+)))) + (define-public calceph (package (name "calceph") -- cgit v1.2.3 From cdff1423c0d03e7d3e8445cf14f1123f694468c8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 26 Jun 2022 18:34:58 +0100 Subject: gnu: Add aoflagger. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/astronomy.scm (aoflagger): New variable. * gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/astronomy.scm | 63 ++++++++++++++++++++++ .../aoflagger-use-system-provided-pybind11.patch | 38 +++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index 2484320038..cbfe880d6e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -858,6 +858,7 @@ dist_patch_DATA = \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ + %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/ark-skip-xar-test.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \ diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 336ef02d66..3c4c92619e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -142,6 +142,69 @@ (define-public calceph @end itemize\n") (license license:cecill))) +(define-public aoflagger + (package + (name "aoflagger") + (version "3.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/aroffringa/aoflagger") + (commit (string-append "v" version)))) + (sha256 + (base32 "1dcbfrbiybhpbypna2xhddx1wk7yifh38ha2r6p5rzsikzwlsin1")) + (patches + (search-patches "aoflagger-use-system-provided-pybind11.patch")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: Tests require external files download from + ;; https://www.astron.nl/citt/ci_data/aoflagger/ + ;; FIXME: runtest is not found + #:tests? #f + #:configure-flags + #~(list (string-append "-DCASACORE_ROOT_DIR=" + #$(this-package-input "casacore"))) + #:phases + #~(modify-phases %standard-phases + ;; aocommon and pybind11 are expected to be found as git submodules, + ;; link them before build. + (add-after 'unpack 'link-submodule-package + (lambda _ + (rmdir "external/aocommon") + (symlink #$(this-package-native-input "aocommon") + (string-append (getcwd) "/external/aocommon"))))))) + (native-inputs + (list aocommon + boost + pkg-config + python + pybind11)) + (inputs + (list casacore + cfitsio + fftw + gsl + gtkmm-3 + hdf5 + lapack + libpng + libsigc++ + libxml2 + lua + openblas + zlib)) + (home-page "https://gitlab.com/aroffringa/aoflagger") + (synopsis "Astronomical tool that can find and remove radio-frequency interference") + (description + "AOFlagger is a tool that can find and remove radio-frequency +interference (RFI) in radio astronomical observations. It can make use of Lua +scripts to make flagging strategies flexible, and the tools are applicable to a +wide set of telescopes.") + (license license:gpl3+))) + (define-public casacore (package (name "casacore") diff --git a/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch b/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch new file mode 100644 index 0000000000..76bc52a4ba --- /dev/null +++ b/gnu/packages/patches/aoflagger-use-system-provided-pybind11.patch @@ -0,0 +1,38 @@ +This patch was borrowed from Debian's package: +https://salsa.debian.org/debian-astro-team/aoflagger/-/blob/0484ef75a663e3e07738550cdade46f433a53dac/debian/patches/Use-system-provided-pybind11.patch +Description: Use system provided pybind11 +Author: Ole Streicher +Origin: Debian +Last-Update: Mon, 30 Aug 2021 11:05:37 +0200 +--- + CMakeLists.txt | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 655ea5e..824ee2a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,11 +62,6 @@ foreach(ExternalSubmodule IN LISTS ExternalSubmoduleDirectories) + endif() + endforeach() + +-# Include aocommon/pybind11 headers +-include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include") +-add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11") +-include_directories(SYSTEM ${pybind11_INCLUDE_DIR}) +- + find_package( + HDF5 + COMPONENTS C CXX +@@ -101,6 +96,11 @@ find_package(PythonInterp REQUIRED) + message(STATUS "Using python version ${PYTHON_VERSION_STRING}") + include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS}) + ++# Include pybind11 headers ++find_package(pybind11 REQUIRED) ++include_directories("${CMAKE_SOURCE_DIR}/external/aocommon/include") ++include_directories(${pybind11_INCLUDE_DIR}) ++ + # boost::alignment requires Boost 1.56 + find_package(Boost 1.56.0 REQUIRED COMPONENTS date_time filesystem system + unit_test_framework) -- cgit v1.2.3 From 95139f9cc413f948c5f831e8460f83f457518637 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:08:55 +0000 Subject: gnu: libomp-14: Reference llvm-14 version string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-14): Reference llvm-14 version string. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 2a139f0471..c21314cedc 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -663,7 +663,7 @@ (define-public clang-14 (define-public libomp-14 (package (name "libomp") - (version "14.0.6") + (version (package-version llvm-14)) (source (origin (method url-fetch) (uri (llvm-uri "openmp" version)) -- cgit v1.2.3 From a46a980abe87a7f3d214cffcc46c91c76efce0c9 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:08:56 +0000 Subject: gnu: libomp-13: Reference llvm-13 version string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-13): Reference llvm-13 version string. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c21314cedc..4d6747327a 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -744,7 +744,7 @@ (define-public clang-13 (define-public libomp-13 (package (inherit libomp-14) - (version "13.0.1") + (version (package-version llvm-13)) (source (origin (method url-fetch) (uri (llvm-uri "openmp" version)) @@ -1205,6 +1205,7 @@ (define-public clang-3.5 #:patches '("clang-3.5-libc-search-path.patch"))) ;; Default LLVM and Clang version. +(define-public libomp libomp-13) (define-public llvm llvm-13) (define-public clang-runtime clang-runtime-13) (define-public clang clang-13) @@ -1583,8 +1584,6 @@ (define-public libclc ;; Apache license 2.0 with LLVM exception (license license:asl2.0))) -(define-public libomp libomp-13) - (define-public python-llvmlite (package (name "python-llvmlite") -- cgit v1.2.3 From 68dfb535d39fe89679e05800e7a2a8f7499332e2 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:08:57 +0000 Subject: gnu: Add libomp-12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-12): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4d6747327a..b81b5c0394 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -855,6 +855,27 @@ (define-public clang-12 (base32 "1r9a4fdz9ci58b5z2inwvm4z4cdp6scrivnaw05dggkxz7yrwrb5"))))) +(define-public libomp-12 + (package + (inherit libomp-13) + (version (package-version llvm-12)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (arguments + '(#:configure-flags '("-DLIBOMP_USE_HWLOC=ON" + "-DOPENMP_TEST_C_COMPILER=clang" + "-DOPENMP_TEST_CXX_COMPILER=clang++") + #:test-target "check-libomp")) + (native-inputs + (modify-inputs (package-native-inputs libomp-13) + (replace "clang" clang-12) + (replace "llvm" llvm-12))))) + (define-public clang-toolchain-12 (make-clang-toolchain clang-12)) -- cgit v1.2.3 From 07e1b5a32a1800b9304909494a64e5566dc71dd5 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:08:58 +0000 Subject: gnu: clang-toolchain-12: Use libomp-12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-12): Switch dependency from the default libomp-13 to libomp-12. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b81b5c0394..cb3d314375 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -877,7 +877,7 @@ (define-public libomp-12 (replace "llvm" llvm-12))))) (define-public clang-toolchain-12 - (make-clang-toolchain clang-12)) + (make-clang-toolchain clang-12 libomp-12)) (define-public llvm-11 (package -- cgit v1.2.3 From fdd5bf9fb79f747e082c3b3aba54d2227104b526 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:08:59 +0000 Subject: gnu: Add libomp-11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-11): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index cb3d314375..b03ba264ef 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -909,6 +909,22 @@ (define-public clang-11 (base32 "02bcwwn54661madhq4nxc069s7p7pj5gpqi8ww50w3anbpviilzy"))))) +(define-public libomp-11 + (package + (inherit libomp-12) + (version (package-version llvm-11)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "0k389d0g9zlfyzh1kpb3i5jdawzpn0hrdxzbjinpvdv7rbw4sw1d")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-12) + (replace "clang" clang-11) + (replace "llvm" llvm-11))))) + (define-public clang-toolchain-11 (make-clang-toolchain clang-11)) -- cgit v1.2.3 From ae8de603512095e2baa0816d7fb86d117fbfe107 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:00 +0000 Subject: gnu: clang-toolchain-11: Use libomp-11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-11): Switch dependency from the default libomp-13 to libomp-11. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index b03ba264ef..f733a767c2 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -926,7 +926,7 @@ (define-public libomp-11 (replace "llvm" llvm-11))))) (define-public clang-toolchain-11 - (make-clang-toolchain clang-11)) + (make-clang-toolchain clang-11 libomp-11)) (define-public llvm-10 (package -- cgit v1.2.3 From 09d9b1ddae49d4b6f264fbd362047dd634761646 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:01 +0000 Subject: gnu: Add libomp-10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-10): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index f733a767c2..c0c0100f67 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -965,6 +965,22 @@ (define-public clang-10 (base32 "06n1yp638rh24xdxv9v2df0qajxbjz4w59b7dd4ky36drwmpi4yh"))))) +(define-public libomp-10 + (package + (inherit libomp-11) + (version (package-version llvm-10)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "0i4bn84lkpm5w3qkpvwm5z6jdj8fynp7d3bcasa1xyq4is6757yi")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-11) + (replace "clang" clang-10) + (replace "llvm" llvm-10))))) + (define-public clang-toolchain-10 (make-clang-toolchain clang-10)) -- cgit v1.2.3 From a72bebf8f578931d042a3527906169a3b554441b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:02 +0000 Subject: gnu: clang-toolchain-10: Use libomp-10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-10): Switch dependency from the default libomp-13 to libomp-10. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c0c0100f67..caa3e5e087 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -982,7 +982,7 @@ (define-public libomp-10 (replace "llvm" llvm-10))))) (define-public clang-toolchain-10 - (make-clang-toolchain clang-10)) + (make-clang-toolchain clang-10 libomp-10)) (define-public llvm-9 (package -- cgit v1.2.3 From 16d6a618fa69a1c4c2bb958727eff5598327de47 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:03 +0000 Subject: gnu: Add libomp-9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-9): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index caa3e5e087..4232e88d4f 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1026,6 +1026,22 @@ (define-public clang-9 "0ls2h3iv4finqyflyhry21qhc9cm9ga7g1zq21020p065qmm2y2p" #:patches '("clang-9.0-libc-search-path.patch"))) +(define-public libomp-9 + (package + (inherit libomp-10) + (version (package-version llvm-9)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "1knafnpp0f7hylx8q20lkd6g1sf0flly572dayc5d5kghh7hd52w")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-10) + (replace "clang" clang-9) + (replace "llvm" llvm-9))))) + (define-public clang-toolchain-9 (make-clang-toolchain clang-9)) -- cgit v1.2.3 From cd5557e818f27fd68e61bd0a9d6a4e0f7e52b61e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:04 +0000 Subject: gnu: clang-toolchain-9: Use libomp-9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-9): Switch dependency from the default libomp-13 to libomp-9. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 4232e88d4f..47915dd20d 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1043,7 +1043,7 @@ (define-public libomp-9 (replace "llvm" llvm-9))))) (define-public clang-toolchain-9 - (make-clang-toolchain clang-9)) + (make-clang-toolchain clang-9 libomp-9)) (define-public llvm-8 (package -- cgit v1.2.3 From fe4683b2cf2997350ed9a1d351a27baf1e8d8d21 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:05 +0000 Subject: gnu: Add libomp-8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-8): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 47915dd20d..d139880501 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1069,6 +1069,23 @@ (define-public clang-8 "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh" #:patches '("clang-8.0-libc-search-path.patch"))) +(define-public libomp-8 + (package + (inherit libomp-9) + (version (package-version llvm-8)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "0b3jlxhqbpyd1nqkpxjfggm5d9va5qpyf7d4i5y7n4a1mlydv19y")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-9) + (replace "clang" clang-8) + (replace "llvm" llvm-8))) + (license license:ncsa))) + (define-public clang-toolchain-8 (make-clang-toolchain clang-8)) -- cgit v1.2.3 From 79e91394789adc10f3cba5b06cfc4f26baf7182c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:06 +0000 Subject: gnu: clang-toolchain-8: Use libomp-8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-8): Switch dependency from the default libomp-13 to libomp-8. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d139880501..c3a1b875e0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1087,7 +1087,7 @@ (define-public libomp-8 (license license:ncsa))) (define-public clang-toolchain-8 - (make-clang-toolchain clang-8)) + (make-clang-toolchain clang-8 libomp-8)) (define-public llvm-7 (package -- cgit v1.2.3 From 93c71314d33f6082e13806d2d8da276a2a8fa559 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:07 +0000 Subject: gnu: Add libomp-7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-7): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c3a1b875e0..773870b256 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1111,6 +1111,22 @@ (define-public clang-7 "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9" #:patches '("clang-7.0-libc-search-path.patch"))) +(define-public libomp-7 + (package + (inherit libomp-8) + (version (package-version llvm-7)) + (source (origin + (method url-fetch) + (uri (llvm-uri "openmp" version)) + (sha256 + (base32 + "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-8) + (replace "clang" clang-7) + (replace "llvm" llvm-7))))) + (define-public clang-toolchain-7 (make-clang-toolchain clang-7)) -- cgit v1.2.3 From d711e3922feb91b9bbf49b636384b53d7be43433 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:08 +0000 Subject: gnu: clang-toolchain-7: Use libomp-7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-7): Switch dependency from the default libomp-13 to libomp-7. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 773870b256..01bec7bac0 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1128,7 +1128,7 @@ (define-public libomp-7 (replace "llvm" llvm-7))))) (define-public clang-toolchain-7 - (make-clang-toolchain clang-7)) + (make-clang-toolchain clang-7 libomp-7)) (define-public llvm-6 (package -- cgit v1.2.3 From d8ab469e95bd774234e754645d03f8b8e70216bd Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:09 +0000 Subject: gnu: Add libomp-6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (libomp-6): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 01bec7bac0..6f8cb7c9cd 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1152,6 +1152,24 @@ (define-public clang-6 "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w" #:patches '("clang-6.0-libc-search-path.patch"))) +(define-public libomp-6 + (package + (inherit libomp-7) + (version (package-version llvm-6)) + (source (origin + (method url-fetch) + (uri (string-append "https://releases.llvm.org/" + version "/openmp-" version + ".src.tar.xz")) + (sha256 + (base32 + "0nhwfba9c351r16zgyjyfwdayr98nairky3c2f0b2lc360mwmbv6")) + (file-name (string-append "libomp-" version ".tar.xz")))) + (native-inputs + (modify-inputs (package-native-inputs libomp-7) + (replace "clang" clang-6) + (replace "llvm" llvm-6))))) + (define-public clang-toolchain-6 (make-clang-toolchain clang-6)) -- cgit v1.2.3 From 71725377180c22c3669d058291740247f2dd93d1 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:10 +0000 Subject: gnu: clang-toolchain-6: Use libomp-6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (clang-toolchain-6): Switch dependency from the default libomp-13 to libomp-6. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 6f8cb7c9cd..29fe7172a9 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -1171,7 +1171,7 @@ (define-public libomp-6 (replace "llvm" llvm-6))))) (define-public clang-toolchain-6 - (make-clang-toolchain clang-6)) + (make-clang-toolchain clang-6 libomp-6)) (define-public llvm-3.9.1 (package (inherit llvm-6) -- cgit v1.2.3 From c3c65ad1f93e3baaacfc93410c46d51e6f84a66d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 20 Jul 2022 15:09:11 +0000 Subject: gnu: make-clang-toolchain: Require explicit libomp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/llvm.scm (make-clang-toolchain): Remove default libomp parameter since each clang-toolchain has a matching libomp package. (clang-toolchain-13): Explicitly refer to libomp-13. Signed-off-by: Ludovic Courtès --- gnu/packages/llvm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 29fe7172a9..2d3ee79339 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -485,7 +485,7 @@ (define (clang-properties version) "znver3") '()))))) -(define* (make-clang-toolchain clang #:optional (libomp libomp-13)) +(define (make-clang-toolchain clang libomp) (package (name (string-append (package-name clang) "-toolchain")) (version (package-version clang)) @@ -767,7 +767,7 @@ (define-public libomp-13 (replace "llvm" llvm-13))))) (define-public clang-toolchain-13 - (make-clang-toolchain clang-13)) + (make-clang-toolchain clang-13 libomp-13)) (define-public llvm-12 (package -- cgit v1.2.3 From 6dcc652d758af8b5e9e30f6b8203c0e0770cbeeb Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:16:16 -0400 Subject: gnu: Add ruby-wapiti. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-wapiti): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index c1e3dca807..9a75118946 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2021 EuAndreh ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Giovanni Biscuolo +;;; Copyright © 2022 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -12984,3 +12985,48 @@ (define-public ruby-blather (description "Blather is a XMPP DSL for Ruby written on top of EventMachine and Nokogiri.") (license license:expat))) + +(define-public ruby-wapiti + (package + (name "ruby-wapiti") + (version "2.0.0") + ;; the gem archive lacks tests + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/inukshuk/wapiti-ruby") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kawqw45j7mqk5zmwbn67x1vxiapdgm2ypqqz2bs9l5s7nglzr5b")))) + (build-system ruby-build-system) + (propagated-inputs + (list ruby-builder + ruby-rexml)) + (native-inputs + (list ruby-byebug + ruby-pry + ruby-rake-compiler + ruby-rspec + ruby-simplecov)) + (arguments + (list + #:test-target "spec" + #:phases + #~(modify-phases %standard-phases + (add-after 'replace-git-ls-files 'replace-another-git-ls-files + (lambda args + (substitute* "wapiti.gemspec" + (("`git ls-files spec`") + "`find spec -type f | sort`")))) + (add-before 'build 'compile + (lambda args + (invoke "rake" "compile")))))) + (home-page "https://github.com/inukshuk/wapiti-ruby") + (synopsis "Wicked fast Conditional Random Fields for Ruby") + (description + "The Wapiti-Ruby gem provides a wicked fast linear-chain @acronym{CRF, +Conditional Random Fields} API for sequence segmentation and labelling. It is +based on the codebase of @url{https://wapiti.limsi.fr, Wapiti}.") + (license license:bsd-2))) -- cgit v1.2.3 From ea4bb1bde670f53ef926272c6f8d37ba9bf20bd8 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:16:17 -0400 Subject: gnu: Add ruby-namae. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-namae): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9a75118946..2f47d898db 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -13030,3 +13030,42 @@ (define-public ruby-wapiti Conditional Random Fields} API for sequence segmentation and labelling. It is based on the codebase of @url{https://wapiti.limsi.fr, Wapiti}.") (license license:bsd-2))) + +(define-public ruby-namae + (package + (name "ruby-namae") + (version "1.1.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "namae" version)) + (sha256 + (base32 + "1j3nl1klkx3gymrdxfc1hlq4a8qlvhhl9aj5v1v08b9fz27sky0l")))) + (build-system ruby-build-system) + (native-inputs + (list ruby-cucumber + ruby-rspec + ruby-simplecov)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'allow-newer-cucumber + (lambda args + (substitute* "Gemfile" + (("'cucumber', '[^']*'") + "'cucumber'")))) + (replace 'check + ;; Avoid 'rake' so we don't need jeweler. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (apply invoke + "rspec" + (find-files "spec" "_spec\\.rb$")))))))) + (home-page "https://github.com/berkmancenter/namae") + (synopsis "Parser for human names") + (description + "Namae (名前) is a parser for human names. It recognizes personal names +of various cultural backgrounds and tries to split them into their component +parts (e.g., given and family names, honorifics etc.).") + (license (list license:bsd-2 license:agpl3+)))) -- cgit v1.2.3 From 86c0bc5d482dd64acacb2ac361c92f831c66c0b1 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:16:18 -0400 Subject: gnu: Add itex2mml. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (itex2mml): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/maths.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2901d290ef..789de8f500 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2021 Pierre-Antoine Bouttier ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -1739,6 +1740,58 @@ (define-public h5check HDF5 file is encoded according to the HDF File Format Specification.") (license (license:x11-style "file://COPYING")))) +(define-public itex2mml + (package + (name "itex2mml") + (version "1.6.1") + (source (origin + (method url-fetch) + (uri (string-append "https://golem.ph.utexas.edu" + "/~distler/blog/files/itexToMML-" + version + ".tar.gz")) + (sha256 + (base32 + "0pz51c0hfh2mg8xli0wj7hf92s3b7yf5r4114g8z8722lcm5gwiy")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "itex-binaries"))))) + (build-system gnu-build-system) + (native-inputs + (list bison + flex)) + (arguments + (list + #:make-flags #~(list (string-append "BINDIR=" #$output "/bin/") + (string-append "CC=" #$(cc-for-target))) + #:tests? #f ;; there are none + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'chdir + (lambda args + (chdir "itex-src"))) + (add-before 'install 'make-bindir + (lambda args + (mkdir-p (string-append #$output "/bin")))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc-prefix (or (assoc-ref outputs "doc") + #$output)) + (itex2mml+version (strip-store-file-name #$output)) + (doc-dir (string-append doc-prefix + "/share/doc/" + itex2mml+version))) + (install-file "../README" doc-dir))))))) + (home-page "https://golem.ph.utexas.edu/~distler/blog/itex2MML.html") + (synopsis "LaTeX to XHTML/MathML converter") + (description + "The @command{itex2MML} utility is a stream filter. It takes text with +embedded itex equations, converts the itex equations to MathML, and outputs +the resulting text.") + (license (list license:lgpl2.0+ license:gpl2+ license:mpl1.1)))) + (define-public itpp (package (name "itpp") -- cgit v1.2.3 From 7ffea0822a25c54591b3cfeee0affd4d84afddca Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:16:19 -0400 Subject: gnu: Add ruby-ritex. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-ritex): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ruby.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2f47d898db..746bb9b6ce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -13069,3 +13069,45 @@ (define-public ruby-namae of various cultural backgrounds and tries to split them into their component parts (e.g., given and family names, honorifics etc.).") (license (list license:bsd-2 license:agpl3+)))) + +(define-public ruby-ritex + (package + (name "ruby-ritex") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (rubygems-uri "ritex" version)) + (sha256 + (base32 + "07rlm3nyz9sxzy1srxs6a31hw81r6w7swrb85fiwi393z8npwc3a")))) + (build-system ruby-build-system) + (native-inputs + (list itex2mml)) + (arguments + ;; thanks to the Gentoo packagers for figuring this out + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'fix-tests + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (substitute* "test/mathml.rb" + (("\\./itex2MML") + ;; don't use the absolute path to avoid keeping a reference + "itex2MML") + (("cmp ',\\\\,\\\\,,,\\\\,'" orig) + (string-append "# " orig " # patched for Guix"))) + (substitute* "test/answer-key.yaml" + (("- ,\\\\,\\\\,,,\\\\," orig) + (string-append "# " orig " # patched for Guix"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ruby" "-Ilib:." "test/all.rb"))))))) + (home-page "https://rubygems.org/gems/ritex") + (synopsis "Convert expressions from WebTeX into MathML") + (description + "Ritex converts expressions from WebTeX into MathML. WebTeX is an +adaptation of TeX math syntax for web display. Ritex makes inserting math +into HTML pages easy. It supports most TeX math syntax as well as macros.") + ;; doesn't clearly state -only vs -or-later + (license license:gpl2))) -- cgit v1.2.3 From cc5b8cb3c09fd56834bc9ddcb823ce0be9c84b87 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 25 Jul 2022 08:16:20 -0400 Subject: gnu: Add ruby-latex-decode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/ruby-latex-decode-fix-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/ruby.scm (ruby-latex-decode): New variable. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + .../patches/ruby-latex-decode-fix-test.patch | 66 ++++++++++++++++++++++ gnu/packages/ruby.scm | 52 +++++++++++++++++ 3 files changed, 119 insertions(+) create mode 100644 gnu/packages/patches/ruby-latex-decode-fix-test.patch (limited to 'gnu/packages') diff --git a/gnu/local.mk b/gnu/local.mk index cbfe880d6e..ca3b83c550 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1782,6 +1782,7 @@ dist_patch_DATA = \ %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \ + %D%/packages/patches/ruby-latex-decode-fix-test.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/rustc-1.39.0-src.patch \ diff --git a/gnu/packages/patches/ruby-latex-decode-fix-test.patch b/gnu/packages/patches/ruby-latex-decode-fix-test.patch new file mode 100644 index 0000000000..58d7d16258 --- /dev/null +++ b/gnu/packages/patches/ruby-latex-decode-fix-test.patch @@ -0,0 +1,66 @@ +From 698e39a251d433e2cd2934586a2dfc5e6582c4f9 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Sun, 24 Jul 2022 09:12:55 -0400 +Subject: [PATCH] Improve readability of whitespace tests + +This change fixes the test for `~x` in some environments in which it +was previously failing. + +Related to https://github.com/inukshuk/latex-decode/issues/13 +--- + features/step_definitions/latex.rb | 5 +++++ + features/symbols.feature | 7 ------- + features/whitespace.feature | 13 +++++++++++++ + 3 files changed, 18 insertions(+), 7 deletions(-) + create mode 100644 features/whitespace.feature + +diff --git a/features/step_definitions/latex.rb b/features/step_definitions/latex.rb +index 4b1b595..fca63c0 100644 +--- a/features/step_definitions/latex.rb ++++ b/features/step_definitions/latex.rb +@@ -5,3 +5,8 @@ end + Then /^the result should be ('|")(.*)\1$/ do |quote,value| + expect(@result).to eq(value) + end ++ ++# For whitespace or other characters that are hard to read in source code: ++Then /^I should get '([^']*)' \+ U\+(\h{4,}) \+ '([^']*)'$/ do |pre,code,post| ++ expect(@result).to eq(pre + code.hex.chr(Encoding::UTF_8) + post) ++end +diff --git a/features/symbols.feature b/features/symbols.feature +index 46d9a51..f8a5e84 100644 +--- a/features/symbols.feature ++++ b/features/symbols.feature +@@ -12,10 +12,3 @@ Feature: Decode LaTeX symbol directives + | \\uparrow | ↑ | + | \\downarrow | ↓ | + | \\rightarrow | → | +- +- Scenarios: Whitespace +- | latex | unicode | description | +- | x\\,x | x x | small space | +- | x~x | x x | non-breaking space | +- | ~x |  x | non-breaking space | +- +diff --git a/features/whitespace.feature b/features/whitespace.feature +new file mode 100644 +index 0000000..fe5b208 +--- /dev/null ++++ b/features/whitespace.feature +@@ -0,0 +1,13 @@ ++Feature: Decode LaTeX whitespace directives ++ As a hacker who works with LaTeX ++ I want to be able to decode LaTeX whitespace ++ ++ Scenario Outline: LaTeX to Unicode transformation ++ When I decode the string '' ++ Then I should get 
 + U+ + 
++
++  Scenarios: Whitespace
++    | latex | pre | code | post | description                |
++    | x~x   | 'x' | 00A0 | 'x'  | non-breaking space         |
++    | ~y    | ''  | 00A0 | 'y'  | leading non-breaking space |
++    | z\\,z | 'z' | 2009 | 'z'  | small space                |
+-- 
+2.32.0
+
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 746bb9b6ce..5111b9ae2b 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13111,3 +13111,55 @@ (define-public ruby-ritex
 into HTML pages easy.  It supports most TeX math syntax as well as macros.")
     ;; doesn't clearly state -only vs -or-later
     (license license:gpl2)))
+
+(define-public ruby-latex-decode
+  (package
+    (name "ruby-latex-decode")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/inukshuk/latex-decode")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "1f5j67ayd04pjkmzvn0hk7cr8yqvn0gyg9ns6a0vhzj2gwna9ihy"))
+              (file-name (git-file-name name version))))
+    (build-system ruby-build-system)
+    (native-inputs
+     (list ruby-cucumber
+           ruby-ritex
+           ruby-rspec))
+    (arguments
+     (list
+      #:test-target "cucumber"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'extract-gemspec 'avoid-bundler
+            (lambda args
+              (substitute* "Rakefile"
+                (("require 'bundler" orig)
+                 (string-append "# " orig " # patched for Guix"))
+                (("Cucumber::Rake::Task\\.new[(]:cucumber[)]" orig)
+                 (string-append orig " do |c|\n"
+                                "  c.bundler = false # patched for Guix\n"
+                                "end"))
+                (("Bundler\\.setup" orig)
+                 (string-append "true # " orig " # patched for Guix")))
+              (substitute* "cucumber.yml"
+                ;; thanks to avoiding bundler, we can't use this option
+                ((" --publish-quiet")
+                 ""))))
+          (add-after 'replace-git-ls-files 'replace-another-git-ls-files
+            (lambda args
+              (substitute* "latex-decode.gemspec"
+                (("`git ls-files -- [{]test,spec,features[}]/\\*`")
+                 "`find {test,spec,features} -type f | sort`")))))))
+    (home-page "https://github.com/inukshuk/latex-decode")
+    (synopsis "Convert LaTeX to Unicode")
+    (description
+     "This package provides a gem to convert LaTeX input to Unicode.  Its
+original use was as an input filter for BibTeX-Ruby, but it can be used
+independently to decode LaTeX.  Many of the patterns used by this Ruby gem are
+based on François Charette's equivalent Perl module @code{LaTeX::Decode}.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From 5e27bcf358bc57c735ca38e5a87f645529db26a2 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:21 -0400
Subject: gnu: Add ruby-link-header.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-link-header): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 5111b9ae2b..bab120f8e0 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13163,3 +13163,24 @@ (define-public ruby-latex-decode
 independently to decode LaTeX.  Many of the patterns used by this Ruby gem are
 based on François Charette's equivalent Perl module @code{LaTeX::Decode}.")
     (license license:gpl3+)))
+
+(define-public ruby-link-header
+  (package
+    (name "ruby-link-header")
+    (version "0.0.8")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "link_header" version))
+              (sha256
+               (base32
+                "1yamrdq4rywmnpdhbygnkkl9fdy249fg5r851nrkkxr97gj5rihm"))))
+    (build-system ruby-build-system)
+    (home-page "https://github.com/asplake/link_header")
+    (synopsis "Parse and format HTTP @code{Link} headers")
+    (description
+     "This gem provides the classes @code{LinkHeader} and
+@code{LinkHeader::Link}, which represent HTTP @code{Link} headers conforming
+to RFC 5988.  Objects can be constructed from and converted to text or a
+JSON-friendly @code{Array} representation.  They can also be used to generate
+corresponding HTML @code{link} elements.")
+    (license license:expat)))
-- 
cgit v1.2.3


From 033b2e61627957fb959cde113fa0868bb0e61f1f Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:22 -0400
Subject: gnu: Add ruby-rdf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-rdf): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index bab120f8e0..f6d95604f4 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13184,3 +13184,25 @@ (define-public ruby-link-header
 JSON-friendly @code{Array} representation.  They can also be used to generate
 corresponding HTML @code{link} elements.")
     (license license:expat)))
+
+(define-public ruby-rdf
+  (package
+    (name "ruby-rdf")
+    (version "3.2.8")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "rdf" version))
+              (sha256
+               (base32
+                "1cj0k8ryd8hgbkgqb5swvy6fiygxny3y5bln0my5gv6dbfv3gm20"))))
+    (build-system ruby-build-system)
+    (propagated-inputs (list ruby-link-header))
+    (arguments
+     (list #:tests? #f)) ;; tests have many cyclic dependencies
+    (home-page "https://ruby-rdf.github.io/")
+    (synopsis "Linked Data for Ruby")
+    (description
+     "This gem contains the core algorithms and classes used for doing basic
+programming with @acronym{RDF, Resource Description Framework} data,
+implemented in pure Ruby.")
+    (license license:unlicense)))
-- 
cgit v1.2.3


From e8335360268b8ea16b4e0eda1a3dd98bc2fdaaee Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:23 -0400
Subject: gnu: Add ruby-rdf-vocab.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-rdf-vocab): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index f6d95604f4..01244bb35c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13206,3 +13206,25 @@ (define-public ruby-rdf
 programming with @acronym{RDF, Resource Description Framework} data,
 implemented in pure Ruby.")
     (license license:unlicense)))
+
+(define-public ruby-rdf-vocab
+  (package
+    (name "ruby-rdf-vocab")
+    (version "3.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "rdf-vocab" version))
+              (sha256
+               (base32
+                "1bqmp9rfjvd56ajjz68ij6jla1wjf1fqg7bi4dpnjrsmn4pwaq7l"))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     (list ruby-rdf))
+    (arguments
+     (list #:tests? #f)) ;; tests have many cyclic dependencies
+    (home-page "https://github.com/ruby-rdf/rdf-vocab")
+    (synopsis "Common RDF vocabularies")
+    (description
+     "This gem extends @code{ruby-rdf} with several common @acronym{RDF,
+Resource Description Framework} vocabularies.")
+    (license license:unlicense)))
-- 
cgit v1.2.3


From 07dcbc767a0a844d0dd51ede273b815886d4e4fc Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:24 -0400
Subject: gnu: Add ruby-bibtex-ruby.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-bibtex-ruby): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 01244bb35c..28e5ea0b7e 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13228,3 +13228,46 @@ (define-public ruby-rdf-vocab
      "This gem extends @code{ruby-rdf} with several common @acronym{RDF,
 Resource Description Framework} vocabularies.")
     (license license:unlicense)))
+
+(define-public ruby-bibtex-ruby
+  (package
+    (name "ruby-bibtex-ruby")
+    (version "6.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "bibtex-ruby" version))
+              (sha256
+               (base32
+                "0vynqa8q9hwghw6sdljr304b5gh11nqzy5nwqqwxmgy7pqyf7qw5"))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     (list ruby-latex-decode
+           ruby-rdf
+           ruby-rdf-vocab))
+    (native-inputs
+     (list ruby-byebug
+           ruby-cucumber
+           ruby-minitest
+           ruby-yard))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'extract-gemspec 'avoid-bundler
+            (lambda args
+              (substitute* "Rakefile"
+                (("require 'bundler" orig)
+                 (string-append "# " orig " # patched for Guix"))
+                (("Bundler\\.setup" orig)
+                 (string-append "true # " orig " # patched for Guix"))))))))
+    (home-page "https://github.com/inukshuk/bibtex-ruby")
+    (synopsis "Rubyist's Swiss Army knife for all things BibTeX")
+    (description
+     "BibTeX-Ruby is the Rubyist's Swiss Army knife for all things BibTeX.
+It includes a parser for all common BibTeX objects and a sophisticated name
+parser that tokenizes correctly formatted names.  BibTeX-Ruby recognizes
+BibTeX string replacements, joins values containing multiple strings or
+variables, supports cross-references, and decodes common LaTeX formatting
+instructions to unicode.  If you are in a hurry, it also allows for easy
+export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From 5f7db95215ca71d2f09a54fda6b881749b6ad2ba Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:25 -0400
Subject: gnu: Add ruby-unicode-scripts.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-unicode-scripts): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 28e5ea0b7e..25e3cbcd97 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13271,3 +13271,25 @@ (define-public ruby-bibtex-ruby
 instructions to unicode.  If you are in a hurry, it also allows for easy
 export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).")
     (license license:gpl3+)))
+
+(define-public ruby-unicode-scripts
+  (package
+    (name "ruby-unicode-scripts")
+    (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "unicode-scripts" version))
+              (sha256
+               (base32
+                "1k7kbfk806zam129bp7pdiqkfb5hn51x149irzvjhs4xf22m4yvi"))))
+    (build-system ruby-build-system)
+    (native-inputs
+     (list ruby-minitest))
+    (arguments
+     (list #:test-target "spec"))
+    (home-page "https://github.com/janlelis/unicode-scripts")
+    (synopsis "Unicode script classification library")
+    (description
+     "This gem provides a simple interface for classifying Ruby strings using
+the Unicode @code{Script} and @code{Script_Extensions} properties.")
+    (license license:expat)))
-- 
cgit v1.2.3


From cb585754f3dafa63215ef76ab45ae682bf632c46 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:26 -0400
Subject: gnu: Add ruby-citeproc.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-citeproc): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 25e3cbcd97..e3d9572bec 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13293,3 +13293,27 @@ (define-public ruby-unicode-scripts
      "This gem provides a simple interface for classifying Ruby strings using
 the Unicode @code{Script} and @code{Script_Extensions} properties.")
     (license license:expat)))
+
+(define-public ruby-citeproc
+  (package
+    (name "ruby-citeproc")
+    (version "1.0.10")
+    (source (origin
+              (method url-fetch)
+              (uri (rubygems-uri "citeproc" version))
+              (sha256
+               (base32
+                "13vl5sjmksk5a8kjcqnjxh7kn9gn1n4f9p1rvqfgsfhs54p0m6l2"))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     (list ruby-namae))
+    (arguments
+     (list #:tests? #f)) ;; tests have a cyclic dependency
+    (home-page "https://github.com/inukshuk/citeproc")
+    (synopsis "Interface for Ruby citation processors")
+    (description
+     "CiteProc is a citation processor interface and citation data API based
+on the @acronym{CSL, Citation Style Language} specifications.  To actually
+process citations, a dedicated processor engine is required: a pure Ruby
+engine is available in the @code{citeproc-ruby} gem.")
+    (license (list license:agpl3+ license:bsd-2))))
-- 
cgit v1.2.3


From e708f7f8b0f273eb5d9b1ee2e4c50ab9042a71f7 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:27 -0400
Subject: gnu: Add ruby-edtf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-edtf): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index e3d9572bec..914c7e859c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13317,3 +13317,63 @@ (define-public ruby-citeproc
 process citations, a dedicated processor engine is required: a pure Ruby
 engine is available in the @code{citeproc-ruby} gem.")
     (license (list license:agpl3+ license:bsd-2))))
+
+(define-public ruby-edtf
+  (package
+    (name "ruby-edtf")
+    (version "3.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/inukshuk/edtf-ruby")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "18j8xq8zmrn41cs2gpd1i87agi9905asvnjqndky2cqb5zg3q14g"))
+              (snippet
+               ;; remove generated file
+               #~(delete-file "lib/edtf/parser.rb"))
+              (file-name (git-file-name name version))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     (list ruby-activesupport))
+    (native-inputs
+     (list ruby-cucumber
+           ruby-rspec))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'extract-gemspec 'avoid-bundler
+            (lambda args
+              (substitute* "Rakefile"
+                (("require 'bundler" orig)
+                 (string-append "# " orig " # patched for Guix"))
+                (("bundle exec racc")
+                 "racc")
+                (("Cucumber::Rake::Task\\.new[(]:cucumber[)]" orig)
+                 (string-append orig " do |c|\n"
+                                "  c.bundler = false # patched for Guix\n"
+                                "end"))
+                (("Bundler\\.setup" orig)
+                 (string-append "true # " orig " # patched for Guix")))))
+          (add-after 'avoid-bundler 'patch-cucumber-options
+            (lambda args
+              (substitute* "cucumber.yml"
+                ;; this option is not supported, at least in our configuration
+                ((" --publish-quiet")
+                 ""))))
+          (add-before 'build 'compile
+            (lambda args
+              (invoke "rake" "racc")))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "rake")))))))
+    (home-page "https://github.com/inukshuk/edtf-ruby")
+    (synopsis "Ruby implementation of Extended Date/Time Format")
+    (description
+     "EDTF-Ruby provides a parser and an API for the @acronym{EDTF, Extended
+Date/Time Format} standard, implemented as an extension to Ruby's @code{Date}
+class.")
+    (license license:bsd-2)))
-- 
cgit v1.2.3


From fc1f561432161718d9fa88cbcfc3f0fbff51b397 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:28 -0400
Subject: gnu: Add ruby-gli.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-gli): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 914c7e859c..af19bf7701 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13377,3 +13377,55 @@ (define-public ruby-edtf
 Date/Time Format} standard, implemented as an extension to Ruby's @code{Date}
 class.")
     (license license:bsd-2)))
+
+(define-public ruby-gli
+  (package
+    (name "ruby-gli")
+    (version "2.21.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/davetron5000/gli")
+                    (commit (string-append "v" version))))
+              (sha256
+               (base32
+                "09b1r9hlx4dy2yq036nk7hc2nbswhia6q3na9v11z94yibc8mgja"))
+              (file-name (git-file-name name version))))
+    (build-system ruby-build-system)
+    (native-inputs
+     (list ruby-minitest
+           ruby-rainbow
+           ruby-rdoc
+           ruby-sdoc))
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'extract-gemspec 'patch-gemspec-version
+            (lambda args
+              (substitute* "gli.gemspec"
+                ;; this trick fails in our build environment
+                (("require File\\.join[(]\\[" orig)
+                 (string-append "# patched for Guix # " orig))
+                (("s\\.version = GLI::VERSION")
+                 #$(string-append "s.version = '"
+                                  (package-version this-package)
+                                  "' # patched for Guix")))))
+          (add-after 'replace-git-ls-files 'replace-another-git-ls-files
+            (lambda args
+              (substitute* "gli.gemspec"
+                (("`git ls-files -- [{]test,spec,features[}]/\\*`")
+                 "`find {test,spec,features} -type f | sort`"))))
+          (add-after 'replace-another-git-ls-files 'fix-rubyopt
+            (lambda args
+              (substitute* "Rakefile"
+                (("ENV\\[\"RUBYOPT\"]")
+                 "(ENV['RUBYOPT'] || '')")))))))
+    (home-page "https://davetron5000.github.io/gli/")
+    (synopsis "Git-Like Interface command-line parser")
+    (description
+     "GLI allows you to create command-line applications in Ruby with Git-Like
+Interfaces: that is, they take subcommands in the style of @command{git} and
+@command{gem}.  GLI uses a simple domain-specific language, but retains all
+the power of the built-in @code{OptionParser}.")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From 8d4670f4d18a9c57a6300eb3c11fbc26825f7a61 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:29 -0400
Subject: gnu: Add ruby-anystyle-data.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-anystyle-data): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index af19bf7701..6b312d1b4d 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13429,3 +13429,54 @@ (define-public ruby-gli
 @command{gem}.  GLI uses a simple domain-specific language, but retains all
 the power of the built-in @code{OptionParser}.")
     (license license:asl2.0)))
+
+(define-public ruby-anystyle-data
+  (package
+    (name "ruby-anystyle-data")
+    (version "1.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/inukshuk/anystyle-data")
+                    (commit version)))
+              (sha256
+               (base32
+                "025mxa7r9d7izqn6bc1wr40ijp64da0jh211prlpjl6svilgd6rm"))
+              (snippet
+               ;; remove pre-built file
+               #~(delete-file "lib/anystyle/data/dict.txt.gz"))
+              (file-name (git-file-name name version))))
+    (build-system ruby-build-system)
+    (arguments
+     (list
+      #:tests? #f ;; there are none
+      #:modules
+      `((guix build ruby-build-system)
+        (guix build utils)
+        (srfi srfi-26))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'replace-git-ls-files 'replace-another-git-ls-files
+            (lambda args
+              (substitute* "anystyle-data.gemspec"
+                (("`git ls-files lib README\\.md LICENSE`\\.split[(][^)]*[)]")
+                 (string-append
+                  "["
+                  (string-join
+                   (map (cut string-append "\"" <> "\"")
+                        `("README.md"
+                          "LICENSE"
+                          "lib/anystyle/data.rb"
+                          "lib/anystyle/data/dict.txt.gz"
+                          "lib/anystyle/data/setup.rb"
+                          "lib/anystyle/data/version.rb"))
+                   ", ")
+                  "]")))))
+          (add-before 'build 'compile-dict
+            (lambda args
+              (invoke "rake" "compile"))))))
+    (home-page "https://anystyle.io")
+    (synopsis "AnyStyle parser dictionary data")
+    (description
+     "This gem provides parser dictionary data for AnyStyle.")
+    (license license:bsd-2)))
-- 
cgit v1.2.3


From 3b017b9400978a7f351fd8a75e33d1eefb079d08 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:30 -0400
Subject: gnu: Add ruby-anystyle.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (ruby-anystyle): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6b312d1b4d..39d8d9e1ef 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13480,3 +13480,74 @@ (define-public ruby-anystyle-data
     (description
      "This gem provides parser dictionary data for AnyStyle.")
     (license license:bsd-2)))
+
+(define-public ruby-anystyle
+  (let ((commit "50f1dd547d28ab4b830e45d70e840cb1898a37b0")
+        (revision "1"))
+    ;; Releases point to specific commits, but recent releases haven't been
+    ;; tagged in Git.  Meanwhile, the rubygems archive lacks tests.
+    (package
+      (name "ruby-anystyle")
+      (version (git-version "1.3.14" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/inukshuk/anystyle")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "0f4qcrywl1kl6qysn24lj3yp85ln4i7za7b7ld2fglyzwcggxwb0"))
+                (snippet
+                 ;; There is an optional dependency on
+                 ;; , which
+                 ;; seems like it was intended to be free software, but
+                 ;; doesn't have a clear license statement.  Maybe someone can
+                 ;; do more sleuthing, or else find a replacement?  See also
+                 ;; .  For
+                 ;; now, patch it out, but leave a pointer to follow up.
+                 #~(begin
+                     (use-modules (guix build utils))
+                     (substitute* "Gemfile"
+                       (("gem 'language_detector', github: '[^']*'" orig)
+                        (string-append "# " orig " # unclear license")))
+                     (substitute* "spec/anystyle/parser_spec.rb"
+                       (("language: 'en'," orig)
+                        (string-append "# " orig " # no lanugage_detector")))))
+                (file-name (git-file-name name version))))
+      (build-system ruby-build-system)
+      (propagated-inputs
+       (list ruby-anystyle-data
+             ruby-bibtex-ruby
+             ruby-namae
+             ruby-wapiti))
+      (native-inputs
+       (list ruby-byebug
+             ruby-citeproc
+             ruby-edtf
+             ruby-rspec
+             ruby-unicode-scripts))
+      (arguments
+       (list
+        #:test-target "spec"
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'extract-gemspec 'avoid-bundler
+              (lambda args
+                (substitute* "Rakefile"
+                  (("require 'bundler" orig)
+                   (string-append "# " orig " # patched for Guix"))
+                  (("Bundler\\.setup" orig)
+                   (string-append "true # " orig " # patched for Guix")))))
+            (add-after 'replace-git-ls-files 'replace-another-git-ls-files
+              (lambda args
+                (substitute* "anystyle.gemspec"
+                  (("`git ls-files spec`")
+                   "`find spec -type f | sort`")))))))
+      (home-page "https://anystyle.io")
+      (synopsis "Fast and smart citation reference parsing (Ruby library)")
+      (description
+       "AnyStyle is a very fast and smart parser for academic reference lists
+and bibliographies.  AnyStyle uses powerful machine learning heuristics based
+on Conditional Random Fields and aims to make it easy to train the model with
+data that is relevant to your parsing needs.")
+      (license license:bsd-2))))
-- 
cgit v1.2.3


From 3ee5460b6338246b0b1e97c77b3f4b676f8a92bc Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:31 -0400
Subject: gnu: Add anystyle.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (anystyle): New variable.
(ruby-anystyle)[description]: Mention it.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 125 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 39d8d9e1ef..cdb9f53830 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -66,6 +66,7 @@ (define-module (gnu packages ruby)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages lsof)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
@@ -13549,5 +13550,127 @@ (define-public ruby-anystyle
        "AnyStyle is a very fast and smart parser for academic reference lists
 and bibliographies.  AnyStyle uses powerful machine learning heuristics based
 on Conditional Random Fields and aims to make it easy to train the model with
-data that is relevant to your parsing needs.")
+data that is relevant to your parsing needs.
+
+This package provides the Ruby module @code{AnyStyle}.  AnyStyle can also be
+used via the @command{anystyle} command-line utility or a web application,
+though the later has not yet been packaged for Guix.")
       (license license:bsd-2))))
+
+(define-public anystyle
+  (package
+    (name "anystyle")
+    (version "1.3.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/inukshuk/anystyle-cli")
+                    (commit version)))
+              (sha256
+               (base32
+                "1bazzms04cra8516q7vydmcm31yd0a7si1pxk4waffqy7lh0pksg"))
+              (file-name (git-file-name name version))))
+    (build-system ruby-build-system)
+    (propagated-inputs
+     (list ruby-anystyle
+           ruby-bibtex-ruby
+           ruby-gli))
+    (native-inputs
+     (list txt2man))
+    (arguments
+     (list
+      #:modules
+      `((guix build ruby-build-system)
+        (ice-9 popen)
+        (guix build utils))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'extract-gemspec 'less-strict-dependencies
+            (lambda args
+              (substitute* "anystyle-cli.gemspec"
+                (("'bibtex-ruby', '[^']*'")
+                 "'bibtex-ruby'"))))
+          (delete 'check) ;; there are no upstream tests
+          (add-after 'wrap 'check-cli
+            (lambda* (#:key tests? outputs #:allow-other-keys)
+              (when tests?
+                (with-output-to-file "check-cli.in"
+                  (lambda ()
+                    (for-each
+                     display
+                     '("Derrida, J. (1967). L’écriture et la différence "
+                       "(1 éd.). Paris: Éditions du Seuil.\n"))))
+                (invoke (search-input-file outputs "/bin/anystyle")
+                        "parse"
+                        "check-cli.in"))))
+          (add-after 'wrap 'generate-man-page
+            ;; generating a man page also tests that the command actually runs
+            (lambda args
+              (define (run-with-output-file file command . args)
+                (format (current-output-port)
+                        "running: ~s\nwith output to: ~s\n"
+                        (cons command args)
+                        file)
+                (unless (zero?
+                         (with-output-to-file file
+                           (lambda ()
+                             (status:exit-val
+                              (close-pipe
+                               (apply open-pipe* OPEN_WRITE command args))))))
+                  (error "command failed")))
+              (let ((anystyle (string-append #$output "/bin/anystyle")))
+                (run-with-output-file "intro.txt"
+                                      anystyle "--help")
+                (for-each (lambda (cmd)
+                            (let ((file (string-append cmd ".txt")))
+                              (run-with-output-file file
+                                                    anystyle cmd "--help")
+                              ;; indent headings to create subsections
+                              (substitute* file
+                                (("^[A-Z]" orig)
+                                 (string-append " " orig)))
+                              ;; generate a section heading
+                              (call-with-output-file
+                                  (string-append "section-" file)
+                                (lambda (out)
+                                  (format out "\n\n~a COMMAND\n\n"
+                                          (string-upcase cmd))))))
+                          '("check" "find" "parse" "train"))
+                (substitute* `("intro.txt"
+                               "check.txt" "find.txt" "parse.txt" "train.txt")
+                  ;; format "tag list" for txt2man"
+                  ((" - ")
+                   "    ")
+                  ;; restore formatting of the "name" sections
+                  (("(anystyle|check|find|parse|train)    ([A-Z])" _ cmd post)
+                   (string-append cmd " - " post)))
+                (run-with-output-file "anystyle.txt"
+                                      "cat"
+                                      "intro.txt"
+                                      "section-check.txt" "check.txt"
+                                      "section-find.txt" "find.txt"
+                                      "section-parse.txt" "parse.txt"
+                                      "section-train.txt" "train.txt")
+                (run-with-output-file
+                 "anystyle.1"
+                 "txt2man"
+                 "-v" "General Commands Manual" "-t" "anystyle" "-s" "1"
+                 "-r" #$(string-append "anystyle-cli "
+                                       (package-version this-package))
+                 "-B" "check" "-B" "find" "-B" "parse" "-B" "train"
+                 "anystyle.txt")
+                (install-file "anystyle.1"
+                              (string-append #$output "/share/man/man1"))))))))
+    (home-page "https://anystyle.io")
+    (synopsis "Fast and smart citation reference parsing")
+    (description
+     "AnyStyle is a very fast and smart parser for academic reference lists
+and bibliographies.  AnyStyle uses powerful machine learning heuristics based
+on Conditional Random Fields and aims to make it easy to train the model with
+data that is relevant to your parsing needs.
+
+This package provides the @command{anystyle} command-line utility.  AnyStyle
+can also be used as a Ruby library or as a web application, though the later
+has not yet been packaged for Guix.")
+    (license license:bsd-2)
+    (properties `((upstream-name . "anystyle-cli")))))
-- 
cgit v1.2.3


From bc2de56572872eefdc2992b34cce69c77deb485a Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:32 -0400
Subject: gnu: ruby-anystyle-data: Don't write to installed gem.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/patches/ruby-anystyle-data-immutable-install.patch: New
patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ruby.scm (ruby-anystyle-data)[patches]: Use it.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                       |  1 +
 .../ruby-anystyle-data-immutable-install.patch     | 40 ++++++++++++++++++++++
 gnu/packages/ruby.scm                              |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 gnu/packages/patches/ruby-anystyle-data-immutable-install.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index ca3b83c550..32ee102943 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1782,6 +1782,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \
   %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
   %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
+  %D%/packages/patches/ruby-anystyle-data-immutable-install.patch	\
   %D%/packages/patches/ruby-latex-decode-fix-test.patch		\
   %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
   %D%/packages/patches/ruby-sanitize-system-libxml.patch	\
diff --git a/gnu/packages/patches/ruby-anystyle-data-immutable-install.patch b/gnu/packages/patches/ruby-anystyle-data-immutable-install.patch
new file mode 100644
index 0000000000..d5d7149a67
--- /dev/null
+++ b/gnu/packages/patches/ruby-anystyle-data-immutable-install.patch
@@ -0,0 +1,40 @@
+From a6f5b37cd22daa6069d8fbef8cba9dc60a6731f6 Mon Sep 17 00:00:00 2001
+From: Philip McGrath 
+Date: Sun, 24 Jul 2022 23:54:19 -0400
+Subject: [PATCH] `AnyStyle::Data.setup()`: adjust for immutable install
+
+Don't override the default paths for `Dictionary::Marshal`,
+`Dictionary::GDBM`, and `Dictionary:LDBM` to point to this gem: we can't
+populate such files without the 'anystyle' gem (which depends on this
+one), and we won't be able to write to the directory where this gem is
+installed later, so the files will never exist at those locations.
+---
+ lib/anystyle/data/setup.rb | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/lib/anystyle/data/setup.rb b/lib/anystyle/data/setup.rb
+index 17efdf8..08246fa 100644
+--- a/lib/anystyle/data/setup.rb
++++ b/lib/anystyle/data/setup.rb
+@@ -4,18 +4,6 @@ module AnyStyle
+ 
+     def self.setup
+       Dictionary.defaults[:source] = File.join(ROOT, 'dict.txt.gz')
+-
+-      if defined? Dictionary::Marshal
+-        Dictionary::Marshal.defaults[:path] = File.join(ROOT, 'dict.marshal')
+-      end
+-
+-      if defined? Dictionary::GDBM
+-        Dictionary::GDBM.defaults[:path] = File.join(ROOT, 'dict.db')
+-      end
+-
+-      if defined? Dictionary::LDBM
+-        Dictionary::LDBM.defaults[:path] = ROOT
+-      end
+     end
+   end
+ end
+-- 
+2.32.0
+
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index cdb9f53830..6e0b2dd14c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13446,6 +13446,8 @@ (define-public ruby-anystyle-data
               (snippet
                ;; remove pre-built file
                #~(delete-file "lib/anystyle/data/dict.txt.gz"))
+              (patches
+               (search-patches "ruby-anystyle-data-immutable-install.patch"))
               (file-name (git-file-name name version))))
     (build-system ruby-build-system)
     (arguments
-- 
cgit v1.2.3


From 14a50b62d4e8765b794861226d79f6872d6c434c Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:33 -0400
Subject: gnu: ruby-anystyle: Initialize dictionary files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the GDBM and Marshal dictionary adapters to be useful with their
default settings, we must initialize their data files during the package
build: upstream would initialize them lazily, but that doesn't work with
an immutable installation directory (at least, not without more complex
patches). Otherwise, we would always end up rebuilding the dictionary at
startup, which is “slow” and “not recommended”.

* gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch: New
patch.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/ruby.scm (ruby-anystyle)[patches]: Use it.
[arguments]<#:phases>: Add 'populate-dictionaries' phase.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                       |  1 +
 .../ruby-anystyle-fix-dictionary-populate.patch    | 94 ++++++++++++++++++++++
 gnu/packages/ruby.scm                              | 31 ++++++-
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index 32ee102943..0e8b7b0447 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1783,6 +1783,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
   %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
   %D%/packages/patches/ruby-anystyle-data-immutable-install.patch	\
+  %D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch	\
   %D%/packages/patches/ruby-latex-decode-fix-test.patch		\
   %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
   %D%/packages/patches/ruby-sanitize-system-libxml.patch	\
diff --git a/gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch b/gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch
new file mode 100644
index 0000000000..b2e0498e8d
--- /dev/null
+++ b/gnu/packages/patches/ruby-anystyle-fix-dictionary-populate.patch
@@ -0,0 +1,94 @@
+From fae622c8b77feebac66a538d76e4211de8bd8eb3 Mon Sep 17 00:00:00 2001
+From: Philip McGrath 
+Date: Sun, 24 Jul 2022 21:50:44 -0400
+Subject: [PATCH] fix saving `AnyStyle::Dictionary` after `populate!`
+
+Some of these fixes are more generally applicable.
+
+A more robust solution might find data files using
+e.g. `Gem.find_files()`.
+---
+ lib/anystyle/dictionary/gdbm.rb    |  6 ++++++
+ lib/anystyle/dictionary/marshal.rb | 31 ++++++++++++++++++++++++------
+ 2 files changed, 31 insertions(+), 6 deletions(-)
+
+diff --git a/lib/anystyle/dictionary/gdbm.rb b/lib/anystyle/dictionary/gdbm.rb
+index 754903c..c814df2 100644
+--- a/lib/anystyle/dictionary/gdbm.rb
++++ b/lib/anystyle/dictionary/gdbm.rb
+@@ -1,5 +1,6 @@
+ module AnyStyle
+   require 'gdbm'
++  require 'fileutils'
+ 
+   class Dictionary
+     class GDBM < Dictionary
+@@ -17,8 +18,13 @@ module AnyStyle
+ 
+       def open
+         close
++        FileUtils.mkdir_p(File.dirname(options[:path]))
+         @db = ::GDBM.new(*options.values_at(:path, :mode, :flags))
+         self
++      rescue Errno::EACCES
++        # GDBM.new tries this if :flags is nil, but not necessarily otherwise
++        @db = ::GDBM.new(options[:path],options[:mode],::GDBM::READER)
++        self
+       ensure
+         populate! if empty?
+       end
+diff --git a/lib/anystyle/dictionary/marshal.rb b/lib/anystyle/dictionary/marshal.rb
+index 761ca36..b9529d0 100644
+--- a/lib/anystyle/dictionary/marshal.rb
++++ b/lib/anystyle/dictionary/marshal.rb
+@@ -1,4 +1,6 @@
+ module AnyStyle
++  require 'fileutils'
++  require 'tempfile'
+   class Dictionary
+     class Marshal < Dictionary
+       @defaults = {
+@@ -10,17 +12,34 @@ module AnyStyle
+       end
+ 
+       def open
+-        if File.exists?(options[:path])
+-          @db = ::Marshal.load(File.open(options[:path]))
+-        else
+-          @db = {}
++        File.open(options[:path]) do |file|
++          @db = ::Marshal.load(file)
+         end
+         self
++      rescue Errno::ENOENT
++        @db = {}
++        self
+       ensure
+         if empty?
+           populate!
+-          if File.writable?(options[:path])
+-            ::Marshal.dump(db, File.open(options[:path], 'wb'))
++          tmp = nil
++          begin
++            FileUtils.mkdir_p(File.dirname(options[:path]))
++            tmp = Tempfile.create(File.basename(options[:path]),
++                                  File.dirname(options[:path]),
++                                  mode: File::Constants::BINARY)
++            pth = tmp.path()
++            ::Marshal.dump(db, tmp)
++            tmp.close()
++            File.rename(tmp.path, options[:path]) # will overwrite if exists
++            tmp = nil
++          rescue SystemCallError => e
++            warn(e.message)
++          ensure
++            if tmp then
++              tmp.close()
++              tmp.unlink()
++            end
+           end
+         end
+       end
+-- 
+2.32.0
+
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6e0b2dd14c..0b558de6db 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13516,6 +13516,9 @@ (define-public ruby-anystyle
                      (substitute* "spec/anystyle/parser_spec.rb"
                        (("language: 'en'," orig)
                         (string-append "# " orig " # no lanugage_detector")))))
+                (patches
+                 (search-patches
+                  "ruby-anystyle-fix-dictionary-populate.patch"))
                 (file-name (git-file-name name version))))
       (build-system ruby-build-system)
       (propagated-inputs
@@ -13545,7 +13548,33 @@ (define-public ruby-anystyle
               (lambda args
                 (substitute* "anystyle.gemspec"
                   (("`git ls-files spec`")
-                   "`find spec -type f | sort`")))))))
+                   "`find spec -type f | sort`"))))
+            (add-after 'wrap 'populate-dictionaries
+              (lambda args
+                ;; We must initiallize these files here, or they will never be
+                ;; usable with the default settings. A more flexible approach
+                ;; might use something like `Gem.find_files()` or
+                ;; XDG_DATA_DIRS.
+                (with-output-to-file "initialize-dictionaries.rb"
+                  (lambda ()
+                    (display "
+require 'anystyle/dictionary' # must come before 'anystyle/data'
+require 'anystyle/data'
+[:marshal, :gdbm].each do |adapter|
+  AnyStyle::Dictionary.create({adapter: adapter}).open().close()
+end
+")))
+                (let* ((old-gems (getenv "GEM_PATH"))
+                       (new-gems (string-append #$output
+                                                "/lib/ruby/vendor_ruby:"
+                                                old-gems)))
+                  (dynamic-wind
+                    (lambda ()
+                      (setenv "GEM_PATH" new-gems))
+                    (lambda ()
+                      (invoke "ruby" "initialize-dictionaries.rb"))
+                    (lambda ()
+                      (setenv "GEM_PATH" old-gems)))))))))
       (home-page "https://anystyle.io")
       (synopsis "Fast and smart citation reference parsing (Ruby library)")
       (description
-- 
cgit v1.2.3


From 9c124671ce0eafe50c1d913976ad6bc619475f9a Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:34 -0400
Subject: gnu: anystyle: Add tests for dictionary adapters.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/ruby.scm (anystyle)[arguments]: Instead of deleting the
'check' phase, replace it with a few tests. Add SRFI 1 to '#:modules'.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 0b558de6db..2dba81c2a1 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13613,6 +13613,7 @@ (define-public anystyle
       #:modules
       `((guix build ruby-build-system)
         (ice-9 popen)
+        (srfi srfi-1)
         (guix build utils))
       #:phases
       #~(modify-phases %standard-phases
@@ -13621,7 +13622,30 @@ (define-public anystyle
               (substitute* "anystyle-cli.gemspec"
                 (("'bibtex-ruby', '[^']*'")
                  "'bibtex-ruby'"))))
-          (delete 'check) ;; there are no upstream tests
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              ;; There are no tests, but let's use this opportunity to do a
+              ;; basic test of our own that things run ok. It works especially
+              ;; well to test this here since we know the 'ruby-anystile'
+              ;; package is in its final, immutable installed form.
+              (when tests?
+                (let ((common
+                       `("require 'anystyle'"
+                         ,(string-append
+                           "pp AnyStyle.parse 'Derrida, J. (1967). L’écriture"
+                           " et la différence (1 éd.). Paris: Éditions du"
+                           " Seuil.'"))))
+                  (for-each
+                   (lambda (lines)
+                     (apply invoke "ruby"
+                            (fold-right (lambda (line lst)
+                                          (cons* "-e" line lst))
+                                        '()
+                                        lines)))
+                   `(,common
+                     ("require 'anystyle/dictionary'"
+                      "AnyStyle::Dictionary.defaults[:adapter] = :gdbm"
+                      ,@common)))))))
           (add-after 'wrap 'check-cli
             (lambda* (#:key tests? outputs #:allow-other-keys)
               (when tests?
-- 
cgit v1.2.3


From c90c1698e1e256f8c42558caed077850e92c6434 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 08:16:35 -0400
Subject: gnu: anystyle: Use GDBM by default.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we have GDBM available, it offers a smaller memory footprint
and faster start-up.

* gnu/packages/ruby.scm (anystyle)[arguments]<#:phases>: Add phase
'change-default-dictionary-adapter'.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/ruby.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2dba81c2a1..cc95bd8d6e 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -13622,6 +13622,14 @@ (define-public anystyle
               (substitute* "anystyle-cli.gemspec"
                 (("'bibtex-ruby', '[^']*'")
                  "'bibtex-ruby'"))))
+          (add-before 'build 'change-default-dictionary-adapter
+            (lambda args
+              ;; Since we always have gdbm available, using it will give a
+              ;; faster startup time, which is particularly worth-while for
+              ;; a command-line tool.
+              (substitute* "bin/anystyle"
+                (("default_value: 'ruby',")
+                 "default_value: 'gdbm', # patched for Guix"))))
           (replace 'check
             (lambda* (#:key tests? #:allow-other-keys)
               ;; There are no tests, but let's use this opportunity to do a
-- 
cgit v1.2.3


From 58d196866a3766480a79a935264b761df1524daf Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher 
Date: Fri, 22 Jul 2022 12:34:36 +0100
Subject: gnu: python-netcdf4: Update to 1.6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm: (python-netcdf4): Update to 1.6.0.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1be295b140..f9266e4281 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1641,14 +1641,14 @@ (define-public python-cftime
 (define-public python-netcdf4
   (package
     (name "python-netcdf4")
-    (version "1.5.3")
+    (version "1.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "netCDF4" version))
        (sha256
         (base32
-         "1gn35mb2yc263pci720aik8ymz41lrvxlrn3z83vyjwghiashg1a"))))
+         "0qxs8r1qmsmg760wm5q0wqlcm7hdd3k7cghryw6wvqd3v5rs7vwm"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From 3bd2b1b544c45e5e341010e48bcedcb0ba593480 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher 
Date: Fri, 22 Jul 2022 12:44:37 +0100
Subject: gnu: Add python-h5netcdf.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm: (python-h5netcdf): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f9266e4281..d02501684f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1476,6 +1476,37 @@ (define-public python-hdf4
 @url{http://hdfeos.org/software/pyhdf.php,pyhdf}.")
    (license license:expat)))
 
+(define-public python-h5netcdf
+  (package
+    (name "python-h5netcdf")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "h5netcdf" version))
+       (sha256
+        (base32 "1b2dcgf5rwy7pb7hr4prkc5vgcw9qc2was20dmnj90lbrpx08rvp"))))
+    (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "pytest" "-vv" "h5netcdf/tests")))))))
+    (native-inputs
+     (list python-netcdf4
+           python-pytest
+           python-setuptools-scm))
+    (propagated-inputs
+     (list python-h5py python-packaging))
+    (home-page "https://h5netcdf.org")
+    (synopsis "Python interface for the netCDF4 file-format based on h5py")
+    (description "This package provides Python interface for the netCDF4
+file-format that reads and writes local or remote HDF5 files directly via h5py
+or h5pyd, without relying on the Unidata netCDF library")
+    (license license:bsd-3)))
+
 (define-public python-h5py
   (package
     (name "python-h5py")
-- 
cgit v1.2.3


From a5933dc071ed51b5b3f694259808447716acf065 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 25 Jul 2022 03:02:42 +0200
Subject: gnu: gsasl: Update to 2.0.1.

* gnu/packages/gsasl.scm (gsasl): Update to 2.0.1.
---
 gnu/packages/gsasl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm
index 787bbae2bb..eb3255beed 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -77,14 +77,14 @@ (define-public gss
 (define-public gsasl
   (package
    (name "gsasl")
-   (version "1.10.0")
+   (version "2.0.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gsasl/gsasl-" version
                                 ".tar.gz"))
             (sha256
              (base32
-              "1lv8fp01aq4jjia9g4vkx90zacl8rgmjhfi6f1wdwnh9ws7bvg45"))))
+              "0yhvq3n6smgnc7fp0smmly8d248248xr7q2apbcbqhc80117ab1j"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--with-gssapi-impl=mit"
-- 
cgit v1.2.3


From aec302e03a52f96a3545da34a110f6c015a872d8 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 2 Aug 2022 20:56:05 +0200
Subject: gnu: amalgamate: Remove input labels.

* gnu/packages/code.scm (amalgamate)[inputs]: Remove label.
---
 gnu/packages/code.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 11df6fd4b2..96736aac84 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -914,8 +914,7 @@ (define-public amalgamate
              (("test_command \"cc -Wall -Wextra -o source.out source.c\"" all)
               "test_command \"gcc -Wall -Wextra -o source.out source.c\"")))))
       (build-system gnu-build-system)
-      (inputs
-       `(("python" ,python-wrapper)))
+      (inputs (list python-wrapper))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
-- 
cgit v1.2.3


From 20d1e2ffb0cd4860faeabc8f5c2b4afde99c7a1b Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 10:38:07 +0200
Subject: gnu: inkscape: Update to 1.2.1.

* gnu/packages/inkscape.scm (inkscape): Update to 1.2.1.
---
 gnu/packages/inkscape.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index ad9552e049..9cab43c911 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -244,7 +244,7 @@ (define-public inkscape
   (package
     (inherit inkscape/stable)
     (name "inkscape")
-    (version "1.2")
+    (version "1.2.1")
     (source
      (origin
        (inherit (package-source inkscape/stable))
@@ -253,7 +253,7 @@ (define-public inkscape
                            "resources/file/"
                            "inkscape-" version ".tar.xz"))
        (sha256
-        (base32 "1bg6rlflzhq726kpcwazfscm02liammjvzpyxmj5d52l4la336wd"))))
+        (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
     (build-system cmake-build-system)
     (arguments
      (substitute-keyword-arguments (package-arguments inkscape/stable)
-- 
cgit v1.2.3


From 1892f5539ef1cdccd201785767db3ca9913c2dbe Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 10:40:56 +0200
Subject: gnu: inkscape: Build with lib2geom 1.2.

* gnu/packages/graphics.scm (lib2geom-1.2): New variable.
* gnu/packages/inkscape.scm (inkscape)[arguments]: Enable previously failing
test.
[inputs]: Replace "lib2geom" with LIB2GEOM-1.2.
---
 gnu/packages/graphics.scm | 14 ++++++++++++++
 gnu/packages/inkscape.scm | 11 +----------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index fc90c72bed..4920f613a5 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -849,6 +849,20 @@ (define-public lib2geom
     ;; https://gitlab.com/inkscape/inkscape/issues/784).
     (license license:gpl3+)))
 
+(define-public lib2geom-1.2
+  (package
+    (inherit lib2geom)
+    (version "1.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/inkscape/lib2geom")
+                    (commit version)))
+              (file-name (git-file-name "lib2geom" version))
+              (sha256
+               (base32
+                "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))))
+
 (define-public python-booleanoperations
   (package
     (name "python-booleanoperations")
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 9cab43c911..2e43835e4f 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -259,16 +259,6 @@ (define-public inkscape
      (substitute-keyword-arguments (package-arguments inkscape/stable)
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'disable-problematic-tests
-             ;; The UnionOutside and UnionOutsideSwap tests fail, comparing
-             ;; e.g. the result "M 0 1.5 V 0 H 2 V 2 H 0.5 V 2.5 H 0 V 2 V 1.5 H
-             ;; 0.5 V 2 z" to the expected string "M 0 0 V 1.5 V 2 V 2.5 H 0.5 V
-             ;; 2 H 2 V 0 z" (see:
-             ;; https://gitlab.com/inkscape/inkscape/-/issues/3689).
-             (lambda _
-               (substitute* "testfiles/src/path-boolop-test.cpp"
-                 (("PathBoolopTest, UnionOutside(Swap)?.*" all)
-                  (string-append all "    GTEST_SKIP();\n")))))
            (replace 'wrap-program
              ;; Ensure Python is available at runtime.
              (lambda* (#:key outputs #:allow-other-keys)
@@ -281,6 +271,7 @@ (define-public inkscape
                    `("GDK_PIXBUF_MODULE_FILE" =
                      (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
     (inputs (modify-inputs (package-inputs inkscape/stable)
+              (replace "lib2geom" lib2geom-1.2)
               (append bash-minimal
                       librsvg)))        ;for the pixbuf loader
     (properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
-- 
cgit v1.2.3


From d01310f24b42a9b06e28f1f4a5ef0eb6d67f34ca Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 10:48:22 +0200
Subject: gnu: ungoogled-chromium: Update to 104.0.5112.81-1.

* gnu/packages/chromium.scm (%chromium-version): Set to 104.0.5112.81.
(%ungoogled-origin): Update hash.
(ungoogled-chromium)[source](sha256): Likewise.
[arguments]: Add snippet to fix build with system MINIZIP.  Remove obsolete
configure flag.
---
 gnu/packages/chromium.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 4f21335502..f27afc9743 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -316,7 +316,7 @@ (define %blacklisted-files
   ;; run the Blink performance tests, just remove everything to save ~70MiB.
   '("third_party/blink/perf_tests"))
 
-(define %chromium-version "103.0.5060.134")
+(define %chromium-version "104.0.5112.81")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision "debian/102.0.5005.61-1")
 
@@ -328,7 +328,7 @@ (define %ungoogled-origin
     (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
     (sha256
      (base32
-      "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r"))))
+      "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w"))))
 
 (define %debian-origin
   (origin
@@ -477,7 +477,7 @@ (define-public ungoogled-chromium
                                   %chromium-version ".tar.xz"))
               (sha256
                (base32
-                "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4"))
+                "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y"))
               (modules '((guix build utils)))
               (snippet (force ungoogled-chromium-snippet))))
     (build-system gnu-build-system)
@@ -509,7 +509,6 @@ (define-public ungoogled-chromium
               "disable_fieldtrial_testing_config=true"
               "safe_browsing_mode=0"
               "enable_mdns=false"
-              "enable_one_click_signin=false"
               "enable_reading_list=false"
               "enable_remoting=false"
               "enable_reporting=false"
@@ -596,6 +595,12 @@ (define-public ungoogled-chromium
                   ;; This include path is added by Debians openjpeg patch.
                   (("/usr/include/openjpeg-2.4") openjpeg))
 
+                ;; Remove contrib/ prefix from minizip header inclusions.
+                (substitute* (find-files "third_party/tflite_support\
+/src/tensorflow_lite_support/metadata/cc")
+                  (("contrib/minizip/")
+                   "minizip/"))
+
                 (substitute*
                     '("base/process/launch_posix.cc"
                       "base/third_party/dynamic_annotations/dynamic_annotations.c"
-- 
cgit v1.2.3


From 30ac2d1c4043af279d60bb271e24fd5fea896d2e Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 11:23:41 +0200
Subject: gnu: libolm: Update to 3.2.12.

* gnu/packages/crypto.scm (libolm): Update to 3.2.12.
[source](uri): Follow redirect.
---
 gnu/packages/crypto.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 6e4b1331e7..9dcffd8dd4 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1295,15 +1295,15 @@ (define-public minisign
 (define-public libolm
   (package
     (name "libolm")
-    (version "3.2.3")
+    (version "3.2.12")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://git.matrix.org/git/olm")
+                    (url "https://gitlab.matrix.org/matrix-org/olm")
                     (commit version)))
               (sha256
                (base32
-                "0bixly6jqpwfx3p37c1qp1j685yg6m429r1nazwh43w4n527bs3y"))
+                "1k8v9ig32vmjm58rbris621d7mvp4q91qa5p79vc51p41sz91yhj"))
               (file-name (git-file-name name version))
               ;; Delete the bundled blob.  It's free, but unauditable,
               ;; and apparently only required for android.
-- 
cgit v1.2.3


From 9dab4ff7707b654da0f6e3ee014ff93a2682a7f4 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 11:24:11 +0200
Subject: gnu: mtxclient: Update to 0.8.0.

* gnu/packages/messaging.scm (mtxclient): Update to 0.8.0.
---
 gnu/packages/messaging.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 58ac95f42c..b6fce218b2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2340,7 +2340,7 @@ (define-public libqmatrixclient
 (define-public mtxclient
   (package
     (name "mtxclient")
-    (version "0.7.0")
+    (version "0.8.0")
     (source
      (origin
        (method git-fetch)
@@ -2349,7 +2349,7 @@ (define-public mtxclient
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0kgz9i3xgyk1a82sv48a1m8gdxg0cl5pgd5imgwy519vvjlkwv48"))))
+        (base32 "0gkzgq6rzanvgyk47d25nqz7m0lwa3kz5pc0m4w0ada38xwhy2j9"))))
     (arguments
      `(#:configure-flags
        (list
-- 
cgit v1.2.3


From ca6f15310d53cea820888ba2b67f16602bc1f6d6 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 12:17:51 +0200
Subject: gnu: nheko: Update to 0.10.0.

* gnu/packages/messaging.scm (nheko): Update to 0.10.0.
[arguments]: Adjust unbundling substitutions.
---
 gnu/packages/messaging.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index b6fce218b2..2f61a8f783 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2385,7 +2385,7 @@ (define-public mtxclient
 (define-public nheko
   (package
     (name "nheko")
-    (version "0.9.3")
+    (version "0.10.0")
     (source
      (origin
        (method git-fetch)
@@ -2394,7 +2394,7 @@ (define-public nheko
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1941jvk72qy9g41cs2p3d6fphkg8ccjlsiclwymvzdyi7s3ilml7"))
+        (base32 "1n7czmv8mamaphpr2cnppddpgmb914pjd7msxng0fim6w7bhil14"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -2413,13 +2413,15 @@ (define-public nheko
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'unbundle-dependencies
-            (lambda _
-              (let ((single-app #$(this-package-input "single-application-qt5")))
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((libSingleApplication.a
+                     (search-input-file inputs "lib/libSingleApplication.a"))
+                    (httplib.h (search-input-file inputs "include/httplib.h")))
                 (substitute* "CMakeLists.txt"
                   ;; Remove include and source dirs,replace with the correct one
-                  (("third_party/blurhash/blurhash.cpp") "")
-                  (("third_party/cpp-httplib-0.5.12")
-                   (string-append "\"" single-app "/include\""))
+                  (("third_party/blurhash/blurhash\\.[ch]pp") "")
+                  (("third_party/cpp-httplib-0\\.5\\.12")
+                   (dirname httplib.h))
                   (("add_subdirectory.*third_party/SingleApplication.*") "")
                   ;; Link using the correct static/shared libs
                   (("SingleApplication::SingleApplication")
@@ -2427,7 +2429,7 @@ (define-public nheko
                     ;; Dynamic libraries
                     "httplib" "\n" "blurhash" "\n"
                     ;; Static library
-                    single-app "/lib/libSingleApplication.a"))))))
+                    libSingleApplication.a))))))
           (add-after 'unpack 'fix-determinism
             (lambda _
               ;; Make Qt deterministic.
-- 
cgit v1.2.3


From 5d7cb47d5f3e608074ac2e89a42e72ede13f5b26 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 11:24:31 +0200
Subject: gnu: notcurses: Update to 3.0.8.

* gnu/packages/notcurses.scm (notcurses): Update to 3.0.8.
[arguments]: Fix configure flag typo.
---
 gnu/packages/notcurses.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/notcurses.scm b/gnu/packages/notcurses.scm
index 9da298dce8..28747a864e 100644
--- a/gnu/packages/notcurses.scm
+++ b/gnu/packages/notcurses.scm
@@ -34,7 +34,7 @@ (define-module (gnu packages notcurses)
 (define-public notcurses
   (package
    (name "notcurses")
-   (version "3.0.0")
+   (version "3.0.8")
    (source
     (origin
      (method git-fetch)
@@ -43,7 +43,7 @@ (define-public notcurses
            (commit (string-append "v" version))))
      (file-name (git-file-name name version))
          (sha256
-          (base32 "1y9s77m1pp6syfml559d8dvif61y6zjldrdx1zri18q9sr0zqm9m"))))
+          (base32 "05dxv0745kzna2zylvsb3rlwcrlpyc5xsdcflbrdc34ab29mc8z5"))))
       (build-system cmake-build-system)
       (arguments
        `(#:make-flags
@@ -59,7 +59,7 @@ (define-public notcurses
            ;; Use FFmpeg for multimedia support
            "-DUSE_MULTIMEDIA=ffmpeg"
            ;; Follow the Debian Free Software Guidelines, omitting nonfree content.
-           "-DFSG_BUILD=ON")))
+           "-DDFSG_BUILD=ON")))
       (native-inputs
        (list pkg-config
              pandoc
-- 
cgit v1.2.3


From d0f25610d90753f336db11f09fd8e87d0d2c0121 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 12:02:17 +0200
Subject: gnu: notcurses: Use tarball source instead of git.

* gnu/packages/notcurses.scm (notcurses)[source]: Use URL-FETCH.
---
 gnu/packages/notcurses.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/notcurses.scm b/gnu/packages/notcurses.scm
index 28747a864e..5bb8a24edd 100644
--- a/gnu/packages/notcurses.scm
+++ b/gnu/packages/notcurses.scm
@@ -1,4 +1,5 @@
 ;;; Copyright © 2021 Blake Shaw 
+;;; Copyright © 2022 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,7 +21,7 @@ (define-module (gnu packages notcurses)
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix build utils)
-  #:use-module (guix git-download)
+  #:use-module (guix download)
   #:use-module (guix build-system cmake)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages check)
@@ -37,13 +38,17 @@ (define-public notcurses
    (version "3.0.8")
    (source
     (origin
-     (method git-fetch)
-     (uri (git-reference
-           (url "https://github.com/dankamongmen/notcurses")
-           (commit (string-append "v" version))))
-     (file-name (git-file-name name version))
-         (sha256
-          (base32 "05dxv0745kzna2zylvsb3rlwcrlpyc5xsdcflbrdc34ab29mc8z5"))))
+     (method url-fetch)
+     ;; Note: the upstream git repository contains non-free media (see the
+     ;; documentation for DFSG_BUILD; but the project provides a sanitized
+     ;; tarball for distributions.  If switching to a git source, we need
+     ;; to find a way to elide the non-free demos with a source 'snippet'.
+     (uri (string-append "https://github.com/dankamongmen/notcurses/releases"
+                         "/download/v" version "/notcurses_" version
+                         "+dfsg.1.orig.tar.xz"))
+     (file-name (string-append name "-" version ".tar.xz"))
+     (sha256
+      (base32 "1nz32nqh7fn4i06hvl8ndkm0z4g08a6wzhilvv8ggx2hc5axsz89"))))
       (build-system cmake-build-system)
       (arguments
        `(#:make-flags
-- 
cgit v1.2.3


From 243bcbb8a2ede8a092f42a4d90ec6efdce7f28d5 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 4 Aug 2022 12:03:24 +0200
Subject: gnu: notcurses: Adjust indentation.

* gnu/packages/notcurses.scm (notcurses): Re-indent.
---
 gnu/packages/notcurses.scm | 90 +++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/notcurses.scm b/gnu/packages/notcurses.scm
index 5bb8a24edd..bb0086d4b3 100644
--- a/gnu/packages/notcurses.scm
+++ b/gnu/packages/notcurses.scm
@@ -34,49 +34,49 @@ (define-module (gnu packages notcurses)
 
 (define-public notcurses
   (package
-   (name "notcurses")
-   (version "3.0.8")
-   (source
-    (origin
-     (method url-fetch)
-     ;; Note: the upstream git repository contains non-free media (see the
-     ;; documentation for DFSG_BUILD; but the project provides a sanitized
-     ;; tarball for distributions.  If switching to a git source, we need
-     ;; to find a way to elide the non-free demos with a source 'snippet'.
-     (uri (string-append "https://github.com/dankamongmen/notcurses/releases"
-                         "/download/v" version "/notcurses_" version
-                         "+dfsg.1.orig.tar.xz"))
-     (file-name (string-append name "-" version ".tar.xz"))
-     (sha256
-      (base32 "1nz32nqh7fn4i06hvl8ndkm0z4g08a6wzhilvv8ggx2hc5axsz89"))))
-      (build-system cmake-build-system)
-      (arguments
-       `(#:make-flags
-         (list (string-append "CC=" ,(cc-for-target)))
-         ;; These flags are documented in 'INSTALL.md' in the source distribution.
-         #:configure-flags
-         '(;; Do not build "coverage"
-           "-DUSE_COVERAGE=off"
-           ;; Do not build HTML documentation
-           "-DUSE_DOXYGEN=off"
-           ;; Don't include mouse support
-           "-DUSE_GPM=off"
-           ;; Use FFmpeg for multimedia support
-           "-DUSE_MULTIMEDIA=ffmpeg"
-           ;; Follow the Debian Free Software Guidelines, omitting nonfree content.
-           "-DDFSG_BUILD=ON")))
-      (native-inputs
-       (list pkg-config
-             pandoc
-             doctest))
-      (inputs
-       (list ffmpeg
-             libdeflate
-             libunistring
-             ncurses
-             zlib))
-      (synopsis "Textual user interfaces")
-      (description "Notcurses is a library for building complex textual user
+    (name "notcurses")
+    (version "3.0.8")
+    (source
+     (origin
+       (method url-fetch)
+       ;; Note: the upstream git repository contains non-free media (see the
+       ;; documentation for DFSG_BUILD; but the project provides a sanitized
+       ;; tarball for distributions.  If switching to a git source, we need
+       ;; to find a way to elide the non-free demos with a source 'snippet'.
+       (uri (string-append "https://github.com/dankamongmen/notcurses/releases"
+                           "/download/v" version "/notcurses_" version
+                           "+dfsg.1.orig.tar.xz"))
+       (file-name (string-append name "-" version ".tar.xz"))
+       (sha256
+        (base32 "1nz32nqh7fn4i06hvl8ndkm0z4g08a6wzhilvv8ggx2hc5axsz89"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:make-flags
+       (list (string-append "CC=" ,(cc-for-target)))
+       ;; These flags are documented in 'INSTALL.md' in the source distribution.
+       #:configure-flags
+       '( ;; Do not build "coverage"
+         "-DUSE_COVERAGE=off"
+         ;; Do not build HTML documentation
+         "-DUSE_DOXYGEN=off"
+         ;; Don't include mouse support
+         "-DUSE_GPM=off"
+         ;; Use FFmpeg for multimedia support
+         "-DUSE_MULTIMEDIA=ffmpeg"
+         ;; Follow the Debian Free Software Guidelines, omitting nonfree content.
+         "-DDFSG_BUILD=ON")))
+    (native-inputs
+     (list pkg-config
+           pandoc
+           doctest))
+    (inputs
+     (list ffmpeg
+           libdeflate
+           libunistring
+           ncurses
+           zlib))
+    (synopsis "Textual user interfaces")
+    (description "Notcurses is a library for building complex textual user
 interfaces on modern terminals.")
-      (home-page "https://notcurses.com")
-      (license license:asl2.0)))
+    (home-page "https://notcurses.com")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From e920ba0b1ddd02f4de5f3810d82dea2d65d9590c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Thu, 4 Aug 2022 13:51:49 +0200
Subject: gnu: emacs-helm: Update to 3.8.7.

* gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.8.7.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 00b52f75be..5024e5c49c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -11805,7 +11805,7 @@ (define-public emacs-wgrep
 (define-public emacs-helm
   (package
     (name "emacs-helm")
-    (version "3.8.6")
+    (version "3.8.7")
     (source
      (origin
        (method git-fetch)
@@ -11814,7 +11814,7 @@ (define-public emacs-helm
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z"))))
+        (base32 "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-async emacs-popup))
-- 
cgit v1.2.3


From 94776d73d8c157cca226a1c3c8e32fa625ce844b Mon Sep 17 00:00:00 2001
From: jgart via Guix-patches via 
Date: Thu, 21 Jul 2022 20:36:11 -0500
Subject: gnu: python-pudb: Update to 2022.1.2.

* gnu/packages/python-xyz.scm (python-pudb): Update to 2022.1.2.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d02501684f..622a356bf1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -28837,13 +28837,13 @@ (define-public dynaconf
 (define-public python-pudb
   (package
     (name "python-pudb")
-    (version "2022.1.1")
+    (version "2022.1.2")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "pudb" version))
               (sha256
                (base32
-                "0gq82hwnibby9qdyv7ri11phvg94nby4jb0w9h3jk79w89kdsfyv"))))
+                "03a7zalgdxfd2z2k6050ng087gwqgqis544n2083gdfxbf0ap0vb"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
cgit v1.2.3


From f8b200db81445a180583afbc5974c3d2ccc33095 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:04:25 -0400
Subject: gnu: linux-libre: Update to 5.18.16.

* gnu/packages/linux.scm (linux-libre-5.18-version): Update to 5.18.16.
(linux-libre-5.18-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a9594905d9..3aa3aea1d2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -352,7 +352,7 @@ (define (%upstream-linux-source version hash)
 ;; The current "stable" kernels. That is, the most recently released major
 ;; versions that are still supported upstream.
 
-(define-public linux-libre-5.18-version "5.18.14")
+(define-public linux-libre-5.18-version "5.18.16")
 (define-public linux-libre-5.18-gnu-revision "gnu")
 (define deblob-scripts-5.18
   (linux-libre-deblob-scripts
@@ -362,7 +362,7 @@ (define deblob-scripts-5.18
    (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53")))
 (define-public linux-libre-5.18-pristine-source
   (let ((version linux-libre-5.18-version)
-        (hash (base32 "1bsnk2rskdkimciij5q3hjs00lc7ks1h1qh9kc4s7lrk252lczg1")))
+        (hash (base32 "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi")))
    (make-linux-libre-source version
 
                             (%upstream-linux-source version hash)
-- 
cgit v1.2.3


From b4af9220d0a4f5e1482d1364dbc00c57d23e80b6 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:04:55 -0400
Subject: gnu: linux-libre 5.15: Update to 5.15.59.

* gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.59.
(linux-libre-5.15-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3aa3aea1d2..3fa5c70bea 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -371,7 +371,7 @@ (define-public linux-libre-5.18-pristine-source
 ;; The "longterm" kernels — the older releases with long-term upstream support.
 ;; Here are the support timelines:
 ;; 
-(define-public linux-libre-5.15-version "5.15.57")
+(define-public linux-libre-5.15-version "5.15.59")
 (define-public linux-libre-5.15-gnu-revision "gnu")
 (define deblob-scripts-5.15
   (linux-libre-deblob-scripts
@@ -381,7 +381,7 @@ (define deblob-scripts-5.15
    (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24")))
 (define-public linux-libre-5.15-pristine-source
   (let ((version linux-libre-5.15-version)
-        (hash (base32 "1zgh43pgn8fsyxzksfw6llxqw6fc8qassfn9a18k2xn83xd0kqv2")))
+        (hash (base32 "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.15)))
-- 
cgit v1.2.3


From c4a2a844340a4e2aa7d8b77d855b7f3cc08aad60 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:05:10 -0400
Subject: gnu: linux-libre 5.10: Update to 5.10.135.

* gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.135.
(linux-libre-5.10-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3fa5c70bea..20a35f4a62 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -386,7 +386,7 @@ (define-public linux-libre-5.15-pristine-source
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.15)))
 
-(define-public linux-libre-5.10-version "5.10.133")
+(define-public linux-libre-5.10-version "5.10.135")
 (define-public linux-libre-5.10-gnu-revision "gnu1")
 (define deblob-scripts-5.10
   (linux-libre-deblob-scripts
@@ -396,7 +396,7 @@ (define deblob-scripts-5.10
    (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8")))
 (define-public linux-libre-5.10-pristine-source
   (let ((version linux-libre-5.10-version)
-        (hash (base32 "03i84g3pfh24f10zsdyyqyv9fhy01ah9lk02y48hqwnabdylqp1v")))
+        (hash (base32 "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.10)))
-- 
cgit v1.2.3


From 5874779d80a4003090a2473ca9d722f6c72bf625 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:05:25 -0400
Subject: gnu: linux-libre 5.4: Update to 5.4.209.

* gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.209.
(linux-libre-5.4-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 20a35f4a62..b428a329a8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -401,7 +401,7 @@ (define-public linux-libre-5.10-pristine-source
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.10)))
 
-(define-public linux-libre-5.4-version "5.4.207")
+(define-public linux-libre-5.4-version "5.4.209")
 (define-public linux-libre-5.4-gnu-revision "gnu1")
 (define deblob-scripts-5.4
   (linux-libre-deblob-scripts
@@ -411,7 +411,7 @@ (define deblob-scripts-5.4
    (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6")))
 (define-public linux-libre-5.4-pristine-source
   (let ((version linux-libre-5.4-version)
-        (hash (base32 "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v")))
+        (hash (base32 "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf")))
    (make-linux-libre-source version
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.4)))
-- 
cgit v1.2.3


From f0866ba4de46e7bce2a21bff4e4ae6b0dba7e2c4 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:05:42 -0400
Subject: gnu: linux-libre 4.19: Update to 4.19.254.

* gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.254.
(linux-libre-4.19-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b428a329a8..f6d31639f7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -416,7 +416,7 @@ (define-public linux-libre-5.4-pristine-source
                             (%upstream-linux-source version hash)
                             deblob-scripts-5.4)))
 
-(define-public linux-libre-4.19-version "4.19.253")
+(define-public linux-libre-4.19-version "4.19.254")
 (define-public linux-libre-4.19-gnu-revision "gnu1")
 (define deblob-scripts-4.19
   (linux-libre-deblob-scripts
@@ -426,7 +426,7 @@ (define deblob-scripts-4.19
    (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
 (define-public linux-libre-4.19-pristine-source
   (let ((version linux-libre-4.19-version)
-        (hash (base32 "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz")))
+        (hash (base32 "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
-- 
cgit v1.2.3


From 168e58fb41d1ff71eb3c83c85591d5dc4e01bc3e Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Wed, 3 Aug 2022 16:06:01 -0400
Subject: gnu: linux-libre 4.14: Update to 4.14.290.

* gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.290.
(linux-libre-4.14-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f6d31639f7..cc5a4e1cfb 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -431,7 +431,7 @@ (define-public linux-libre-4.19-pristine-source
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.19)))
 
-(define-public linux-libre-4.14-version "4.14.289")
+(define-public linux-libre-4.14-version "4.14.290")
 (define-public linux-libre-4.14-gnu-revision "gnu1")
 (define deblob-scripts-4.14
   (linux-libre-deblob-scripts
@@ -441,7 +441,7 @@ (define deblob-scripts-4.14
    (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im")))
 (define-public linux-libre-4.14-pristine-source
   (let ((version linux-libre-4.14-version)
-        (hash (base32 "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6")))
+        (hash (base32 "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
-- 
cgit v1.2.3


From 6048c05592e0aabb55bcd081100f9d75b7736890 Mon Sep 17 00:00:00 2001
From: Leo Famulari 
Date: Thu, 4 Aug 2022 13:13:58 -0400
Subject: gnu: linux-libre 4.9: Update to 4.9.325.

* gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.325.
(linux-libre-4.9-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cc5a4e1cfb..b33fc244b2 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -446,7 +446,7 @@ (define-public linux-libre-4.14-pristine-source
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.14)))
 
-(define-public linux-libre-4.9-version "4.9.324")
+(define-public linux-libre-4.9-version "4.9.325")
 (define-public linux-libre-4.9-gnu-revision "gnu1")
 (define deblob-scripts-4.9
   (linux-libre-deblob-scripts
@@ -456,7 +456,7 @@ (define deblob-scripts-4.9
    (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h")))
 (define-public linux-libre-4.9-pristine-source
   (let ((version linux-libre-4.9-version)
-        (hash (base32 "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4")))
+        (hash (base32 "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl")))
     (make-linux-libre-source version
                              (%upstream-linux-source version hash)
                              deblob-scripts-4.9)))
-- 
cgit v1.2.3


From e9f10f1d3bee7b8d7111456f372d909544f67690 Mon Sep 17 00:00:00 2001
From: Zhu Zihao 
Date: Wed, 20 Jul 2022 12:08:17 +0800
Subject: gnu: emacs-next: Enable SQLite3 support.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[[PGP Signed Part:No public key for 66397F84F76693F9 created at 2022-07-20T06:08:56+0200 using EDDSA]]

[[End of PGP Signed Part]]
>From 068de10c98b5d29adb13963222a1ca21ef7b0a76 Mon Sep 17 00:00:00 2001
From: Zhu Zihao 
Date: Wed, 20 Jul 2022 12:07:09 +0800
Subject: [PATCH] gnu: emacs-next: Enable SQLite3 support.

* gnu/packages/emacs.scm (emacs-next)[inputs]: Add sqlite.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs.scm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 0de4b7a5d5..ffd1eda08e 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Amin Bandali 
 ;;; Copyright © 2020 Jack Hill 
 ;;; Copyright © 2020 Morgan Smith 
+;;; Copyright © 2022 Zhu Zihao 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -69,6 +70,7 @@ (define-module (gnu packages emacs)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages selinux)
+  #:use-module (gnu packages sqlite)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)       ; for jansson
@@ -340,6 +342,9 @@ (define-public emacs-next
          (sha256
           (base32
            "0dqmrawkvbypxp8gcnspnhhmfamzp3l62gfgp1pw2l6svz58v991"))))
+      (inputs
+       (modify-inputs (package-inputs emacs)
+         (prepend sqlite)))
       (native-inputs
        (modify-inputs (package-native-inputs emacs)
          (prepend autoconf))))))
-- 
cgit v1.2.3


From b7bbb77c9dd71fe805752c885a7191e5af31e4ec Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Thu, 4 Aug 2022 23:56:11 +0200
Subject: gnu: lightdm: Add bash-minimal as an input.

Suggested by 'guix lint'.

* gnu/packages/display-managers.scm (lightdm)[inputs]: Add
BASH-MINIMAL.  Replace COREUTILS by COREUTILS-MINIMAL.
---
 gnu/packages/display-managers.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 1b837bc4de..6c1c5b6c25 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Joshua Grant 
-;;; Copyright © 2014, 2018 Ludovic Courtès 
+;;; Copyright © 2014, 2018, 2022 Ludovic Courtès 
 ;;; Copyright © 2014 Andreas Enge 
 ;;; Copyright © 2017 Ricardo Wurmus 
 ;;; Copyright © 2017 Sou Bunnbu 
@@ -301,7 +301,8 @@ (define-public lightdm
              (unsetenv "LC_ALL"))))))
     (inputs
      (list audit
-           coreutils                    ;for cross-compilation
+           bash-minimal                           ;for cross-compilation
+           coreutils-minimal                      ;ditto
            linux-pam
            shadow                       ;for sbin/nologin
            libgcrypt
-- 
cgit v1.2.3


From e2397e66e6d6f0d67152b87b7ec8debee3687c53 Mon Sep 17 00:00:00 2001
From: Petr Hodina 
Date: Wed, 20 Jul 2022 10:28:30 +0200
Subject: gnu: Add lkrg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/linux.scm (lkrg): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/linux.scm | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b33fc244b2..aeb03020ce 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -60,7 +60,7 @@
 ;;; Copyright © 2021 Josselin Poiret 
 ;;; Copyright © 2021 Olivier Dion 
 ;;; Copyright © 2021 Solene Rapenne 
-;;; Copyright © 2021 Petr Hodina 
+;;; Copyright © 2021, 2022 Petr Hodina 
 ;;; Copyright © 2022 Artyom V. Poptsov 
 ;;; Copyright © 2022 Rene Saavedra 
 
@@ -1342,6 +1342,37 @@ (define-public librem-ec-acpi-linux-module
 and the notification, WiFi, and Bluetooth LED.")
     (license license:gpl2)))
 
+(define-public lkrg
+  (package
+    (name "lkrg")
+    (version "0.9.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/lkrg-org/lkrg")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0yirb7n4mqv8cn0gziz1m7ymq00dhhy79j59jdgrx00b8rj57cfw"))))
+    (build-system linux-module-build-system)
+    (arguments
+     (list #:linux linux-libre
+           #:tests? #f
+           #:make-flags #~(list (string-append "CC="
+                                               #$(cc-for-target))
+                                (string-append "SYSSRC="
+                                               (assoc-ref %build-inputs
+                                                "linux-module-builder")
+                                               "/lib/modules/build"))))
+    (inputs (list bash-minimal))
+    (home-page "https://lkrg.org/")
+    (synopsis "Linux Kernel Runtime Guard")
+    (description
+     "This package performs runtime integrity checking of the Linux kernel and
+detection of security vulnerability exploits against the kernel.")
+    (license license:gpl2)))
+
 (define-public rtl8821ce-linux-module
   (let ((commit "be733dc86781c68571650b395dd0fa6b53c0a039")
         (revision "6"))
-- 
cgit v1.2.3


From 334e953c93f470d6b289fb259e9b7bea3638e36a Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Sat, 9 Jul 2022 23:39:16 +0200
Subject: gnu: openssl: Cross-compile to mingw.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tls.scm (target->openssl-target): Add cases for mingw and
mingw64.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tls.scm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 697d9d1d36..a310899b27 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -378,6 +378,12 @@ (define (target->openssl-target target)
   ;; without causing rebuilds for other targets.
   (cond ((string-prefix? "i586" target)
          "hurd-x86")
+        ((string-suffix? "mingw32" target)
+         (string-append
+          "mingw"
+          (if (string-prefix? "x86_64" target)
+              "64"
+              "")))
         ((string-prefix? "i686" target)
          "linux-x86")
         ((string-prefix? "x86_64" target)
-- 
cgit v1.2.3


From a5a88b0248f3ca70db30605c0c2aa93bb360d8ad Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Tue, 19 Jul 2022 20:09:14 +0200
Subject: gnu: openssl: Use 'target-*' predicates from (guix utils).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tls.scm (target->openssl-target): Rewrite in terms of the
'target-*' predicates.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tls.scm | 65 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a310899b27..1e527ecce2 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -376,33 +376,44 @@ (define (target->openssl-target target)
   ;; Keep this code outside the build code,
   ;; such that new targets can be added
   ;; without causing rebuilds for other targets.
-  (cond ((string-prefix? "i586" target)
-         "hurd-x86")
-        ((string-suffix? "mingw32" target)
-         (string-append
-          "mingw"
-          (if (string-prefix? "x86_64" target)
-              "64"
-              "")))
-        ((string-prefix? "i686" target)
-         "linux-x86")
-        ((string-prefix? "x86_64" target)
-         "linux-x86_64")
-        ((string-prefix? "mips64el" target)
-         "linux-mips64")
-        ((string-prefix? "arm" target)
-         "linux-armv4")
-        ((string-prefix? "aarch64" target)
-         "linux-aarch64")
-        ((string-prefix? "powerpc64le" target)
-         "linux-ppc64le")
-        ((string-prefix? "powerpc64" target)
-         "linux-ppc64")
-        ((string-prefix? "powerpc" target)
-         "linux-ppc")
-        ((string-prefix? "riscv64" target)
-         ;; linux64-riscv64 isn't recognized until 3.0.0.
-         "linux-generic64")))
+  (if (target-mingw? target)
+      (string-append
+       "mingw"
+       (if (target-x86-64? target)
+           "64"
+           ""))
+      (let ((kernel
+             (cond ((target-hurd? target)
+                    "hurd")
+                   ((target-linux? target)
+                    "linux")
+                   (else
+                    (error "unsupported openssl target kernel"))))
+            (arch
+             (cond
+              ((target-x86-32? target)
+               "x86")
+              ((target-x86-64? target)
+               "x86_64")
+              ((target-mips64el? target)
+               "mips64")
+              ((target-arm32? target)
+               "armv4")
+              ((target-aarch64? target)
+               "aarch64")
+              ((target-ppc64le? target)
+               "ppc64le")
+              ((target-ppc32? target)
+               "ppc")
+              ((and (target-powerpc? target)
+                    (target-64bit? target))
+               "ppc64")
+              ((target-64bit? target)
+               ;; linux64-riscv64 isn't recognized until 3.0.0.
+               "generic64")
+              (else
+               (error "unsupported openssl target architecture")))))
+        (string-append kernel "-" arch))))
 
 (define-public openssl
   (package
-- 
cgit v1.2.3


From 116c0268ffd387c88b6b47135203fb330eb422f0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 5 Aug 2022 00:20:21 +0300
Subject: gnu: grub-efi32: Fix building on aarch64-linux.

* gnu/packages/bootloaders.scm (grub-efi32)[arguments]: When building
for aarch64-linux add TARGET_CC to configure-flags.
[native-inputs]: When building for aarch64-linux add cross-gcc and
cross-binutils for arm-linux-gnueabihf.
---
 gnu/packages/bootloaders.scm | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 71a10f54d5..d19cf55bc4 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -340,10 +340,23 @@ (define-public grub-efi32
     (synopsis "GRand Unified Boot loader (UEFI 32bit version)")
     (arguments
      `(,@(substitute-keyword-arguments (package-arguments grub-efi)
-           ((#:configure-flags flags
-             ''()) `(cons* ,(cond ((target-x86?) "--target=i386")
-                                  ((target-arm?) "--target=arm"))
-                           ,flags)))))))
+           ((#:configure-flags flags ''())
+            `(cons*
+               ,@(cond ((target-x86?) '("--target=i386"))
+                       ((target-aarch64?)
+                        (list "--target=arm"
+                              (string-append "TARGET_CC="
+                                             (cc-for-target "arm-linux-gnueabihf"))))
+                       ((target-arm?) '("--target=arm"))
+                       (else '()))
+               ,flags)))))
+    (native-inputs
+     (if (target-aarch64?)
+       (modify-inputs (package-native-inputs grub-efi)
+         (prepend
+           (cross-gcc "arm-linux-gnueabihf")
+           (cross-binutils "arm-linux-gnueabihf")))
+       (package-native-inputs grub-efi)))))
 
 ;; Because grub searches hardcoded paths it's easiest to just build grub
 ;; again to make it find both grub-pc and grub-efi.  There is a command
-- 
cgit v1.2.3


From a8d24e97dc5a893eafbd9cfa7a96b6dd7bef500c Mon Sep 17 00:00:00 2001
From: 宋文武 
Date: Fri, 5 Aug 2022 10:22:30 +0800
Subject: gnu: xfce: Replace 'gtk-xfce-engine' with 'greybird-gtk-theme'.

Suggested in .

* gnu/packages/xfce.scm (xfce)[inputs]:
Replace 'gtk-xfce-engine' with 'greybird-gtk-theme'.
---
 gnu/packages/xfce.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 19bb18923b..9d217fc8cf 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -45,6 +45,7 @@ (define-module (gnu packages xfce)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gnome-xyz)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
@@ -1087,7 +1088,10 @@ (define-public xfce
      (list exo
            garcon
            gnome-icon-theme
-           gtk-xfce-engine
+           ;; Greybird is the recommend theme since Xfce 4.14, see:
+           ;; 
+           ;; TODO: Make it default via "xfconf/xfce/perchannel-xml/xsettinsg.xml"
+           greybird-gtk-theme
            hicolor-icon-theme
            mate-polkit-for-xfce
            ristretto
-- 
cgit v1.2.3


From f182be365018be79a4ac4d98b44465e3d3bf35a2 Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Tue, 2 Aug 2022 23:37:44 -0400
Subject: gnu: ugrep: Update to 3.8.3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/search.scm (ugrep): Update to 3.8.3.

Signed-off-by: 宋文武 
---
 gnu/packages/search.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 016142c7a9..db5579a708 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -672,14 +672,14 @@ (define (purge-term-support input output)
 (define-public ugrep
   (package
     (name "ugrep")
-    (version "3.7.9")
+    (version "3.8.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/Genivia/ugrep")
                     (commit (string-append "v" version))))
               (sha256
-               (base32 "0mj4da91r81drfl2nbgzl1krka6ksk7srjjvwgp55r6l265fk3b5"))
+               (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
               (snippet
-- 
cgit v1.2.3


From 8956fba98926d16da8d7377d2f52003bae4f5b6b Mon Sep 17 00:00:00 2001
From: Antero Mejr 
Date: Sat, 28 May 2022 22:10:26 -0400
Subject: gnu: Add svkbd.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/suckless.scm (svkbd): New variable.

Signed-off-by: 宋文武 
---
 gnu/packages/suckless.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index 460e8bfc0f..dbc3537ac6 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2021 Nikolay Korotkiy 
 ;;; Copyright © 2022 Jai Vetrivelan 
 ;;; Copyright © 2022 jgart 
+;;; Copyright © 2022 Antero Mejr 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1180,3 +1181,39 @@ (define-public farbfeld
 pipe and compress.")
       (home-page "https://git.suckless.org/farbfeld/")
       (license license:isc))))
+
+(define-public svkbd
+  (package
+    (name "svkbd")
+    (version "0.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://dl.suckless.org/tools/svkbd-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0nhgmr38pk1a8zrcrxd1ygh0m843a3bdchkv8phl508x7vy63hpv"))))
+    (build-system gnu-build-system)
+    (arguments
+     (list #:tests? #f
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target))
+                   (string-append "PREFIX=" #$output))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (substitute* "config.mk"
+                     (("/usr/local") #$output)
+                     (("/usr/X11R6") #$libx11)
+                     (("/usr/include/freetype2") (string-append #$freetype
+                                                  "/include/freetype2")))))
+               (delete 'configure)))) ;no configure script
+    (native-inputs (list pkg-config))
+    (inputs (list freetype libx11 libxft libxtst libxinerama))
+    (propagated-inputs (list glibc-utf8-locales))
+    (home-page "https://tools.suckless.org/x/svkbd/")
+    (synopsis "Virtual on-screen keyboard")
+    (description "svkbd is a simple virtual keyboard, intended to be used in
+environments, where no keyboard is available.")
+    (license license:expat)))
-- 
cgit v1.2.3


From cc4c02e346a71ccef897e2d9f04fa2df2529a269 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Fri, 5 Aug 2022 08:55:44 +0200
Subject: gnu: guile-parted: Use the latest parted.

The Parted 3.5 regression discussed here: https://issues.guix.gnu.org/55549
has been fixed with 3c381af76a144a4dc3d0f9269f43ee2ec501b538.

* gnu/packages/guile-xyz.scm (guile-parted)[inputs]: Use the latest parted
package.
---
 gnu/packages/guile-xyz.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index dd28e38a20..3b74540a20 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1409,9 +1409,7 @@ (define-public guile-parted
      '(#:make-flags
        '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
     (inputs
-     ;; XXX: Use Parted 3.4 to work around issues when using 3.5 in the Guix
-     ;; System installer: .
-     (list guile-3.0 parted-3.4))
+     (list guile-3.0 parted))
     (propagated-inputs
      (list guile-bytestructures))
     (native-inputs
-- 
cgit v1.2.3


From 644646beab2f8bdaddf7736fa5e4dfc7e684bebd Mon Sep 17 00:00:00 2001
From: Felix Gruber 
Date: Tue, 2 Aug 2022 13:24:02 +0000
Subject: gnu: veusz: Fix build.

* gnu/packages/maths.scm (veusz)[arguments] Fix lookup of qtsvg path
  in wrap-executable phase.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/maths.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 789de8f500..fe93552ab9 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3118,7 +3118,7 @@ (define-public veusz
              (let ((out (assoc-ref outputs "out")))
                (wrap-program (string-append out "/bin/veusz")
                  `("QT_PLUGIN_PATH" prefix
-                   ,(list (string-append (assoc-ref inputs "qtsvg-5")
+                   ,(list (string-append (assoc-ref inputs "qtsvg")
                                          "/lib/qt5/plugins/"))))))))))
     (native-inputs
      (list pkg-config
-- 
cgit v1.2.3


From bd956bc57babc427347180fd4e5f4485990811ba Mon Sep 17 00:00:00 2001
From: Olivier Dion 
Date: Wed, 3 Aug 2022 19:44:28 -0400
Subject: gnu: Add perf-tools.

* gnu/packages/instrumentation.scm (perf-tools): New variable.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/instrumentation.scm | 58 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm
index 4e23e9bed4..f52cf11505 100644
--- a/gnu/packages/instrumentation.scm
+++ b/gnu/packages/instrumentation.scm
@@ -18,13 +18,17 @@
 
 (define-module (gnu packages instrumentation)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages commencement)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages engineering)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gawk)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages libunwind)
@@ -290,6 +294,60 @@ (define-public lttng-tools
 @code{lttng-relayd} for network streaming.")
     (license (list  license:gpl2 license:lgpl2.1))))
 
+(define-public perf-tools
+  (package
+    (name "perf-tools")
+    (version "1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/brendangregg/perf-tools")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1ab735idi0h62yvhzd7822jj3555vygixv4xjrfrdvi8d2hhz6qn"))))
+    (build-system copy-build-system)
+    (arguments
+     `(#:install-plan
+       ',(append
+          (map (cut list <> "bin/")
+               '("disk/bitesize"
+                 "fs/cachestat"
+                 "execsnoop"
+                 "kernel/funccount"
+                 "kernel/funcgraph"
+                 "kernel/funcslower"
+                 "kernel/functrace"
+                 "iolatency"
+                 "iosnoop"
+                 "killsnoop"
+                 "kernel/kprobe"
+                 "opensnoop"
+                 "misc/perf-stat-hist"
+                 "tools/reset-ftrace"
+                 "syscount"
+                 "net/tcpretrans"
+                 "system/tpoint"
+                 "user/uprobe"))
+          '(("man/man8/" "share/man/man8")))))
+    (propagated-inputs
+     (list
+      bash
+      coreutils                         ; cat + rm
+      gawk
+      gcc-toolchain                     ; objdump + ldconfig
+      file
+      perf
+      perl
+      procps                            ; sysctl
+      which))
+    (home-page "https://github.com/brendangregg/perf-tools")
+    (synopsis "Performance analysis tools")
+    (description "Perf-tools is a collection of scripts for performance
+analysis and instrumentation based on Linux perf_events (aka perf) and
+ftrace.")
+    (license (list license:gpl2))))
+
 (define-public uftrace
   (package
     (name "uftrace")
-- 
cgit v1.2.3


From e167044fad6a233196a930d943ad9b687431e8d7 Mon Sep 17 00:00:00 2001
From: Vivien Kraus 
Date: Fri, 5 Aug 2022 09:52:21 +0200
Subject: gnu: openssl: Keep .dll.a files in main output.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tls.scm (openssl) [phase move-static-libraries]: Do not move
.dll.a files to the static output when targetting mingw.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tls.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 1e527ecce2..4ee75ace3d 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -507,7 +507,13 @@ (define-public openssl
                (for-each (lambda (file)
                            (install-file file slib)
                            (delete-file file))
-                         (find-files lib "\\.a$")))))
+                         (find-files
+                          lib
+                          #$(if (target-mingw?)
+                                '(lambda (filename _)
+                                   (and (string-suffix? ".a" filename)
+                                        (not (string-suffix? ".dll.a" filename))))
+                                "\\.a$"))))))
          (add-after 'install 'move-extra-documentation
            (lambda _
              ;; Move man pages and full HTML documentation to "doc".
-- 
cgit v1.2.3


From 1a1c4e48855af1462d9c72990b1cf0fefbfa26af Mon Sep 17 00:00:00 2001
From: tiantian 
Date: Sun, 31 Jul 2022 18:17:37 +0800
Subject: gnu: gnome-shell-extension-appindicator: Update to 42.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): Update to 42.
[build-system]: Switch to meson-build-system.
[arguments]: Delete.
[native-inputs]: New field.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/gnome-xyz.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 1cf4793ba7..c37ae27cc5 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -305,7 +305,7 @@ (define-public gnome-plots
 (define-public gnome-shell-extension-appindicator
   (package
     (name "gnome-shell-extension-appindicator")
-    (version "33")
+    (version "42")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -314,13 +314,11 @@ (define-public gnome-shell-extension-appindicator
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "0qm77s080nbf4gqnfzpwp8a7jf7lliz6fxbsd3lasvrr11pgsk87"))
+                "1lf3aqb924nzhj87rhy2zvm5pcfqcklhfw21m6ic3i7wzd9r7cnc"))
               (file-name (git-file-name name version))))
-    (build-system copy-build-system)
-    (arguments
-     `(#:install-plan
-       '(("." ,(string-append "share/gnome-shell/extensions/"
-                              "appindicatorsupport@rgcjonas.gmail.com")))))
+    (build-system meson-build-system)
+    (native-inputs (list jq gnu-gettext
+                         `(,glib "bin")))
     (synopsis "Adds KStatusNotifierItem support to GNOME Shell")
     (description "This extension integrates Ubuntu AppIndicators
 and KStatusNotifierItems (KDE's successor of the systray) into
-- 
cgit v1.2.3


From 7279801cff2c7f8a904086850a6ea835df89eb36 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:43 -0400
Subject: gnu: Add texlive-abstract.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-abstract): New variable.

Co-authored-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index fe90d15124..2cd6311b2d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2021 Thiago Jung Bauermann 
 ;;; Copyright © 2022 Jack Hill 
 ;;; Copyright © 2022 Fabio Natali 
+;;; Copyright © 2022 Philip McGrath 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -11289,3 +11290,40 @@ (define-public texlive-everyshi
 @code{everyshi} will automatically fall back to its old implementation by
 loading @code{everyshi-2001-05-15}.")
     (license license:lppl1.3c)))
+
+(define-public texlive-abstract
+  (let ((template (simple-texlive-package
+                   "texlive-abstract"
+                   '("doc/latex/abstract/"
+                     "source/latex/abstract/"
+                     "tex/latex/abstract/")
+                   (base32
+                    "1axm78qgrpml09pkh252g1hsjx9c2w7mbdrm9rdl4yqh5ppwq4y9"))))
+    (package
+      (inherit template)
+      (arguments
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:tex-directory _ #f)
+          "latex/abstract")
+         ((#:build-targets _ #t)
+          #~(list "abstract.ins"))
+         ((#:phases std-phases)
+          #~(modify-phases #$std-phases
+              (add-after 'unpack 'chdir
+                (lambda args
+                  (chdir "source/latex/abstract")))
+              (add-before 'copy-files 'unchdir
+                (lambda args
+                  (chdir "../../..")))
+              (add-after 'copy-files 'remove-extra-files
+                (lambda args
+                  (delete-file-recursively
+                   (string-append #$output
+                                  "/share/texmf-dist"
+                                  "/source/latex/abstract/build"))))))))
+      (home-page "https://ctan.org/pkg/abstract")
+      (synopsis "Control the typesetting of the abstract environment")
+      (description "The abstract package gives you control over the typesetting
+of the abstract environment, and in particular provides for a one column
+abstract in a two column paper.")
+      (license license:lppl))))
-- 
cgit v1.2.3


From 26410b475923f7280203c0f74dcc0b6390de7b60 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:44 -0400
Subject: gnu: Add texlive-breqn.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-breqn): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 2cd6311b2d..1f3184838b 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11327,3 +11327,44 @@ (define-public texlive-abstract
 of the abstract environment, and in particular provides for a one column
 abstract in a two column paper.")
       (license license:lppl))))
+
+(define-public texlive-breqn
+  (let ((template (simple-texlive-package
+                   "texlive-breqn"
+                   '("/doc/latex/breqn/"
+                     "/source/latex/breqn/")
+                   (base32
+                    "186cypxiyf30fq6dxvvlbwn5yx7c8d4cd243wvvb3243n5l4rpl3"))))
+    (package
+      (inherit template)
+      (arguments
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:tex-directory _ #f)
+          "latex/breqn")
+         ((#:build-targets _ #t)
+          #~(list "breqnbundle.ins"))
+         ((#:phases std-phases)
+          #~(modify-phases #$std-phases
+              (add-after 'unpack 'chdir
+                (lambda args
+                  (chdir "source/latex/breqn")))
+              (add-before 'copy-files 'unchdir
+                (lambda args
+                  (chdir "../../..")))
+              (add-after 'copy-files 'remove-extra-files
+                (lambda args
+                  (delete-file-recursively
+                   (string-append #$output
+                                  "/share/texmf-dist"
+                                  "/source/latex/breqn/build"))))))))
+      (home-page "https://wspr.io/breqn/")
+      (synopsis "Automatic line breaking of displayed equations")
+      (description "This package provides solutions to a number of common
+difficulties in writing displayed equations and getting high-quality output.
+The single most ambitious goal of the package is to support automatic
+linebreaking of displayed equations.  Such linebreaking cannot be done without
+substantial changes under the hood in the way formulae are processed; the code
+must be watched carefully, keeping an eye on possible glitches.  The bundle
+also contains the @code{flexisym} and @code{mathstyle} packages, which are
+both designated as support for @code{breqn}.")
+      (license license:lppl1.3+))))
-- 
cgit v1.2.3


From 0ae0bb9c4961898965cafeaf23c24df5a836cfee Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:45 -0400
Subject: gnu: Add texlive-comment.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-comment): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 1f3184838b..ca637fd925 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11368,3 +11368,19 @@ (define-public texlive-breqn
 also contains the @code{flexisym} and @code{mathstyle} packages, which are
 both designated as support for @code{breqn}.")
       (license license:lppl1.3+))))
+
+(define-public texlive-comment
+  (package
+    (inherit (simple-texlive-package
+              "texlive-comment"
+              '("/doc/latex/comment/"
+                "/tex/latex/comment/")
+              (base32
+               "1c1mqziwxyf1bqzpw6ji65n7ypygm3lyknblxmf0c70w0ivw76pa")
+              #:trivial? #t))
+    (home-page "https://ctan.org/pkg/comment")
+    (synopsis "Selectively include/exclude portions of text")
+    (description "This package provides environments for selectively including
+or excluding pieces of text, allowing the user to define new, separately
+controlled comment versions.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 54ec9c14154c06569bb70d6e23dfd4c01ada6d55 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:46 -0400
Subject: gnu: Add texlive-datatool.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-datatool): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index ca637fd925..4697205fe9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11384,3 +11384,42 @@ (define-public texlive-comment
 or excluding pieces of text, allowing the user to define new, separately
 controlled comment versions.")
     (license license:gpl2+)))
+
+(define-public texlive-datatool
+  (let ((template (simple-texlive-package
+                   "texlive-datatool"
+                   '("/bibtex/bst/datatool/"
+                     "/doc/latex/datatool/"
+                     "/source/latex/datatool/")
+                   (base32
+                    "0hh2623zlwgq8zb2lv4d8yfaqwzrz54dqhc1xk0jd1k4fp281kl5"))))
+    (package
+      (inherit template)
+      (arguments
+       (substitute-keyword-arguments (package-arguments template)
+         ((#:tex-directory _ #f)
+          "latex/datatool")
+         ((#:build-targets _ #t)
+          #~(list "datatool.ins"))
+         ((#:phases std-phases)
+          #~(modify-phases #$std-phases
+              (add-after 'unpack 'chdir
+                (lambda args
+                  (chdir "source/latex/datatool")))
+              (add-before 'copy-files 'unchdir
+                (lambda args
+                  (chdir "../../..")))
+              (add-after 'copy-files 'remove-extra-files
+                (lambda args
+                  (delete-file-recursively
+                   (string-append #$output
+                                  "/share/texmf-dist"
+                                  "/source/latex/datatool/build"))))))))
+      (home-page "https://ctan.org/pkg/datatool")
+      (synopsis "Tools to load and manipulate data")
+      (description "This package provides tools to create databases using LaTeX
+commands or by importing external files.  Databases may be sorted, filtered,
+and visualized using several kinds of configurable plots.  Particular support
+is provided for mail merging, indexing, creating glossaries, manipulating
+bibliographies, and displaying personal pronouns.")
+      (license license:lppl1.3+))))
-- 
cgit v1.2.3


From 46148a36c976d224587b1725e4ef8e3acb9aead4 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:47 -0400
Subject: gnu: Add texlive-physics.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-physics): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4697205fe9..7a68705f7c 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11423,3 +11423,19 @@ (define-public texlive-datatool
 is provided for mail merging, indexing, creating glossaries, manipulating
 bibliographies, and displaying personal pronouns.")
       (license license:lppl1.3+))))
+
+(define-public texlive-physics
+  (package
+    (inherit (simple-texlive-package
+              "texlive-physics"
+              '("/doc/latex/physics/"
+                "/tex/latex/physics/")
+              (base32
+               "1wy58wwcv1pv18xs1n71abnm73dqnxqijxvhfxk0rcmvbc6wvwrb")
+              #:trivial? #t))
+    (home-page "https://ctan.org/pkg/physics")
+    (synopsis "Macros supporting the Mathematics of Physics")
+    (description "The package defines simple and flexible macros for
+typesetting equations in the languages of vector calculus and linear
+algebra, using Dirac notation.")
+    (license license:lppl)))
-- 
cgit v1.2.3


From f7fed0d994439a8a187c8bd0f3814fd82c49f492 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:48 -0400
Subject: gnu: Add texlive-sourcesanspro.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-sourcesanspro): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7a68705f7c..7afb76a763 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11439,3 +11439,31 @@ (define-public texlive-physics
 typesetting equations in the languages of vector calculus and linear
 algebra, using Dirac notation.")
     (license license:lppl)))
+
+(define-public texlive-sourcesanspro
+  (package
+    (inherit (simple-texlive-package
+              "texlive-sourcesanspro"
+              '("/doc/latex/sourcesanspro/"
+                "/fonts/enc/dvips/sourcesanspro/"
+                "/fonts/map/dvips/sourcesanspro/"
+                "/fonts/opentype/adobe/sourcesanspro/"
+                ;; ^ It would be tempting to use our
+                ;; font-adobe-source-sans-pro for these, but the version in
+                ;; texlive could differ from our version: probably the
+                ;; difference would be small, but debugging would not be fun.
+                ;; If the files are really identical, Guix will hard-link them
+                ;; anyway.
+                "/fonts/tfm/adobe/sourcesanspro/"
+                "/fonts/type1/adobe/sourcesanspro/"
+                "/fonts/vf/adobe/sourcesanspro/"
+                "/tex/latex/sourcesanspro/")
+              (base32
+               "18z7ln8dyh0sp6v0vdvc6qqxnpg3h3ix0f5magjcjbpay54kl0i3")
+              #:trivial? #t))
+    (home-page "https://ctan.org/pkg/sourcesanspro")
+    (synopsis "Use Source Sans Pro with TeX(-alike) systems")
+    (description "This package provides the Source Sans Pro font family from
+Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
+use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
+    (license (list license:lppl1.3+ license:silofl1.1))))
-- 
cgit v1.2.3


From f6f7bb51c9309e3748f04cfd7ba26cb22c101d9d Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:49 -0400
Subject: gnu: Add texlive-sourceserifpro.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-sourceserifpro): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 7afb76a763..d775c43a11 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11467,3 +11467,26 @@ (define-public texlive-sourcesanspro
 Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
 use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
     (license (list license:lppl1.3+ license:silofl1.1))))
+
+(define-public texlive-sourceserifpro
+  (package
+    (inherit (simple-texlive-package
+              "texlive-sourceserifpro"
+              '("/doc/latex/sourceserifpro/"
+                "/fonts/enc/dvips/sourceserifpro/"
+                "/fonts/map/dvips/sourceserifpro/"
+                "/fonts/opentype/adobe/sourceserifpro/"
+                ;; ^ see comment on texlive-sourcesanspro
+                "/fonts/tfm/adobe/sourceserifpro/"
+                "/fonts/type1/adobe/sourceserifpro/"
+                "/fonts/vf/adobe/sourceserifpro/"
+                "/tex/latex/sourceserifpro/")
+              (base32
+               "18xxncg8ybv86r46zq5mvgkrfnvlhx93n55fy8nkk8vdmminrh8w")
+              #:trivial? #t))
+    (home-page "https://ctan.org/pkg/sourceserifpro")
+    (synopsis "Use Source Serif Pro with TeX(-alike) systems")
+    (description "This package provides the Source Serif Pro font family from
+Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
+use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
+    (license (list license:lppl1.3+ license:silofl1.1))))
-- 
cgit v1.2.3


From 81faecf77ccc3f35f86ead3422bfcae467d93a95 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Sat, 30 Jul 2022 21:08:50 -0400
Subject: gnu: Add texlive-sourcecodepro.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/tex.scm (texlive-sourcecodepro): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/tex.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index d775c43a11..67c07afff9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -11490,3 +11490,26 @@ (define-public texlive-sourceserifpro
 Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
 use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
     (license (list license:lppl1.3+ license:silofl1.1))))
+
+(define-public texlive-sourcecodepro
+  (package
+    (inherit (simple-texlive-package
+              "texlive-sourcecodepro"
+              '("/doc/latex/sourcecodepro/"
+                "/fonts/enc/dvips/sourcecodepro/"
+                "/fonts/map/dvips/sourcecodepro/"
+                "/fonts/opentype/adobe/sourcecodepro/"
+                ;; ^ see comment on texlive-sourcesanspro
+                "/fonts/tfm/adobe/sourcecodepro/"
+                "/fonts/type1/adobe/sourcecodepro/"
+                "/fonts/vf/adobe/sourcecodepro/"
+                "/tex/latex/sourcecodepro/")
+              (base32
+               "009v9y7d3vsljgq9nw5yx4kzyqavxbwrlvwhfjj83s6rmb9xcrmh")
+              #:trivial? #t))
+    (home-page "https://ctan.org/pkg/sourcecodepro")
+    (synopsis "Use Source Code Pro with TeX(-alike) systems")
+    (description "This package provides the Source Code Pro font family from
+Adobe in both Adobe Type 1 and OpenType formats, plus macros supporting the
+use of the fonts in LaTeX (Type 1) and XeLaTeX/LuaLaTeX (OTF).")
+    (license (list license:lppl1.3+ license:silofl1.1))))
-- 
cgit v1.2.3


From b70d6ce6273a377963f706454640d88edbbd4208 Mon Sep 17 00:00:00 2001
From: FELŠÖCI Marek 
Date: Thu, 4 Aug 2022 19:08:39 +0200
Subject: gnu: mumps: Update to 5.5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/maths.scm (mumps): Update to 5.5.1. Stop applying patches as the build configuration has been updated upstream. Allow for further optimized BLR compression by specifying the -DBLR_MT build option.
* gnu/packages/patches/mumps-build-parallelism.patch: File removed.
* gnu/packages/patches/mumps-shared-libseq.patch: File removed.
* gnu/packages/patches/mumps-shared-mumps.patch: File removed.
* gnu/packages/patches/mumps-shared-pord.patch: File removed.

Signed-off-by: Ludovic Courtès 
---
 gnu/local.mk                                       |   4 -
 gnu/packages/maths.scm                             | 131 +++++++++++----------
 gnu/packages/patches/mumps-build-parallelism.patch |  13 --
 gnu/packages/patches/mumps-shared-libseq.patch     |  42 -------
 gnu/packages/patches/mumps-shared-mumps.patch      |  63 ----------
 gnu/packages/patches/mumps-shared-pord.patch       |  77 ------------
 6 files changed, 72 insertions(+), 258 deletions(-)
 delete mode 100644 gnu/packages/patches/mumps-build-parallelism.patch
 delete mode 100644 gnu/packages/patches/mumps-shared-libseq.patch
 delete mode 100644 gnu/packages/patches/mumps-shared-mumps.patch
 delete mode 100644 gnu/packages/patches/mumps-shared-pord.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index 0e8b7b0447..88100416d5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1525,10 +1525,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mosaicatcher-unbundle-htslib.patch	\
   %D%/packages/patches/mrrescue-support-love-11.patch		\
   %D%/packages/patches/mtools-mformat-uninitialized.patch	\
-  %D%/packages/patches/mumps-build-parallelism.patch		\
-  %D%/packages/patches/mumps-shared-libseq.patch		\
-  %D%/packages/patches/mumps-shared-mumps.patch			\
-  %D%/packages/patches/mumps-shared-pord.patch			\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
   %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \
   %D%/packages/patches/musl-cross-locale.patch			\
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index fe93552ab9..963fc8fa6a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -53,6 +53,7 @@
 ;;; Copyright © 2022 Zhu Zihao 
 ;;; Copyright © 2022 Sharlatan Hellseher 
 ;;; Copyright © 2022 Philip McGrath 
+;;; Copyright © 2022 Marek Felšöci 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3735,7 +3736,7 @@ (define-public minizinc
 (define-public mumps
   (package
     (name "mumps")
-    (version "5.2.1")
+    (version "5.5.1")
     (source
      (origin
        (method url-fetch)
@@ -3743,11 +3744,7 @@ (define-public mumps
                            version ".tar.gz"))
        (sha256
         (base32
-         "0jklh54x4y3ik1zkw6db7766kakjm5910diyaghfxxf8vwsgr26r"))
-       (patches (search-patches "mumps-build-parallelism.patch"
-                                "mumps-shared-libseq.patch"
-                                "mumps-shared-mumps.patch"
-                                "mumps-shared-pord.patch"))))
+         "05gs2i8b76m9flm1826fxpyfnwibjjawbmfza3ylrvj7zaag5gqs"))))
     (build-system gnu-build-system)
     (inputs
      (list gfortran
@@ -3764,58 +3761,71 @@ (define-public mumps
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
-          (lambda* (#:key inputs #:allow-other-keys)
+          (lambda* (#:key inputs outputs #:allow-other-keys)
             (call-with-output-file "Makefile.inc"
               (lambda (port)
                 (format port "
-PLAT         =
-LIBEXT       = .a
-OUTC         = -o
-OUTF         = -o
-RM           = rm -f~:[
-CC           = gcc
-FC           = gfortran
-FL           = gfortran
-INCSEQ       = -I$(topdir)/libseq
-LIBSEQ       = $(topdir)/libseq/libmpiseq.a
-LIBSEQNEEDED = libseqneeded~;
-CC           = mpicc
-FC           = mpifort
-FL           = mpifort~]
-AR           = ar vr # rules require trailing space, ugh...
-RANLIB       = ranlib
-BLASDIR      = ~a
-LIBBLAS      = -Wl,-rpath=$(BLASDIR) -Wl,-rpath='$$ORIGIN' -L$(BLASDIR) -lopenblas~@[
-SCALAPDIR    = ~a
-SCALAP       = -Wl,-rpath=$(SCALAPDIR) -Wl,-rpath='$$ORIGIN' -L$(SCALAPDIR) -lscalapack~]
-LIBOTHERS    = -pthread
-CDEFS        = -DAdd_
-PIC          = -fPIC
-OPTF         = -O2 -DALLOW_NON_INIT -fallow-argument-mismatch $(PIC)
-OPTL         = -O2 $(PIC)
-OPTC         = -O2 $(PIC)
-INCS         = $(INCSEQ)
-LIBS         = $(SCALAP) $(LIBSEQ)
-LPORDDIR     = $(topdir)/PORD/lib
-IPORD        = -I$(topdir)/PORD/include
-LPORD        = $(LPORDDIR)/libpord.a
-ORDERINGSF   = -Dpord~@[
-METISDIR     = ~a
-IMETIS       = -I$(METISDIR)/include
-LMETIS       = -Wl,-rpath $(METISDIR)/lib -L$(METISDIR)/lib -lmetis
-ORDERINGSF  += -Dmetis~]~@[~:{
-SCOTCHDIR    = ~a
-ISCOTCH      = -I$(SCOTCHDIR)/include
-LSCOTCH      = -Wl,-rpath $(SCOTCHDIR)/lib -L$(SCOTCHDIR)/lib ~a-lesmumps -lscotch -lscotcherr
-ORDERINGSF  += ~a~}~]
-ORDERINGSC   = $(ORDERINGSF)
-LORDERINGS   = $(LPORD) $(LMETIS) $(LSCOTCH) $(LIBSEQ)
-IORDERINGSF  = $(ISCOTCH)
-IORDERINGSC  = $(IPORD) $(IMETIS) $(ISCOTCH)"
-                        (->bool (which "mpicc"))  ;MPI support enabled?
-                        (dirname
-                         (dirname (search-input-file inputs "/include/cblas.h")))
+PLAT          =
+LIBEXT        = .a
+LIBEXT_SHARED = .so
+OUTC          = -o
+OUTF          = -o
+BLASDIR       = ~a
+LIBBLAS       = -Wl,-rpath=$(BLASDIR)/lib -Wl,-rpath='$$ORIGIN'
+LIBBLAS      += -L$(BLASDIR)/lib
+LIBBLAS      += -lopenblas~@[
+SCALAPDIR     = ~a
+SCALAP        = -Wl,-rpath=$(SCALAPDIR)/lib -Wl,-rpath='$$ORIGIN'
+SCALAP       += -L$(SCALAPDIR)/lib -lscalapack~]
+RM            = rm -f~:[
+CC            = gcc
+FC            = gfortran
+FL            = gfortran
+INCSEQ        = -I$(topdir)/libseq
+LIBSEQ        = $(LAPACK) -L$(topdir)/libseq -lmpiseq
+LIBSEQNEEDED  = libseqneeded
+INCS          = $(INCSEQ)
+LIBS          = $(LIBSEQ)~;
+CC            = mpicc
+FC            = mpifort
+FL            = mpifort
+INCPAR        =
+LIBPAR        = $(SCALAP) $(LAPACK)
+LIBSEQNEEDED  = 
+INCS          = $(INCPAR)
+LIBS          = $(LIBPAR)~]
+AR            = ar vr # rules require trailing space, ugh...
+RANLIB        = ranlib
+LIBOTHERS     = -pthread
+CDEFS         = -DAdd_
+PIC           = -fPIC
+FPIC_OPT      = $(PIC)
+RPATH_OPT     = -Wl,-rpath,~a/lib
+OPTF          = -O2 -fopenmp -DALLOW_NON_INIT -DBLR_MT
+OPTF         += -fallow-argument-mismatch $(PIC)
+OPTL          = -O2 -fopenmp $(PIC)
+OPTC          = -O2 -fopenmp $(PIC)
+LPORDDIR      = $(topdir)/PORD/lib
+IPORD         = -I$(topdir)/PORD/include
+LPORD         = $(LPORDDIR)/libpord.a
+ORDERINGSF    = -Dpord~@[
+METISDIR      = ~a
+IMETIS        = -I$(METISDIR)/include
+LMETIS        = -Wl,-rpath $(METISDIR)/lib -L$(METISDIR)/lib -lmetis
+ORDERINGSF   += -Dmetis~]~@[~:{
+SCOTCHDIR     = ~a
+ISCOTCH       = -I$(SCOTCHDIR)/include
+LSCOTCH       = -Wl,-rpath $(SCOTCHDIR)/lib -L$(SCOTCHDIR)/lib ~a -lesmumps
+LSCOTCH      += -lscotch -lscotcherr
+ORDERINGSF   += ~a~}~]
+ORDERINGSC    = $(ORDERINGSF)
+LORDERINGS    = $(LPORD) $(LMETIS) $(LSCOTCH)
+IORDERINGSF   = $(ISCOTCH)
+IORDERINGSC   = $(IPORD) $(IMETIS) $(ISCOTCH)"
+                        (assoc-ref inputs "openblas")
                         (assoc-ref inputs "scalapack")
+                        (->bool (which "mpicc"))  ;; MPI support enabled?
+                        (assoc-ref outputs "out")
                         (assoc-ref inputs "metis")
                         (match (list (assoc-ref inputs "pt-scotch")
                                      (assoc-ref inputs "scotch"))
@@ -3828,11 +3838,14 @@ (define-public mumps
                               "-lesmumps -lptscotch -lptscotcherr "
                               "-Dptscotch")))))))))
          (replace 'build
-          ;; By default only the d-precision library is built.  Make with "all"
-          ;; target so that all precision libraries and examples are built.
-          (lambda _
-            (invoke "make" "all"
-                    (format #f "-j~a" (parallel-job-count)))))
+           ;; By default only the d-precision library is built. Make with "all"
+           ;; target so that all precision libraries and examples are built.
+           ;; Then, "make allshared" builts equivalent shared libraries as well.
+           (lambda _
+             (invoke "make" "all"
+                     (format #f "-j~a" (parallel-job-count)))
+             (invoke "make" "allshared"
+                     (format #f "-j~a" (parallel-job-count)))))
          (replace 'check
           ;; Run the simple test drivers, which read test input from stdin:
           ;; from the "real" input for the single- and double-precision
diff --git a/gnu/packages/patches/mumps-build-parallelism.patch b/gnu/packages/patches/mumps-build-parallelism.patch
deleted file mode 100644
index 26dd330311..0000000000
--- a/gnu/packages/patches/mumps-build-parallelism.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Building sublibraries in parallel can lead to race conditions on the libseq
-and lipord targets.
-
---- MUMPS_5.0.0/Makefile.orig	2015-06-15 10:08:54.523146562 -0500
-+++ MUMPS_5.0.0/Makefile	2015-06-15 10:19:44.074367512 -0500
-@@ -11,6 +11,7 @@
- 	sexamples dexamples cexamples zexamples \
- 	mumps_lib requiredobj libseqneeded clean
- 
-+.NOTPARALLEL:
- alllib:		c z s d
- all:		cexamples zexamples sexamples dexamples
- 
diff --git a/gnu/packages/patches/mumps-shared-libseq.patch b/gnu/packages/patches/mumps-shared-libseq.patch
deleted file mode 100644
index eccf528f7a..0000000000
--- a/gnu/packages/patches/mumps-shared-libseq.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Create a shared version of the sequential library, MUST BE LAST IN SERIES
-
-Index: mumps/libseq/Makefile
-===================================================================
---- mumps.orig/libseq/Makefile
-+++ mumps/libseq/Makefile
-@@ -8,15 +8,17 @@ all: libmpiseq
- 
- include ../Makefile.inc
- 
--libmpiseq: libmpiseq$(PLAT)$(LIBEXT)
-+libmpiseq: libmpiseq$(PLAT).a libmpiseq$(PLAT).so
- 
--libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o
--	$(AR)$@ mpi.o mpic.o elapse.o
-+libmpiseq$(PLAT).a: mpi.o mpic.o elapse.o
-+	$(AR) $@ mpi.o mpic.o elapse.o
- 	$(RANLIB) $@
-+libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o
-+	$(FC) -shared $^ -Wl,-soname,libmpiseq$(PLAT)-5.2.1.so -o libmpiseq$(PLAT)-5.2.1.so -Wl,-z,defs
- .f.o:
--	$(FC) $(OPTF)              -c $*.f $(OUTF)$*.o
-+	$(FC) $(OPTF)              -fPIC -c $*.f $(OUTF)$*.o
- .c.o:
--	$(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o
-+	$(CC) $(OPTC) $(CDEFS) -I. -fPIC -c $*.c $(OUTC)$*.o
- 
- clean:
--	$(RM) *.o *$(LIBEXT)
-+	$(RM) *.o *.a *.so
-Index: mumps/Makefile
-===================================================================
---- mumps.orig/Makefile
-+++ mumps/Makefile
-@@ -60,6 +60,7 @@ requiredobj: Makefile.inc $(LIBSEQNEEDED
- 
- libseqneeded:
- 	(cd libseq; $(MAKE))
-+	cp libseq/lib* $(libdir)
- 
- # Build the libpord.a library and copy it into $(topdir)/lib
- $(libdir)/libpord$(PLAT).a:
diff --git a/gnu/packages/patches/mumps-shared-mumps.patch b/gnu/packages/patches/mumps-shared-mumps.patch
deleted file mode 100644
index d94ccf6ce9..0000000000
--- a/gnu/packages/patches/mumps-shared-mumps.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Create a shared version of the MUMPS library.
-
-Index: mumps/src/Makefile
-===================================================================
---- mumps.orig/src/Makefile
-+++ mumps/src/Makefile
-@@ -23,8 +23,10 @@ z:
- 
- include $(topdir)/Makefile.inc
- 
--mumps_lib:    $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \
--              $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT)
-+mumps_lib:    $(libdir)/libmumps_common$(PLAT).a \
-+              $(libdir)/libmumps_common$(PLAT).so \
-+              $(libdir)/lib$(ARITH)mumps$(PLAT).a \
-+              $(libdir)/lib$(ARITH)mumps$(PLAT).so
- 
- OBJS_COMMON_MOD = \
-         lr_common.o \
-@@ -167,14 +169,22 @@ OBJS_OTHER = \
-         $(ARITH)tools.o\
-         $(ARITH)type3_root.o
- 
--$(libdir)/libmumps_common$(PLAT)$(LIBEXT):      $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
--	$(AR)$@ $?
-+$(libdir)/libmumps_common$(PLAT).a:      $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-+	$(AR) $@ $?
- 	$(RANLIB) $@
- 
--$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT):    $(OBJS_MOD) $(OBJS_OTHER)
--	$(AR)$@ $?
-+$(libdir)/libmumps_common$(PLAT).so:      $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-+	$(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.2.1.so -L$(libdir) $(LORDERINGS) -lpthread $(MPIFLIB) $(MPICLIB) $(LEXTRAS) -o $(libdir)/libmumps_common$(PLAT)-5.2.1.so -Wl,-z,defs
-+	ln -s libmumps_common$(PLAT)-5.2.1.so $@
-+
-+$(libdir)/lib$(ARITH)mumps$(PLAT).a:    $(OBJS_MOD) $(OBJS_OTHER)
-+	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(libdir)/lib$(ARITH)mumps$(PLAT).so:    $(OBJS_MOD) $(OBJS_OTHER)
-+	$(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.2.1.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MPIFLIB) $(LEXTRAS) $(LIBBLAS) $(SCALAP) $(LAPACK) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.2.1.so -Wl,-z,defs
-+	ln -s lib$(ARITH)mumps$(PLAT)-5.2.1.so $@
-+
- # Dependencies between modules:
- $(ARITH)mumps_load.o:		$(ARITH)mumps_comm_buffer.o \
- 				$(ARITH)mumps_struc_def.o \
-@@ -290,13 +300,13 @@ $(OBJS_OTHER):$(OBJS_COMMON_MOD) $(OBJS_
- 
- .SUFFIXES: .c .F .o
- .F.o:
--	$(FC) $(OPTF) $(INCS) $(IORDERINGSF) $(ORDERINGSF) -I. -I../include -c $*.F $(OUTF)$*.o
-+	$(FC) $(OPTF) $(INCS) $(IORDERINGSF) $(ORDERINGSF) -I. -I../include -fPIC -c $*.F $(OUTF)$*.o
- .c.o:
--	$(CC) $(OPTC) $(INCS) -I../include $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o
-+	$(CC) $(OPTC) $(INCS) -I../include $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -fPIC -c $*.c $(OUTC)$*.o
- 
- $(ARITH)mumps_c.o:	mumps_c.c
- 	$(CC) $(OPTC) $(INCS) $(CDEFS) -DMUMPS_ARITH=MUMPS_ARITH_$(ARITH) \
--	      $(IORDERINGSC) $(ORDERINGSC) -I../include -c mumps_c.c $(OUTC)$@
-+	      $(IORDERINGSC) $(ORDERINGSC) -I../include -fPIC -c mumps_c.c $(OUTC)$@
- 
- 
- clean:
diff --git a/gnu/packages/patches/mumps-shared-pord.patch b/gnu/packages/patches/mumps-shared-pord.patch
deleted file mode 100644
index d3915b0ad9..0000000000
--- a/gnu/packages/patches/mumps-shared-pord.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Create static and shared versions of the PORD library.
-
-Index: mumps/PORD/lib/Makefile
-===================================================================
---- mumps.orig/PORD/lib/Makefile
-+++ mumps/PORD/lib/Makefile
-@@ -9,7 +9,7 @@
- 
- INCLUDES = -I../include
- 
--COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS)
-+COPTIONS = $(INCLUDES) $(CFLAGS) $(OPTFLAGS) -fPIC
- 
- OBJS = graph.o gbipart.o gbisect.o ddcreate.o ddbisect.o nestdiss.o \
-        multisector.o gelim.o bucket.o tree.o \
-@@ -24,12 +24,16 @@ OBJS = graph.o gbipart.o gbisect.o ddcre
- .c.o:
- 	$(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
- 
--libpord$(LIBEXT):$(OBJS)
--	$(AR)$@ $(OBJS)
-+libpord$(PLAT).a:$(OBJS)
-+	$(AR) $@ $(OBJS)
- 	$(RANLIB) $@
- 
-+libpord$(PLAT).so: $(OBJS)
-+	$(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.2.1.so -o libpord$(PLAT)-5.2.1.so -Wl,-z,defs
-+	ln -s libpord$(PLAT)-5.2.1.so $@
-+
- clean:
- 	rm -f *.o
- 
- realclean:
--	rm -f *.o libpord.a
-+	rm -f *.o libpord*.a *.so
-Index: mumps/Makefile
-===================================================================
---- mumps.orig/Makefile
-+++ mumps/Makefile
-@@ -54,7 +54,7 @@ dexamples:	d
- multi_example:	s d c z
- 	(cd examples ; $(MAKE) multi)
- 
--requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT)
-+requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT).a $(libdir)/libpord$(PLAT).so
- 
- # dummy MPI library (sequential version)
- 
-@@ -62,19 +62,25 @@ libseqneeded:
- 	(cd libseq; $(MAKE))
- 
- # Build the libpord.a library and copy it into $(topdir)/lib
--$(libdir)/libpord$(PLAT)$(LIBEXT):
-+$(libdir)/libpord$(PLAT).a:
- 	if [ "$(LPORDDIR)" != "" ] ; then \
- 	  cd $(LPORDDIR); \
- 	  $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC="$(OUTC)" LIBEXT=$(LIBEXT); \
- 	fi;
- 	if [ "$(LPORDDIR)" != "" ] ; then \
--	  cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
-+	  cp $(LPORDDIR)/libpord$(PLAT).a $@; \
- 	fi;
- 
-+$(libdir)/libpord$(PLAT).so:
-+	if [ "$(LPORDDIR)" != "" ] ; then \
-+	cd $(LPORDDIR); make CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" ARFUNCT= RANLIB="$(RANLIB)" libpord$(PLAT).so; fi;
-+	if [ "$(LPORDDIR)" != "" ] ; then \
-+	cp -a $(LPORDDIR)/libpord*.so lib/; fi;
-+
- clean:
- 	(cd src; $(MAKE) clean)
- 	(cd examples; $(MAKE) clean)
--	(cd $(libdir); $(RM) *$(PLAT)$(LIBEXT))
-+	(cd $(libdir); $(RM) *$(PLAT).a *$(PLAT).so)
- 	(cd libseq; $(MAKE) clean)
- 	if [ "$(LPORDDIR)" != "" ] ; then \
- 	  cd $(LPORDDIR); $(MAKE) realclean; \
-- 
cgit v1.2.3


From 12087b1b19e6d6e746304447669dfe5b66090012 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 5 Aug 2022 14:55:52 +0200
Subject: gnu: mumps: Add alternate source code URL.

* gnu/packages/maths.scm (mumps)[source]: Add alternate URL.
---
 gnu/packages/maths.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 963fc8fa6a..c10794a089 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3740,8 +3740,11 @@ (define-public mumps
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "http://mumps.enseeiht.fr/MUMPS_"
-                           version ".tar.gz"))
+       (uri (list (string-append "http://mumps.enseeiht.fr/MUMPS_"
+                                 version ".tar.gz")
+                  (string-append
+                   "https://ftp.mcs.anl.gov/pub/petsc/externalpackages"
+                   "/MUMPS_" version ".tar.gz")))
        (sha256
         (base32
          "05gs2i8b76m9flm1826fxpyfnwibjjawbmfza3ylrvj7zaag5gqs"))))
-- 
cgit v1.2.3


From 45ace7bc94a768264b0c59635105cdc1004a17fe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 5 Aug 2022 15:30:00 +0200
Subject: gnu: Add r-poorman.

* gnu/packages/cran.scm (r-poorman): New variable.
---
 gnu/packages/cran.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 094dd4e449..d7491e28ea 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1448,6 +1448,26 @@ (define-public r-polychrome
 colleagues (2019) @url{https://doi:10.18637/jss.v090.c01}.")
     (license license:asl2.0)))
 
+(define-public r-poorman
+  (package
+    (name "r-poorman")
+    (version "0.2.5")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "poorman" version))
+              (sha256
+               (base32
+                "05h7rjgri0b5a1jd0388p7lqvvg0y8z6g42f9bxc80jg1z730axr"))))
+    (properties `((upstream-name . "poorman")))
+    (build-system r-build-system)
+    (native-inputs (list r-knitr))
+    (home-page "https://nathaneastwood.github.io/poorman/")
+    (synopsis "Dependency-free recreation of dplyr")
+    (description
+     "This package provides a replication of key functionality from
+@code{dplyr} and the wider @code{tidyverse} using only @code{base}.")
+    (license license:expat)))
+
 (define-public r-ecp
   (package
     (name "r-ecp")
-- 
cgit v1.2.3


From 62e1e3c16ebc4fbc18179adc56fcdb674c720291 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 5 Aug 2022 15:30:11 +0200
Subject: gnu: Add r-philentropy.

* gnu/packages/cran.scm (r-philentropy): New variable.
---
 gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d7491e28ea..fc793e3c92 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1376,6 +1376,34 @@ (define-public r-pheatmap
 control over dimensions and appearance.")
     (license license:gpl2+)))
 
+(define-public r-philentropy
+  (package
+    (name "r-philentropy")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "philentropy" version))
+              (sha256
+               (base32
+                "1dpf4hfflp4mcql4na46wzcq1flabkipiwyycz9wj5xbxlmcz2hk"))))
+    (properties `((upstream-name . "philentropy")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-kernsmooth r-poorman r-rcpp))
+    (native-inputs (list r-knitr))
+    (home-page "https://github.com/drostlab/philentropy")
+    (synopsis
+     "Similarity and distance quantification between probability functions")
+    (description
+     "This package computes optimized distance and similarity measures for
+comparing probability functions (Drost (2018) ).
+These comparisons between probability functions have their foundations in a
+broad range of scientific disciplines from mathematics to ecology.  The aim of
+this package is to provide a core framework for clustering, classification,
+statistical inference, goodness-of-fit, non-parametric statistics, information
+theory, and machine learning tasks that are based on comparing univariate or
+multivariate probability functions.")
+    (license license:gpl2)))
+
 (define-public r-pnwcolors
   (package
     (name "r-pnwcolors")
-- 
cgit v1.2.3


From 3b75131be6cddf2a52130489483e86c99faea842 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Fri, 5 Aug 2022 15:30:21 +0200
Subject: gnu: Add r-biomartr.

* gnu/packages/bioconductor.scm (r-biomartr): New variable.
---
 gnu/packages/bioconductor.scm | 47 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index d2a296ff66..fd9ff0c678 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -3417,6 +3417,53 @@ (define-public r-biomart
 powerful online queries from gene annotation to database mining.")
     (license license:artistic2.0)))
 
+;; This is a CRAN package, but it depends on a Bioconductor package:
+;; r-biomart
+(define-public r-biomartr
+  (package
+    (name "r-biomartr")
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "biomartr" version))
+              (sha256
+               (base32
+                "0hr7wks88lbfcqzjzm4x265dk4lpmc3i2ndp7xcrx8ssj76wrmkz"))))
+    (properties `((upstream-name . "biomartr")))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-biomart
+           r-biostrings
+           r-curl
+           r-data-table
+           r-downloader
+           r-dplyr
+           r-fs
+           r-httr
+           r-jsonlite
+           r-philentropy
+           r-purrr
+           r-r-utils
+           r-rcurl
+           r-readr
+           r-stringr
+           r-tibble
+           r-withr
+           r-xml))
+    (native-inputs (list r-knitr))
+    (home-page "https://docs.ropensci.org/biomartr/")
+    (synopsis "Genomic data retrieval")
+    (description
+     "Perform large scale genomic data retrieval and functional annotation
+retrieval.  This package aims to provide users with a standardized way to
+automate genome, proteome, RNA, coding sequence (CDS), GFF, and metagenome
+retrieval from NCBI RefSeq, NCBI Genbank, ENSEMBL, and UniProt databases.
+Furthermore, an interface to the BioMart database allows users to retrieve
+functional annotation for genomic loci.  In addition, users can download
+entire databases such as NCBI RefSeq, NCBI nr, NCBI nt, NCBI Genbank, etc with
+only one command.")
+    (license license:gpl2)))
+
 (define-public r-biocparallel
   (package
     (name "r-biocparallel")
-- 
cgit v1.2.3


From ff91ab768977b361496f786c864dda2212acac86 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 5 Aug 2022 17:32:50 +0300
Subject: gnu: urlscan: Update to 0.9.10.

* gnu/packages/mail.scm (urlscan): Update to 0.9.10.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ca4b3e819e..d4f9b28060 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3898,13 +3898,13 @@ (define-public imapfilter
 (define-public urlscan
   (package
     (name "urlscan")
-    (version "0.9.9")
+    (version "0.9.10")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "urlscan" version))
         (sha256
-         (base32 "1lc06i4r29s7qsfds4w3ip85n5fxjn65n47wxh8pvyb46fdvjrns"))))
+         (base32 "1ir6dxifkd8hv048p65jyz4wyg6ll002fzvbmajpdnvs6mvkj1md"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-urwid))
-- 
cgit v1.2.3


From 6c62a5eeb03a58ae3b826ac796e188e187018993 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 5 Aug 2022 18:18:39 +0300
Subject: gnu: rust-httparse-1: Update to 1.7.1.

* gnu/packages/crates-io.scm (rust-httparse-1): Update to 1.7.1.
[cargo-development-inputs]: Remove rust-pico-sys-0.0. Add
rust-criterion-0.3.
---
 gnu/packages/crates-io.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 910b2e68df..b6be110d1c 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -27883,7 +27883,7 @@ (define-public rust-http-types-2
 (define-public rust-httparse-1
   (package
     (name "rust-httparse")
-    (version "1.5.1")
+    (version "1.7.1")
     (source
      (origin
        (method url-fetch)
@@ -27891,11 +27891,11 @@ (define-public rust-httparse-1
        (file-name
         (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "00smbrgb9vyzbbj3j5d66iarjl5x2wpfwkmhcy5nizylw7dlzndc"))))
+        (base32 "0k60q1hx96cvmjn6k3yjkff87fz0ga2a4z0g9ss8a9x5nndy4v29"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-development-inputs
-       (("rust-pico-sys" ,rust-pico-sys-0.0))))
+       (("rust-criterion" ,rust-criterion-0.3))))
     (home-page "https://github.com/seanmonstar/httparse")
     (synopsis "Zero-copy HTTP/1.x parser")
     (description
-- 
cgit v1.2.3


From 1dc4e1810c6d2e3244781fc0488bafd098cb9e05 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Fri, 5 Aug 2022 18:19:31 +0300
Subject: gnu: Remove rust-pico-sys-0.0.

* gnu/packages/crates-io.scm (rust-pico-sys-0.0): Remove variable.
---
 gnu/packages/crates-io.scm | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6be110d1c..cfafce9aa3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -42928,29 +42928,6 @@ (define-public rust-phf-shared-0.7
      "Support code shared by PHF libraries.")
     (license license:expat)))
 
-(define-public rust-pico-sys-0.0
-  (package
-    (name "rust-pico-sys")
-    (version "0.0.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (crate-uri "pico-sys" version))
-        (file-name (string-append name "-" version ".tar.gz"))
-        (sha256
-         (base32
-          "1q5pg0ms6szz6b5h26h4k40zb76zbwwjgyigac4wly9qngdj4yl5"))))
-    (build-system cargo-build-system)
-    (arguments
-     `(#:cargo-inputs
-       (("rust-libc" ,rust-libc-0.2)
-        ("rust-gcc" ,rust-gcc-0.3))))
-    (home-page "https://github.com/reem/rust-pico-sys")
-    (synopsis "Bindings to the PicoHTTPParser")
-    (description
-     "This package provides bindings to the PicoHTTPParser.")
-    (license license:expat)))
-
 (define-public rust-pin-project-1
   (package
     (name "rust-pin-project")
-- 
cgit v1.2.3


From b12da85668c40be322204e1ca04fb70b4d709411 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher 
Date: Fri, 29 Jul 2022 17:50:56 +0100
Subject: gnu: Add python-posix-ipc.

* gnu/packages/python-xyz.scm: (python-posix-ipc): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 622a356bf1..95467f4d52 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -29631,6 +29631,38 @@ (define-public python-queuelib
 fashion.")
     (license license:bsd-3)))
 
+(define-public python-posix-ipc
+  (package
+    (name "python-posix-ipc")
+    (version "1.0.5")
+    (source
+     (origin
+       ;; The source distributed on PyPI is prebuild.
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/osvenskan/posix_ipc")
+             (commit (string-append "rel" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17y4d0pmvp199c5hbs602ailhlh9f9zv89kmpbd8jhyl6rgaxsvs"))))
+    (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-cc-path
+                 (lambda _
+                   (substitute* "prober.py"
+                     (("cmd = .cc")
+                      (string-append "cmd = \"" #$(cc-for-target)))))))))
+    (native-inputs
+     (list python-unittest2))
+    (home-page "http://semanchuk.com/philip/posix_ipc/")
+    (synopsis "POSIX IPC primitives for Python")
+    (description
+     "This package provides POSIX IPC primitives - semaphores, shared memory and
+message queues for Python.")
+    (license license:bsd-3))) ; BSD like Copyright (c) 2018, Philip Semanchuk
+
 (define-public python-itemadapter
   (package
     (name "python-itemadapter")
-- 
cgit v1.2.3


From 6615e82a63b7515a91aa453cab2c1788f4b1adf9 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher 
Date: Fri, 29 Jul 2022 21:17:50 +0100
Subject: gnu: Add python-pynbody.

* gnu/packages/astronomy.scm: (python-pynbody): New variable.

Signed-off-by: Efraim Flashner 
---
 gnu/packages/astronomy.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 3c4c92619e..29f1e6fc36 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1739,6 +1739,75 @@ (define-public python-pyerfa
 functions, so that they can be called with scalar or array inputs.")
     (license license:bsd-3)))
 
+(define-public python-pynbody
+  (package
+    (name "python-pynbody")
+    (version "1.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pynbody" version))
+       (sha256
+        (base32 "1jxwk2s4qz1znvyak2lj7ld01kl1jh87xp81ki7a8dz1gcy93fkx"))))
+    (build-system python-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'disable-tests-require-testdata
+                 (lambda _
+                   ;; Disable tests which need to download additional 1.0GiB+
+                   ;; of test data archive from
+                   ;; http://star.ucl.ac.uk/~app/testdata.tar.gz
+                   ;;    https://github.com/pynbody/pynbody/blob/ \
+                   ;;    f4bd482dc47532831b3ec115c7cb07149d61bfc5/ \
+                   ;;    .github/workflows/build-test.yaml#L41
+                   (with-directory-excursion "tests"
+                     (for-each delete-file
+                               '("gravity_test.py"
+                                 "adaptahop_test.py"
+                                 "ahf_halos_test.py"
+                                 "array_test.py"
+                                 "bridge_test.py"
+                                 "family_test.py"
+                                 "partial_tipsy_test.py"
+                                 "snapshot_test.py"
+                                 "test_profile.py"
+                                 "gadget_test.py"
+                                 "gadgethdf_test.py"
+                                 "grafic_test.py"
+                                 "halotools_test.py"
+                                 "nchilada_test.py"
+                                 "ramses_new_ptcl_format_test.py"
+                                 "ramses_test.py"
+                                 "rockstar_test.py"
+                                 "sph_image_test.py"
+                                 "sph_smooth_test.py"
+                                 "subfind_test.py"
+                                 "subfindhdf_gadget4_test.py"
+                                 "tipsy_test.py")))))
+               (replace 'check
+                 (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+                   (when tests?
+                     (add-installed-pythonpath inputs outputs)
+                     (setenv "HOME" "/tmp")
+                     (invoke "pytest" "-vv")))))))
+    (native-inputs
+     (list python-cython
+           python-pandas
+           python-pytest))
+    (propagated-inputs
+     (list python-h5py
+           python-matplotlib
+           python-numpy
+           python-posix-ipc
+           python-scipy))
+    (home-page "https://pynbody.github.io/pynbody/index.html")
+    (synopsis "Light-weight astronomical N-body/SPH analysis for python")
+    (description "@code{Pynbody} is an analysis framework for N-body and hydrodynamic
+astrophysical simulations supporting PKDGRAV/Gasoline, Gadget, Gadget4/Arepo,
+N-Chilada and RAMSES AMR outputs.")
+    (license license:gpl3+)))
+
 (define-public python-sep
   (package
     (inherit libsep)
-- 
cgit v1.2.3


From 5974f0a27615fd6c356b0c87f157013094ea25a6 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sat, 6 Aug 2022 01:30:16 +0200
Subject: gnu: emacs-taxy: Update to 0.10.

* gnu/packages/emacs-xyz.scm (emacs-taxy): Update to 0.10.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 5024e5c49c..ba841fde96 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -16613,7 +16613,7 @@ (define-public emacs-tiny
 (define-public emacs-taxy
   (package
     (name "emacs-taxy")
-    (version "0.9")
+    (version "0.10")
     (source
      (origin
        (method url-fetch)
@@ -16621,7 +16621,7 @@ (define-public emacs-taxy
              "https://elpa.gnu.org/packages/taxy-" version ".tar"))
        (sha256
         (base32
-         "1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh"))))
+         "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-magit))
-- 
cgit v1.2.3


From 32ac3efa98187a869fe47f84531ae4fe95dc9c0e Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou 
Date: Sat, 6 Aug 2022 01:31:51 +0200
Subject: gnu: emacs-gruvbox-theme: Update to 1.29.0.

* gnu/packages/emacs-xyz.scm (emacs-gruvbox-theme): Update to 1.29.0.
---
 gnu/packages/emacs-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ba841fde96..c3f2fdeb12 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -8707,7 +8707,7 @@ (define-public emacs-color-theme-modern
 (define-public emacs-gruvbox-theme
   (package
     (name "emacs-gruvbox-theme")
-    (version "1.28.0")
+    (version "1.29.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8716,7 +8716,7 @@ (define-public emacs-gruvbox-theme
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p"))))
+                "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa"))))
     (build-system emacs-build-system)
     (propagated-inputs
      (list emacs-autothemer))
-- 
cgit v1.2.3


From fe47ae3b7924c7e03fd23461e0bb334fe4a88861 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 31 Jul 2022 02:00:04 +0200
Subject: gnu: frotz: Update to 2.54.

This fixes the build.

* gnu/packages/games.scm (frotz): Update to 2.54.
[arguments]: Use G-expressions.  Set CC in #:make-flags.
Remove obsolete 'curses phase.
Don't explicitly return #t from phases.
[native-inputs]: Add pkg-config and which.
[inputs]: Add ao.
---
 gnu/packages/games.scm | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 06084d1167..d90e85de9e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8003,7 +8003,7 @@ (define (install src dst)
 (define-public frotz
   (package
     (name "frotz")
-    (version "2.44")
+    (version "2.54")
     (source (origin
               (method url-fetch)
               (uri (list (string-append
@@ -8014,28 +8014,25 @@ (define-public frotz
                           "frotz/frotz-" version ".tar.gz")))
               (sha256
                (base32
-                "1v735xr3blznac8fnwa27s1vhllx4jpz7kw7qdw1bsfj6kq21v3k"))))
+                "1vsfq9ryyb4nvzxpnnn40k423k9pdy8k67i8390qz5h0vmxw0fds"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; there are no tests
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-before 'build 'curses
-           (lambda _
-             (substitute* "Makefile"
-               (("lcurses") "lncurses"))
-             #t))
-         (replace 'install
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (man (string-append out "/share/man/man6")))
-               (install-file "frotz" bin)
-               (mkdir-p man)
-               (install-file "doc/frotz.6" man)
-               #t))))))
-    (inputs (list libmodplug libsamplerate libsndfile libvorbis ncurses))
+     (list #:tests? #f                  ; there are no tests
+           #:make-flags
+           #~(list (string-append "CC=" #$(cc-for-target)))
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)      ; no configure-script
+               (replace 'install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (bin (string-append out "/bin"))
+                          (man (string-append out "/share/man/man6")))
+                     (install-file "frotz" bin)
+                     (mkdir-p man)
+                     (install-file "doc/frotz.6" man)))))))
+    (native-inputs (list pkg-config which))
+    (inputs (list ao libmodplug libsamplerate libsndfile libvorbis ncurses))
     (synopsis "Portable Z-machine interpreter (ncurses version) for text adventure games")
     (description "Frotz is an interpreter for Infocom games and other Z-machine
 games in the text adventure/interactive fiction genre.  This version of Frotz
-- 
cgit v1.2.3


From 792e1c2ce1776ed98c216a13df7af95b064f9a9d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 24 Jul 2022 02:00:01 +0200
Subject: gnu: libinih: Update to 56.

* gnu/packages/linux.scm (libinih): Update to 56.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index aeb03020ce..67ca86cbb0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8390,7 +8390,7 @@ (define-public go-netlink
 (define-public libinih
   (package
     (name "libinih")
-    (version "55")
+    (version "56")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8399,7 +8399,7 @@ (define-public libinih
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0g6dkcphlzgxvh9zyf6rj82gigccca6x5acjxn01gz6rykfg0lnn"))))
+                "1fjqvf56yij15lgwj58dcmxlq5n98gzpbss0nnn1d2i5j7gf4kgf"))))
     (build-system meson-build-system)
     ;; Install static libraries for use by the initrd's xfsprogs/static.
     (outputs (list "out" "static"))
-- 
cgit v1.2.3


From 8b6c4eddedc1b4e4a4a2519cf3ed213f3fa8cb0d Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler 
Date: Sat, 6 Aug 2022 00:36:01 +0200
Subject: gnu: komikku: Update to 0.40.0.

* gnu/packages/gnome.scm (komikku): Update to 0.40.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0044bb33fb..6a6b3edca9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12437,7 +12437,7 @@ (define-public gnome-builder
 (define-public komikku
   (package
     (name "komikku")
-    (version "0.39.0")
+    (version "0.40.0")
     (source
      (origin
        (method git-fetch)
@@ -12447,7 +12447,7 @@ (define-public komikku
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1g765kbgimfpvma67j1gscj046n2q9a9nr2pczlw65qwlm0418c5"))))
+         "12l6qks4kwi75ss61yx1f515nb30d987qw3yhi4a36w5xz721p5z"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
-- 
cgit v1.2.3


From 18007d3a7bfcafa28205b636e7b631818c664c63 Mon Sep 17 00:00:00 2001
From: Felix Gruber 
Date: Thu, 4 Aug 2022 19:23:49 +0000
Subject: gnu: queen-de: Fix build.

The sources for queen-de lack a readme, so check whether one exists prior to
trying to install it.  See .

* gnu/packages/games.scm (make-queen-package)[#:builder]: Only install
readme.txt if it exists.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/games.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d90e85de9e..5e8b7a6d0d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9807,7 +9807,9 @@ (define (make-queen-package name file-prefix release language hash)
            (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
              (invoke unzip "-j" (assoc-ref %build-inputs "source")))
            (let ((doc (string-append share "/doc/" ,name "-" ,version)))
-             (install-file "readme.txt" doc))
+             (for-each (lambda (file)
+                         (when (file-exists? file) (install-file file doc)))
+                       '("readme.txt" "README" "README.md")))
            (install-file "queen.1c" data)
            (mkdir-p bin)
            (let ((bash (assoc-ref %build-inputs "bash")))
-- 
cgit v1.2.3


From 1d543f67e2ea8f4e158aa29a5332b66b09bee7fa Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler 
Date: Sat, 6 Aug 2022 06:38:58 +0200
Subject: gnu: queen: Use new package style.

* gnu/packages/games.scm (make-queen-package)[build-system]: Use
copy-build-system.
[arguments]: Convert to list of G-Expressions.
Replace #:modules and #:builder with #:install-plan and #:phases.
---
 gnu/packages/games.scm | 93 ++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 49 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5e8b7a6d0d..99eccca04d 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9791,56 +9791,51 @@ (define (make-queen-package name file-prefix release language hash)
                            file-prefix release ".zip"))
        (sha256
         (base32 hash))))
-    (build-system trivial-build-system)
+    (build-system copy-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (share (string-append out "/share"))
-                (data (string-append share "/" ,name))
-                (apps (string-append share "/applications"))
-                (bin (string-append out "/bin"))
-                (executable (string-append bin "/" ,name))
-                (scummvm (assoc-ref %build-inputs "scummvm")))
-           (let ((unzip (search-input-file %build-inputs "/bin/unzip")))
-             (invoke unzip "-j" (assoc-ref %build-inputs "source")))
-           (let ((doc (string-append share "/doc/" ,name "-" ,version)))
-             (for-each (lambda (file)
-                         (when (file-exists? file) (install-file file doc)))
-                       '("readme.txt" "README" "README.md")))
-           (install-file "queen.1c" data)
-           (mkdir-p bin)
-           (let ((bash (assoc-ref %build-inputs "bash")))
-             (with-output-to-file executable
-               (lambda ()
-                 (format #t "#!~a/bin/bash~%" bash)
-                 (format #t "exec ~a/bin/scummvm -q fr -p ~a queen~%"
-                         scummvm data))))
-           (chmod executable #o755)
-           ;; Create desktop file.  There is no dedicated
-           ;; icon for the game, so we borrow SCUMMVM's.
-           (mkdir-p apps)
-           (with-output-to-file (string-append apps "/" ,name ".desktop")
-             (lambda _
-               (format #t
-                       "[Desktop Entry]~@
-                       Name=Flight of the Amazon Queen~@
-                       GenericName=Queen~@
-                       Comment=Embark on a quest to rescue a kidnapped princess and in the process, discover the true sinister intentions of a suspiciously located Lederhosen company~@
-                       Comment[de]=Begib dich auf ein Abenteuer, um eine entführte Prinzessin zu retten und entdecke die wahren, finsteren Absichten eines verdächtig erscheinenden Lederhosen-Unternehmens~@
-                       Type=Application~@
-                       Exec=~a~@
-                       Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
-                       Categories=AdventureGame;Game;RolePlaying;~@
-                       Keywords=adventure;game;roleplaying;fantasy;~%"
-                       executable scummvm))))
-         #t)))
-    (native-inputs
-     (list unzip))
-    (inputs
-     (list bash scummvm))
+     (list
+      #:install-plan
+      #~'(("queen.1c" #$(string-append "share/" name "/"))
+          (#$name "bin/")
+          (#$(string-append name ".desktop") "share/applications/")
+          ("." #$(string-append "share/doc/" name "-" version)
+           #:include-regexp ("README" "readme")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'install 'build
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (with-output-to-file #$name
+                (lambda ()
+                  (format #t "#!~a~%" (search-input-file inputs "bin/sh"))
+                  (format #t "exec ~a -q ~a -p ~a queen~%"
+                          (search-input-file inputs "bin/scummvm")
+                          #$language
+                          (string-append (assoc-ref outputs "out")
+                                         "/share/" #$name))))
+              (chmod #$name #o755)
+              (with-output-to-file #$(string-append name ".desktop")
+                (lambda ()
+                  (format
+                   #t
+                   "[Desktop Entry]~@
+                    Name=Flight of the Amazon Queen~@
+                    GenericName=Queen~@
+                    Comment=Embark on a quest to rescue a kidnapped princess~
+                    and in the process, discover the true sinister intentions~
+                    of a suspiciously located Lederhosen company~@
+                    Comment[de]=Begib dich auf ein Abenteuer, um eine entführte~
+                    Prinzessin zu retten und entdecke die wahren, finsteren~
+                    Absichten eines verdächtig erscheinenden~
+                    Lederhosen-Unternehmens~@
+                    Type=Application~@
+                    Exec=~a~@
+                    Icon=~a/share/icons/hicolor/scalable/apps/scummvm.svg~@
+                    Categories=AdventureGame;Game;RolePlaying;~@
+                    Keywords=adventure;game;roleplaying;fantasy;~%"
+                   (string-append (assoc-ref outputs "out") "/bin/" #$name)
+                   (search-input-file inputs "bin/scummvm")))))))))
+    (native-inputs (list unzip))
+    (inputs (list bash scummvm))
     (home-page "https://www.scummvm.org/")
     (synopsis "Classic 2D point and click adventure game")
     (description "Flight of the Amazon Queen is a 2D point-and-click
-- 
cgit v1.2.3


From 7f9b7ed0ffb8db1c7d4c509a59cac28d811928db Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Sat, 6 Aug 2022 01:28:34 -0400
Subject: gnu: yt-dlp: Update to 2022.07.18.

* gnu/packages/video.scm (yt-dlp): Update to 2022.07.18.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 04049fd9c8..017c0d3857 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2474,7 +2474,7 @@ (define-public youtube-dl
 (define-public yt-dlp
   (package/inherit youtube-dl
     (name "yt-dlp")
-    (version "2022.06.22.1")
+    (version "2022.07.18")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/yt-dlp/yt-dlp/"
@@ -2482,7 +2482,7 @@ (define-public yt-dlp
                                   version "/yt-dlp.tar.gz"))
               (sha256
                (base32
-                "1nr6g3dhvjc10jzhyvgjrrxqhsgi3hiw8bswp8bi6bscimd9vhps"))
+                "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj"))
               (snippet
                '(begin
                   ;; Delete the pre-generated files, except for the man page
-- 
cgit v1.2.3


From d457a5ec09028c594b7c450cbe827b96e5e61701 Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Sat, 6 Aug 2022 01:28:37 -0400
Subject: gnu: yt-dlp: Use new package style.

* gnu/packages/video.scm (yt-dlp)[source](snippet): Rewrite as a G-Expression.
[arguments]: Use G-Expressions.
[inputs]: Drop labels.
[native-inputs]: Likewise.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/video.scm | 85 +++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 43 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 017c0d3857..c681165f2e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2484,53 +2484,52 @@ (define-public yt-dlp
                (base32
                 "1wmzfqhysx1mqdba4ikvm6nbahasihi4xgqwqad20y3vs701slyj"))
               (snippet
-               '(begin
-                  ;; Delete the pre-generated files, except for the man page
-                  ;; which requires 'pandoc' to build.
-                  (for-each delete-file '("yt-dlp"
-                                          ;;pandoc is needed to generate
-                                          ;;"yt-dlp.1"
-                                          "completions/bash/yt-dlp"
-                                          "completions/fish/yt-dlp.fish"
-                                          "completions/zsh/_yt-dlp"))))))
+               #~(begin
+                   ;; Delete the pre-generated files, except for the man page
+                   ;; which requires 'pandoc' to build.
+                   (for-each delete-file
+                             (list "yt-dlp"
+                                   ;;pandoc is needed to generate
+                                   ;;"yt-dlp.1"
+                                   "completions/bash/yt-dlp"
+                                   "completions/fish/yt-dlp.fish"
+                                   "completions/zsh/_yt-dlp"))))))
     (arguments
      (substitute-keyword-arguments (package-arguments youtube-dl)
        ((#:tests? _) #t)
        ((#:phases phases)
-        `(modify-phases ,phases
-           ;; See the comment for the corresponding phase in youtube-dl.
-           (replace 'default-to-the-ffmpeg-input
-             (lambda _
-               (substitute* "yt_dlp/postprocessor/ffmpeg.py"
-                 (("\\.get_param\\('ffmpeg_location'\\)" match)
-                  (format #f "~a or '~a'" match (which "ffmpeg"))))))
-           (replace 'build-generated-files
-             (lambda _
-               ;; Avoid the yt-dlp.1 target, which requires pandoc.
-               (invoke "make" "PYTHON=python" "yt-dlp" "completions")))
-           (replace 'fix-the-data-directories
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((prefix (assoc-ref outputs "out")))
-                 (substitute* "setup.py"
-                   (("'etc/")
-                    (string-append "'" prefix "/etc/"))
-                   (("'share/")
-                    (string-append "'" prefix "/share/"))))))
-           (delete 'install-completion)
-           (replace 'check
-             (lambda* (#:key tests? #:allow-other-keys)
-               (when tests?
-                 (invoke "pytest" "-k" "not download"))))))))
-    (inputs
-     `(("python-brotli" ,python-brotli)
-       ("python-certifi" ,python-certifi)
-       ("python-mutagen" ,python-mutagen)
-       ("python-pycryptodomex" ,python-pycryptodomex)
-       ("python-websockets" ,python-websockets)
-       ,@(package-inputs youtube-dl)))
-    (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ,@(package-native-inputs youtube-dl)))
+        #~(modify-phases #$phases
+            ;; See the comment for the corresponding phase in youtube-dl.
+            (replace 'default-to-the-ffmpeg-input
+              (lambda _
+                (substitute* "yt_dlp/postprocessor/ffmpeg.py"
+                  (("\\.get_param\\('ffmpeg_location'\\)" match)
+                   (format #f "~a or '~a'" match (which "ffmpeg"))))))
+            (replace 'build-generated-files
+              (lambda _
+                ;; Avoid the yt-dlp.1 target, which requires pandoc.
+                (invoke "make" "PYTHON=python" "yt-dlp" "completions")))
+            (replace 'fix-the-data-directories
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let ((prefix (assoc-ref outputs "out")))
+                  (substitute* "setup.py"
+                    (("'etc/")
+                     (string-append "'" prefix "/etc/"))
+                    (("'share/")
+                     (string-append "'" prefix "/share/"))))))
+            (delete 'install-completion)
+            (replace 'check
+              (lambda* (#:key tests? #:allow-other-keys)
+                (when tests?
+                  (invoke "pytest" "-k" "not download"))))))))
+    (inputs (modify-inputs (package-inputs youtube-dl)
+              (append python-brotli
+                      python-certifi
+                      python-mutagen
+                      python-pycryptodomex
+                      python-websockets)))
+    (native-inputs (modify-inputs (package-native-inputs youtube-dl)
+                     (append python-pytest)))
     (description
      "yt-dlp is a small command-line program to download videos from
 YouTube.com and many more sites.  It is a fork of youtube-dl with a
-- 
cgit v1.2.3


From 47989e0a5f02200c708f8b12e19c97c660ffcc4d Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Sat, 6 Aug 2022 01:37:50 -0400
Subject: gnu: ugrep: Build with zstd support.

* gnu/packages/search.scm (ugrep)[inputs]: Add zstd lib.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/search.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index db5579a708..4a867ec1be 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -696,7 +696,8 @@ (define-public ugrep
            lz4
            lzip ;; lzma
            pcre2
-           zlib))
+           zlib
+           `(,zstd "lib")))
     (arguments
      `(#:tests? #f                  ; no way to rebuild the binary input files
        #:test-target "test"
-- 
cgit v1.2.3


From 6665600e2354a76da1913d9847d47299e4a8f8dd Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Sat, 6 Aug 2022 01:37:52 -0400
Subject: gnu: ugrep: Use G-Expressions.

* gnu/packages/search.scm (ugrep)[source]: Convert snippet to G-Expression.
[arguments]: Convert to list of G-Expressions.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/search.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 4a867ec1be..025e862fa4 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages search)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -682,13 +683,11 @@ (define-public ugrep
                (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (delete-file-recursively "bin") ; pre-built executables
-                  (for-each delete-file (find-files "tests" "^archive\\..*"))
-                  (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                  (for-each delete-file (find-files "tests" "^.*\\.class$"))
-                  #t))))
+              (snippet #~(begin
+                           (delete-file-recursively "bin") ; pre-built executables
+                           (for-each delete-file (find-files "tests" "^archive\\..*"))
+                           (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
+                           (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
@@ -699,16 +698,17 @@ (define-public ugrep
            zlib
            `(,zstd "lib")))
     (arguments
-     `(#:tests? #f                  ; no way to rebuild the binary input files
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; Unpatch shebangs in tests.
-             (substitute* '("tests/Hello.bat"
-                            "tests/Hello.sh")
-               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
+     (list
+      #:tests? #f                  ; no way to rebuild the binary input files
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; Unpatch shebangs in tests.
+              (substitute* '("tests/Hello.bat"
+                             "tests/Hello.sh")
+                (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
     (home-page "https://github.com/Genivia/ugrep/")
     (synopsis "Faster grep with an interactive query UI")
     (description "Ugrep is a ultra fast searcher of file systems, text
-- 
cgit v1.2.3


From ffea1d47cbbd76fbcd412258f11291320b14be6a Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler 
Date: Sat, 6 Aug 2022 09:53:09 +0200
Subject: gnu: ugrep: Simplify snippet.

* gnu/packages/search.scm (ugrep)[source]: Use nested for-each loop.
Simplify regular expressions.
---
 gnu/packages/search.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 025e862fa4..2d652f5789 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -683,11 +683,13 @@ (define-public ugrep
                (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
-              (snippet #~(begin
-                           (delete-file-recursively "bin") ; pre-built executables
-                           (for-each delete-file (find-files "tests" "^archive\\..*"))
-                           (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                           (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
+              (snippet
+               #~(begin
+                   (delete-file-recursively "bin") ; pre-built executables
+                   (for-each (lambda (regexp)
+                               (for-each delete-file
+                                         (find-files "tests" regexp)))
+                             '("^archive" "\\.pdf$" "\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
-- 
cgit v1.2.3


From 607f9a9af9e09d2ede24510ca169247785ba25dc Mon Sep 17 00:00:00 2001
From: Maxime Devos 
Date: Tue, 2 Aug 2022 14:13:27 +0200
Subject: gnu: freedesktop: Add 'bash' input for 'wrap-program'

It is required for cross-compilation.
Cherry-picked from .

* gnu/packages/freedesktop.scm
(udisks)[inputs]: Add 'bash-minimal' when cross-compiling.
(perl-file-mimeinfo)[inputs]: Likewise.
(udiskie)[inputs]: Likewise.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index cde7156383..8816ef5542 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1319,13 +1319,17 @@ (define-public udisks
     (propagated-inputs
      (list glib)) ; required by udisks2.pc
     (inputs
-     (list acl
-           cryptsetup
-           libatasmart
-           libblockdev
-           libgudev
-           polkit
-           util-linux))
+     `(,acl
+       ;; TODO(staging): Make unconditional.
+       ,@(if (%current-target-system)
+             (list bash-minimal) ; for wrap-program
+             '())
+       ,cryptsetup
+       ,libatasmart
+       ,libblockdev
+       ,libgudev
+       ,polkit
+       ,util-linux))
     (outputs '("out"
                "doc"))                            ;5 MiB of gtk-doc HTML
     (arguments
@@ -1932,6 +1936,11 @@ (define-public perl-file-mimeinfo
         (base32
          "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"))))
     (build-system perl-build-system)
+    (inputs
+     ;; TODO(staging): Make unconditional.
+     (if (%current-target-system)
+         (list bash-minimal) ; for wrap-program
+         '()))
     ;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and
     ;; perl-test-tiny as native-inputs.
     (propagated-inputs
@@ -2028,7 +2037,15 @@ (define-public udiskie
        ("gettext" ,gettext-minimal)
        ("gobject-introspection" ,gobject-introspection)))
     (inputs
-     (list gobject-introspection gtk+ libappindicator libnotify udisks))
+     ;; TODO(staging): Make unconditional.
+     `(,@(if (%current-target-system)
+             (list bash-minimal)
+             '())
+       ,gobject-introspection
+       ,gtk+
+       ,libappindicator
+       ,libnotify
+       ,udisks))
     (propagated-inputs
      (list python-docopt python-pygobject python-keyutils python-pyxdg
            python-pyyaml))
-- 
cgit v1.2.3


From b914ccc91525d847683b79f482b9d318b7f94aec Mon Sep 17 00:00:00 2001
From: Maxime Devos 
Date: Tue, 2 Aug 2022 14:13:28 +0200
Subject: perl-file-mimeinfo: Fix cross-compilation.

* gnu/packages/freedesktop.scm
(perl-file-mimeinfo)[arguments]<#:phases>: Make it a G-exp to avoid messy nested
quasiquotation.
{wrap-programs}: When cross-compiling, don't use the PELRL5LIB environment
variable, instead use 'search-path-as-list'.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/freedesktop.scm | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 8816ef5542..6713e449e6 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1948,19 +1948,31 @@ (define-public perl-file-mimeinfo
     (arguments
      ;; Some tests fail due to requiring the mimetype of perl files to be
      ;; text/plain when they are actually application/x-perl.
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-programs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (for-each (lambda (prog)
-                           (wrap-program (string-append out "/bin/" prog)
-                             `("PERL5LIB" ":" prefix
-                               (,(string-append (getenv "PERL5LIB") ":" out
-                                                "/lib/perl5/site_perl")))))
-                         '("mimeopen" "mimetype")))
-             #t)))))
+     (list #:tests? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'wrap-programs
+                 ;; TODO(staging): Make unconditional.
+                 (lambda* (#:key #$@(if (%current-target-system)
+                                        #~(inputs)
+                                        #~()) outputs #:allow-other-keys)
+                   (let ((out (assoc-ref outputs "out")))
+                     (for-each
+                      (lambda (prog)
+                        (wrap-program (string-append out "/bin/" prog)
+                          `("PERL5LIB" ":" prefix
+                            ;; PERL5LIB looks in 'native-inputs', not 'inputs',
+                            ;; whereas the latter is required for
+                            ;; cross-compilation.
+                            #$(if (%current-target-system)
+                                  #~,(search-path-as-list
+                                      '("lib/perl5/site_perl")
+                                      (map cdr (append inputs outputs)))
+                                  #~(,(string-append
+                                       (getenv "PERL5LIB")
+                                       ":" out "/lib/perl5/site_perl"))))))
+                      '("mimeopen" "mimetype")))
+                   #t)))))
     (home-page "https://metacpan.org/release/File-MimeInfo")
     (synopsis "Determine file type from the file name")
     (description
-- 
cgit v1.2.3


From ad878a2c5e5313c534ccf2546cb8c978e5295ae1 Mon Sep 17 00:00:00 2001
From: Maxime Devos 
Date: Tue, 2 Aug 2022 14:13:29 +0200
Subject: xdg-utils: Support cross-compilation.

It has been verified that this does not cause rebuilds when compiling
natively.  The references graph when cross-compiling has also been verified --
glibc-2.33 and the native bash-static-5.1.8 still remains in the graph, but
via the cross-compiled inetutils-2.0, ncurses-6.2.20210619 and via
gcc-cross-TARGET-10.3.0-lib, which is not related with Perl cross-compilation.

* gnu/packages/freedesktop.scm
(xdg-utils)[inputs]{bash-minimal,file}: New inputs when cross-compiling.
(xdg-utils)[arguments]<#:phases>{locate-catalog-files}: Add 'native-inputs'
argument when cross-compiling. Look for docbook-xml and docbook-xsl in
native-inputs when cross-compiling.  While we are at it, eliminate input
labels with search-input-file.
(xdg-utils)[arguments]<#:phases>{patch-hardcoded-patch}: Use
search-input-file + inputs instead of 'which' when cross-compiling.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/freedesktop.scm | 62 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6713e449e6..037a247243 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -25,7 +25,7 @@
 ;;; Copyright © 2021 pineapples 
 ;;; Copyright © 2021 Sarah Morgensen 
 ;;; Copyright © 2021 Robby Zambito 
-;;; Copyright © 2021 Maxime Devos 
+;;; Copyright © 2021, 2022 Maxime Devos 
 ;;; Copyright © 2021 John Kehayias 
 ;;; Copyright © 2021, 2021 Maxim Cournoyer 
 ;;; Copyright © 2022 Daniel Meißner 
@@ -76,6 +76,7 @@ (define-module (gnu packages freedesktop)
   #:use-module (gnu packages disk)
   #:use-module (gnu packages docbook)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gettext)
@@ -414,7 +415,15 @@ (define-public xdg-utils
      (list docbook-xsl docbook-xml-4.1.2 libxslt w3m xmlto))
     (inputs
      `(("awk" ,gawk)
+       ;; TODO(staging): Make this unconditional, to avoid canonical packages,
+       ;; see .
+       ,@(if (%current-target-system)
+             `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program'
+             '())
        ("coreutils" ,coreutils)
+       ,@(if (%current-target-system)
+             `(("file" ,file))
+             '())
        ("grep" ,grep)
        ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
        ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
@@ -428,19 +437,44 @@ (define-public xdg-utils
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-hardcoded-paths
-           (lambda _
-             (substitute* "scripts/xdg-mime.in"
-               (("/usr/bin/file") (which "file")))
-             (substitute* "scripts/xdg-open.in"
-               (("/usr/bin/printf") (which "printf")))
-             #t))
+           ;; TODO(staging): make unconditional
+           (,@(if (%current-target-system)
+                 '(lambda* (#:key inputs #:allow-other-keys))
+                 '(lambda _))
+            (substitute* "scripts/xdg-mime.in"
+              (("/usr/bin/file")
+               (,@(if (%current-target-system)
+                      '(search-input-file inputs "bin/file")
+                      '(which "file")))))
+            (substitute* "scripts/xdg-open.in"
+              (("/usr/bin/printf")
+               (,@(if (%current-target-system)
+                      '(search-input-file inputs "bin/printf")
+                      '(which "printf")))))
+            #t))
          (add-before 'build 'locate-catalog-files
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
-                                          "/xml/dtd/docbook"))
-                   (xsldoc (string-append (assoc-ref inputs "docbook-xsl")
-                                          "/xml/xsl/docbook-xsl-"
-                                          ,(package-version docbook-xsl))))
+           ;; TODO(staging): Make unconditional for simplicity.
+           (lambda* (#:key inputs ,@(if (%current-target-system)
+                                        '(native-inputs)
+                                        '()) #:allow-other-keys)
+             ;; TODO(staging): Make unconditional for simplicity and
+             ;; to avoid depending on input labels.
+             (let ,(if (%current-target-system)
+                       `((native-inputs (or native-inputs inputs))
+                         (xmldoc (search-input-directory native-inputs
+                                                         "xml/dtd/docbook"))
+                         (xsldoc
+                          (search-input-directory
+                           native-inputs
+                           (string-append "xml/xsl/docbook-xsl-"
+                                          ,(package-version docbook-xsl)))))
+                       `((xmldoc
+                          (string-append (assoc-ref inputs "docbook-xml")
+                                         "/xml/dtd/docbook"))
+                         (xsldoc
+                          (string-append (assoc-ref inputs "docbook-xsl")
+                                         "/xml/xsl/docbook-xsl-"
+                                         ,(package-version docbook-xsl)))))
                (for-each (lambda (file)
                            (substitute* file
                              (("http://.*/docbookx\\.dtd")
@@ -456,6 +490,8 @@ (define-public xdg-utils
                                  "/manpages/docbook.xsl man")))
                (setenv "STYLESHEET"
                        (string-append xsldoc "/html/docbook.xsl"))
+               ;; TODO(staging): Might as well remove the #t while we are at
+               ;; it.
                #t)))
          (add-after 'install 'wrap-executables
            (lambda* (#:key inputs outputs #:allow-other-keys)
-- 
cgit v1.2.3


From 902fea913682d5ae878a26f1522536a289695631 Mon Sep 17 00:00:00 2001
From: Joeke de Graaf 
Date: Wed, 27 Jul 2022 23:43:38 +0000
Subject: gnu: Add wavbreaker.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mp3.scm (wavbreaker): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/mp3.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 275468d343..e2b112832b 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Simon Streit 
 ;;; Copyright © 2021 Guillaume Le Vaillant 
 ;;; Copyright © 2022 John Kehayias 
+;;; Copyright © 2022 Joeke de Graaf 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,12 +34,15 @@ (define-module (gnu packages mp3)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gnome)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
@@ -58,7 +62,8 @@ (define-module (gnu packages mp3)
   #:use-module (guix build-system copy)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
-  #:use-module (guix build-system cmake))
+  #:use-module (guix build-system cmake)
+  #:use-module (guix build-system meson))
 
 (define-public libmad
   (package
@@ -741,3 +746,70 @@ (define-public python-pytaglib
 cross-platform, works with all Python versions, and is very
 simple to use yet fully featured.")
     (license license:gpl3)))
+
+(define-public wavbreaker
+  (package
+    (name "wavbreaker")
+    (version "0.15")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/thp/wavbreaker/")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "16h0sfcb8av6a368giizzwv9m0lq5c3bnf4b9vyyh9nkbbsc7c3j"))))
+    (build-system meson-build-system)
+    (arguments
+     '(#:modules
+       ((guix build utils)
+        (guix build meson-build-system))
+
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-program
+           ;; This wrapping is necessary to make wavbreaker find things it
+           ;; needs in pure environments.
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out"))
+                   (adwaita-icons (assoc-ref inputs "adwaita-icon-theme"))
+                   (hicolor-icons (assoc-ref inputs "hicolor-icon-theme"))
+                   (shared-mime (assoc-ref inputs "shared-mime-info")))
+               (wrap-program (string-append out "/bin/wavbreaker")
+                 ;; Needed in order for wavbreakere to find the icons it needs
+                 `("XDG_DATA_DIRS" ":" prefix
+                   ,(map (lambda (package)
+                           (string-append package "/share"))
+                         `(,out                   ;for wavbreaker's icon
+                           ,adwaita-icons
+                           ,hicolor-icons
+                           ,shared-mime)))
+                 ;; This is necessary to load some pixbufs like Adwaita's
+                 ;; check-symbolic.svg and wavbreaker's own logo in the
+                 ;; 'about' section.
+                 `("GDK_PIXBUF_MODULE_FILE" =
+                   (,(getenv "GDK_PIXBUF_MODULE_FILE")))
+                 ;; Needed for GTK's file chooser to not crash.
+                 `("GSETTINGS_SCHEMA_DIR" =
+                 (,(string-append (assoc-ref inputs "gtk+")
+                                  "/share/glib-2.0/schemas"))))))))))
+    (native-inputs
+     (list pkg-config cmake))
+    (inputs
+     (list glib
+           gtk+
+           ao
+           bash-minimal
+           adwaita-icon-theme
+           shared-mime-info
+           hicolor-icon-theme
+           gsettings-desktop-schemas))
+    (home-page "https://wavbreaker.sourceforge.io/")
+    (synopsis "WAV and MP3 file splitter with a GUI")
+    (description
+     "Wavbreaker is a WAV and MP3 file splitter.  It can be used to break up a
+WAV or MP3 audio file into multiple WAV files.  Wavbreaker contains a helpful
+waveform display of the audio file being edited, to help the user in splitting
+the file at the right point.  Wavbreaker also supports splitting MP3 files
+without re-encoding them, to preserve their original audio quality.")
+    (license license:gpl2+)))
-- 
cgit v1.2.3


From 80ac0c0a7e557ac510ce81606be99194df40a1c7 Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Sat, 23 Jul 2022 13:44:57 +0800
Subject: gnu: Add emacs-vundo.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/emacs-xyz.scm (emacs-vundo): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c3f2fdeb12..3c1d322db3 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -115,6 +115,7 @@
 ;;; Copyright © 2022 Thomas Albers Raviola 
 ;;; Copyright © 2022 Haider Mirza 
 ;;; Copyright © 2022 Jose G Perez Taveras 
+;;; Copyright © 2022 Hilton Chain 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31946,3 +31947,23 @@ (define-public emacs-bitbake-modes
 be useful when working with the bitbake files in Yocto and OpenEmbedded
 projects.")
    (license license:gpl3+)))
+
+(define-public emacs-vundo
+  (package
+    (name "emacs-vundo")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://elpa.gnu.org/packages/vundo-"
+                                  version ".tar"))
+              (sha256
+               (base32
+                "032aqcqq2xhh12qcpp8p3qldv0r9cnqr2y11jk1m5cvgal1cbb68"))))
+    (build-system emacs-build-system)
+    (home-page "https://github.com/casouri/vundo")
+    (synopsis "Visualize the undo tree")
+    (description
+     "Vundo (visual undo) displays the undo history as a tree and lets you move in the
+tree to go back to previous buffer states.  To use vundo, type @kbd{M-x vundo RET} in
+the buffer you want to undo.  An undo tree buffer should pop up.")
+    (license license:gpl3+)))
-- 
cgit v1.2.3


From 86da72fb5b3a35a30660e81084ed0c90ec5af08f Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Sat, 23 Jul 2022 20:46:53 +0800
Subject: gnu: Add python-i3ipc.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm (python-i3ipc): New variable.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 95467f4d52..affc4772dd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -126,6 +126,7 @@
 ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ 
 ;;; Copyright © 2022 Philip McGrath 
 ;;; Copyright © 2022 Marek Felšöci 
+;;; Copyright © 2022 Hilton Chain 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -30305,3 +30306,26 @@ (define-public python-biblib
       ;; N.B. It seems the parser was translated from WEB by hand: this
       ;; package does not contain any generated files.
       (license license:expat))))
+
+(define-public python-i3ipc
+  (package
+    (name "python-i3ipc")
+    (version "2.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/altdesktop/i3ipc-python")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "13bzs9dcv27czpnnbgz7a037lm8h991c8gk0qzzk5mq5yak24715"))))
+    (build-system python-build-system)
+    (arguments (list #:tests? #f))      ;FIXME: some tests are unable to run
+    (propagated-inputs (list python-xlib))
+    (home-page "https://github.com/altdesktop/i3ipc-python")
+    (synopsis "Python library for controlling i3 and Sway")
+    (description
+     "This package provides a Python library for controlling the i3 and Sway
+window managers.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From 515288874ff12c00ca8d1d22a94ef4b4903fec76 Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Sat, 23 Jul 2022 20:48:19 +0800
Subject: gnu: Add i3-autotiling.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/python-xyz.scm (i3-autotiling): New variable.

Signed-off-by: Hilton Chain 
Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index affc4772dd..b6ca32a757 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30329,3 +30329,27 @@ (define-public python-i3ipc
      "This package provides a Python library for controlling the i3 and Sway
 window managers.")
     (license license:bsd-3)))
+
+(define-public i3-autotiling
+  (package
+    (name "i3-autotiling")
+    (version "1.6")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nwg-piotr/autotiling")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1hjlvg7095s322gb43r9g7mqlsy3pj13l827jpnbn5x0918rq9rr"))))
+    (build-system python-build-system)
+    (arguments (list #:tests? #f))      ;no tests
+    (native-inputs (list python-wheel))
+    (propagated-inputs (list python-i3ipc))
+    (home-page "https://github.com/nwg-piotr/autotiling")
+    (synopsis "Automatically tile windows in i3 and Sway")
+    (description
+     "Script for Sway and i3 to automatically switch the horizontal/vertical
+ window split orientation.")
+    (license license:gpl3)))
-- 
cgit v1.2.3


From bb5afc5b9ebcea94bc083f14fbc83cab9f86adfe Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Sat, 6 Aug 2022 21:52:16 -0400
Subject: gnu: gnome-system-monitor: Update to 42.0.

* gnu/packages/gnome.scm (gnome-system-monitor): Update to 42.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6a6b3edca9..3c4251286b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10388,7 +10388,7 @@ (define-public bluefish
 (define-public gnome-system-monitor
   (package
     (name "gnome-system-monitor")
-    (version "41.0")
+    (version "42.0")
     (source
      (origin
        (method url-fetch)
@@ -10397,7 +10397,7 @@ (define-public gnome-system-monitor
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0pwy2c95rm0ym3x5pr6rqg7zh58crjxyns4r52q99ds937349z67"))))
+         "1p3mq32pfd9260aql5nys806g0c4nrswacwqs8ms40920ci9s8qk"))))
     (build-system meson-build-system)
     (arguments
      '(#:glib-or-gtk? #t
-- 
cgit v1.2.3


From c0e713f6e2232593739181c89a886b9fd7be3a6c Mon Sep 17 00:00:00 2001
From: Jean-Pierre De Jesus DIAZ 
Date: Wed, 13 Jul 2022 14:02:30 +0200
Subject: gnu: newt: Fix cross-compilation.

* gnu/packages/slang.scm (newt): Fix-cross compilation.
  [arguments]: Use G-Expressions for `#:configure-flags',
  `#:make-flags' and `#:phases', also set correct path for
  `python-config'.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/slang.scm | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/slang.scm b/gnu/packages/slang.scm
index f335dc1a39..885fcf8c15 100644
--- a/gnu/packages/slang.scm
+++ b/gnu/packages/slang.scm
@@ -147,34 +147,41 @@ (define-public newt
     (inputs
      (list slang popt python fribidi))
     (arguments
-     `(#:tests? #f    ; no test suite
+     (list
+       #:tests? #f    ; no test suite
        #:configure-flags
        ;; Set the correct RUNPATH in binaries.
-       (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
+       #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
        #:make-flags
        ;; configure uses a hard-coded search of /usr/include/python* to set
        ;; this variable, and does not allow us to override it from the
        ;; command line.  Fortunately, the Makefile does, so provide it here.
-       (list (string-append "PYTHONVERS=python"
-                            ,(version-major+minor (package-version python))))
+       #~(list
+          (string-append "PYTHONVERS=python"
+                         #$(version-major+minor (package-version python))))
        #:phases
-       (modify-phases %standard-phases
-         (add-after
-          'unpack 'patch-/usr/bin/install
-          (lambda _
-            (substitute* "po/Makefile"
-              (("/usr/bin/install") "install"))
-            #t))
-         (add-after
-          'install 'move-python
-          (lambda* (#:key outputs #:allow-other-keys)
-            (let ((out  (assoc-ref outputs "out"))
-                  (py   (assoc-ref outputs "python"))
-                  (ver ,(version-major+minor (package-version python))))
-              (mkdir-p (string-append py "/lib"))
-              (rename-file (string-append out "/lib/python" ver)
-                           (string-append py  "/lib/python" ver))
-              #t))))))
+       #~(modify-phases %standard-phases
+           (add-after 'unpack 'patch-/usr/bin/install
+             (lambda _
+               (substitute* "po/Makefile"
+                 (("/usr/bin/install") "install"))))
+           (add-before 'build 'add-python-config-to-path
+             (lambda* (#:key target #:allow-other-keys)
+               ;; When cross-compiling python-config is not present in $PATH.
+               ;;
+               ;; It is a shell script without dependencies on target binaries
+               ;; so it can be run on the host to allow cross-compilation.
+               (when target
+                 (let ((path (getenv "PATH"))
+                       (py (string-append #$python "/bin")))
+                   (setenv "PATH" (string-append path ":" py))))))
+           (add-after 'install 'move-python
+             (lambda* _
+               (let ((ver #$(version-major+minor (package-version python))))
+                 (mkdir-p (string-append #$output:python "/lib"))
+                 (rename-file
+                   (string-append #$output "/lib/python" ver)
+                   (string-append #$output:python  "/lib/python" ver))))))))
     (home-page "https://pagure.io/newt")
     (synopsis "Not Erik's Windowing Toolkit - text mode windowing with slang")
     (description
-- 
cgit v1.2.3


From 120d8f8563106e16375bf092f0fad45f9f2dc697 Mon Sep 17 00:00:00 2001
From: Olivier Dion 
Date: Sat, 6 Aug 2022 14:40:52 -0400
Subject: gnu: guile-sqlite3: Update to 0.1.3.

* gnu/packages/guile.scm (guile-sqlite3): Update to 0.1.3.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index d320763a61..fcdf75051c 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -733,7 +733,7 @@ (define-public guile2.2-gdbm-ffi
 (define-public guile-sqlite3
   (package
     (name "guile-sqlite3")
-    (version "0.1.2")
+    (version "0.1.3")
     (home-page "https://notabug.org/guile-sqlite3/guile-sqlite3.git")
     (source (origin
               (method git-fetch)
@@ -742,7 +742,7 @@ (define-public guile-sqlite3
                     (commit (string-append "v" version))))
               (sha256
                (base32
-                "1nryy9j3bk34i0alkmc9bmqsm0ayz92k1cdf752mvhyjjn8nr928"))
+                "0qqygvlpz63phdi2p5p8ncp80dci230qfa3pwds8yfxqqaablmhb"))
               (file-name (string-append name "-" version "-checkout"))))
     (build-system gnu-build-system)
     (native-inputs (list autoconf automake guile-3.0 pkg-config))
-- 
cgit v1.2.3


From 544ff0b6c2b189b61ae2fa252e6e5233420d06a5 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 16:13:36 +0300
Subject: gnu: shishi: Update to 1.0.3.

* gnu/packages/kerberos.scm (shishi): Update to 1.0.3.
[source]: Remove patch.
[arguments]: Remove configure flag overriding libgcrypt detection.
* gnu/packages/patches/shishi-fix-libgcrypt-detection.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/kerberos.scm                          | 20 ++++++--------
 .../patches/shishi-fix-libgcrypt-detection.patch   | 32 ----------------------
 3 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 gnu/packages/patches/shishi-fix-libgcrypt-detection.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index 88100416d5..bfaa1ea5db 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1815,7 +1815,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/serf-python3.patch			\
   %D%/packages/patches/shakespeare-spl-fix-grammar.patch		\
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch		\
-  %D%/packages/patches/shishi-fix-libgcrypt-detection.patch	\
   %D%/packages/patches/slim-session.patch			\
   %D%/packages/patches/slim-config.patch			\
   %D%/packages/patches/slim-sigusr1.patch			\
diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index dec09ca791..a52d4b42cc 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2012, 2013 Andreas Enge 
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver 
 ;;; Copyright © 2016, 2017 Leo Famulari 
-;;; Copyright © 2016 Efraim Flashner 
+;;; Copyright © 2016, 2022 Efraim Flashner 
 ;;; Copyright © 2012, 2013 Nikita Karetnikov 
 ;;; Copyright © 2012, 2017 Ludovic Courtès 
 ;;; Copyright © 2017, 2019 Ricardo Wurmus 
@@ -121,32 +121,28 @@ (define-public mit-krb5
 (define-public shishi
   (package
     (name "shishi")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://gnu/shishi/shishi-"
                           version ".tar.gz"))
-      (patches (search-patches "shishi-fix-libgcrypt-detection.patch"))
       (sha256
        (base32
-        "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"))))
+        "14kyj7rdki2g1sj5k42y9v5ya9jar81yw483ivwa80fx2byqyycm"))))
     (build-system gnu-build-system)
     (arguments
-     '(;; This is required since we patch some of the build scripts.
-       ;; Remove first two items for the next Shishi release after 1.0.2 or
-       ;; when removing 'shishi-fix-libgcrypt-detection.patch'.
-       #:configure-flags
-       '("ac_cv_libgcrypt=yes" "--disable-static"
-         "--with-key-dir=/etc/shishi" "--with-db-dir=/var/shishi")
+     '(#:configure-flags
+       '("--disable-static"
+         "--with-key-dir=/etc/shishi"
+         "--with-db-dir=/var/shishi")
        #:phases
        (modify-phases %standard-phases
         (add-after 'configure 'disable-automatic-key-generation
           (lambda* (#:key outputs #:allow-other-keys)
             (substitute* "Makefile"
              (("^install-data-hook:")
-              "install-data-hook:\nx:\n"))
-            #t)))))
+              "install-data-hook:\nx:\n")))))))
     (native-inputs (list pkg-config))
     (inputs
      (list gnutls
diff --git a/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch b/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch
deleted file mode 100644
index 3db42feac9..0000000000
--- a/gnu/packages/patches/shishi-fix-libgcrypt-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fix building of Shishi with libgcrypt 1.6 and later.
-
-Patch copied from Debian:
-
-https://anonscm.debian.org/cgit/collab-maint/shishi.git/tree/debian/patches/fix_gcrypt_detection.diff?id=948301ae648a542a408da250755aeed58a6e3542
-
-Description: Fix autoconf gnutls detection to also accept gcrypt 1.6.
-Author: Andreas Metzler 
-Bug-Debian: http://bugs.debian.org/753150
-Origin: vendor
-Forwarded: no
-Last-Update: 2014-07-18
-
---- shishi-1.0.2.orig/gl/m4/gc.m4
-+++ shishi-1.0.2/gl/m4/gc.m4
-@@ -12,10 +12,12 @@ AC_DEFUN([gl_GC],
-   if test "$libgcrypt" != no; then
-     AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
- #include 
--/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
--   will fail on startup if we don't have 1.4.4 or later, so
--   test for it early. */
--#if !defined GCRY_MODULE_ID_USER
-+/* gc-libgcrypt.c will fail on startup if we don't have libgcrypt 1.4.4 or
-+   later, test for it early. by checking for either
-+   - GCRY_MODULE_ID_USER which was added in 1.4.4 and dropped in 1.6 or
-+   - GCRYPT_VERSION_NUMBER which was added in 1.6.
-+   */
-+#if !defined GCRY_MODULE_ID_USER && !defined GCRYPT_VERSION_NUMBER
- error too old libgcrypt
- #endif
- ])
-- 
cgit v1.2.3


From e3e33b5251e11beb0c77cc39f335a5116ab36f9c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 16:17:23 +0300
Subject: gnu: shishi: Build with newer linux-pam.

* gnu/packages/kerberos.scm (shishi)[inputs]: Replace linux-pam-1.2 with
linux-pam.
* gnu/packages/linux.scm (linux-pam-1.2): Remove variable.
---
 gnu/packages/kerberos.scm |  2 +-
 gnu/packages/linux.scm    | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index a52d4b42cc..8f2bbd1c13 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -147,7 +147,7 @@ (define-public shishi
     (inputs
      (list gnutls
            libidn
-           linux-pam-1.2
+           linux-pam
            zlib
            libgcrypt
            libtasn1))
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 67ca86cbb0..48e58c035d 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1660,21 +1660,6 @@ (define-public linux-pam
 at login.  Local and dynamic reconfiguration are its key features.")
     (license license:bsd-3)))
 
-(define-public linux-pam-1.2
-  (package
-    (inherit linux-pam)
-    (version "1.2.1")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append
-            "http://www.linux-pam.org/library/"
-            "Linux-PAM-" version ".tar.bz2"))
-      (sha256
-       (base32
-        "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl"))
-      (patches (search-patches "linux-pam-no-setfsuid.patch"))))))
-
 (define-public python-pamela
   (package
     (name "python-pamela")
-- 
cgit v1.2.3


From 6757ee9d2bbdc3d064eacfc332d756105521166c Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 16:20:38 +0300
Subject: gnu: shishi: Use G-expressions.

* gnu/packages/kerberos.scm (shishi)[arguments]: Convert to list of
G-Expressions.
---
 gnu/packages/kerberos.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm
index 8f2bbd1c13..9454a5983e 100644
--- a/gnu/packages/kerberos.scm
+++ b/gnu/packages/kerberos.scm
@@ -132,17 +132,18 @@ (define-public shishi
         "14kyj7rdki2g1sj5k42y9v5ya9jar81yw483ivwa80fx2byqyycm"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags
-       '("--disable-static"
-         "--with-key-dir=/etc/shishi"
-         "--with-db-dir=/var/shishi")
+     (list
+       #:configure-flags
+       #~(list "--disable-static"
+               "--with-key-dir=/etc/shishi"
+               "--with-db-dir=/var/shishi")
        #:phases
-       (modify-phases %standard-phases
-        (add-after 'configure 'disable-automatic-key-generation
-          (lambda* (#:key outputs #:allow-other-keys)
-            (substitute* "Makefile"
-             (("^install-data-hook:")
-              "install-data-hook:\nx:\n")))))))
+       #~(modify-phases %standard-phases
+           (add-after 'configure 'disable-automatic-key-generation
+             (lambda _
+               (substitute* "Makefile"
+                (("^install-data-hook:")
+                 "install-data-hook:\nx:\n")))))))
     (native-inputs (list pkg-config))
     (inputs
      (list gnutls
-- 
cgit v1.2.3


From 92769ab2828b53ce41200e8beb8789a12863ee53 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 17:33:02 +0300
Subject: gnu: libtirpc: Fix CVE-2021-46828.

* gnu/packages/onc-rpc.scm (libtirpc)[replacement]: New field.
(libtirpc/fixed): New variable.
(libtirpc-hurd)[source]: Add patch.
* gnu/packages/patches/libtirpc-CVE-2021-46828.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/onc-rpc.scm                           |  12 +-
 gnu/packages/patches/libtirpc-CVE-2021-46828.patch | 567 +++++++++++++++++++++
 3 files changed, 579 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/libtirpc-CVE-2021-46828.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index bfaa1ea5db..a837d16e34 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1429,6 +1429,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libtgvoip-disable-sse2.patch 		\
   %D%/packages/patches/libtgvoip-disable-webrtc.patch 		\
   %D%/packages/patches/libtheora-config-guess.patch		\
+  %D%/packages/patches/libtirpc-CVE-2021-46828.patch		\
   %D%/packages/patches/libtirpc-hurd.patch			\
   %D%/packages/patches/libtommath-fix-linkage.patch		\
   %D%/packages/patches/libtool-skip-tests2.patch		\
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index f1cab94e08..873dc54c30 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice 
 ;;; Copyright © 2019 Marius Bakke 
 ;;; Copyright © 2020 Ricardo Wurmus 
+;;; Copyright © 2022 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@ (define-public libtirpc
   (package
     (name "libtirpc")
     (version "1.3.1")
+    (replacement libtirpc/fixed)
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/libtirpc/libtirpc/"
@@ -74,7 +76,8 @@ (define-public libtirpc/hurd
   (package/inherit libtirpc
     (name "libtirpc-hurd")
     (source (origin (inherit (package-source libtirpc))
-                    (patches (search-patches "libtirpc-hurd.patch"))))
+                    (patches (search-patches "libtirpc-hurd.patch"
+                                             "libtirpc-CVE-2021-46828.patch"))))
     (arguments
      (substitute-keyword-arguments (package-arguments libtirpc)
        ((#:configure-flags flags ''())
@@ -83,6 +86,13 @@ (define-public libtirpc/hurd
                               (assoc-ref %build-inputs "mit-krb5")
                               "/bin/krb5-config")))))))
 
+(define libtirpc/fixed
+  (package
+    (inherit libtirpc)
+    (source (origin
+              (inherit (package-source libtirpc))
+              (patches (search-patches "libtirpc-CVE-2021-46828.patch"))))))
+
 (define-public rpcbind
   (package
     (name "rpcbind")
diff --git a/gnu/packages/patches/libtirpc-CVE-2021-46828.patch b/gnu/packages/patches/libtirpc-CVE-2021-46828.patch
new file mode 100644
index 0000000000..d7ecbd239d
--- /dev/null
+++ b/gnu/packages/patches/libtirpc-CVE-2021-46828.patch
@@ -0,0 +1,567 @@
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-46828
+https://nvd.nist.gov/vuln/detail/CVE-2021-46828
+
+http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=86529758570cef4c73fb9b9c4104fdc510f701ed
+
+From 86529758570cef4c73fb9b9c4104fdc510f701ed Mon Sep 17 00:00:00 2001
+From: Dai Ngo 
+Date: Sat, 21 Aug 2021 13:16:23 -0400
+Subject: [PATCH] Fix DoS vulnerability in libtirpc
+
+Currently svc_run does not handle poll timeout and rendezvous_request
+does not handle EMFILE error returned from accept(2 as it used to.
+These two missing functionality were removed by commit b2c9430f46c4.
+
+The effect of not handling poll timeout allows idle TCP conections
+to remain ESTABLISHED indefinitely. When the number of connections
+reaches the limit of the open file descriptors (ulimit -n) then
+accept(2) fails with EMFILE. Since there is no handling of EMFILE
+error this causes svc_run() to get in a tight loop calling accept(2).
+This resulting in the RPC service of svc_run is being down, it's
+no longer able to service any requests.
+
+RPC service rpcbind, statd and mountd are effected by this
+problem.
+
+Fix by enhancing rendezvous_request to keep the number of
+SVCXPRT conections to 4/5 of the size of the file descriptor
+table. When this thresold is reached, it destroys the idle
+TCP connections or destroys the least active connection if
+no idle connnction was found.
+
+Fixes: 44bf15b8 rpcbind: don't use obsolete svc_fdset interface of libtirpc
+Signed-off-by: dai.ngo@oracle.com
+Signed-off-by: Steve Dickson 
+---
+ INSTALL      | 371 +----------------------------------------------------------
+ src/svc.c    |  17 ++-
+ src/svc_vc.c |  62 +++++++++-
+ 3 files changed, 78 insertions(+), 372 deletions(-)
+ mode change 100644 => 120000 INSTALL
+
+diff --git a/INSTALL b/INSTALL
+deleted file mode 100644
+index 2099840..0000000
+--- a/INSTALL
++++ /dev/null
+@@ -1,370 +0,0 @@
+-Installation Instructions
+-*************************
+-
+-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+-Inc.
+-
+-   Copying and distribution of this file, with or without modification,
+-are permitted in any medium without royalty provided the copyright
+-notice and this notice are preserved.  This file is offered as-is,
+-without warranty of any kind.
+-
+-Basic Installation
+-==================
+-
+-   Briefly, the shell command `./configure && make && make install'
+-should configure, build, and install this package.  The following
+-more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.  Some packages provide this
+-`INSTALL' file but do not implement all of the features documented
+-below.  The lack of an optional feature in a given package is not
+-necessarily a bug.  More recommendations for GNU packages can be found
+-in *note Makefile Conventions: (standards)Makefile Conventions.
+-
+-   The `configure' shell script attempts to guess correct values for
+-various system-dependent variables used during compilation.  It uses
+-those values to create a `Makefile' in each directory of the package.
+-It may also create one or more `.h' files containing system-dependent
+-definitions.  Finally, it creates a shell script `config.status' that
+-you can run in the future to recreate the current configuration, and a
+-file `config.log' containing compiler output (useful mainly for
+-debugging `configure').
+-
+-   It can also use an optional file (typically called `config.cache'
+-and enabled with `--cache-file=config.cache' or simply `-C') that saves
+-the results of its tests to speed up reconfiguring.  Caching is
+-disabled by default to prevent problems with accidental use of stale
+-cache files.
+-
+-   If you need to do unusual things to compile the package, please try
+-to figure out how `configure' could check whether to do them, and mail
+-diffs or instructions to the address given in the `README' so they can
+-be considered for the next release.  If you are using the cache, and at
+-some point `config.cache' contains results you don't want to keep, you
+-may remove or edit it.
+-
+-   The file `configure.ac' (or `configure.in') is used to create
+-`configure' by a program called `autoconf'.  You need `configure.ac' if
+-you want to change it or regenerate `configure' using a newer version
+-of `autoconf'.
+-
+-   The simplest way to compile this package is:
+-
+-  1. `cd' to the directory containing the package's source code and type
+-     `./configure' to configure the package for your system.
+-
+-     Running `configure' might take a while.  While running, it prints
+-     some messages telling which features it is checking for.
+-
+-  2. Type `make' to compile the package.
+-
+-  3. Optionally, type `make check' to run any self-tests that come with
+-     the package, generally using the just-built uninstalled binaries.
+-
+-  4. Type `make install' to install the programs and any data files and
+-     documentation.  When installing into a prefix owned by root, it is
+-     recommended that the package be configured and built as a regular
+-     user, and only the `make install' phase executed with root
+-     privileges.
+-
+-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+-     this time using the binaries in their final installed location.
+-     This target does not install anything.  Running this target as a
+-     regular user, particularly if the prior `make install' required
+-     root privileges, verifies that the installation completed
+-     correctly.
+-
+-  6. You can remove the program binaries and object files from the
+-     source code directory by typing `make clean'.  To also remove the
+-     files that `configure' created (so you can compile the package for
+-     a different kind of computer), type `make distclean'.  There is
+-     also a `make maintainer-clean' target, but that is intended mainly
+-     for the package's developers.  If you use it, you may have to get
+-     all sorts of other programs in order to regenerate files that came
+-     with the distribution.
+-
+-  7. Often, you can also type `make uninstall' to remove the installed
+-     files again.  In practice, not all packages have tested that
+-     uninstallation works correctly, even though it is required by the
+-     GNU Coding Standards.
+-
+-  8. Some packages, particularly those that use Automake, provide `make
+-     distcheck', which can by used by developers to test that all other
+-     targets like `make install' and `make uninstall' work correctly.
+-     This target is generally not run by end users.
+-
+-Compilers and Options
+-=====================
+-
+-   Some systems require unusual options for compilation or linking that
+-the `configure' script does not know about.  Run `./configure --help'
+-for details on some of the pertinent environment variables.
+-
+-   You can give `configure' initial values for configuration parameters
+-by setting variables in the command line or in the environment.  Here
+-is an example:
+-
+-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+-
+-   *Note Defining Variables::, for more details.
+-
+-Compiling For Multiple Architectures
+-====================================
+-
+-   You can compile the package for more than one kind of computer at the
+-same time, by placing the object files for each architecture in their
+-own directory.  To do this, you can use GNU `make'.  `cd' to the
+-directory where you want the object files and executables to go and run
+-the `configure' script.  `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.  This
+-is known as a "VPATH" build.
+-
+-   With a non-GNU `make', it is safer to compile the package for one
+-architecture at a time in the source code directory.  After you have
+-installed the package for one architecture, use `make distclean' before
+-reconfiguring for another architecture.
+-
+-   On MacOS X 10.5 and later systems, you can create libraries and
+-executables that work on multiple system types--known as "fat" or
+-"universal" binaries--by specifying multiple `-arch' options to the
+-compiler but only a single `-arch' option to the preprocessor.  Like
+-this:
+-
+-     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+-                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+-                 CPP="gcc -E" CXXCPP="g++ -E"
+-
+-   This is not guaranteed to produce working output in all cases, you
+-may have to build one architecture at a time and combine the results
+-using the `lipo' tool if you have problems.
+-
+-Installation Names
+-==================
+-
+-   By default, `make install' installs the package's commands under
+-`/usr/local/bin', include files under `/usr/local/include', etc.  You
+-can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+-absolute file name.
+-
+-   You can specify separate installation prefixes for
+-architecture-specific files and architecture-independent files.  If you
+-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+-PREFIX as the prefix for installing programs and libraries.
+-Documentation and other data files still use the regular prefix.
+-
+-   In addition, if you use an unusual directory layout you can give
+-options like `--bindir=DIR' to specify different values for particular
+-kinds of files.  Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.  In general, the
+-default for these options is expressed in terms of `${prefix}', so that
+-specifying just `--prefix' will affect all of the other directory
+-specifications that were not explicitly provided.
+-
+-   The most portable way to affect installation locations is to pass the
+-correct locations to `configure'; however, many packages provide one or
+-both of the following shortcuts of passing variable assignments to the
+-`make install' command line to change installation locations without
+-having to reconfigure or recompile.
+-
+-   The first method involves providing an override variable for each
+-affected directory.  For example, `make install
+-prefix=/alternate/directory' will choose an alternate location for all
+-directory configuration variables that were expressed in terms of
+-`${prefix}'.  Any directories that were specified during `configure',
+-but not in terms of `${prefix}', must each be overridden at install
+-time for the entire installation to be relocated.  The approach of
+-makefile variable overrides for each directory variable is required by
+-the GNU Coding Standards, and ideally causes no recompilation.
+-However, some platforms have known limitations with the semantics of
+-shared libraries that end up requiring recompilation when using this
+-method, particularly noticeable in packages that use GNU Libtool.
+-
+-   The second method involves providing the `DESTDIR' variable.  For
+-example, `make install DESTDIR=/alternate/directory' will prepend
+-`/alternate/directory' before all installation names.  The approach of
+-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+-does not work on platforms that have drive letters.  On the other hand,
+-it does better at avoiding recompilation issues, and works well even
+-when some directory options were not specified in terms of `${prefix}'
+-at `configure' time.
+-
+-Optional Features
+-=================
+-
+-   If the package supports it, you can cause programs to be installed
+-with an extra prefix or suffix on their names by giving `configure' the
+-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+-
+-   Some packages pay attention to `--enable-FEATURE' options to
+-`configure', where FEATURE indicates an optional part of the package.
+-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+-is something like `gnu-as' or `x' (for the X Window System).  The
+-`README' should mention any `--enable-' and `--with-' options that the
+-package recognizes.
+-
+-   For packages that use the X Window System, `configure' can usually
+-find the X include and library files automatically, but if it doesn't,
+-you can use the `configure' options `--x-includes=DIR' and
+-`--x-libraries=DIR' to specify their locations.
+-
+-   Some packages offer the ability to configure how verbose the
+-execution of `make' will be.  For these packages, running `./configure
+---enable-silent-rules' sets the default to minimal output, which can be
+-overridden with `make V=1'; while running `./configure
+---disable-silent-rules' sets the default to verbose, which can be
+-overridden with `make V=0'.
+-
+-Particular systems
+-==================
+-
+-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+-CC is not installed, it is recommended to use the following options in
+-order to use an ANSI C compiler:
+-
+-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+-
+-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+-
+-   HP-UX `make' updates targets which have the same time stamps as
+-their prerequisites, which makes it generally unusable when shipped
+-generated files such as `configure' are involved.  Use GNU `make'
+-instead.
+-
+-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+-parse its `' header file.  The option `-nodtk' can be used as
+-a workaround.  If GNU CC is not installed, it is therefore recommended
+-to try
+-
+-     ./configure CC="cc"
+-
+-and if that doesn't work, try
+-
+-     ./configure CC="cc -nodtk"
+-
+-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+-directory contains several dysfunctional programs; working variants of
+-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+-in your `PATH', put it _after_ `/usr/bin'.
+-
+-   On Haiku, software installed for all users goes in `/boot/common',
+-not `/usr/local'.  It is recommended to use the following options:
+-
+-     ./configure --prefix=/boot/common
+-
+-Specifying the System Type
+-==========================
+-
+-   There may be some features `configure' cannot figure out
+-automatically, but needs to determine by the type of machine the package
+-will run on.  Usually, assuming the package is built to be run on the
+-_same_ architectures, `configure' can figure that out, but if it prints
+-a message saying it cannot guess the machine type, give it the
+-`--build=TYPE' option.  TYPE can either be a short name for the system
+-type, such as `sun4', or a canonical name which has the form:
+-
+-     CPU-COMPANY-SYSTEM
+-
+-where SYSTEM can have one of these forms:
+-
+-     OS
+-     KERNEL-OS
+-
+-   See the file `config.sub' for the possible values of each field.  If
+-`config.sub' isn't included in this package, then this package doesn't
+-need to know the machine type.
+-
+-   If you are _building_ compiler tools for cross-compiling, you should
+-use the option `--target=TYPE' to select the type of system they will
+-produce code for.
+-
+-   If you want to _use_ a cross compiler, that generates code for a
+-platform different from the build platform, you should specify the
+-"host" platform (i.e., that on which the generated programs will
+-eventually be run) with `--host=TYPE'.
+-
+-Sharing Defaults
+-================
+-
+-   If you want to set default values for `configure' scripts to share,
+-you can create a site shell script called `config.site' that gives
+-default values for variables like `CC', `cache_file', and `prefix'.
+-`configure' looks for `PREFIX/share/config.site' if it exists, then
+-`PREFIX/etc/config.site' if it exists.  Or, you can set the
+-`CONFIG_SITE' environment variable to the location of the site script.
+-A warning: not all `configure' scripts look for a site script.
+-
+-Defining Variables
+-==================
+-
+-   Variables not defined in a site shell script can be set in the
+-environment passed to `configure'.  However, some packages may run
+-configure again during the build, and the customized values of these
+-variables may be lost.  In order to avoid this problem, you should set
+-them in the `configure' command line, using `VAR=value'.  For example:
+-
+-     ./configure CC=/usr/local2/bin/gcc
+-
+-causes the specified `gcc' to be used as the C compiler (unless it is
+-overridden in the site shell script).
+-
+-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+-an Autoconf limitation.  Until the limitation is lifted, you can use
+-this workaround:
+-
+-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+-
+-`configure' Invocation
+-======================
+-
+-   `configure' recognizes the following options to control how it
+-operates.
+-
+-`--help'
+-`-h'
+-     Print a summary of all of the options to `configure', and exit.
+-
+-`--help=short'
+-`--help=recursive'
+-     Print a summary of the options unique to this package's
+-     `configure', and exit.  The `short' variant lists options used
+-     only in the top level, while the `recursive' variant lists options
+-     also present in any nested packages.
+-
+-`--version'
+-`-V'
+-     Print the version of Autoconf used to generate the `configure'
+-     script, and exit.
+-
+-`--cache-file=FILE'
+-     Enable the cache: use and save the results of the tests in FILE,
+-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+-     disable caching.
+-
+-`--config-cache'
+-`-C'
+-     Alias for `--cache-file=config.cache'.
+-
+-`--quiet'
+-`--silent'
+-`-q'
+-     Do not print messages saying which checks are being made.  To
+-     suppress all normal output, redirect it to `/dev/null' (any error
+-     messages will still be shown).
+-
+-`--srcdir=DIR'
+-     Look for the package's source code in directory DIR.  Usually
+-     `configure' can determine that directory automatically.
+-
+-`--prefix=DIR'
+-     Use DIR as the installation prefix.  *note Installation Names::
+-     for more details, including other options available for fine-tuning
+-     the installation locations.
+-
+-`--no-create'
+-`-n'
+-     Run the configure checks, but stop before creating any output
+-     files.
+-
+-`configure' also accepts some other, not widely useful, options.  Run
+-`configure --help' for more details.
+diff --git a/INSTALL b/INSTALL
+new file mode 120000
+index 0000000..e3f22c0
+--- /dev/null
++++ b/INSTALL
+@@ -0,0 +1 @@
++/usr/share/automake-1.16/INSTALL
+\ No newline at end of file
+diff --git a/src/svc.c b/src/svc.c
+index 6db164b..3a8709f 100644
+--- a/src/svc.c
++++ b/src/svc.c
+@@ -57,7 +57,7 @@
+ 
+ #define max(a, b) (a > b ? a : b)
+ 
+-static SVCXPRT **__svc_xports;
++SVCXPRT **__svc_xports;
+ int __svc_maxrec;
+ 
+ /*
+@@ -194,6 +194,21 @@ __xprt_do_unregister (xprt, dolock)
+     rwlock_unlock (&svc_fd_lock);
+ }
+ 
++int
++svc_open_fds()
++{
++	int ix;
++	int nfds = 0;
++
++	rwlock_rdlock (&svc_fd_lock);
++	for (ix = 0; ix < svc_max_pollfd; ++ix) {
++		if (svc_pollfd[ix].fd != -1)
++			nfds++;
++	}
++	rwlock_unlock (&svc_fd_lock);
++	return (nfds);
++}
++
+ /*
+  * Add a service program to the callout list.
+  * The dispatch routine will be called when a rpc request for this
+diff --git a/src/svc_vc.c b/src/svc_vc.c
+index f1d9f00..3dc8a75 100644
+--- a/src/svc_vc.c
++++ b/src/svc_vc.c
+@@ -64,6 +64,8 @@
+ 
+ 
+ extern rwlock_t svc_fd_lock;
++extern SVCXPRT **__svc_xports;
++extern int svc_open_fds();
+ 
+ static SVCXPRT *makefd_xprt(int, u_int, u_int);
+ static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
+@@ -82,6 +84,7 @@ static void svc_vc_ops(SVCXPRT *);
+ static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
+ static bool_t svc_vc_rendezvous_control (SVCXPRT *xprt, const u_int rq,
+ 				   	     void *in);
++static int __svc_destroy_idle(int timeout);
+ 
+ struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
+ 	u_int sendsize;
+@@ -313,13 +316,14 @@ done:
+ 	return (xprt);
+ }
+ 
++
+ /*ARGSUSED*/
+ static bool_t
+ rendezvous_request(xprt, msg)
+ 	SVCXPRT *xprt;
+ 	struct rpc_msg *msg;
+ {
+-	int sock, flags;
++	int sock, flags, nfds, cnt;
+ 	struct cf_rendezvous *r;
+ 	struct cf_conn *cd;
+ 	struct sockaddr_storage addr;
+@@ -379,6 +383,16 @@ again:
+ 
+ 	gettimeofday(&cd->last_recv_time, NULL);
+ 
++	nfds = svc_open_fds();
++	if (nfds >= (_rpc_dtablesize() / 5) * 4) {
++		/* destroy idle connections */
++		cnt = __svc_destroy_idle(15);
++		if (cnt == 0) {
++			/* destroy least active */
++			__svc_destroy_idle(0);
++		}
++	}
++
+ 	return (FALSE); /* there is never an rpc msg to be processed */
+ }
+ 
+@@ -820,3 +834,49 @@ __svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
+ {
+ 	return FALSE;
+ }
++
++static int
++__svc_destroy_idle(int timeout)
++{
++	int i, ncleaned = 0;
++	SVCXPRT *xprt, *least_active;
++	struct timeval tv, tdiff, tmax;
++	struct cf_conn *cd;
++
++	gettimeofday(&tv, NULL);
++	tmax.tv_sec = tmax.tv_usec = 0;
++	least_active = NULL;
++	rwlock_wrlock(&svc_fd_lock);
++
++	for (i = 0; i <= svc_max_pollfd; i++) {
++		if (svc_pollfd[i].fd == -1)
++			continue;
++		xprt = __svc_xports[i];
++		if (xprt == NULL || xprt->xp_ops == NULL ||
++			xprt->xp_ops->xp_recv != svc_vc_recv)
++			continue;
++		cd = (struct cf_conn *)xprt->xp_p1;
++		if (!cd->nonblock)
++			continue;
++		if (timeout == 0) {
++			timersub(&tv, &cd->last_recv_time, &tdiff);
++			if (timercmp(&tdiff, &tmax, >)) {
++				tmax = tdiff;
++				least_active = xprt;
++			}
++			continue;
++		}
++		if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
++			__xprt_unregister_unlocked(xprt);
++			__svc_vc_dodestroy(xprt);
++			ncleaned++;
++		}
++	}
++	if (timeout == 0 && least_active != NULL) {
++		__xprt_unregister_unlocked(least_active);
++		__svc_vc_dodestroy(least_active);
++		ncleaned++;
++	}
++	rwlock_unlock(&svc_fd_lock);
++	return (ncleaned);
++}
+-- 
+1.8.3.1
+
-- 
cgit v1.2.3


From f0ae9da3210cc6d87ca519545203daf9751f3465 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 19:54:34 +0300
Subject: gnu: gss: Update to 1.0.4.

* gnu/packages/gsasl.scm (gss): Update to 1.0.4.
---
 gnu/packages/gsasl.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm
index eb3255beed..70624f9c59 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2017 Ricardo Wurmus 
 ;;; Copyright © 2017 Eric Bavier 
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice 
-;;; Copyright © 2020, 2021 Efraim Flashner 
+;;; Copyright © 2020-2022 Efraim Flashner 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -54,13 +54,13 @@ (define-public libntlm
 (define-public gss
   (package
    (name "gss")
-   (version "1.0.3")
+   (version "1.0.4")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://gnu/gss/gss-" version
                                 ".tar.gz"))
             (sha256 (base32
-                     "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz"))))
+                     "0www841ax21f5f61pdjk9fjdn9s2xf1wnblb47kzrqyaykgapkpc"))))
    (build-system gnu-build-system)
    (inputs (list nettle shishi zlib))
    (synopsis "Generic Security Service library")
-- 
cgit v1.2.3


From eb8ab9128467113c62b020bfd4d21e20aba7402f Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 20:04:53 +0300
Subject: gnu: msmtp: Update to 1.8.22.

* gnu/packages/mail.scm (msmtp): Update to 1.8.22.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d4f9b28060..f72f6c21e3 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1721,14 +1721,14 @@ (define-public claws-mail
 (define-public msmtp
   (package
     (name "msmtp")
-    (version "1.8.20")
+    (version "1.8.22")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://marlam.de/msmtp/releases"
                            "/msmtp-" version ".tar.xz"))
        (sha256
-        (base32 "04di9qs2bwiwidnhk3afif5mh05q3ggr9cyhr5ysyj0gzjmf4fnr"))))
+        (base32 "1rx3ksvwdfrwahsd2lwf52vnhhq72ygb0kjy6ci2df55hri2010v"))))
     (build-system gnu-build-system)
     (inputs
      (list libsecret gnutls zlib gsasl))
-- 
cgit v1.2.3


From f63ef9ab0de9f3cce6e573f548e9dabcf5e6be7f Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 20:31:31 +0300
Subject: gnu: msmtp: Don't override defaults when checking for network.

This is no longer needed as the defaults have changed upstream.

* gnu/packages/mail.scm (msmtp)[arguments]: Remove substitution to force
'ping' instead of 'netcat' to check for network access.
---
 gnu/packages/mail.scm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f72f6c21e3..d0839fbe09 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1751,11 +1751,7 @@ (define-public msmtp
                (install-file (string-append msmtpq "/msmtpq") bin)
                (install-file (string-append msmtpq "/msmtp-queue") bin)
                (install-file (string-append msmtpq "/README.msmtpq") doc)
-               (install-file "scripts/vim/msmtp.vim" vimfiles)
-               ;; Don't rely on netcat being in the PATH to test for a
-               ;; connection, instead look up and ping debian.org.
-               (substitute* (string-append bin "/msmtpq")
-                 (("EMAIL_CONN_TEST=n") "EMAIL_CONN_TEST=p"))))))))
+               (install-file "scripts/vim/msmtp.vim" vimfiles)))))))
     (properties
      '((release-monitoring-url . "https://marlam.de/msmtp/download/")))
     (synopsis
-- 
cgit v1.2.3


From eed987855ced6d1774326cf5b261680727c5d65a Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Sun, 7 Aug 2022 20:36:19 +0300
Subject: gnu: msmtp: Use G-Expressions.

* gnu/packages/mail.scm (msmtp)[arguments]: Rewrite using G-Expressions.
---
 gnu/packages/mail.scm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index d0839fbe09..c31361b6a5 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1736,22 +1736,24 @@ (define-public msmtp
      (list pkg-config))
     (home-page "https://marlam.de/msmtp/")
     (arguments
-     `(#:configure-flags (list "--with-libgsasl"
-                               "--with-libidn"
-                               "--with-tls=gnutls")
+     (list
+       #:configure-flags
+       #~(list "--with-libgsasl"
+               "--with-libidn"
+               "--with-tls=gnutls")
        #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-additional-files
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin"))
-                    (doc (string-append out "/share/doc/msmtp"))
-                    (msmtpq "scripts/msmtpq")
-                    (vimfiles (string-append out "/share/vim/vimfiles/syntax")))
-               (install-file (string-append msmtpq "/msmtpq") bin)
-               (install-file (string-append msmtpq "/msmtp-queue") bin)
-               (install-file (string-append msmtpq "/README.msmtpq") doc)
-               (install-file "scripts/vim/msmtp.vim" vimfiles)))))))
+       #~(modify-phases %standard-phases
+           (add-after 'install 'install-additional-files
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out #$output)
+                      (bin (string-append out "/bin"))
+                      (doc (string-append out "/share/doc/msmtp"))
+                      (msmtpq "scripts/msmtpq")
+                      (vimfiles (string-append out "/share/vim/vimfiles/syntax")))
+                 (install-file (string-append msmtpq "/msmtpq") bin)
+                 (install-file (string-append msmtpq "/msmtp-queue") bin)
+                 (install-file (string-append msmtpq "/README.msmtpq") doc)
+                 (install-file "scripts/vim/msmtp.vim" vimfiles)))))))
     (properties
      '((release-monitoring-url . "https://marlam.de/msmtp/download/")))
     (synopsis
-- 
cgit v1.2.3


From ee216d16ef5ea537eaf5508dcffa5d808ab62bb0 Mon Sep 17 00:00:00 2001
From: 宋文武 
Date: Mon, 8 Aug 2022 10:15:13 +0800
Subject: gnu: tiled: Fix build.

Fixes .

* gnu/packages/game-development.scm (tiled)[arguments]:
Use 'search-input-file' to locate 'lrelease'.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 70bd4c0251..090e7f7d12 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -531,8 +531,8 @@ (define-public tiled
              (substitute* "translations/translations.pro"
                (("LRELEASE =.*")
                 (string-append "LRELEASE = "
-                               (assoc-ref inputs "qttools-5")
-                               "/bin/lrelease\n")))
+                               (search-input-file inputs "/bin/lrelease")
+                               "\n")))
              (let ((out (assoc-ref outputs "out")))
                (invoke "qmake"
                        (string-append "PREFIX=" out))))))))
-- 
cgit v1.2.3


From bd698fede7cebc82fae680a62fad8334d7d54159 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 8 Aug 2022 09:08:22 +0200
Subject: gnu: python-django: Update to 4.0.7 [fixes CVE-2022-36359].

* gnu/packages/django.scm (python-django-4.0): Update to 4.0.7.
---
 gnu/packages/django.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index b32faab183..4209686c98 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -54,13 +54,13 @@ (define-module (gnu packages django)
 (define-public python-django-4.0
   (package
     (name "python-django")
-    (version "4.0.6")
+    (version "4.0.7")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "1bn3lg68r2bz6rzwnd7y2sin6fi9vahdqdsmamrx6zw2yqzpjym6"))))
+                "0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3


From d6dab262d594b86083b68c32f7693d88b4e04aec Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 8 Aug 2022 09:09:16 +0200
Subject: gnu: python-django@3.2: Update to 3.2.15 [fixes CVE-2022-36359].

* gnu/packages/django.scm (python-django-3.2): Update to 3.2.15.
---
 gnu/packages/django.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4209686c98..0eb9ccf0f3 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -141,13 +141,13 @@ (define-public python-django-4.0
 (define-public python-django-3.2
   (package
     (inherit python-django-4.0)
-    (version "3.2.14")
+    (version "3.2.15")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Django" version))
               (sha256
                (base32
-                "1krg0bfd78mnqly1gzbprssz3bz6xryc2fig0x75la2vifx84wb7"))))
+                "0asqhsw73555wjnvd7769b89q9w96q2k95mcr634mw92m2qk86gp"))))
     (native-search-paths '())           ;no need for TZDIR
     (propagated-inputs
      (modify-inputs (package-propagated-inputs python-django-4.0)
-- 
cgit v1.2.3


From 8ad976d49ffdb651f7d26ed3122d48f78e7e8fc1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 8 Aug 2022 09:17:27 +0200
Subject: gnu: postorius: Update to 1.3.6.

* gnu/packages/mail.scm (postorius): Update to 1.3.6.
[inputs]: Change from PYTHON-DJANGO-2.2 to PYTHON-DJANGO.
---
 gnu/packages/mail.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index c31361b6a5..e9bf50a641 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3541,14 +3541,14 @@ (define-public python-hyperkitty
 (define-public postorius
   (package
     (name "postorius")
-    (version "1.3.3")
+    (version "1.3.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "postorius" version))
        (sha256
         (base32
-         "08jn23gblbkfl09qlykbpsmp39mmach3sl69h1j5cd5kkx839rwa"))))
+         "0s0sv97nmszl5pl9rnnyzp3sxpmdhpxqrdwv7nc0ww8zs99w831b"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -3563,7 +3563,7 @@ (define-public postorius
        #:tests? #f)) ; Tests try to run a mailman instance to test against.
     (inputs
      (list python-readme-renderer python-mailmanclient
-           python-django-2.2 python-django-mailman3))
+           python-django python-django-mailman3))
     (native-inputs
      (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
     (home-page "https://gitlab.com/mailman/postorius")
-- 
cgit v1.2.3


From 0e320fbfdcafb14605deda4685721b6361eaa785 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Mon, 8 Aug 2022 09:21:24 +0200
Subject: gnu: chatty: Update to 0.6.7.

* gnu/packages/messaging.scm (chatty): Update to 0.6.7.
[source]: Fetch git submodules too.
[arguments]: Add pre-check phase.
[native-inputs]: Add XORG-SERVER-FOR-TESTS.
[inputs]: Add GNOME-DESKTOP.
---
 gnu/packages/messaging.scm | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 2f61a8f783..47798c3586 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -20,7 +20,7 @@
 ;;; Copyright © 2019, 2020 Timotej Lazar 
 ;;; Copyright © 2020, 2021 Nicolò Balzarotti 
 ;;; Copyright © 2020 Vincent Legoll 
-;;; Copyright © 2020 Marius Bakke 
+;;; Copyright © 2020, 2022 Marius Bakke 
 ;;; Copyright © 2020 Reza Alizadeh Majd 
 ;;; Copyright © 2020 Jonathan Brielmaier 
 ;;; Copyright © 2020 Mason Hock 
@@ -2810,16 +2810,22 @@ (define-public libphonenumber
 (define-public chatty
  (package
    (name "chatty")
-   (version "0.4.0")
+   (version "0.6.7")
    (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://source.puri.sm/Librem5/chatty.git")
-                    (commit (string-append "v" version))))
+                    (commit (string-append "v" version))
+                    ;; Fetch the required subprojects, notably libcmatrix
+                    ;; which has no releases and is developed in tandem.
+                    ;; Note: this also pulls in libgd, and embeds functionality
+                    ;; from it that is not part of the public API, making
+                    ;; unbundling difficult.
+                    (recursive? #true)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"))))
+                "11q07vjrrjf3k00kk41vm79brpq0qigz7l328br3g0li979kz32v"))))
    (build-system meson-build-system)
    (arguments
     '(#:phases
@@ -2827,12 +2833,25 @@ (define-public chatty
         (add-after 'unpack 'skip-updating-desktop-database
           (lambda _
             (substitute* "meson.build"
-              (("meson.add_install_script.*") "")))))))
+              (("meson.add_install_script.*") ""))))
+        (add-before 'check 'pre-check
+          (lambda* (#:key tests? #:allow-other-keys)
+            (when tests?
+              ;; One test requires a running Xorg server.  Start one.
+              (system "Xvfb :1 &")
+              (setenv "DISPLAY" ":1")
+              ;; HOME must be writable for writing configuration files.
+              (setenv "HOME" "/tmp")))))))
    (native-inputs
-    (list gettext-minimal `(,glib "bin") pkg-config protobuf))
+    (list gettext-minimal
+          `(,glib "bin")
+          pkg-config
+          protobuf
+          xorg-server-for-tests))
    (inputs
     (list feedbackd
           folks
+          gnome-desktop
           gsettings-desktop-schemas
           gspell
           json-glib
-- 
cgit v1.2.3


From 19592539e54902097ec0a5a16ba38f41a687236c Mon Sep 17 00:00:00 2001
From: 宋文武 
Date: Mon, 8 Aug 2022 15:58:44 +0800
Subject: gnu: cool-retro-term: Fix build and runtime errors.

This fixes .

* gnu/packages/terminals.scm (cool-retro-term)
[inputs]: Add qtquickcontrols-5.
[arguments]: Fix 'QML2_IMPORT_PATH'.
---
 gnu/packages/terminals.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 7e5016f08f..1b08ec4979 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -783,7 +783,8 @@ (define-public cool-retro-term
                       (("COMMODORE_PET") "PROGGY_TINY"))))))
       (build-system gnu-build-system)
       (inputs
-       (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2-5 bash-minimal))
+       (list qtbase-5 qtdeclarative-5 qtgraphicaleffects
+             qtquickcontrols-5 qtquickcontrols2-5 bash-minimal))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
@@ -805,9 +806,10 @@ (define-public cool-retro-term
                      (,(string-append out qml)
                       ,@(map (lambda (i)
                                (string-append (assoc-ref inputs i) qml))
-                             '("qtdeclarative-5"
+                             '("qtdeclarative"
                                "qtgraphicaleffects"
-                               "qtquickcontrols2-5"))))))))
+                               "qtquickcontrols"
+                               "qtquickcontrols2"))))))))
            (add-after 'install 'add-alternate-name
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
-- 
cgit v1.2.3


From bde902cb78c529174155e2d46ed814123182619f Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Mon, 8 Aug 2022 10:54:10 +0200
Subject: gnu: guile-newt: Update to 0.0.3.

Fixes: .

* gnu/packages/guile-xyz.scm (guile-newt): Update to 0.0.3.
[native-inputs]: Add guile-3.0 that is required when cross-compiling.
---
 gnu/packages/guile-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 3b74540a20..33d64018d3 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1330,7 +1330,7 @@ (define-public guile2.2-email
 (define-public guile-newt
   (package
     (name "guile-newt")
-    (version "0.0.2")
+    (version "0.0.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1339,7 +1339,7 @@ (define-public guile-newt
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gksd1lzgjjh1p9vczghg8jw995d22hm34kbsiv8rcryirv2xy09"))))
+                "0hbznqigdkyh0kdkpnkp7sz2qd0g5dvmibcdi1rki02zg78mzypv"))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
@@ -1347,7 +1347,7 @@ (define-public guile-newt
     (inputs
      (list guile-3.0 newt))
     (native-inputs
-     (list autoconf automake pkg-config))
+     (list autoconf automake pkg-config guile-3.0))
     (synopsis "Guile bindings to Newt")
     (description
      "This package provides bindings for Newt, a programming library for
-- 
cgit v1.2.3


From bc3eaf9d83c5f227681f43bbc70067d92fc72193 Mon Sep 17 00:00:00 2001
From: Morgan Smith 
Date: Fri, 22 Jul 2022 10:54:32 -0400
Subject: gnu: go-gitlab.com-shackra-goimapnotify: Update to 2.3.7.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/mail.scm (go-gitlab.com-shackra-goimapnotify): Update to 2.3.7.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/mail.scm | 52 +++++++++++++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index e9bf50a641..33dcc48e04 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -404,34 +404,32 @@ (define-public mailutils
      (list license:gpl3+ license:lgpl3+))))
 
 (define-public go-gitlab.com-shackra-goimapnotify
-  (let ((commit "832bc7112db9b28e28d69e90b91ea6c005244c9b")
-        (revision "0"))
-    (package
-      (name "go-gitlab.com-shackra-goimapnotify")
-      (version (git-version "0.0.0" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://gitlab.com/shackra/goimapnotify")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1h27kshx4vwl5k6vc2szsq3d701fzs4gczjypz907f8hj0lrnjmy"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "gitlab.com/shackra/goimapnotify"))
-      (propagated-inputs
-       (list go-github-com-emersion-go-imap
-             go-github-com-emersion-go-imap-idle
-             go-github-com-emersion-go-sasl go-github-com-sirupsen-logrus
-             go-golang-org-x-text))
-      (synopsis "Execute scripts on IMAP mailbox changes")
-      (description
-       "Script to execute scripts on IMAP mailbox changes (new/deleted/updated
+  (package
+    (name "go-gitlab.com-shackra-goimapnotify")
+    (version "2.3.7")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/shackra/goimapnotify")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "06jhxvhdvdv049qpvp8ahnhvswvbpakpw7aq2lw790f3x89px2ss"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "gitlab.com/shackra/goimapnotify"))
+    (propagated-inputs
+     (list go-github-com-emersion-go-imap
+           go-github-com-emersion-go-imap-idle
+           go-github-com-emersion-go-sasl go-github-com-sirupsen-logrus
+           go-golang-org-x-text))
+    (synopsis "Execute scripts on IMAP mailbox changes")
+    (description
+     "Script to execute scripts on IMAP mailbox changes (new/deleted/updated
 messages) using IDLE.  Implemented in Go.")
-      (home-page "https://gitlab.com/shackra/goimapnotify")
-      (license license:gpl3+))))
+    (home-page "https://gitlab.com/shackra/goimapnotify")
+    (license license:gpl3+)))
 
 (define-public guile2.2-mailutils
   (package
-- 
cgit v1.2.3


From d2470772c66172e940f555f24a76de873c29a137 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Mon, 8 Aug 2022 12:06:42 +0200
Subject: gnu: Add texlive-cite.

* gnu/packages/tex.scm (texlive-cite): New variable.
---
 gnu/packages/tex.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 67c07afff9..6d3572cf25 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -978,6 +978,26 @@ (define-public texlive-cbfonts-fd
 Tip: installing @code{texlive-cbfonts} will automatically propagate this one.")
     (license license:lppl1.3c+)))
 
+(define-public texlive-cite
+  (package
+    (inherit (simple-texlive-package
+              "texlive-cite"
+              (list "doc/latex/cite/" "tex/latex/cite/")
+              (base32
+               "0b1amznayxj80dmqbzcysmj7q8aksbyz98k6djsqi0mhwp1cd0fd")
+              #:trivial? #t))
+    (version (number->string %texlive-revision))
+    (home-page "https://ctan.org/pkg/cite")
+    (synopsis "Improved citation handling in LaTeX")
+    (description
+     "The package supports compressed, sorted lists of numerical citations,
+and also deals with various punctuation and other issues of representation,
+including comprehensive management of break points.  The package is compatible
+with both hyperref and backref.  The package is (unsurprisingly) part of the
+cite bundle of the author's citation-related packages.")
+    (license (license:fsf-free
+              "/share/texmf-dist/doc/latex/cite/README"))))
+
 (define-public texlive-cm
   (let ((template (simple-texlive-package
                    "texlive-cm"
-- 
cgit v1.2.3


From ec6499aad231b8a5991f38c1ec982be4b3598837 Mon Sep 17 00:00:00 2001
From: Mădălin Ionel Patrașcu 
Date: Fri, 5 Aug 2022 11:33:03 +0200
Subject: gnu: Add phyml.

* gnu/packages/bioinformatics.scm (phyml): New variable.

Co-authored-by: Ricardo Wurmus 
---
 gnu/packages/bioinformatics.scm | 85 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 00238531db..289079b766 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -9068,6 +9068,91 @@ (define-public phylip
 programs for inferring phylogenies (evolutionary trees).")
     (license license:bsd-2)))
 
+(define-public phyml
+  (package
+    (name "phyml")
+    (version "3.3.20220408")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/stephaneguindon/phyml")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "03hdqmnsgnzkcrp9r9ajdfkj33jgq4b86kra8ssjlrph65y344sa"))
+              (snippet
+               '(delete-file "doc/phyml-manual.pdf"))))
+    (build-system gnu-build-system)
+    (supported-systems '("x86_64-linux"))
+    (arguments
+     (let ((default-flags (list "--disable-native")))
+       `(#:phases
+         (let ((build (lambda (what)
+                         (lambda args
+                           (apply (assoc-ref %standard-phases 'configure)
+                                  (append args
+                                          (list #:configure-flags
+                                                (cons (format #false "--enable-~a" what)
+                                                      '() #;,default-flags))))
+                           (apply (assoc-ref %standard-phases 'build) args)
+                           (apply (assoc-ref %standard-phases 'install) args)))))
+           (modify-phases %standard-phases
+             ;; We cannot use --disable-native; see
+             ;; https://github.com/stephaneguindon/phyml/issues/173 Instead we
+             ;; patch the code to at least get rid of -march=native.
+             (add-after 'unpack 'remove-march-native
+               (lambda _
+                 (substitute* "configure.ac"
+                   (("DEFAULT_VECTOR_FLAG=\"-march=native\"")
+                    "DEFAULT_VECTOR_FLAG=\"-march=athlon64-sse3\"\n"))))
+             (add-after 'build 'build-manual
+               (lambda _
+                 (with-directory-excursion "doc"
+                   (invoke "make" "phyml-manual.pdf"))))
+             (add-after 'build-manual 'install-manual
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (with-directory-excursion "doc"
+                   (install-file "phyml-manual.pdf"
+                                 (string-append (assoc-ref outputs "out")
+                                                "/share/doc/phyml")))))
+             (add-after 'install 'build-phyml-mpi
+               (build "phyml-mpi"))
+             (add-after 'build-phyml-mpi 'build-rf
+               (build "rf"))
+             (add-after 'build-rf 'build-phyrex
+               (build "phyrex")))))))
+    (native-inputs
+     (list automake
+           autoconf
+           openmpi
+           (texlive-updmap.cfg (list texlive-amsfonts
+                                     texlive-caption
+                                     texlive-cite
+                                     texlive-fonts-ec
+                                     texlive-grfext
+                                     texlive-hyperref
+                                     texlive-latex-fancyvrb
+                                     texlive-latex-graphics
+                                     texlive-latex-psfrag
+                                     texlive-xcolor))))
+    (home-page "https://github.com/stephaneguindon/phyml")
+    (synopsis "Programs for working on SAM/BAM files")
+    (description
+     "@code{PhyML} is a software package that uses modern statistical
+approaches to analyse alignments of nucleotide or amino acid sequences in a
+phylogenetic framework.  The main tool in this package builds phylogenies
+under the maximum likelihood criterion.  It implements a large number of
+substitution models coupled with efficient options to search the space of
+phylogenetic tree topologies.  code{PhyREX} fits the
+spatial-Lambda-Fleming-Viot model to geo-referenced genetic data.  This model
+is similar to the structured coalescent but assumes that individuals are
+distributed along a spatial continuum rather than discrete demes.
+@code{PhyREX} can be used to estimate population densities and rates of
+dispersal.  Its output can be processed by treeannotator (from the
+@code{BEAST} package) as well as @code{SPREAD}.")
+    (license license:gpl3)))
+
 (define-public imp
   (package
     (name "imp")
-- 
cgit v1.2.3


From a8868a53ade4269bd7f48d805daf39257cb5954a Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe 
Date: Mon, 8 Aug 2022 17:13:30 +0200
Subject: gnu: guile-parted: Update to 0.0.6.

Fix cross-compilation.

* gnu/packages/guile-xyz.scm (guile-parted): Update to 0.0.6.
[native-inputs]: Add guile-3.0 and guile-bytestructures.
---
 gnu/packages/guile-xyz.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 33d64018d3..cf7f3e6774 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -1393,7 +1393,7 @@ (define-public guile-mastodon
 (define-public guile-parted
   (package
     (name "guile-parted")
-    (version "0.0.5")
+    (version "0.0.6")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1402,18 +1402,18 @@ (define-public guile-parted
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ar6n38br3h1jm54yy6d54rpqdgsy7pmnj3nqdzqrfk8z0kx0rm9"))
+                "12ygz0dw8zjr8g3z4g3sh4d1yw3fiphh0ssyqd4nllqa3sfwv21f"))
               (modules '((guix build utils)))))
     (build-system gnu-build-system)
     (arguments
      '(#:make-flags
        '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
+    (native-inputs
+     (list autoconf automake guile-3.0 guile-bytestructures pkg-config))
     (inputs
      (list guile-3.0 parted))
     (propagated-inputs
      (list guile-bytestructures))
-    (native-inputs
-     (list autoconf automake pkg-config))
     (synopsis "Guile bindings to GNU Parted")
     (description
      "This package provides bindings for GNU Parted library, a C library
-- 
cgit v1.2.3


From b8424f0cddd6be29a51b778790dd5a4ca10007c4 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 8 Aug 2022 18:47:20 +0300
Subject: gnu: unzip: Mark safe from CVE-2019-13232.

* gnu/packages/compression.scm (unzip)[properties]: New field.
---
 gnu/packages/compression.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6070c5beb1..e5bc3813c5 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1846,6 +1846,7 @@ (define-public unzip
 behaviour (with no options) is to extract into the current directory, and
 subdirectories below it, all files from the specified zipfile.  UnZip
 recreates the stored directory structure by default.")
+    (properties `((lint-hidden-cve . ("CVE-2019-13232"))))
     (license (license:non-copyleft "file://LICENSE"
                                    "See LICENSE in the distribution."))))
 
-- 
cgit v1.2.3


From 5e009a88746bf3c20b29626a8671055c47a42bd0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Mon, 8 Aug 2022 19:13:07 +0300
Subject: gnu: unzip: Patch for CVE-2022-0529 and CVE-2022-0530.

* gnu/packages/compression.scm (unzip)[replacement]: New field.
(unzip/fixed): New variable.
* gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                       |   1 +
 gnu/packages/compression.scm                       |  10 ++
 .../unzip-CVE-2022-0529+CVE-2022-0530.patch        | 177 +++++++++++++++++++++
 3 files changed, 188 insertions(+)
 create mode 100644 gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index a837d16e34..ac40640658 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1900,6 +1900,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/unzip-CVE-2014-9636.patch		\
   %D%/packages/patches/unzip-CVE-2015-7696.patch		\
   %D%/packages/patches/unzip-CVE-2015-7697.patch		\
+  %D%/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch	\
   %D%/packages/patches/unzip-allow-greater-hostver-values.patch	\
   %D%/packages/patches/unzip-attribs-overflow.patch		\
   %D%/packages/patches/unzip-overflow-on-invalid-input.patch	\
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index e5bc3813c5..6854bcafe4 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1768,6 +1768,7 @@ (define-public unzip
   (package (inherit zip)
     (name "unzip")
     (version "6.0")
+    (replacement unzip/fixed)
     (source
      (origin
        (method url-fetch)
@@ -1850,6 +1851,15 @@ (define-public unzip
     (license (license:non-copyleft "file://LICENSE"
                                    "See LICENSE in the distribution."))))
 
+(define unzip/fixed
+  (package (inherit unzip)
+    (source
+     (origin
+       (inherit (package-source unzip))
+       (patches (append
+                  (origin-patches (package-source unzip))
+                  (search-patches "unzip-CVE-2022-0529+CVE-2022-0530.patch")))))))
+
 (define-public ziptime
   (let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc")
         (revision "0"))
diff --git a/gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch b/gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch
new file mode 100644
index 0000000000..e3fe2314ac
--- /dev/null
+++ b/gnu/packages/patches/unzip-CVE-2022-0529+CVE-2022-0530.patch
@@ -0,0 +1,177 @@
+https://nvd.nist.gov/vuln/detail/CVE-2022-0529
+https://nvd.nist.gov/vuln/detail/CVE-2022-0530
+https://sources.debian.org/src/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch/
+
+From: Steven M. Schweda 
+Subject: Fix for CVE-2022-0529 and CVE-2022-0530
+Bug-Debian: https://bugs.debian.org/1010355
+X-Debian-version: 6.0-27
+
+--- a/fileio.c
++++ b/fileio.c
+@@ -171,8 +171,10 @@
+ static ZCONST char Far FilenameTooLongTrunc[] =
+   "warning:  filename too long--truncating.\n";
+ #ifdef UNICODE_SUPPORT
++   static ZCONST char Far UFilenameCorrupt[] =
++     "error: Unicode filename corrupt.\n";
+    static ZCONST char Far UFilenameTooLongTrunc[] =
+-     "warning:  Converted unicode filename too long--truncating.\n";
++     "warning:  Converted Unicode filename too long--truncating.\n";
+ #endif
+ static ZCONST char Far ExtraFieldTooLong[] =
+   "warning:  extra field too long (%d).  Ignoring...\n";
+@@ -2361,16 +2363,30 @@
+                   /* convert UTF-8 to local character set */
+                   fn = utf8_to_local_string(G.unipath_filename,
+                                             G.unicode_escape_all);
+-                  /* make sure filename is short enough */
+-                  if (strlen(fn) >= FILNAMSIZ) {
+-                    fn[FILNAMSIZ - 1] = '\0';
++
++                  /* 2022-07-22 SMS, et al.  CVE-2022-0530
++                   * Detect conversion failure, emit message.
++                   * Continue with unconverted name.
++                   */
++                  if (fn == NULL)
++                  {
+                     Info(slide, 0x401, ((char *)slide,
+-                      LoadFarString(UFilenameTooLongTrunc)));
+-                    error = PK_WARN;
++                     LoadFarString(UFilenameCorrupt)));
++                    error = PK_ERR;
++                  }
++                  else
++                  {
++                    /* make sure filename is short enough */
++                    if (strlen(fn) >= FILNAMSIZ) {
++                      fn[FILNAMSIZ - 1] = '\0';
++                      Info(slide, 0x401, ((char *)slide,
++                        LoadFarString(UFilenameTooLongTrunc)));
++                      error = PK_WARN;
++                    }
++                    /* replace filename with converted UTF-8 */
++                    strcpy(G.filename, fn);
++                    free(fn);
+                   }
+-                  /* replace filename with converted UTF-8 */
+-                  strcpy(G.filename, fn);
+-                  free(fn);
+                 }
+ # endif /* UNICODE_WCHAR */
+                 if (G.unipath_filename != G.filename_full)
+--- a/process.c
++++ b/process.c
+@@ -222,6 +222,8 @@
+      "\nwarning:  Unicode Path version > 1\n";
+    static ZCONST char Far UnicodeMismatchError[] =
+      "\nwarning:  Unicode Path checksum invalid\n";
++   static ZCONST char Far UFilenameTooLongTrunc[] =
++     "warning:  filename too long (P1) -- truncating.\n";
+ #endif
+ 
+ 
+@@ -1915,7 +1917,7 @@
+     Sets both local header and central header fields.  Not terribly clever,
+     but it means that this procedure is only called in one place.
+ 
+-    2014-12-05 SMS.
++    2014-12-05 SMS.  (oCERT.org report.)  CVE-2014-8141.
+     Added checks to ensure that enough data are available before calling
+     makeint64() or makelong().  Replaced various sizeof() values with
+     simple ("4" or "8") constants.  (The Zip64 structures do not depend
+@@ -1947,9 +1949,10 @@
+               ef_len - EB_HEADSIZE));
+             break;
+         }
++
+         if (eb_id == EF_PKSZ64)
+         {
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+ 
+           if ((G.crec.ucsize == Z64FLGL) || (G.lrec.ucsize == Z64FLGL))
+           {
+@@ -2046,7 +2049,7 @@
+         }
+         if (eb_id == EF_UNIPATH) {
+ 
+-          int offset = EB_HEADSIZE;
++          unsigned offset = EB_HEADSIZE;
+           ush ULen = eb_len - 5;
+           ulg chksum = CRCVAL_INITIAL;
+ 
+@@ -2504,16 +2507,17 @@
+   int state_dependent;
+   int wsize = 0;
+   int max_bytes = MB_CUR_MAX;
+-  char buf[9];
++  char buf[ MB_CUR_MAX+ 1];             /* ("+1" not really needed?) */
+   char *buffer = NULL;
+   char *local_string = NULL;
++  size_t buffer_size;                   /* CVE-2022-0529 */
+ 
+   for (wsize = 0; wide_string[wsize]; wsize++) ;
+ 
+   if (max_bytes < MAX_ESCAPE_BYTES)
+     max_bytes = MAX_ESCAPE_BYTES;
+-
+-  if ((buffer = (char *)malloc(wsize * max_bytes + 1)) == NULL) {
++  buffer_size = wsize * max_bytes + 1;          /* Reused below. */
++  if ((buffer = (char *)malloc( buffer_size)) == NULL) {
+     return NULL;
+   }
+ 
+@@ -2551,8 +2555,28 @@
+     } else {
+       /* no MB for this wide */
+         /* use escape for wide character */
+-        char *escape_string = wide_to_escape_string(wide_string[i]);
+-        strcat(buffer, escape_string);
++        size_t buffer_len;
++        size_t escape_string_len;
++        char *escape_string;
++        int err_msg = 0;
++
++        escape_string = wide_to_escape_string(wide_string[i]);
++        buffer_len = strlen( buffer);
++        escape_string_len = strlen( escape_string);
++
++        /* Append escape string, as space allows. */
++        /* 2022-07-18 SMS, et al.  CVE-2022-0529 */
++        if (escape_string_len > buffer_size- buffer_len- 1)
++        {
++            escape_string_len = buffer_size- buffer_len- 1;
++            if (err_msg == 0)
++            {
++                err_msg = 1;
++                Info(slide, 0x401, ((char *)slide,
++                 LoadFarString( UFilenameTooLongTrunc)));
++            }
++        }
++        strncat( buffer, escape_string, escape_string_len);
+         free(escape_string);
+     }
+   }
+@@ -2604,9 +2628,18 @@
+   ZCONST char *utf8_string;
+   int escape_all;
+ {
+-  zwchar *wide = utf8_to_wide_string(utf8_string);
+-  char *loc = wide_to_local_string(wide, escape_all);
+-  free(wide);
++  zwchar *wide;
++  char *loc = NULL;
++
++  wide = utf8_to_wide_string( utf8_string);
++
++  /* 2022-07-25 SMS, et al.  CVE-2022-0530 */
++  if (wide != NULL)
++  {
++    loc = wide_to_local_string( wide, escape_all);
++    free( wide);
++  }
++
+   return loc;
+ }
+ 
-- 
cgit v1.2.3


From fc10a6eba8049d066baa56f5e5480832a71bc02e Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:57:05 +0800
Subject: gnu: font-sarasa-gothic: Use English for synopsis.

* gnu/packages/fonts.scm (font-sarasa-gothic)[synopsis]: Use English.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index ae9d79c1b8..3a217a54b2 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1599,7 +1599,7 @@ (define-public font-sarasa-gothic
     (native-inputs (list p7zip))
     (home-page "https://github.com/be5invis/Sarasa-Gothic")
     (license license:silofl1.1)
-    (synopsis "Sarasa Gothic / 更纱黑体 / 更紗黑體 / 更紗ゴシック / 사라사 고딕")
+    (synopsis "CJK programming font based on Iosevka and Source Han Sans")
     (description
      "Sarasa Gothic is a programming font based on Iosevka and Source Han Sans,
 most CJK characters are same height, and double width as ASCII characters.")))
-- 
cgit v1.2.3


From c24a2e7c301fb4808fe854f57a93f68505b7e0af Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:57:29 +0800
Subject: gnu: font-lxgw-wenkai: Use English for synopsis.

* gnu/packages/fonts.scm (font-lxgw-wenkai)[synopsis,description]: Use English.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 3a217a54b2..35a211e6e1 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2725,9 +2725,11 @@ (define-public font-lxgw-wenkai
                 "17li3xry4j4ccdnwz2pcnf0gv7c5mwq0h5fwvl7ar28brn2qgdbk"))))
     (build-system font-build-system)
     (home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/")
-    (synopsis "LXGW Wenkai / 霞鹜文楷")
+    (synopsis "Simplified Chinese Imitation Song typeface")
     (description
-     "An open-source Chinese font derived from Fontworks' Klee One.")
+     "LXGW Wenkai is a Simplified Chinese Imitation Song typeface covering the
+CJK Unified Ideographs (base block) and commonly used Hangul.  For characters
+within GB 2312, standard glyphs for Mainland China is used.")
     (license license:silofl1.1)))
 
 (define-public font-lxgw-wenkai-tc
-- 
cgit v1.2.3


From c3e8eaafdd511991791593f0de43058195d64911 Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:57:50 +0800
Subject: gnu: font-lxgw-wenkai-tc: Inherit from font-lxgw-wenkai.

* gnu/packages/fonts.scm (font-lxgw-wenkai-tc): Inherit from font-lxgw-wenkai.
[build-system, license]: Removed fields.
[synopsis, description]: Use English.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 35a211e6e1..2acb5b9e44 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2734,6 +2734,7 @@ (define-public font-lxgw-wenkai
 
 (define-public font-lxgw-wenkai-tc
   (package
+    (inherit font-lxgw-wenkai)
     (name "font-lxgw-wenkai-tc")
     (version "0.920")
     (source (origin
@@ -2744,11 +2745,12 @@ (define-public font-lxgw-wenkai-tc
               (sha256
                (base32
                 "1kysqzi19ldd1a3pd9axmggcbm1719myq6i6q6fdb1afscn272cp"))))
-    (build-system font-build-system)
     (home-page "https://github.com/lxgw/LxgwWenKaitc")
-    (synopsis "LXGW WenKai TC / 霞鶩文楷 TC")
-    (description "The Traditional Chinese Version of LXGW WenKai.")
-    (license license:silofl1.1)))
+    (synopsis "Traditional Chinese Imitation Song typeface")
+    (description
+     "LXGW Wenkai TC is a Traditional Chinese inherited glyphs form Imitation
+Song typeface covering commonly used characters as well as written form of
+dialects in Hong Kong and Taiwan.")))
 
 (define-public font-chiron-sung-hk
   (package
-- 
cgit v1.2.3


From 1cdcc55b977f717353859144455ae88f6fe990fc Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:58:11 +0800
Subject: gnu: font-chiron-sung-hk: Use English for synopsis.

* gnu/packages/fonts.scm (font-chiron-sung-hk)[synopsis,description]: Use English.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 2acb5b9e44..4357879e1a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2767,10 +2767,12 @@ (define-public font-chiron-sung-hk
                 "0iqlnb7825kisg2avhr9hwwvb4jw8f642vvmms5dw6m9czzydpgw"))))
     (build-system font-build-system)
     (home-page "https://chiron-fonts.github.io/")
-    (synopsis "昭源宋體")
+    (synopsis "Traditional Chinese Song typeface")
     (description
-     "Chiron Sung HK (昭源宋體) is a Traditional Chinese serif
- typeface based on Adobe’s Source Han Serif (a.k.a. Google’s Noto Sans CJK).")
+     "Chiron Sung HK is a Traditional Chinese Song typeface based on the Hong
+Kong variant of Adobe’s Source Han Serif.  The font aims at providing a modern,
+region-agnostic glyph set adopting the “modern” glyph style that is similar to
+prevalent typefaces in Traditional Chinese regions.")
     (license license:silofl1.1)))
 
 (define-public font-chiron-hei-hk
-- 
cgit v1.2.3


From 80f380c5473a6f16430e1c047f5af57da002edb4 Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:58:38 +0800
Subject: gnu: font-chiron-hei-hk: Inherit from font-chiron-sung-hk.

* gnu/packages/fonts.scm (font-chiron-hei-hk): Inherit from
font-chiron-sung-hk.
[build-system, home-page ,license]: Drop fields.
[synopsis, description]: Use English.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 4357879e1a..a5f2bd9e95 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2777,6 +2777,7 @@ (define-public font-chiron-sung-hk
 
 (define-public font-chiron-hei-hk
   (package
+    (inherit font-chiron-sung-hk)
     (name "font-chiron-hei-hk")
     (version "2.502")
     (source (origin
@@ -2788,8 +2789,10 @@ (define-public font-chiron-hei-hk
               (sha256
                (base32
                 "0wk1yladmwflkwrmj374avpml8shyrgd622f7mbvw5ln7fi70d2l"))))
-    (build-system font-build-system)
-    (home-page "https://chiron-fonts.github.io/")
-    (synopsis "昭源黑體")
-    (description "The complementary sans-serif typeface for Chiron Sung HK.")
-    (license license:silofl1.1)))
+                "00av598lcsvbwfxabs8m1bfvlk3zq98nziynsrg5p2s5mhz2pkvk"))))
+    (synopsis "Traditional Chinese Gothic typeface")
+    (description
+     "Chiron Hei HK is a Traditional Chinese Gothic typeface based on the Hong
+Kong variant of Adobe’s Source Han Sans.  The font aims at providing a modern,
+region-agnostic glyph set adopting the “modern” glyph style that is similar to
+prevalent typefaces in Traditional Chinese regions.")))
-- 
cgit v1.2.3


From 9aaf104e1f628b24dd266494be0cdc7e07c02d5a Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:58:57 +0800
Subject: gnu: font-sarasa-gothic: Update to 0.36.8.

* gnu/packages/fonts.scm (font-sarasa-gothic): Update to 0.36.8.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a5f2bd9e95..ff9d705e4a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1579,7 +1579,7 @@ (define-public font-iosevka-etoile
 (define-public font-sarasa-gothic
   (package
     (name "font-sarasa-gothic")
-    (version "0.36.6")
+    (version "0.36.8")
     (source
      (origin
        (method url-fetch)
@@ -1587,7 +1587,7 @@ (define-public font-sarasa-gothic
                            "/releases/download/v" version
                            "/sarasa-gothic-ttc-" version ".7z"))
        (sha256
-        (base32 "1sns6589h3wwppykqgz5w9jy4n9cbkwk56cc4gz3j3zm8wqsn0jq"))))
+        (base32 "01fn5mzr1rcz0c8nbhabwbv1pq1c3ylf2msxldc9adks1pi45fmh"))))
     (build-system font-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
cgit v1.2.3


From 4f3b36e890d4dcd53dad4a8d893ce909fa2e367e Mon Sep 17 00:00:00 2001
From: Hilton Chain 
Date: Mon, 8 Aug 2022 15:59:16 +0800
Subject: gnu: font-chiron-hei-hk: Update to 2.503.

* gnu/packages/fonts.scm (font-chiron-hei-hk): Update to 2.503.

Signed-off-by: Liliana Marie Prikler 
---
 gnu/packages/fonts.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index ff9d705e4a..20b55bce96 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2779,7 +2779,7 @@ (define-public font-chiron-hei-hk
   (package
     (inherit font-chiron-sung-hk)
     (name "font-chiron-hei-hk")
-    (version "2.502")
+    (version "2.503")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2788,7 +2788,6 @@ (define-public font-chiron-hei-hk
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0wk1yladmwflkwrmj374avpml8shyrgd622f7mbvw5ln7fi70d2l"))))
                 "00av598lcsvbwfxabs8m1bfvlk3zq98nziynsrg5p2s5mhz2pkvk"))))
     (synopsis "Traditional Chinese Gothic typeface")
     (description
-- 
cgit v1.2.3


From 9683a6203c4a4cb6f1c992ecbf0beca80de235da Mon Sep 17 00:00:00 2001
From: vicvbcun 
Date: Sat, 23 Jul 2022 22:52:01 +0200
Subject: gnu: eclib: Update to 20220621.

* gnu/packages/algebra.scm (eclib): Update to 20220621.

Signed-off-by: Andreas Enge 
---
 gnu/packages/algebra.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index bb71373aa9..61d7356d38 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1589,16 +1589,16 @@ (define-public m4rie
 (define-public eclib
   (package
     (name "eclib")
-    (version "20190909")
+    (version "20220621")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/JohnCremona/eclib/")
-                    (commit (string-append "v" version))))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gw27lqc3f525n8qdcmr2nyn16y9g10z9f6dnmckyyxcdzvhq35n"))))
+                "07wbkzmn6w0hrv2vim7f0il7k59ccc66x5vnn623xkmhfw32b3nz"))))
     (build-system gnu-build-system)
     (native-inputs
      (list autoconf automake libtool))
-- 
cgit v1.2.3


From 2a428633a72d49efecea8f31012594507cda0775 Mon Sep 17 00:00:00 2001
From: vicvbcun 
Date: Sat, 23 Jul 2022 22:52:00 +0200
Subject: gnu: ntl: Update to 11.5.1.

* gnu/packages/algebra.scm (ntl): Update to 11.5.1.

Signed-off-by: Andreas Enge 
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 61d7356d38..afd5c75a88 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -540,14 +540,14 @@ (define-public python-flint
 (define-public ntl
   (package
    (name "ntl")
-   (version "11.4.4")
+   (version "11.5.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://shoup.net/ntl/ntl-"
                                 version ".tar.gz"))
             (sha256
              (base32
-              "1nr1h27j2gdz6badzz9lk2pknxhdijqdxqhd3haryh0sw616wzwx"))
+              "12ka3hym4skg63mp8vgkin79svbpdk2m6i41yvmcdjq62g1hc391"))
             (modules '((guix build utils)))
             (snippet
              '(begin
-- 
cgit v1.2.3


From aa83dde4b79501e4bf29f290bffbfe68581b8427 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Mon, 8 Aug 2022 20:10:12 +0200
Subject: gnu: python-gmpy2: Update to 2.1.2.

* gnu/packages/sagemath.scm (python-gmpy2): Update to 2.1.2.
---
 gnu/packages/sagemath.scm | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm
index 7f76f8912b..bb80ff4db5 100644
--- a/gnu/packages/sagemath.scm
+++ b/gnu/packages/sagemath.scm
@@ -69,22 +69,17 @@ (define-public python-cypari2
 but it can be used independently.")
     (license license:gpl2+)))
 
-;; The stable version of the following package is not young enough to be
-;; used with Sage, since it does not support cython; so we use a beta
-;; release.
 (define-public python-gmpy2
   (package
     (name "python-gmpy2")
-    (version "2.1.0b1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/aleaxit/gmpy")
-                    (commit (string-append "gmpy2-" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0ljvnmhxqdfsp0yy4c2hynhk5sggm63kkqsq4iwq4k9vsnx2xm97"))))
+    (version "2.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "gmpy2" version))
+       (sha256
+        (base32
+         "1lc29g3s4z5f1qbsc2x9i9sf6wrpni9pwiwmb1wwx3hjr85i8xfs"))))
     (build-system python-build-system)
     (native-inputs
      (list unzip))
-- 
cgit v1.2.3


From 2c3828c0b5d23a181d5c14f67723716183c1d356 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Mon, 8 Aug 2022 20:12:22 +0200
Subject: gnu: flint: Update to 2.9.0.

* gnu/packages/algebra.scm (flint): Update to 2.9.0.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index afd5c75a88..66d0db71bc 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -413,13 +413,13 @@ (define-public giac
 (define-public flint
   (package
    (name "flint")
-   (version "2.8.4")
+   (version "2.9.0")
    (source
     (origin
       (method url-fetch)
       (uri (string-append "http://flintlib.org/flint-" version ".tar.gz"))
       (sha256
-       (base32 "1gp4wm2s8c27g2hh53d09cys62da1bsxfwbcsj9cd7cfikm95pv1"))))
+       (base32 "0sp79ixaawjzna79afrlwlx9hg55jxil03f1wq435j9k23ar1h1g"))))
    (build-system gnu-build-system)
    (inputs
     (list ntl))
-- 
cgit v1.2.3


From a0668d88bcd67b3955c5303da2125874cc48d71d Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Mon, 8 Aug 2022 20:22:11 +0200
Subject: gnu: arb: Update to 2.23.0.

* gnu/packages/algebra.scm (arb): Update to 2.23.0.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 66d0db71bc..61d7683ee4 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -466,7 +466,7 @@ (define-public flint
 (define-public arb
   (package
     (name "arb")
-    (version "2.22.1")
+    (version "2.23.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -475,7 +475,7 @@ (define-public arb
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0qcyf8a7w95yxap0r3sb7xibk53nbs5kkidja3ljvqpbpk5xvpax"))))
+                "1m9vskyf857gbm0cbh3z8c8m6cqkqa765wb9hqmsv7yzfmklzpvn"))))
     (build-system gnu-build-system)
     (propagated-inputs
      (list flint))               ; flint.h is included by arf.h
-- 
cgit v1.2.3


From 8a8ffd40e3238e7e8b2085c042b593c55b1d79a4 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Mon, 8 Aug 2022 22:23:51 +0200
Subject: gnu: symengine: Update to 0.9.0.

* gnu/packages/algebra.scm (symengine): Update to 0.9.0.
---
 gnu/packages/algebra.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 61d7683ee4..dbf42ce2db 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -923,7 +923,7 @@ (define-public lmfit
 (define-public symengine
   (package
     (name "symengine")
-    (version "0.6.0")
+    (version "0.9.0")
     (source
      (origin
        (method git-fetch)
@@ -932,7 +932,7 @@ (define-public symengine
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"))))
+        (base32 "17b6byrhk0bgvarqmg92nrrqhzll9as6x1smghmyq2h9xc373ap4"))))
     (build-system cmake-build-system)
     (arguments
      '(#:configure-flags
-- 
cgit v1.2.3


From 38d024dc58ec7d7fc951bf96da0143e7ce3d145b Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Mon, 8 Aug 2022 21:24:41 +0200
Subject: gnu: python-symengine: Update to 0.9.2.

* gnu/packages/python-xyz.scm (python-symengine): Update to 0.9.2.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b6ca32a757..e5326274c0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14575,13 +14575,13 @@ (define-public python-jmespath
 (define-public python-symengine
   (package
     (name "python-symengine")
-    (version "0.6.1")
+    (version "0.9.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "symengine" version))
        (sha256
-        (base32 "1kn1w4dp9mrsq6kzmhf4pjmx3wicxc3dw1mwa924q8g48g77lr4c"))))
+        (base32 "0qjgdbnb10kfk7jdhxnzfl8cpaps81k8vap7gm7q9ym3pgslazhg"))))
     (build-system python-build-system)
     (native-inputs
      (list cmake python-cython))
-- 
cgit v1.2.3


From 2efc787811a2c4586b763aeed319cb3777e7aa37 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 10:45:05 +0200
Subject: gnu: Add r-ciara.

* gnu/packages/bioconductor.scm (r-ciara): New variable.
---
 gnu/packages/bioconductor.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index fd9ff0c678..1bb8c0d406 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -11989,6 +11989,30 @@ (define-public r-chicago
      "This package provides a pipeline for analysing Capture Hi-C data.")
     (license license:artistic2.0)))
 
+;; This is a CRAN package, but it depends on Bioconductor packages, so we put
+;; it here.
+(define-public r-ciara
+  (package
+    (name "r-ciara")
+    (version "0.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "CIARA" version))
+              (sha256
+               (base32
+                "0nr7wks9231326x0lhpbh824c6vcb5hr5jn89s9bmg9mci907bsf"))))
+    (properties `((upstream-name . "CIARA")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-biobase r-ggplot2 r-ggraph r-magrittr))
+    (native-inputs (list r-knitr))
+    (home-page "https://cran.r-project.org/package=CIARA")
+    (synopsis "Cluster-independent algorithm for rare cell types identification")
+    (description
+     "This is a package to support identification of markers of rare cell
+types by looking at genes whose expression is confined in small regions of the
+expression space.")
+    (license license:artistic2.0)))
+
 (define-public r-cicero
   (package
     (name "r-cicero")
-- 
cgit v1.2.3


From ecdd5d85638e296c7b37878cf466c1acac437c00 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Tue, 9 Aug 2022 11:22:11 +0200
Subject: gnu: maxima: Update to 5.46.0.

* gnu/packages/maths.scm (maxima): Update to 5.46.0.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c10794a089..87d8e5284c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4329,7 +4329,7 @@ (define-public gsegrafix
 (define-public maxima
   (package
     (name "maxima")
-    (version "5.45.1")
+    (version "5.46.0")
     (source
      (origin
        (method url-fetch)
@@ -4337,7 +4337,7 @@ (define-public maxima
                            version "-source/" name "-" version ".tar.gz"))
        (sha256
         (base32
-         "1p77nk5sz1qfkn5zr97szpbi8ib4b22k8i52l4ag5gkhd4kid47y"))
+         "01wbm8jj43p7gpdj4h55aij0b44bjydn4bwb7q1wjrfs91mz143k"))
        (patches (search-patches "maxima-defsystem-mkdir.patch"))))
     (build-system gnu-build-system)
     (inputs
-- 
cgit v1.2.3


From 04f8e4194fa54ff00baac502c7e126df46b6f4cc Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Tue, 9 Aug 2022 11:43:39 +0200
Subject: gnu: wxmaxima: Update to 22.05.0.

* gnu/packages/maths.scm (wxmaxima): Update to 22.05.0.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 87d8e5284c..6061fbe1e9 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4437,7 +4437,7 @@ (define-public maxima
 (define-public wxmaxima
   (package
     (name "wxmaxima")
-    (version "21.05.2")
+    (version "22.05.0")
     (source
      (origin
        (method git-fetch)
@@ -4446,7 +4446,7 @@ (define-public wxmaxima
              (commit (string-append "Version-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0h7ryykh2dapcyvpp4f1j1b3vrrz80x9k8nkci2yxifgdb29vyhw"))))
+        (base32 "1va56v9dys97yln4m1z3fz3k90lpy8i3kvcq0v1cbg36689aghm5"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("gettext" ,gettext-minimal)))
-- 
cgit v1.2.3


From 0d9eef0a06ffcb6a0f66d272ea036597b521ffb6 Mon Sep 17 00:00:00 2001
From: vicvbcun 
Date: Mon, 8 Aug 2022 17:45:46 +0200
Subject: gnu: cddlib: Update to 0.94m.

* gnu/packages/maths.scm (cddlib): Update to 0.94m.
[source]: Move to git, following the upstream decision.
[native-inputs]: New field.
[arguments]: New field to have docdir include the version number.

Co-authored-by: Andreas Enge 
---
 gnu/packages/maths.scm | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6061fbe1e9..e32a71100e 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2022 Sharlatan Hellseher 
 ;;; Copyright © 2022 Philip McGrath 
 ;;; Copyright © 2022 Marek Felšöci 
+;;; Copyright © 2022 vicvbcun 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -75,6 +76,7 @@ (define-module (gnu packages maths)
   #:use-module (ice-9 match)
   #:use-module (gnu packages)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -724,18 +726,31 @@ (define-public 4ti2
 (define-public cddlib
   (package
     (name "cddlib")
-    (version "0.94i")
+    (version "0.94m")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-"
-                          (string-delete #\. version) ".tar.gz"))
+      (method git-fetch)
+      (uri (git-reference
+            (url "https://github.com/cddlib/cddlib")
+            (commit version)))
       (sha256
        (base32
-        "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq"))))
+        "09s8323h5w9j6mpl1yc6lm770dkskfxd2ayyafkcjllmnncxzfa0"))))
     (build-system gnu-build-system)
     (inputs
      (list gmp))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         texlive-amsfonts
+                         texlive-dvips-l3backend
+                         texlive-latex-graphics
+                         texlive-latex-l3backend
+                         texlive-tiny))
+    (arguments
+     (list #:configure-flags
+             #~(list (string-append "--docdir=" #$output
+                                    "/share/doc/" #$name "-" #$version))))
     (home-page "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html")
     (synopsis "Library for convex hulls and extreme rays of polyhedra")
     (description
-- 
cgit v1.2.3


From 5bce4c82422de6beb3ce6120ba1592be898c2b72 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Fri, 5 Aug 2022 17:09:10 +0200
Subject: build-system: Add 'channel-build-system'.

* gnu/ci.scm (channel-build-system, channel-source->package): Remove.
* gnu/packages/package-management.scm (channel-source->package): New
procedure, moved from (gnu ci).
* guix/build-system/channel.scm: New file, with code moved from (gnu ci).
* doc/guix.texi (Build Systems): Document it.
---
 Makefile.am                         |  1 +
 doc/guix.texi                       |  9 ++++++
 etc/system-tests.scm                |  3 +-
 gnu/ci.scm                          | 42 ++-------------------------
 gnu/packages/package-management.scm | 16 ++++++++++
 guix/build-system/channel.scm       | 58 +++++++++++++++++++++++++++++++++++++
 6 files changed, 87 insertions(+), 42 deletions(-)
 create mode 100644 guix/build-system/channel.scm

(limited to 'gnu/packages')

diff --git a/Makefile.am b/Makefile.am
index f7c42e8153..f707b930b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,6 +142,7 @@ MODULES =					\
   guix/build-system/android-ndk.scm		\
   guix/build-system/ant.scm			\
   guix/build-system/cargo.scm			\
+  guix/build-system/channel.scm			\
   guix/build-system/chicken.scm			\
   guix/build-system/clojure.scm			\
   guix/build-system/cmake.scm			\
diff --git a/doc/guix.texi b/doc/guix.texi
index 9a6a5c307d..5dab9cf169 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9568,6 +9568,15 @@ with @code{build-expression->derivation} (@pxref{Derivations,
 @code{build-expression->derivation}}).
 @end defvr
 
+@defvr {Scheme Variable} channel-build-system
+This variable is exported by @code{(guix build-system channel)}.
+
+This build system is meant primarily for internal use.  It requires two
+arguments, @code{#:commit} and @code{#:source}, and builds a Guix
+instance from that channel, in the same way @command{guix time-machine}
+would do it (@pxref{Channels}).
+@end defvr
+
 @node Build Phases
 @section Build Phases
 
diff --git a/etc/system-tests.scm b/etc/system-tests.scm
index cd22b7e6d3..221a63bb7f 100644
--- a/etc/system-tests.scm
+++ b/etc/system-tests.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2018, 2019, 2020 Ludovic Courtès 
+;;; Copyright © 2016, 2018-2020, 2022 Ludovic Courtès 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,7 +20,6 @@
              (gnu packages package-management)
              (guix monads)
              (guix store)
-             ((gnu ci) #:select (channel-source->package))
              ((guix git-download) #:select (git-predicate))
              ((guix utils) #:select (current-source-directory))
              (git)
diff --git a/gnu/ci.scm b/gnu/ci.scm
index 9389b43824..9cc3a1a81f 100644
--- a/gnu/ci.scm
+++ b/gnu/ci.scm
@@ -21,9 +21,9 @@
 ;;; along with GNU Guix.  If not, see .
 
 (define-module (gnu ci)
-  #:use-module (guix channels)
+  #:use-module (guix build-system channel)
   #:use-module (guix config)
-  #:use-module (guix describe)
+  #:autoload   (guix describe) (package-channels)
   #:use-module (guix store)
   #:use-module (guix grafts)
   #:use-module (guix profiles)
@@ -32,7 +32,6 @@ (define-module (gnu ci)
   #:use-module (guix channels)
   #:use-module (guix config)
   #:use-module (guix derivations)
-  #:use-module (guix build-system)
   #:use-module (guix monads)
   #:use-module (guix gexp)
   #:use-module (guix ui)
@@ -71,7 +70,6 @@ (define-module (gnu ci)
             image->job
 
             %core-packages
-            channel-source->package
 
             arguments->systems
             cuirass-jobs))
@@ -288,42 +286,6 @@ (define MiB
               '()))
       '()))
 
-(define channel-build-system
-  ;; Build system used to "convert" a channel instance to a package.
-  (let* ((build (lambda* (name inputs
-                               #:key source commit system
-                               #:allow-other-keys)
-                  (mlet* %store-monad ((source (if (string? source)
-                                                   (return source)
-                                                   (lower-object source)))
-                                       (instance
-                                        -> (checkout->channel-instance
-                                            source #:commit commit)))
-                    (channel-instances->derivation (list instance)))))
-         (lower (lambda* (name #:key system source commit
-                               #:allow-other-keys)
-                  (bag
-                    (name name)
-                    (system system)
-                    (build build)
-                    (arguments `(#:source ,source
-                                 #:commit ,commit))))))
-    (build-system (name 'channel)
-                  (description "Turn a channel instance into a package.")
-                  (lower lower))))
-
-(define* (channel-source->package source #:key commit)
-  "Return a package for the given channel SOURCE, a lowerable object."
-  (package
-    (inherit guix)
-    (version (string-append (package-version guix) "+"))
-    (build-system channel-build-system)
-    (arguments `(#:source ,source
-                 #:commit ,commit))
-    (inputs '())
-    (native-inputs '())
-    (propagated-inputs '())))
-
 (define* (system-test-jobs store system
                            #:key source commit)
   "Return a list of jobs for the system tests."
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index c22c9f7a43..b9cd74eb27 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -110,6 +110,7 @@ (define-module (gnu packages package-management)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages version-control)
+  #:autoload   (guix build-system channel) (channel-build-system)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system guile)
@@ -489,6 +490,21 @@ (define code
       (license license:gpl3+)
       (properties '((ftp-server . "alpha.gnu.org"))))))
 
+(define* (channel-source->package source #:key commit)
+  "Return a package for the given channel SOURCE, a lowerable object."
+  (package
+    (inherit guix)
+    (version (string-append (package-version guix) "."
+                            (if commit (string-take commit 7) "")))
+    (build-system channel-build-system)
+    (arguments `(#:source ,source
+                 #:commit ,commit))
+    (inputs '())
+    (native-inputs '())
+    (propagated-inputs '())))
+
+(export channel-source->package)
+
 (define-public guix-for-cuirass
   ;; Known-good revision before commit
   ;; bd86bbd300474204878e927f6cd3f0defa1662a5, which introduced
diff --git a/guix/build-system/channel.scm b/guix/build-system/channel.scm
new file mode 100644
index 0000000000..227eb08373
--- /dev/null
+++ b/guix/build-system/channel.scm
@@ -0,0 +1,58 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019-2021 Ludovic Courtès 
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see .
+
+(define-module (guix build-system channel)
+  #:use-module ((guix store) #:select (%store-monad))
+  #:use-module ((guix gexp) #:select (lower-object))
+  #:use-module (guix monads)
+  #:use-module (guix channels)
+  #:use-module (guix build-system)
+  #:export (channel-build-system))
+
+;;; Commentary:
+;;;
+;;; The "channel" build system lets you build Guix instances from channel
+;;; specifications, similar to how 'guix time-machine' would do it, as regular
+;;; packages.
+;;;
+;;; Code:
+
+(define channel-build-system
+  ;; Build system used to "convert" a channel instance to a package.
+  (let* ((build (lambda* (name inputs
+                               #:key source commit system
+                               #:allow-other-keys)
+                  (mlet* %store-monad ((source (if (string? source)
+                                                   (return source)
+                                                   (lower-object source)))
+                                       (instance
+                                        -> (checkout->channel-instance
+                                            source #:commit commit)))
+                    (channel-instances->derivation (list instance)))))
+         (lower (lambda* (name #:key system source commit
+                               #:allow-other-keys)
+                  (bag
+                    (name name)
+                    (system system)
+                    (build build)
+                    (arguments `(#:source ,source
+                                 #:commit ,commit))))))
+    (build-system (name 'channel)
+                  (description "Turn a channel instance into a package.")
+                  (lower lower))))
+
-- 
cgit v1.2.3


From 57f1892d366ea28083391577f90c4aa06b90aaf1 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès 
Date: Mon, 8 Aug 2022 23:35:22 +0200
Subject: gnu: guix: Default 'current-guix' is built using the current
 channels.

* gnu/packages/package-management.scm (source-file?): Remove.
(current-guix-package): Change default value to the promise of a
package.
(current-guix): Turn into a call to 'current-guix-package' possibly with
'force'.
---
 gnu/packages/package-management.scm | 62 +++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index b9cd74eb27..01abd98d65 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -120,6 +120,10 @@ (define-module (gnu packages package-management)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:autoload   (guix describe) (current-channels)
+  #:autoload   (guix channels) (channel?
+                                guix-channel?
+                                repository->guix-channel)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -600,45 +604,37 @@ (define-public guix-minimal
       (modify-inputs (package-propagated-inputs guix)
         (delete "guile-ssh"))))))
 
-(define (source-file? file stat)
-  "Return true if FILE is likely a source file, false if it is a typical
-generated file."
-  (define (wrong-extension? file)
-    (or (string-suffix? "~" file)
-        (member (file-extension file)
-                '("o" "a" "lo" "so" "go"))))
-
-  (match (basename file)
-    ((or ".git" "autom4te.cache" "configure" "Makefile" "Makefile.in" ".libs")
-     #f)
-    ((? wrong-extension?)
-     #f)
-    (_
-     #t)))
-
 (define-public current-guix-package
   ;; This parameter allows callers to override the package that 'current-guix'
   ;; returns.  This is useful when 'current-guix' cannot compute it by itself,
   ;; for instance because it's not running from a source code checkout.
-  (make-parameter #f))
+  ;;
+  ;; The default value is obtained by creating a package from the 'guix'
+  ;; channel returned by 'current-channels' or, if that's the empty list, that
+  ;; returned by 'repository->guix-channel' for the current directory (which
+  ;; assumes that we're running from a Git checkout).  Delay computation so
+  ;; that the relevant modules can be loaded lazily.
+  (make-parameter
+   (delay (match (or (find guix-channel? (current-channels))
+                     (repository->guix-channel
+                      (current-source-directory)))
+            ((? channel? source)
+             (package
+               (inherit guix)
+               (source source)
+               (build-system channel-build-system)
+               (inputs '())
+               (native-inputs '())
+               (propagated-inputs '())))
+            (#f #f)))))
 
 (define-public current-guix
-  (let* ((repository-root (delay (canonicalize-path
-                                  (string-append (current-source-directory)
-                                                 "/../.."))))
-         (select? (delay (or (git-predicate (force repository-root))
-                             source-file?))))
-    (lambda ()
-      "Return a package representing Guix built from the current source tree.
-This works by adding the current source tree to the store (after filtering it
-out) and returning a package that uses that as its 'source'."
-      (or (current-guix-package)
-          (package
-            (inherit guix)
-            (version (string-append (package-version guix) "+"))
-            (source (local-file (force repository-root) "guix-current"
-                                #:recursive? #t
-                                #:select? (force select?))))))))
+  (lambda ()
+    "Return a package representing the currently-used Guix.  It can be
+overridden by setting the 'current-guix-package' parameter."
+    (match (current-guix-package)
+      ((? promise? package) (force package))
+      (package package))))
 
 (define-public guix-icons
   (package
-- 
cgit v1.2.3


From bc03aa438bef326d47aafaed99bc6de45e518c53 Mon Sep 17 00:00:00 2001
From: Philip McGrath 
Date: Mon, 25 Jul 2022 16:05:10 -0400
Subject: gnu: wrap-python3: Clarify relationship with wrapped package.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous description could give the impression that the user faced a
choice between `python` and `python3`, but could not have both at once.
In fact, the packages `python-wrapper` and `python-minimal-wrapper`
already provide both sets of names.

* gnu/packages/python.scm (wrap-python3)[description]: Tweak.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/python.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4fcee28ba3..23407e4e84 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -58,6 +58,7 @@
 ;;; Copyright © 2019 Tanguy Le Carrour 
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen 
 ;;; Copyright © 2020, 2021 Greg Hogan 
+;;; Copyright © 2022 Philip McGrath 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -662,10 +663,13 @@ (define* (wrap-python3 python
     (synopsis "Wrapper for the Python 3 commands")
     (description
      "This package provides wrappers for the commands of Python@tie{}3.x such
-that they can be invoked under their usual name---e.g., @command{python}
+that they can also be invoked under their usual names---e.g., @command{python}
 instead of @command{python3} or @command{pip} instead of @command{pip3}.
+
 To function properly, this package should not be installed together with the
-@command{python} package.")))
+@code{python} package: this package uses the @code{python} package as a
+propagated input, so installing this package already makes both the versioned
+and the unversioned commands available.")))
 
 (define-public python-wrapper (wrap-python3 python))
 (define-public python-minimal-wrapper (wrap-python3 python-minimal))
-- 
cgit v1.2.3


From f194df2bb44d61ed17222d4ac1b4bc739fdc3f97 Mon Sep 17 00:00:00 2001
From: John Kehayias 
Date: Thu, 4 Aug 2022 00:53:33 -0400
Subject: gnu: vorta: Update to 0.8.7.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/backup.scm (vorta): Update to 0.8.7.

Signed-off-by: Ludovic Courtès 
---
 gnu/packages/backup.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 06a8ac59eb..0d03d2e87f 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1291,13 +1291,13 @@ (define-public borgmatic
 (define-public vorta
   (package
     (name "vorta")
-    (version "0.8.3")
+    (version "0.8.7")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "vorta" version))
               (sha256
                (base32
-                "0674crxsmf1gwiacpi9ixypgz685fyzr5y3f9sd768b0bmh7ilsn"))))
+                "0yv2z2djbl7aq3fa9m3ihzv9i99a5ahsxz7dlzwvvf4a7pmhc6b2"))))
     (build-system python-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From 468c95e9415bc303cfa36c9b67bbd2ce0abe904b Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 9 Aug 2022 22:05:28 +0300
Subject: gnu: aspell: Patch CVE-2019-25051.

* gnu/packages/aspell.scm (aspell)[source]: Add patch.
* gnu/packages/patches/aspell-CVE-2019-25051.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                     |  1 +
 gnu/packages/aspell.scm                          |  3 +-
 gnu/packages/patches/aspell-CVE-2019-25051.patch | 99 ++++++++++++++++++++++++
 3 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/aspell-CVE-2019-25051.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index ac40640658..f907c8b635 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -861,6 +861,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
   %D%/packages/patches/apr-skip-getservbyname-test.patch	\
   %D%/packages/patches/ark-skip-xar-test.patch			\
+  %D%/packages/patches/aspell-CVE-2019-25051.patch		\
   %D%/packages/patches/aspell-default-dict-dir.patch		\
   %D%/packages/patches/ath9k-htc-firmware-binutils.patch	\
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index ef225ac64d..d2737ee79a 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -55,7 +55,8 @@ (define-public aspell
       (sha256
        (base32
         "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
-      (patches (search-patches "aspell-default-dict-dir.patch"))))
+      (patches (search-patches "aspell-default-dict-dir.patch"
+                               "aspell-CVE-2019-25051.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/patches/aspell-CVE-2019-25051.patch b/gnu/packages/patches/aspell-CVE-2019-25051.patch
new file mode 100644
index 0000000000..a7471dacd4
--- /dev/null
+++ b/gnu/packages/patches/aspell-CVE-2019-25051.patch
@@ -0,0 +1,99 @@
+https://github.com/gnuaspell/aspell/commit/0718b375425aad8e54e1150313b862e4c6fd324a
+https://nvd.nist.gov/vuln/detail/CVE-2019-25051
+
+From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001
+From: Kevin Atkinson 
+Date: Sat, 21 Dec 2019 20:32:47 +0000
+Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk
+ to prevent a buffer overflow
+
+Bug found using OSS-Fuze.
+---
+ common/objstack.hpp | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/common/objstack.hpp b/common/objstack.hpp
+index 3997bf7..bd97ccd 100644
+--- a/common/objstack.hpp
++++ b/common/objstack.hpp
+@@ -5,6 +5,7 @@
+ #include "parm_string.hpp"
+ #include 
+ #include 
++#include 
+ 
+ namespace acommon {
+ 
+@@ -26,6 +27,12 @@ class ObjStack
+   byte * temp_end;
+   void setup_chunk();
+   void new_chunk();
++  bool will_overflow(size_t sz) const {
++    return offsetof(Node,data) + sz > chunk_size;
++  }
++  void check_size(size_t sz) {
++    assert(!will_overflow(sz));
++  }
+ 
+   ObjStack(const ObjStack &);
+   void operator=(const ObjStack &);
+@@ -56,7 +63,7 @@ class ObjStack
+   void * alloc_bottom(size_t size)  {
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;}
++    if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;}
+     return tmp;
+   }
+   // This alloc_bottom will insure that the object is aligned based on the
+@@ -66,7 +73,7 @@ class ObjStack
+     align_bottom(align);
+     byte * tmp = bottom;
+     bottom += size;
+-    if (bottom > top) {new_chunk(); goto loop;}
++    if (bottom > top) {check_size(size); new_chunk(); goto loop;}
+     return tmp;
+   }
+   char * dup_bottom(ParmString str) {
+@@ -79,7 +86,7 @@ class ObjStack
+   // always be aligned as such.
+   void * alloc_top(size_t size) {
+     top -= size;
+-    if (top < bottom) {new_chunk(); top -= size;}
++    if (top < bottom) {check_size(size); new_chunk(); top -= size;}
+     return top;
+   }
+   // This alloc_top will insure that the object is aligned based on
+@@ -88,7 +95,7 @@ class ObjStack
+   {loop:
+     top -= size;
+     align_top(align);
+-    if (top < bottom) {new_chunk(); goto loop;}
++    if (top < bottom) {check_size(size); new_chunk(); goto loop;}
+     return top;
+   }
+   char * dup_top(ParmString str) {
+@@ -117,6 +124,7 @@ class ObjStack
+   void * alloc_temp(size_t size) {
+     temp_end = bottom + size;
+     if (temp_end > top) {
++      check_size(size);
+       new_chunk();
+       temp_end = bottom + size;
+     }
+@@ -131,6 +139,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
+@@ -150,6 +159,7 @@ class ObjStack
+     } else {
+       size_t s = temp_end - bottom;
+       byte * p = bottom;
++      check_size(size);
+       new_chunk();
+       memcpy(bottom, p, s);
+       temp_end = bottom + size;
-- 
cgit v1.2.3


From 987f5acb2d13bf475b0c5bc6cf0ceea787fb1c20 Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 9 Aug 2022 22:13:47 +0300
Subject: gnu: git: Hide more CVEs from the linter.

* gnu/packages/version-control.scm (git)[properties]: Add more CVEs to
the lint-hidden-cve property.
---
 gnu/packages/version-control.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6652ac717f..9bf5ac76df 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -590,7 +590,14 @@ (define-public git
    (properties '((lint-hidden-cve . ("CVE-2018-1000182"
                                      "CVE-2018-1000110"
                                      "CVE-2019-1003010"
-                                     "CVE-2020-2136"))))
+                                     "CVE-2020-2136"
+                                     "CVE-2021-21684"
+                                     "CVE-2022-30947"
+                                     "CVE-2022-30948"
+                                     "CVE-2022-30949"
+                                     "CVE-2022-36882"
+                                     "CVE-2022-36883"
+                                     "CVE-2022-36884"))))
    (license license:gpl2)
    (home-page "https://git-scm.com/")))
 
-- 
cgit v1.2.3


From 9a53a79fc54e01932bd727ec519403ea4c2c3efc Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Tue, 9 Aug 2022 22:39:26 +0300
Subject: gnu: gnupg: Patch CVE-2022-34903.

* gnu/packages/gnupg.scm (gnupg)[replacement]: New field.
(gnupg/replacement): New variable.
* gnu/packages/patches/gnupg-CVE-2022-34903.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                    |  1 +
 gnu/packages/gnupg.scm                          | 10 +++++
 gnu/packages/patches/gnupg-CVE-2022-34903.patch | 54 +++++++++++++++++++++++++
 3 files changed, 65 insertions(+)
 create mode 100644 gnu/packages/patches/gnupg-CVE-2022-34903.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index f907c8b635..caf5fd68b0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1213,6 +1213,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gnome-session-support-elogind.patch      \
   %D%/packages/patches/gnome-todo-libportal.patch		\
   %D%/packages/patches/gnome-tweaks-search-paths.patch		\
+  %D%/packages/patches/gnupg-CVE-2022-34903.patch		\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 08fa1570d6..90215a6877 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -285,6 +285,7 @@ (define-public gnupg
     ;; Note2: 2.2.33 currently suffers from regressions, so do not update to it
     ;; (see: https://dev.gnupg.org/T5742).
     (version "2.2.32")
+    (replacement gnupg/fixed)
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version
@@ -352,6 +353,15 @@ (define-public gnupg
     (properties '((ftp-server . "ftp.gnupg.org")
                   (ftp-directory . "/gcrypt/gnupg")))))
 
+(define gnupg/fixed
+  (package
+    (inherit gnupg)
+    (source (origin
+              (inherit (package-source gnupg))
+              (patches
+                (append (origin-patches (package-source gnupg))
+                        (search-patches "gnupg-CVE-2022-34903.patch")))))))
+
 (define-public gnupg-1
   (package (inherit gnupg)
     (version "1.4.23")
diff --git a/gnu/packages/patches/gnupg-CVE-2022-34903.patch b/gnu/packages/patches/gnupg-CVE-2022-34903.patch
new file mode 100644
index 0000000000..19c055282a
--- /dev/null
+++ b/gnu/packages/patches/gnupg-CVE-2022-34903.patch
@@ -0,0 +1,54 @@
+https://dev.gnupg.org/T6027
+https://www.openwall.com/lists/oss-security/2022/06/30/1
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=34c649b3601383cd11dbc76221747ec16fd68e1b
+
+From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
+From: Werner Koch 
+Date: Tue, 14 Jun 2022 11:33:27 +0200
+Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
+
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+--
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong.  Fixed by always using a break to
+terminate the escape detection loop.  Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+---
+ g10/cpr.c | 13 ++++---------
+ 1 file changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/g10/cpr.c b/g10/cpr.c
+index 9bfdd3c34..fa8005d6f 100644
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
+             }
+           first = 0;
+         }
+-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++      for (esc=0, s=buffer, n=len; n; s++, n--)
+         {
+           if (*s == '%' || *(const byte*)s <= lower_limit
+               || *(const byte*)s == 127 )
+             esc = 1;
+           if (wrap && ++count > wrap)
+-            {
+-              dowrap=1;
+-              break;
+-            }
+-        }
+-      if (esc)
+-        {
+-          s--; n++;
++            dowrap=1;
++          if (esc || dowrap)
++            break;
+         }
+       if (s != buffer)
+         es_fwrite (buffer, s-buffer, 1, statusfp);
+-- 
+2.11.0
+
-- 
cgit v1.2.3


From 0b55b036c1cdd5409c638e4ab3efea1deea1b708 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 15:48:30 +0200
Subject: gnu: cereal: Update to 1.3.2.

* gnu/packages/serialization.scm (cereal): Update to 1.3.2.
[arguments]: Use G-expression.
(cereal-1.3.0): New variable.
* gnu/packages/bioinformatics.scm (salmon)[inputs]: Change from CEREAL to
CEREAL-1.3.0.
* gnu/packages/engineering.scm (prusa-slicer)[inputs]: Likewise.
---
 gnu/packages/bioinformatics.scm |  2 +-
 gnu/packages/engineering.scm    |  2 +-
 gnu/packages/serialization.scm  | 60 ++++++++++++++++++++++++++++++-----------
 3 files changed, 46 insertions(+), 18 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 289079b766..3a40cc2281 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10017,7 +10017,7 @@ (define-public salmon
     (inputs
      `(("boost" ,boost)
        ("bzip2" ,bzip2)
-       ("cereal" ,cereal)
+       ("cereal" ,cereal-1.3.0)
        ("curl" ,curl)
        ("eigen" ,eigen)
        ("jemalloc" ,jemalloc)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 0e28a0c428..ed87cd8d6a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3222,7 +3222,7 @@ (define-public prusa-slicer
      (list pkg-config))
     (inputs
      (list boost
-           cereal
+           cereal-1.3.0
            cgal
            curl
            dbus
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index cec9b68299..1f2f7ff47f 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus 
 ;;; Copyright © 2016 Lukas Gradl 
 ;;; Copyright © 2016 David Craven 
-;;; Copyright © 2016, 2019, 2020 Marius Bakke 
+;;; Copyright © 2016, 2019, 2020, 2022 Marius Bakke 
 ;;; Copyright © 2016, 2018, 2019, 2021 Efraim Flashner 
 ;;; Copyright © 2017 Corentin Bocquillon 
 ;;; Copyright © 2017 Gregor Giesen 
@@ -31,6 +31,7 @@
 (define-module (gnu packages serialization)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix hg-download)
   #:use-module (guix git-download)
@@ -132,7 +133,7 @@ (define-public avro-cpp-1.9-for-irods
 (define-public cereal
   (package
     (name "cereal")
-    (version "1.3.0")
+    (version "1.3.2")
     (source
      (origin
        (method git-fetch)
@@ -142,22 +143,22 @@ (define-public cereal
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"))))
+         "02sd90ynya7wg013zwzjr79fsv4bzqgfg9l2mapd4j38rv06gahx"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DSKIP_PORTABILITY_TEST=ON")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'skip-sandbox
-           (lambda _
-             (substitute* "CMakeLists.txt"
-               (("add_subdirectory\\(sandbox\\)") ""))))
-         (add-after 'install 'install-doc
-           (lambda _
-             (let ((doc (string-append %output "/share/doc/html")))
-               (invoke "make" "doc")
-               (mkdir-p doc)
-               (copy-recursively "doc/html" doc)))))))
+     (list
+      #:configure-flags #~'("-DSKIP_PORTABILITY_TEST=ON"
+                            ;; Don't bother building the sandbox examples.
+                            "-DSKIP_PERFORMANCE_COMPARISON=ON"
+                            "-DBUILD_SANDBOX=OFF")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-doc
+            (lambda _
+              (let ((doc (string-append #$output "/share/doc/html")))
+                (invoke "make" "doc")
+                (mkdir-p doc)
+                (copy-recursively "doc/html" doc)))))))
     (native-inputs
      (list doxygen))
     (home-page "https://uscilab.github.io/cereal/")
@@ -168,6 +169,33 @@ (define-public cereal
 such as compact binary encodings, XML, or JSON.")
     (license license:bsd-3)))
 
+;; Some packages fail with the latest version.  Remove this variable
+;; when unused.
+(define-public cereal-1.3.0
+  (package
+    (inherit cereal)
+    (version "1.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/USCiLab/cereal")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "cereal" version))
+       (sha256
+        (base32
+         "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments cereal)
+       ((#:configure-flags flags #~'())
+        #~'("-DSKIP_PORTABILITY_TEST=ON"))
+       ((#:phases phases #~%standard-phases)
+        #~(modify-phases #$phases
+            (add-before 'configure 'skip-sandbox
+              (lambda _
+                (substitute* "CMakeLists.txt"
+                  (("add_subdirectory\\(sandbox\\)") ""))))))))))
+
 (define-public msgpack
   (package
     (name "msgpack")
-- 
cgit v1.2.3


From 6e2f570cded7b932692ece35a879c5d6db255825 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 00:19:53 +0200
Subject: gnu: cereal: List all licenses that apply.

* gnu/packages/serialization.scm (cereal)[license]: Add LICENSE:BOOST,
LICENSE:EXPAT, and LICENSE:NON-COPYLEFT.
---
 gnu/packages/serialization.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 1f2f7ff47f..79c55e2b2f 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -167,7 +167,17 @@ (define-public cereal
      "Cereal is a header-only C++11 serialization library.  Cereal takes
 arbitrary data types and reversibly turns them into different representations,
 such as compact binary encodings, XML, or JSON.")
-    (license license:bsd-3)))
+    ;; Note: Cereal bundles forked versions of rapidxml and rapidjson
+    ;; (see include/cereal/external/), so list their licenses too.
+    (license (list license:bsd-3        ;Cereal itself
+                   ;; The bundled RapidXML is dual Boost/Expat (users choice).
+                   ;; RapidJSON is Expat licensed, and further bundles a
+                   ;; stdint.h with BSD-3.
+                   license:boost1.0 license:expat
+                   ;; Finally, include/cereal/external/base64.hpp has a
+                   ;; home-grown BSD-like license.
+                   (license:non-copyleft
+                    "file://include/cereal/external/LICENSE")))))
 
 ;; Some packages fail with the latest version.  Remove this variable
 ;; when unused.
-- 
cgit v1.2.3


From 78c917e9a4aeb73ff332bee65f416b3677cd4f24 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:16:24 +0200
Subject: gnu: liburing: Update to 2.2.

* gnu/packages/linux.scm (liburing): Update to 2.2.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 48e58c035d..5a9dbb35b8 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9147,7 +9147,7 @@ (define-public ipset
 (define-public liburing
   (package
     (name "liburing")
-    (version "0.7")
+    (version "2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9156,7 +9156,7 @@ (define-public liburing
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"))))
+                "1677zqqbd9nw9hrdaxqbd1zwy54cxfsv2z0bjipn23mrkz2xzy1k"))))
     (build-system gnu-build-system)
     (arguments
      `(;; Tests are dependent on kernel version and features
-- 
cgit v1.2.3


From d5986f7622bb59d40a227abf7cd973129dc4c129 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 15:51:58 +0200
Subject: gnu: libbpf: Update to 0.8.1.

* gnu/packages/linux.scm (libbpf): Update to 0.8.1.
[inputs]: Change from LIBELF to ELFUTILS.
[arguments]: Use CC-FOR-TARGET.  Remove trailing #t.
---
 gnu/packages/linux.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 5a9dbb35b8..adf660ea6b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8919,7 +8919,7 @@ (define-public cachefilesd
 (define-public libbpf
   (package
     (name "libbpf")
-    (version "0.1.1")
+    (version "0.8.1")
     (source
      (origin
        (method git-fetch)
@@ -8929,28 +8929,26 @@ (define-public libbpf
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"))))
+         "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
     (propagated-inputs
      ;; In Requires.private of libbpf.pc.
-     (list libelf zlib))
+     (list elfutils zlib))
     (arguments
      `(#:tests? #f                      ; no tests
        #:make-flags
        (list
         (string-append "PREFIX=" (assoc-ref %outputs "out"))
         (string-append "LIBDIR=$(PREFIX)/lib")
-        (string-append
-         "CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc"))
+        (string-append "CC=" ,(cc-for-target)))
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
          (add-before 'build 'pre-build
            (lambda _
-             (chdir "src")
-             #t)))))
+             (chdir "src"))))))
     (home-page "https://github.com/libbpf/libbpf")
     (synopsis "BPF CO-RE (Compile Once – Run Everywhere)")
     (description
-- 
cgit v1.2.3


From 2fd9ca5e05cc6008d36b08a002d3f30d824140ce Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 15:56:01 +0200
Subject: gnu: bcc: Update to 0.24.0.

* gnu/packages/linux.scm (bcc): Update to 0.24.0.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index adf660ea6b..1dc8b492ff 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8960,7 +8960,7 @@ (define-public libbpf
 (define-public bcc
   (package
     (name "bcc")
-    (version "0.16.0")
+    (version "0.24.0")
     (source
      (origin
        (method git-fetch)
@@ -8970,7 +8970,7 @@ (define-public bcc
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1367c0bzrpclvjvmk0sxgi49rh7j2f9izqk5a7g3yvawh1fmvvjh"))))
+         "1i6xikkxf2nasfkqa91hjzdq0a88mgyzrvia4fi2i2v1d8pbmnp4"))))
     (build-system cmake-build-system)
     (native-inputs
      (list bison flex))
-- 
cgit v1.2.3


From 00962dd18f21270daaaf9a5b7c7cc995d8f6402f Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 15:58:40 +0200
Subject: gnu: bpftrace: Update to 0.15.0.

* gnu/packages/linux.scm (bpftrace): Update to 0.15.0.
[inputs]: Add CEREAL.
---
 gnu/packages/linux.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1dc8b492ff..7f909e863e 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9040,7 +9040,7 @@ (define-public bcc
 (define-public bpftrace
   (package
     (name "bpftrace")
-    (version "0.11.4")
+    (version "0.15.0")
     (source
      (origin
        (method git-fetch)
@@ -9049,13 +9049,13 @@ (define-public bpftrace
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"))
+        (base32 "022fg0kiz0liahj82wvlxmivkwyp86shs5fwr2v4blx7lh05k9zm"))
        (patches (search-patches "bpftrace-disable-bfd-disasm.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      (list bison flex))
     (inputs
-     (list bcc clang-toolchain-9 elfutils libbpf))
+     (list bcc clang-toolchain-9 elfutils libbpf cereal))
     (arguments
      `(#:tests? #f ;Tests require googletest sources.
        #:configure-flags
-- 
cgit v1.2.3


From 9fda25caff4f7e7df375dec44804c4cebb1a0643 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 21:23:22 +0200
Subject: gnu: box2d: Unbundle doctest.

* gnu/packages/game-development.scm (box2d)[source](snippet): Delete doctest,
and adjust accordingly.
[native-inputs]: Add DOCTEST.
---
 gnu/packages/game-development.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 090e7f7d12..3e0301a199 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2017 Peter Mikkelsen 
 ;;; Copyright © 2017 Arun Isaac 
 ;;; Copyright © 2017, 2019 Rutger Helling 
-;;; Copyright © 2018 Marius Bakke 
+;;; Copyright © 2018, 2022 Marius Bakke 
 ;;; Copyright © 2019 Pierre Neidhardt 
 ;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler 
 ;;; Copyright © 2019 Jethro Cao 
@@ -2467,13 +2467,23 @@ (define-public box2d
        (modules '((guix build utils)))
        (snippet
         '(begin
-           ;; Bundled code only used for the testbed.
-           (delete-file-recursively "extern")))))
+           ;; Remove bundled code only used for the testbed.
+           (delete-file-recursively "extern")
+           ;; Remove bundled copy of doctest, and adjust tests accordingly.
+           (delete-file "unit-test/doctest.h")
+           (substitute* "unit-test/CMakeLists.txt"
+             (("doctest\\.h")
+              ""))
+           (substitute* (find-files "unit-test" "\\.cpp$")
+             (("include \"doctest\\.h\"")
+              "include "))))))
     (build-system cmake-build-system)
     (arguments
      `(#:test-target "unit_test"
        #:configure-flags '("-DBUILD_SHARED_LIBS=ON"
                            "-DBOX2D_BUILD_TESTBED=OFF")))
+    (native-inputs
+     (list doctest))                    ;for tests
     (inputs
      (list libx11))
     (home-page "https://box2d.org/")
-- 
cgit v1.2.3


From e954e708edb62d471fa82d8092a5f339f97e2b39 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:09:35 +0200
Subject: gnu: ungoogled-chromium: Install crashpad handler.

* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Install one more
file.
---
 gnu/packages/chromium.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index f27afc9743..52c84ebe8a 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -795,6 +795,7 @@ (define-public ungoogled-chromium
                                        "chrome_200_percent.pak"
                                        "resources.pak"
                                        "v8_context_snapshot.bin"
+                                       "chrome_crashpad_handler"
 
                                        ;; Swiftshader ICD.
                                        "libvk_swiftshader.so"
-- 
cgit v1.2.3


From 6c2412e9d1cd80658d6fe8ec9eea9ae535bce644 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:17:28 +0200
Subject: gnu: v4l-utils: Update to 1.22.1.

* gnu/packages/video.scm (v4l-utils): Update to 1.22.1.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c681165f2e..754f9431d3 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3241,14 +3241,14 @@ (define-public mlt-6
 (define-public v4l-utils
   (package
     (name "v4l-utils")
-    (version "1.20.0")
+    (version "1.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://linuxtv.org/downloads/v4l-utils"
                                   "/v4l-utils-" version ".tar.bz2"))
               (sha256
                (base32
-                "1xr66y6w422hil6s7n8d61a2vhwh4im8l267amf41jvw7xqihqcm"))))
+                "0cafp64b7ylxhjnp47hxm59r0b0v5hc2gc23qh2s2k5463lgpik5"))))
     (build-system gnu-build-system)
     ;; Separate graphical tools in order to save almost 1 GiB on the closure
     ;; for the common case.
-- 
cgit v1.2.3


From 0a9d99bc8cf8348d7fdb989e4bec364cc083ed67 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:17:59 +0200
Subject: gnu: v4l-utils: Remove input labels.

* gnu/packages/video.scm (v4l-utils)[inputs]: Remove labels.
---
 gnu/packages/video.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 754f9431d3..44ae49ac1c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3287,12 +3287,12 @@ (define-public v4l-utils
     (native-inputs
      (list perl pkg-config))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("glu" ,glu)
-       ("libjpeg" ,libjpeg-turbo)
-       ("libx11" ,libx11)
-       ("qtbase" ,qtbase-5)
-       ("eudev" ,eudev)))
+     (list alsa-lib
+           glu
+           libjpeg-turbo
+           libx11
+           qtbase-5
+           eudev))
     (synopsis "Realtime video capture utilities for Linux")
     (description "The v4l-utils provide a series of libraries and utilities to
 be used for realtime video capture via Linux-specific APIs.")
-- 
cgit v1.2.3


From e3fc94576ec0fac00ffd1e3f79f2a5c7ad8e2265 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:18:47 +0200
Subject: gnu: python-tlsh: Update to 4.11.2.

* gnu/packages/python-xyz.scm (python-tlsh): Update to 4.11.2.
[source](uri): Remove "v" prefix from version.
[arguments]: Add custom check phase.  Use G-expression.
[inputs]: Remove label.
---
 gnu/packages/python-xyz.scm | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e5326274c0..d18959889e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12455,32 +12455,41 @@ (define-public python-pip-run
 (define-public python-tlsh
   (package
     (name "python-tlsh")
-    (version "3.4.5")
+    (version "4.11.2")
     (home-page "https://github.com/trendmicro/tlsh")
     (source
      (origin
        (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/trendmicro/tlsh")
-             (commit (string-append "v" version))))
+       (uri (git-reference (url home-page) (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll"))))
+        (base32 "1gb5j73nw3nmx030rf8pm75rns5syxhv44zxr6i74kjicyly1i9w"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:out-of-source? #f
-       #:phases (modify-phases %standard-phases
-                  (replace
-                   'install
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     ;; Build and install the Python bindings.  The underlying
-                     ;; C++ library is apparently not meant to be installed.
-                     (let ((out (assoc-ref outputs "out")))
-                       (with-directory-excursion "py_ext"
-                         (and (system* "python" "setup.py" "build")
-                              (system* "python" "setup.py" "install"
-                                       (string-append "--prefix=" out))))))))))
-    (inputs `(("python" ,python-wrapper)))        ;for the bindings
+     (list #:out-of-source? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'install
+                 (lambda _
+                   ;; Build and install the Python bindings.  The underlying
+                   ;; C++ library is apparently not meant to be installed.
+                   (with-directory-excursion "py_ext"
+                     (and (system* "python" "setup.py" "build")
+                          (system* "python" "setup.py" "install"
+                                   (string-append "--prefix=" #$output))))))
+               ;; Delay tests until the phase above has run.
+               (delete 'check)
+               (add-after 'install 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (substitute* "Testing/python_test.sh"
+                     ;; The script sets up a working PYTHONPATH, but does not
+                     ;; export it for all subsequent test commands.  Fix that.
+                     (("^PYTHONPATH=\".*" all)
+                      (string-append all "\nexport PYTHONPATH\n")))
+                   (when tests?
+                     (with-directory-excursion "Testing"
+                       (invoke "./python_test.sh"))))))))
+    (inputs (list python-wrapper))      ;for the bindings
     (synopsis "Fuzzy matching library for Python")
     (description
      "Trend Micro Locality Sensitive Hash (TLSH) is a fuzzy matching library.
-- 
cgit v1.2.3


From 131e09b95a85a826e539b7a6a536e217e0cdcf7c Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:20:31 +0200
Subject: gnu: spdlog: Prevent test failure on busy machines.

* gnu/packages/logging.scm (spdlog)[source](modules, snippet): New fields.
---
 gnu/packages/logging.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index 9e7cfe613a..099b6a9509 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -220,7 +220,14 @@ (define-public spdlog
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "02xz017ba9fssm1rp1fcfld7h79awbr6fqai9dxaqp02akp3davk"))))
+        (base32 "02xz017ba9fssm1rp1fcfld7h79awbr6fqai9dxaqp02akp3davk"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Prevent race on busy hardware.  Remove snippet for versions
+        ;; > 1.10.0; see .
+        '(substitute* "tests/test_misc.cpp"
+           (("spdlog::details::os::sleep_for_millis\\(10\\)")
+            "spdlog::details::os::sleep_for_millis(100)")))))
     (build-system cmake-build-system)
     ;; TODO run benchmark. Currently not possible, as adding
     ;; (gnu packages benchmark) forms a dependency cycle
-- 
cgit v1.2.3


From 181fd74121fd763e5848c0d146f97ff528ce3bae Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:49:31 +0200
Subject: gnu: multipath-tools: Remove input labels.

* gnu/packages/linux.scm (multipath-tools)[arguments]: Use G-expression and
SEARCH-INPUT-FILE.
[inputs]: Remove labels.
---
 gnu/packages/linux.scm | 126 +++++++++++++++++++++++--------------------------
 1 file changed, 60 insertions(+), 66 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7f909e863e..a203adc1d4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5223,75 +5223,69 @@ (define-public multipath-tools
                   #t))))
     (build-system gnu-build-system)
     (arguments
-     '(#:test-target "test"
-       #:parallel-build? #f             ;XXX: broken in 0.8.4
-       #:make-flags (list "CC=gcc"
-                          (string-append "DESTDIR="
-                                         (assoc-ref %outputs "out"))
-                          ;; Install Udev rules below this directory, relative
-                          ;; to the prefix.
-                          "SYSTEMDPATH=lib"
-                          (string-append "LDFLAGS=-Wl,-rpath="
-                                         (assoc-ref %outputs "out")
-                                         "/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-source
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((lvm2 (assoc-ref inputs "lvm2"))
-                   (udev (assoc-ref inputs "udev")))
-               (substitute* "Makefile.inc"
-                 (("\\$\\(prefix\\)/usr") "$(prefix)")
-                 ;; Do not save timestamp to avoid gzip "timestamp
-                 ;; out-of-range" warnings.
-                 (("gzip -9") "gzip -9n"))
-               (substitute* '("kpartx/Makefile" "libmultipath/Makefile")
-                 (("/usr/include/libdevmapper.h")
-                  (string-append lvm2 "/include/libdevmapper.h"))
-                 (("/usr/include/libudev.h")
-                  (string-append udev "/include/libudev.h")))
-               #t)))
-         (add-after 'unpack 'fix-maybe-uninitialized-variable
-           (lambda _
-             ;; This variable gets initialized later if needed, but GCC 7
-             ;; fails to notice.  Should be fixed for > 0.8.4.
-             ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html
-             (substitute* "libmultipath/structs_vec.c"
-               (("bool is_queueing;")
-                "bool is_queueing = false;"))
-             #t))
-         (add-after 'unpack 'fix-linking-tests
-           (lambda _
-             ;; Add missing linker flag for -lmpathcmd.  This should be fixed
-             ;; for versions > 0.8.4.
-             (substitute* "tests/Makefile"
-               (("-lmultipath -lcmocka")
-                "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))
-             #t))
-         (add-after 'unpack 'skip-failing-tests
-           (lambda _
-             ;; This test and the module's setup() test an arbitrary block
-             ;; device node name, but the build environment has none.
-             (substitute* "tests/devt.c"
-               (("return get_one_devt.*") "return 0;\n")
-               (("cmocka_unit_test\\(test_devt2devname_devt_good\\),") ""))
-             ;; The above triggers -Werror=unused-function.  Ignore it.
-             (substitute* "tests/Makefile"
-               (("CFLAGS \\+= " match)
-                (string-append match "-Wno-error=unused-function ")))
-             #t))
-         (delete 'configure))))         ; no configure script
+     (list
+      #:test-target "test"
+      #:parallel-build? #f              ;XXX: broken since 0.8.4
+      #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+                           (string-append "DESTDIR=" #$output)
+                           ;; Install Udev rules below this directory, relative
+                           ;; to the prefix.
+                           "SYSTEMDPATH=lib"
+                           (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-source
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((libdevmapper.h
+                     (search-input-file inputs "include/libdevmapper.h"))
+                    (libudev.h
+                     (search-input-file inputs "include/libudev.h")))
+                (substitute* "Makefile.inc"
+                  (("\\$\\(prefix\\)/usr") "$(prefix)")
+                  ;; Do not save timestamp to avoid gzip "timestamp
+                  ;; out-of-range" warnings.
+                  (("gzip -9") "gzip -9n"))
+                (substitute* '("kpartx/Makefile" "libmultipath/Makefile")
+                  (("/usr/include/libdevmapper.h") libdevmapper.h)
+                  (("/usr/include/libudev.h") libudev.h)))))
+          (add-after 'unpack 'fix-maybe-uninitialized-variable
+            (lambda _
+              ;; This variable gets initialized later if needed, but GCC 7
+              ;; fails to notice.  Should be fixed for > 0.8.4.
+              ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html
+              (substitute* "libmultipath/structs_vec.c"
+                (("bool is_queueing;")
+                 "bool is_queueing = false;"))))
+          (add-after 'unpack 'fix-linking-tests
+            (lambda _
+              ;; Add missing linker flag for -lmpathcmd.  This should be fixed
+              ;; for versions > 0.8.4.
+              (substitute* "tests/Makefile"
+                (("-lmultipath -lcmocka")
+                 "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))))
+          (add-after 'unpack 'skip-failing-tests
+            (lambda _
+              ;; This test and the module's setup() test an arbitrary block
+              ;; device node name, but the build environment has none.
+              (substitute* "tests/devt.c"
+                (("return get_one_devt.*") "return 0;\n")
+                (("cmocka_unit_test\\(test_devt2devname_devt_good\\),") ""))
+              ;; The above triggers -Werror=unused-function.  Ignore it.
+              (substitute* "tests/Makefile"
+                (("CFLAGS \\+= " match)
+                 (string-append match "-Wno-error=unused-function ")))))
+          (delete 'configure))))        ;no configure script
     (native-inputs
      (list perl pkg-config valgrind
            ;; For tests.
            cmocka))
     (inputs
-     `(("json-c" ,json-c)
-       ("libaio" ,libaio)
-       ("liburcu" ,liburcu)
-       ("lvm2" ,lvm2)
-       ("readline" ,readline)
-       ("udev" ,eudev)))
+     (list json-c
+           libaio
+           liburcu
+           lvm2
+           readline
+           eudev))
     (home-page "http://christophe.varoqui.free.fr/")
     (synopsis "Access block devices through multiple paths")
     (description
@@ -5304,8 +5298,8 @@ (define-public multipath-tools
 @code{dm} multipath devices.
 @item @command{kpartx} - Create device maps from partition tables.
 @end enumerate")
-    (license (list license:gpl2+             ; main distribution
-                   license:lgpl2.0+))))      ; libmpathcmd/mpath_cmd.h
+    (license (list license:gpl2+        ;main distribution
+                   license:lgpl2.0+)))) ;libmpathcmd/mpath_cmd.h
 
 (define-public libaio
   (package
-- 
cgit v1.2.3


From 01a4f6672ae67ee9ad506739f6a9401e3359dd1d Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 22:56:05 +0200
Subject: gnu: multipath-tools: Update to 0.9.0.

* gnu/packages/linux.scm (multipath-tools): Update to 0.9.0.
[home-page]: Change to current.
[source](uri): Likewise.
[source](snippet): Remove trailing #t.
[arguments]: Move LDFLAGS out of #:make-flags, and add in a phase.  Add
substitution for /bin/echo, and remove obsolete phases.
---
 gnu/packages/linux.scm | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a203adc1d4..b868991461 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -5201,16 +5201,15 @@ (define-public mdadm-static
 (define-public multipath-tools
   (package
     (name "multipath-tools")
-    (version "0.8.5")
+    (version "0.9.0")
+    (home-page "https://github.com/opensvc/multipath-tools")
     (source (origin
               (method git-fetch)
-              (uri (git-reference
-                    (url "https://git.opensvc.com/multipath-tools/.git")
-                    (commit version)))
+              (uri (git-reference (url home-page) (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0gipg0z79h76j0f449cx4wcrfsv69ravjlpphsac11h302g3nrvg"))
+                "09m3vs798qb3xk0v7s3hy0nhw0dznkxjb56671kqj961h7zhg47b"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -5219,8 +5218,7 @@ (define-public multipath-tools
                   (substitute* '("multipathd/main.c"
                                  "libmultipath/debug.c")
                     (("#include \"../third-party/")
-                     "#include \""))
-                  #t))))
+                     "#include \""))))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -5230,8 +5228,7 @@ (define-public multipath-tools
                            (string-append "DESTDIR=" #$output)
                            ;; Install Udev rules below this directory, relative
                            ;; to the prefix.
-                           "SYSTEMDPATH=lib"
-                           (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib"))
+                           "SYSTEMDPATH=lib")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-source
@@ -5241,6 +5238,7 @@ (define-public multipath-tools
                     (libudev.h
                      (search-input-file inputs "include/libudev.h")))
                 (substitute* "Makefile.inc"
+                  (("/bin/echo") "echo")
                   (("\\$\\(prefix\\)/usr") "$(prefix)")
                   ;; Do not save timestamp to avoid gzip "timestamp
                   ;; out-of-range" warnings.
@@ -5248,21 +5246,6 @@ (define-public multipath-tools
                 (substitute* '("kpartx/Makefile" "libmultipath/Makefile")
                   (("/usr/include/libdevmapper.h") libdevmapper.h)
                   (("/usr/include/libudev.h") libudev.h)))))
-          (add-after 'unpack 'fix-maybe-uninitialized-variable
-            (lambda _
-              ;; This variable gets initialized later if needed, but GCC 7
-              ;; fails to notice.  Should be fixed for > 0.8.4.
-              ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html
-              (substitute* "libmultipath/structs_vec.c"
-                (("bool is_queueing;")
-                 "bool is_queueing = false;"))))
-          (add-after 'unpack 'fix-linking-tests
-            (lambda _
-              ;; Add missing linker flag for -lmpathcmd.  This should be fixed
-              ;; for versions > 0.8.4.
-              (substitute* "tests/Makefile"
-                (("-lmultipath -lcmocka")
-                 "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))))
           (add-after 'unpack 'skip-failing-tests
             (lambda _
               ;; This test and the module's setup() test an arbitrary block
@@ -5274,7 +5257,14 @@ (define-public multipath-tools
               (substitute* "tests/Makefile"
                 (("CFLAGS \\+= " match)
                  (string-append match "-Wno-error=unused-function ")))))
-          (delete 'configure))))        ;no configure script
+          (delete 'configure)           ;no configure script
+          (add-before 'build 'set-LDFLAGS
+            (lambda _
+              ;; Note: this cannot be passed as a make flag because that will
+              ;; override the build system LDFLAGS.
+              (setenv "LDFLAGS"
+                      (string-append "-Wl,-rpath=" #$output "/lib")))))))
+
     (native-inputs
      (list perl pkg-config valgrind
            ;; For tests.
@@ -5286,7 +5276,6 @@ (define-public multipath-tools
            lvm2
            readline
            eudev))
-    (home-page "http://christophe.varoqui.free.fr/")
     (synopsis "Access block devices through multiple paths")
     (description
      "This package provides the following binaries to drive the
-- 
cgit v1.2.3


From f2e9f04dd905d9a5700114233f22ef8282407f42 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 23:09:48 +0200
Subject: gnu: freeimage: Update home page.

* gnu/packages/image.scm (freeimage)[home-page]: Follow redirect.
---
 gnu/packages/image.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1b88c7be83..0a677d7835 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1153,7 +1153,7 @@ (define-public freeimage
     "FreeImage is a library for developers who would like to support popular
 graphics image formats like PNG, BMP, JPEG, TIFF and others.")
    (license license:gpl2+)
-   (home-page "http://freeimage.sourceforge.net")))
+   (home-page "https://freeimage.sourceforge.io/")))
 
 (define-public vigra
     (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f")
-- 
cgit v1.2.3


From 02de6a59813df9dd839117669535118f1b798ed4 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Tue, 9 Aug 2022 23:13:45 +0200
Subject: gnu: freeimage: Remove input labels.

* gnu/packages/image.scm (freeimage): Reindent.
[arguments]: Use G-expression and SEARCH-INPUT-DIRECTORY.
[inputs]: Remove labels.
---
 gnu/packages/image.scm | 161 +++++++++++++++++++++++++------------------------
 1 file changed, 81 insertions(+), 80 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 0a677d7835..0b0452664b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal 
 ;;; Copyright © 2018 Fis Trivial 
 ;;; Copyright © 2018 Pierre Neidhardt 
-;;; Copyright © 2018, 2019, 2020 Marius Bakke 
+;;; Copyright © 2018-2020, 2022 Marius Bakke 
 ;;; Copyright © 2018 Pierre-Antoine Rouby 
 ;;; Copyright © 2018 Alex Vong 
 ;;; Copyright © 2018 Rutger Helling 
@@ -98,6 +98,7 @@ (define-module (gnu packages image)
   #:use-module (gnu packages fonts)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix utils)
@@ -1071,89 +1072,89 @@ (define-public giblib
 
 (define-public freeimage
   (package
-   (name "freeimage")
-   (version "3.18.0")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append
-                  "mirror://sourceforge/freeimage/Source%20Distribution/"
-                  version "/FreeImage"
-                  (string-concatenate (string-split version #\.))
-                  ".zip"))
-            (sha256
-             (base32
-              "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"))
-            (modules '((guix build utils)))
-            (snippet
-             '(begin
-                (for-each
-                  (lambda (dir)
-                    (delete-file-recursively (string-append "Source/" dir)))
-                  '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite"
-                    "LibJXR" "LibWebP" "OpenEXR" "ZLib"))))
-            (patches
-             (append
-              (search-patches "freeimage-unbundle.patch")
-              ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility.
-              (list (origin
-                      (method url-fetch)
-                      (uri "https://raw.githubusercontent.com/archlinux\
+    (name "freeimage")
+    (version "3.18.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://sourceforge/freeimage/Source%20Distribution/"
+                    version "/FreeImage"
+                    (string-concatenate (string-split version #\.))
+                    ".zip"))
+              (sha256
+               (base32
+                "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (for-each
+                   (lambda (dir)
+                     (delete-file-recursively (string-append "Source/" dir)))
+                   '("LibJPEG" "LibOpenJPEG" "LibPNG" "LibRawLite"
+                     "LibJXR" "LibWebP" "OpenEXR" "ZLib"))))
+              (patches
+               (append
+                (search-patches "freeimage-unbundle.patch")
+                ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility.
+                (list (origin
+                        (method url-fetch)
+                        (uri "https://raw.githubusercontent.com/archlinux\
 /svntogit-community/ca3e6a52f5a46dec87cbf85e9d84fe370e282c8c/trunk\
 /freeimage-libraw-0.20.patch")
-                      (file-name "freeimage-libraw-compat.patch")
-                      (sha256
-                       (base32
-                        "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki"))))))))
-   (build-system gnu-build-system)
-   (arguments
-    `(#:phases
-      (modify-phases %standard-phases
-        ;; According to Fedora these files depend on private headers, but their
-        ;; presence is required for building, so we replace them with empty files.
-        (add-after 'unpack 'delete-unbuildable-files
-          (lambda _
-            (for-each (lambda (file)
-                        (delete-file file)
-                        (close (open file O_CREAT)))
-                      '("Source/FreeImage/PluginG3.cpp"
-                        "Source/FreeImageToolkit/JPEGTransform.cpp"))
-            #t))
-        ;; These scripts generate the Makefiles.
-        (replace 'configure
-          (lambda _
-            (invoke "sh" "gensrclist.sh")
-            (invoke "sh" "genfipsrclist.sh")))
-        (add-before 'build 'patch-makefile
-          (lambda* (#:key outputs #:allow-other-keys)
-            (substitute* "Makefile.gnu"
-              (("/usr") (assoc-ref outputs "out"))
-              (("-o root -g root") ""))
-            #t)))
+                        (file-name "freeimage-libraw-compat.patch")
+                        (sha256
+                         (base32
+                          "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki"))))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; According to Fedora these files depend on private headers, but their
+          ;; presence is required for building, so we replace them with empty files.
+          (add-after 'unpack 'delete-unbuildable-files
+            (lambda _
+              (for-each (lambda (file)
+                          (delete-file file)
+                          (close (open file O_CREAT)))
+                        '("Source/FreeImage/PluginG3.cpp"
+                          "Source/FreeImageToolkit/JPEGTransform.cpp"))))
+          ;; These scripts generate the Makefiles.
+          (replace 'configure
+            (lambda _
+              (invoke "sh" "gensrclist.sh")
+              (invoke "sh" "genfipsrclist.sh")))
+          (add-before 'build 'patch-makefile
+            (lambda* (#:key outputs #:allow-other-keys)
+              (substitute* "Makefile.gnu"
+                (("/usr") (assoc-ref outputs "out"))
+                (("-o root -g root") "")))))
       #:make-flags
-      (list ,(string-append "CC=" (cc-for-target))
-            ;; We need '-fpermissive' for Source/FreeImage.h.
-            ;; libjxr doesn't have a pkg-config file.
-            (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive "
-                           "-I" (assoc-ref %build-inputs "libjxr") "/include/jxrlib"))
-      #:tests? #f)) ; no check target
-   (native-inputs
-    (list pkg-config unzip))
-   (inputs
-    `(("libjpeg" ,libjpeg-turbo)
-      ("libjxr" ,libjxr)
-      ("libpng" ,libpng)
-      ("libraw" ,libraw)
-      ("libtiff" ,libtiff)
-      ("libwebp" ,libwebp)
-      ("openexr" ,openexr-2)
-      ("openjpeg" ,openjpeg)
-      ("zlib" ,zlib)))
-   (synopsis "Library for handling popular graphics image formats")
-   (description
-    "FreeImage is a library for developers who would like to support popular
+      #~(let ((jxrlib (search-input-directory %build-inputs "include/jxrlib")))
+          (list (string-append "CC=" #$(cc-for-target))
+                ;; We need '-fpermissive' for Source/FreeImage.h.
+                ;; libjxr doesn't have a pkg-config file.
+                (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden "
+                               "-fpermissive -I" jxrlib)))
+      #:tests? #f))                     ; no check target
+    (native-inputs
+     (list pkg-config unzip))
+    (inputs
+     (list libjpeg-turbo
+           libjxr
+           libpng
+           libraw
+           libtiff
+           libwebp
+           openexr-2
+           openjpeg
+           zlib))
+    (synopsis "Library for handling popular graphics image formats")
+    (description
+     "FreeImage is a library for developers who would like to support popular
 graphics image formats like PNG, BMP, JPEG, TIFF and others.")
-   (license license:gpl2+)
-   (home-page "https://freeimage.sourceforge.io/")))
+    (license license:gpl2+)
+    (home-page "https://freeimage.sourceforge.io/")))
 
 (define-public vigra
     (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f")
-- 
cgit v1.2.3


From 02b69362cb5922e3e2579b120a12afcc6167a46e Mon Sep 17 00:00:00 2001
From: 宋文武 
Date: Wed, 10 Aug 2022 08:48:28 +0800
Subject: gnu: xfce: Replace 'gnome-icon-theme' with 'adwaita-icon-theme'.

This fixes .

* gnu/packages/xfce.scm (xfce)[inputs]: Replace gnome-icon-theme with
adwaita-icon-theme.
---
 gnu/packages/xfce.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 9d217fc8cf..12c490f622 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1087,7 +1087,7 @@ (define-public xfce
     (inputs
      (list exo
            garcon
-           gnome-icon-theme
+           adwaita-icon-theme
            ;; Greybird is the recommend theme since Xfce 4.14, see:
            ;; 
            ;; TODO: Make it default via "xfconf/xfce/perchannel-xml/xsettinsg.xml"
-- 
cgit v1.2.3


From b72459a861d7029d69e9e3ffe3dd411b452e26de Mon Sep 17 00:00:00 2001
From: Daniel Meißner 
Date: Tue, 9 Aug 2022 15:07:06 +0200
Subject: gnu: maxima: Fix to find info files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Maxima command ‘describe’ allows to pick the relevant portions from
Maxima’s Texinfo docs.  However it does not support reading gzipped info
files.

* gnu/packages/maths.scm (maxima)[arguments]: Delete
'compress-documentation phase.

Signed-off-by: 宋文武 
---
 gnu/packages/maths.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e32a71100e..52a6d6259f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4435,7 +4435,11 @@ (define-public maxima
                ;; components at runtime.
                (wrap-program (string-append out "/bin/maxima")
                  `("PATH" prefix (,binutils))))
-             #t)))))
+             #t))
+         ;; The Maxima command ‘describe’ allows to pick the relevant portions
+         ;; from Maxima’s Texinfo docs.  However it does not support reading
+         ;; gzipped info files.
+         (delete 'compress-documentation))))
     (home-page "https://maxima.sourceforge.io")
     (synopsis "Numeric and symbolic expression manipulation")
     (description "Maxima is a system for the manipulation of symbolic and
-- 
cgit v1.2.3


From b4714ef05e33c13a2b89df6f355c707f39758801 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 9 Aug 2022 13:05:16 +0200
Subject: gnu: python-stestr: Update to 3.2.1.

* gnu/packages/python-check.scm (python-stestr): Update to 3.2.1.
---
 gnu/packages/python-check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index af0e5be28b..e196f2eccb 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1976,14 +1976,14 @@ (define-public python-robber
 (define-public python-stestr
   (package
     (name "python-stestr")
-    (version "3.0.1")
+    (version "3.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "stestr" version))
        (sha256
         (base32
-         "0adhqp9c9338wlvlq776k57k04lyxp38bv591afdm9gjsn2qn1zm"))))
+         "1kg9gfdr4bj2m7s1r44z530a0ba4p17j4jlhcn1xha0j8jmyfgn2"))))
     (build-system python-build-system)
     (arguments
      `(#:tests? #f))                    ;to avoid circular dependencies
-- 
cgit v1.2.3


From ee41bd8391cea0b903429ed6a281cf802c1be499 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 09:53:45 +0200
Subject: gnu: Add python-requests-kerberos.

* gnu/packages/python-web.scm (python-requests-kerberos): New variable.
---
 gnu/packages/python-web.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 7c5e5651c8..98c5e87888 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver 
 ;;; Copyright © 2015 Cyril Roelandt 
 ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari 
-;;; Copyright © 2016, 2019 Hartmut Goebel 
+;;; Copyright © 2016, 2019, 2022 Hartmut Goebel 
 ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice 
 ;;; Copyright © 2015, 2017 Ben Woodcroft 
 ;;; Copyright © 2015, 2016 Christine Lemmer-Webber 
@@ -2805,6 +2805,25 @@ (define-public python-requests
 than Python’s urllib2 library.")
     (license license:asl2.0)))
 
+(define-public python-requests-kerberos
+  (package
+    (name "python-requests-kerberos")
+    (version "0.14.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "requests-kerberos" version))
+              (sha256
+               (base32
+                "1lbgjs779cjxhz07lfl9dbyp3qfh8a3ir2393042wfg518jd3afd"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-cryptography python-pyspnego
+                             python-requests))
+    (home-page "https://github.com/requests/requests-kerberos")
+    (synopsis "Kerberos authentication handler for python-requests")
+    (description "This package provides a Kerberos authentication handler for
+python-requests.")
+    (license license:isc)))
+
 (define-public python-requests-unixsocket
   (package
     (name "python-requests-unixsocket")
-- 
cgit v1.2.3


From 59625e3cc9fb0355b5c0612065d3361ebf35f0c2 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 15:24:43 +0200
Subject: gnu: Add python-dogpile.cache.

* gnu/packages/databases.scm (python-dogpile.cache): New variable.
---
 gnu/packages/databases.scm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9535b65dbd..7e9a1400c2 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2015, 2016 Sou Bunnbu 
 ;;; Copyright © 2015 Leo Famulari 
 ;;; Copyright © 2015 Eric Dvorsak 
-;;; Copyright © 2016 Hartmut Goebel 
+;;; Copyright © 2016, 2022 Hartmut Goebel 
 ;;; Copyright © 2016 Christine Lemmer-Webber 
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner 
 ;;; Copyright © 2016, 2017 Nikita 
@@ -122,6 +122,7 @@ (define-module (gnu packages databases)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages networking)
   #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages openstack)
   #:use-module (gnu packages pantheon)
   #:use-module (gnu packages parallel)
   #:use-module (gnu packages pcre)
@@ -4823,3 +4824,31 @@ (define-public sqls
     (description
      "This package implements the @acronym{LSP, Language Server Protocol} for SQL.")
     (license license:expat)))
+
+(define-public python-dogpile.cache
+  (package
+    (name "python-dogpile.cache")
+    (version "1.1.8")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "dogpile.cache" version))
+              (sha256
+               (base32
+                "0kpx42vxzss4sz5ic6mp01a97zinzm6q76n8li2gbi4ccfxyhi6q"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "pytest")))))))
+    (native-inputs (list python-mako python-pytest))
+    (propagated-inputs (list python-decorator python-stevedore))
+    (home-page "https://github.com/sqlalchemy/dogpile.cache")
+    (synopsis "Caching front-end based on the Dogpile lock")
+    (description "@code{dogpile.cache} is a caching API which provides a
+generic interface to caching backends of any variety, and additionally
+provides API hooks which integrate these cache backends with the locking
+mechanism of @code{dogpile}.")
+    (license license:expat)))
-- 
cgit v1.2.3


From b5801efaa33af9b46274b67807d4e665b2b685c1 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 20:06:18 +0200
Subject: gnu: Add python-statsd.

* gnu/packages/monitoring.scm (python-statsd): New variable.
---
 gnu/packages/monitoring.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 1694f94b98..c14d62c312 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021 Stefan Reichör 
 ;;; Copyright © 2021 Raphaël Mélotte 
 ;;; Copyright © 2022 Paul A. Patience 
+;;; Copyright © 2022 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -743,3 +744,21 @@ (define-public pw
 display resumes.
 @end itemize")
     (license license:bsd-2)))
+
+(define-public python-statsd
+  (package
+    (name "python-statsd")
+    (version "3.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "statsd" version))
+              (sha256
+               (base32
+                "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"))))
+    (build-system python-build-system)
+    (native-inputs (list python-mock python-nose))
+    (home-page "https://github.com/jsocol/pystatsd")
+    (synopsis "Simple StatsD client")
+    (description "StatsD is a friendly front-end to Graphite.  This package
+provides a simple Python client for the StatsD daemon.")
+    (license license:expat)))
-- 
cgit v1.2.3


From e2857167b1f49888c4c216c5735257350b3e161e Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 09:53:45 +0200
Subject: gnu: Add python-os-service-types.

* gnu/packages/openstack.scm (python-os-service-types): New variable.
---
 gnu/packages/openstack.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 0721d27dbf..e132f70832 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2020, 2021 Ricardo Wurmus 
 ;;; Copyright © 2020 Maxim Cournoyer 
 ;;; Copyright © 2022 Tanguy Le Carrour 
+;;; Copyright © 2022 Hartmut Goebel 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -251,6 +252,32 @@ (define-public python-os-client-config
   comprehensive manner.")
     (license asl2.0)))
 
+(define-public python-os-service-types
+  (package
+    (name "python-os-service-types")
+    (version "1.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "os-service-types" version))
+              (sha256
+               (base32
+                "0v4chwr5jykkvkv4w7iaaic7gb06j6ziw7xrjlwkcf92m2ch501i"))))
+    (build-system python-build-system)
+    (arguments
+     ;; The tests are disabled to avoid a circular dependency with
+     ;; python-keystoneauth1.
+     `(#:tests? #f))
+    (native-inputs (list python-pbr))
+    (home-page "https://docs.openstack.org/os-service-types/latest/")
+    (synopsis "Library for consuming OpenStack Service Types Authority data")
+    (description "The @emph{OpenStack Service Types Authority} contains
+information about officiag OpenStack services and their historical
+service-type aliases.  The data is in JSON and the latest data should always
+be used.  This simple library exists to allow for easy consumption of the
+data, along with a built-in version of the data to use in case network access
+is for some reason not possible and local caching of the fetched data.")
+    (license asl2.0)))
+
 (define-public python-os-testr
   (package
     (name "python-os-testr")
-- 
cgit v1.2.3


From 122bedf2fd843571f11ad68d33735a2a9b21af8a Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 18:46:50 +0200
Subject: gnu: Add python-oslo.concurrency.

* gnu/packages/openstack.scm (python-oslo.concurrency): New variable.
---
 gnu/packages/openstack.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e132f70832..df78526175 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -388,6 +388,50 @@ (define-public python-tempest-lib
 ;;; Packages from the Oslo library
 ;;;
 
+(define-public python-oslo.concurrency
+  (package
+    (name "python-oslo.concurrency")
+    (version "5.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "oslo.concurrency" version))
+              (sha256
+               (base32
+                "0zl9wyxvs69i78wja5c3cacd6gadk8cc8ggy2ips0wlakxp98ilz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "test-requirements.txt"
+               (("hacking[<>!=]" line) (string-append "# " line))
+               (("coverage[<>!=]" line) (string-append "# " line))
+               (("bandit[<>!=]" line) (string-append "# " line))
+               (("pre-commit[<>!=]" line) (string-append "# " line)))))
+         (add-before 'check 'fix-tests
+           (lambda _
+             (substitute* "oslo_concurrency/tests/unit/test_processutils.py"
+               (("#!/bin/bash") (string-append "#!" (which "bash")))
+               (("#!/bin/sh") (string-append "#!" (which "sh")))
+               (("'/usr/bin/env'") (string-append "'" (which "env") "'"))
+               (("'/usr/bin/env ") (string-append "'" (which "env") " "))
+               (("'/bin/true'") (string-append "'" (which "true") "'"))))))))
+    (native-inputs (list python-pbr
+                         ;; for tests:
+                         python-oslotest
+                         python-fixtures
+                         python-stestr
+                         python-eventlet))
+    (propagated-inputs (list python-fasteners python-oslo.config
+                             python-oslo.i18n python-oslo.utils))
+    (home-page "https://docs.openstack.org/oslo.concurrency/latest/")
+    (synopsis "Oslo Concurrency library")
+    (description "The Oslo Concurrency Library provides utilities for safely
+running multi-thread, multi-process applications using locking mechanisms and
+for running external processes.")
+    (license asl2.0)))
+
 (define-public python-oslo.config
   (package
     (name "python-oslo.config")
-- 
cgit v1.2.3


From 0b929d2d239a5e32f2c87e6744105dff34c72c4a Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 20:41:29 +0200
Subject: gnu: Add python-keystoneauth1.

* gnu/packages/openstack.scm (python-keystoneauth1): New variable.
---
 gnu/packages/openstack.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index df78526175..4e3e933509 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -725,6 +725,66 @@ (define-public python-oslo.utils
 handling.")
     (license asl2.0)))
 
+(define-public python-keystoneauth1
+  (package
+    (name "python-keystoneauth1")
+    (version "5.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "keystoneauth1" version))
+              (sha256
+               (base32
+                "08s36dqxrxqx37sdl28cr7fx2iwr8wfxaa53hwq2dzcx9h25zfvf"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "test-requirements.txt"
+               (("hacking[<>!=].*") "hacking\n")
+               ;; unused, code-quality checks only
+               (("flake8-.*[<>!=]" line) (string-append "# " line))
+               (("pycodestyle[<>!=]" line) (string-append "# " line))
+               (("bandit[<>!=]" line) (string-append "# " line))
+               (("coverage[<>!=]" line) (string-append "# " line))
+               (("reno[<>!=]" line) (string-append "# " line)))))
+         (add-before 'check 'check-setup
+           (lambda _
+             ;; remove code-quality checks
+             (delete-file "keystoneauth1/tests/unit/test_hacking_checks.py")))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "stestr" "run")))))))
+    (propagated-inputs (list python-iso8601
+                             python-os-service-types
+                             python-requests
+                             python-six
+                             python-stevedore))
+    (native-inputs (list python-betamax
+                         python-fixtures
+                         python-hacking
+                         python-lxml
+                         python-oauthlib
+                         python-oslo.config
+                         python-oslo.utils
+                         python-oslotest
+                         python-pbr
+                         python-pyyaml
+                         python-requests-kerberos
+                         python-requests-mock
+                         python-stestr
+                         python-testresources
+                         python-testtools))
+    (home-page "https://docs.openstack.org/keystoneauth/latest/")
+    (synopsis "Authentication Library for OpenStack Identity")
+    (description "Keystoneauth provides a standard way to do authentication
+and service requests within the OpenStack ecosystem.  It is designed for use
+in conjunction with the existing OpenStack clients and for simplifying the
+process of writing new clients.")
+    (license asl2.0)))
+
 (define-public python-keystoneclient
   (package
     (name "python-keystoneclient")
-- 
cgit v1.2.3


From c037745a4c99a5fc9483f6e0e12e2867d26cf10c Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 20:24:34 +0200
Subject: gnu: Add python-requestsexceptions.

* gnu/packages/openstack.scm (python-requestsexceptions): New variable.
---
 gnu/packages/openstack.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 4e3e933509..217fcb4a93 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -924,3 +924,27 @@ (define-public python-git-review
      "Git-review is a command-line tool that helps submitting Git branches to
 Gerrit for review, or fetching existing ones.")
     (license asl2.0)))
+
+(define-public python-requestsexceptions
+  (package
+    (name "python-requestsexceptions")
+    (version "1.4.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "requestsexceptions" version))
+              (sha256
+               (base32
+                "0r9hp9yzgj8r81q5gc6r8sgxldqc09xi6ax0b7a6dw0qfv3wp5dh"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f))  ; no tests
+    (native-inputs (list python-pbr))
+    (home-page "https://www.openstack.org/")
+    (synopsis "Import exceptions from potentially bundled packages in requests")
+    (description "The Python requests library bundles the urllib3 library,
+however, some software distributions modify requests to remove the bundled
+library.  This makes some operations difficult, such as suppressing the
+“insecure platform warning” messages that urllib emits.  This package is a
+simple library to find the correct path to exceptions in the requests library
+regardless of whether they are bundled or not.")
+    (license asl2.0)))
-- 
cgit v1.2.3


From 8a4faff132fddc4ff6f26778787cd60e9732d6b3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 20:33:32 +0200
Subject: gnu: Add python-openstacksdk.

* gnu/packages/openstack.scm (python-openstacksdk): New variable.
---
 gnu/packages/openstack.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 217fcb4a93..e84c9ac7bc 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -27,7 +27,9 @@
 (define-module (gnu packages openstack)
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages databases)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages monitoring)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-check)
@@ -948,3 +950,72 @@ (define-public python-requestsexceptions
 simple library to find the correct path to exceptions in the requests library
 regardless of whether they are bundled or not.")
     (license asl2.0)))
+
+(define-public python-openstacksdk
+  (package
+    (name "python-openstacksdk")
+    (version "0.100.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "openstacksdk" version))
+              (sha256
+               (base32
+                "0iq7rxw59ibl6xsqh3jw56yg3zfbz3cqgx1239n6xd9iv86mcgq1"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (with-output-to-file "exclusion-list.txt"
+                          (lambda _
+	                    (display
+                             (string-append
+                              ;; tests timing out
+                              "test_create_dynamic_large_object$\n"
+                              "test_create_object_index_rax$\n"
+                              "test_create_object_skip_checksum$\n"
+                              "test_inspect_machine_inspect_failed$\n"
+                              "test_inspect_machine_wait$\n"
+                              "test_status_fails_different_attribute$\n"
+                              "test_status_match$\n"
+                              "test_status_match_different_attribute$\n"
+                              "test_status_match_with_none$\n"
+                              "test_wait_for_baremetal_node_lock_locked$\n"
+                              "test_wait_for_task_error_396$\n"
+                              "test_wait_for_task_wait$\n"))))
+                        (invoke "stestr" "run"
+                                "--exclude-list" "exclusion-list.txt")))))))
+    (native-inputs (list python-ddt
+                         python-hacking
+                         python-jsonschema
+                         python-pbr
+                         python-prometheus-client
+                         python-requests-mock
+                         python-statsd
+                         python-stestr
+                         python-testscenarios
+                         python-oslo.config
+                         python-oslotest))
+    (propagated-inputs (list python-appdirs
+                             python-cryptography
+                             python-decorator
+                             python-dogpile.cache
+                             python-importlib-metadata
+                             python-iso8601
+                             python-jmespath
+                             python-jsonpatch
+                             python-keystoneauth1
+                             python-munch
+                             python-netifaces
+                             python-os-service-types
+                             python-pbr   ; run-time dependency actually
+                             python-pyyaml
+                             python-requestsexceptions))
+    (home-page "https://docs.openstack.org/openstacksdk/latest/")
+    (synopsis "SDK for building applications to work with OpenStack")
+    (description "This package provides a client library for building
+applications to work with OpenStack clouds.  The SDK aims to provide a
+consistent and complete set of interactions with OpenStack’s many services,
+along with complete documentation, examples, and tools.")
+    (license asl2.0)))
-- 
cgit v1.2.3


From b08a3554a4577f7fb1557f296aa189bc220e7138 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 21:49:40 +0200
Subject: gnu: Add python-tempest.

* gnu/packages/openstack.scm (python-tempest): New variable.
---
 gnu/packages/openstack.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e84c9ac7bc..5bf5983541 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -346,6 +346,64 @@ (define-public python-stevedore
 extensions.")
     (license asl2.0)))
 
+(define-public python-tempest
+  (package
+    (name "python-tempest")
+    (version "31.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "tempest" version))
+              (sha256
+               (base32
+                "1bh250n0cf68jm68jd7pcrgf7zbsv74cq590ar1n002sijfcb80i"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "test-requirements.txt"
+               ;; unused, code-quality checks only
+               (("hacking[<>!=]" line) (string-append "# " line))
+               (("flake8-.*[<>!=]" line) (string-append "# " line))
+               (("pycodestyle[<>!=]" line) (string-append "# " line))
+               (("coverage[<>!=]" line) (string-append "# " line)))))
+         (add-before 'check 'setup-check
+           (lambda _
+             (substitute* "tempest/tests/lib/cli/test_execute.py"
+               (("cli_base.execute\\(\"env\",")
+                (string-append "cli_base.execute('" (which "env") "',")))))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "stestr" "--test-path" "./tempest/tests" "run")))))))
+    (propagated-inputs (list python-cliff
+                             python-cryptography
+                             python-debtcollector
+                             python-fixtures
+                             python-jsonschema
+                             python-netaddr
+                             python-oslo.concurrency
+                             python-oslo.config
+                             python-oslo.log
+                             python-oslo.serialization
+                             python-oslo.utils
+                             python-paramiko
+                             python-prettytable
+                             python-pyyaml
+                             python-stevedore
+                             python-subunit
+                             python-testtools
+                             python-urllib3))
+    (native-inputs (list python-oslotest python-pbr python-stestr python-hacking))
+    (home-page "https://docs.openstack.org/tempest/latest/")
+    (synopsis "OpenStack Integration Testing")
+    (description "This is a set of integration tests to be run against a live
+OpenStack cluster.  Tempest has batteries of tests for OpenStack API
+validation, scenarios, and other specific tests useful in validating an
+OpenStack deployment.")
+    (license asl2.0)))
+
 (define-public python-tempest-lib
   (package
     (name "python-tempest-lib")
-- 
cgit v1.2.3


From d2dd9d1d2648b81d08f668c0a9dfc300af54d2ac Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 21:49:40 +0200
Subject: gnu: python-keystoneclient: Update to 5.0.0.

* gnu/packages/openstack.scm (python-keystoneclient): Update to 5.0.0.
  [arguments]{relax-requirements}: New phase.
  [propagated-inputs]: Remove python-pbr; add python-keystoneauth1.
  [native-inputs]: Adjust to new style. Remove python-sphinx, python-coverage,
  python-discover, python-hacking, python-mox3, python-oslosphinx,
  python-pycrypto, python-testrepository, and python-webob; add python-pbr,
  python-stestr, and python-testscenarios.
---
 gnu/packages/openstack.scm | 54 +++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 5bf5983541..ebe3f39f9c 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -848,49 +848,53 @@ (define-public python-keystoneauth1
 (define-public python-keystoneclient
   (package
     (name "python-keystoneclient")
-    (version "1.8.1")
+    (version "5.0.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "python-keystoneclient" version))
         (sha256
          (base32
-          "1w4csvkah67rfpxylxnvs2s3594i0f9isy8pf4gnsqs5zirvjaa4"))))
+          "0gza5fx3xl3l6vrc6pnhbzhipz1fz9h98kwxqp7mmd90pwrxll0g"))))
     (build-system python-build-system)
     (arguments
-     '(#:tests? #f)) ; FIXME: Many tests are failing.
+     '(#:tests? #f   ; FIXME: Many tests are failing.
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'relax-requirements
+                    (lambda _
+                      (substitute* "test-requirements.txt"
+                        ;; unused, code-quality checks only
+                        (("hacking[<>!=]" line) (string-append "# " line))
+                        (("flake8-.*[<>!=]" line) (string-append "# " line))
+                        (("pycodestyle[<>!=]" line) (string-append "# " line))
+                        (("bandit[<>!=]" line) (string-append "# " line))
+                        (("coverage[<>!=]" line) (string-append "# " line))
+                        (("reno[<>!=]" line) (string-append "# " line))))))))
     (native-inputs
-     `(("python-sphinx" ,python-sphinx)
-       ;; and some packages for the tests
-       ("openssl" ,openssl)
-       ("python-coverage" ,python-coverage)
-       ("python-discover" ,python-discover)
-       ("python-fixtures" ,python-fixtures)
-       ("python-hacking" ,python-hacking)
-       ("python-keyring" ,python-keyring)
-       ("python-lxml" ,python-lxml)
-       ("python-mock" ,python-mock)
-       ("python-mox3" ,python-mox3)
-       ("python-oauthlib" ,python-oauthlib)
-       ("python-oslosphinx" ,python-oslosphinx)
-       ("python-oslotest" ,python-oslotest)
-       ("python-pycrypto" ,python-pycrypto)
-       ("python-requests-mock" ,python-requests-mock)
-       ("python-temptest-lib" ,python-tempest-lib)
-       ("python-testrepository" ,python-testrepository)
-       ("python-testresources" ,python-testresources)
-       ("python-testtools" ,python-testtools)
-       ("python-webob" ,python-webob)))
+     (list openssl
+           python-fixtures
+           python-keyring
+           python-lxml
+           python-mock
+           python-oauthlib
+           python-oslotest
+           python-pbr
+           python-requests-mock
+           python-stestr
+           python-tempest-lib
+           python-testresources
+           python-testscenarios
+           python-testtools))
     (propagated-inputs
      (list python-babel
            python-debtcollector
            python-iso8601
+           python-keystoneauth1
            python-netaddr
            python-oslo.config
            python-oslo.i18n
            python-oslo.serialization
            python-oslo.utils
-           python-pbr
            python-prettytable
            python-requests
            python-six
-- 
cgit v1.2.3


From cffb9967fe5037bba4da52438d4d2f57409db637 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 20:33:56 +0200
Subject: gnu: python-munch: Update to 2.5.0.

* gnu/packages/python-xyz.scm (python-munch): Update to 2.5.0.
  [propagated-inputs]: Add python-six.
  [native-inputs]: Add python-pbr and python-pytest.
---
 gnu/packages/python-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d18959889e..6270fee9b9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5742,15 +5742,17 @@ (define-public python-numpy-documentation
 (define-public python-munch
   (package
     (name "python-munch")
-    (version "2.0.4")
+    (version "2.5.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "munch" version))
         (sha256
          (base32
-          "1cmqg91xnqx8gvnh4pmp0bfl1dfcm65d5p9mg73zz8pkjhx6h80l"))))
+          "1lnvlic9g68hcmgdnv5bzp0nx2bf1kjclj54gx0s7nyl4ipmywrd"))))
     (build-system python-build-system)
+    (native-inputs (list python-pbr python-pytest))
+    (propagated-inputs (list python-six))
     (home-page "https://github.com/Infinidat/munch")
     (synopsis "Dot-accessible dictionary")
     (description "Munch is a dot-accessible dictionary similar to JavaScript
-- 
cgit v1.2.3


From 0bba3ebf567942be9a3fa937b2657a7dc288fcfa Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:20:34 +0200
Subject: gnu: python-oslo.context: Update to 5.0.0.

* gnu/packages/openstack.scm (python-oslo.context): Update to 5.0.0.
  [native-inputs]: Remove python-bandit; add python-mypy.
  [arguments]{relax-requirements}: Relax more requirements.
---
 gnu/packages/openstack.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index ebe3f39f9c..e2afad707b 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -523,30 +523,31 @@ (define-public python-oslo.config
 (define-public python-oslo.context
   (package
     (name "python-oslo.context")
-    (version "3.1.1")
+    (version "5.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "oslo.context" version))
        (sha256
         (base32
-         "1l2z186rkd9acrb2ygf53yrdc1lgf7cy1akbhm21kgkzind4p2r6"))))
+         "091j2cjh1b60nx6s0a4amb2idh9awijnbmppc3an0738fv8cdh48"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
                   (add-after 'unpack 'relax-requirements
                     (lambda _
                       (substitute* "test-requirements.txt"
-                        (("hacking>=3.0.1,<3.1.0")
-                         "hacking>=3.0.1"))
-                      #t)))))
+                        (("hacking[<>!=].*") "hacking\n")
+                        ;; unused, code-quality checks only
+                        (("bandit[<>!=]" line) (string-append "# " line))
+                        (("pre-commit[<>!=]" line) (string-append "# " line))))))))
     (propagated-inputs
      (list python-debtcollector))
     (native-inputs
-     (list python-bandit
-           python-coverage
+     (list python-coverage
            python-fixtures
            python-hacking
+           python-mypy
            python-oslotest
            python-pbr
            python-stestr))
-- 
cgit v1.2.3


From 52359f01bb92e254de3a83078d2a0908b083aab6 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:20:35 +0200
Subject: gnu: python-oslo.log: Update to 5.0.0.

* gnu/packages/openstack.scm (python-oslo.log): Update to 5.0.0.
  [propagated-inputs]: Remove python-six, python-pbr.
  [native-inputs]: Add python-pbr.
---
 gnu/packages/openstack.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e2afad707b..12c128d706 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -588,14 +588,14 @@ (define-public python-oslo.i18n
 (define-public python-oslo.log
   (package
   (name "python-oslo.log")
-  (version "4.6.1")
+  (version "5.0.0")
   (source
     (origin
       (method url-fetch)
       (uri (pypi-uri "oslo.log" version))
       (sha256
         (base32
-          "0dlnxjci9mpwhgfv19fy1z7xrdp8m95skrj5dr60all3pr7n22f6"))))
+          "00adkm465xcaxg15pncsmwxhicdj3kx4v1vcabghpmd2m0s75avk"))))
   (build-system python-build-system)
   (arguments
    '(#:phases (modify-phases %standard-phases
@@ -610,11 +610,10 @@ (define-public python-oslo.log
          python-oslo.i18n
          python-oslo.utils
          python-oslo.serialization
-         python-pbr
-         python-pyinotify
-         python-six))
+         python-pyinotify))
   (native-inputs
-    (list python-fixtures python-oslotest python-stestr python-testtools))
+   (list python-fixtures python-oslotest python-stestr python-testtools
+         python-pbr))
   (home-page "https://launchpad.net/oslo")
   (synopsis "Python logging library of the Oslo project")
   (description
-- 
cgit v1.2.3


From 104f9e05754e3453413534bc2c31a60281ebde9f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:20:34 +0200
Subject: gnu: python-tempest-lib: Update to 1.0.0.

* gnu/packages/openstack.scm (python-tempest-lib): Update to 1.0.0.
  [arguments]{relax-requirements}: New phase.
  [propagated-inputs]: Remove python-pbr.
  [native-inouts]: Add python-pbr.
---
 gnu/packages/openstack.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 12c128d706..844f535286 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -420,6 +420,10 @@ (define-public python-tempest-lib
      `(#:tests? #f ; FIXME: Requires oslo.log >= 1.14.0.
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'relax-requirements
+           (lambda _
+             (substitute* "requirements.txt"
+               (("jsonschema[<>!=].*") "jsonschema\n"))))
          (add-before
           'check 'pre-check
           (lambda _
@@ -432,10 +436,10 @@ (define-public python-tempest-lib
             python-jsonschema
             python-oslo.log
             python-paramiko
-            python-pbr
             python-six))
     (native-inputs
-      (list python-babel python-mock python-os-testr python-oslotest))
+      (list python-babel python-mock python-os-testr python-oslotest
+            python-pbr))
     (home-page "https://www.openstack.org/")
     (synopsis "OpenStack functional testing library")
     (description
-- 
cgit v1.2.3


From 6937cea1996a21321b6cc041c37e4c0381c9b6a0 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:20:35 +0200
Subject: gnu: python-pyjwt: Update to 2.4.0.

* gnu/packages/python-xyz.scm (python-pyjwt): Update to 2.4.0.
  [source]: Remove snippet.
  [arguments]{check}: Remove now unused parts, honor '#:tests?'.
  (native-inputs]: Remove python-pytest-cov, add python-cryptography.
---
 gnu/packages/python-xyz.scm | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6270fee9b9..c430b99600 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3763,34 +3763,23 @@ (define-public python-text-unidecode
 (define-public python-pyjwt
   (package
     (name "python-pyjwt")
-    (version "1.7.1")
+    (version "2.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "PyJWT" version))
        (sha256
         (base32
-         "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           (for-each delete-file-recursively
-                     (find-files "." "\\.pyc$"))
-           #t))))
+         "1fmbcwfw1463wjzwbcgg3s16rad6kfb1mc5y7jbkp6v9ihh0hafl"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
                   (replace 'check
-                    (lambda _
-                      ;; Mimic upstream commit 3a20892442b34c7 to get
-                      ;; rid of dependency on pytest-runner < 5.0.
-                      ;; Remove substitution for PyJWT > 1.7.1.
-                      (substitute* "setup.py"
-                        ((".*pytest-runner.*")
-                         ""))
-                      (invoke "pytest" "-vv"))))))
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest" "-vv")))))))
     (native-inputs
-     (list python-pytest python-pytest-cov))
+     (list python-cryptography python-pytest))
     (home-page "https://github.com/progrium/pyjwt")
     (synopsis "JSON Web Token implementation in Python")
     (description
-- 
cgit v1.2.3


From ead37cb68557f40823fed8f932ddf051261e2438 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 20:47:50 +0200
Subject: gnu: python-swiftclient: Update to 4.0.1.

* gnu/packages/openstack.scm (python-swiftclient): Update to 4.0.1.
  [arguments]{relax-requirements}: New phase.
  [arguments]{check}: New phase.
  [propagated-inputs]: Remove python-six.
  [native-inputs]: Remove python-pbr, python-sphinx, python-coverage,
  python-discover, python-hacking, python-mock, python-oslosphinx,
  python-testrepository, and python-testtools; add python-keystoneauth1,
  python-openstacksdk, and python-stestr.
---
 gnu/packages/openstack.scm | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 844f535286..dd13404c87 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -917,29 +917,31 @@ (define-public python-keystoneclient
 (define-public python-swiftclient
   (package
     (name "python-swiftclient")
-    (version "2.6.0")
+    (version "4.0.1")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "python-swiftclient" version))
         (sha256
          (base32
-          "1j33l4z9vqh0scfncl4fxg01zr1hgqxhhai6gvcih1gccqm4nd7p"))))
+          "1zwb4zcln454fzcnbwqhyzxb68wrsr1i2vvvrn5c7yy5k4vcfs1v"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'relax-requirements
+                    (lambda _
+                      (delete-file "test-requirements.txt")))
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "stestr" "run")))))))
     (native-inputs
-     (list python-pbr
-           python-sphinx
-           ;; The folloing packages are needed for the tests.
-           python-coverage
-           python-discover
-           python-hacking
-           python-mock
-           python-oslosphinx
-           python-keystoneclient
-           python-testrepository
-           python-testtools))
+     (list python-keystoneclient
+           python-keystoneauth1
+           python-openstacksdk
+           python-stestr))
     (propagated-inputs
-     (list python-requests python-six))
+     (list python-requests))
     (home-page "https://www.openstack.org/")
     (synopsis "OpenStack Object Storage API Client Library")
     (description
-- 
cgit v1.2.3


From 84de0e317511515d310ca54d90bbd7996babe0fc Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 22:08:43 +0200
Subject: gnu: python-pygithub: Update to 1.55.

* gnu/packages/python-xyz.scm (python-pygithub): Update to 1.55.
  [propagated-inputs]: Add python-pynacl.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c430b99600..1822eeea36 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4589,7 +4589,7 @@ (define-public python-deprecated
 (define-public python-pygithub
   (package
     (name "python-pygithub")
-    (version "1.54.1")
+    (version "1.55")
     (source
      ;; We fetch from the Git repo because there are no tests in the PyPI
      ;; archive.
@@ -4600,7 +4600,7 @@ (define-public python-pygithub
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq"))))
+        (base32 "082bxffpy4h97dsay3l75cpgfjj10kywkvicnm6xscwvah285q9y"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -4612,7 +4612,7 @@ (define-public python-pygithub
              #t)))))
     (propagated-inputs
      (list python-cryptography python-deprecated python-pyjwt
-           python-requests))
+           python-pynacl python-requests))
     (native-inputs
      (list python-httpretty python-pytest))
     (home-page "https://pygithub.readthedocs.io/en/latest/")
-- 
cgit v1.2.3


From 2111a4eee7441213156e9df04dd141cf19d91fdc Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Thu, 21 Jul 2022 23:01:35 +0200
Subject: gnu: conan: Update to 1.50.0.

* gnu/packages/package-management.scm (conan): Update to 1.50.0.
  [arguments]{check}: Add another test to be skipped, adjust comment.
---
 gnu/packages/package-management.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 01abd98d65..0469c73ff5 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1152,7 +1152,7 @@ (define-public conda
 (define-public conan
   (package
     (name "conan")
-    (version "1.47.0")
+    (version "1.50.0")
     (source
      (origin
        (method git-fetch)               ;no tests in PyPI archive
@@ -1162,7 +1162,7 @@ (define-public conan
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1zs2xb22rsy5fsc0fd7c95vrx1mfz7vasyg1lqkzyfimvn5zah6n"))))
+         "1jjrinz5wkcxfvwdpldrv4h7vacdyz88cc4af5vi3sdnjra0i0m5"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -1231,8 +1231,9 @@ (define system ,(or (%current-target-system)
                         ;; This one fails for unknown reasons (see:
                         ;; https://github.com/conan-io/conan/issues/9671).
                         "and not test_build "
-                        ;; This test expects the 'apt' command to be available.
+                        ;; These tests expect the 'apt' command to be available.
                         "and not test_apt_check "
+                        "and not test_apt_install_substitutes "
                         (if (not (string-prefix? "x86_64" system))
                             ;; These tests either assume the machine is
                             ;; x86_64, or require a cross-compiler to target
-- 
cgit v1.2.3


From 924a78b1148e8a433178c6e9737e0029691b0022 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 09:50:02 +0200
Subject: gnu: aspell: Fix CVE-2019-25051 with a graft.

This partially reverts commit 468c95e9415bc303cfa36c9b67bbd2ce0abe904b in
order to prevent rebuilding 2k+ packages via 'inkscape'.

* gnu/packages/aspell.scm (aspell)[replacement]: New field.
[source](patches): Remove "aspell-CVE-2019-25051.patch".
(aspell/replacement): New private variable.
---
 gnu/packages/aspell.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm
index d2737ee79a..ec0dafbc7a 100644
--- a/gnu/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -47,6 +47,7 @@ (define-public aspell
   (package
     (name "aspell")
     (version "0.60.8")
+    (replacement aspell/replacement)
     (source
      (origin
       (method url-fetch)
@@ -55,8 +56,7 @@ (define-public aspell
       (sha256
        (base32
         "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"))
-      (patches (search-patches "aspell-default-dict-dir.patch"
-                               "aspell-CVE-2019-25051.patch"))))
+      (patches (search-patches "aspell-default-dict-dir.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
@@ -93,6 +93,16 @@ (define-public aspell
 dictionaries, including personal ones.")
     (license lgpl2.1+)))
 
+;; Replacement package with security fixes.
+(define aspell/replacement
+  (package
+    (inherit aspell)
+    (source
+     (origin
+       (inherit (package-source aspell))
+       (patches (append (origin-patches (package-source aspell))
+                        (search-patches "aspell-CVE-2019-25051.patch")))))))
+
 ;;;
 ;;; Dictionaries.
 ;;;
-- 
cgit v1.2.3


From 357a4c1870992a71f64033a90a09a1a8cb32c210 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:09:35 +0200
Subject: gnu: Add python-mkdocs-markdownextradata-plugin.

* gnu/packages/python-xyz.scm (python-mkdocs-markdownextradata-plugin): New variable.
---
 gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1822eeea36..808ca1c8db 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -693,6 +693,32 @@ (define-public python-mkdocs
 configured with a single YAML configuration file.")
     (license license:bsd-3)))
 
+(define-public python-mkdocs-markdownextradata-plugin
+  (package
+    (name "python-mkdocs-markdownextradata-plugin")
+    (version "0.2.5")
+    (source (origin
+       ;; Use git, as there are some test files missing from the PyPI release,
+       ;; see https://github.com/rosscdh/mkdocs-markdownextradata-plugin/issues/41.
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/rosscdh/mkdocs-markdownextradata-plugin")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a3868s9m7pzyfncpjbjsa9vw5nihssl2v47pxj7h6qa67kvlk3g"))))
+    (build-system python-build-system)
+    (native-inputs (list python-pytest))
+    (propagated-inputs (list python-mkdocs python-pyyaml))
+    (home-page "https://github.com/rosscdh/mkdocs-markdownextradata-plugin/")
+    (synopsis "Inject mkdocs.yml extra variables into the MkDocs markdown
+template")
+    (description
+     "This package provides a MkDocs plugin that injects the mkdocs.yml extra
+variables into the markdown template")
+    (license license:expat)))
+
 (define-public python-pymdown-extensions
   (package
     (name "python-pymdown-extensions")
-- 
cgit v1.2.3


From feef09b28ce802465d4e048e06cd52d57b5fd9f3 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:09:36 +0200
Subject: gnu: Add python-starlette.

* gnu/packages/python-web.scm (python-starlette): New variable.
---
 gnu/packages/python-web.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 98c5e87888..e863ff9c55 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7685,3 +7685,29 @@ (define-public python-sendgrid
 SendGrid Web API v3.  Version 3+ of the library provides full support for all
 SendGrid Web API v3 endpoints, including the new v3 /mail/send.")
     (license license:expat)))
+
+(define-public python-starlette
+  (package
+    (name "python-starlette")
+    (version "0.20.4")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "starlette" version))
+              (sha256
+               (base32
+                "112hmwk4fh4dl21nlr2xd37h43xzxpjxfnic7v7fz3wr5w9g7z22"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-anyio
+                             python-typing-extensions
+                             ;; [all] extra dependencies:
+                             python-itsdangerous
+                             python-jinja2
+                             python-multipart
+                             python-pyyaml
+                             python-requests))
+    (home-page "https://github.com/encode/starlette")
+    (synopsis "Little ASGI library")
+    (description
+     "Starlette is a lightweight ASGI (Asynchronous Server Gateway
+Interface) framework/toolkit for building async web services in Python.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From cf2327ecc0e92ec28e8863bb35ff38d9ffaa0615 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:29:31 +0200
Subject: gnu: Add python-cyclic.

* gnu/packages/python-xyz.scm (python-cyclic): New variable.
---
 gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 808ca1c8db..1e4d04e069 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30379,3 +30379,26 @@ (define-public i3-autotiling
      "Script for Sway and i3 to automatically switch the horizontal/vertical
  window split orientation.")
     (license license:gpl3)))
+
+(define-public python-cyclic
+  (package
+    (name "python-cyclic")
+    (version "1.0.0")
+    (source (origin
+              ;; Use git, as there are some test files missing from the PyPI
+              ;; release, see https://github.com/neurobin/cyclic/issues/1
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/neurobin/cyclic")
+                    ;; Release is not tagged on github, see
+                    ;; https://github.com/neurobin/cyclic/issues/2
+                    (commit "bf616c47ea49a43500ea55a1e6f4890323be0679")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0r8zzjdv70fpxssxps62rlgpii8fr9gh8gykdygqn6mkdnfjwgjc"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/neurobin/cyclic")
+    (synopsis "Handle cyclic relations")
+    (description "This package handles cyclic relations compared by value.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From 0f9e0abd4fd15afb498ec8aa3ca10fdb8a9bc1c4 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:30:13 +0200
Subject: gnu: Add python-rcslice.

* gnu/packages/python-xyz.scm (python-rcslice): New variable.
---
 gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1e4d04e069..c22718efaf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30402,3 +30402,29 @@ (define-public python-cyclic
     (synopsis "Handle cyclic relations")
     (description "This package handles cyclic relations compared by value.")
     (license license:bsd-3)))
+
+(define-public python-rcslice
+  (package
+    (name "python-rcslice")
+    (version "1.1.0")
+    (source (origin
+              ;; Use git, as there are some test files missing from the PyPI
+              ;; release, see https://github.com/neurobin/rcslice/issues/1
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/neurobin/rcslice")
+                    ;; Releases are not tagged on github, see
+                    ;; https://github.com/neurobin/rcslice/issues/2
+                    (commit "1e1ef42cd262db76b67ded430630d5b499790f42")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1lmhcgghh60kvdlx0cin1phhgfy9jivc6l0mb4ibnpa1x1md0zvv"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/neurobin/rcslice")
+    (synopsis "Slice a list of sliceables")
+    (description "This package provides Python module to slice a list of
+sliceables (1 indexed, both start and end index are inclusive).  Helps to
+slice file content line by line or column by column or a combination of
+both.")
+    (license license:bsd-3)))
-- 
cgit v1.2.3


From da7e6028c8147266590aabb380755a2d9a974889 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:28:05 +0200
Subject: gnu: Add python-mdx-include.

* gnu/packages/python-xyz.scm (python-mdx-include): New variable.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c22718efaf..5eac85affe 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10900,6 +10900,42 @@ (define-public python-markdown
 markdown_py is also provided to convert Markdown files to HTML.")
     (license license:bsd-3)))
 
+(define-public python-mdx-include
+  (package
+    (name "python-mdx-include")
+    (version "1.4.1")
+    (source (origin
+              ;; Use git, as there are some test files missing from the PyPI
+              ;; release, see https://github.com/neurobin/mdx_include/issues/9
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/neurobin/mdx_include")
+                    ;; Releases are not tagged on github, see
+                    ;; https://github.com/neurobin/mdx_include/issues/10
+                    (commit "683e6be7a00a1ef4d673ad0294458fa61bc97286")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0qpzgln4ybd7pl0m9s19dv60aq9cvwrk7x3yz96kjhcywaa5w386"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-test-requiring-network
+           (lambda _
+             (substitute* "mdx_include/test/test.py"
+               (("(\\s+def )test_(cache|config|default)\\(" _ pre post)
+                (string-append pre "__off__test_" post "("))))))))
+    (propagated-inputs (list python-cyclic python-markdown python-rcslice))
+    (home-page "https://github.com/neurobin/mdx_include")
+    (synopsis "Python Markdown extension to include local or remote files")
+    (description "Include extension for Python Markdown.  It lets you include
+local or remote (downloadable) files into your markdown at arbitrary
+positions.
+
+This project is motivated by markdown-include and provides the same
+functionalities with some extras.")
+    (license license:bsd-3)))
 
 (define-public python-ptyprocess
   (package
-- 
cgit v1.2.3


From 6ff0e43d4ef80b81599cb66432f80784deefc704 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Sun, 24 Jul 2022 13:30:24 +0200
Subject: gnu: Add python-types-orjson.

* gnu/packages/python-xyz.scm (python-types-orjson): New variable.
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5eac85affe..60f2df85f1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30464,3 +30464,21 @@ (define-public python-rcslice
 slice file content line by line or column by column or a combination of
 both.")
     (license license:bsd-3)))
+
+(define-public python-types-orjson
+  (package
+    (name "python-types-orjson")
+    (version "3.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "types-orjson" version))
+              (sha256
+               (base32
+                "0f66lf2qrl9d4vad42db3dmnzv89h4rr05r5zxx5qcl6kb3zr6ng"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/python/typeshed")
+    (synopsis "Typing stubs for orjson")
+    (description "This is a PEP 561 type stub package for the @code{orjson}
+package.  It can be used by type-checking tools like mypy, PyCharm, pytype
+etc. to check code that uses @code{orjson}.")
+    (license license:asl2.0)))
-- 
cgit v1.2.3


From 37ea0a7360f88e213e2dc3616c259d7fd4d2b6fd Mon Sep 17 00:00:00 2001
From: kiasoc5 
Date: Fri, 5 Aug 2022 00:44:53 -0400
Subject: gnu: openh264: Update to 2.3.0 and use gexps.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/video.scm (openh264): Update to 2.3.0.
[arguments]: Use gexps.

Signed-off-by: 宋文武 
---
 gnu/packages/video.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 44ae49ac1c..d5dc59ddff 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3939,7 +3939,7 @@ (define-public intel-vaapi-driver
 (define-public openh264
   (package
     (name "openh264")
-    (version "2.1.1")
+    (version "2.3.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3948,17 +3948,20 @@ (define-public openh264
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s"))))
+                "1yr6nsjpnazq4z6dvjfyanljwgwnyjh3ddxa0sq6hl9qc59yq91r"))))
     (build-system gnu-build-system)
     (native-inputs
      (list nasm python))
     (arguments
-     '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
-                          "CC=gcc")
-       #:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  ;; no configure script
-                  (delete 'configure))))
+     (list
+      #:make-flags
+      #~(list (string-append "PREFIX=" #$output)
+                             "CC=gcc")
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; no configure script
+          (delete 'configure))))
     (home-page "https://www.openh264.org/")
     (synopsis "H264 decoder library")
     (description
-- 
cgit v1.2.3


From 00d3fb23ff88fbd2292c4b19cec85f244bfed684 Mon Sep 17 00:00:00 2001
From: vicvbcun 
Date: Mon, 8 Aug 2022 17:45:45 +0200
Subject: gnu: python-sympy: Update to 1.10.1.

* gnu/packages/python-xyz.scm (python-sympy): Update to 1.10.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 60f2df85f1..b062b4c013 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9957,13 +9957,13 @@ (define-public python-yte
 (define-public python-sympy
   (package
     (name "python-sympy")
-    (version "1.7.1")
+    (version "1.10.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "sympy" version))
        (sha256
-        (base32 "0bkb4jf24yv5i4kjpsmg1xjjccfhqyi0syv0p0xvhdbmx5hr5pm3"))))
+        (base32 "0yvqb2fhrm81skl8s9znbkkjfb1a09n64qqlc1r225cyvzzywfar"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From ea6b2d52e03295e570354494de534e74b7e9293d Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 15:46:35 +0200
Subject: gnu: Add python-pycountry@20.7.3.

This old version is required by Tryton.

* gnu/packages/python-xyz.scm (python-pycountry@20.7.3): New variable.
---
 gnu/packages/python-xyz.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b062b4c013..0ea9b9b25f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18923,6 +18923,18 @@ (define-public python-pycountry
      through a Python API.")
     (license license:lgpl2.1+)))
 
+(define-public python-pycountry@20.7.3
+  (package
+    (inherit python-pycountry)
+    (name "python-pycountry")
+    (version "20.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pycountry" version))
+       (sha256
+        (base32 "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"))))))
+
 (define-public python-pycosat
   (package
     (name "python-pycosat")
-- 
cgit v1.2.3


From 5897d873d0c902f08d13c38500eff11098f2a634 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 15:47:25 +0200
Subject: gnu: Tryton application and framework: Update to 6.2.x.

* gnu/packages/tryton.scm (trytond-account-be, trytond-account-cash-rounding,
  trytond-account-credit-limit, trytond-account-de-skr03,
  trytond-account-deposit, trytond-account-dunning,
  trytond-account-dunning-email, trytond-account-dunning-fee,
  trytond-account-dunning-letter, trytond-account-eu, trytond-account-fr,
  trytond-account-invoice-correction, trytond-account-invoice-history,
  trytond-account-invoice-line-standalone,
  trytond-account-invoice-secondary-unit, trytond-account-payment-braintree,
  trytond-account-payment-sepa-cfonb, trytond-account-payment-stripe,
  trytond-account-statement-coda, trytond-account-statement-ofx,
  trytond-account-stock-landed-cost-weight, trytond-account-tax-cash,
  trytond-account-tax-rule-country, trytond-analytic-account,
  trytond-analytic-invoice, trytond-analytic-purchase, trytond-analytic-sale,
  trytond-attendance, trytond-authentication-sms, trytond-bank,
  trytond-carrier, trytond-commission, trytond-company,
  trytond-company-work-time, trytond-currency, trytond-customs,
  trytond-dashboard, trytond-edocument-uncefact, trytond-edocument-unece,
  trytond-gis, trytond-google-maps, trytond-marketing,
  trytond-marketing-email, trytond-party-avatar, trytond-party-relationship,
  trytond-party-siret, trytond-product, trytond-product-attribute,
  trytond-product-classification, trytond-product-classification-taxonomic,
  trytond-product-cost-fifo, trytond-product-cost-history,
  trytond-product-measurements, trytond-product-price-list,
  trytond-product-price-list-parent, trytond-production-outsourcing,
  trytond-production-routing, trytond-production-split,
  trytond-production-work, trytond-production-work-timesheet, trytond-project,
  trytond-project-plan, trytond-purchase-history,
  trytond-purchase-invoice-line-standalone, trytond-purchase-requisition,
  trytond-purchase-secondary-unit, trytond-purchase-shipment-cost,
  trytond-sale-advance-payment, trytond-sale-credit-limit, trytond-sale-extra,
  trytond-sale-history, trytond-sale-invoice-grouping,
  trytond-sale-opportunity, trytond-sale-price-list, trytond-sale-promotion,
  trytond-sale-promotion-coupon, trytond-sale-secondary-unit,
  trytond-sale-shipment-grouping, trytond-sale-shipment-tolerance,
  trytond-sale-stock-quantity, trytond-sale-subscription,
  trytond-sale-subscription-asset, trytond-sale-supply,
  trytond-stock-assign-manual, trytond-stock-consignment,
  trytond-stock-inventory-location, trytond-stock-location-move,
  trytond-stock-location-sequence, trytond-stock-lot, trytond-stock-lot-sled,
  trytond-stock-lot-unit, trytond-stock-package,
  trytond-stock-package-shipping-ups, trytond-stock-product-location,
  trytond-stock-secondary-unit, trytond-stock-split, trytond-stock-supply-day,
  trytond-stock-supply-forecast, trytond-stock-supply-production,
  trytond-timesheet, trytond-timesheet-cost, trytond-user-role,
  trytond-web-shop-vue-storefront-stripe, trytond-web-user): Update to 6.2.0.
  (trytond-web-shop): Update to 6.2.0. [native-inputs]: Add trytond-image.
  (trytond-account-es): Update to 6.2.0. [native-inputs]: Add
  trytond-sale-advance-payment. [propagated-inputs]: Add trytond-company,
  trytond-currency.
  (trytond-sale-gift-card): Update to 6.2.0. [native-inputs]: Add
  trytond-sale-point.
  (trytond-carrier-percentage, trytond-carrier-subdivision,
  trytond-carrier-weight, trytond-incoterm): Update to 6.2.0. [native-inputs]:
  Add trytond-stock-shipment-cost.
  (trytond-stock-shipment-cost): Update to 6.2.0. [propagated-inputs]: Add
  trytond-carrier.
  (trytond-stock-package-shipping): Update to 6.2.0. [propagated-inputs]:
  Remove trytond-sale-shipment-cost; add trytond-stock-shipment-cost.
  (trytond-account-asset, trytond-account-fr-chorus,
  trytond-account-invoice-stock, trytond-account-payment-clearing,
  trytond-account-product, trytond-account-statement-aeb43,
  trytond-account-statement-rule, trytond-account-stock-anglo-saxon,
  trytond-commission-waiting, trytond-ldap-authentication,
  trytond-marketing-automation, trytond-party,
  trytond-product-price-list-dates, trytond-production,
  trytond-project-revenue, trytond-purchase-amendment,
  trytond-purchase-price-list, trytond-purchase-request,
  trytond-purchase-request-quotation, trytond-sale-amendment,
  trytond-sale-complaint, trytond-sale-discount, trytond-sale-payment,
  trytond-sale-supply-drop-shipment, trytond-sale-supply-production,
  trytond-stock-forecast, trytond-stock-quantity-issue,
  trytond-stock-shipment-measurements, trytond-web-shortener): Update to
  6.2.1.
  (trytond-product-cost-warehouse): Update to 6.2.1. [native-inputs]: Add
  trytond-account-invoice-stock.
  (trytond-web-shop-vue-storefront): Update to 6.2.1. [native-inputs]: Add
  trytond-product-image, trytond-stock-shipment-cost.
  (trytond-country): Update to 6.2.1. [propagated-inputs]: Remove
  python-pycountry; add python-pycountry@20.7.3.
  (trytond-account-invoice-defer, trytond-account-payment,
  trytond-account-payment-sepa, trytond-account-stock-landed-cost,
  trytond-notification-email, trytond-product-kit,
  trytond-sale-product-customer, trytond-sale-shipment-cost,
  trytond-stock-quantity-early-planning, trytond-stock-supply): Update to
  6.2.2.
  (trytond-account-statement, trytond-account-stock-continental,
  trytond-project-invoice, trytond-purchase,
  trytond-stock-package-shipping-dpd): Update to 6.2.3.
  (python-proteus): Update to 6.2.3. [propagated-inputs]: Add
  python-defusedxml.
  (trytond-account-invoice, trytond-sale): Update to 6.2.4.
  (tryton, trytond-account, trytond-stock): Update to 6.2.7.
  (trytond): Update to 6.2.10. [propagated-inputs]: Add python-defusedxml.
---
 gnu/packages/tryton.scm | 708 ++++++++++++++++++++++++------------------------
 1 file changed, 360 insertions(+), 348 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 9810a90d02..5307b0994d 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -57,18 +57,19 @@ (define (guix-trytonpath-search-path version)
 (define-public trytond
   (package
     (name "trytond")
-    (version "6.0.6")
+    (version "6.2.10")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond" version))
        (sha256
-        (base32 "1jp5cadqpwkcnml8r1hj6aak5kc8an2d5ai62p96x77nn0dp3ny4"))
+        (base32 "0s53ig8snbs9936h99pwa0lwhcrd3j3cbpwlmf90mf1chrif7zca"))
        (patches (search-patches "trytond-add-egg-modules-to-path.patch"
                                 "trytond-add-guix_trytond_path.patch"))))
     (build-system python-build-system)
     (propagated-inputs
      (list python-dateutil
+           python-defusedxml
            python-genshi
            python-lxml
            python-magic
@@ -105,13 +106,13 @@ (define-public python-trytond
 (define-public tryton
   (package
     (name "tryton")
-    (version "6.0.5")
+    (version "6.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tryton" version))
        (sha256
-        (base32 "15cbp2r25pkr7lp4yliqgb6d0n779z70d4gckv56bx5aw4z27f66"))))
+        (base32 "1bvwkrj2mmnddaif60g2np2jpx8lq5ka32xlhd4rlnshnbryrm5q"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -146,19 +147,19 @@ (define-public tryton
 (define-public python-proteus
   (package
     (name "python-proteus")
-    (version "6.0.2")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "proteus" version))
        (sha256
-        (base32 "0qr7rir7ysxvy2kyfzp2d2kcw9qzq4vdkddbwswzgddxjpycksdh"))))
+        (base32 "0xx8kqzgs66rgz6bk5favnjs0akz6znz81vmjwpwp2wpq7094fsr"))))
     (build-system python-build-system)
     ;; Tests require python-trytond-party which requires python-proteus.
     (arguments
      `(#:tests? #f))
     (propagated-inputs
-     (list python-dateutil))
+     (list python-dateutil python-defusedxml))
     (home-page "http://www.tryton.org/")
     (synopsis "Library to access a Tryton server as a client")
     (description
@@ -207,13 +208,13 @@ (define (%standard-trytond-native-inputs)
 (define-public trytond-account
   (package
     (name "trytond-account")
-    (version "6.0.3")
+    (version "6.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account" version))
        (sha256
-        (base32 "0j1mn8sd5n8rkwgfvcy9kf8s7s3qxvnilnc72i83ac573zj922xc"))))
+        (base32 "1jjffyfkax36v6znhdyvlrr314h3d5rn13iwv3kvhsm6paddbmwi"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -233,13 +234,13 @@ (define-public python-trytond-account
 (define-public trytond-account-asset
   (package
     (name "trytond-account-asset")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_asset" version))
        (sha256
-        (base32 "12qf6f4hpxi6c3mx18d07ljbzzr58h0lg8yz95nby3g3mpx2mlaz"))))
+        (base32 "0zs0bqa3crfqc39z7c5hcj60w2aws2fv2l9y59v9sfy8azi32533"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_asset"))
     (native-inputs
@@ -257,13 +258,13 @@ (define-public trytond-account-asset
 (define-public trytond-account-be
   (package
     (name "trytond-account-be")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_be" version))
        (sha256
-        (base32 "1l4zxsh9f3ndsgj3224xv23nr7gbg5kwrydwgv34nlkyxp5557dk"))))
+        (base32 "0ff27b9g1nf1gqlbv71kq7nm25r85vqpn8b0piajcxln1pbwgnmw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_be"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -278,13 +279,13 @@ (define-public trytond-account-be
 (define-public trytond-account-cash-rounding
   (package
     (name "trytond-account-cash-rounding")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_cash_rounding" version))
        (sha256
-        (base32 "15xl36929zgfw9rlwaqdqs5l4ijspfx8i060z6884p2nizhh69s5"))))
+        (base32 "0lxwz3f1p8szphvl64w8fhjnnvn30fin5k1rh47ikvcmlpq8xb67"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_cash_rounding"))
     (native-inputs
@@ -304,13 +305,13 @@ (define-public trytond-account-cash-rounding
 (define-public trytond-account-credit-limit
   (package
     (name "trytond-account-credit-limit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_credit_limit" version))
        (sha256
-        (base32 "1ni4cfydypxrkdj7fc0j4js9ygfkxa22ii5db2p89z2izbg1hxd8"))))
+        (base32 "1j3krz4qm04366d1k4sdf089vwbjl29lw8wbpd002hr2lb2lppm3"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_credit_limit"))
     (native-inputs
@@ -327,13 +328,13 @@ (define-public trytond-account-credit-limit
 (define-public trytond-account-de-skr03
   (package
     (name "trytond-account-de-skr03")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_de_skr03" version))
        (sha256
-        (base32 "1dhgspabr2bm0y6qkzh5kz6badhf23arzkw7lra1zsn52r23j9dl"))))
+        (base32 "1igag4nbafr5il6fqw7piak0wma6mgxhzy59zpsnl8gcl96jijv1"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_de_skr03"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -348,13 +349,13 @@ (define-public trytond-account-de-skr03
 (define-public trytond-account-deposit
   (package
     (name "trytond-account-deposit")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_deposit" version))
        (sha256
-        (base32 "005yw868wxv8fhp7dlqd2z19hhjlmk4cgqa36axdfjmbwxvh1r6r"))))
+        (base32 "0axp72p00fk1r6mr9pip8g4276wvb55vfbp962f3gdsijslj9mqi"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_deposit"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -374,13 +375,13 @@ (define-public trytond-account-deposit
 (define-public trytond-account-dunning
   (package
     (name "trytond-account-dunning")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_dunning" version))
        (sha256
-        (base32 "0d5wabn5g1gzmllihkdhzqix934184v303pp20927qxpzb2pm3qw"))))
+        (base32 "0kzafh99055ghg5d8vs411y5c8v1xjqqf23n1sa9a4dzj10wlq97"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_dunning"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -395,13 +396,13 @@ (define-public trytond-account-dunning
 (define-public trytond-account-dunning-email
   (package
     (name "trytond-account-dunning-email")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_dunning_email" version))
        (sha256
-        (base32 "0sbh2rnziw5fhlbaq4n8q9rwqcgz35rik77dbvhflyyjdxh51vfq"))))
+        (base32 "01d0cwgvl40i7zq9s3yrmf504j8s6395vs8mm1hgg0s9dpi7pl46"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_dunning_email"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -418,13 +419,13 @@ (define-public trytond-account-dunning-email
 (define-public trytond-account-dunning-fee
   (package
     (name "trytond-account-dunning-fee")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_dunning_fee" version))
        (sha256
-        (base32 "1h8qlrdvpyyf36cdss5lv3qp4h4xs6kp3ybh9ci14mhwy0jyni75"))))
+        (base32 "0v88xkigxqr1py2l25z3qfrr1irpllsi7zzwg3sxmp12d8pi8szk"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_dunning_fee"))
     (native-inputs
@@ -441,13 +442,13 @@ (define-public trytond-account-dunning-fee
 (define-public trytond-account-dunning-letter
   (package
     (name "trytond-account-dunning-letter")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_dunning_letter" version))
        (sha256
-        (base32 "0xb0mpf7n8jjgm8sb52q5sb2fjs1ap1gc0p33csdgz2lyh66lh3b"))))
+        (base32 "1jx1ad7kwlk7cm5j2b15bf4lcy5d2c13j8ag48v0pfy3kiglr2z3"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_dunning_letter"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -464,22 +465,23 @@ (define-public trytond-account-dunning-letter
 (define-public trytond-account-es
   (package
     (name "trytond-account-es")
-    (version "6.0.2")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_es" version))
        (sha256
-        (base32 "19qflzfwbbwz7jxxbah2l8z89m1rwsgvm80w2qsjw93chzabz802"))))
+        (base32 "0wwfkqxlppaild62labldabcnzgdmiqd36sknqdb69jn4ljhw4im"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_es"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
        ("trytond-account-asset" ,trytond-account-asset)
-       ("trytond-account-payment-sepa" ,trytond-account-payment-sepa)))
+       ("trytond-account-payment-sepa" ,trytond-account-payment-sepa)
+       ("trytond-sale-advance-payment" ,trytond-sale-advance-payment)))
     (propagated-inputs
-     (list trytond trytond-account trytond-account-eu
-           trytond-account-invoice trytond-party))
+     (list trytond trytond-account trytond-account-eu trytond-account-invoice
+           trytond-company trytond-currency trytond-party))
     (home-page "https://docs.tryton.org/projects/modules-account-es")
     (synopsis "Tryton with Spanish chart of accounts")
     (description "This package provides the following Spanish charts of
@@ -501,13 +503,13 @@ (define-public trytond-account-es
 (define-public trytond-account-eu
   (package
     (name "trytond-account-eu")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_eu" version))
        (sha256
-        (base32 "1x3w7iijkckv20q8lpqb5fnfrvddm130f51mcpnh4hlyx14q1c5i"))))
+        (base32 "1k11ncamp4cd5bdpj4va9p0vga2vcgfwd7wbivf1w4m1bzpisvm8"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_eu"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -531,13 +533,13 @@ (define-public trytond-account-eu
 (define-public trytond-account-fr
   (package
     (name "trytond-account-fr")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_fr" version))
        (sha256
-        (base32 "1zpzdnd68gsjrz4as019amygdh8yad8wvwrm22dbccwmbbnyvqpg"))))
+        (base32 "18wmijaxah125skhgpqc7iaw6a8md5mpv7m5yazcrscx9pk1z5jz"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_fr"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -552,13 +554,13 @@ (define-public trytond-account-fr
 (define-public trytond-account-fr-chorus
   (package
     (name "trytond-account-fr-chorus")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_fr_chorus" version))
        (sha256
-        (base32 "13z30390zinv6ps0zr3k7mdmxrw2nhr49k248yjk0c0qh9rwifll"))))
+        (base32 "14rcfk825m7wi73a4ahps5wqrz2aws3a7spz402mmbfxz84ypvbg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_fr_chorus"))
     (native-inputs
@@ -586,13 +588,13 @@ (define-public trytond-account-fr-chorus
 (define-public trytond-account-invoice
   (package
     (name "trytond-account-invoice")
-    (version "6.0.3")
+    (version "6.2.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice" version))
        (sha256
-        (base32 "0r8zigb4qmv40kf835x8jd7049nnhk5g7g0aibvfd0y9p28lspnz"))))
+        (base32 "12hkrlni1psa5n72bvz94zqwfmzpy24814p0f2vk1cmzkbsfb6vi"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -617,13 +619,13 @@ (define-public python-trytond-account-invoice
 (define-public trytond-account-invoice-correction
   (package
     (name "trytond-account-invoice-correction")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_correction" version))
        (sha256
-        (base32 "152jxsl6v2wclk1wjhykbyvianh47cp2yg575hkx18dfynyp7nmw"))))
+        (base32 "1m95h7bnwzjbhrnbld5bka4hqygm0d8jcg1g2nmdyqakcniljv34"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_correction"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -641,13 +643,13 @@ (define-public trytond-account-invoice-correction
 (define-public trytond-account-invoice-defer
   (package
     (name "trytond-account-invoice-defer")
-    (version "6.0.0")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_defer" version))
        (sha256
-        (base32 "1ay9cpf6z8j3gamwy52z88qg31s09wkp6k5flv20f9c00hvly452"))))
+        (base32 "1jjsadia1bxx0h80aqhm0alzxdqbkg3by0i7i6qfk7wwikim6lkm"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_defer"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -664,13 +666,13 @@ (define-public trytond-account-invoice-defer
 (define-public trytond-account-invoice-history
   (package
     (name "trytond-account-invoice-history")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_history" version))
        (sha256
-        (base32 "0pq1raj6v76vqsb2mk1bfv1vg1ngfk9iiai30rlzj2zcl53phcvj"))))
+        (base32 "1qg8x6kggi2f390y35m7k3mfi358zr4jwiw76vw5kkrpa3gm4lyj"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_history"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -686,13 +688,13 @@ (define-public trytond-account-invoice-history
 (define-public trytond-account-invoice-line-standalone
   (package
     (name "trytond-account-invoice-line-standalone")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_line_standalone" version))
        (sha256
-        (base32 "1affxhinyzz1lqfq621f76fixnx523fi7qrxwsqa4f1b6g31651a"))))
+        (base32 "15ld3iixh8kgil5zw3q4acci4xvdcd56lyin154qaak12f7rms0z"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_line_standalone"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -708,13 +710,13 @@ (define-public trytond-account-invoice-line-standalone
 (define-public trytond-account-invoice-secondary-unit
   (package
     (name "trytond-account-invoice-secondary-unit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_secondary_unit" version))
        (sha256
-        (base32 "0wam7v92ldajpx3529x2cfvczgwv8ayr6hi6bwj8fi736p9x2kbp"))))
+        (base32 "1wmc8zx51saqxbg26b7jnhl7ss3gjrhzxn7zqqsis9dps6l07jwf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_secondary_unit"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -730,13 +732,13 @@ (define-public trytond-account-invoice-secondary-unit
 (define-public trytond-account-invoice-stock
   (package
     (name "trytond-account-invoice-stock")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_invoice_stock" version))
        (sha256
-        (base32 "1228n6vsx0rdjsy3idvpyssa3n21nhvz9gqaacwa46c0hp2251bp"))))
+        (base32 "0q12v6xdpsw4fjm9pqp73bffdixi2hm9j2vxxx6n2p9r0c3g1gj1"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_invoice_stock"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -757,13 +759,13 @@ (define-public python-trytond-account-invoice-stock
 (define-public trytond-account-payment
   (package
     (name "trytond-account-payment")
-    (version "6.0.1")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment" version))
        (sha256
-        (base32 "006d78kcml65mxikqp80igln118vkxfs9ah03lq5j9bvnfr6bb2m"))))
+        (base32 "0gsg53fiqdmrdpckpfh5sm56ycqjdpa26calmng4p0v2rz557l1f"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment"))
     (native-inputs
@@ -781,13 +783,13 @@ (define-public trytond-account-payment
 (define-public trytond-account-payment-braintree
   (package
     (name "trytond-account-payment-braintree")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment_braintree" version))
        (sha256
-        (base32 "0dgw47q4m5l13bhfl1kdpajh0q94pazdrq9sqzf1vg9mggai2gvi"))))
+        (base32 "0s8li1ynb89nx5isxmg0rbbk6aw85i0218391z9nzgkj8kxgww9j"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment_braintree"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -806,13 +808,13 @@ (define-public trytond-account-payment-braintree
 (define-public trytond-account-payment-clearing
   (package
     (name "trytond-account-payment-clearing")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment_clearing" version))
        (sha256
-        (base32 "0dvjfgp0lrqn838wchkmhbbg4990xx2jv337rivnis164nw84dn0"))))
+        (base32 "037d759nzfs5qh97a5hq24argrga9i3p0b966xckss38cwyq7ixq"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment_clearing"))
     (native-inputs
@@ -833,13 +835,13 @@ (define-public trytond-account-payment-clearing
 (define-public trytond-account-payment-sepa
   (package
     (name "trytond-account-payment-sepa")
-    (version "6.0.0")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment_sepa" version))
        (sha256
-        (base32 "0clnl2lql5q0gh48lad3vw47xajgd3cdj4kbmvdi72jh775p174w"))))
+        (base32 "0c3ij24l8mxad2ppd3r24mx92l2xm52ip2syf88wlxqhsja9p945"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment_sepa"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -859,13 +861,13 @@ (define-public trytond-account-payment-sepa
 (define-public trytond-account-payment-sepa-cfonb
   (package
     (name "trytond-account-payment-sepa-cfonb")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment_sepa_cfonb" version))
        (sha256
-        (base32 "0ccn5s360w78wqnq86qfyci8wii4n1n3pd9wvwsnbrpmabj1byv1"))))
+        (base32 "1a4g2jzk8f98iy3plzanz8wfw5jixqpbsljqfigcp05nykbcfwzf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment_sepa_cfonb"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -886,13 +888,13 @@ (define-public trytond-account-payment-sepa-cfonb
 (define-public trytond-account-payment-stripe
   (package
     (name "trytond-account-payment-stripe")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_payment_stripe" version))
        (sha256
-        (base32 "18hr2lrrx9asb0d3cjcpska4bv825yjln9cbqjzg0xbl36z6w3s2"))))
+        (base32 "11lmgw4ny5v7zimvx35kkmy9n2pa342j97abn25y10yrcacfjhvh"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_payment_stripe"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -910,13 +912,13 @@ (define-public trytond-account-payment-stripe
 (define-public trytond-account-product
   (package
     (name "trytond-account-product")
-    (version "6.0.2")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_product" version))
        (sha256
-        (base32 "1z0dn1p22smzb4a9v451224wrpxcw94inl7jxkarc0q088gasn7d"))))
+        (base32 "1z1ri2plsmdnhgw64r5yxk2m346zcnva8nddmcwcalis35krgjcx"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_product"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -936,13 +938,13 @@ (define-public python-trytond-account-product
 (define-public trytond-account-statement
   (package
     (name "trytond-account-statement")
-    (version "6.0.0")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_statement" version))
        (sha256
-        (base32 "0nlak4kv2ampb5v2zbsvabnirvdi53h6vr35kp2zmrv4alpjsla0"))))
+        (base32 "1c7k1xv5jcraaa9dqdzxphqffycbc1ygy0gc49909vql1r8dpzk5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_statement"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -963,13 +965,13 @@ (define-public trytond-account-statement
 (define-public trytond-account-statement-aeb43
   (package
     (name "trytond-account-statement-aeb43")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_statement_aeb43" version))
        (sha256
-        (base32 "09mkxb9m9167lpca8pb8k4rvnwhsng6b6pmhw9c21w2r4q0hppxv"))))
+        (base32 "1snjabg4qixsb99lsrirpx7zrz0f21wy46d61rar5704657yxyc9"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_statement_aeb43"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -987,13 +989,13 @@ (define-public trytond-account-statement-aeb43
 (define-public trytond-account-statement-coda
   (package
     (name "trytond-account-statement-coda")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_statement_coda" version))
        (sha256
-        (base32 "11gryxh2b2py0h6f89nj2y42cwb8rrxjn0r5jbhrcsfhb2kh1x3w"))))
+        (base32 "0flz8rkavfcwq3przw9sq8jnpf6hdmyi3ip7vc89s3ykdx4qcrh0"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_statement_coda"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1011,13 +1013,13 @@ (define-public trytond-account-statement-coda
 (define-public trytond-account-statement-ofx
   (package
     (name "trytond-account-statement-ofx")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_statement_ofx" version))
        (sha256
-        (base32 "1n24lwp1lfw59xdd7mqaz6ncr5b0bldr2qniqdnkvyaav0h8h5px"))))
+        (base32 "01ncqvz4nx277q7x50sqwwvcy3hcpgp7bwhbp2l5aa2habprki8x"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_statement_ofx"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1034,13 +1036,13 @@ (define-public trytond-account-statement-ofx
 (define-public trytond-account-statement-rule
   (package
     (name "trytond-account-statement-rule")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_statement_rule" version))
        (sha256
-        (base32 "0kg6lf2wa5scwxggr8p7r7j6jd3a34qv2dcs9w18ra1qvg6p4kmp"))))
+        (base32 "1fbn4z111k0wwsy9jr9np82yyc7xiniavyavwhf0qf3l6l8qwk6x"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_statement_rule"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1066,13 +1068,13 @@ (define-public trytond-account-statement-rule
 (define-public trytond-account-stock-anglo-saxon
   (package
     (name "trytond-account-stock-anglo-saxon")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_stock_anglo_saxon" version))
        (sha256
-        (base32 "090a4ykrlk2xpqxqhmpa2jrbjkrvhibm60ilp1n28wisbgv9d3di"))))
+        (base32 "1jgj5kb85qj3kb1hcyb9jps1x062cqa32x5rp4rvgg64824d8hwz"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_stock_anglo_saxon"))
     (native-inputs
@@ -1098,13 +1100,13 @@ (define-public trytond-account-stock-anglo-saxon
 (define-public trytond-account-stock-continental
   (package
     (name "trytond-account-stock-continental")
-    (version "6.0.1")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_stock_continental" version))
        (sha256
-        (base32 "1i7cyxqs2vxxvg5iyplhai4g8pi0nmh90i5kxqhbnhich6myfr4n"))))
+        (base32 "1dzldnasshpx2gn15scycj72z85z5xli5wq1h39y8brb49ib7nvy"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_stock_continental"))
     (native-inputs
@@ -1126,13 +1128,13 @@ (define-public trytond-account-stock-continental
 (define-public trytond-account-stock-landed-cost
   (package
     (name "trytond-account-stock-landed-cost")
-    (version "6.0.1")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_stock_landed_cost" version))
        (sha256
-        (base32 "1p5xgd76585i55zcwvsi2gqhl0br9gbw398ap7m0cvadxfa6nxch"))))
+        (base32 "01yfkhwxw86s354y51bhs799cvfhwkmjrnmhaspbn889mkpir0wg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_stock_landed_cost"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1149,13 +1151,13 @@ (define-public trytond-account-stock-landed-cost
 (define-public trytond-account-stock-landed-cost-weight
   (package
     (name "trytond-account-stock-landed-cost-weight")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_stock_landed_cost_weight" version))
        (sha256
-        (base32 "10i0ww3k2cgdg227lv6h8ag2j6rm07maylbh3n0grwxfy8dbq34m"))))
+        (base32 "1dx5m5l1ccnffkqgwxpfk57g1wndxq1q1jrmrbf4cj6q47x1y0xx"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_stock_landed_cost_weight"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1173,13 +1175,13 @@ (define-public trytond-account-stock-landed-cost-weight
 (define-public trytond-account-tax-cash
   (package
     (name "trytond-account-tax-cash")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_tax_cash" version))
        (sha256
-        (base32 "1di8brrj4jpx99i0553whyh2fddayvwq06dwdshb3iibgv4357cr"))))
+        (base32 "0hy5929697lsa84xyy535gh4s2j1yv4vdfxyi93md17pjf95hwpg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_tax_cash"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1194,13 +1196,13 @@ (define-public trytond-account-tax-cash
 (define-public trytond-account-tax-rule-country
   (package
     (name "trytond-account-tax-rule-country")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_account_tax_rule_country" version))
        (sha256
-        (base32 "0gy2zp023d2wqcivaiw5db5d8f4wrpqdnd6jywjhpkvqk4ay6i27"))))
+        (base32 "0bg831hha4j71lm9xhpv4al2qaxmk8qgli5s9hx2h4bcy1hbf5wf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "account_tax_rule_country"))
     (native-inputs
@@ -1222,13 +1224,13 @@ (define-public trytond-account-tax-rule-country
 (define-public trytond-analytic-account
   (package
     (name "trytond-analytic-account")
-    (version "6.0.2")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_analytic_account" version))
        (sha256
-        (base32 "09j9xz41n5hk3j7w63xbw1asd3p00prqvl652qcm9x1nrlmqiw3r"))))
+        (base32 "1ys9admjlgvn2m2zjp74liplzmc8q12x8i004cgb5m43x2mhrj8d"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_account"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1249,13 +1251,13 @@ (define-public python-trytond-analytic-account
 (define-public trytond-analytic-invoice
   (package
     (name "trytond-analytic-invoice")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_analytic_invoice" version))
        (sha256
-        (base32 "151vwcn5sgpqma9kjxbznx4v4wlhfc97dcyb432brxnswf5glcir"))))
+        (base32 "0416knbcn7wcx4anzvl0hw7qcdn3xndlh5i0pa0xffvw6kw1ijp9"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_invoice"))
     (native-inputs
@@ -1272,13 +1274,13 @@ (define-public trytond-analytic-invoice
 (define-public trytond-analytic-purchase
   (package
     (name "trytond-analytic-purchase")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_analytic_purchase" version))
        (sha256
-        (base32 "1yx3w3p98y11qw99jy02kal9393y6jpxazsfcznsffgigw2vl3y6"))))
+        (base32 "098sdhmr1idqqaxms3c05pgmvb27bykwfhgibxi9l1lr6k06d2cr"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_purchase"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1294,13 +1296,13 @@ (define-public trytond-analytic-purchase
 (define-public trytond-analytic-sale
   (package
     (name "trytond-analytic-sale")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_analytic_sale" version))
        (sha256
-        (base32 "07l97jmg67468pihymfcjagqbbfdcmry3654f24zbmnljxy2qm1x"))))
+        (base32 "00b3xiykm9j0kf1f9kmsy22413rdjsmvg5li7bd4xrxk22j8v4wv"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "analytic_sale"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1316,13 +1318,13 @@ (define-public trytond-analytic-sale
 (define-public trytond-attendance
   (package
     (name "trytond-attendance")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_attendance" version))
        (sha256
-        (base32 "1kwbxblpwjw9sv9axfp29vqgdkwkzf0c0vw8qx1fx8mfwv1hba5c"))))
+        (base32 "0g9b0x4zdz6djmd592ll8zj4q3lhz5gj97phc38kkzvwgvpq9xw2"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "attendance"))
     (native-inputs
@@ -1341,13 +1343,13 @@ (define-public trytond-attendance
 (define-public trytond-authentication-sms
   (package
     (name "trytond-authentication-sms")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_authentication_sms" version))
        (sha256
-        (base32 "1g46mimgjkz2lvh90p2ffmkfgwl7w03iqnvqlcghwpxk5vyxw3sj"))))
+        (base32 "17237qrmk8pm7lifrn5zjvsf42cs2q6p2h6qw2vk9fixdz1gxk9x"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "authentication_sms"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1364,13 +1366,13 @@ (define-public trytond-authentication-sms
 (define-public trytond-bank
   (package
     (name "trytond-bank")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_bank" version))
        (sha256
-        (base32 "0qwgp2s88n4hcqqxg1g34lmmvq5spdlkm978gzn6s96kmmzang0c"))))
+        (base32 "1gvsd8yyrba9bsql9zi4wlmg1jyjb7m13m15av0szkwxylcy0c0q"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "bank"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1385,13 +1387,13 @@ (define-public trytond-bank
 (define-public trytond-carrier
   (package
     (name "trytond-carrier")
-    (version "6.0.2")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_carrier" version))
        (sha256
-        (base32 "0kp08jb5f86bzfyn99qs4k1047svdrkhz3jxv3jw46vrpc2s0c1y"))))
+        (base32 "1fr12m4qi0fkxnbjq5v1sf5dkic9xb2j0bvb8y18if3hh0csfcy7"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "carrier"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1406,19 +1408,20 @@ (define-public trytond-carrier
 (define-public trytond-carrier-percentage
   (package
     (name "trytond-carrier-percentage")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_carrier_percentage" version))
        (sha256
-        (base32 "0glgjf733qliqxbr1sykxn2rlphagnpixhkg84my7bv6cxfmvkh6"))))
+        (base32 "0lnahli4bc4zspr86i8qchza96k4cmsfcdg3wp7wicp1s2ki7bbw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "carrier_percentage"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
        ("trytond-purchase-shipment-cost" ,trytond-purchase-shipment-cost)
-       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)))
+       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)
+       ("trytond-stock-shipment-cost" ,trytond-stock-shipment-cost)))
     (propagated-inputs
      (list trytond trytond-carrier trytond-currency))
     (home-page "https://docs.tryton.org/projects/modules-carrier-percentage")
@@ -1430,18 +1433,19 @@ (define-public trytond-carrier-percentage
 (define-public trytond-carrier-subdivision
   (package
     (name "trytond-carrier-subdivision")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_carrier_subdivision" version))
        (sha256
-        (base32 "1mmbz541yywdgm16ij2xfvm50xad24plmqdb739ssg6jj0skmji4"))))
+        (base32 "1a4jpi6iaah3f1zsdsjz2zak6wd9jai4jcqzijl2li4pcnkc0x8a"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "carrier_subdivision"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
-       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)))
+       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)
+       ("trytond-stock-shipment-cost" ,trytond-stock-shipment-cost)))
     (propagated-inputs
      (list trytond trytond-carrier))
     (home-page "https://docs.tryton.org/projects/modules-carrier-subdivision")
@@ -1464,19 +1468,20 @@ (define-public trytond-carrier-subdivision
 (define-public trytond-carrier-weight
   (package
     (name "trytond-carrier-weight")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_carrier_weight" version))
        (sha256
-        (base32 "0l2gg4syym7jk0vjqnw7invh0gngrfmg9zmmvc1k6110aryr77yi"))))
+        (base32 "0mvz7q2hb4bcj3abvi4dxmnqbrph1g49s2bvyf3lx9ykbmr6v3n7"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "carrier_weight"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
        ("trytond-purchase-shipment-cost" ,trytond-purchase-shipment-cost)
-       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)))
+       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)
+       ("trytond-stock-shipment-cost" ,trytond-stock-shipment-cost)))
     (propagated-inputs
      (list trytond
            trytond-carrier
@@ -1494,13 +1499,13 @@ (define-public trytond-carrier-weight
 (define-public trytond-commission
   (package
     (name "trytond-commission")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_commission" version))
        (sha256
-        (base32 "0a5grn6gvvwn0prr5fpgyj4kz283w08a8svmv3b4a4c5pchik3hv"))))
+        (base32 "1m8cg6vb08paymi3bckqwp2vg0as36p6jadg86dc4b1axabas144"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "commission"))
     (native-inputs
@@ -1524,13 +1529,13 @@ (define-public trytond-commission
 (define-public trytond-commission-waiting
   (package
     (name "trytond-commission-waiting")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_commission_waiting" version))
        (sha256
-        (base32 "113wzwjip8virdh9bnh14vl29wb3w7a32skk5yibja819s19ycdn"))))
+        (base32 "16y11dc33x1h55v94rab8wzbh4d1pc35vd64ys8915rvijpm6xm5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "commission_waiting"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1547,13 +1552,13 @@ (define-public trytond-commission-waiting
 (define-public trytond-company
   (package
     (name "trytond-company")
-    (version "6.0.3")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_company" version))
        (sha256
-        (base32 "1q4qdyg32dn00pn3pj2yjl3jhxaqpv7a1cv5s5c95cpy5p46p02n"))))
+        (base32 "03ss7cwxbynn8ly5y32bj1cl2ikji9ydsby62l440jb025sn9x8v"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "company"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1572,13 +1577,13 @@ (define-public python-trytond-company
 (define-public trytond-company-work-time
   (package
     (name "trytond-company-work-time")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_company_work_time" version))
        (sha256
-        (base32 "0aasp12l66zcys9w3qc4ysi2krd5c9x3xxaxvr29j7zl7nz05bwx"))))
+        (base32 "08nhnlxy1z5drlmxdsd6ad166qx5ckymzx94ja824n1qqac17zqw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "company_work_time"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1598,19 +1603,19 @@ (define-public trytond-company-work-time
 (define-public trytond-country
   (package
     (name "trytond-country")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_country" version))
        (sha256
-        (base32 "1ksinysac7p0k8avsz8xqzfkmm21s6i93qyrsma5h4y5477cwmw7"))))
+        (base32 "1mlf6fwngdbqy6c7xi7nmg4dph3nnac61rkzhn79x5zqg2mgnv53"))))
     (build-system python-build-system)
     ;; Doctest contains one test that requires internet access.
     (arguments (tryton-arguments "country" "--no-doctest"))
     (native-inputs (%standard-trytond-native-inputs))
     (propagated-inputs
-     (list python-pycountry trytond))
+     (list python-pycountry@20.7.3 trytond))
     (home-page "http://www.tryton.org/")
     (synopsis "Tryton module with countries")
     (description
@@ -1623,13 +1628,13 @@ (define-public python-trytond-country
 (define-public trytond-currency
   (package
     (name "trytond-currency")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_currency" version))
        (sha256
-        (base32 "0fs2wvhgvc0l4yzs5m9l8z4lbzazr42hgz0859malhnlp1sya2kq"))))
+        (base32 "1sx9wanb4r95gs5hsl6hgy0gcvsfh0yr17rnhaa908286f88wa4f"))))
     (build-system python-build-system)
     ;; Doctest 'scenario_currency_rate_update.rst' fails.
     (arguments (tryton-arguments "currency" "--no-doctest"))
@@ -1652,13 +1657,13 @@ (define-public python-trytond-currency
 (define-public trytond-customs
   (package
     (name "trytond-customs")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_customs" version))
        (sha256
-        (base32 "1qilj1b9zr35z15313xbvgklf87dgxddvkcnymklwp9n7vs7hrz5"))))
+        (base32 "1zx9cwiq9q4802bj2ga3bilyjls60vpycp3cncqfqh2n4mg23xlq"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "customs"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1674,13 +1679,13 @@ (define-public trytond-customs
 (define-public trytond-dashboard
   (package
     (name "trytond-dashboard")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_dashboard" version))
        (sha256
-        (base32 "1drqiks8r7y58wz0skfa39v9yqx9fi5x0ymrrjd87wybw9q3kv46"))))
+        (base32 "1b8dalnbj69ppk8q7znw1ljyv5515r16m6gfd9a3l25dpvj0cxz2"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "dashboard"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1695,13 +1700,13 @@ (define-public trytond-dashboard
 (define-public trytond-edocument-uncefact
   (package
     (name "trytond-edocument-uncefact")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_edocument_uncefact" version))
        (sha256
-        (base32 "0b5qhkirfkrh5g1d7m42f7niiz86favf352i403fdi4j532sl3i2"))))
+        (base32 "0nf72c5sw33c77y87idkhf8fz39a7qlgmlrbnzz1cwcpky4hrmdg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "edocument_uncefact"))
     (native-inputs
@@ -1723,13 +1728,13 @@ (define-public trytond-edocument-uncefact
 (define-public trytond-edocument-unece
   (package
     (name "trytond-edocument-unece")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_edocument_unece" version))
        (sha256
-        (base32 "1ri3gjvk0h0sljbgh7h2j0rbr3953p3k21l8x6rhrnh1q2rqgi70"))))
+        (base32 "1ikrh9yk5if8v1sw1aihnysbpipmly6r6ka6zccjcywm1cmabhx0"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "edocument_unece"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1751,13 +1756,13 @@ (define-public trytond-edocument-unece
 (define-public trytond-gis
   (package
     (name "trytond-gis")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_gis" version))
        (sha256
-        (base32 "1z6rvwyzisd62bmzhh1g56as7xyvchdsgj52w9q5x908k2jr4pl4"))))
+        (base32 "0zfvbqzxhvjja03pv9ja9rml2i2fqiir5a92rz0vj3lx9azjbkvw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "trytond_gis"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1771,13 +1776,13 @@ (define-public trytond-gis
 (define-public trytond-google-maps
   (package
     (name "trytond-google-maps")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_google_maps" version))
        (sha256
-        (base32 "1wgcnl3r1017vicbf7rkcwv2ffrhaah90hcajn3i78bywjdag6nj"))))
+        (base32 "0g6hag2n7rc7avcawwhdkndbqxc957nyrwq4arkrlkidpbipw37n"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "trytond_google_maps"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1792,13 +1797,13 @@ (define-public trytond-google-maps
 (define-public trytond-incoterm
   (package
     (name "trytond-incoterm")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_incoterm" version))
        (sha256
-        (base32 "09x53kqi7dvmr4kcri2b3f0lxyv99pi731vhk6581f3vy2bby97s"))))
+        (base32 "08sz2j3610iqqzz3qdl51pxdj8mncyjp8lg29y6sskfd0s4fhax5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "incoterm"))
     (native-inputs
@@ -1814,7 +1819,8 @@ (define-public trytond-incoterm
        ("trytond-sale-invoice-grouping" ,trytond-sale-invoice-grouping)
        ("trytond-sale-opportunity" ,trytond-sale-opportunity)
        ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)
-       ("trytond-stock" ,trytond-stock)))
+       ("trytond-stock" ,trytond-stock)
+       ("trytond-stock-shipment-cost" ,trytond-stock-shipment-cost)))
     (propagated-inputs
      (list trytond trytond-company trytond-party))
     (home-page "https://docs.tryton.org/projects/modules-incoterm")
@@ -1827,13 +1833,13 @@ (define-public trytond-incoterm
 (define-public trytond-ldap-authentication
   (package
     (name "trytond-ldap-authentication")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_ldap_authentication" version))
        (sha256
-        (base32 "1iylbpp66qjff1mkp0w3a703pracpcv3bv25i2bafkmcjiv9b4jl"))))
+        (base32 "0c3g2y8zqh17wwg9w3bk9q1gwm4hq7h8avchmbfawi6cq3g6ch5b"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "ldap_authentication"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1848,13 +1854,13 @@ (define-public trytond-ldap-authentication
 (define-public trytond-marketing
   (package
     (name "trytond-marketing")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_marketing" version))
        (sha256
-        (base32 "0mh85sx5xj06zjmf9fhcislkwlp7k54fz14k3ia1xxpw5f953y3c"))))
+        (base32 "1ljv23ldva3cd07k0knncnawwrig8q6lgsxlm392dcqkyb8gvbjg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "marketing"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1869,13 +1875,13 @@ (define-public trytond-marketing
 (define-public trytond-marketing-automation
   (package
     (name "trytond-marketing-automation")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_marketing_automation" version))
        (sha256
-        (base32 "0c2bjkxkpkjqm5zqk0r0gcxm1cxgixm6xxhh16j46vy7d4zssgsp"))))
+        (base32 "17x4pikw2i513wwrfv8g8xim65ksk3dwijahk1qhf3yqpa506kp2"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "marketing_automation"))
     (native-inputs
@@ -1894,13 +1900,13 @@ (define-public trytond-marketing-automation
 (define-public trytond-marketing-email
   (package
     (name "trytond-marketing-email")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_marketing_email" version))
        (sha256
-        (base32 "07zh1pni4kpm6bsgyizz0a5k64nyxc9laxxaih9py7d24p9pgvky"))))
+        (base32 "1z38c3lw8chqbm23y0wfsnp268kq2f9azly4ix6imis74zdjnzkl"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "marketing_email"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -1916,13 +1922,13 @@ (define-public trytond-marketing-email
 (define-public trytond-notification-email
   (package
     (name "trytond-notification-email")
-    (version "6.0.1")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_notification_email" version))
        (sha256
-        (base32 "12hi2p400b15vsmq2a4yifxppc08zdf5l64svv987mxxqv6403ma"))))
+        (base32 "1i0h7spdnf3gryzbzjm8khc0jxzj6g6ljsjgsd28h39kqpdxyffz"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "notification_email"))
     (native-inputs
@@ -1944,13 +1950,13 @@ (define-public trytond-notification-email
 (define-public trytond-party
   (package
     (name "trytond-party")
-    (version "6.0.2")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party" version))
        (sha256
-        (base32 "0aikzpr0ambc98v76dl6xqa42b08dy3b011y33lvxjp5mcha3f7y"))))
+        (base32 "1g62kzdqr4rq6k8zswil4anwhd22d8nzz0i852fmkdsb97yqg4id"))))
     (build-system python-build-system)
     ;; Doctest 'scenario_party_phone_number.rst' fails.
     (arguments (tryton-arguments "party" "--no-doctest"))
@@ -1970,13 +1976,13 @@ (define-public python-trytond-party
 (define-public trytond-party-avatar
   (package
     (name "trytond-party-avatar")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party_avatar" version))
        (sha256
-        (base32 "1g0f4522bfw2ycr05yq9k570amwcfxf9sza89lhhpzg0kxx0mpq2"))))
+        (base32 "00gjjvslvcvfkdb0293n9yd9pmsnlbjvcnxrjg99vxkrn6dcwxzh"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "party_avatar"))
     (native-inputs
@@ -1993,13 +1999,13 @@ (define-public trytond-party-avatar
 (define-public trytond-party-relationship
   (package
     (name "trytond-party-relationship")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party_relationship" version))
        (sha256
-        (base32 "03lkjmhinxm75schfn596vyg8459fx2spdyh372ikra3zdp8pg75"))))
+        (base32 "0vhm7zl29z8al4ay4n6gw3zazq07dsdhjc54il7sg3z9kz21xv6k"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "party_relationship"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2014,13 +2020,13 @@ (define-public trytond-party-relationship
 (define-public trytond-party-siret
   (package
     (name "trytond-party-siret")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_party_siret" version))
        (sha256
-        (base32 "1xmfjiqn7wzwja34abrxn3bj39z0799pdxd8bcz7l5dxrnqxwc38"))))
+        (base32 "0ab5g3rs2k73wk01ykzh1s4pgrnypdv4l75lr3pn8hyxw9q4b5vk"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "party_siret"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2035,13 +2041,13 @@ (define-public trytond-party-siret
 (define-public trytond-product
   (package
     (name "trytond-product")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product" version))
        (sha256
-        (base32 "1xvvqxkvzyqy6fn2sj5h3zj0g17igzwx6s18sxkdz72vqz6kpv0l"))))
+        (base32 "1cq270ng0rav7hzxip3fswbvhs6wkjadl2j8kmiy30qa43abmpwr"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2060,13 +2066,13 @@ (define-public python-trytond-product
 (define-public trytond-product-attribute
   (package
     (name "trytond-product-attribute")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_attribute" version))
        (sha256
-        (base32 "0brvwvm3q2ik4vjb9cwd6jxddrmpp2vcafw8k675gy0xbbp1ddik"))))
+        (base32 "10656g9na098ndjhy4iv1iv0020jin7yw38bb79zxynck39vld29"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_attribute"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2081,13 +2087,13 @@ (define-public trytond-product-attribute
 (define-public trytond-product-classification
   (package
     (name "trytond-product-classification")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_classification" version))
        (sha256
-        (base32 "1sq42siqq8w6dd8jnqnkzy3npaf9g2nrdzazkl6nw5dysvpsz8cr"))))
+        (base32 "1a5rdvscp3hb7jddciqmpzb095yzmyvsj5jc06jiilvynrawwzsh"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_classification"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2104,13 +2110,13 @@ (define-public trytond-product-classification
 (define-public trytond-product-classification-taxonomic
   (package
     (name "trytond-product-classification-taxonomic")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_classification_taxonomic" version))
        (sha256
-        (base32 "1pkk0z4bl1pz2yxs46b18fj35zwa80dnbickjg1ad66n9yrmifk6"))))
+        (base32 "1933kqhab8ky2mman13mmg06rdmlbak3sjgm5qbk615x5fzbl4s4"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_classification_taxonomic"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2126,13 +2132,13 @@ (define-public trytond-product-classification-taxonomic
 (define-public trytond-product-cost-fifo
   (package
     (name "trytond-product-cost-fifo")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_cost_fifo" version))
        (sha256
-        (base32 "1zksnawvnbf1l2hkyxw4m85ysjy6i8kbx103sz4p9a9bgvjn3ai6"))))
+        (base32 "1lqd960z7dmy3000fhhqqbmq7c4lk2l2dqw383sd62ka5j57kpf4"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_cost_fifo"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2147,13 +2153,13 @@ (define-public trytond-product-cost-fifo
 (define-public trytond-product-cost-history
   (package
     (name "trytond-product-cost-history")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_cost_history" version))
        (sha256
-        (base32 "01cxx1lmcxwangk3q8lhbkd97w208qxpk96mqxv2hgds77xr42cj"))))
+        (base32 "16gnqa04fv7525ax12xfmh4phk4fvm577j3c80cahxqpvsp2a0q6"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_cost_history"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2172,17 +2178,18 @@ (define-public trytond-product-cost-history
 (define-public trytond-product-cost-warehouse
   (package
     (name "trytond-product-cost-warehouse")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_cost_warehouse" version))
        (sha256
-        (base32 "12fcnmcx4m5wyw1hi3k175iiis5m18fcs72b04y14km583s6jcfr"))))
+        (base32 "0anz5071j1yzg9xp00qqcc3a4wb3zvl6605bzici76558zj7fl38"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_cost_warehouse"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
+       ("trytond-account-invoice-stock" ,trytond-account-invoice-stock)
        ("trytond-account-stock-continental" ,trytond-account-stock-continental)
        ("trytond-product-cost-fifo" ,trytond-product-cost-fifo)
        ("trytond-product-cost-history" ,trytond-product-cost-history)))
@@ -2198,13 +2205,13 @@ (define-public trytond-product-cost-warehouse
 (define-public trytond-product-kit
   (package
     (name "trytond-product-kit")
-    (version "6.0.3")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_kit" version))
        (sha256
-        (base32 "1xr1vd66lrnzj16ycbw5xnz4ai44ml77akhsvxvihf09zdz09yd7"))))
+        (base32 "1s41jng93cmf4pahz59jmza1k6nj6pb532k0mn2xnr0pgnh26w9m"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_kit"))
     (native-inputs
@@ -2227,13 +2234,13 @@ (define-public trytond-product-kit
 (define-public trytond-product-measurements
   (package
     (name "trytond-product-measurements")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_measurements" version))
        (sha256
-        (base32 "0za3p0wxh2kb6f49455pggnpmy0vfiwj95j5c3l63x8q5yp8vdjl"))))
+        (base32 "111q382lv3yg76r7jxfhnvr35kgi2fhiyxyj07immvwm5k3z0vi1"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_measurements"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2248,13 +2255,13 @@ (define-public trytond-product-measurements
 (define-public trytond-product-price-list
   (package
     (name "trytond-product-price-list")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_price_list" version))
        (sha256
-        (base32 "1csr2g7wx89kykhm76dyrjn0nicvjmc4razqfqpj9rhdpwppdgr6"))))
+        (base32 "0x85317skmqkq12i9qqyjiny37rn2dccx7rk7lan87jj2cam70q4"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_price_list"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2269,13 +2276,13 @@ (define-public trytond-product-price-list
 (define-public trytond-product-price-list-dates
   (package
     (name "trytond-product-price-list-dates")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_price_list_dates" version))
        (sha256
-        (base32 "0p1n4qivj9gfhdy0357n53wswyi14rnanc2bkayiv3zfr7qkf2m1"))))
+        (base32 "0312s99fqfjwyn5lp3b8qd7j0ac0208jbalgxxazfks1h2g22nj5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_price_list_dates"))
     (native-inputs
@@ -2293,13 +2300,13 @@ (define-public trytond-product-price-list-dates
 (define-public trytond-product-price-list-parent
   (package
     (name "trytond-product-price-list-parent")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_product_price_list_parent" version))
        (sha256
-        (base32 "15jdw9qj2fffml9x4vdlzp3iz5gs2l597hpf5y5p887mmx9aa8cn"))))
+        (base32 "0w5fmr2p56p44yq33qgjxp5b8r7bpyixwpdp6xgbrd36ig9wcg3z"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "product_price_list_parent"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2316,13 +2323,13 @@ (define-public trytond-product-price-list-parent
 (define-public trytond-production
   (package
     (name "trytond-production")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production" version))
        (sha256
-        (base32 "0ys1wg52bs3i7yjrrkm9ycn07xz7fsb2pqc4a2bj44691pvrclpk"))))
+        (base32 "1sjrpyh4cxllmcxh085nfkq4hhdaz2mcgs1x9hwcsk9scqbi8fkw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2337,13 +2344,13 @@ (define-public trytond-production
 (define-public trytond-production-outsourcing
   (package
     (name "trytond-production-outsourcing")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production_outsourcing" version))
        (sha256
-        (base32 "08pp80d4jfw7qmhvds60i63pb2nad489xwkf2ybbzdkrzhcgrrjk"))))
+        (base32 "0ms50p42jr23v2fgm3kplacr11czx16dljmxvvn4qgxlacsf0dz0"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production_outsourcing"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2362,13 +2369,13 @@ (define-public trytond-production-outsourcing
 (define-public trytond-production-routing
   (package
     (name "trytond-production-routing")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production_routing" version))
        (sha256
-        (base32 "0qypqsf36lf02wrbv7pwhg2vv7004g7c6vxd1z2aiwj58g8q7894"))))
+        (base32 "1a6cw0yc60ijd8bnrk84rzx4swqi294g3dsapp03hapn9rgdjbpj"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production_routing"))
     (native-inputs
@@ -2385,13 +2392,13 @@ (define-public trytond-production-routing
 (define-public trytond-production-split
   (package
     (name "trytond-production-split")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production_split" version))
        (sha256
-        (base32 "0jl2jnm0lwybwjw2w4nb7ih2s3z7lp00l6zm5vsx4phcvfvzcxgi"))))
+        (base32 "1fcsbvmcjxriq4yllxv2h7i2p07caqgka39f04l7pvz4w9ha4s96"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production_split"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2409,13 +2416,13 @@ (define-public trytond-production-split
 (define-public trytond-production-work
   (package
     (name "trytond-production-work")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production_work" version))
        (sha256
-        (base32 "01a09snawlr224s5aqhrdkal14qry4hlfsglnsk09yzbw6fx196b"))))
+        (base32 "1bff8rfdrlx14ahjnmq3lw7z816qnk22cjk9wwmwkcpl99faw3bd"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production_work"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2436,13 +2443,13 @@ (define-public trytond-production-work
 (define-public trytond-production-work-timesheet
   (package
     (name "trytond-production-work-timesheet")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_production_work_timesheet" version))
        (sha256
-        (base32 "1r7k25wddd381g0p5pj3m8jqvbg8g6ss0ifnhhjya3b6x0d41jz9"))))
+        (base32 "19d9sasviayn4vkbwgxmgqbn2fd61qqh4sk35vzlmkbwycrbczhi"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "production_work_timesheet"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2459,13 +2466,13 @@ (define-public trytond-production-work-timesheet
 (define-public trytond-project
   (package
     (name "trytond-project")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_project" version))
        (sha256
-        (base32 "1xlqzg07csr9a89jjgmk5n4d9dd2s3qahg2x8arf3vqqnrqw1g0f"))))
+        (base32 "0rr1ar7ah753afqi16yklirwv3ikmcv4xhnbv5vixna1kqhg8n43"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "project"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2481,13 +2488,13 @@ (define-public trytond-project
 (define-public trytond-project-invoice
   (package
     (name "trytond-project-invoice")
-    (version "6.0.0")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_project_invoice" version))
        (sha256
-        (base32 "0wxgpsn5kwfz4f51icmc0p7r615lpr286ifwyz0xnd6rrh0glvmw"))))
+        (base32 "1hdyds6k2k0hjk8za8xa64qvqx9pnyv1a6g7mq80ag8hscx2s282"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "project_invoice"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2518,13 +2525,13 @@ (define-public trytond-project-invoice
 (define-public trytond-project-plan
   (package
     (name "trytond-project-plan")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_project_plan" version))
        (sha256
-        (base32 "0yanvfmg4nmbc322h6w9m7asv4bm95y2wksi4rrvlbs84njgvhnq"))))
+        (base32 "1rijwxx1sypgv3fapw7sv0i6xbci2b6h3ij42aq693yvn0wm46q4"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "project_plan"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2539,13 +2546,13 @@ (define-public trytond-project-plan
 (define-public trytond-project-revenue
   (package
     (name "trytond-project-revenue")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_project_revenue" version))
        (sha256
-        (base32 "0gji7kpq4l1smxvj6dqdpcyp2ml4ywfhagf6xm813y71mrlfvmka"))))
+        (base32 "0hpqwjpd6d0a291yssa8f0x89xxqvdzq8a3f10csibsq7bssqzki"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "project_revenue"))
     (native-inputs
@@ -2571,13 +2578,13 @@ (define-public trytond-project-revenue
 (define-public trytond-purchase
   (package
     (name "trytond-purchase")
-    (version "6.0.2")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase" version))
        (sha256
-        (base32 "12drjw30ik3alckn6xrny4814vzi3ysh17wgiawiy9319yahsvay"))))
+        (base32 "1lni31dhi1yrz0ga1l2268fyv564gsqiy1rjal8l765v40121q0p"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2604,13 +2611,13 @@ (define-public python-trytond-purchase
 (define-public trytond-purchase-amendment
   (package
     (name "trytond-purchase-amendment")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_amendment" version))
        (sha256
-        (base32 "0bgk5ib7y1nzdrfx00g9qr2lxmjkascvh1caps21r12czz0iz5fx"))))
+        (base32 "0zprgfxpif2bbjbv8b4aci7s5si9sp3rjizr7nf31mvsjnwx7i06"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_amendment"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2637,13 +2644,13 @@ (define-public trytond-purchase-amendment
 (define-public trytond-purchase-history
   (package
     (name "trytond-purchase-history")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_history" version))
        (sha256
-        (base32 "18mb1vqmf9c934jp2qjwj4mi0sx99m8005vxc42mjj1f5qkxxsgg"))))
+        (base32 "0b72q0b41jfaahccdnya9amp5x4w90mlx4b32wdby96xvfi485ar"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_history"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2659,13 +2666,13 @@ (define-public trytond-purchase-history
 (define-public trytond-purchase-invoice-line-standalone
   (package
     (name "trytond-purchase-invoice-line-standalone")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_invoice_line_standalone" version))
        (sha256
-        (base32 "1qwa8a1vxalvb6r3d1w5wwpa9kx7w8c879x1zb4wwc9nqpdji8v0"))))
+        (base32 "169y69an6i796m8bmp8sanfn0qh7bcws8nangp96q07dsv51wrvb"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_invoice_line_standalone"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2682,13 +2689,13 @@ (define-public trytond-purchase-invoice-line-standalone
 (define-public trytond-purchase-price-list
   (package
     (name "trytond-purchase-price-list")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_price_list" version))
        (sha256
-        (base32 "0y54b677dy1jpmclgxvbzs2zsypzkyvmdbx1i58j16hs24l8h0c8"))))
+        (base32 "0xqry794l9vy5v5ck0qqy9yli57av4zzmpv1g8f9hkg7lm9ypg0v"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_price_list"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2708,13 +2715,13 @@ (define-public trytond-purchase-price-list
 (define-public trytond-purchase-request
   (package
     (name "trytond-purchase-request")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_request" version))
        (sha256
-        (base32 "0yhf3lh5b24qpk80r5pbmmswf5757bxa0s7ckl40vf6lkjkccv5i"))))
+        (base32 "0as8lb6bgjigpg926fjfyfy25758m45ihl1xish5vlfcxmccpyn3"))))
     (build-system python-build-system)
     ;; Doctest 'scenario_purchase_request.rst' fails.
     (arguments (tryton-arguments "purchase_request" "--no-doctest"))
@@ -2736,13 +2743,13 @@ (define-public python-trytond-purchase-request
 (define-public trytond-purchase-request-quotation
   (package
     (name "trytond-purchase-request-quotation")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_request_quotation" version))
        (sha256
-        (base32 "12r34fawdsvxhaygs5nlnmx2a51x6yn0vgayj4qy083f4lv0mwml"))))
+        (base32 "08kcp88lfn8aa92cd07x5i5xbjznqy0x9lr34f07ky0i26nrnn72"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_request_quotation"))
     (native-inputs
@@ -2767,13 +2774,13 @@ (define-public trytond-purchase-request-quotation
 (define-public trytond-purchase-requisition
   (package
     (name "trytond-purchase-requisition")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_requisition" version))
        (sha256
-        (base32 "0hiz4q4cq7zz6xxl6bkk0vn71hc2wgasnhda5h41cmi69jphhzzk"))))
+        (base32 "0wm4xrxklwd5bbdzlwr5ca4h0zm6jx9pm08mspk15nbvf23qz5n3"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_requisition"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2798,13 +2805,13 @@ (define-public trytond-purchase-requisition
 (define-public trytond-purchase-secondary-unit
   (package
     (name "trytond-purchase-secondary-unit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_secondary_unit" version))
        (sha256
-        (base32 "0vyvdrshlikp9m3gxn1yyi15qxgih0cccxndr9d257fap9nilip5"))))
+        (base32 "04fnrim6dimrd63rqbqginlklpih7sb4x3zai5idxjn6hc1l398y"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_secondary_unit"))
     (native-inputs
@@ -2829,13 +2836,13 @@ (define-public trytond-purchase-secondary-unit
 (define-public trytond-purchase-shipment-cost
   (package
     (name "trytond-purchase-shipment-cost")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_purchase_shipment_cost" version))
        (sha256
-        (base32 "0n54mkw8fbhyxn8sxrkn97bkx2c1j7bngsc7isc3md5c3kyi50nf"))))
+        (base32 "1xpkqicv32vrhi89wpn073bc58x6xl189yv0f7h1i9m9q613w9ps"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "purchase_shipment_cost"))
     (native-inputs
@@ -2857,13 +2864,13 @@ (define-public trytond-purchase-shipment-cost
 (define-public trytond-sale
   (package
     (name "trytond-sale")
-    (version "6.0.1")
+    (version "6.2.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale" version))
        (sha256
-        (base32 "0wk5lhj74vl7zs4l3x176iwfqr3jnq37xhiksgnajsrjrl54bgfg"))))
+        (base32 "124cx2h93dw61rnavc2q7isjy9008qc379g82myihq9gh4z6rbpr"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2891,13 +2898,13 @@ (define-public trytond-sale
 (define-public trytond-sale-advance-payment
   (package
     (name "trytond-sale-advance-payment")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_advance_payment" version))
        (sha256
-        (base32 "1h7jjh0ddfhk8b2rlmizlv5x31k14zz0xccm846kc4idvcsaqcy4"))))
+        (base32 "00rlg4jax212qha2w6acris7knj3b17a0rrlm7xyw0bp2vfzgb69"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_advance_payment"))
     (native-inputs
@@ -2916,13 +2923,13 @@ (define-public trytond-sale-advance-payment
 (define-public trytond-sale-amendment
   (package
     (name "trytond-sale-amendment")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_amendment" version))
        (sha256
-        (base32 "1vkcyfp30hng2vj1h1pvwrlvp9b59pkzzlmgnj6gvs867l8f2zva"))))
+        (base32 "0mrnqlgihkvn4z2p1k90c9cha8kqa28ss1ycjzsalxmngnw27hfg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_amendment"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2939,13 +2946,13 @@ (define-public trytond-sale-amendment
 (define-public trytond-sale-complaint
   (package
     (name "trytond-sale-complaint")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_complaint" version))
        (sha256
-        (base32 "0wbs7kawrzz39z0jw34ygdb85qja49xfb75ahbwgqd185wf3jvgz"))))
+        (base32 "172650xyn2k1ay6jd4vy6f71s9rfv8qalfx9j8jz0i4cn320z272"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_complaint"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2961,13 +2968,13 @@ (define-public trytond-sale-complaint
 (define-public trytond-sale-credit-limit
   (package
     (name "trytond-sale-credit-limit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_credit_limit" version))
        (sha256
-        (base32 "1qj4lg5gjsqg27sv6l5afb3rgw46y008ywy6742w9ab6misy57dh"))))
+        (base32 "0rx3zi0m4cbpbmjlzkii08424yz68y31nqqkgj6rl9swaqins67h"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_credit_limit"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -2988,13 +2995,13 @@ (define-public trytond-sale-credit-limit
 (define-public trytond-sale-discount
   (package
     (name "trytond-sale-discount")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_discount" version))
        (sha256
-        (base32 "0ss976dcx6k2z2gdbhcgdp6d561b2vwwgf83xdl2pc28q2d3rmh6"))))
+        (base32 "1kbfbd5rmvaaf5wwvb1akxf7zij1bqpzx2s0dahjxcihxwwra2ib"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_discount"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3009,13 +3016,13 @@ (define-public trytond-sale-discount
 (define-public trytond-sale-extra
   (package
     (name "trytond-sale-extra")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_extra" version))
        (sha256
-        (base32 "0n6fxv573bszhfw1ik16y9754jfp6r2rrliprm6iv7v5ld3r1yqi"))))
+        (base32 "0j9ya68p6bfyr2ixh1dqfqnmfa4mn5ayf9hn5pfm2z7nih8bys3r"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_extra"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3035,16 +3042,18 @@ (define-public trytond-sale-extra
 (define-public trytond-sale-gift-card
   (package
     (name "trytond-sale-gift-card")
-    (version "6.0.3")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_gift_card" version))
        (sha256
-        (base32 "0bbcgm7xs5hmn3axz62jkarhl9v43nk9mk9zldlf9qrfqy89fd80"))))
+        (base32 "0r395qj178f39lip8mkwhn9lakkh3700hlpcsd208d8wqqqmbf1n"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_gift_card"))
-    (native-inputs (%standard-trytond-native-inputs))
+    (native-inputs
+     `(,@(%standard-trytond-native-inputs)
+       ("trytond-sale-point" ,trytond-sale-point)))
     (propagated-inputs
      (list trytond
            trytond-account
@@ -3062,13 +3071,13 @@ (define-public trytond-sale-gift-card
 (define-public trytond-sale-history
   (package
     (name "trytond-sale-history")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_history" version))
        (sha256
-        (base32 "1pp5lmmpiqakcmwxv392v1miiisbb0yl55gjb618ngx6ayrd0vdv"))))
+        (base32 "0snjdbhq5mf8j7z6i6yqk3kjl3mpjsdzwnh5bzcnax2n4zrscvxq"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_history"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3084,13 +3093,13 @@ (define-public trytond-sale-history
 (define-public trytond-sale-invoice-grouping
   (package
     (name "trytond-sale-invoice-grouping")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_invoice_grouping" version))
        (sha256
-        (base32 "1h8lcm8dg3i6644c50d9y1lca9x7k8l6cvwzkabvzixm54mflqsx"))))
+        (base32 "1c70s1lnxzhg6yqv7vjxyqvxp4myh26i9hnnf1k045d6hwf80hvf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_invoice_grouping"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3106,13 +3115,13 @@ (define-public trytond-sale-invoice-grouping
 (define-public trytond-sale-opportunity
   (package
     (name "trytond-sale-opportunity")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_opportunity" version))
        (sha256
-        (base32 "0rvj73382h2ha6jqhini0fzpn40w190qij1r7k2fa0c9ls15rrp5"))))
+        (base32 "05zliwc39zandn7amjzf1n7fqxq7yrwrx5b418ikh09pfz4alq21"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_opportunity"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3135,13 +3144,13 @@ (define-public trytond-sale-opportunity
 (define-public trytond-sale-payment
   (package
     (name "trytond-sale-payment")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_payment" version))
        (sha256
-        (base32 "0i38766m9a0arhwybsqgk11zmmr982mmcsn0fswq695gb0zlwl0f"))))
+        (base32 "02zq3smfj55n70kqgipi2q869lp7hlfm0qbw74qx7pina28pipf4"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_payment"))
     (native-inputs
@@ -3159,13 +3168,13 @@ (define-public trytond-sale-payment
 (define-public trytond-sale-price-list
   (package
     (name "trytond-sale-price-list")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_price_list" version))
        (sha256
-        (base32 "0xg0i12a7billpdv13arvc3j5jsbn9gzis8snkl84315ayz3irq4"))))
+        (base32 "037h107wl3p3ig9w8db2878x80gzdf4dsa9wjrrcxdaz7yp7iwhn"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_price_list"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3181,13 +3190,13 @@ (define-public trytond-sale-price-list
 (define-public trytond-sale-product-customer
   (package
     (name "trytond-sale-product-customer")
-    (version "6.0.0")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_product_customer" version))
        (sha256
-        (base32 "0yys6mc52v62v51wkg3wngmz9jhqb2lq9v5jvb93j0yh5ah07a4v"))))
+        (base32 "01nyhimg00z33zzlxyg8incpfbgcqa7svmzzv5n0x2dafnx5n7wl"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_product_customer"))
     (native-inputs
@@ -3205,13 +3214,13 @@ (define-public trytond-sale-product-customer
 (define-public trytond-sale-promotion
   (package
     (name "trytond-sale-promotion")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_promotion" version))
        (sha256
-        (base32 "1bvk14sjlqrlg2wakihrcbz8vl40hr6isbc3ijdsv5g1khl3j74i"))))
+        (base32 "1nd4f5j25v3g25hr0xr6kqzv0rqavnwkc5wyn8r0if1y9b2scwnc"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_promotion"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3232,13 +3241,13 @@ (define-public trytond-sale-promotion
 (define-public trytond-sale-promotion-coupon
   (package
     (name "trytond-sale-promotion-coupon")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_promotion_coupon" version))
        (sha256
-        (base32 "1hkbsamsf6swx05ij2yh7b3nvmcnlvf9xbz9r7hfs6blx2jkxs3p"))))
+        (base32 "18086y4xszb5iq6v5ibq3kylzc3b8zbyn6pn6pm61mdbdpqav7mg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_promotion_coupon"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3254,13 +3263,13 @@ (define-public trytond-sale-promotion-coupon
 (define-public trytond-sale-secondary-unit
   (package
     (name "trytond-sale-secondary-unit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_secondary_unit" version))
        (sha256
-        (base32 "0w7jw6ih4ypwqy83r5qrpclp3yalsrvnz65z2kn5yqaj95b4dpy8"))))
+        (base32 "0as7vc8wp2i3402h5r90zg6170y3av41a6k5ivdfbaxlhsjq8lxa"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_secondary_unit"))
     (native-inputs
@@ -3283,13 +3292,13 @@ (define-public trytond-sale-secondary-unit
 (define-public trytond-sale-shipment-cost
   (package
     (name "trytond-sale-shipment-cost")
-    (version "6.0.1")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_shipment_cost" version))
        (sha256
-        (base32 "1h1qhp90f8mzx2px48fa8xsgwhbf2gkg8q94vghy696a3hh1xzxb"))))
+        (base32 "1r6jcsfxa2q448ks5s23apbj3b35rc5596qk7f3hzwiw6nm168k5"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_shipment_cost"))
     (native-inputs
@@ -3313,13 +3322,13 @@ (define-public trytond-sale-shipment-cost
 (define-public trytond-sale-shipment-grouping
   (package
     (name "trytond-sale-shipment-grouping")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_shipment_grouping" version))
        (sha256
-        (base32 "0n1h50j6c4za7a16pgn916cqjxxrd2qs16hb2h42wsp5p2bkfww2"))))
+        (base32 "0v8inxsgdhmkiaj0l3c2gjzbs96qbbxmbw67f14mx9axjvcvkkwy"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_shipment_grouping"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3335,13 +3344,13 @@ (define-public trytond-sale-shipment-grouping
 (define-public trytond-sale-shipment-tolerance
   (package
     (name "trytond-sale-shipment-tolerance")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_shipment_tolerance" version))
        (sha256
-        (base32 "0zigl695hyw7zyk86y1ng6mnvd9v8dbk05c5n6q14yvh4gz3ri5l"))))
+        (base32 "1vggdhnfg05dad2gmyi49ydhrq3sjqva4shn9zygj8fyjpkppx2y"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_shipment_tolerance"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3361,13 +3370,13 @@ (define-public trytond-sale-shipment-tolerance
 (define-public trytond-sale-stock-quantity
   (package
     (name "trytond-sale-stock-quantity")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_stock_quantity" version))
        (sha256
-        (base32 "0xi79nmizly3hfc1ppcid622nvby50524jflisfvmjb651ixpfl8"))))
+        (base32 "0bn06a752rp16ki5xa0dr3in5xj1hry6020qgz6mji8kxl24v7sv"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_stock_quantity"))
     (native-inputs
@@ -3387,13 +3396,13 @@ (define-public trytond-sale-stock-quantity
 (define-public trytond-sale-subscription
   (package
     (name "trytond-sale-subscription")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_subscription" version))
        (sha256
-        (base32 "092ljl0ywybwchp4qfki752nclqc6hkx2h99cd1h3g998jv3l72x"))))
+        (base32 "095zdy6031lqffm3yddhsrv93dl2dgqjpbskp539knvd72bdaqdd"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_subscription"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3414,13 +3423,13 @@ (define-public trytond-sale-subscription
 (define-public trytond-sale-subscription-asset
   (package
     (name "trytond-sale-subscription-asset")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_subscription_asset" version))
        (sha256
-        (base32 "1j160sqfvzqv0ah85w2bsc4fixrxhzjq0lbin2bgasmdm3yqfqdj"))))
+        (base32 "0bkksk3l3ydxmqglsrrqgwgrak6iwc740vmj0dpw93h4f127haiv"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_subscription_asset"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3436,13 +3445,13 @@ (define-public trytond-sale-subscription-asset
 (define-public trytond-sale-supply
   (package
     (name "trytond-sale-supply")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_supply" version))
        (sha256
-        (base32 "0lk4pj2fr1q603wnia96i7fzym8pncpvy0hg41q4dkr380nm3qzs"))))
+        (base32 "05ik819spy8jmc5k10mki6kxdjxdqrr4x0g3rgvvlnmadn5igykf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_supply"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3462,13 +3471,13 @@ (define-public trytond-sale-supply
 (define-public trytond-sale-supply-drop-shipment
   (package
     (name "trytond-sale-supply-drop-shipment")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_supply_drop_shipment" version))
        (sha256
-        (base32 "0gm2m5zm7vrm1vb34svqby7h91ka3mhln3367zmwr17yfyqf68dk"))))
+        (base32 "1i3a8amm3nacc7wis3amr4z9pl47sjzy7gds5qv1xg3fl1awm4ic"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_supply_drop_shipment"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3494,13 +3503,13 @@ (define-public trytond-sale-supply-drop-shipment
 (define-public trytond-sale-supply-production
   (package
     (name "trytond-sale-supply-production")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_sale_supply_production" version))
        (sha256
-        (base32 "03v702r4sfmql5yv6414gi2y72psvr3zq3xmx049w5nsywc2585v"))))
+        (base32 "08ky3mqprlqyksw91mqlb7mjkfpdrgzgnc862wm2q28s0aydn3dv"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "sale_supply_production"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3520,13 +3529,13 @@ (define-public trytond-sale-supply-production
 (define-public trytond-stock
   (package
     (name "trytond-stock")
-    (version "6.0.6")
+    (version "6.2.7")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock" version))
        (sha256
-        (base32 "1v6pvkwj6vhjqbz2zn0609kb7kx4g0dsn1xhvax4z2dqigh7ywpx"))))
+        (base32 "02klx6qk2vrwiynxcdjnpqx593wr1wjg9sygh5zjzrqqwmjb16yi"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3552,13 +3561,13 @@ (define-public python-trytond-stock
 (define-public trytond-stock-assign-manual
   (package
     (name "trytond-stock-assign-manual")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_assign_manual" version))
        (sha256
-        (base32 "0106x21ncxiyd4jsbdapmf6gfix6infjf59807j2lqmrblb3z25f"))))
+        (base32 "0jn5rbbgmr7jnddrbmy49r2vpfbbfsrgx1bkgjkg687d922lwnrh"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_assign_manual"))
     (native-inputs
@@ -3576,13 +3585,13 @@ (define-public trytond-stock-assign-manual
 (define-public trytond-stock-consignment
   (package
     (name "trytond-stock-consignment")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_consignment" version))
        (sha256
-        (base32 "0c2wa0d8msam77nd4c79f71jaznsprnlvv1jqrmkl1qf3lvgq4a2"))))
+        (base32 "0c26gvqmh98hj7zp1kx3q30wdwnvy8j101m9kmsi21j9n2nw7maj"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_consignment"))
     (native-inputs
@@ -3606,13 +3615,13 @@ (define-public trytond-stock-consignment
 (define-public trytond-stock-forecast
   (package
     (name "trytond-stock-forecast")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_forecast" version))
        (sha256
-        (base32 "1l3ks2jbz95qqbv9jsvakrxgazyq1kkk3fspwvrg1d10rv6xmb58"))))
+        (base32 "19w4q71rm4j0rlsdp6d2ykyjcdkrvq5mjlprsdk6890dmnxm6czx"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_forecast"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3628,13 +3637,13 @@ (define-public trytond-stock-forecast
 (define-public trytond-stock-inventory-location
   (package
     (name "trytond-stock-inventory-location")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_inventory_location" version))
        (sha256
-        (base32 "0mvgday5qhmx89xikklr2ad2xa7zxkiysxa2bqsf76imvx4801q6"))))
+        (base32 "1x35rq6hzxb9wzsflvlsbl1fjgqcp6byrj4rk20fvgbhnv02s4x0"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_inventory_location"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3650,13 +3659,13 @@ (define-public trytond-stock-inventory-location
 (define-public trytond-stock-location-move
   (package
     (name "trytond-stock-location-move")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_location_move" version))
        (sha256
-        (base32 "1mljb97abwcmsl3zmz20b2kfa8wm9q405kr1lag7j5587j2b2h6f"))))
+        (base32 "07f0xq26wc0vpxf94655gsya3nxsa2xpi6v1c74q5a2qan4gkv9k"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_location_move"))
     (native-inputs
@@ -3674,13 +3683,13 @@ (define-public trytond-stock-location-move
 (define-public trytond-stock-location-sequence
   (package
     (name "trytond-stock-location-sequence")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_location_sequence" version))
        (sha256
-        (base32 "0lpvgk5s7v30c0hicqc2m6apv8gzd1d6229yv1lrp2g62yp9pa9f"))))
+        (base32 "0ab2jf36mmbkg0hrhwrmpjh5m9kpl60mz1gdkb2zhv629z9bxr13"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_location_sequence"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3696,13 +3705,13 @@ (define-public trytond-stock-location-sequence
 (define-public trytond-stock-lot
   (package
     (name "trytond-stock-lot")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_lot" version))
        (sha256
-        (base32 "18cwrvnrzjk1wb765gr6hp3plpdpwz1a7cwimjhxi47iw7w5c84g"))))
+        (base32 "0z0ligvgvm2py794sg2ay5r47pm30m890lmfp2jvdr3vjbq3f1a3"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_lot"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3720,13 +3729,13 @@ (define-public python-trytond-stock-lot
 (define-public trytond-stock-lot-sled
   (package
     (name "trytond-stock-lot-sled")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_lot_sled" version))
        (sha256
-        (base32 "1x8sjhgbakqbgfhrrl7b1b0961riqibs6q6lmgmyrvjyrxx0hpig"))))
+        (base32 "14bx84snw6kd896h6gdd825qrg2p7nmm341xl8qvrpn34jq3p2p1"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_lot_sled"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3743,13 +3752,13 @@ (define-public trytond-stock-lot-sled
 (define-public trytond-stock-lot-unit
   (package
     (name "trytond-stock-lot-unit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_lot_unit" version))
        (sha256
-        (base32 "1acvrj9af83gmfcp7kgyi37kv3v5910rh1q73scd37xbv7h8dyrm"))))
+        (base32 "1m6vbz57y0yrjv4z447gggqgcwd6dzk0hrycv5zvbq4h1kscrh6z"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_lot_unit"))
     (native-inputs
@@ -3766,13 +3775,13 @@ (define-public trytond-stock-lot-unit
 (define-public trytond-stock-package
   (package
     (name "trytond-stock-package")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_package" version))
        (sha256
-        (base32 "1jbpl141wyc19v27bcyqsph8p2zf9yqprm55yl642mvwq55bshq8"))))
+        (base32 "1jy7qz62h29rf10mjr9d9pm6g53ira26m77iccs0cwv3qlrv87rg"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_package"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3787,13 +3796,13 @@ (define-public trytond-stock-package
 (define-public trytond-stock-package-shipping
   (package
     (name "trytond-stock-package-shipping")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_package_shipping" version))
        (sha256
-        (base32 "09j7v64wmpiw1bh9byjq4shsd5474rq0mfx7wwak8hn0v5ni7imn"))))
+        (base32 "0j902bvkmfhn353z6dgfbik7jh5yps13jz4dq785rqj2ia5az9iq"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_package_shipping"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3802,9 +3811,9 @@ (define-public trytond-stock-package-shipping
            trytond-carrier
            trytond-product
            trytond-product-measurements
-           trytond-sale-shipment-cost
            trytond-stock
            trytond-stock-package
+           trytond-stock-shipment-cost
            trytond-stock-shipment-measurements))
     (home-page
      "https://docs.tryton.org/projects/modules-stock-package-shipping")
@@ -3816,13 +3825,13 @@ (define-public trytond-stock-package-shipping
 (define-public trytond-stock-package-shipping-dpd
   (package
     (name "trytond-stock-package-shipping-dpd")
-    (version "6.0.0")
+    (version "6.2.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_package_shipping_dpd" version))
        (sha256
-        (base32 "11jn2i7gkxj4nck5fkp0j8n8r6vhsv26rcnmmmmdh1iqji7cv8yf"))))
+        (base32 "0q7g5qg9j32kn51yigiahd939k2x9gfsnb8k6kinyc9vhq3anbkx"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_package_shipping_dpd"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3841,13 +3850,13 @@ (define-public trytond-stock-package-shipping-dpd
 (define-public trytond-stock-package-shipping-ups
   (package
     (name "trytond-stock-package-shipping-ups")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_package_shipping_ups" version))
        (sha256
-        (base32 "1dw6amd1kvpsldk14m656c0hpazf1ljzz2zri00nqq11d9x8xab5"))))
+        (base32 "198i6fdb9ghcsd7z1cb1f3m261dl9w9hxmzzvs7h51f2lbw07n58"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_package_shipping_ups"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3870,13 +3879,13 @@ (define-public trytond-stock-package-shipping-ups
 (define-public trytond-stock-product-location
   (package
     (name "trytond-stock-product-location")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_product_location" version))
        (sha256
-        (base32 "1r0a9pkyjh1n0xhax583v80fawnszxaf9q8r3851325an2rmndx8"))))
+        (base32 "18r7j40zdbva8rcxyhianjwb7m30db7qf85709kivvbvbk93rabh"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_product_location"))
     (native-inputs
@@ -3897,13 +3906,13 @@ (define-public trytond-stock-product-location
 (define-public trytond-stock-quantity-early-planning
   (package
     (name "trytond-stock-quantity-early-planning")
-    (version "6.0.0")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_quantity_early_planning" version))
        (sha256
-        (base32 "05djbhz82wjkgvfvlzkhzi94nfg0cif3jfmh1jv0zixzfv87chqs"))))
+        (base32 "04fj6h21kl4ab8vl1w9vhnvsxgjg6qd1gxcf1i6r7pfsbhjz8gfj"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_quantity_early_planning"))
     (native-inputs
@@ -3921,13 +3930,13 @@ (define-public trytond-stock-quantity-early-planning
 (define-public trytond-stock-quantity-issue
   (package
     (name "trytond-stock-quantity-issue")
-    (version "6.0.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_quantity_issue" version))
        (sha256
-        (base32 "1fk250l09l2q4jcx1vh9nkkpn419ng993bkp2bmk6dpk7xs1qv0v"))))
+        (base32 "0ig2lix5qw8ql1gax8dymwc7advmf9x3xc8djhw5sgb8v0bvknrv"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_quantity_issue"))
     (native-inputs
@@ -3944,13 +3953,13 @@ (define-public trytond-stock-quantity-issue
 (define-public trytond-stock-secondary-unit
   (package
     (name "trytond-stock-secondary-unit")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_secondary_unit" version))
        (sha256
-        (base32 "0s4nryiirdbndm2sz5aqpk2mzw9zxah92gmh6433sj5zyc6a22if"))))
+        (base32 "0ihhgf4xs5rrf12v9mfj4rpsxjrqfl7schp3r66cdmrm0ccnrj29"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_secondary_unit"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -3965,18 +3974,18 @@ (define-public trytond-stock-secondary-unit
 (define-public trytond-stock-shipment-cost
   (package
     (name "trytond-stock-shipment-cost")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_shipment_cost" version))
        (sha256
-        (base32 "13c940pz5ivqj9qk6b5nbid2xfkjnnijjmbz1bn7ic7ydfpiqy8j"))))
+        (base32 "0abl4lw0mz7c1chv5c5r3341cqcfz49nw00g9y12kxbxib17h3fc"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_shipment_cost"))
     (native-inputs (%standard-trytond-native-inputs))
     (propagated-inputs
-     (list trytond trytond-product trytond-stock))
+     (list trytond trytond-carrier trytond-product trytond-stock))
     (home-page "https://docs.tryton.org/projects/modules-stock-shipment-cost")
     (synopsis "Tryton module for stock shipment cost")
     (description "The @emph{Stock Shipment Cost} Tryton Module adds a shipment
@@ -3987,13 +3996,13 @@ (define-public trytond-stock-shipment-cost
 (define-public trytond-stock-shipment-measurements
   (package
     (name "trytond-stock-shipment-measurements")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_shipment_measurements" version))
        (sha256
-        (base32 "1h9ijs7yc0013w7cwa4i7ny3dndbgycxxpkai7qw0ygqf9ajmh8c"))))
+        (base32 "0a2p3c1780waa779kx24vpknjr9g6z8097ika9kl047xzdnw4n00"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_shipment_measurements"))
     (native-inputs
@@ -4013,13 +4022,13 @@ (define-public trytond-stock-shipment-measurements
 (define-public trytond-stock-split
   (package
     (name "trytond-stock-split")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_split" version))
        (sha256
-        (base32 "0ynvmmdxgzgg6mn8ckhl7jr9ircq4bpwsl0xpzk83r6mhlvlrxpm"))))
+        (base32 "1gqbkncdg084cxfsq7vc4ikvdajd2akbl2ryi3awh5xs7phrpabf"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_split"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4036,13 +4045,13 @@ (define-public trytond-stock-split
 (define-public trytond-stock-supply
   (package
     (name "trytond-stock-supply")
-    (version "6.0.1")
+    (version "6.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_supply" version))
        (sha256
-        (base32 "1p5l3yjjy6l25kk9xnhbl691l3v8gfg9fhc87jc6qszhxlqxk730"))))
+        (base32 "1kb6rnb1xk8hnqr9znfpgh8m66590zqbar62xr7094bwaym2ymaa"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4067,13 +4076,13 @@ (define-public python-trytond-stock-supply
 (define-public trytond-stock-supply-day
   (package
     (name "trytond-stock-supply-day")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_supply_day" version))
        (sha256
-        (base32 "1b6q2zk0qnsxdhlqgsnb49prgn6sgqlpr84vy31a2p83mwiz0fqr"))))
+        (base32 "112xzrzw2k4badync2qd9aanvni43nh86qhrdh754f311km5gh7q"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply_day"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4090,13 +4099,13 @@ (define-public trytond-stock-supply-day
 (define-public trytond-stock-supply-forecast
   (package
     (name "trytond-stock-supply-forecast")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_supply_forecast" version))
        (sha256
-        (base32 "0i5dc9ddd6mfx3zjlcq16isw52b8qy7igaj2lv8jqvkdrc19yfha"))))
+        (base32 "0b7d8csjcn74086wgm6cydirsl1ygrd9hysd7l4kmd3jz8bb8dzs"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply_forecast"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4112,13 +4121,13 @@ (define-public trytond-stock-supply-forecast
 (define-public trytond-stock-supply-production
   (package
     (name "trytond-stock-supply-production")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_stock_supply_production" version))
        (sha256
-        (base32 "1qyvj61hwn3xgjqagnr7d28qkiniw5fp0b5vmn9wii9grf7p4m8d"))))
+        (base32 "03cs9g9yfw885ia03x2lxkpjnh919ynizimvvx1jay62i3adk7a2"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "stock_supply_production"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4135,13 +4144,13 @@ (define-public trytond-stock-supply-production
 (define-public trytond-timesheet
   (package
     (name "trytond-timesheet")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_timesheet" version))
        (sha256
-        (base32 "0airh5jvcdjbkb71p684dr5qgsnpam2hhmq6gswclgnx3nd1lz6a"))))
+        (base32 "0lbdb0743mj33vrzrb3fq93d3ksj3395d7q0ivbplp1nn3hrh6sq"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "timesheet"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4158,13 +4167,13 @@ (define-public trytond-timesheet
 (define-public trytond-timesheet-cost
   (package
     (name "trytond-timesheet-cost")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_timesheet_cost" version))
        (sha256
-        (base32 "0pjsdgad2plbx8k6mh6mpa6qbz6lp30nnpv7ydyz0gsgb6jz7li6"))))
+        (base32 "1b1xi7fa371kdsci0naskspvznswb8z8yay7nrzzi8rv622g0cjw"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "timesheet_cost"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4179,13 +4188,13 @@ (define-public trytond-timesheet-cost
 (define-public trytond-user-role
   (package
     (name "trytond-user-role")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_user_role" version))
        (sha256
-        (base32 "11sjz46kagrpig5n05pp52yph4z0l1zm140q9wsagjcmzkx7s6gf"))))
+        (base32 "0kx6vqmhny8xjzm2wsy0kf14ybgcdig1cjhyir9b0v11fbavhbw7"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "user_role"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4202,18 +4211,19 @@ (define-public trytond-user-role
 (define-public trytond-web-shop
   (package
     (name "trytond-web-shop")
-    (version "6.0.2")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_web_shop" version))
        (sha256
-        (base32 "0gnq9hyx4x681hcmqsm2d6rga7chbaf2r2k2nmnkjq6izg5ivas2"))))
+        (base32 "182mawahm74lkns2cpy9lrczhllpa8p8np1d7k9agv9kypaqq582"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "web_shop"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
-       ("trytond-product-attribute" ,trytond-product-attribute)))
+       ("trytond-product-attribute" ,trytond-product-attribute)
+       ("trytond-product-image" ,trytond-product-image)))
     (propagated-inputs
      (list trytond
            trytond-account
@@ -4232,21 +4242,23 @@ (define-public trytond-web-shop
 (define-public trytond-web-shop-vue-storefront
   (package
     (name "trytond-web-shop-vue-storefront")
-    (version "6.0.2")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_web_shop_vue_storefront" version))
        (sha256
-        (base32 "0hccvk5i2qrczvbm66mnp8vcgr9zbnwqmbqmavqlkk7r7bqa1gch"))))
+        (base32 "18rc77crfdckzxcz5wryqk0iqccm3mx2a6b956274643sa8kbhvs"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "web_shop_vue_storefront"))
     (native-inputs
      `(,@(%standard-trytond-native-inputs)
        ("trytond-carrier" ,trytond-carrier)
        ("trytond-product-attribute" ,trytond-product-attribute)
+       ("trytond-product-image" ,trytond-product-image)
        ("trytond-sale-promotion-coupon" ,trytond-sale-promotion-coupon)
-       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)))
+       ("trytond-sale-shipment-cost" ,trytond-sale-shipment-cost)
+       ("trytond-stock-shipment-cost" ,trytond-stock-shipment-cost)))
     (propagated-inputs
      (list python-elasticsearch
            python-stdnum
@@ -4266,13 +4278,13 @@ (define-public trytond-web-shop-vue-storefront
 (define-public trytond-web-shop-vue-storefront-stripe
   (package
     (name "trytond-web-shop-vue-storefront-stripe")
-    (version "6.0.1")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_web_shop_vue_storefront_stripe" version))
        (sha256
-        (base32 "0j4yv9q0f39bkyqlcn7kpnlqi9wc4qfjs8zic69za6xw2c86zgzm"))))
+        (base32 "0qzcflcrkd35da9vb9gl9mnxg7dis1sz9kp9hb6hbnmyjbhdz17k"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "web_shop_vue_storefront_stripe"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4289,13 +4301,13 @@ (define-public trytond-web-shop-vue-storefront-stripe
 (define-public trytond-web-shortener
   (package
     (name "trytond-web-shortener")
-    (version "6.0.0")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_web_shortener" version))
        (sha256
-        (base32 "0vxwnsy7xzxawn7fmm6ykdrhih6ahrwwx6fzd6kz7qbwh4nmqcpk"))))
+        (base32 "0mjcp97f5dh6lzgw4yhd7k01jlmaga1jvsc07as1snz9y7r06kpk"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "web_shortener"))
     (native-inputs (%standard-trytond-native-inputs))
@@ -4311,13 +4323,13 @@ (define-public trytond-web-shortener
 (define-public trytond-web-user
   (package
     (name "trytond-web-user")
-    (version "6.0.0")
+    (version "6.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "trytond_web_user" version))
        (sha256
-        (base32 "1k07d1kcfm2hwwqcyy8k5mjbhhgrnji0hadn487zsx1zp50r6rds"))))
+        (base32 "04b3mb4kxibz073746c90i9k4gsc3vnnk47fcn4wqj2b2wq6smng"))))
     (build-system python-build-system)
     (arguments (tryton-arguments "web_user"))
     (native-inputs (%standard-trytond-native-inputs))
-- 
cgit v1.2.3


From e718ef4a1b75f52eaaeda71da73e2aa24e23aaf7 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:38 +0200
Subject: gnu: Add trytond-account-budget.

* gnu/packages/tryton.scm (trytond-account-budget): New variable.
---
 gnu/packages/tryton.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 5307b0994d..6f23366e4c 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -276,6 +276,28 @@ (define-public trytond-account-be
 chart of account for Belgium.")
     (license license:gpl3+)))
 
+(define-public trytond-account-budget
+  (package
+    (name "trytond-account-budget")
+    (version "6.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_account_budget" version))
+              (sha256
+               (base32 "055y9jjpx4xfrc6dlssvjzmjz7rrvfljlaljx0v6c6s87mpzi3m5"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_account_budget"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list trytond trytond-account
+                             trytond-company trytond-currency))
+    (home-page "https://docs.tryton.org/projects/modules-account-budget")
+    (synopsis "Tryton module that allows budgets to be setup for accounts")
+    (description "The @emph{Account Budget} Tryton module provides the ability
+to set budgets for accounts over a defined period of time.  These budgets can
+then be used to track the total amount from relevant transactions against the
+budgeted amount.")
+    (license license:gpl3+)))
+
 (define-public trytond-account-cash-rounding
   (package
     (name "trytond-account-cash-rounding")
-- 
cgit v1.2.3


From ee32e4726e635be8133725243e4a129c09bd936f Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:39 +0200
Subject: gnu: Add trytond-account-move-line-grouping.

* gnu/packages/tryton.scm (trytond-account-move-line-grouping): New variable.
---
 gnu/packages/tryton.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 6f23366e4c..f247605f90 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -778,6 +778,25 @@ (define-public python-trytond-account-invoice-stock
   (deprecated-package
    "python-trytond-account-invoice-stock" trytond-account-invoice-stock))
 
+(define-public trytond-account-move-line-grouping
+  (package
+    (name "trytond-account-move-line-grouping")
+    (version "6.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_account_move_line_grouping" version))
+              (sha256
+               (base32 "1mrh17a55hkfj89vyx1jrmgzps4ig0m03c10ngsy4my6v6rnnn2r"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_account_move_line_grouping"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-sql trytond trytond-account))
+    (home-page "https://docs.tryton.org/projects/modules-account-move-line-grouping")
+    (synopsis "Tryton module to display account move lines grouped")
+    (description "The @emph{Account Move Line Grouping} Tryton module adds a
+view that displays move lines grouped.")
+    (license license:gpl3+)))
+
 (define-public trytond-account-payment
   (package
     (name "trytond-account-payment")
-- 
cgit v1.2.3


From 53a976c0dca9b930a0822c94f5e0f445861dcb7e Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:39 +0200
Subject: gnu: Add trytond-account-rule.

* gnu/packages/tryton.scm (trytond-account-rule): New variable.
---
 gnu/packages/tryton.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index f247605f90..78ecb7dde8 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -976,6 +976,26 @@ (define-public trytond-account-product
 (define-public python-trytond-account-product
   (deprecated-package "python-trytond-account-product" trytond-account-product))
 
+(define-public trytond-account-rule
+  (package
+    (name "trytond-account-rule")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_account_rule" version))
+              (sha256
+               (base32 "1rn0xdqk5pcjybpyw09fqag6lyha06dq9qb3v0jc31cvwmd17ckl"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_account_rule"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list trytond trytond-account
+                             trytond-company trytond-party))
+    (home-page "https://docs.tryton.org/projects/modules-account-rule")
+    (synopsis "Tryton module to change accounts based on rules")
+    (description "The @emph{Account Rule} Tryton module allows rules which
+substitute default accounts with other accounts.")
+    (license license:gpl3+)))
+
 (define-public trytond-account-statement
   (package
     (name "trytond-account-statement")
-- 
cgit v1.2.3


From d75842363baaa9751fc1133f5e100fb4aee13553 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:39 +0200
Subject: gnu: Add trytond-account-stock-shipment-cost.

* gnu/packages/tryton.scm (trytond-account-stock-shipment-cost): New variable.
---
 gnu/packages/tryton.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 78ecb7dde8..2bc7388af4 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -1233,6 +1233,30 @@ (define-public trytond-account-stock-landed-cost-weight
 from the Product Measurements")
     (license license:gpl3+)))
 
+(define-public trytond-account-stock-shipment-cost
+  (package
+    (name "trytond-account-stock-shipment-cost")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_account_stock_shipment_cost" version))
+              (sha256
+               (base32 "1iyz76cma63kp2alqr4rcrm3zjj6ifsvv9hsylbfkamfgy84brsr"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_account_stock_shipment_cost"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list trytond
+                             trytond-account
+                             trytond-account-invoice
+                             trytond-product
+                             trytond-stock
+                             trytond-stock-shipment-cost))
+    (home-page "https://docs.tryton.org/projects/modules-account-stock-shipment-cost")
+    (synopsis "Tryton module to allocate shipment cost based on invoice")
+    (description "The @emph{Account Stock Shipment Cost} Tryton module
+allocates shipment cost based on invoice.")
+    (license license:gpl3+)))
+
 (define-public trytond-account-tax-cash
   (package
     (name "trytond-account-tax-cash")
-- 
cgit v1.2.3


From 2128adbc52b3a85f6ee69d196176a74884bb8816 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:39 +0200
Subject: gnu: Add trytond-analytic-budget.

* gnu/packages/tryton.scm (trytond-analytic-budget): New variable.
---
 gnu/packages/tryton.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 2bc7388af4..548d34ded6 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -1333,6 +1333,29 @@ (define-public python-trytond-analytic-account
   (deprecated-package
    "python-trytond-analytic-account" trytond-analytic-account))
 
+(define-public trytond-analytic-budget
+  (package
+    (name "trytond-analytic-budget")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_analytic_budget" version))
+              (sha256
+               (base32 "080a1s9w6n50xi2r7d3jkyk84rdqzggbqzhab9qjgppl67q85m8p"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_analytic_budget"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list trytond trytond-account-budget
+                             trytond-analytic-account
+                             trytond-company))
+    (home-page "https://docs.tryton.org/projects/modules-analytic-budget")
+    (synopsis "Allow creating budgets for analytic accounts in Tryton")
+    (description "The @emph{Analytic Budget} Tryton module provides the
+ability to set budgets for analytic accounts over a defined period of time.
+These budgets can then be used to track the total amount from relevant
+transactions against the budgeted amount.")
+    (license license:gpl3+)))
+
 (define-public trytond-analytic-invoice
   (package
     (name "trytond-analytic-invoice")
-- 
cgit v1.2.3


From 2941b08c0a8e31e36b0af96efcf32c9cab2e0705 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:39 +0200
Subject: gnu: Add trytond-currency-ro.

* gnu/packages/tryton.scm (trytond-currency-ro): New variable.
---
 gnu/packages/tryton.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 548d34ded6..e906e4f719 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -1762,6 +1762,26 @@ (define-public trytond-currency
 (define-public python-trytond-currency
   (deprecated-package "python-trytond-currency" trytond-currency))
 
+(define-public trytond-currency-ro
+  (package
+    (name "trytond-currency-ro")
+    (version "6.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_currency_ro" version))
+              (sha256
+               (base32 "1kn4bgh1gg5dcphb2afqb922myyg2012vdhixipmi7ccbv7ik46s"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_currency_ro"))
+        (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-lxml python-requests trytond
+                             trytond-currency))
+    (home-page "https://docs.tryton.org/projects/modules-currency-ro")
+    (synopsis "Fetch currency rates from the Romanian National Bank")
+    (description "The @emph{Currency RO} Tryton module adds the Romanian
+National Bank as a source for currency exchange rates.")
+    (license license:gpl3+)))
+
 (define-public trytond-customs
   (package
     (name "trytond-customs")
-- 
cgit v1.2.3


From d67e290173007f4ed268fa3c9f8be87e4cc821c4 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-currency-rs.

* gnu/packages/tryton.scm (trytond-currency-rs): New variable.
---
 gnu/packages/tryton.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index e906e4f719..ed82a7ebec 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -1782,6 +1782,26 @@ (define-public trytond-currency-ro
 National Bank as a source for currency exchange rates.")
     (license license:gpl3+)))
 
+(define-public trytond-currency-rs
+  (package
+    (name "trytond-currency-rs")
+    (version "6.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_currency_rs" version))
+              (sha256
+               (base32 "05admscvj5m7anhji2ni9w2d8b33vlgcifda6jbrxdw8g4c0yivn"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_currency_rs"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-lxml trytond trytond-currency
+                             python-zeep))
+    (home-page "https://docs.tryton.org/projects/modules-currency-rs")
+    (synopsis "Fetch currency rates from the Serbian National Bank")
+    (description "The @emph{Currency RS} Tryton module adds the Serbian
+National Bank as a source for currency exchange rates.")
+    (license license:gpl3+)))
+
 (define-public trytond-customs
   (package
     (name "trytond-customs")
-- 
cgit v1.2.3


From 4e4c9e064c013e2e3fbccadfcc7e3352683d184d Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-product-image.

* gnu/packages/tryton.scm (trytond-product-image): New variable.
---
 gnu/packages/tryton.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index ed82a7ebec..833c157689 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -2350,6 +2350,25 @@ (define-public trytond-product-cost-warehouse
 cost price of products to be calculated separately for each warehouse.")
     (license license:gpl3+)))
 
+(define-public trytond-product-image
+  (package
+    (name "trytond-product-image")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_product_image" version))
+              (sha256
+               (base32 "1xdqgc4y1sghnp5q25facdz3mnaxf8fysqlpbq3zrghsvi136mvd"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_product_image"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-pillow trytond trytond-product))
+    (home-page "https://docs.tryton.org/projects/modules-product-image")
+    (synopsis "Tryton module that adds images to products")
+    (description "The @emph{Product Image} Tryton module adds images to each
+product and variant.")
+    (license license:gpl3+)))
+
 (define-public trytond-product-kit
   (package
     (name "trytond-product-kit")
-- 
cgit v1.2.3


From 655e1a474f061556917d4d8bb7f19b0fbe175147 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-product-image-attribute.

* gnu/packages/tryton.scm (trytond-product-image-attribute): New variable.
---
 gnu/packages/tryton.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 833c157689..9df1d9846b 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -2369,6 +2369,27 @@ (define-public trytond-product-image
 product and variant.")
     (license license:gpl3+)))
 
+(define-public trytond-product-image-attribute
+  (package
+    (name "trytond-product-image-attribute")
+    (version "6.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_product_image_attribute" version))
+              (sha256
+               (base32 "1ywyh158325v461qkka5svp4gygsfkkrxd6yl9dgfgypd483qjs8"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_product_image_attribute"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list trytond trytond-product
+                             trytond-product-attribute
+                             trytond-product-image))
+    (home-page "https://docs.tryton.org/projects/modules-product-image-attribute")
+    (synopsis "Tryton module to select variant images based on attributes")
+    (description "The @emph{Product Image Attribute} Tryton module adds
+attributes to product images.")
+    (license license:gpl3+)))
+
 (define-public trytond-product-kit
   (package
     (name "trytond-product-kit")
-- 
cgit v1.2.3


From d074c57ace69c0dcfcf071914324bbe9560c9f05 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-sale-point.

* gnu/packages/tryton.scm (trytond-sale-point): New variable.
---
 gnu/packages/tryton.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 9df1d9846b..15602c5fc7 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -3353,6 +3353,33 @@ (define-public trytond-sale-payment
 payments prior to the creation of any invoice.")
     (license license:gpl3+)))
 
+(define-public trytond-sale-point
+  (package
+    (name "trytond-sale-point")
+    (version "6.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_sale_point" version))
+              (sha256
+               (base32 "0brysadw75rm80yk66wq68gqkyb28zk65sw530fyacx9ma0sq0pj"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_sale_point"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-sql
+                             trytond
+                             trytond-account
+                             trytond-account-product
+                             trytond-company
+                             trytond-party
+                             trytond-product
+                             trytond-sale
+                             trytond-stock))
+    (home-page "https://docs.tryton.org/projects/modules-sale-point")
+    (synopsis "Tryton module for Point of Sales")
+    (description "The @emph{Sale Point} Tryton module allows retail sales to
+be handled and recorded.")
+    (license license:gpl3+)))
+
 (define-public trytond-sale-price-list
   (package
     (name "trytond-sale-price-list")
-- 
cgit v1.2.3


From c46b66450b3a09371bdb9a0daffb8868939582e9 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-stock-package-shipping-mygls.

* gnu/packages/tryton.scm (trytond-stock-package-shipping-mygls): New variable.
---
 gnu/packages/tryton.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 15602c5fc7..2b35653142 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -4062,6 +4062,31 @@ (define-public trytond-stock-package-shipping-dpd
 different web services, the module supports:")
     (license license:gpl3+)))
 
+(define-public trytond-stock-package-shipping-mygls
+  (package
+    (name "trytond-stock-package-shipping-mygls")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_stock_package_shipping_mygls" version))
+              (sha256
+               (base32 "0pwq720mqv473s5aqib89z5bjdl127l8nqw91prxsna82bm16kv2"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_stock_package_shipping_mygls"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-pypdf2
+                             trytond
+                             trytond-carrier
+                             trytond-stock
+                             trytond-stock-package
+                             trytond-stock-package-shipping
+                             python-zeep))
+    (home-page "https://docs.tryton.org/projects/modules-stock-package-shipping-mygls")
+    (synopsis "MyGLS connector for the Tryton application platform")
+    (description "The @emph{Stock Package Shipping MyGLS} Tryton module allows
+package labels to be generated for shipments using MyGLS webservices.")
+    (license license:gpl3+)))
+
 (define-public trytond-stock-package-shipping-ups
   (package
     (name "trytond-stock-package-shipping-ups")
-- 
cgit v1.2.3


From b1f243c3a7480ea66dcc71015bb691d446855122 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:40 +0200
Subject: gnu: Add trytond-stock-package-shipping-sendcloud.

* gnu/packages/tryton.scm (trytond-stock-package-shipping-sendcloud): New variable.
---
 gnu/packages/tryton.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 2b35653142..8385c5fd5f 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -4087,6 +4087,35 @@ (define-public trytond-stock-package-shipping-mygls
 package labels to be generated for shipments using MyGLS webservices.")
     (license license:gpl3+)))
 
+(define-public trytond-stock-package-shipping-sendcloud
+  (package
+    (name "trytond-stock-package-shipping-sendcloud")
+    (version "6.2.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_stock_package_shipping_sendcloud" version))
+              (sha256
+               (base32 "1hvlyrdz1nv1l06qrdj1np8yfyip8hhw0l7wbin1rab63hbxa8rf"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_stock_package_shipping_sendcloud"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-requests
+                             trytond
+                             trytond-company
+                             trytond-party
+                             trytond-product
+                             trytond-stock
+                             trytond-stock-package
+                             trytond-stock-package-shipping
+                             trytond-stock-shipment-measurements))
+    (home-page
+     "https://docs.tryton.org/projects/modules-stock-package-shipping-sendcloud")
+    (synopsis "Sendcloud connector for the Tryton application platform")
+    (description "The @emph{Stock Package Shipping Sendcloud} Tryton module
+allows package labels to be generated for shipments made by any of Sendcloud’s
+supported carriers.")
+    (license license:gpl3+)))
+
 (define-public trytond-stock-package-shipping-ups
   (package
     (name "trytond-stock-package-shipping-ups")
-- 
cgit v1.2.3


From 1bcd1ec72f4ef18cad4b6ac4f6135dd028c8fcee Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:20:29 +0200
Subject: gnu: Add python-pyactiveresource.

* gnu/packages/python-web.scm (python-pyactiveresource): New variable.
---
 gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e863ff9c55..57ad194333 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7711,3 +7711,30 @@ (define-public python-starlette
      "Starlette is a lightweight ASGI (Asynchronous Server Gateway
 Interface) framework/toolkit for building async web services in Python.")
     (license license:bsd-3)))
+
+(define-public python-pyactiveresource
+  (package
+    (name "python-pyactiveresource")
+    (version "2.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyactiveresource" version))
+              (sha256
+               (base32
+                "1n7xvzh1j8fxal0gx9bgg1ayrp3q9mb1a2vb12d6s86wa93880rg"))))
+    (build-system python-build-system)
+    (native-inputs (list python-dateutil python-pyyaml))
+    (propagated-inputs (list python-six))
+    (home-page "https://github.com/Shopify/pyactiveresource/")
+    (synopsis "ActiveResource for Python")
+    (description "This package provides a Python port of the ActiveResource
+project.
+
+Active Resource attempts to provide a coherent wrapper object-relational
+mapping for REST web services.  It follows the same philosophy as Active
+Record, in that one of its prime aims is to reduce the amount of code needed
+to map to these resources.  This is made possible by relying on a number of
+code- and protocol-based conventions that make it easy for Active Resource to
+infer complex relations and structures.")
+    (license license:expat)))
+
-- 
cgit v1.2.3


From 0d9f15868535fbb65d4920387755005acec7f63b Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Wed, 20 Jul 2022 08:29:40 +0200
Subject: gnu: Add python-shopifyapi.

* gnu/packages/python-web.scm (python-shopifyapi): New variable.
---
 gnu/packages/python-web.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 57ad194333..896e60aba2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7738,3 +7738,26 @@ (define-public python-pyactiveresource
 infer complex relations and structures.")
     (license license:expat)))
 
+(define-public python-shopifyapi
+  (package
+    (name "python-shopifyapi")
+    (version "12.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "ShopifyAPI" version))
+              (sha256
+               (base32
+                "03np9mkycqbw5l5vk0srmq353q3vmbycbbarzv0cg3z703p81gnb"))))
+    (build-system python-build-system)
+    (native-inputs (list python-mock))
+    (propagated-inputs (list python-pyactiveresource python-pyjwt
+                             python-pyyaml python-six))
+    (home-page "https://github.com/Shopify/shopify_python_api")
+    (synopsis "Shopify API for Python")
+    (description "This package provides the Shopify API for Python.
+
+The ShopifyAPI library allows Python developers to programmatically access the
+admin section of stores using an ActiveResource-like interface similar the
+ruby Shopify API gem.  The library makes HTTP requests to Shopify in order to
+list, create, update, or delete resources (e.g. Order, Product, Collection).")
+    (license license:expat)))
-- 
cgit v1.2.3


From 62bee0a915ca15dadfc584d7f619f546f5f1256b Mon Sep 17 00:00:00 2001
From: Hartmut Goebel 
Date: Tue, 19 Jul 2022 16:37:41 +0200
Subject: gnu: Add trytond-web-shop-shopify.

* gnu/packages/tryton.scm (trytond-web-shop-shopify): New variable.
---
 gnu/packages/tryton.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index 8385c5fd5f..8e561cad45 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -4508,6 +4508,39 @@ (define-public trytond-web-shop
 configuration of an online web shop.")
     (license license:gpl3+)))
 
+(define-public trytond-web-shop-shopify
+  (package
+    (name "trytond-web-shop-shopify")
+    (version "6.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "trytond_web_shop_shopify" version))
+              (sha256
+               (base32 "1nd2wnzr6cibqcsidk0k98iy4vs7dy7crhld60wkbza8pgc23hc4"))))
+    (build-system python-build-system)
+    (arguments (tryton-arguments "trytond_web_shop_shopify"))
+    (native-inputs (%standard-trytond-native-inputs))
+    (propagated-inputs (list python-dateutil
+                             python-pyactiveresource
+                             python-shopifyapi
+                             python-sql
+                             trytond
+                             trytond-account-payment
+                             trytond-currency
+                             trytond-party
+                             trytond-product
+                             trytond-product-attribute
+                             trytond-sale
+                             trytond-sale-payment
+                             trytond-stock
+                             trytond-web-shop))
+    (home-page "https://docs.tryton.org/projects/modules-web-shop-shopify")
+    (synopsis "Integrate Tryton with Shopify")
+    (description "The @emph{Web Shop Shopify} Tryton module provides a way to
+manage @emph{Shopify} stores.  It uploads products, variants and collections
+to Shopify, and downloads orders, transactions and creates fulfilments.")
+    (license license:gpl3+)))
+
 (define-public trytond-web-shop-vue-storefront
   (package
     (name "trytond-web-shop-vue-storefront")
-- 
cgit v1.2.3


From d49bbd01e10e2f19ec3d8a06b31b828ffd2d45de Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 23:33:50 +0200
Subject: gnu: Add r-interp.

* gnu/packages/cran.scm (r-interp): New variable.
---
 gnu/packages/cran.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index fc793e3c92..605b722975 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -10855,6 +10855,29 @@ (define-public r-intergraph
 @code{igraph}.")
     (license license:gpl3)))
 
+(define-public r-interp
+  (package
+    (name "r-interp")
+    (version "1.1-3")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "interp" version))
+              (sha256
+               (base32
+                "0gzsnlg8f7knb100n6vv6307c3v2jd8f9qzrq62jkc6g71mn0kmp"))))
+    (properties `((upstream-name . "interp")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-deldir r-rcpp r-rcppeigen))
+    (native-inputs (list gfortran))
+    (home-page "https://cran.r-project.org/package=interp")
+    (synopsis "Interpolation methods")
+    (description
+     "Bivariate data interpolation on regular and irregular grids, either
+linear or using splines are the main part of this package.  It is intended to
+provide replacement functions for the ACM licensed @code{akima::interp} and
+@code{tripack::tri.mesh} functions.")
+    (license license:gpl2+)))
+
 (define-public r-abcoptim
   (package
     (name "r-abcoptim")
-- 
cgit v1.2.3


From 563aabf3ccd52a149fa767f6afba4a0b4ba476f2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 23:35:09 +0200
Subject: gnu: Add r-profvis.

* gnu/packages/cran.scm (r-profvis): New variable.
---
 gnu/packages/cran.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 605b722975..aef91cb60f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15931,6 +15931,71 @@ (define-public r-rbamtools
 library.")
     (license license:artistic2.0)))
 
+(define-public r-profvis
+  (package
+    (name "r-profvis")
+    (version "0.3.7")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "profvis" version))
+              (sha256
+               (base32
+                "1f86m426pcf90l29hf4hkirzf8f38dihk52bxbdq2gvrrdili5s3"))
+              (modules '((guix build utils)))
+              (snippet
+               '(with-directory-excursion "inst/htmlwidgets/lib"
+                  (for-each delete-file
+                            (list "highlight/highlight.js" ;from rmarkdown
+                                  "jquery/jquery.min.js" ;version 1.12.4
+                                  "d3/d3.min.js")))))) ;version 3.5.6
+    (properties `((upstream-name . "profvis")))
+    (build-system r-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'process-javascript
+           (lambda* (#:key inputs #:allow-other-keys)
+             (with-directory-excursion "inst/htmlwidgets/lib/"
+               (copy-file
+                (search-input-file
+                 inputs "/site-library/rmarkdown/rmd/h/highlightjs/highlight.js")
+                "highlight/highlight.js")
+               (let ((mapping
+                      `((,(assoc-ref inputs "js-jquery")
+                         . "jquery/jquery.min.js")
+                        (,(assoc-ref inputs "js-d3")
+                         . "d3/d3.min.js"))))
+                 (for-each (lambda (source target)
+                             (format #true "Processing ~a --> ~a~%"
+                                     source target)
+                             (invoke "esbuild" source "--minify"
+                                     (string-append "--outfile=" target)))
+                           (map car mapping)
+                           (map cdr mapping)))))))))
+    (native-inputs
+     `(("esbuild" ,esbuild)
+       ("r-rmarkdown" ,r-rmarkdown)
+       ("js-d3"
+        ,(origin
+           (method url-fetch)
+           (uri "https://raw.githubusercontent.com/d3/d3/v3.5.6/d3.js")
+           (sha256
+            (base32
+             "17qlbwn7vgx335gciq6zp2ib6zg1r9lfa6p1bd9g0ds0xbcsbvgd"))))
+       ("js-jquery"
+        ,(origin
+           (method url-fetch)
+           (uri "https://code.jquery.com/jquery-1.12.4.js")
+           (sha256
+            (base32
+             "0x9mrc1668icvhpwzvgafm8xm11x9lfai9nwr66aw6pjnpwkc3s3"))))))
+    (propagated-inputs (list r-htmlwidgets r-stringr))
+    (home-page "https://rstudio.github.io/profvis/")
+    (synopsis "Interactive visualizations for profiling R code")
+    (description "This package provides interactive visualizations for
+profiling R code.")
+    (license license:gpl3)))
+
 (define-public r-protviz
   (package
     (name "r-protviz")
-- 
cgit v1.2.3


From e7bb12c0a4cb5bf3edb0eefe32d4b4430ebbe672 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 23:36:47 +0200
Subject: gnu: Add r-urlchecker.

* gnu/packages/cran.scm (r-urlchecker): New variable.
---
 gnu/packages/cran.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index aef91cb60f..c7aa223388 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -18936,6 +18936,27 @@ (define-public r-polyclip
 self-intersections from polygon data.")
     (license license:boost1.0)))
 
+(define-public r-urlchecker
+  (package
+    (name "r-urlchecker")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "urlchecker" version))
+              (sha256
+               (base32
+                "06034lb94krbzawqg5xklwcksvyyzl3qy355f66baj5pw7dms5k2"))))
+    (properties `((upstream-name . "urlchecker")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-cli r-curl r-xml2))
+    (home-page "https://github.com/r-lib/urlchecker")
+    (synopsis "Run CRAN URL checks from older R versions")
+    (description
+     "This package provides the URL checking tools available in R 4.1+ as a
+package for earlier versions of R.  It also uses concurrent requests so can be
+much faster than the serial versions.")
+    (license license:gpl3)))
+
 (define-public r-urltools
   (package
     (name "r-urltools")
-- 
cgit v1.2.3


From 6ef2b32612ba08600fb0c7ab4a123c27201a4fc9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 23:48:39 +0200
Subject: gnu: r-flexdashboard: Update to 0.6.0.

* gnu/packages/cran.scm (r-flexdashboard): Update to 0.6.0.
[source]: Delete featherlight.min.js.
[arguments]: Remove trailing #T.
[propagated-inputs]: Add r-bslib, r-sass, and r-scales.
---
 gnu/packages/cran.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c7aa223388..953866fe7f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -19479,14 +19479,14 @@ (define-public r-ggtext
 (define-public r-flexdashboard
   (package
     (name "r-flexdashboard")
-    (version "0.5.2")
+    (version "0.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "flexdashboard" version))
        (sha256
         (base32
-         "1bh759llp15fxrx2rwvxd8p3w84vjmkid32ism7zg49a127fjib4"))
+         "0bvw2ca6xxscia4hvq505qvjf6zkgpsqv86f1s78aknzwr9jsikm"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -19495,7 +19495,7 @@ (define-public r-flexdashboard
            (delete-file "inst/www/sly/sly.min.js")
            (delete-file "inst/www/stickytableheaders/jquery.stickytableheaders.min.js")
            (delete-file "inst/www/prism/prism.js")
-           #t))))
+           (delete-file "inst/www/featherlight/featherlight.min.js")))))
     (build-system r-build-system)
     (arguments
      `(#:modules ((guix build utils)
@@ -19542,14 +19542,16 @@ (define-public r-flexdashboard
                                  (call-with-output-file target
                                    (lambda (port)
                                      (dump-port minified port)))))
-                             sources targets))))
-             #t)))))
+                             sources targets)))))))))
     (propagated-inputs
-     (list r-htmltools
+     (list r-bslib
+           r-htmltools
            r-htmlwidgets
            r-jsonlite
            r-knitr
            r-rmarkdown
+           r-sass
+           r-scales
            r-shiny))
     (native-inputs
      `(("uglifyjs" ,node-uglify-js)
-- 
cgit v1.2.3


From fdae170c37ef642c410f5c8153140d20837d188e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Tue, 9 Aug 2022 23:55:10 +0200
Subject: gnu: r-rtweet: Update to 1.0.2.

* gnu/packages/cran.scm (r-rtweet): Update to 1.0.2.
[propagated-inputs]: Add r-bit64, r-curl, r-lifecycle, r-rlang, and r-withr;
remove r-httpuv, r-magrittr, and r-rcpp.
[synopsis]: Adjust.
[description]: Use full sentence.
---
 gnu/packages/cran.scm | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 953866fe7f..3348e87096 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -31577,31 +31577,32 @@ (define-public r-rworldmap
 (define-public r-rtweet
   (package
     (name "r-rtweet")
-    (version "0.7.0")
+    (version "1.0.2")
     (source
-      (origin
-        (method url-fetch)
-        (uri (cran-uri "rtweet" version))
-        (sha256
-          (base32
-            "05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"))))
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "rtweet" version))
+       (sha256
+        (base32
+         "1dhdq2c2zl88h29caqpm7zh2i5970q7rfg98zf2xb7x4zak7bq9x"))))
     (properties `((upstream-name . "rtweet")))
     (build-system r-build-system)
     (propagated-inputs
-      (list r-httpuv
-            r-httr
-            r-jsonlite
-            r-magrittr
-            r-progress
-            r-rcpp
-            r-tibble))
+     (list r-bit64
+           r-curl
+           r-httr
+           r-jsonlite
+           r-lifecycle
+           r-progress
+           r-rlang
+           r-tibble
+           r-withr))
     (native-inputs (list r-knitr))
-    (home-page
-      "https://docs.ropensci.org/rtweet/")
-    (synopsis "Collecting Twitter Data")
+    (home-page "https://docs.ropensci.org/rtweet/")
+    (synopsis "Collect Twitter data")
     (description
-      "An implementation of calls designed to collect and organize Twitter data
-via @url{https://developer.twitter.com/en/docs,Twitter's REST and stream
+     "This package implements tools designed to collect and organize Twitter
+data via @url{https://developer.twitter.com/en/docs,Twitter's REST and stream
 Application Program Interfaces (API)}.")
     (license license:expat)))
 
-- 
cgit v1.2.3


From 4dcb2f3fb752cf948c904e73dead4dda5c8ea1ed Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 10:08:08 +0200
Subject: gnu: r-s2: Update to 1.1.0.

* gnu/packages/cran.scm (r-s2): Update to 1.1.0.
[arguments]: Add build phase to unbreak linking.
---
 gnu/packages/cran.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3348e87096..8061fbfee6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17841,16 +17841,27 @@ (define-public r-wk
 (define-public r-s2
   (package
     (name "r-s2")
-    (version "1.0.7")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "s2" version))
        (sha256
         (base32
-         "0gwydn6wdl675ydkcckrci6ylcx30qn8nfhmrp4qx4r9mv3c2410"))))
+         "05n459rp5b1wk826sq3c5d2z1xwgkpfp8m1jnfshvs4gadlfkap3"))))
     (properties `((upstream-name . "s2")))
     (build-system r-build-system)
+    (arguments
+     (list
+      #:phases
+      `(modify-phases %standard-phases
+         ;; We don't want to convert -lssl to -l:libssl.so.1.1; there is only
+         ;; one libssl.so anyway and the -l:* thing breaks linking.
+         (add-after 'unpack 'undo-library-versioning
+           (lambda _
+             (substitute* "configure"
+               (("PKG_LIBS_VERSIONED=.*")
+                "PKG_LIBS_VERSIONED=\"${PKG_LIBS}\"\n")))))))
     (propagated-inputs
      (list r-rcpp r-wk))
     (inputs
-- 
cgit v1.2.3


From a8ec2fcec62049d23cac9f5eed374abdfbdaab4a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 10:18:16 +0200
Subject: gnu: r-bslib: Update to 0.4.0.

* gnu/packages/cran.scm (r-bslib): Update to 0.4.0.
[native-inputs]: Update js-bootstrap5-bundle from 5.0.2 to 5.1.3.
[propagated-inputs]: Add r-cachem and r-memoise.
---
 gnu/packages/cran.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8061fbfee6..8dabfa6059 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2605,14 +2605,14 @@ (define-public r-saver
 (define-public r-bslib
   (package
     (name "r-bslib")
-    (version "0.3.1")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "bslib" version))
        (sha256
         (base32
-         "0jcqklry1nkibz0sydsz5xdsnb4wnrrhvmyr9ji3k45bbipbap2z"))
+         "1hkmaj0mpygbf6qr1955biv9z4q3khflyqi5x0c3dwi6qz74xspv"))
        (snippet
         '(for-each delete-file
                    '("inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js"
@@ -2652,7 +2652,13 @@ (define-public r-bslib
                                        (string-append "--outfile=" target)))
                              sources targets)))))))))
     (propagated-inputs
-     (list r-htmltools r-jquerylib r-jsonlite r-rlang r-sass))
+     (list r-cachem
+           r-htmltools
+           r-jquerylib
+           r-jsonlite
+           r-memoise
+           r-rlang
+           r-sass))
     (native-inputs
      `(("esbuild" ,esbuild)
        ("js-bootstrap4-bundle"
@@ -2665,10 +2671,10 @@ (define-public r-bslib
        ("js-bootstrap5-bundle"
         ,(origin
            (method url-fetch)
-           (uri "https://raw.githubusercontent.com/twbs/bootstrap/v5.0.2/dist/js/bootstrap.bundle.js")
+           (uri "https://raw.githubusercontent.com/twbs/bootstrap/v5.1.3/dist/js/bootstrap.bundle.js")
            (sha256
             (base32
-             "06vin94nqw1vzs4zrqcms8z9js9fckbj8gwyx07awm8jkjhnqfhl"))))))
+             "116979i2vr1y9i6g7n5iir19p85xwr642scbl9jcqdr0w9801nw6"))))))
     (home-page "https://rstudio.github.io/bslib/")
     (synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown")
     (description
-- 
cgit v1.2.3


From 17d3880de7eeca8204c08e07ab583f0e9da33af8 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:46 +0200
Subject: gnu: r-activepathways: Update to 1.1.1.

* gnu/packages/bioconductor.scm (r-activepathways): Update to 1.1.1.
---
 gnu/packages/bioconductor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 1bb8c0d406..94c92abefa 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -12925,14 +12925,14 @@ (define-public r-activedriverwgs
 (define-public r-activepathways
   (package
     (name "r-activepathways")
-    (version "1.1.0")
+    (version "1.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ActivePathways" version))
        (sha256
         (base32
-         "0zbrgz91mlik7j8j11wsdswqqqfsijj8jkgd5fx1ar3mc6rqsmbg"))))
+         "1crq164vyqhdq5y3q09k3m5zljqrhcd5ak0jrc0xqvzf0pasml2m"))))
     (properties
      `((upstream-name . "ActivePathways")))
     (build-system r-build-system)
-- 
cgit v1.2.3


From 4eb4e7eb785661306d475d0b3d1388a83340274d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:55 +0200
Subject: gnu: r-datawizard: Update to 0.5.0.

* gnu/packages/cran.scm (r-datawizard): Update to 0.5.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8dabfa6059..90cb14702f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -257,14 +257,14 @@ (define-public r-curry
 (define-public r-datawizard
   (package
     (name "r-datawizard")
-    (version "0.4.1")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "datawizard" version))
        (sha256
         (base32
-         "09lyh1awm2rplfzgwbdw4iy76mbaqwjd4hwlrsgvxj9pwdnjs4cx"))))
+         "022bbfaszbpml3i281cal7z0y1i380i1zjnhk1ldy5r535vs9cgq"))))
     (properties `((upstream-name . "datawizard")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 0d6da50180fb07cd5b0c3cff9e091cef6acea0f0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:55 +0200
Subject: gnu: r-v8: Update to 4.2.1.

* gnu/packages/cran.scm (r-v8): Update to 4.2.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 90cb14702f..3d17b073c1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -708,14 +708,14 @@ (define-public r-bwstest
 (define-public r-v8
   (package
     (name "r-v8")
-    (version "4.2.0")
+    (version "4.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "V8" version))
        (sha256
         (base32
-         "0hs7ajjw6y3q7mp7z00a9712y4cn6wgcnk5dbjbzlc6cfk4zsqkc"))))
+         "1w1zihmhrygn2i674wimbv7xqjnwlld4x3ndvh5dl4cdg7s1m24r"))))
     (properties `((upstream-name . "V8")))
     (build-system r-build-system)
     (arguments
-- 
cgit v1.2.3


From 9fe9856ebef515927900e56686a1071936bdafcc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:55 +0200
Subject: gnu: r-fontawesome: Update to 0.3.0.

* gnu/packages/cran.scm (r-fontawesome): Update to 0.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3d17b073c1..cef7573e97 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -860,13 +860,13 @@ (define-public r-zoo
 (define-public r-fontawesome
   (package
     (name "r-fontawesome")
-    (version "0.2.2")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "fontawesome" version))
        (sha256
-        (base32 "0r6zb5175cr4ybqj6bl0mbhadwv9xjxaf32yjc0y76rw3d6vcbap"))))
+        (base32 "0c8sb8isiyn2gr3xfql75yyssf9wlb152cw67whq83aqsksgrvjd"))))
     (properties `((upstream-name . "fontawesome")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From bf789892d0b7ef706f0fe2146f917664c2bef48e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:55 +0200
Subject: gnu: r-ggside: Update to 0.2.1.

* gnu/packages/cran.scm (r-ggside): Update to 0.2.1.
[propagated-inputs]: Add r-tibble.
---
 gnu/packages/cran.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cef7573e97..cb20808697 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1141,16 +1141,22 @@ (define-public r-ggpmisc
 (define-public r-ggside
   (package
     (name "r-ggside")
-    (version "0.2.0")
+    (version "0.2.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "ggside" version))
               (sha256
                (base32
-                "1x505zizv7hf65pxp9j5v92c3bchhxh9dsrkk1m55kwqqnsl5nza"))))
+                "1vl7kzgmi5xxxsqvyg4cm4xwd3lfjgysay1lw6hri5vj22mnga5h"))))
     (properties `((upstream-name . "ggside")))
     (build-system r-build-system)
-    (propagated-inputs (list r-ggplot2 r-glue r-gtable r-rlang r-scales))
+    (propagated-inputs
+     (list r-ggplot2
+           r-glue
+           r-gtable
+           r-rlang
+           r-scales
+           r-tibble))
     (native-inputs (list r-knitr))
     (home-page "https://cran.r-project.org/package=ggside")
     (synopsis "Side grammar graphics that extends @code{ggplot2}")
-- 
cgit v1.2.3


From 6c0677d3c145f0f6f68dce99aaafa1b8efcaf249 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:55 +0200
Subject: gnu: r-tidyverse: Update to 1.3.2.

* gnu/packages/cran.scm (r-tidyverse): Update to 1.3.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cb20808697..720f70871b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1808,14 +1808,14 @@ (define-public r-vegan
 (define-public r-tidyverse
   (package
     (name "r-tidyverse")
-    (version "1.3.1")
+    (version "1.3.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidyverse" version))
        (sha256
         (base32
-         "0ck6xmsw5p168jmw2fqv79fzfnw5jckfra7mfii261j6kl89bkw3"))))
+         "0qfgq4p2aq95j39xd5kcing2cacy7rzy7f6zf0bnpsa95svziyrp"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-broom
-- 
cgit v1.2.3


From 3ad1be568329295c7a697fdd7038a6c9282d55d5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:56 +0200
Subject: gnu: r-callr: Update to 3.7.1.

* gnu/packages/cran.scm (r-callr): Update to 3.7.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 720f70871b..237978ad2d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1969,14 +1969,14 @@ (define-public r-reordercluster
 (define-public r-callr
   (package
     (name "r-callr")
-    (version "3.7.0")
+    (version "3.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "callr" version))
        (sha256
         (base32
-         "02inaf3c7b0hikii7p2zwaphrq5myv4in92d9jxd1ilmhla5awnn"))))
+         "1vc986d571nwmb5lw5rq3d38z4qw36lr94s3apz50c2v79xsbqrp"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-r6 r-processx))
-- 
cgit v1.2.3


From 44c54b3f257feede97b9eac6d10a095265e8adae Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:56 +0200
Subject: gnu: r-htmltools: Update to 0.5.3.

* gnu/packages/cran.scm (r-htmltools): Update to 0.5.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 237978ad2d..127b9b72ae 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2253,13 +2253,13 @@ (define-public r-howmany
 (define-public r-htmltools
   (package
     (name "r-htmltools")
-    (version "0.5.2")
+    (version "0.5.3")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "htmltools" version))
               (sha256
                (base32
-                "1yv74ydyqm28gfhimmr7825sj1iaawpwsnzq05c2ma756q2dbivx"))))
+                "0krjyz99q7zvdfg60b128c0zwr36h54gb05jw9c874d8kqv1ni9c"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-base64enc r-digest r-fastmap r-rlang))
-- 
cgit v1.2.3


From 568a535d63cf1f8bc94537786654b7d34f19ef3d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:56 +0200
Subject: gnu: r-htmltable: Update to 2.4.1.

* gnu/packages/cran.scm (r-htmltable): Update to 2.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 127b9b72ae..7cfa8e041d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2295,13 +2295,13 @@ (define-public r-htmlwidgets
 (define-public r-htmltable
   (package
     (name "r-htmltable")
-    (version "2.4.0")
+    (version "2.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "htmlTable" version))
        (sha256
-        (base32 "17csp0ry4iy4m5xy271dn5wd81v4p03l79swmvlfxkvpdmhvb8jc"))))
+        (base32 "14qg65nw0bpikqs1hb1x7apzdzrnnl3ykjnks67kkp46v1skwzrs"))))
     (properties `((upstream-name . "htmlTable")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 0b1c23c7abf87fe5f84b5eb8ca12ed116eb18e85 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:56 +0200
Subject: gnu: r-rstpm2: Update to 1.5.7.

* gnu/packages/cran.scm (r-rstpm2): Update to 1.5.7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7cfa8e041d..478d543c18 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2457,14 +2457,14 @@ (define-public r-fastghquad
 (define-public r-rstpm2
   (package
     (name "r-rstpm2")
-    (version "1.5.6")
+    (version "1.5.7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rstpm2" version))
        (sha256
         (base32
-         "17mhzfxh761vl64ar6pynpj3k2jkhjgbacxsjhkrfkbmy3aiv0d1"))))
+         "1gsizffplj4m9x1ln82f76936psgxn9cii45m7658lpwf2nzwli2"))))
     (properties `((upstream-name . "rstpm2")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 995db36c9d8d62043ef762eda115f639e09d0227 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:56 +0200
Subject: gnu: r-sass: Update to 0.4.2.

* gnu/packages/cran.scm (r-sass): Update to 0.4.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 478d543c18..93a78b535c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2549,14 +2549,14 @@ (define-public r-jquerylib
 (define-public r-sass
   (package
     (name "r-sass")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sass" version))
        (sha256
         (base32
-         "1fq8wqnxmx10lg0dh4qzmxdkhd22fjh8vhassapxb1chsimwn3w5"))))
+         "0iln5ky6k1ix0gddlyw4rr2953kc499x66bcyi9yiyp91nfh82dl"))))
     (properties `((upstream-name . "sass")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 8f935a88e882e11ec1994039bb1804fff3820d62 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:57 +0200
Subject: gnu: r-mbess: Update to 4.9.1.

* gnu/packages/cran.scm (r-mbess): Update to 4.9.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 93a78b535c..b2736362e8 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3171,13 +3171,13 @@ (define-public r-gg-gap
 (define-public r-mbess
   (package
     (name "r-mbess")
-    (version "4.9.0")
+    (version "4.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "MBESS" version))
        (sha256
-        (base32 "0qmyvjx2zn5hlzdbz8c94g8l4707swhn7sq9mxkdqiydmflzv0b5"))))
+        (base32 "18klyyjvmwggv4ma2x77jac3640yxbsbinl3s2rp1ik4n9phnjd0"))))
     (properties `((upstream-name . "MBESS")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 6a97fb98e22922e527aae04e796043ad95d51fc7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:57 +0200
Subject: gnu: r-pls: Update to 2.8-1.

* gnu/packages/cran.scm (r-pls): Update to 2.8-1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b2736362e8..6851fd1ffa 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -3875,13 +3875,13 @@ (define-public r-plogr
 (define-public r-pls
   (package
     (name "r-pls")
-    (version "2.8-0")
+    (version "2.8-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pls" version))
        (sha256
-        (base32 "1gqq8rcq6p0hs2gfzwfj690rz3pwywmnv8qzcv0wsd6aaqkskwzg"))))
+        (base32 "137jg3x7aqwyki29i4kzp8d6imn17nq6wzzfjw5q19pixvmpybp2"))))
     (build-system r-build-system)
     (home-page "https://mevik.net/work/software/pls.html")
     (synopsis "Partial Least Squares and Principal Component Regression")
-- 
cgit v1.2.3


From a1cf3f7c2001e2867e92b6ec35a970f37745433e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:57 +0200
Subject: gnu: r-rcpp: Update to 1.0.9.

* gnu/packages/cran.scm (r-rcpp): Update to 1.0.9.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6851fd1ffa..7de17360ea 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4004,13 +4004,13 @@ (define-public r-pvclust
 (define-public r-rcpp
   (package
     (name "r-rcpp")
-    (version "1.0.8.3")
+    (version "1.0.9")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Rcpp" version))
        (sha256
-        (base32 "1gzqfn1xjawzig30ama3rldykqpcn6bd8sg684mrfvpmv96bi9cx"))))
+        (base32 "0xli48y9nsj8x8p5vkhisiz4l23g8r2623rn0i4xb5javh3fqz40"))))
     (build-system r-build-system)
     (home-page "http://www.rcpp.org")
     (synopsis "Seamless R and C++ integration")
-- 
cgit v1.2.3


From 8f32af12d5895baa9e7cbc1c76e232ff5b7a90e4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:57 +0200
Subject: gnu: r-dendextend: Update to 1.16.0.

* gnu/packages/cran.scm (r-dendextend): Update to 1.16.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7de17360ea..82a16d0ff2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4312,14 +4312,14 @@ (define-public r-compare
 (define-public r-dendextend
   (package
     (name "r-dendextend")
-    (version "1.15.2")
+    (version "1.16.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "dendextend" version))
        (sha256
         (base32
-         "06wjs8451hmnimzgngpzbai3yrgy33133vzzapa8jib9crdqi8sb"))))
+         "0rl4f0b73s1gdjfxgpnz87lhv131qazxb6vsv2935ad266fd0bzc"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-ggplot2 r-magrittr r-viridis))
-- 
cgit v1.2.3


From 4d4e8a314b88a91a9b518d47c425a437969738b7 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:57 +0200
Subject: gnu: r-dimred: Update to 0.2.6.

* gnu/packages/cran.scm (r-dimred): Update to 0.2.6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 82a16d0ff2..c99bc17050 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5336,14 +5336,14 @@ (define-public r-prodlim
 (define-public r-dimred
   (package
     (name "r-dimred")
-    (version "0.2.5")
+    (version "0.2.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "dimRed" version))
        (sha256
         (base32
-         "1z8fqdc8mslvfix8ngxs1y2yrvlanp5581hwp2nzldj6mk5kn15b"))))
+         "05zlkf6hjdqqr1sgw7ww9f17vjnsiqfaj9kvdvi146phh53v2zls"))))
     (properties `((upstream-name . "dimRed")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From f708acfde7eb3298a8cd6bcf235896030cc4b19d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:58 +0200
Subject: gnu: r-timedate: Update to 4021.104.

* gnu/packages/cran.scm (r-timedate): Update to 4021.104.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c99bc17050..3cd97298e4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5361,14 +5361,14 @@ (define-public r-dimred
 (define-public r-timedate
   (package
     (name "r-timedate")
-    (version "3043.102")
+    (version "4021.104")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "timeDate" version))
        (sha256
         (base32
-         "0wvl5pq261rvbgly7vilk3x3m9xk3ly6il1i5scwdf6srl1vlz1p"))))
+         "03ncgbc9igiwl4s8pa94nj2v7aw3gw8ay51pwvv9gkv2f7l7dvh3"))))
     (properties `((upstream-name . "timeDate")))
     (build-system r-build-system)
     (home-page "https://www.rmetrics.org")
-- 
cgit v1.2.3


From 49eaf286f90de0586431fc9e2fc7c25708d9e744 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:58 +0200
Subject: gnu: r-rpostgresql: Update to 0.7-4.

* gnu/packages/cran.scm (r-rpostgresql): Update to 0.7-4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3cd97298e4..018cb12a24 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5431,14 +5431,14 @@ (define-public r-rmysql
 (define-public r-rpostgresql
   (package
     (name "r-rpostgresql")
-    (version "0.7-3")
+    (version "0.7-4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RPostgreSQL" version))
        (sha256
         (base32
-         "1fbixmnjp1kh6yiv8zhg8zi5ryvdf5j2jxv4agq5gcxf541s3g5x"))))
+         "1ijnsly8wgy6cfib4xvdaz2g9hk1gzg7q52r37zkvc7jjh0gdbdn"))))
     (properties `((upstream-name . "RPostgreSQL")))
     (build-system r-build-system)
     (inputs
-- 
cgit v1.2.3


From 9b9c04e91b3b173dfd8c8c786db5984d11c28791 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:58 +0200
Subject: gnu: r-geometry: Update to 0.4.6.1.

* gnu/packages/cran.scm (r-geometry): Update to 0.4.6.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 018cb12a24..a4c38753b4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5477,14 +5477,14 @@ (define-public r-linprog
 (define-public r-geometry
   (package
     (name "r-geometry")
-    (version "0.4.6")
+    (version "0.4.6.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "geometry" version))
        (sha256
         (base32
-         "1n7m0djqlhrv01l98r76grkki6cv4k4q2z6c7fksqgq4r2l6a14i"))))
+         "0wplszaxi6phxffp3zww5alwnfbh9521qi43h65w057lrm1pmj2j"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-magic r-linprog r-lpsolve r-rcpp r-rcppprogress))
-- 
cgit v1.2.3


From 9d1b9928375f51dc18298538a4a2ff25eaec8883 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:58 +0200
Subject: gnu: r-generics: Update to 0.1.3.

* gnu/packages/cran.scm (r-generics): Update to 0.1.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a4c38753b4..0675105c5a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5646,14 +5646,14 @@ (define-public r-psych
 (define-public r-generics
   (package
     (name "r-generics")
-    (version "0.1.2")
+    (version "0.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "generics" version))
        (sha256
         (base32
-         "162q9hdsnfcwjj255ahbi6v9vnyynvda7gb75p721y28j5xb7sk3"))))
+         "0lyhhwik0w7m5h3fbwl2f52gc1v2g6g6h6sc47sa9f58pxin213m"))))
     (build-system r-build-system)
     (home-page "https://github.com/r-lib/generics")
     (synopsis "Common S3 generics not provided by base R methods")
-- 
cgit v1.2.3


From 16f6320eb854c63143f39d9c11c48b47fe3d969c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:59 +0200
Subject: gnu: r-recipes: Update to 1.0.1.

* gnu/packages/cran.scm (r-recipes): Update to 1.0.1.
[propagated-inputs]: Add r-cli.
---
 gnu/packages/cran.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0675105c5a..0eb9a99360 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5705,17 +5705,18 @@ (define-public r-broom
 (define-public r-recipes
   (package
     (name "r-recipes")
-    (version "0.2.0")
+    (version "1.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "recipes" version))
        (sha256
         (base32
-         "1950rvva19ms6xy9d3jx94gzy589qprk115zjjd0ib4qxgip601x"))))
+         "1jav29biq13xf0vg9kj3k6khqb71hqak26kxxi0vy29l849f4fly"))))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-dplyr
+     (list r-cli
+           r-dplyr
            r-ellipsis
            r-generics
            r-glue
-- 
cgit v1.2.3


From d8de4d9be6156c547d4b508f62ce11b06ef2381f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:59 +0200
Subject: gnu: r-coro: Update to 1.0.3.

* gnu/packages/cran.scm (r-coro): Update to 1.0.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0eb9a99360..2b09aaf59a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5799,13 +5799,13 @@ (define-public r-ggrepel
 (define-public r-coro
   (package
     (name "r-coro")
-    (version "1.0.2")
+    (version "1.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "coro" version))
        (sha256
-        (base32 "14irld29dipgfd34y0k351daqg9vqpnpdx8m3pxmqr1aiyj5f5cv"))))
+        (base32 "0wvxdpdh3xrskz5s5wfkva856x849knx1jigbf0ff6s6n6qjjxsf"))))
     (properties `((upstream-name . "coro")))
     (build-system r-build-system)
     (propagated-inputs (list r-rlang))
-- 
cgit v1.2.3


From 12d0ab6df40a67efa0501ab25b1665c85a77bdae Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:59 +0200
Subject: gnu: r-sm: Update to 2.2-5.7.1.

* gnu/packages/cran.scm (r-sm): Update to 2.2-5.7.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2b09aaf59a..b225071539 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6150,14 +6150,14 @@ (define-public r-hardyweinberg
 (define-public r-sm
   (package
     (name "r-sm")
-    (version "2.2-5.7")
+    (version "2.2-5.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sm" version))
        (sha256
         (base32
-         "03z8igsjqr32x407asxvkrbayvm6yhv9xyfs0n8fkmv8zk5a41r6"))))
+         "0mql7rlm8wkdwmx1lv7pscdk9ibvsdpfdv8bpaz1hv2gn4pc637a"))))
     (build-system r-build-system)
     (native-inputs (list gfortran))
     (home-page "http://www.stats.gla.ac.uk/~adrian/sm/")
-- 
cgit v1.2.3


From 23367bfa5785376f51901e3d80727260644a4c0f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:19:59 +0200
Subject: gnu: r-vcfr: Update to 1.13.0.

* gnu/packages/cran.scm (r-vcfr): Update to 1.13.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b225071539..2b2b39a7a6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6338,13 +6338,13 @@ (define-public r-vcd
 (define-public r-vcfr
   (package
    (name "r-vcfr")
-   (version "1.12.0")
+   (version "1.13.0")
    (source (origin
             (method url-fetch)
             (uri (cran-uri "vcfR" version))
             (sha256
              (base32
-              "0lhxb3ac4fafwik9q3cds46svzf0hyca8k54chw3dpk50c0zz1yx"))))
+              "1g4y11vpr3wrvf5prj7y33c2bah6rn4xfb4a1y7n7niafd2yhg3l"))))
    (build-system r-build-system)
    (native-inputs
     (list r-knitr))
-- 
cgit v1.2.3


From 796267ef8d6c65f6c9bc9debf57a1df6fc6ae249 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:00 +0200
Subject: gnu: r-ica: Update to 1.0-3.

* gnu/packages/cran.scm (r-ica): Update to 1.0-3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 2b2b39a7a6..0745ba4ad7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6376,14 +6376,14 @@ (define-public r-vcfr
 (define-public r-ica
   (package
     (name "r-ica")
-    (version "1.0-2")
+    (version "1.0-3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ica" version))
        (sha256
         (base32
-         "0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"))))
+         "0rdqd3kz2cv3xvf6yz55bwhsg3k7j90d450i3azs2xkbn4q3aka7"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/ica/")
     (synopsis "Independent component analysis")
-- 
cgit v1.2.3


From a00797d332396df5d9a4aac674e8d74a12376b2d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:00 +0200
Subject: gnu: r-processx: Update to 3.7.0.

* gnu/packages/cran.scm (r-processx): Update to 3.7.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0745ba4ad7..39445a93c2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6568,13 +6568,13 @@ (define-public r-debugme
 (define-public r-processx
   (package
     (name "r-processx")
-    (version "3.6.1")
+    (version "3.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "processx" version))
        (sha256
-        (base32 "1xgjj37s304vdwp2a02rl999xl6dw7iw0ib9jyfpjrqyc1lmfw47"))))
+        (base32 "1lsyspd3jak6g625sna5jdqrg5fw02qgdfiz0hsyqlzw6m0qssny"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-ps r-r6))
-- 
cgit v1.2.3


From fbb11572ff9a377cc8c920f50380baa6a1e4a306 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:00 +0200
Subject: gnu: r-tsp: Update to 1.2-1.

* gnu/packages/cran.scm (r-tsp): Update to 1.2-1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 39445a93c2..43d07e3b6e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6593,14 +6593,14 @@ (define-public r-processx
 (define-public r-tsp
   (package
     (name "r-tsp")
-    (version "1.2-0")
+    (version "1.2-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "TSP" version))
        (sha256
         (base32
-         "022k0972kcxb0w6qhx09l9cif8fmpkpvwddvgxiy60bx343ywzia"))))
+         "1pa6pb4qrh2iybpjzjiny6hshj0shjdm0pxqnidcrg5hyfzzxd9b"))))
     (properties `((upstream-name . "TSP")))
     (build-system r-build-system)
     (propagated-inputs (list r-foreach))
-- 
cgit v1.2.3


From 40e6e23fa5579285d52f6578992e798a5df0d816 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:00 +0200
Subject: gnu: r-seriation: Update to 1.3.6.

* gnu/packages/cran.scm (r-seriation): Update to 1.3.6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 43d07e3b6e..76609dcff1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6678,14 +6678,14 @@ (define-public r-webshot
 (define-public r-seriation
   (package
     (name "r-seriation")
-    (version "1.3.5")
+    (version "1.3.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "seriation" version))
        (sha256
         (base32
-         "0dlj0mqpg585m6i7yn0h878i8ag6pyqph98xkk42i2nvghpy01gr"))))
+         "1i0bbfxbvzy2lwprliqrn97ww8lqr2s9klg0g3qqjyr8cdxs5fyc"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-cluster
-- 
cgit v1.2.3


From 0d53fd5005185dfd1a522a0c949f9791f84ab191 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:00 +0200
Subject: gnu: r-pillar: Update to 1.8.0.

* gnu/packages/cran.scm (r-pillar): Update to 1.8.0.
[propagated-inputs]: Remove r-crayon and r-ellipsis.
---
 gnu/packages/cran.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 76609dcff1..9087531d18 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -6833,19 +6833,17 @@ (define-public r-vctrs
 (define-public r-pillar
   (package
     (name "r-pillar")
-    (version "1.7.0")
+    (version "1.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pillar" version))
        (sha256
         (base32
-         "1fqk18vc9ashf12gdqkdi6n1nj5lh324vwhgiib3b2fcb2bghhbq"))))
+         "0vxkg451s5kwkg0m8d9dnr8gl5s0pgi8mxcm39ry5vgdj8v47ijj"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-cli
-           r-crayon
-           r-ellipsis
            r-fansi
            r-glue
            r-lifecycle
-- 
cgit v1.2.3


From fcdb9fa2d55992f7e1ba33f7c00c78ee2a26da0b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:01 +0200
Subject: gnu: r-ifultools: Update to 2.0-26.

* gnu/packages/cran.scm (r-ifultools): Update to 2.0-26.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9087531d18..68da95480d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -7385,14 +7385,14 @@ (define-public r-splus2r
 (define-public r-ifultools
   (package
     (name "r-ifultools")
-    (version "2.0-23")
+    (version "2.0-26")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ifultools" version))
        (sha256
         (base32
-         "16a7rbvlym3bnfm93ikr5kl0l86ppk0s41fva6idvcx765g3fqkk"))))
+         "1lkmzrh65j6vdb8523axxk9gig5q4zxy08wiqsp16w482d2q2sl1"))))
     (build-system r-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From 92bf6b65642954122e7307de2c431037930b3135 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:01 +0200
Subject: gnu: r-tsa: Update to 1.3.1.

* gnu/packages/cran.scm (r-tsa): Update to 1.3.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 68da95480d..986db650fd 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -7531,14 +7531,14 @@ (define-public r-wmtsa
 (define-public r-tsa
   (package
     (name "r-tsa")
-    (version "1.3")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "TSA" version))
        (sha256
         (base32
-         "1bv5q609lhmrcxnjnvcj497fbjlv89zwa8q918hw4iki5nkvwwdb"))))
+         "14g58s2w7wma1fgcg3b51267b3676zrv0w8v4hpypxygz023d9bx"))))
     (properties `((upstream-name . "TSA")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From a2848ce4b28c81efc83c5adb7a9d09536f1dbb3a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:01 +0200
Subject: gnu: r-radiant-data: Update to 1.4.4.

* gnu/packages/cran.scm (r-radiant-data): Update to 1.4.4.
[propagated-inputs]: Add r-bslib and r-png.
---
 gnu/packages/cran.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 986db650fd..a0e3f17989 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8049,14 +8049,14 @@ (define-public r-base64url
 (define-public r-radiant-data
   (package
     (name "r-radiant-data")
-    (version "1.4.2")
+    (version "1.4.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "radiant.data" version))
        (sha256
         (base32
-         "0c5c99q13pwv6k0b07x3r2bxmh0h2w15h02xb1pincgs61qwi15k"))
+         "1lj8zz9zg7kys9rkjxn9p5z6l944dk2bx6idlxal59yhy4ql2i4p"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -8068,6 +8068,7 @@ (define-public r-radiant-data
     (propagated-inputs
      (list r-base64enc
            r-broom
+           r-bslib
            r-car
            r-curl
            r-dplyr
@@ -8083,6 +8084,7 @@ (define-public r-radiant-data
            r-mass
            r-patchwork
            r-plotly
+           r-png
            r-psych
            r-randomizr
            r-readr
-- 
cgit v1.2.3


From 45250735ef0a7fe2580f03e4a8c1096ea8f3f030 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:02 +0200
Subject: gnu: r-snowfall: Update to 1.84-6.2.

* gnu/packages/cran.scm (r-snowfall): Update to 1.84-6.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a0e3f17989..95c26ae70b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -8793,12 +8793,12 @@ (define-public r-fst
 (define-public r-snowfall
   (package
    (name "r-snowfall")
-   (version "1.84-6.1")
+   (version "1.84-6.2")
    (source (origin
             (method url-fetch)
             (uri (cran-uri "snowfall" version))
             (sha256
-             (base32 "13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"))))
+             (base32 "0frmasv04wd47h04zbwaryhiyxllarf3ggpa39p5qicjp6r7lilv"))))
    (build-system r-build-system)
    (propagated-inputs
     (list r-snow))
-- 
cgit v1.2.3


From 859d2908d848cbe9084f10bc20a113bc39583b98 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:02 +0200
Subject: gnu: r-rdpack: Update to 2.4.

* gnu/packages/cran.scm (r-rdpack): Update to 2.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 95c26ae70b..794563519a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9829,14 +9829,14 @@ (define-public r-rbibutils
 (define-public r-rdpack
   (package
     (name "r-rdpack")
-    (version "2.3.1")
+    (version "2.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Rdpack" version))
        (sha256
         (base32
-         "12j45n4srs987s9mqvp3524cviqbl2pnpx7yw8agac9ynnfmwgmm"))))
+         "109mylzmlncq5a09ayy4g2g0frj1k843lj8j78gvmz1h5g8sslkn"))))
     (properties `((upstream-name . "Rdpack")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 89506cbb3c0689653cf5b8b463ce2f6ff12898ea Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:02 +0200
Subject: gnu: r-acdm: Update to 1.0.4.1.

* gnu/packages/cran.scm (r-acdm): Update to 1.0.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 794563519a..a1b67791d3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9981,14 +9981,14 @@ (define-public r-acd
 (define-public r-acdm
   (package
     (name "r-acdm")
-    (version "1.0.4")
+    (version "1.0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ACDm" version))
        (sha256
         (base32
-         "0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"))))
+         "129ykw0j8z30mr4c01qzx6qy6h4bl87zxvmps0vkh8cqb7akninq"))))
     (properties `((upstream-name . "ACDm")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From c3e1314ac21d2bf85131e91a310a7c3e35ba46ed Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:02 +0200
Subject: gnu: r-insight: Update to 0.18.0.

* gnu/packages/cran.scm (r-insight): Update to 0.18.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a1b67791d3..091b68d8c1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -10071,14 +10071,14 @@ (define-public r-prediction
 (define-public r-insight
   (package
     (name "r-insight")
-    (version "0.17.1")
+    (version "0.18.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "insight" version))
        (sha256
         (base32
-         "0dffrsimgijdqsgvr9cad4g4w97d5ssjl3l0fm5ssly9l115ag35"))))
+         "09gpkac882hqw84rk66h5dm94ljk08ydz13wz9fbjdxaffgw5ba1"))))
     (build-system r-build-system)
     (native-inputs
      (list r-knitr))
-- 
cgit v1.2.3


From 95d9a83be1e11107ebe456cf708b33eaf8a8bd23 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:03 +0200
Subject: gnu: r-argparse: Update to 2.1.6.

* gnu/packages/cran.scm (r-argparse): Update to 2.1.6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 091b68d8c1..7a75e84b37 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -10356,14 +10356,14 @@ (define-public r-findpython
 (define-public r-argparse
   (package
     (name "r-argparse")
-    (version "2.1.5")
+    (version "2.1.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "argparse" version))
        (sha256
         (base32
-         "13b5halfxc7nr57vkz3qmkkcpw1hr4xdk1mjh2cq8cvpnjz15qc3"))))
+         "14p57nm0w3siqd473snzhpmnvsgl72x92pdcd64vhy2qg6nzmmra"))))
     (build-system r-build-system)
     (inputs (list python))
     (propagated-inputs
-- 
cgit v1.2.3


From 6d65fb584258a87587575ac6569c86adc01fe934 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:03 +0200
Subject: gnu: r-gam: Update to 1.20.2.

* gnu/packages/cran.scm (r-gam): Update to 1.20.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7a75e84b37..b71c0d6613 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11064,14 +11064,14 @@ (define-public r-cvauc
 (define-public r-gam
   (package
     (name "r-gam")
-    (version "1.20.1")
+    (version "1.20.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gam" version))
        (sha256
         (base32
-         "1bbxiqfgi7jc9vw1hspw5q41d69nlw2v6k91zqlvmam5pvxcd1sp"))))
+         "1ndgnaq5fk1w6l6z93w5gd22887yxkykrchbdbx366qmz8v8wcyg"))))
     (properties `((upstream-name . "gam")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 8200e698721aec393786e249fa1d9a74294c552b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:03 +0200
Subject: gnu: r-nleqslv: Update to 3.3.3.

* gnu/packages/cran.scm (r-nleqslv): Update to 3.3.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index b71c0d6613..5eca8c3770 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -11764,13 +11764,13 @@ (define-public r-mhsmm
 (define-public r-nleqslv
   (package
     (name "r-nleqslv")
-    (version "3.3.2")
+    (version "3.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "nleqslv" version))
        (sha256
-        (base32 "1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"))))
+        (base32 "0cy65bqkmnnr8v0x1cag84caxwdxyr0yw4w443apxzfxjp7dyiif"))))
     (build-system r-build-system)
     (native-inputs (list gfortran))
     (home-page "https://cran.r-project.org/web/packages/nleqslv/")
-- 
cgit v1.2.3


From e1714c11e102cd7f8eb65c51510b5b7dbc9501a9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:03 +0200
Subject: gnu: r-multcomp: Update to 1.4-20.

* gnu/packages/cran.scm (r-multcomp): Update to 1.4-20.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5eca8c3770..30b19f8bf4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12370,14 +12370,14 @@ (define-public r-th-data
 (define-public r-multcomp
   (package
     (name "r-multcomp")
-    (version "1.4-19")
+    (version "1.4-20")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "multcomp" version))
        (sha256
         (base32
-         "0mz5wdqrqpp2gqijfpp9rgfbq8yvxki4is8fbbc4qwdwryqp6d7h"))))
+         "1z1cqklahnp4qi48r335xlqvw7h7xbjrlpb4pjky9gc987xf92rj"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-codetools r-mvtnorm r-sandwich r-survival r-th-data))
-- 
cgit v1.2.3


From a8427f0a63ef81c88c9017994012d93cfa7379b4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:04 +0200
Subject: gnu: r-emmeans: Update to 1.8.0.

* gnu/packages/cran.scm (r-emmeans): Update to 1.8.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 30b19f8bf4..39c5d97c17 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12415,14 +12415,14 @@ (define-public r-multcompview
 (define-public r-emmeans
   (package
     (name "r-emmeans")
-    (version "1.7.5")
+    (version "1.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "emmeans" version))
        (sha256
         (base32
-         "04zy4fb5v3l5zi74bgch8l7mzf2zg16w303k6kp7hwqjlfzh6zms"))))
+         "0xdvbjcywmwk6n8xbp55n92lmqz7wbc938gmv7lbg96hkf9kc993"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-estimability r-mvtnorm r-numderiv r-xtable))
-- 
cgit v1.2.3


From e6231aec751663cd71d4a7cd7508c184f328ad16 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:04 +0200
Subject: gnu: r-glmmtmb: Update to 1.1.4.

* gnu/packages/cran.scm (r-glmmtmb): Update to 1.1.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 39c5d97c17..da0473497e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12614,14 +12614,14 @@ (define-public r-sjstats
 (define-public r-glmmtmb
   (package
     (name "r-glmmtmb")
-    (version "1.1.3")
+    (version "1.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "glmmTMB" version))
        (sha256
         (base32
-         "0xdjc3gx0cj098rrjzlsy9cccxzfvn029xh4ycpya4xjhxsykldr"))))
+         "1ldly6qn8iwqr41ndqlwsdz4v2n36giavsmx33vybn9g7r2fq4m7"))))
     (properties `((upstream-name . "glmmTMB")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From a041d1d9deccd99ed09cfae50d394e3aedbdfb77 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:04 +0200
Subject: gnu: r-ggeffects: Update to 1.1.3.

* gnu/packages/cran.scm (r-ggeffects): Update to 1.1.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index da0473497e..24dd02f7d7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12700,14 +12700,14 @@ (define-public r-performance
 (define-public r-ggeffects
   (package
     (name "r-ggeffects")
-    (version "1.1.2")
+    (version "1.1.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggeffects" version))
        (sha256
         (base32
-         "01yyfw7fkbxrp0gpwni5y8m4w9l3xckwc3crnvy1fqs1d6gwx3xx"))))
+         "1h60s10b1b5ciqg125mfnhq7nf2paq9svs2lfgwpwdvs4f8l4aq7"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-insight r-mass r-sjlabelled))
-- 
cgit v1.2.3


From c712e0e6a43db0d03a7472f6ee773ee0a0f71002 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:04 +0200
Subject: gnu: r-sjplot: Update to 2.8.11.

* gnu/packages/cran.scm (r-sjplot): Update to 2.8.11.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 24dd02f7d7..265044d3d3 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12754,13 +12754,13 @@ (define-public r-effectsize
 (define-public r-sjplot
   (package
     (name "r-sjplot")
-    (version "2.8.10")
+    (version "2.8.11")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sjPlot" version))
        (sha256
-        (base32 "1rnwhh271xj8xgvvlpqw9ain56mfz37fvl7f6jq9nzx9jxx95bjd"))))
+        (base32 "05iimcf1if1cx9bmsjb6f5gcq58hjiw10vx7kqd4nqnyhzcvy8yr"))))
     (properties `((upstream-name . "sjPlot")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From cc5ddcbd6d8973a5543d1eb0ad0f247b955ddfc0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:04 +0200
Subject: gnu: r-gert: Update to 1.7.0.

* gnu/packages/cran.scm (r-gert): Update to 1.7.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 265044d3d3..768efbdb9e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -12983,14 +12983,14 @@ (define-public r-credentials
 (define-public r-gert
   (package
     (name "r-gert")
-    (version "1.6.0")
+    (version "1.7.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gert" version))
        (sha256
         (base32
-         "0r19vi77yyjw5gbhgjibdysjlszlw2095v14f6sv675zpbp0li4c"))))
+         "1pdqmnlrpbjkqwf9ns2232d3cgyqjkywyd2s8sqinaapnlh87y0x"))))
     (properties `((upstream-name . "gert")))
     (build-system r-build-system)
     (inputs
-- 
cgit v1.2.3


From 7243de5074ca81017d7941731869fe904f185376 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:05 +0200
Subject: gnu: r-rcpphnsw: Update to 0.4.1.

* gnu/packages/cran.scm (r-rcpphnsw): Update to 0.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 768efbdb9e..557d0c2fe2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13628,14 +13628,14 @@ (define-public r-rcppannoy
 (define-public r-rcpphnsw
   (package
     (name "r-rcpphnsw")
-    (version "0.3.0")
+    (version "0.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RcppHNSW" version))
        (sha256
         (base32
-         "01z0plf1i6dyibw4ica8shmijyk1grpqb886hcga72z2cpm4xsx0"))))
+         "0x3w14cz6hkrl8hi6217j0dl65l3yphbzka1dmsvgp3p9waq402g"))))
     (properties `((upstream-name . "RcppHNSW")))
     (build-system r-build-system)
     (propagated-inputs (list r-rcpp))
-- 
cgit v1.2.3


From 04d54256588f73b62fffe47f33a6af44603abb00 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:05 +0200
Subject: gnu: r-rgl: Update to 0.109.6.

* gnu/packages/cran.scm (r-rgl): Update to 0.109.6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 557d0c2fe2..346cc055ed 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13720,14 +13720,14 @@ (define-public r-biocmanager
 (define-public r-rgl
   (package
     (name "r-rgl")
-    (version "0.109.2")
+    (version "0.109.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rgl" version))
        (sha256
         (base32
-         "15rckpi2vzjc45glqk1mibxw1vja9y08hj9id2qd1si2bb708x8i"))))
+         "1jl89v2gwk1d4q3vn7kx8x7abjbgiisfiyrs4d40qixr6iil8hrz"))))
     (build-system r-build-system)
     (native-inputs
      (list pkg-config
-- 
cgit v1.2.3


From 18528e2c2558e01cedfc4db634189d81d9266893 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:05 +0200
Subject: gnu: r-rnifti: Update to 1.4.1.

* gnu/packages/cran.scm (r-rnifti): Update to 1.4.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 346cc055ed..8353c93d3c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14767,14 +14767,14 @@ (define-public r-rnexml
 (define-public r-rnifti
   (package
     (name "r-rnifti")
-    (version "1.4.0")
+    (version "1.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RNifti" version))
        (sha256
         (base32
-         "0kkj9dby85iwnlqb7zwrh1xidlvqip7i1mbgckb5qg4b0a3zgibc"))))
+         "058jzhw91wd4hb9l06mn0ihf1yp2fapz1fyb32w9bjwxq7qxvii2"))))
     (properties `((upstream-name . "RNifti")))
     (build-system r-build-system)
     (inputs (list zlib))
-- 
cgit v1.2.3


From e27dc21c2ad45ea701841f6fb71653baa75aead2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:05 +0200
Subject: gnu: r-spam: Update to 2.9-1.

* gnu/packages/cran.scm (r-spam): Update to 2.9-1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8353c93d3c..88a685e134 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15689,13 +15689,13 @@ (define-public r-dotcall64
 (define-public r-spam
   (package
     (name "r-spam")
-    (version "2.8-0")
+    (version "2.9-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "spam" version))
        (sha256
-        (base32 "1ann2a2ifr3z983fcg1c0pkgmbxz6a0ym5q1dmq1r382bd1pg0fr"))))
+        (base32 "1nvx965vxzs697k9m2l40a15bykflksn9bwa4py1p2wqg6922bn3"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-dotcall64))
-- 
cgit v1.2.3


From 2efe7068a8971944886a8fab1c67e37b24101528 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:06 +0200
Subject: gnu: r-fields: Update to 14.0.

* gnu/packages/cran.scm (r-fields): Update to 14.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 88a685e134..a2bb892278 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -15719,13 +15719,13 @@ (define-public r-spam
 (define-public r-fields
   (package
     (name "r-fields")
-    (version "13.3")
+    (version "14.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "fields" version))
        (sha256
-        (base32 "1hs4k5a9hh0r5fsrnpnvs6wvf78xpjzj8a2j6643dsz73a5q6ln6"))))
+        (base32 "0rjg2yx52f5s1fhg6jbk9lfv92qmjqwd6bwpz9rx1fkml9vy8zch"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-maps r-spam r-viridis))
-- 
cgit v1.2.3


From 1185825784e75d1700d3ddb3871bb913d9fa5007 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:06 +0200
Subject: gnu: r-globals: Update to 0.16.0.

* gnu/packages/cran.scm (r-globals): Update to 0.16.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a2bb892278..e6cd45728f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -16241,14 +16241,14 @@ (define-public r-listenv
 (define-public r-globals
   (package
     (name "r-globals")
-    (version "0.15.1")
+    (version "0.16.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "globals" version))
        (sha256
         (base32
-         "0svsssf8swzsihng6c8wpmn33lxaj4f5xq975ywlr950svmjfz7f"))))
+         "0507lxykjz44yws4s4hb99zb3bn6kn6fy8m87lf2dsm431j40gy5"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-codetools))
-- 
cgit v1.2.3


From 540a61897b5b4868487d4b8e3f65190a0de1315d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:06 +0200
Subject: gnu: r-parallelly: Update to 1.32.1.

* gnu/packages/cran.scm (r-parallelly): Update to 1.32.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e6cd45728f..0ca055b68b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -16265,14 +16265,14 @@ (define-public r-globals
 (define-public r-parallelly
   (package
     (name "r-parallelly")
-    (version "1.32.0")
+    (version "1.32.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "parallelly" version))
        (sha256
         (base32
-         "0yg1hmgkp81ihgwqaynqh0jgki2mkdy78j4fgjmqvc1ig5ga774h"))))
+         "146a9i999vrflr4g1fph1pgkl4bq0dw102bjw8pp1zy7kbsqbiii"))))
     (properties `((upstream-name . "parallelly")))
     (build-system r-build-system)
     (home-page "https://github.com/HenrikBengtsson/parallelly")
-- 
cgit v1.2.3


From c205c762889648c70f1078fb453ef66a70c6aad0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:06 +0200
Subject: gnu: r-future: Update to 1.27.0.

* gnu/packages/cran.scm (r-future): Update to 1.27.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0ca055b68b..acb298b28f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -16293,14 +16293,14 @@ (define-public r-parallelly
 (define-public r-future
   (package
     (name "r-future")
-    (version "1.26.1")
+    (version "1.27.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "future" version))
        (sha256
         (base32
-         "1mchjdvvwgs8v0iv8z5m6gav3xzvnq11h8qrc7lfnrb2x3d0np53"))))
+         "1ybhbdw158403n6plipgiwkw710pxpnq3mq8pdx5g8q3jibv93nh"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From bfbdad67d5a1ab1c01053e5fe983dc80e73d6621 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:06 +0200
Subject: gnu: r-lavaan: Update to 0.6-12.

* gnu/packages/cran.scm (r-lavaan): Update to 0.6-12.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index acb298b28f..43f9fdf4df 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17036,14 +17036,14 @@ (define-public r-pbivnorm
 (define-public r-lavaan
   (package
     (name "r-lavaan")
-    (version "0.6-11")
+    (version "0.6-12")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "lavaan" version))
        (sha256
         (base32
-         "026k32paf51lpy6zxm9m81zg9szx14j37dxdip6nba334jw97h9c"))))
+         "17h79pnww1mihvlp6ap0r6d8wnly9bwszj13l5dkby0284z2fj40"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-mass r-mnormt r-numderiv r-pbivnorm))
-- 
cgit v1.2.3


From 05c7e5533979cc56d34082568bbc0d5b70a41b34 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:07 +0200
Subject: gnu: r-partitions: Update to 1.10-7.

* gnu/packages/cran.scm (r-partitions): Update to 1.10-7.
[propagated-inputs]: Add r-rdpack.
---
 gnu/packages/cran.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 43f9fdf4df..d832d797ce 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17523,17 +17523,17 @@ (define-public r-sets
 (define-public r-partitions
   (package
     (name "r-partitions")
-    (version "1.10-4")
+    (version "1.10-7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "partitions" version))
        (sha256
         (base32
-         "1ik7cj2yfybx4v847nvnjrbkd0k66pfqqv6lkygfnlrldi0r205i"))))
+         "1kxiy1wl7dr39kyfg2y9hd67s32knd83r2jsb7j9p3vg8iqq7yqb"))))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-gmp r-mathjaxr r-polynom r-sets))
+     (list r-gmp r-mathjaxr r-polynom r-rdpack r-sets))
     (home-page "https://cran.r-project.org/web/packages/partitions")
     (synopsis "Additive partitions of integers")
     (description
-- 
cgit v1.2.3


From 8776d5ba2c2ac08cf674b817b3793a09ef48674c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:07 +0200
Subject: gnu: r-sf: Update to 1.0-8.

* gnu/packages/cran.scm (r-sf): Update to 1.0-8.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d832d797ce..7728966128 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -17895,14 +17895,14 @@ (define-public r-s2
 (define-public r-sf
   (package
     (name "r-sf")
-    (version "1.0-7")
+    (version "1.0-8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "sf" version))
        (sha256
         (base32
-         "0lsl4rh4lbv386hxlsnnwsjb5x1n9d3z0ckjmxakmmrqjjmiywyh"))))
+         "0cl7m47ar3iw95rpwpmjl23frdbscxa15q39mlzmwswxwy871p1x"))))
     (build-system r-build-system)
     (inputs
      (list gdal geos proj sqlite zlib))
-- 
cgit v1.2.3


From 1a95e6b0f6f1967d2eaa442beab9162e230e7658 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:07 +0200
Subject: gnu: r-optparse: Update to 1.7.3.

* gnu/packages/cran.scm (r-optparse): Update to 1.7.3.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7728966128..420ac7143f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -18404,14 +18404,14 @@ (define-public r-bookdown
 (define-public r-optparse
   (package
     (name "r-optparse")
-    (version "1.7.1")
+    (version "1.7.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "optparse" version))
        (sha256
         (base32
-         "1rqz0y4r94y3mwbb9kyz97cjqpnprka96qbncvbnbmgg2d630kij"))))
+         "1v87db7fm494dwxvdsnl1m2kj84nplq7pkh0g41najhx0npy31v2"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-getopt))
-- 
cgit v1.2.3


From 5464de5328878312ae309976c5dffbe085c1e42a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:07 +0200
Subject: gnu: r-farver: Update to 2.1.1.

* gnu/packages/cran.scm (r-farver): Update to 2.1.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 420ac7143f..d080fd11d0 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -18821,14 +18821,14 @@ (define-public r-gridgraphics
 (define-public r-farver
   (package
     (name "r-farver")
-    (version "2.1.0")
+    (version "2.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "farver" version))
        (sha256
         (base32
-         "1x6ffwxqbrwlylnk995jz2a6nz2y9z59jaq0ncpni7q40w367j75"))))
+         "1klnr73fhm7n46q85in1v9gi99y6rcdzzg4h4wvnbx23lxndmkqd"))))
     (build-system r-build-system)
     (home-page "https://github.com/thomasp85/farver")
     (synopsis "Vectorized color conversion and comparison")
-- 
cgit v1.2.3


From e0c4e49e09f88de554c26b074611fcac8eccdbd4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:08 +0200
Subject: gnu: r-ggraph: Update to 2.0.6.

* gnu/packages/cran.scm (r-ggraph): Update to 2.0.6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d080fd11d0..4a06611c32 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -19082,14 +19082,14 @@ (define-public r-europepmc
 (define-public r-ggraph
   (package
     (name "r-ggraph")
-    (version "2.0.5")
+    (version "2.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "ggraph" version))
        (sha256
         (base32
-         "0m4n8iw2b9jk8hcy5blg5w59zsqcpsbv27wbw598dvljpafx8sp3"))))
+         "02nl92vgyp5pc61r14mmmbfhg5nhb6fibjjb3djfag2ahc6wj2kv"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-digest
-- 
cgit v1.2.3


From 684601c5d307dcdc39bbf966fa2c942b79ebe124 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:08 +0200
Subject: gnu: r-terra: Update to 1.6-7.

* gnu/packages/cran.scm (r-terra): Update to 1.6-7.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4a06611c32..ace15b73ac 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -21075,14 +21075,14 @@ (define-public r-graphlayouts
 (define-public r-terra
   (package
     (name "r-terra")
-    (version "1.5-34")
+    (version "1.6-7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "terra" version))
        (sha256
         (base32
-         "075azi23gi1b1jxm3s1f1hpc6in7qz4fp38shq9pflfnzbs8ib9w"))))
+         "1p67797i9n4cjk1lp4a84h220428nxv940n1kjg1ysl3chrf0w1l"))))
     (properties `((upstream-name . "terra")))
     (build-system r-build-system)
     (inputs
-- 
cgit v1.2.3


From 2f4b94745211dae4951a7532fe09130f6e1d170d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:08 +0200
Subject: gnu: r-desolve: Update to 1.33.

* gnu/packages/cran.scm (r-desolve): Update to 1.33.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ace15b73ac..40ce29a052 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -21355,13 +21355,13 @@ (define-public r-quadprog
 (define-public r-desolve
   (package
     (name "r-desolve")
-    (version "1.32")
+    (version "1.33")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "deSolve" version))
        (sha256
-        (base32 "1bfr4w760nr7mjhpmf32z39swr6isnn1665cld2d1pdgx8b0yrvl"))))
+        (base32 "115nr3j1zp2016qpk9ab6r8n15zygvlihlmc10ilfznf0ng9gpki"))))
     (properties `((upstream-name . "deSolve")))
     (build-system r-build-system)
     (native-inputs
-- 
cgit v1.2.3


From e2c9780f4c812f97192d8bbbab5fff7ec3402f85 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:08 +0200
Subject: gnu: r-pmcmrplus: Update to 1.9.5.

* gnu/packages/cran.scm (r-pmcmrplus): Update to 1.9.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 40ce29a052..a3b1401a19 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -21384,13 +21384,13 @@ (define-public r-desolve
 (define-public r-pmcmrplus
   (package
     (name "r-pmcmrplus")
-    (version "1.9.4")
+    (version "1.9.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "PMCMRplus" version))
        (sha256
-        (base32 "16m1pdrzjq9vnx5v7zv56mz9r1205rkw92883cxaqbvdpds6dhqy"))))
+        (base32 "15xhwq231vgq9q7pk1r4z11wijn4hgdwcly1n9nxxa05w15x9q33"))))
     (properties `((upstream-name . "PMCMRplus")))
     (build-system r-build-system)
     (inputs (list gmp))
-- 
cgit v1.2.3


From 2bba6299c9f7c6e9cb2d80f4d1106f747330c030 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:08 +0200
Subject: gnu: r-bios2cor: Update to 2.2.1.

* gnu/packages/cran.scm (r-bios2cor): Update to 2.2.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index a3b1401a19..ec49b49e3a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -21507,14 +21507,14 @@ (define-public r-bio3d
 (define-public r-bios2cor
   (package
     (name "r-bios2cor")
-    (version "2.2")
+    (version "2.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Bios2cor" version))
        (sha256
         (base32
-         "1wkj9vr33m9jilidil9jpw5rzr3pf7gkimxdvch22ks4bgkx7l1w"))))
+         "0xj7ab9a463p4a67y0hlv6mfd08xf8didkn2mwrfa7gxjqqvix4z"))))
     (properties `((upstream-name . "Bios2cor")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From ac0d8ed2aa3fa2e3b16a723096669f8a0d0b1d6c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:09 +0200
Subject: gnu: r-accept: Update to 0.9.1.

* gnu/packages/cran.scm (r-accept): Update to 0.9.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ec49b49e3a..628c827465 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -22066,14 +22066,14 @@ (define-public r-reldist
 (define-public r-accept
   (package
     (name "r-accept")
-    (version "0.9.0")
+    (version "0.9.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "accept" version))
        (sha256
         (base32
-         "13kx8fbnbpasjklgbq2rf4n73j2s8rvy5v77ywqhfzln24937qgh"))))
+         "0risdxw17jk3d56q40a78slb1rcj93b6kz71hn5hbwr0iih722gr"))))
     (properties `((upstream-name . "accept")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 4cfd49918e1e6811469644677d7693232e799449 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:09 +0200
Subject: gnu: r-r-filesets: Update to 2.15.0.

* gnu/packages/cran.scm (r-r-filesets): Update to 2.15.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 628c827465..8418ff38d4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -22740,14 +22740,14 @@ (define-public r-r-huge
 (define-public r-r-filesets
   (package
     (name "r-r-filesets")
-    (version "2.14.0")
+    (version "2.15.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "R.filesets" version))
        (sha256
         (base32
-         "08xv8b3c81nf54viyr3w912al18483k5gfnjpg7bxbdfk70dfzbh"))))
+         "14dngx6ffhfvlaixpvlq890nwgil6zyaw8wy3dlcrv001wynzmms"))))
     (properties `((upstream-name . "R.filesets")))
     (build-system r-build-system)
     (arguments
-- 
cgit v1.2.3


From 54350956f2c1db625d5984170dbd108f417229be Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:09 +0200
Subject: gnu: r-fda: Update to 6.0.5.

* gnu/packages/cran.scm (r-fda): Update to 6.0.5.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 8418ff38d4..f3355691a9 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -23488,14 +23488,14 @@ (define-public r-fds
 (define-public r-fda
   (package
     (name "r-fda")
-    (version "6.0.4")
+    (version "6.0.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "fda" version))
        (sha256
         (base32
-         "0r2a1rsg904gz6vwcw5jrji7a7pspkfcxmnl9dswpglkn2dsans2"))))
+         "1wdq35acxavarh7qrxxmdpcjc9jcs56mp3p9rbb4qa35ziv5fi0l"))))
     (properties `((upstream-name . "fda")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 6007b185a3dd82f116698bdd6f024f0be23b69f2 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:09 +0200
Subject: gnu: r-actuar: Update to 3.3-0.

* gnu/packages/cran.scm (r-actuar): Update to 3.3-0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f3355691a9..d53b8c6c3a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -23720,14 +23720,14 @@ (define-public r-expint
 (define-public r-actuar
   (package
     (name "r-actuar")
-    (version "3.2-2")
+    (version "3.3-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "actuar" version))
        (sha256
         (base32
-         "0dhpaivyga0jwvw1csagbx74biy9jfkw4a8sa871579njxl1x7p1"))))
+         "1qi9y2x93pxxbynwl06rbiasm86vb0jh7sckw1dw3s21rsx1f5c5"))))
     (properties `((upstream-name . "actuar")))
     (build-system r-build-system)
     (propagated-inputs (list r-expint))
-- 
cgit v1.2.3


From 4d0ed6317ebd78e99d4ca981c4dade75cb20a2ff Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:09 +0200
Subject: gnu: r-emplik: Update to 1.2.

* gnu/packages/cran.scm (r-emplik): Update to 1.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d53b8c6c3a..5eba3f0163 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24615,14 +24615,14 @@ (define-public r-influencer
 (define-public r-emplik
   (package
     (name "r-emplik")
-    (version "1.1-1")
+    (version "1.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "emplik" version))
        (sha256
         (base32
-         "1kw8g8j075bsicdvgkjf4870rfv5c30gvmw6qkkaz3ki22x74w77"))))
+         "039kz7703ri91j2i93dr8ixap7i63sr72id9zp74cm7ws9pd1b27"))))
     (properties `((upstream-name . "emplik")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 4b216858ccc9989f5eab4033d567c3b4d9250fdc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:10 +0200
Subject: gnu: r-forecast: Update to 8.17.0.

* gnu/packages/cran.scm (r-forecast): Update to 8.17.0.
[propagated-inputs]: Add r-generics.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5eba3f0163..75a5b5c81a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24874,19 +24874,20 @@ (define-public r-fracdiff
 (define-public r-forecast
   (package
     (name "r-forecast")
-    (version "8.16")
+    (version "8.17.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "forecast" version))
        (sha256
         (base32
-         "0zvn44k7npxai8kj0hgxaaqv1hgd8rxicnvj4cg7wfl8ba4yn0cz"))))
+         "01633q2fg4cl8zg61dvsnrk8nk1iknk9jqk7p7xnkypxjckm7zl9"))))
     (properties `((upstream-name . "forecast")))
     (build-system r-build-system)
     (propagated-inputs
      (list r-colorspace
            r-fracdiff
+           r-generics
            r-ggplot2
            r-lmtest
            r-magrittr
-- 
cgit v1.2.3


From 8ebf5f63c768efa112d495e6c3996162de400b2c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:10 +0200
Subject: gnu: r-proxyc: Update to 0.3.0.

* gnu/packages/cran.scm (r-proxyc): Update to 0.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 75a5b5c81a..9607b12667 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -24959,14 +24959,14 @@ (define-public r-xmisc
 (define-public r-proxyc
   (package
     (name "r-proxyc")
-    (version "0.2.4")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "proxyC" version))
        (sha256
         (base32
-         "1mcimswrx1cjjm7wsgkzfrgh3jpf4sncwfvdvg2f14fzfzy7afd6"))))
+         "0n3rjc64b3cbccwjajpzd9gr1frgji6rsylw67xswrr9qxkrm0fd"))))
     (properties `((upstream-name . "proxyC")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 0dbfbd6dba359167a3af89e2a44a5f42b8e74f42 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:10 +0200
Subject: gnu: r-quanteda: Update to 3.2.2.

* gnu/packages/cran.scm (r-quanteda): Update to 3.2.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9607b12667..61a11f67e7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -25073,14 +25073,14 @@ (define-public r-snowballc
 (define-public r-quanteda
   (package
     (name "r-quanteda")
-    (version "3.2.1")
+    (version "3.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "quanteda" version))
        (sha256
         (base32
-         "102wlx6481fskgdr5wv467n29f666q0qg9kjm0ivqfg9xsbvza12"))))
+         "0qb5yl2bxh6mq4xnjviqv8hfy9fxnx4hmxf06icwldpgx15afa31"))))
     (properties `((upstream-name . "quanteda")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 81a02293e8e806a2b9bb15d7ceb29989ddae1a4a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:10 +0200
Subject: gnu: r-matrixextra: Update to 0.1.11.

* gnu/packages/cran.scm (r-matrixextra): Update to 0.1.11.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 61a11f67e7..ea3cb3c03f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -25295,13 +25295,13 @@ (define-public r-matrixcalc
 (define-public r-matrixextra
   (package
     (name "r-matrixextra")
-    (version "0.1.10")
+    (version "0.1.11")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "MatrixExtra" version))
        (sha256
-        (base32 "00f6sgw6p2709gs3df68yr59nvsr429pk9xql71id3kachjzh618"))))
+        (base32 "0d32b8l28ds7162rgbwbg9g206hds1zzv1mqq7aa9m6f9gg8x3am"))))
     (properties `((upstream-name . "MatrixExtra")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 82c6989d3e3eccf2b1cfa4ed8dd6766db69adebd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:11 +0200
Subject: gnu: r-rockchalk: Update to 1.8.157.

* gnu/packages/cran.scm (r-rockchalk): Update to 1.8.157.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index ea3cb3c03f..69f7dd7f63 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -25537,14 +25537,14 @@ (define-public r-kutils
 (define-public r-rockchalk
   (package
     (name "r-rockchalk")
-    (version "1.8.152")
+    (version "1.8.157")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rockchalk" version))
        (sha256
         (base32
-         "1d15jlgcy35pvaicaddd4zrhwm5ajb9yc3jk6dyxm99gc5wcn6h3"))))
+         "13g2rdnxazqfgy653d7vj6w79b2vgnd7bbz0sqn9k4qiig59jh41"))))
     (properties `((upstream-name . "rockchalk")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From c38e68960dd608d172ed71164b6408f95b6bb7ba Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:11 +0200
Subject: gnu: r-bdgraph: Update to 2.68.

* gnu/packages/cran.scm (r-bdgraph): Update to 2.68.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 69f7dd7f63..4455e0c5b6 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -25584,14 +25584,14 @@ (define-public r-lisreltor
 (define-public r-bdgraph
   (package
     (name "r-bdgraph")
-    (version "2.67")
+    (version "2.68")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "BDgraph" version))
        (sha256
         (base32
-         "0s2j4462zlgyjnqvvvxg4lynhmwwnjaw1cr1chzmagfvaj94qhhz"))))
+         "1mixzkk8shcbyrxydhchq483j2jh2icgmdshmrl79a8vsnz9mmrm"))))
     (properties `((upstream-name . "BDgraph")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 460e8a0e7db33e3d3a8b2377b6163971c90d9f6d Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:11 +0200
Subject: gnu: r-rsconnect: Update to 0.8.27.

* gnu/packages/cran.scm (r-rsconnect): Update to 0.8.27.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4455e0c5b6..3268f1130d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -25890,14 +25890,14 @@ (define-public r-packrat
 (define-public r-rsconnect
   (package
     (name "r-rsconnect")
-    (version "0.8.26")
+    (version "0.8.27")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rsconnect" version))
        (sha256
         (base32
-         "1vazdgpha7545h4riz11njbl8azg38i1y1a5nfckfx03v2zapbzs"))))
+         "170niwxcmyvad7qw8k115i5a48x3wiidcd82x9anikf7bxhdai0a"))))
     (properties `((upstream-name . "rsconnect")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From f74c8d242e35bee5ad1fca28403fe453d2343ba1 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:11 +0200
Subject: gnu: r-igraph: Update to 1.3.4.

* gnu/packages/cran.scm (r-igraph): Update to 1.3.4.
[propagated-inputs]: Add r-rlang.
---
 gnu/packages/cran.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3268f1130d..42e4015fda 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -28744,21 +28744,21 @@ (define-public r-diffusionmap
 (define-public r-igraph
   (package
     (name "r-igraph")
-    (version "1.3.2")
+    (version "1.3.4")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "igraph" version))
        (sha256
         (base32
-         "0863gr9k7rvjrm7gz4l35q827jh8802m1q6f51ficgi21qc6cl0g"))))
+         "1kyic5xmwgw5lm30rsvsf1x3m0yxysdlrnw63xn4fh8j4vcc66ms"))))
     (build-system r-build-system)
     (native-inputs
      (list gfortran))
     (inputs
      (list gmp glpk libxml2 zlib))
     (propagated-inputs
-     (list r-magrittr r-matrix r-pkgconfig))
+     (list r-magrittr r-matrix r-pkgconfig r-rlang))
     (home-page "https://igraph.org")
     (synopsis "Network analysis and visualization")
     (description
-- 
cgit v1.2.3


From f8ae59a5663711da14a15992a8d3fdbc07d720b9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:11 +0200
Subject: gnu: r-workflows: Update to 1.0.0.

* gnu/packages/cran.scm (r-workflows): Update to 1.0.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 42e4015fda..3977ba10c2 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -28771,14 +28771,14 @@ (define-public r-igraph
 (define-public r-workflows
   (package
     (name "r-workflows")
-    (version "0.2.6")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "workflows" version))
        (sha256
         (base32
-         "0xhc1j25fjipw8hvcpdbvfm640kp0flwvifj5f7g4n6b3wb8cm6a"))))
+         "0bsizgqin5cya0xibs1nqzadrrxcph8n4bh5vlcfbqqzzkv7cx1b"))))
     (properties `((upstream-name . "workflows")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 8b68ee9a351d4f3b8aef5d395b4def4363396f59 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:12 +0200
Subject: gnu: r-rsample: Update to 1.1.0.

* gnu/packages/cran.scm (r-rsample): Update to 1.1.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3977ba10c2..c35bf498a7 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -28992,14 +28992,14 @@ (define-public r-rlist
 (define-public r-rsample
   (package
     (name "r-rsample")
-    (version "1.0.0")
+    (version "1.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "rsample" version))
        (sha256
         (base32
-         "0n3pzjxdb6s0cbpalhi1sjba6ifrvjjb448dczvryrqjk7pqvby5"))))
+         "1iy61riwjch9z4m6k7whsrkl80sk9sww5lf1np4iq4vdfq6w01jb"))))
     (properties `((upstream-name . "rsample")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From abc8efb0e8766d82827521a2fa651ae02abd8227 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:12 +0200
Subject: gnu: r-tune: Update to 1.0.0.

* gnu/packages/cran.scm (r-tune): Update to 1.0.0.
[propagated-inputs]: Add r-tidyselect.
---
 gnu/packages/cran.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index c35bf498a7..0fdfbd5262 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29083,14 +29083,14 @@ (define-public r-dials
 (define-public r-tune
   (package
     (name "r-tune")
-    (version "0.2.0")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tune" version))
        (sha256
         (base32
-         "05gxlsaqv6sjk11r5g4nkdd6hlb3bnfmc29cx4vln1blha37jx4i"))))
+         "0jh29dy4gwa1fyi01fp1305hkxw1mpkx704j6kydplh8h09rv80p"))))
     (properties `((upstream-name . "tune")))
     (build-system r-build-system)
     (propagated-inputs
@@ -29111,6 +29111,7 @@ (define-public r-tune
            r-rsample
            r-tibble
            r-tidyr
+           r-tidyselect
            r-vctrs
            r-withr
            r-workflows
-- 
cgit v1.2.3


From 7baaf47df6984d3028ea2144a02fb19b02487a36 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:12 +0200
Subject: gnu: r-workflowsets: Update to 1.0.0.

* gnu/packages/cran.scm (r-workflowsets): Update to 1.0.0.
[propagated-inputs]: Add r-glue, r-parsnip, and r-pillar.
---
 gnu/packages/cran.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0fdfbd5262..6503229f6b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29128,14 +29128,14 @@ (define-public r-tune
 (define-public r-workflowsets
   (package
     (name "r-workflowsets")
-    (version "0.2.1")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "workflowsets" version))
        (sha256
         (base32
-         "0q42nhnw0mbivadcfb07v71fp39x8fcnjipvn5l5yhjzc56cfxi8"))))
+         "12wj0m6kqnjh8k5k14kqh40wf14gzyg5l3shhbpr2lvk87l9ssqq"))))
     (properties `((upstream-name . "workflowsets")))
     (build-system r-build-system)
     (propagated-inputs
@@ -29144,7 +29144,10 @@ (define-public r-workflowsets
            r-hardhat
            r-generics
            r-ggplot2
+           r-glue
            r-lifecycle
+           r-parsnip
+           r-pillar
            r-prettyunits
            r-purrr
            r-rlang
-- 
cgit v1.2.3


From bacd9de0ae33c73251a6139b8ba779a1259f3418 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:12 +0200
Subject: gnu: r-modeldata: Update to 1.0.0.

* gnu/packages/cran.scm (r-modeldata): Update to 1.0.0.
[propagated-inputs]: Add r-dplyr, r-mass, r-purrr, r-rlang, and r-tibble.
---
 gnu/packages/cran.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6503229f6b..f1053e7c9c 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29482,16 +29482,22 @@ (define-public r-infer
 (define-public r-modeldata
   (package
     (name "r-modeldata")
-    (version "0.1.1")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "modeldata" version))
        (sha256
         (base32
-         "0jgrwf9k8p9j3ywg3yv2wzwsx3snlwm3dd9vfqwhlr7j63jg3cm4"))))
+         "16ad8g86alahirgmp8bhb6v1ghayw965bdz5mrpnq7nnncazaqcm"))))
     (properties `((upstream-name . "modeldata")))
     (build-system r-build-system)
+    (propagated-inputs
+     (list r-dplyr
+           r-mass
+           r-purrr
+           r-rlang
+           r-tibble))
     (home-page "https://modeldata.tidymodels.org")
     (synopsis "Data sets useful for modeling packages")
     (description
-- 
cgit v1.2.3


From 5ddccfa8b7af64ed218f66f63b7dd967a507c785 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:13 +0200
Subject: gnu: r-tidymodels: Update to 1.0.0.

* gnu/packages/cran.scm (r-tidymodels): Update to 1.0.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index f1053e7c9c..d0aaab46c5 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29534,14 +29534,14 @@ (define-public r-conflicted
 (define-public r-tidymodels
   (package
     (name "r-tidymodels")
-    (version "0.2.0")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tidymodels" version))
        (sha256
         (base32
-         "1xkv4s4kn7k9137svb39zrm5302gxpxyp1jv5bb6z0xrvj5wwa4i"))))
+         "1zqdq7zwmhc19zs77x27l5ja01rhj01v8dw182j8jhy49h0alyz3"))))
     (properties `((upstream-name . "tidymodels")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 8cc19bef26164dce12609881c5535ce04f7653c9 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:13 +0200
Subject: gnu: r-qtl: Update to 1.52.

* gnu/packages/cran.scm (r-qtl): Update to 1.52.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d0aaab46c5..7cf9b26e55 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -29726,14 +29726,14 @@ (define-public r-perm
 (define-public r-qtl
   (package
     (name "r-qtl")
-    (version "1.50")
+    (version "1.52")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "qtl" version))
        (sha256
         (base32
-         "1mcy9wlp5lj5f3z4mf3n5li7x32vj67rmhjnzsp8fhfw0ipnaf1d"))))
+         "0q49g3ar1451whsl6ig7kz4mg8s9zxlcvgkj4ivyw4995wbwc2ij"))))
     (build-system r-build-system)
     (home-page "https://rqtl.org/")
     (synopsis "R package for analyzing QTL experiments in genetics")
-- 
cgit v1.2.3


From a59a1e976400876b2d35f0893a257bd8d0919164 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:13 +0200
Subject: gnu: r-mlr3measures: Update to 0.5.0.

* gnu/packages/cran.scm (r-mlr3measures): Update to 0.5.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7cf9b26e55..bb6521d217 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30326,13 +30326,13 @@ (define-public r-mhg
 (define-public r-mlr3measures
   (package
     (name "r-mlr3measures")
-    (version "0.4.1")
+    (version "0.5.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "mlr3measures" version))
               (sha256
                (base32
-                "1kbw3xd7c9x65v9zzs8i5skmrvl0mf2wsbyssmiif0lvrbzfhcmb"))))
+                "0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-checkmate r-prroc))
-- 
cgit v1.2.3


From 320cf6b189163ef64e40a8c3f74cfef50f512efe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:13 +0200
Subject: gnu: r-paradox: Update to 0.10.0.

* gnu/packages/cran.scm (r-paradox): Update to 0.10.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bb6521d217..d0b34a127d 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30433,13 +30433,13 @@ (define-public r-mlr3ordinal
 (define-public r-paradox
   (package
     (name "r-paradox")
-    (version "0.9.0")
+    (version "0.10.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "paradox" version))
               (sha256
                (base32
-                "0fzq59903fklgj3kblnpzasy13a82s72c1qjsy7d1m0fyj28ahdw"))))
+                "08h92wk8splf0w3rach9zbk3xz13phgcd1yybmgbs0sj4vx93whd"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-backports r-checkmate r-data-table r-mlr3misc r-r6))
-- 
cgit v1.2.3


From d16106e74417019b2a7aacb277243697dfb85166 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:14 +0200
Subject: gnu: r-mlr3: Update to 0.13.4.

* gnu/packages/cran.scm (r-mlr3): Update to 0.13.4.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index d0b34a127d..109117953a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30454,13 +30454,13 @@ (define-public r-paradox
 (define-public r-mlr3
   (package
     (name "r-mlr3")
-    (version "0.13.3")
+    (version "0.13.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "mlr3" version))
               (sha256
                (base32
-                "010kl51zsgpc0qv63g1fg9kiw9m0wzqskcr14f1j8b9zi1lwi0bf"))))
+                "13g0krjry0da1yfm6hrdq63ga5rwag5lkgp375394michiipnbwk"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-r6
-- 
cgit v1.2.3


From 06fd18d0eaf6a1443c1456dbc0254600dc005aab Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:14 +0200
Subject: gnu: r-downlit: Update to 0.4.2.

* gnu/packages/cran.scm (r-downlit): Update to 0.4.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 109117953a..6e0a81a2b1 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30868,14 +30868,14 @@ (define-public r-ragg
 (define-public r-downlit
   (package
     (name "r-downlit")
-    (version "0.4.1")
+    (version "0.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "downlit" version))
        (sha256
         (base32
-         "1h9jjrrfm1k4lz7hlg9qvqny5s1qq3p4l9pzsy6vqg4zmh2nb85v"))))
+         "0g3yncj3gmaqsc6cw7g9slgvd0kfk2414yz5m1dilk8h15lzdprk"))))
     (properties `((upstream-name . "downlit")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 44a2b13013e2f5bbc43f1a81592281aadc138ad4 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:14 +0200
Subject: gnu: r-pkgdown: Update to 2.0.6.

* gnu/packages/cran.scm (r-pkgdown): Update to 2.0.6.
[propagated-inputs]: Remove r-crayon; add r-cli.
---
 gnu/packages/cran.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 6e0a81a2b1..0385ff7c76 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -30902,21 +30902,21 @@ (define-public r-downlit
 (define-public r-pkgdown
   (package
     (name "r-pkgdown")
-    (version "2.0.5")
+    (version "2.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pkgdown" version))
        (sha256
         (base32
-         "1bk10jh01v4yqzmpvhs2iw9hwwj0nldskbm2942hjx3xf08y1q4i"))))
+         "0sbz3kzd0hbdnszylsb281arldn2z1c9yxifhj4zv2dilp46b6nj"))))
     (properties `((upstream-name . "pkgdown")))
     (build-system r-build-system)
     (inputs (list pandoc))
     (propagated-inputs
      (list r-bslib
            r-callr
-           r-crayon
+           r-cli
            r-desc
            r-digest
            r-downlit
-- 
cgit v1.2.3


From 99722cdbc10ec481afcf3069ae2f79ad7dd08ccb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:14 +0200
Subject: gnu: r-pdftools: Update to 3.3.0.

* gnu/packages/cran.scm (r-pdftools): Update to 3.3.0.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 0385ff7c76..e45fc1c847 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -31373,14 +31373,14 @@ (define-public r-qpdf
 (define-public r-pdftools
   (package
     (name "r-pdftools")
-    (version "3.2.1")
+    (version "3.3.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pdftools" version))
        (sha256
         (base32
-         "1b9ppdndvlf8nl0i3xy1rx4f9j0j8ic6q9n0c4zn3rv6jdy8zqfi"))))
+         "151f7vaznxigwka4qhp17v4gnahm245rfgcvb8j132vix7md44q9"))))
     (properties `((upstream-name . "pdftools")))
     (build-system r-build-system)
     (inputs (list zlib poppler))
-- 
cgit v1.2.3


From 4b64e712fc8bb03b5d1e4d605c514c5987e9bd3e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:14 +0200
Subject: gnu: r-stars: Update to 0.5-6.

* gnu/packages/cran.scm (r-stars): Update to 0.5-6.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index e45fc1c847..9c90786816 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -31528,14 +31528,14 @@ (define-public r-lwgeom
 (define-public r-stars
   (package
     (name "r-stars")
-    (version "0.5-5")
+    (version "0.5-6")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "stars" version))
         (sha256
           (base32
-            "0hcbzr8c7wk30qjwrvx6bflzwkjpms79pavaxawnq1h8kry5fngk"))))
+            "0qcli9bangpym4yp96yfibd5f4li5qw1622jnbvzfd9n8aakqhg0"))))
     (properties `((upstream-name . "stars")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 47b36a2da509a525336d4a35831d96cc1562f48a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:15 +0200
Subject: gnu: r-textplot: Update to 0.2.2.

* gnu/packages/cran.scm (r-textplot): Update to 0.2.2.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 9c90786816..cedb90c71e 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -31817,14 +31817,14 @@ (define-public r-qpcr
 (define-public r-textplot
   (package
     (name "r-textplot")
-    (version "0.2.1")
+    (version "0.2.2")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "textplot" version))
         (sha256
           (base32
-            "10nxh9axhy6kyp6f3rz7smq08yl35ydx9jx47bs7i0bmcl2kwxvl"))))
+            "1ag2h365zsx0fxbl05s2yfhf1q13p40akvbqg4qwsb5ynh2a56bf"))))
     (properties `((upstream-name . "textplot")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 2304e8d7311acfeb202198dac9a02fb431c43e0e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:15 +0200
Subject: gnu: r-rapiserialize: Update to 0.1.1.

* gnu/packages/cran.scm (r-rapiserialize): Update to 0.1.1.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index cedb90c71e..5cc9ef524b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -32286,14 +32286,14 @@ (define-public r-stringfish
 (define-public r-rapiserialize
   (package
     (name "r-rapiserialize")
-    (version "0.1.0")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "RApiSerialize" version))
        (sha256
         (base32
-         "0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"))))
+         "0gkix6s5hb7pdbb8miyz36hghx59hhwxql0slqnlr5nakh31klxp"))))
     (properties `((upstream-name . "RApiSerialize")))
     (build-system r-build-system)
     (home-page
-- 
cgit v1.2.3


From f7c1973eea8daf73594edb4203c285490513d9db Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:15 +0200
Subject: gnu: r-dismo: Update to 1.3-8.

* gnu/packages/cran.scm (r-dismo): Update to 1.3-8.
---
 gnu/packages/cran.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 5cc9ef524b..da0d52f92f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -32662,14 +32662,14 @@ (define-public r-rfigshare
 (define-public r-dismo
   (package
     (name "r-dismo")
-    (version "1.3-5")
+    (version "1.3-8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "dismo" version))
        (sha256
         (base32
-         "1rqf6h4imbqvs7hjd1k4my6154wg0qnmnp5byan403rcshr1jbl1"))))
+         "17dwk4fv9l903fp38ab9arc4dfyrj1sbllfxlybkdwm9lpsn1qv6"))))
     (properties `((upstream-name . "dismo")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 3731d402c4c60187eb471375d30a584372046383 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:15 +0200
Subject: gnu: r-paws-common: Update to 0.4.0.

* gnu/packages/cran.scm (r-paws-common): Update to 0.4.0.
[propagated-inputs]: Add r-curl.
---
 gnu/packages/cran.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index da0d52f92f..7a3868ed7b 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -32720,18 +32720,18 @@ (define-public r-zoon
 (define-public r-paws-common
   (package
     (name "r-paws-common")
-    (version "0.3.17")
+    (version "0.4.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "paws.common" version))
        (sha256
         (base32
-         "1dg18hwnrjd6m1vjcxfs2vm1zxciivf4vzhq0z76dmmiqz2yjm28"))))
+         "1zlv0ahv633z1fwx1syajzqg49zd9hs537df53gm2qch8b66y4bh"))))
     (properties `((upstream-name . "paws.common")))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-base64enc r-digest r-httr r-jsonlite r-xml2))
+     (list r-base64enc r-curl r-digest r-httr r-jsonlite r-xml2))
     (home-page "https://cran.r-project.org/package=paws.common")
     (synopsis "Paws low-level Amazon Web Services API")
     (description
-- 
cgit v1.2.3


From 1679eb939e7fc0592d31ec2c5cee0792e9225ead Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:15 +0200
Subject: gnu: r-mass: Update to 7.3-58.1.

* gnu/packages/statistics.scm (r-mass): Update to 7.3-58.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1ef7efe266..7f46e25b62 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -507,14 +507,14 @@ (define-public r-boot
 (define-public r-mass
   (package
     (name "r-mass")
-    (version "7.3-57")
+    (version "7.3-58.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "MASS" version))
        (sha256
         (base32
-         "13asg609szqq8d1a4ybr508qcanr9gvqd439vfras6mw0l0qi2xx"))))
+         "080l4gqkaw9r4s7b0q9hda489rn24p4ma5xf4g8405qkzgif817p"))))
     (properties `((upstream-name . "MASS")))
     (build-system r-build-system)
     (home-page "http://www.stats.ox.ac.uk/pub/MASS4/")
-- 
cgit v1.2.3


From f06d5289383394d6b199d439af929d6dc9acb0b6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-estimability: Update to 1.4.1.

* gnu/packages/statistics.scm (r-estimability): Update to 1.4.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 7f46e25b62..27b0df7e0d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -974,13 +974,13 @@ (define-public r-digest
 (define-public r-estimability
   (package
     (name "r-estimability")
-    (version "1.3")
+    (version "1.4.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "estimability" version))
               (sha256
                (base32
-                "0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"))))
+                "090i1xwdp4fwj8jr8nk13w49516lfkk5mq1w7l0lff9g8lgaynn6"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/estimability")
     (synopsis "Tools for assessing estimability of linear predictions")
-- 
cgit v1.2.3


From f239dff4f32f5f7598650587343db19a33c7af74 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-stringi: Update to 1.7.8.

* gnu/packages/statistics.scm (r-stringi): Update to 1.7.8.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 27b0df7e0d..2546d34879 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1160,14 +1160,14 @@ (define-public r-sendmailr
 (define-public r-stringi
   (package
     (name "r-stringi")
-    (version "1.7.6")
+    (version "1.7.8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "stringi" version))
        (sha256
         (base32
-         "1v0rj5svgvn1mlf69yzm6jm00fxmrsxazs9xymzrf0apxjpxb8qf"))))
+         "074b8wky3dhm4vcdqliwz6cqw20ah2x4dcasvnidilbfrnqii2ak"))))
     (build-system r-build-system)
     (inputs (list icu4c))
     (native-inputs (list pkg-config))
-- 
cgit v1.2.3


From c66334e5db326ad054218ae671182e894ed2fef0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-rlang: Update to 1.0.4.

* gnu/packages/statistics.scm (r-rlang): Update to 1.0.4.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 2546d34879..fc79ac2c62 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1756,13 +1756,13 @@ (define-public r-r6
 (define-public r-rlang
   (package
     (name "r-rlang")
-    (version "1.0.3")
+    (version "1.0.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "rlang" version))
               (sha256
                (base32
-                "0ghfbs0sw502hk5amxr8i5lwgv6vyqcq2a2liqf57k9dm6qlik04"))))
+                "15l65as409b3y9sn1jm7lb2019jsp19w6qxsgvimr1badka8kdqz"))))
     (build-system r-build-system)
     (home-page "http://rlang.tidyverse.org")
     (synopsis "Functions for base types, core R and Tidyverse features")
-- 
cgit v1.2.3


From fbf2e460e14786a0fca4f462ad025291dbbd6ef6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-tibble: Update to 3.1.8.

* gnu/packages/statistics.scm (r-tibble): Update to 3.1.8.
[propagated-inputs]: Remove r-ellipsis.
---
 gnu/packages/statistics.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index fc79ac2c62..7e2fb56dfc 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1774,18 +1774,17 @@ (define-public r-rlang
 (define-public r-tibble
   (package
     (name "r-tibble")
-    (version "3.1.7")
+    (version "3.1.8")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "tibble" version))
        (sha256
         (base32
-         "0wn8j7slfqrdl126g536sg1xkrvjd9rlsk0bjqk3b03nyj8hi9g1"))))
+         "1spdbk5s0wlipfq8jc08p2mk5fq2ql9hm8iwwlfzdlhqbl3hxwxc"))))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-ellipsis
-           r-fansi
+     (list r-fansi
            r-lifecycle
            r-magrittr
            r-pkgconfig
-- 
cgit v1.2.3


From 303a2680010e91d222be63ff613b7e03dee5af43 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-locfit: Update to 1.5-9.6.

* gnu/packages/statistics.scm (r-locfit): Update to 1.5-9.6.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 7e2fb56dfc..df2b1b60be 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1922,14 +1922,14 @@ (define-public r-formula
 (define-public r-locfit
   (package
     (name "r-locfit")
-    (version "1.5-9.5")
+    (version "1.5-9.6")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "locfit" version))
        (sha256
         (base32
-         "08yywswywmvyys8380576n43h3xyiviq1p2392zcivlbknnjp7zx"))))
+         "0xilf6gp3m8xla2fvxr491j31pvim707mnhswvm9yxnb0d09xs0y"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-lattice))
-- 
cgit v1.2.3


From 2ec831ce86b8b2f760ed65d63438af6389b78cdd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-roxygen2: Update to 7.2.1.

* gnu/packages/statistics.scm (r-roxygen2): Update to 7.2.1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index df2b1b60be..0dce35c30e 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2398,13 +2398,13 @@ (define-public r-commonmark
 (define-public r-roxygen2
   (package
     (name "r-roxygen2")
-    (version "7.2.0")
+    (version "7.2.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "roxygen2" version))
               (sha256
                (base32
-                "12s436jn7aagjpc2lnlrhzwqgsdl8lbbwhkddih6rnxrczawzgrf"))))
+                "08fs5jw6npriqsr8pribs2yy1r8163xzcv4gmlgmcaywj4jk9w6j"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-brew
-- 
cgit v1.2.3


From d6cf8514c8f4649de40df83a38a7d6bebd03b12e Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-devtools: Update to 2.4.4.

* gnu/packages/statistics.scm (r-devtools): Update to 2.4.4.
[propagated-inputs]: Remove r-callr, r-httr, and r-rstudioapi; add r-miniui, r-pkgdown,
r-profvis, and r-urlchecker.
---
 gnu/packages/statistics.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0dce35c30e..fd3843dd92 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2543,33 +2543,34 @@ (define-public r-rstudioapi
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "2.4.3")
+    (version "2.4.4")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "0kvbw218jp8pd2lgdjyn94v2iji75s385hkn1qbikcm0pjlmj8g4"))))
+                "0kckjr12qi8nw498x3iw648pllz63j5p6fhpv8z8jc4z4sfpbmmc"))))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-callr
-           r-cli
+     (list r-cli
            r-desc
            r-ellipsis
            r-fs
-           r-httr
            r-lifecycle
            r-memoise
+           r-miniui
            r-pkgbuild
+           r-pkgdown
            r-pkgload
+           r-profvis
            r-rcmdcheck
            r-remotes
            r-rlang
            r-roxygen2
-           r-rstudioapi
            r-rversions
            r-sessioninfo
            r-testthat
+           r-urlchecker
            r-usethis
            r-withr))
     (native-inputs
-- 
cgit v1.2.3


From c3d510f27ff7ea4e3d791f05a2aeaa5bb45ad190 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:16 +0200
Subject: gnu: r-latticeextra: Update to 0.6-30.

* gnu/packages/statistics.scm (r-latticeextra): Update to 0.6-30.
[propagated-inputs]: Add r-interp and r-mass.
---
 gnu/packages/statistics.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index fd3843dd92..9e3888ab54 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2693,18 +2693,23 @@ (define-public r-gridbase
 (define-public r-latticeextra
   (package
     (name "r-latticeextra")
-    (version "0.6-29")
+    (version "0.6-30")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "latticeExtra" version))
        (sha256
         (base32
-         "04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"))))
+         "1vcy4xr6c53nbvnxikjnlf5kd3n5hf4d8dzj5d41hj322dlsfl65"))))
     (properties `((upstream-name . "latticeExtra")))
     (build-system r-build-system)
     (propagated-inputs
-     (list r-jpeg r-lattice r-png r-rcolorbrewer))
+     (list r-interp
+           r-jpeg
+           r-lattice
+           r-mass
+           r-png
+           r-rcolorbrewer))
     (home-page "http://latticeextra.r-forge.r-project.org/")
     (synopsis "Extra graphical utilities based on lattice")
     (description
-- 
cgit v1.2.3


From ee4885080b9acd87f47399a00b52b5b3840422fe Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-rsqlite: Update to 2.2.15.

* gnu/packages/statistics.scm (r-rsqlite): Update to 2.2.15.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 9e3888ab54..0eb40458c4 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2928,13 +2928,13 @@ (define-public r-blob
 (define-public r-rsqlite
   (package
     (name "r-rsqlite")
-    (version "2.2.14")
+    (version "2.2.15")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RSQLite" version))
               (sha256
                (base32
-                "0z307d7rx7blh2apc9dbw9vgad2ldbf9vbdjhmwlj0mwbs3nmqra"))))
+                "1cypz9i85fnp3izk0px9r8s3l1jwn5kmgs2avc0fi3fad1775029"))))
     (properties `((upstream-name . "RSQLite")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 3f87021f62017ca57533b658cbf5bcb967dbdb3b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-rcurl: Update to 1.98-1.8.

* gnu/packages/statistics.scm (r-rcurl): Update to 1.98-1.8.
[inputs]: Add zlib.
---
 gnu/packages/statistics.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0eb40458c4..1948aca7b1 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2958,13 +2958,13 @@ (define-public r-rsqlite
 (define-public r-rcurl
   (package
     (name "r-rcurl")
-    (version "1.98-1.7")
+    (version "1.98-1.8")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "RCurl" version))
               (sha256
                (base32
-                "138qfkw03j0g5wby24811w9f3virz1fxlgkgnavf6gv3c00jvhia"))))
+                "0a4gr264ycy6am4849y79h3vc9vg7cgpizb88v4xw076pyn52fqy"))))
     (properties `((upstream-name . "RCurl")))
     (build-system r-build-system)
     (arguments
@@ -2981,7 +2981,7 @@ (define-public r-rcurl
     (native-inputs
      (list libxml2))
     (inputs
-     (list curl))
+     (list curl zlib))
     (propagated-inputs
      (list r-bitops))
     (home-page "http://www.omegahat.net/RCurl")
-- 
cgit v1.2.3


From 9c6bd7ab1458e08d54f121f88af83570c9c2e312 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-r-cache: Update to 0.16.0.

* gnu/packages/statistics.scm (r-r-cache): Update to 0.16.0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 1948aca7b1..792339997f 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -3996,13 +3996,13 @@ (define-public r-r-utils
 (define-public r-r-cache
   (package
     (name "r-r-cache")
-    (version "0.15.0")
+    (version "0.16.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "R.cache" version))
               (sha256
                (base32
-                "09pipn1974ivjh4sm3n5fjlh31rilf87p30qwq7y25vriyqd7d5d"))))
+                "14cja0d78mzipb94cwgdl00k5r7awjclzxl30c77j6jpc68l0lvq"))))
     (properties `((upstream-name . "R.cache")))
     (build-system r-build-system)
     (arguments
-- 
cgit v1.2.3


From 4bab4761f4368fcdba09f8a69ba4741ae9d40b0f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-gtools: Update to 3.9.3.

* gnu/packages/statistics.scm (r-gtools): Update to 3.9.3.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 792339997f..a22b1260b3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -4593,14 +4593,14 @@ (define-public r-sfsmisc
 (define-public r-gtools
   (package
     (name "r-gtools")
-    (version "3.9.2.2")
+    (version "3.9.3")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gtools" version))
        (sha256
         (base32
-         "0hyqh1r9vxy7hfnir22439k4jlk4adcxdf78ryz5bk06blvqc81m"))))
+         "0criwc0jmbrgaslh2kdjirgdzbf0ycry8yjryi95fb9qgckm7yvs"))))
     (build-system r-build-system)
     (home-page "https://cran.r-project.org/web/packages/gtools")
     (synopsis "Various R programming tools")
-- 
cgit v1.2.3


From 1a479d487864b7d1461c2752d4bcee2432099694 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-pcapp: Update to 2.0-2.

* gnu/packages/statistics.scm (r-pcapp): Update to 2.0-2.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a22b1260b3..d6aa412e61 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5223,14 +5223,14 @@ (define-public r-robustbase
 (define-public r-pcapp
   (package
     (name "r-pcapp")
-    (version "2.0-1")
+    (version "2.0-2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "pcaPP" version))
        (sha256
         (base32
-         "06hjhr0dzdp5yhd421q9scbv6w6bchicbn2bl7am490ncgrf544n"))))
+         "0jxm1cl48bzfi0s0f2b0y0r5nq7x0iypgkasa3v5myhb9sbnd2x1"))))
     (properties `((upstream-name . "pcaPP")))
     (build-system r-build-system)
     (propagated-inputs
-- 
cgit v1.2.3


From 5b4b0628a51311a88e9c92ced843e05d64e3fbac Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-robust: Update to 0.7-1.

* gnu/packages/statistics.scm (r-robust): Update to 0.7-1.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index d6aa412e61..3680e6900f 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5296,14 +5296,14 @@ (define-public r-fit-models
 (define-public r-robust
   (package
     (name "r-robust")
-    (version "0.7-0")
+    (version "0.7-1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "robust" version))
        (sha256
         (base32
-         "1fc4h19b7gn9ya2j2ia8vfgsycwlyc23frj54k11dr45w4qaq6jy"))))
+         "1pv5xvns3p8dpaadf6v0fqz099ml768ahgp271wpiclrcc6cgapg"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-fit-models r-lattice r-mass r-robustbase r-rrcov))
-- 
cgit v1.2.3


From a8ede19b86bfbe36e95f71ee911a813e745e1c45 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-vgam: Update to 1.1-7.

* gnu/packages/statistics.scm (r-vgam): Update to 1.1-7.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 3680e6900f..570231613d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5373,13 +5373,13 @@ (define-public r-fpc
 (define-public r-vgam
   (package
     (name "r-vgam")
-    (version "1.1-6")
+    (version "1.1-7")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "VGAM" version))
        (sha256
-        (base32 "05yl1lbpambwg3i3rqn6aanaym7c3s8g7hi0bph98iyxqnx62sj4"))))
+        (base32 "0zkmj7crkkvi7ki88f6vfn7x8gf0ycrbg13wann7wirj4cwjvid4"))))
     (properties `((upstream-name . "VGAM")))
     (build-system r-build-system)
     (native-inputs
-- 
cgit v1.2.3


From 2b97db5662ce654391a0d442a795a5a1d9908a50 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:17 +0200
Subject: gnu: r-quantreg: Update to 5.94.

* gnu/packages/statistics.scm (r-quantreg): Update to 5.94.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 570231613d..77f54f5723 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5508,13 +5508,13 @@ (define-public r-matrixmodels
 (define-public r-quantreg
   (package
     (name "r-quantreg")
-    (version "5.93")
+    (version "5.94")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "quantreg" version))
        (sha256
-        (base32 "0fg5x6sa8mz2hh9nak0wajh4l6h03x216462vs94rgq0ln24kafl"))))
+        (base32 "1h8p3gzaas8gdvyh13ir8xc92hiybmizb0yhnwk7gvbjp768bmaj"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From 951944928bc3ae5a6dbecbb79f5fef1416de10d3 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:18 +0200
Subject: gnu: r-lme4: Update to 1.1-30.

* gnu/packages/statistics.scm (r-lme4): Update to 1.1-30.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 77f54f5723..b130661e3a 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5567,14 +5567,14 @@ (define-public r-nloptr
 (define-public r-lme4
   (package
     (name "r-lme4")
-    (version "1.1-29")
+    (version "1.1-30")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "lme4" version))
        (sha256
         (base32
-         "09p836an3pap7vdbhf1zkl0a7wc63ax2dc8mjrd6lw64ikj7vnc3"))))
+         "03rhg6cnsvdk06a1yxkivfvfwlx9934nd9q6jnp0bzscnv2dzazx"))))
     (build-system r-build-system)
     (propagated-inputs
      (list r-boot
-- 
cgit v1.2.3


From 1234b52d039effe977cf23c464f5269e9f8fea52 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:18 +0200
Subject: gnu: r-cairo: Update to 1.6-0.

* gnu/packages/statistics.scm (r-cairo): Update to 1.6-0.
---
 gnu/packages/statistics.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index b130661e3a..551c1ba14d 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -5861,14 +5861,14 @@ (define-public r-tsne
 (define-public r-cairo
   (package
     (name "r-cairo")
-    (version "1.5-15")
+    (version "1.6-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Cairo" version))
        (sha256
         (base32
-         "17g8s80h9kc0a4zpb153sprjm6ndjl3gkpb63aq5xh9ickzv2fmv"))))
+         "1lxpmzy6k8y9b6g7x68x0giy8bblxmbc4q136hkzajmailfsqqn7"))))
     (properties `((upstream-name . "Cairo")))
     (build-system r-build-system)
     (inputs
-- 
cgit v1.2.3


From 64c520fef67ecef4cdfe7c85a9c2967821608d63 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:18 +0200
Subject: gnu: r-effects: Update to 4.2-2.

* gnu/packages/statistics.scm (r-effects): Update to 4.2-2.
[native-inputs]: Remove r-car.
---
 gnu/packages/statistics.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 551c1ba14d..f770d4d682 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6637,14 +6637,14 @@ (define-public r-logspline
 (define-public r-effects
   (package
     (name "r-effects")
-    (version "4.2-1")
+    (version "4.2-2")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "effects" version))
         (sha256
           (base32
-            "0h3n2kd43fddy29hlv1nckw3wglykwrgk1hp8khb0pnm2i12b5sk"))))
+            "0nlj79am9a1yg737dhfa8dj1kj2hly9pfknmphsbcvlgxqn35vig"))))
     (properties `((upstream-name . "effects")))
     (build-system r-build-system)
     (propagated-inputs
@@ -6657,7 +6657,7 @@ (define-public r-effects
             r-nnet
             r-survey))
     (native-inputs
-      (list r-knitr r-car))
+      (list r-knitr))
     (home-page "https://www.r-project.org")
     (synopsis
       "Effect Displays for Linear, Generalized Linear, and Other Models")
-- 
cgit v1.2.3


From ee30369c47ca7acbe698aed91d2b0e8a0f1a9fc0 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 12:20:18 +0200
Subject: gnu: r-bayesfactor: Update to 0.9.12-4.4.

* gnu/packages/statistics.scm (r-bayesfactor): Update to 0.9.12-4.4.
[propagated-inputs]: Remove r-gtools.
---
 gnu/packages/statistics.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index f770d4d682..60ec8bc3a3 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -6669,19 +6669,18 @@ (define-public r-effects
 (define-public r-bayesfactor
   (package
     (name "r-bayesfactor")
-    (version "0.9.12-4.3")
+    (version "0.9.12-4.4")
     (source
       (origin
         (method url-fetch)
         (uri (cran-uri "BayesFactor" version))
         (sha256
           (base32
-            "171hbr445v8mq4hqi1k8q3h8zqsccwjv0a2mj98h9b77667ziyfw"))))
+            "02bhlamnkxp9wqi2cp1i0dxmqdf3y3l872ad9z39xwripbi4kc7a"))))
     (properties `((upstream-name . "BayesFactor")))
     (build-system r-build-system)
     (propagated-inputs
       (list r-coda
-            r-gtools
             r-hypergeo
             r-matrix
             r-matrixmodels
-- 
cgit v1.2.3


From fd4b8e987313644dd63717da17ef16e8e18b7f3f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 15:37:55 +0200
Subject: gnu: Add r-omnipathr/devel.

* gnu/packages/bioinformatics.scm (r-omnipathr/devel): New variable.
---
 gnu/packages/bioinformatics.scm | 65 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3a40cc2281..aae25379fd 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11535,6 +11535,71 @@ (define-public r-dyngen
 dynamic cellular processes at single-cell resolution.")
       (license license:expat))))
 
+;; Needed for r-liana
+(define-public r-omnipathr/devel
+  (let ((commit "679bb79e319af246a16968d27d64d8d6937a331a")
+        (revision "1"))
+    (package
+      (name "r-omnipathr")
+      (version (git-version "3.5.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/saezlab/omnipathr")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "10h6lyapyx4ik8r4kx5z2dly46jlf2v57caq4g6i0hzifyz2vgjq"))))
+      (properties `((upstream-name . "OmnipathR")))
+      (build-system r-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'set-HOME
+             (lambda _ (setenv "HOME" "/tmp"))))))
+      (propagated-inputs
+       (list r-checkmate
+             r-crayon
+             r-curl
+             r-digest
+             r-dplyr
+             r-httr
+             r-igraph
+             r-jsonlite
+             r-later
+             r-logger
+             r-magrittr
+             r-progress
+             r-purrr
+             r-rappdirs
+             r-readr
+             r-readxl
+             r-rlang
+             r-rvest
+             r-stringr
+             r-tibble
+             r-tidyr
+             r-tidyselect
+             r-withr
+             r-xml2
+             r-yaml))
+      (native-inputs (list r-knitr))
+      (home-page "https://github.com/saezlab/omnipathr")
+      (synopsis "OmniPath web service client and more")
+      (description
+       "This package provides a client for the OmniPath web service and many
+other resources.  It also includes functions to transform and pretty print
+some of the downloaded data, functions to access a number of other resources
+such as BioPlex, ConsensusPathDB, EVEX, Gene Ontology, Guide to
+Pharmacology (IUPHAR/BPS), Harmonizome, HTRIdb, Human Phenotype Ontology,
+InWeb InBioMap, KEGG Pathway, Pathway Commons, Ramilowski et al. 2015,
+RegNetwork, ReMap, TF census, TRRUST and Vinayagam et al. 2011.  Furthermore,
+OmnipathR features a close integration with the NicheNet method for ligand
+activity prediction from transcriptomics data, and its R implementation
+@code{nichenetr}.")
+      (license license:expat))))
+
 (define-public r-circus
   (package
     (name "r-circus")
-- 
cgit v1.2.3


From 26bdefd172ec04c4f74cfa19585480904b60a9dd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Wed, 10 Aug 2022 15:38:06 +0200
Subject: gnu: Add r-liana.

* gnu/packages/bioinformatics.scm (r-liana): New variable.
---
 gnu/packages/bioinformatics.scm | 52 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index aae25379fd..801c9e1642 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11600,6 +11600,58 @@ (define-public r-omnipathr/devel
 @code{nichenetr}.")
       (license license:expat))))
 
+(define-public r-liana
+  (let ((commit "efb1249af46f576d1d620956053cfa93b2cee961")
+        (revision "1"))
+    (package
+      (name "r-liana")
+      (version (git-version "0.1.5" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/saezlab/liana/")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0z645k26kqrfj5f1s412vwclw1q47h1zfxxrh9ijr30pxhpv6cv0"))))
+      (properties `((upstream-name . "liana")))
+      (build-system r-build-system)
+      (arguments
+       (list
+        #:phases
+        `(modify-phases %standard-phases
+           ;; This is needed to find ~/.config/OmnipathR/omnipathr.yml
+           (add-after 'unpack 'set-HOME
+             (lambda _ (setenv "HOME" "/tmp"))))))
+      (propagated-inputs
+       (list r-complexheatmap
+             r-dplyr
+             r-ggplot2
+             r-magrittr
+             r-omnipathr/devel
+             r-purrr
+             r-rcolorbrewer
+             r-readr
+             r-reticulate
+             r-rlang
+             r-scater
+             r-scran
+             r-scuttle
+             r-seuratobject
+             r-singlecellexperiment
+             r-stringr
+             r-tibble
+             r-tidyr
+             r-tidyselect))
+      (native-inputs (list r-knitr))
+      (home-page "https://github.com/saezlab/liana/")
+      (synopsis "LIANA: a LIgand-receptor ANalysis frAmework")
+      (description
+       "LIANA provides a number of methods and resource for ligand-receptor
+interaction inference from scRNA-seq data.")
+      (license license:gpl3))))
+
 (define-public r-circus
   (package
     (name "r-circus")
-- 
cgit v1.2.3


From 8c5af3376266117fb52555e77d4221a3d69342b7 Mon Sep 17 00:00:00 2001
From: Julien Lepiller 
Date: Sat, 6 Aug 2022 09:48:04 +0200
Subject: gnu: frama-c: Use lablgtk3.

* gnu/packages/maths.scm (frama-c): Build the graphical interface.
---
 gnu/packages/maths.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 52a6d6259f..c79058ab42 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -7526,6 +7526,7 @@ (define-public frama-c
            ocaml-graph
            ocaml-yojson
            ocaml-zarith
+           lablgtk3
            why3))
     (native-search-paths
      (list (search-path-specification
-- 
cgit v1.2.3


From 96465c4421076e51c9f74a303c4646bb0a5cb114 Mon Sep 17 00:00:00 2001
From: Julien Lepiller 
Date: Sat, 6 Aug 2022 17:17:45 +0200
Subject: gnu: ocaml-extlib: Update to 1.7.9.

* gnu/packages/ocaml.scm (ocaml-extlib): Update to 1.7.9.
---
 gnu/packages/ocaml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c532e2a8b5..6d4f8c8836 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -564,14 +564,14 @@ (define-public camlidl
 (define-public ocaml-extlib
   (package
     (name "ocaml-extlib")
-    (version "1.7.8")
+    (version "1.7.9")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://ygrek.org/p/release/ocaml-extlib/"
                                   "extlib-" version ".tar.gz"))
               (sha256
                (base32
-                "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"))))
+                "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"))))
     (build-system ocaml-build-system)
     (arguments
      `(#:phases
-- 
cgit v1.2.3


From d8d4b81147df59542385a79191eb51e3568ae309 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 19:38:48 +0200
Subject: gnu: fuse@2: Prepare for newer glibc.

* gnu/packages/patches/fuse-glibc-2.34.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/linux.scm (fuse)[source](patches): Add the patch.
[arguments]: Add force-bootstrap phase.
[native-inputs]: Add AUTOCONF, AUTOMAKE, GETTEXT-MINIMAL, and LIBTOOL.
---
 gnu/local.mk                               |  3 +-
 gnu/packages/linux.scm                     |  9 +++++-
 gnu/packages/patches/fuse-glibc-2.34.patch | 49 ++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/fuse-glibc-2.34.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index caf5fd68b0..247b9ec34f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1092,7 +1092,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/freedink-engine-fix-sdl-hints.patch	\
   %D%/packages/patches/freeglut-gcc-compat.patch		\
   %D%/packages/patches/freeimage-unbundle.patch		\
-  %D%/packages/patches/fuse-overlapping-headers.patch				\
+  %D%/packages/patches/fuse-glibc-2.34.patch			\
+  %D%/packages/patches/fuse-overlapping-headers.patch		\
   %D%/packages/patches/fxdiv-system-libraries.patch		\
   %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch	\
   %D%/packages/patches/ganeti-disable-version-symlinks.patch	\
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index b868991461..9bfa1951be 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3291,8 +3291,11 @@ (define-public fuse
               (sha256
                (base32
                 "1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh"))
-              (patches (search-patches "fuse-overlapping-headers.patch"))))
+              (patches (search-patches "fuse-overlapping-headers.patch"
+                                       "fuse-glibc-2.34.patch"))))
     (build-system gnu-build-system)
+    (native-inputs
+     (list autoconf automake gettext-minimal libtool))
     (inputs
      (list bash-minimal util-linux))
     (arguments
@@ -3309,6 +3312,10 @@ (define-public fuse
                                               "/lib/udev/rules.d"))
        #:phases
        (modify-phases %standard-phases
+         (add-before 'bootstrap 'force-bootstrap
+           (lambda _
+             ;; Force a bootstrap to make the patch changes effective.
+             (delete-file "configure")))
          (add-before 'build 'set-file-names
            (lambda* (#:key inputs #:allow-other-keys)
              ;; libfuse calls out to mount(8) and umount(8).  Make sure
diff --git a/gnu/packages/patches/fuse-glibc-2.34.patch b/gnu/packages/patches/fuse-glibc-2.34.patch
new file mode 100644
index 0000000000..5f973e2491
--- /dev/null
+++ b/gnu/packages/patches/fuse-glibc-2.34.patch
@@ -0,0 +1,49 @@
+Don't redefine 'closefrom' if available through glibc.
+
+Shamelessly stolen from Gentoo:
+
+  https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch
+
+diff --git a/configure.ac b/configure.ac
+index 9946a0efa..a2d481aa9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,6 +55,7 @@ fi
+ 
+ AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat])
+ AC_CHECK_FUNCS([posix_fallocate])
++AC_CHECK_FUNCS([closefrom])
+ AC_CHECK_MEMBERS([struct stat.st_atim])
+ AC_CHECK_MEMBERS([struct stat.st_atimespec])
+ 
+diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
+index 273c7d923..a04dac5c6 100644
+--- a/util/ulockmgr_server.c
++++ b/util/ulockmgr_server.c
+@@ -22,6 +22,10 @@
+ #include 
+ #include 
+ 
++#ifdef HAVE_CONFIG_H
++	#include "config.h"
++#endif
++
+ struct message {
+ 	unsigned intr : 1;
+ 	unsigned nofd : 1;
+@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
+ 	return res;
+ }
+ 
++#if !defined(HAVE_CLOSEFROM)
+ static int closefrom(int minfd)
+ {
+ 	DIR *dir = opendir("/proc/self/fd");
+@@ -141,6 +146,7 @@ static int closefrom(int minfd)
+ 	}
+ 	return 0;
+ }
++#endif
+ 
+ static void send_reply(int cfd, struct message *msg)
+ {
-- 
cgit v1.2.3


From 88f976d1604e229c47ecfc16e0c95a36817d5043 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 19:43:05 +0200
Subject: gnu: qtwayland: Fix build with GCC 11.

* gnu/packages/patches/qtwayland-gcc-11.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtwayland)[source](patches): New field.
---
 gnu/local.mk                                |  1 +
 gnu/packages/patches/qtwayland-gcc-11.patch | 18 ++++++++++++++++++
 gnu/packages/qt.scm                         |  1 +
 3 files changed, 20 insertions(+)
 create mode 100644 gnu/packages/patches/qtwayland-gcc-11.patch

(limited to 'gnu/packages')

diff --git a/gnu/local.mk b/gnu/local.mk
index 247b9ec34f..1bd791fb0c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1750,6 +1750,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/qtscript-disable-tests.patch		\
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch	\
+  %D%/packages/patches/qtwayland-gcc-11.patch			\
   %D%/packages/patches/qtwebkit-pbutils-include.patch		\
   %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \
   %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch	\
diff --git a/gnu/packages/patches/qtwayland-gcc-11.patch b/gnu/packages/patches/qtwayland-gcc-11.patch
new file mode 100644
index 0000000000..06983ff2f3
--- /dev/null
+++ b/gnu/packages/patches/qtwayland-gcc-11.patch
@@ -0,0 +1,18 @@
+Add missing import for newer libstdc++.
+
+Taken from upstream:
+
+  https://github.com/qt/qtwayland/commit/1aa6ec2c778504d96543f6cdc2b9199a7b066fc1
+
+diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp
+index 5c6c83baa..fa9b7662a 100644
+--- a/tests/auto/client/shared/corecompositor.cpp
++++ b/tests/auto/client/shared/corecompositor.cpp
+@@ -27,6 +27,7 @@
+ ****************************************************************************/
+ 
+ #include "corecompositor.h"
++#include 
+ 
+ namespace MockCompositor {
+ 
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 7d0f1b4971..be6665a57f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1456,6 +1456,7 @@ (define-public qtwayland
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (patches (search-patches "qtwayland-gcc-11.patch"))
              (sha256
               (base32
                "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
-- 
cgit v1.2.3


From 0a078b5a31f0c93bbd97f153828da4c14fe3429a Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 19:44:17 +0200
Subject: gnu: qtwayland: Remove input labels.

* gnu/packages/qt.scm (qtwayland)[inputs]: Remove labels.
---
 gnu/packages/qt.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index be6665a57f..8814f7cfd8 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1483,18 +1483,18 @@ (define-public qtwayland
     (native-inputs
      (list glib perl pkg-config qtdeclarative-5))
     (inputs
-     `(("fontconfig" ,fontconfig)
-       ("freetype" ,freetype)
-       ("libx11" ,libx11)
-       ("libxcomposite" ,libxcomposite)
-       ("libxext" ,libxext)
-       ("libxkbcommon" ,libxkbcommon)
-       ("libxrender" ,libxrender)
-       ("mesa" ,mesa)
-       ("mtdev" ,mtdev)
-       ("qtbase" ,qtbase-5)
-       ("vulkan-headers" ,vulkan-headers)
-       ("wayland" ,wayland)))
+     (list fontconfig
+           freetype
+           libx11
+           libxcomposite
+           libxext
+           libxkbcommon
+           libxrender
+           mesa
+           mtdev
+           qtbase-5
+           vulkan-headers
+           wayland))
     (synopsis "Qt Wayland module")
     (description "The Qt Wayland module provides the QtWayland client and
 compositor libraries.")))
-- 
cgit v1.2.3


From 57771d42b5e1cf16469ba02a7ef87552ff03a30f Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:40:30 +0200
Subject: gnu: libabigail: Update to 2.0.

* gnu/packages/elf.scm (libabigail): Update to 2.0.
---
 gnu/packages/elf.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 414d6a2856..9d476effec 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -133,14 +133,14 @@ (define-public libabigail
   (package
     (name "libabigail")
     (home-page "https://sourceware.org/libabigail/")
-    (version "1.8")
+    (version "2.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://sourceware.org/pub/libabigail/"
                                   "libabigail-" version ".tar.gz"))
               (sha256
                (base32
-                "0p363mkgypcklgf8iylxpbdnfgqc086a6fv7n9hzrjjci45jdgqw"))))
+                "1nkg7fsqvdr453hrskscy6xqz6fv45mylpgv1357dw3blnbsw11p"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--disable-static"
-- 
cgit v1.2.3


From d4f3fd021f9908958b2281f66927baaa52edcdc4 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:41:46 +0200
Subject: gnu: libabigail: Remove input labels.

* gnu/packages/elf.scm (libabigail)[native-inputs]: Remove labels.
---
 gnu/packages/elf.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index 9d476effec..8cc2ff3637 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -177,10 +177,7 @@ (define-public libabigail
                                 (find-files "bash-completion" ".*abi.*"))
                       #t)))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("makeinfo" ,texinfo)
-       ("python-sphinx" ,python-sphinx)
-       ("python" ,python)))             ;for tests
+     (list pkg-config texinfo python-sphinx python))
     (propagated-inputs
      (list elfutils ;libabigail.la says -lelf
            libxml2))           ;in Requires.private of libabigail.pc
-- 
cgit v1.2.3


From b424ca573df717acc7d5a074b69218eaaeb19ce3 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 20:48:56 +0200
Subject: gnu: mdds: Update to 2.0.3.

* gnu/packages/boost.scm (mdds): Update to 2.0.3.
[source](uri): Use HTTPS & .xz tarball.
---
 gnu/packages/boost.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index ca320c37fb..40e4ca399e 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -443,14 +443,14 @@ (define-public boost-mpi
 (define-public mdds
   (package
     (name "mdds")
-    (version "1.5.0")
+    (version "2.0.3")
     (source (origin
              (method url-fetch)
-             (uri (string-append
-                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
+             (uri (string-append "https://kohei.us/files/mdds/src/mdds-"
+                                 version ".tar.xz"))
              (sha256
               (base32
-               "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l"))))
+               "1r68kxqppmhfg0dhz54d0hqzs5882cqrv1x6wpg7lak6gyyws0bc"))))
     (build-system gnu-build-system)
     (propagated-inputs
       (list boost)) ; inclusion of header files
-- 
cgit v1.2.3


From c61e7ddd294a1e15df97b329112b92ecd9a9781a Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 20:49:33 +0200
Subject: gnu: ixion: Update to 0.17.0.

* gnu/packages/libreoffice.scm (ixion): Update to 0.17.0.
---
 gnu/packages/libreoffice.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index b17a144f7c..b9b8d37d3a 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice 
 ;;; Copyright © 2017 Andy Wingo 
 ;;; Copyright © 2017, 2018, 2019, 2021 Ludovic Courtès 
-;;; Copyright © 2017, 2018, 2019 Marius Bakke 
+;;; Copyright © 2017, 2018, 2019, 2022 Marius Bakke 
 ;;; Copyright © 2017 Rutger Helling 
 ;;; Copyright © 2018, 2019 Ricardo Wurmus 
 ;;; Copyright © 2018, 2020 Jonathan Brielmaier 
@@ -89,7 +89,7 @@ (define-module (gnu packages libreoffice)
 (define-public ixion
   (package
     (name "ixion")
-    (version "0.16.1")
+    (version "0.17.0")
     (source
      (origin
        (method url-fetch)
@@ -97,7 +97,7 @@ (define-public ixion
                            version ".tar.xz"))
        (sha256
         (base32
-         "17q84mhy4rb3masvjw24x549irdjmccnc8n04xh58v9l7hxn8v22"))))
+         "07hhqkvns4da8xv990gr1smqz1zf40m531lg95nphfrz48wp3jak"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
-- 
cgit v1.2.3


From ce0aa88d1cfe663fa3d64814a3d14b64219cbefe Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 20:49:55 +0200
Subject: gnu: orcus: Update to 0.17.2.

* gnu/packages/libreoffice.scm (orcus): Update to 0.17.2.
---
 gnu/packages/libreoffice.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index b9b8d37d3a..895acdb572 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -114,7 +114,7 @@ (define-public ixion
 (define-public orcus
   (package
     (name "orcus")
-    (version "0.16.1")
+    (version "0.17.2")
     (source
      (origin
        (method url-fetch)
@@ -122,7 +122,7 @@ (define-public orcus
                            "orcus-" version ".tar.xz"))
        (sha256
         (base32
-         "1bps34sqz7wlrl01ssywjd5fbmssplifs0rskivgrg801lr6pcm4"))))
+         "1as04qb74jnlnwy4wh5jwaw2nnzgn2s3230ymvh3kx1w9r0rsl1h"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--disable-static")))
-- 
cgit v1.2.3


From 178b762d686405a25dcc7bbf2f4dda98df8a3bde Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 21:39:25 +0200
Subject: gnu: libetonyek: Don't hard code mdds version.

* gnu/packages/libreoffice.scm (libetonyek)[arguments]: Automatically pass the
major+minor version components of the "mdds" input.
---
 gnu/packages/libreoffice.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 895acdb572..da30575357 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages libreoffice)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system trivial)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
@@ -444,7 +445,11 @@ (define-public libetonyek
                "16hy60ws29pb4pz3z5l4920yn9hnk2vlij0xfs5qi1w4drd46c5l"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags '("--with-mdds=1.5")))
+     (list #:configure-flags
+           #~(list (string-append "--with-mdds="
+                                  #$(version-major+minor
+                                     (package-version
+                                      (this-package-input "mdds")))))))
     (native-inputs
      (list cppunit doxygen gperf pkg-config))
     (propagated-inputs ; in Requires or Requires.private field of .pkg
-- 
cgit v1.2.3


From 5b5ab17adfe4256de9b9110ba687c6f5cb65a932 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:11:42 +0200
Subject: gnu: Add libcuckoo.

* gnu/packages/datastructures.scm (libcuckoo): New variable.
---
 gnu/packages/datastructures.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 4fa38ee3d4..d40051506f 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2018 Meiyo Peng 
 ;;; Copyright © 2019, 2020, 2022 Efraim Flashner 
 ;;; Copyright © 2020 Mark H Weaver 
-;;; Copyright © 2020 Marius Bakke 
+;;; Copyright © 2020, 2022 Marius Bakke 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,6 +28,7 @@ (define-module (gnu packages datastructures)
   #:use-module (gnu packages perl)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix gexp)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
@@ -134,6 +135,29 @@ (define-public ssdeep
 in between these sequences may be different in both content and length.")
     (license license:gpl2+)))
 
+(define-public libcuckoo
+  (package
+    (name "libcuckoo")
+    (version "0.3.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/efficient/libcuckoo")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0h9yhpkhk813dk66y6bs2csybw3pbpfnp3cakr2xism02vjwy19l"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:configure-flags #~'("-DBUILD_TESTS=1")))
+    (home-page "https://efficient.github.io/libcuckoo/")
+    (synopsis "Concurrent hash table")
+    (description
+     "@code{libcuckoo} provides a high-performance, compact hash table that
+allows multiple concurrent reader and writer threads.")
+    (license license:asl2.0)))
+
 (define-public liburcu
   (package
     (name "liburcu")
-- 
cgit v1.2.3


From 47710f2a4ff3dace3e09a79e82cfb0f5d7346bd9 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:38:05 +0200
Subject: gnu: libcmis: Update to 0.5.2-46-gf264a61.

* gnu/packages/libreoffice.scm (libcmis): Update to 0.5.2-46-gf264a61.
[source]: Switch to GIT-FETCH.
[native-inputs]: Add AUTOCONF, AUTOMAKE, and LIBTOOL.
[arguments]: Override bootstrap phase.  While at it, convert to gexp and
remove label usage.
---
 gnu/packages/libreoffice.scm | 55 +++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 21 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index da30575357..fa171e4448 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -348,35 +348,48 @@ (define-public libwpg
 (define-public libcmis
   (package
     (name "libcmis")
-    (version "0.5.2")
+    ;; Note: Use an unreleased version because libreoffice requires it and
+    ;; is the only user (see ).
+    (version "0.5.2-46-gf264a61")
+    (home-page "https://github.com/tdf/libcmis")
     (source
      (origin
-      (method url-fetch)
-      (uri (string-append "https://github.com/tdf/libcmis/releases/download/v"
-                          version "/libcmis-" version ".tar.xz"))
-      (sha256
-       (base32
-        "18h0a2gsfxvlv03nlcfvw9bzsflq5sin9agq6za103hr0ab8vcfp"))))
+       (method git-fetch)
+       (uri (git-reference (url home-page)
+                           (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "06ff5vw0xrymvvna18wlaayyk20755sk2541i1gh7zpbmncs2ni6"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list cppunit pkg-config))
-    (propagated-inputs ; in Requires field of .pkg
+     (list autoconf automake libtool cppunit pkg-config))
+    (propagated-inputs                  ;in Requires field of .pkg
      (list curl libxml2))
     (inputs
      (list boost cyrus-sasl openssl))
     (arguments
-     `(#:configure-flags
-        (list
-          ;; FIXME: Man pages generation requires docbook-to-man; reenable
-          ;; it once this is available.
-          "--without-man"
-          ;; XXX: A configure test fails with GCC7 when including Boost headers.
-          "--disable-werror"
-          ;; During configure, the boost headers are found, but linking
-          ;; fails without the following flag.
-          (string-append "--with-boost="
-                         (assoc-ref %build-inputs "boost")))))
-    (home-page "https://github.com/tdf/libcmis")
+     (list
+      #:configure-flags
+      #~(list
+         ;; FIXME: Man pages generation requires docbook-to-man; reenable
+         ;; it once this is available.
+         "--without-man"
+         ;; XXX: A configure test fails with GCC7 when including Boost headers.
+         "--disable-werror"
+         ;; During configure, the boost headers are found, but linking
+         ;; fails without the following flag.
+         (string-append "--with-boost="
+                        (dirname (dirname
+                                  (search-input-directory %build-inputs
+                                                          "include/boost")))))
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'bootstrap
+            (lambda _
+              ;; Override the bootstrap phase as the ancient autogen.sh
+              ;; script exits with a non-zero code when NOCONFIGURE=1.
+              (invoke "autoreconf" "-vif"))))))
     (synopsis "CMIS client library")
     (description "LibCMIS is a C++ client library for the CMIS interface.  It
 allows C++ applications to connect to any ECM behaving as a CMIS server such
-- 
cgit v1.2.3


From 8bdc95ecae30a850f65ba77a13920a9f7ccdaa61 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:46:54 +0200
Subject: gnu: libreoffice: Update to 7.3.5.2.

* gnu/packages/libreoffice.scm (libreoffice): Update to 7.3.5.2.
[inputs]: Add LIBCUCKOO and ZXING-CPP.
* gnu/packages/hunspell.scm (hunspell-dictionary): Update hash.
---
 gnu/packages/hunspell.scm    | 2 +-
 gnu/packages/libreoffice.scm | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm
index aa4ab7d783..65ff90b4b9 100644
--- a/gnu/packages/hunspell.scm
+++ b/gnu/packages/hunspell.scm
@@ -46,7 +46,7 @@ (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page licen
               (string-append "libreoffice-" version))))
        (file-name (git-file-name "libreoffice-dictionaries" version))
        (sha256
-        (base32 "0h1sz8haqwpis4af1vy7jvivl4rr9g53l4l680qa7yn0691gkiv3"))))
+        (base32 "1qyn56kcn2scdlssjgi5b33hnsh20mmnd60w78z0gp7bs0mv0wcs"))))
     (build-system trivial-build-system)
     (native-inputs
      `(("source" ,source)))
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index fa171e4448..f82a56b53a 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -54,6 +54,7 @@ (define-module (gnu packages libreoffice)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
+  #:use-module (gnu packages datastructures)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)
@@ -1048,7 +1049,7 @@ (define-public libqxp
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "7.1.4.2")
+    (version "7.3.5.2")
     (source
      (origin
        (method url-fetch)
@@ -1057,7 +1058,7 @@ (define-public libreoffice
          "https://download.documentfoundation.org/libreoffice/src/"
          (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
        (sha256
-        (base32 "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"))))
+        (base32 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("bison" ,bison)
@@ -1093,6 +1094,7 @@ (define-public libreoffice
        ("libabw" ,libabw)
        ("libcdr" ,libcdr)
        ("libcmis" ,libcmis)
+       ("libcuckoo" ,libcuckoo)
        ("libjpeg-turbo" ,libjpeg-turbo)
        ("libe-book" ,libe-book)
        ("libepubgen" ,libepubgen)
@@ -1142,6 +1144,7 @@ (define-public libreoffice
        ("xdg-utils" ,xdg-utils)
        ("xmlsec" ,xmlsec-nss)
        ("zip" ,zip)
+       ("zxing-cpp" ,zxing-cpp)
        ("dtoa"              ; needed after version 6.4.7.2.
         ,(origin
            (method url-fetch)
-- 
cgit v1.2.3


From a66b9063d1158f129e46ae0b99f1e7cbbc8c16b1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Wed, 10 Aug 2022 22:54:31 +0200
Subject: gnu: libreoffice: Remove input labels.

* gnu/packages/libreoffice.scm (dtoa): New private variable.
(libreoffice)[native-inputs, inputs]: Remove labels.
[arguments]: Use G-expression and SEARCH-INPUT-FILE & co where appropriate.
Remove trailing #t's.
---
 gnu/packages/libreoffice.scm | 367 ++++++++++++++++++++++---------------------
 1 file changed, 184 insertions(+), 183 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index f82a56b53a..aeefba732b 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1044,6 +1044,13 @@ (define-public libqxp
 converting QuarkXPress file format.  It supports versions 3.1 to 4.1.")
     (license license:mpl2.0)))
 
+(define dtoa
+  (origin
+    (method url-fetch)
+    (uri "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz")
+    (sha256
+     (base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))
+
 ;; When updating libreoffice, also make sure to update the
 ;; hunspell dictionaries! They use the libreoffice version.
 (define-public libreoffice
@@ -1061,189 +1068,181 @@ (define-public libreoffice
         (base32 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
-     `(("bison" ,bison)
-       ("cppunit" ,cppunit)
-       ("flex" ,flex)
-       ("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)
-       ("which" ,which)
-       ("ziptime" ,ziptime)))
+     (list bison
+           cppunit
+           flex
+           pkg-config
+           python-wrapper
+           which
+           ziptime))
     (inputs
-     `(("bluez" ,bluez)
-       ("boost" ,boost)
-       ("box2d" ,box2d)
-       ("clucene" ,clucene)
-       ("cups" ,cups)
-       ("dbus-glib" ,dbus-glib)
-       ("firebird" ,firebird)
-       ("fontconfig" ,fontconfig)
-       ("fontforge" ,fontforge)
-       ("gconf" ,gconf)
-       ("glew" ,glew)
-       ("glm" ,glm)
-       ("gnupg" ,gnupg)
-       ("gobject-introspection" ,gobject-introspection)
-       ("gperf" ,gperf)
-       ("gpgme" ,gpgme)
-       ("graphite2" ,graphite2)
-       ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+)
-       ("harfbuzz" ,harfbuzz)
-       ("hunspell" ,hunspell)
-       ("hyphen" ,hyphen)
-       ("libabw" ,libabw)
-       ("libcdr" ,libcdr)
-       ("libcmis" ,libcmis)
-       ("libcuckoo" ,libcuckoo)
-       ("libjpeg-turbo" ,libjpeg-turbo)
-       ("libe-book" ,libe-book)
-       ("libepubgen" ,libepubgen)
-       ("libetonyek" ,libetonyek)
-       ("libexttextcat" ,libexttextcat)
-       ("libfreehand" ,libfreehand)
-       ("liblangtag" ,liblangtag)
-       ;; XXX: Perhaps this should be propagated from xmlsec.
-       ("libltdl" ,libltdl)
-       ("libmspub" ,libmspub)
-       ("libmwaw" ,libmwaw)
-       ("libnumbertext" ,libnumbertext)
-       ("libodfgen" ,libodfgen)
-       ("libpagemaker" ,libpagemaker)
-       ("libqxp" ,libqxp)
-       ("libstaroffice" ,libstaroffice)
-       ("libvisio" ,libvisio)
-       ("libwpg" ,libwpg)
-       ("libwps" ,libwps)
-       ("libxrandr" ,libxrandr)
-       ("libxrender" ,libxrender)
-       ("libxslt" ,libxslt)
-       ("libxt" ,libxt)
-       ("libzmf" ,libzmf)
-       ("lpsolve" ,lpsolve)
-       ("mariadb" ,mariadb "dev")
-       ("mdds" ,mdds)
-       ("mythes" ,mythes)
-       ("neon" ,neon)
-       ("nspr" ,nspr)
-       ("nss" ,nss)
-       ("openldap" ,openldap)
-       ("openssl" ,openssl)
-       ("orcus" ,orcus)
-       ("perl" ,perl)
-       ("perl-archive-zip" ,perl-archive-zip)
-       ("poppler" ,poppler)
-       ("postgresql" ,postgresql)
-       ("python" ,python)
-       ("python-lxml" ,python-lxml)
-       ("qrcodegen-cpp" ,qrcodegen-cpp)
-       ("redland" ,redland)
-       ("sane-backends" ,sane-backends)
-       ("unixodbc" ,unixodbc)
-       ("unzip" ,unzip)
-       ("vigra" ,vigra)
-       ("xdg-utils" ,xdg-utils)
-       ("xmlsec" ,xmlsec-nss)
-       ("zip" ,zip)
-       ("zxing-cpp" ,zxing-cpp)
-       ("dtoa"              ; needed after version 6.4.7.2.
-        ,(origin
-           (method url-fetch)
-           (uri "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz")
-           (sha256
-            (base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))))
+     (list bluez
+           boost
+           box2d
+           clucene
+           cups
+           dbus-glib
+           firebird
+           fontconfig
+           fontforge
+           gconf
+           glew
+           glm
+           gnupg
+           gobject-introspection
+           gperf
+           gpgme
+           graphite2
+           gst-plugins-base
+           gtk+
+           harfbuzz
+           hunspell
+           hyphen
+           libabw
+           libcdr
+           libcmis
+           libcuckoo
+           libjpeg-turbo
+           libe-book
+           libepubgen
+           libetonyek
+           libexttextcat
+           libfreehand
+           liblangtag
+           ;; XXX: Perhaps this should be propagated from xmlsec.
+           libltdl
+           libmspub
+           libmwaw
+           libnumbertext
+           libodfgen
+           libpagemaker
+           libqxp
+           libstaroffice
+           libvisio
+           libwpg
+           libwps
+           libxrandr
+           libxrender
+           libxslt
+           libxt
+           libzmf
+           lpsolve
+           `(,mariadb "dev")
+           mdds
+           mythes
+           neon
+           nspr
+           nss
+           openldap
+           openssl
+           orcus
+           perl
+           perl-archive-zip
+           poppler
+           postgresql
+           python
+           python-lxml
+           qrcodegen-cpp
+           redland
+           sane-backends
+           unixodbc
+           unzip
+           vigra
+           xdg-utils
+           xmlsec-nss
+           zip
+           zxing-cpp))
     (arguments
-     `(#:tests? #f                     ; Building the tests already fails.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'insert-external-tarballs
-           (lambda* (#:key inputs #:allow-other-keys)
-             (mkdir-p "external/tarballs")
-             (copy-file (assoc-ref inputs "dtoa")
-                        "external/tarballs/dtoa-20180411.tgz")
-             #t))
-         (add-before 'configure 'prepare-src
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute*
-                 (list "sysui/CustomTarget_share.mk"
-                       "solenv/gbuild/gbuild.mk"
-                       "solenv/gbuild/platform/unxgcc.mk")
-               (("/bin/sh") (which "sh")))
+     (list
+      #:tests? #f                       ; Building the tests already fails.
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'insert-external-tarballs
+            (lambda _
+              (mkdir-p "external/tarballs")
+              (copy-file #$dtoa "external/tarballs/dtoa-20180411.tgz")))
+          (add-before 'configure 'prepare-src
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute*
+                  (list "sysui/CustomTarget_share.mk"
+                        "solenv/gbuild/gbuild.mk"
+                        "solenv/gbuild/platform/unxgcc.mk")
+                (("/bin/sh") (which "sh")))
 
-             ;; Use store references for strictly necessary commands,
-             ;; but not for optional tools like ‘gdb’ and ‘valgrind’.
-             (for-each (lambda (command)
-                         (substitute* "desktop/scripts/soffice.sh"
-                           (((format #f"~a " command))
-                            (format #f "~a " (which command)))))
-                       (list "dirname" "grep" "uname"))
+              ;; Use store references for strictly necessary commands,
+              ;; but not for optional tools like ‘gdb’ and ‘valgrind’.
+              (for-each (lambda (command)
+                          (substitute* "desktop/scripts/soffice.sh"
+                            (((format #f "~a " command))
+                             (format #f "~a " (which command)))))
+                        (list "dirname" "grep" "uname"))
 
-             ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
-             ;; configure is hardcoded to use FHS directories.
-             (substitute* "configure"
-               (("GPGMEPP_CFLAGS=-I/usr")
-                (string-append "GPGMEPP_CFLAGS=-I"
-                               (assoc-ref inputs "gpgme"))))
+              ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
+              ;; configure is hardcoded to use FHS directories.
+              (substitute* "configure"
+                (("GPGMEPP_CFLAGS=-I/usr/include/gpgme\\+\\+")
+                 (string-append "GPGMEPP_CFLAGS=-I"
+                                (search-input-directory inputs
+                                                        "include/gpgme++"))))
 
-             ;; /usr/bin/xdg-open doesn't exist on Guix System.
-             (substitute* '("shell/source/unix/exec/shellexec.cxx"
-                            "shell/source/unix/misc/senddoc.sh")
-               (("/usr/bin/xdg-open")
-                (search-input-file inputs "/bin/xdg-open")))))
-         (add-after 'install 'reset-zip-timestamps
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (for-each (lambda (file)
-                           (invoke "ziptime" file))
-                         ;; So many different extensions for .zip files.
-                         (find-files out "\\.(bau|dat|otp|ott|zip)$")))))
-         (add-after 'install 'bin-and-desktop-install
-           ;; Create 'soffice' and 'libreoffice' symlinks to the executable
-           ;; script.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (define (symlink-output src dst)
-                 (mkdir-p (dirname (string-append out dst)))
-                 (symlink (string-append out src) (string-append out dst)))
-               (define (install src dst)
-                 (let ((dst (string-append out dst)))
-                   (mkdir-p (dirname dst))
-                   (copy-file src dst)))
-               (define (install-desktop-file app)
-                 (let ((src (string-append "/lib/libreoffice/share/xdg/"
-                                           app ".desktop"))
-                       (dst (string-append "/share/applications/libreoffice-"
-                                           app ".desktop")))
-                   (substitute* (string-append out src)
-                     (("Exec=libreoffice[0-9]+\\.[0-9]+ ")
-                      (string-append "Exec=" out "/bin/libreoffice "))
-                     (("Icon=libreoffice.*")
-                      (string-append "Icon=" app "\n"))
-                     (("LibreOffice [0-9]+\\.[0-9]+")
-                      "LibreOffice"))
-                   (symlink-output src dst)))
-               (define (install-appdata app)
-                 (install-file (string-append
-                                "sysui/desktop/appstream-appdata/"
-                                "libreoffice-" app ".appdata.xml")
-                               (string-append out "/share/appdata")))
-               (symlink-output "/lib/libreoffice/program/soffice"
-                               "/bin/soffice")
-               (symlink-output "/lib/libreoffice/program/soffice"
-                               "/bin/libreoffice")
-               (install
-                "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml"
-                "/share/mime/packages/libreoffice.xml")
-               (for-each install-desktop-file
-                         '("base" "calc" "draw" "impress" "writer"
-                           "math" "startcenter"))
-               (for-each install-appdata
-                         '("base" "calc" "draw" "impress" "writer"))
-               (mkdir-p (string-append out "/share/icons/hicolor"))
-               (copy-recursively "sysui/desktop/icons/hicolor"
-                                 (string-append out "/share/icons/hicolor")))
-             #t)))
-       #:configure-flags
-       (list
+              ;; /usr/bin/xdg-open doesn't exist on Guix System.
+              (substitute* '("shell/source/unix/exec/shellexec.cxx"
+                             "shell/source/unix/misc/senddoc.sh")
+                (("/usr/bin/xdg-open")
+                 (search-input-file inputs "/bin/xdg-open")))))
+          (add-after 'install 'reset-zip-timestamps
+            (lambda _
+              (for-each (lambda (file)
+                          (invoke "ziptime" file))
+                        ;; So many different extensions for .zip files.
+                        (find-files #$output "\\.(bau|dat|otp|ott|zip)$"))))
+      (add-after 'install 'bin-and-desktop-install
+        ;; Create 'soffice' and 'libreoffice' symlinks to the executable
+        ;; script.
+        (lambda _
+          (let ((out #$output))
+            (define (symlink-output src dst)
+              (mkdir-p (dirname (string-append out dst)))
+              (symlink (string-append out src) (string-append out dst)))
+            (define (install src dst)
+              (let ((dst (string-append out dst)))
+                (mkdir-p (dirname dst))
+                (copy-file src dst)))
+            (define (install-desktop-file app)
+              (let ((src (string-append "/lib/libreoffice/share/xdg/"
+                                        app ".desktop"))
+                    (dst (string-append "/share/applications/libreoffice-"
+                                        app ".desktop")))
+                (substitute* (string-append out src)
+                  (("Exec=libreoffice[0-9]+\\.[0-9]+ ")
+                   (string-append "Exec=" out "/bin/libreoffice "))
+                  (("Icon=libreoffice.*")
+                   (string-append "Icon=" app "\n"))
+                  (("LibreOffice [0-9]+\\.[0-9]+")
+                   "LibreOffice"))
+                (symlink-output src dst)))
+            (define (install-appdata app)
+              (install-file (string-append
+                             "sysui/desktop/appstream-appdata/"
+                             "libreoffice-" app ".appdata.xml")
+                            (string-append out "/share/appdata")))
+            (symlink-output "/lib/libreoffice/program/soffice"
+                            "/bin/soffice")
+            (symlink-output "/lib/libreoffice/program/soffice"
+                            "/bin/libreoffice")
+            (install
+             "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml"
+             "/share/mime/packages/libreoffice.xml")
+            (for-each install-desktop-file
+                      '("base" "calc" "draw" "impress" "writer"
+                        "math" "startcenter"))
+            (for-each install-appdata
+                      '("base" "calc" "draw" "impress" "writer"))
+            (mkdir-p (string-append out "/share/icons/hicolor"))
+            (copy-recursively "sysui/desktop/icons/hicolor"
+                              (string-append out "/share/icons/hicolor"))))))
+     #:configure-flags
+     #~(list
         "--enable-release-build"
         "--with-vendor=GNU Guix"
         ;; Avoid using all cpu cores by default
@@ -1251,7 +1250,9 @@ (define (install-appdata app)
         "--disable-fetch-external"      ; disable downloads
         "--with-system-libs"            ; enable all --with-system-* flags
         (string-append "--with-boost-libdir="
-                       (assoc-ref %build-inputs "boost") "/lib")
+                       (dirname
+                        (search-input-file %build-inputs
+                                           "lib/libboost_system.so")))
         ;; Avoid undefined symbols required by boost::spirit
         "LDFLAGS=-lboost_system"
         ;; Avoid a dependency on ucpp.
@@ -1273,11 +1274,11 @@ (define (install-appdata app)
         "--disable-pdfium"
         "--without-doxygen"
         "--enable-build-opensymbol")))
-    (home-page "https://www.libreoffice.org/")
-    (synopsis "Office suite")
-    (description "LibreOffice is a comprehensive office suite.  It contains
+  (home-page "https://www.libreoffice.org/")
+  (synopsis "Office suite")
+  (description "LibreOffice is a comprehensive office suite.  It contains
 a number of components: Writer, a word processor; Calc, a spreadsheet
 application; Impress, a presentation engine; Draw, a drawing and
 flowcharting application; Base, a database and database frontend;
 Math for editing mathematics.")
-    (license license:mpl2.0)))
+  (license license:mpl2.0)))
-- 
cgit v1.2.3


From b611761bfcc9d603fba8147ae6bf9a61bb871a4a Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 00:31:18 +0200
Subject: gnu: strace: Add release-monitoring-url.

* gnu/packages/linux.scm (strace)[properties]: New field.
---
 gnu/packages/linux.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9bfa1951be..3b886e38b1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2417,6 +2417,8 @@ (define-public strace
     (description
      "strace is a system call tracer, i.e. a debugging tool which prints out a
 trace of all the system calls made by a another process/program.")
+    (properties
+     '((release-monitoring-url . "https://github.com/strace/strace/releases")))
     (license license:lgpl2.1+)))
 
 (define-public ltrace
-- 
cgit v1.2.3


From e24f367f50f7a7e19ccc85d7f65ed57b1d464453 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 00:31:42 +0200
Subject: gnu: strace: Update to 5.18.

* gnu/packages/linux.scm (strace): Update to 5.18.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 3b886e38b1..d7d373a92f 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2379,7 +2379,7 @@ (define-public zerofree
 (define-public strace
   (package
     (name "strace")
-    (version "5.15")
+    (version "5.18")
     (home-page "https://strace.io")
     (source (origin
              (method url-fetch)
@@ -2387,7 +2387,7 @@ (define-public strace
                                  "/strace-" version ".tar.xz"))
              (sha256
               (base32
-               "1p3jipp6mj5fwfcjdnp6xhxk84z07jy5qhjlqr6jjdbk54pw5jpb"))
+               "11qi7pdm0ldycsg9qhsa50icm219mmvy16yw1ih3s9f9kakkwab0"))
              (patches (search-patches "strace-readlink-tests.patch"))))
     (build-system gnu-build-system)
     (arguments
-- 
cgit v1.2.3


From 24ec1b5a2046111d34bc5a965a6bef992f7c8d78 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Fri, 29 Jul 2022 15:01:49 -0700
Subject: gnu: Add lcrq.

* gnu/packages/networking.scm (lcrq): New variable.
---
 gnu/packages/networking.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 7ea5cd7d20..acc2b70592 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -239,6 +239,42 @@ (define-public axel
 protocols.")
     (license license:gpl2+)))
 
+(define-public lcrq
+  (package
+    (name "lcrq")
+    (version "0.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://codeberg.org/librecast/lcrq")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jf7x3zcdbz5b99qz7liw4i90hn9s457zr82n0r8g9qsi81a1d8c"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-tests? #f
+       #:make-flags (let ((target ,(%current-target-system)))
+                      (list ,(string-append "CC="
+                                            (cc-for-target))
+                            (string-append "PREFIX="
+                                           (assoc-ref %outputs "out"))))
+       #:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda _
+                      (invoke "make" "test"))))))
+    (home-page "https://librecast.net/lcrq.html")
+    (synopsis "librecast RaptorQ library")
+    (description
+     "C library implementation of RaptorQ Forward Error Correction for
+Librecast.  RFC6330 (IETF) describes the RaptorQ proposed standard, which LCRQ
+more-or-less follows. The primary focus has been on building a fast, simple
+and dependency-free FEC implementation for use with Librecast, and not on
+strict standards compliance.  The code does, however, fairly closely follow
+the RFC.")
+    (license (list license:gpl2 license:gpl3))))
+
 ;; This package does not have a release yet.
 ;; But this is required to provide a feature in PipeWire.
 (define-public libcamera
-- 
cgit v1.2.3


From 78b81bf95166562921284a5257580eb2ff01e4f3 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 26 May 2022 14:27:41 -0700
Subject: gnu: Add librecast.

* gnu/packages/networking.scm (librecast): New variable.
---
 gnu/packages/networking.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index acc2b70592..25c62cadb0 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -419,6 +419,56 @@ (define-public libnice
         license:lgpl2.1+
         license:mpl1.1)))))
 
+(define-public librecast
+  (package
+    (name "librecast")
+    (version "0.5.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://codeberg.org/librecast/librecast")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1zzdxawzsj0lxyxm8c2wdqx3b633f8ybvlg6szs4v0y42xg4a829"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-tests? #f
+       #:make-flags (let ((target ,(%current-target-system)))
+                      (list ,(string-append "CC="
+                                            (cc-for-target))
+                            (string-append "PREFIX="
+                                           (assoc-ref %outputs "out"))))
+       #:phases (modify-phases %standard-phases
+                  (add-before 'check 'remove-network-tests
+                    (lambda _
+                      ;; these tests require networking
+                      (delete-file "./test/0000-0010.c")
+                      (delete-file "./test/0000-0012.c")
+                      (delete-file "./test/0000-0013.c")
+                      (delete-file "./test/0000-0014.c")
+                      (delete-file "./test/0000-0015.c")
+                      (delete-file "./test/0000-0016.c")
+                      (delete-file "./test/0000-0018.c")
+                      (delete-file "./test/0000-0019.c")
+                      (delete-file "./test/0000-0021.c")
+                      (delete-file "./test/0000-0028.c")
+                      (delete-file "./test/0000-0036.c")
+                      (delete-file "./test/0000-0037.c")
+                      (delete-file "./test/0000-0038.c")
+                      (delete-file "./test/0000-0039.c")
+                      (delete-file "./test/0000-0040.c")))
+                  (replace 'check
+                    (lambda _
+                      (invoke "make" "test"))))))
+    (inputs (list libsodium lcrq))
+    (synopsis "librecast IPv6 multicast library")
+    (description "Librecast is a C library which supports IPv6 multicast
+networking.")
+    (home-page "https://librecast.net/librecast.html")
+    (license (list license:gpl2 license:gpl3))))
+
 (define-public rtmpdump
   ;; There are no tags in the repository, and the project is unlikely to
   ;; make new releases.  Take a recent commit for multiple security fixes
-- 
cgit v1.2.3


From 6bdcd2f3f08d054f8a605fc33935c4057528cdcc Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Thu, 26 May 2022 14:37:32 -0700
Subject: gnu: Add lcsync.

* gnu/packages/networking.scm (lcsync): New variable.
---
 gnu/packages/networking.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 25c62cadb0..741cd74df8 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -275,6 +275,55 @@ (define-public lcrq
 the RFC.")
     (license (list license:gpl2 license:gpl3))))
 
+(define-public lcsync
+  (package
+    (name "lcsync")
+    (version "0.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://codeberg.org/librecast/lcsync")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0s038b4xg9nlzhrganzjyfvc6n6cgd6kilnpik4axp62j2n5q11q"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:parallel-tests? #f
+       #:make-flags (let ((target ,(%current-target-system)))
+                      (list ,(string-append "CC="
+                                            (cc-for-target))
+                            ;; avoid running setcap in the install process
+                            "SETCAP_PROGRAM=true"
+                            (string-append "prefix="
+                                           (assoc-ref %outputs "out"))))
+       #:phases (modify-phases %standard-phases
+                  (delete 'configure) ;no configure script
+                  (add-before 'check 'remove-network-tests
+                    (lambda _
+                      ;; these tests require networking
+                      (delete-file "./test/0000-0027.c")
+                      (delete-file "./test/0000-0049.c")
+                      (delete-file "./test/0000-0074.c")))
+                  (replace 'check
+                    (lambda _
+                      (invoke "make" "test" "CC=gcc")))
+                  (add-before 'build 'add-library-paths
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (let* ((librecast (assoc-ref inputs "librecast")))
+                        (substitute* (list "./src/Makefile" "./test/Makefile")
+                          (("-llibrecast")
+                           (string-append "-L" librecast "/lib -llibrecast")))))))))
+    (inputs (list librecast libsodium))
+    (home-page "https://librecast.net/lcsync.html")
+    (synopsis "librecast file and data syncing tool")
+    (description
+     "lcsync is a tool to sync files over IPv6 multicast or the
+local filesystem.  It splits the file into blocks, hashes them, and compares
+them in order to efficiently transfer a minimal amount of data.")
+    (license (list license:gpl2 license:gpl3))))
+
 ;; This package does not have a release yet.
 ;; But this is required to provide a feature in PipeWire.
 (define-public libcamera
-- 
cgit v1.2.3


From 04ef952a4928a427fa3d778e23d4e99299c9fa5a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Wed, 10 Aug 2022 19:54:50 -0700
Subject: gnu: diffoscope: Update to 220.

* gnu/packages/diffoscope.scm (diffoscope): Update to 220.
---
 gnu/packages/diffoscope.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 2dc3cfad0f..696dc2c8f1 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages diffoscope)
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "219")
+    (version "220")
     (source
      (origin
        (method git-fetch)
@@ -84,7 +84,7 @@ (define-public diffoscope
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0n6dn53paxi1316fnv5abw5rlvpfd2kpfn3b08wfzrcb6chsx7br"))
+        (base32 "0lkwbyf1z93skgqp1w4p0d7y8wwqf0bs53i43micwaq8p8xjs1ph"))
        (patches
         (search-patches "diffoscope-fix-llvm-test.patch"))))
     (build-system python-build-system)
-- 
cgit v1.2.3


From f030ae422b6d13a7a21158d9a37c9760597d1573 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian 
Date: Wed, 10 Aug 2022 19:55:18 -0700
Subject: gnu: reprotest: Update to 0.7.21.

* gnu/packages/diffoscope.scm (reprotest): Update to 0.7.21.
---
 gnu/packages/diffoscope.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 696dc2c8f1..81d1a63652 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -246,7 +246,7 @@ (define-public diffoscope
 (define-public reprotest
   (package
     (name "reprotest")
-    (version "0.7.20")
+    (version "0.7.21")
     (source
      (origin
        (method git-fetch)
@@ -256,7 +256,7 @@ (define-public reprotest
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0c3nyiha9gh1xzl0dn9ji2yqa8y06d83v84pz0dqanihm40ljjsm"))))
+         "1jmnp6dwd91w00vfvph89cvgxwk0nvij8his9az5b72265jf9bxz"))))
     (inputs
      (list python-debian python-distro python-libarchive-c python-rstr))
     (native-inputs
-- 
cgit v1.2.3


From 4c846ba9eb3fc97d2204d123f5ff92a979da47ba Mon Sep 17 00:00:00 2001
From: 宋文武 
Date: Thu, 11 Aug 2022 15:32:34 +0800
Subject: gnu: python-symengine: Fix tests.

This fixes .

* gnu/packages/python-xyz.scm (python-symengine):
[native-inputs]: Add python-nose.
[arguments]: Run tests with 'nosetests'.
---
 gnu/packages/python-xyz.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0ea9b9b25f..c21fe67f20 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14645,8 +14645,19 @@ (define-public python-symengine
        (sha256
         (base32 "0qjgdbnb10kfk7jdhxnzfl8cpaps81k8vap7gm7q9ym3pgslazhg"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (if tests?
+                  ;; Run tests against installed package.
+                  (with-directory-excursion "/tmp"
+                    (invoke "nosetests" "-v" "symengine.tests"))
+                  (format #t "test suite not run~%")))))))
     (native-inputs
-     (list cmake python-cython))
+     (list cmake python-cython python-nose))
     (inputs
      (list symengine))
     (home-page "https://github.com/symengine/symengine.py")
-- 
cgit v1.2.3


From a7c14a82255526173f15c05d921a6048063e7378 Mon Sep 17 00:00:00 2001
From: Marcel van der Boom 
Date: Wed, 10 Aug 2022 09:19:02 +0200
Subject: gnu: x265: Fix build on ppc64le.

* gnu/packages/video.scm (x265)[arguments]: Disable ALTIVEC for ppc64le.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/video.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d5dc59ddff..ff12e1bb9e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1252,6 +1252,10 @@ (define-public x265
                  ,@(if (target-aarch64?)
                      '("-DENABLE_ASSEMBLY=OFF")
                      '())
+                 ;; Altivec code produces many build errors.
+                 ,@(if (target-ppc64le?)
+                       '("-DENABLE_ALTIVEC=OFF")
+                       '())
                  "-DHIGH_BIT_DEPTH=ON"
                  "-DEXPORT_C_API=OFF"
                  "-DENABLE_CLI=OFF"
@@ -1272,6 +1276,10 @@ (define-public x265
                  ,@(if (target-aarch64?)
                      '("-DENABLE_ASSEMBLY=OFF")
                      '())
+                 ;; Altivec code produces many build errors.
+                 ,@(if (target-ppc64le?)
+                       '("-DENABLE_ALTIVEC=OFF")
+                       '())
                  "-DHIGH_BIT_DEPTH=ON"
                  "-DEXPORT_C_API=OFF"
                  "-DENABLE_CLI=OFF"
-- 
cgit v1.2.3


From f233ddaa97d9545d6f4606a3e5c13504bdaf6ab8 Mon Sep 17 00:00:00 2001
From: pukkamustard 
Date: Tue, 9 Aug 2022 09:17:56 +0000
Subject: gnu: guile-srfi-158: Update to 0.0.1-0-13126d1.

This fixes compilation and cross-compilation.

* gnu/packages/guile-xyz.scm (guile-srfi-158): Update it.
[native-inputs]: Add guile-3.0.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/guile-xyz.scm | 47 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index cf7f3e6774..8e8a73ad30 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -32,7 +32,7 @@
 ;;; Copyright © 2020 Jesse Gibbons 
 ;;; Copyright © 2020 Mike Rosset 
 ;;; Copyright © 2020 Liliana Marie Prikler 
-;;; Copyright © 2020, 2021 pukkamustard 
+;;; Copyright © 2020, 2021, 2022 pukkamustard 
 ;;; Copyright © 2021 Bonface Munyoki Kilyungi 
 ;;; Copyright © 2021 Xinglu Chen 
 ;;; Copyright © 2021 Leo Le Bouter 
@@ -3116,32 +3116,33 @@ (define-public guile-srfi-145
     (license license:gpl3+)))
 
 (define-public guile-srfi-158
-  (package
-    (name "guile-srfi-158")
-    (version "0.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://gitlab.com/mjbecze/guile-srfi-158.git")
-             (commit version)))
-       (sha256
-        (base32
-         "0b8hlv1bldbcwkcxi9y8mm6xp5gbgpg7b15bwqxv70iynl9d9a7c"))
-       (file-name (git-file-name name version))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list autoconf automake pkg-config))
-    (inputs
-     (list guile-3.0))
-    (home-page "https://gitlab.com/samplet/guile-srfi-158")
-    (synopsis "SRFI 158 (Generators and Accumulators) for Guile")
-    (description "This package provides an implementation of SRFI 158
+  (let ((commit "13126d1ed37892c864337a600a43d6876625fb99")
+        (revision "0"))
+    (package
+      (name "guile-srfi-158")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://gitlab.com/mjbecze/guile-srfi-158.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "0hg57l3w5qamip1clkab0q01np5nqln9y054q39smm4ki0svdl8w"))
+         (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (native-inputs
+       (list guile-3.0 autoconf automake pkg-config))
+      (inputs (list guile-3.0))
+      (home-page "https://gitlab.com/samplet/guile-srfi-158")
+      (synopsis "SRFI 158 (Generators and Accumulators) for Guile")
+      (description "This package provides an implementation of SRFI 158
 for Guile.  SRFI 158 defines utility procedures that create,
 transform, and consume generators.  It also defines procedures that
 return accumulators.  It is implemented by wrapping the sample
 implementation in a thin Guile compatibility layer.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public guile-srfi-159
   (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb")
-- 
cgit v1.2.3


From fc5beaf96aab6052a3e2605c5015e9e441f1c8ca Mon Sep 17 00:00:00 2001
From: Milkey Mouse 
Date: Wed, 10 Aug 2022 12:20:19 -0700
Subject: gnu: libplacebo: Update to 4.208.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/video.scm (libplacebo)[version]: Update to 4.208.0.
[native-inputs]: Add python.

Signed-off-by: 宋文武 
---
 gnu/packages/video.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ff12e1bb9e..fa6ed184a1 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1452,16 +1452,16 @@ (define-public libmatroska
 (define-public libplacebo
   (package
     (name "libplacebo")
-    (version "4.157.0")
+    (version "4.208.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://code.videolan.org/videolan/libplacebo")
+             (url "https://code.videolan.org/videolan/libplacebo.git")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08kqsd29h8wm0vz7698wh2mdgpwv6anqc5n7d1spnnamwyfwc64h"))))
+        (base32 "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
@@ -1470,7 +1470,7 @@ (define-public libplacebo
                          (assoc-ref %build-inputs "vulkan-headers")
                          "/share/vulkan/registry/vk.xml"))))
     (native-inputs
-     (list python-mako pkg-config))
+     (list python python-mako pkg-config))
     (inputs
      (list lcms
            libepoxy
-- 
cgit v1.2.3


From dfda2cc5f6a57a0b89b98f389a2f28bf1e94eaa4 Mon Sep 17 00:00:00 2001
From: "(" 
Date: Mon, 8 Aug 2022 20:08:38 +0100
Subject: gnu: pcc: Fix build.

* gnu/packages/c.scm (pcc)[arguments]: Use gexps.
<#:phases>{fix-multiple-definitions}: New phase.
[native-inputs]: Adjust formatting.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/c.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 1630a40d17..113a331070 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -16,6 +16,7 @@
 ;;; Copyright © 2022 (unmatched parenthesis 
 ;;; Copyright © 2022 Artyom V. Poptsov 
 ;;; Copyright © 2022 Ekaitz Zarraga 
+;;; Copyright © 2022 ( 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -185,12 +186,20 @@ (define-public pcc
                 "1p34w496095mi0473f815w6wbi57zxil106mg7pj6sg6gzpjcgww"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _ (invoke "make" "-C" "cc/cpp" "test") #t)))))
-    (native-inputs
-     (list bison flex))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-multiple-definitions
+                 (lambda _
+                   ;; Certain variables are defined multiple times. This
+                   ;; upsets the linker and causes a build failure.
+                   (substitute* "cc/ccom/pass1.h"
+                     (("FLT flt_zero;") "extern FLT flt_zero;"))
+                   (substitute* (list "cc/ccom/scan.l" "cc/cxxcom/scan.l")
+                     (("lineno, ") ""))))
+               (replace 'check
+                 (lambda _
+                   (invoke "make" "-C" "cc/cpp" "test"))))))
+    (native-inputs (list bison flex))
     (synopsis "Portable C compiler")
     (description
      "PCC is a portable C compiler.  The project goal is to write a C99
-- 
cgit v1.2.3


From fba67be225e2c8d2f4fb6455042c84b18ad59b89 Mon Sep 17 00:00:00 2001
From: "(" 
Date: Mon, 8 Aug 2022 20:08:39 +0100
Subject: gnu: pcc: Respect --without-tests.

* gnu/packages/c.scm (pcc)[arguments]<#:phases>{check}: Respect the
  `tests?` argument.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/c.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 113a331070..39f048e993 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -197,8 +197,9 @@ (define-public pcc
                    (substitute* (list "cc/ccom/scan.l" "cc/cxxcom/scan.l")
                      (("lineno, ") ""))))
                (replace 'check
-                 (lambda _
-                   (invoke "make" "-C" "cc/cpp" "test"))))))
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (invoke "make" "-C" "cc/cpp" "test")))))))
     (native-inputs (list bison flex))
     (synopsis "Portable C compiler")
     (description
-- 
cgit v1.2.3


From 9d96325e017490c9ed39e501c15f8d97f0142809 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Mon, 6 Jun 2022 06:29:18 -0400
Subject: gnu: vtk: Enable the RenderingExternal module.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/image-processing.scm (vtk)[arguments]<#:configure-flags>:
Add -DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES.

Signed-off-by: 宋文武 
---
 gnu/packages/image-processing.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 158d470828..3dfe086af8 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -358,6 +358,7 @@ (define-public vtk
                            "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON"
                            "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON"
                            "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON"
+                           "-DVTK_MODULE_ENABLE_VTK_RenderingExternal=YES" ; For F3D
                            "-DVTK_WRAP_PYTHON=ON"
                            "-DVTK_PYTHON_VERSION:STRING=3"
                            )
-- 
cgit v1.2.3


From 5c131aff691fa1cb0fafe71b5f2795902ae056a7 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Mon, 6 Jun 2022 06:33:27 -0400
Subject: gnu: Add f3d.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/graphics.scm (f3d): New variable.

Signed-off-by: 宋文武 
---
 gnu/packages/graphics.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 4920f613a5..4e0961b9e4 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2022 John Kehayias 
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2022 Tobias Kortkamp 
+;;; Copyright © 2022 Paul A. Patience 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2173,3 +2174,73 @@ (define-public azpainter
 @end itemize
 ")
     (license license:gpl3+)))
+
+(define-public f3d
+  ;; There have been many improvements since the last tagged version (1.2.1,
+  ;; released in December 2021), including support for the Alembic file
+  ;; format.
+  (let ((commit "9cc79b65ed750b178f58012dbba091aa24722dab")
+        (revision "0"))
+    (package
+      (name "f3d")
+      (version (git-version "1.2.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/f3d-app/f3d")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "041gqi2wfny2br4j68vhifg0bd18kbl0qsaallkz7yywk47njxfi"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list
+        ;; Many tests require files supplied by git-lfs.
+        ;; Also, some tests segfault (after an exception?) but the tested
+        ;; behavior, i.e., when the program is run manually, does not (for
+        ;; example, TestNonExistentConfigFile and TestInvalidConfigFile).
+        ;; Upstream is aware of occasionally flaky tests (see
+        ;; https://github.com/f3d-app/f3d/issues/92) but the tests run in CI
+        ;; seem to be passing.
+        ;; Anyway, the program runs and is able to open at least STL files
+        ;; without issue.
+        #:tests? #f
+        #:configure-flags
+        #~(list "-DBUILD_TESTING=OFF"
+                "-DF3D_MODULE_ALEMBIC=ON"
+                "-DF3D_MODULE_ASSIMP=ON"
+                "-DF3D_MODULE_OCCT=ON"
+                ;; Prefer Guix's versioned documentation directory to F3D's
+                ;; unversioned one.
+                (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output
+                               "/share/doc/" #$name "-" #$version))))
+      (inputs
+       (list alembic
+             assimp
+             double-conversion
+             eigen
+             expat
+             fontconfig
+             freetype
+             glew
+             hdf5
+             imath
+             jsoncpp
+             libjpeg-turbo
+             libpng
+             libtiff
+             libx11
+             lz4
+             netcdf
+             opencascade-occt
+             vtk
+             zlib))
+      (home-page "https://f3d-app.github.io/f3d/")
+      (synopsis "VTK based 3D viewer")
+      (description "F3D (pronounced @samp{/fɛd/}) is a VTK-based 3D viewer, it
+has simple interaction mechanisms and is fully controllable using arguments on
+the command line.  It supports a range of file formats (including animated
+glTF, STL, STEP, PLY, OBJ, FBX), and provides numerous rendering and texturing
+options.")
+      (license license:bsd-3))))
-- 
cgit v1.2.3


From 36c5fa6c4d50999ca533be882e743a061b3ad0d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 7 Aug 2022 02:00:00 +0200
Subject: gnu: unzip: Use G-expressions.

* gnu/packages/compression.scm (unzip)[arguments]:
Rewrite as G-expressions.
---
 gnu/packages/compression.scm | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 6854bcafe4..026629cad1 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1818,25 +1818,29 @@ (define-public unzip
     (build-system gnu-build-system)
     ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (add-after 'unpack 'fortify
-                    (lambda _
-                      ;; Mitigate CVE-2018-1000035, an exploitable buffer overflow.
-                      ;; This environment variable is recommended in 'unix/Makefile'
-                      ;; for passing flags to the C compiler.
-                      (setenv "LOCAL_UNZIP" "-D_FORTIFY_SOURCE=1")
-                      #t))
-                  (replace 'build
-                    (lambda* (#:key make-flags #:allow-other-keys)
-                      (apply invoke "make"
-                             `("-j" ,(number->string
-                                      (parallel-job-count))
-                               ,@make-flags
-                               "generic_gcc")))))
-       #:make-flags (list "-f" "unix/Makefile"
-                          (string-append "prefix=" %output)
-                          (string-append "MANDIR=" %output "/share/man/man1"))))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)
+               (add-after 'unpack 'fortify
+                 (lambda _
+                   ;; Mitigate CVE-2018-1000035, an exploitable buffer overflow.
+                   ;; This environment variable is recommended in 'unix/Makefile'
+                   ;; for passing flags to the C compiler.
+                   (setenv "LOCAL_UNZIP" "-D_FORTIFY_SOURCE=1")
+                   #t))
+               (replace 'build
+                 (lambda* (#:key make-flags #:allow-other-keys)
+                   (apply invoke "make"
+                          `("-j" ,(number->string
+                                   (parallel-job-count))
+                            ,@make-flags
+                            "generic_gcc")))))
+           #:make-flags
+           ;; Fix cross-compilation without affecting native builds, as doing so
+           ;; would trigger too many rebuilds: https://issues.guix.gnu.org/57127
+           #~(list "-f" "unix/Makefile"
+                   (string-append "prefix=" %output)
+                   (string-append "MANDIR=" %output "/share/man/man1"))))
     (home-page "http://www.info-zip.org/UnZip.html")
     (synopsis "Decompression and file extraction utility")
     (description
-- 
cgit v1.2.3


From 45db0ca5e9b8a7bca34d8c87d76debfda56c824d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 7 Aug 2022 02:00:00 +0200
Subject: gnu: unzip: Fix cross-compilation.

Fixes .

* gnu/packages/compression.scm (unzip)[arguments]: Use #$output when
cross-compiling.
---
 gnu/packages/compression.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 026629cad1..684979018c 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1838,9 +1838,13 @@ (define-public unzip
            #:make-flags
            ;; Fix cross-compilation without affecting native builds, as doing so
            ;; would trigger too many rebuilds: https://issues.guix.gnu.org/57127
-           #~(list "-f" "unix/Makefile"
-                   (string-append "prefix=" %output)
-                   (string-append "MANDIR=" %output "/share/man/man1"))))
+           (if (%current-target-system)
+               #~(list "-f" "unix/Makefile"
+                       (string-append "prefix=" #$output)
+                       (string-append "MANDIR=" #$output "/share/man/man1"))
+               #~(list "-f" "unix/Makefile"
+                       (string-append "prefix=" %output)
+                       (string-append "MANDIR=" %output "/share/man/man1")))))
     (home-page "http://www.info-zip.org/UnZip.html")
     (synopsis "Decompression and file extraction utility")
     (description
-- 
cgit v1.2.3


From ffed9a31ff51d8ce5389690aa10a5d7393e51c69 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 11 Aug 2022 14:42:06 +0200
Subject: gnu: Add r-fmri.

* gnu/packages/cran.scm (r-fmri): New variable.
---
 gnu/packages/cran.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 7a3868ed7b..736db423fe 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -13955,6 +13955,30 @@ (define-public r-ouch
 for evolution along a phylogenetic tree.")
     (license license:gpl2+)))
 
+(define-public r-fmri
+  (package
+    (name "r-fmri")
+    (version "1.9.6")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "fmri" version))
+              (sha256
+               (base32
+                "1wh77xwpm8f9d9vky3r7vfmkik3hls008ifk8hkm2rq6i06jj53n"))))
+    (properties `((upstream-name . "fmri")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-aws r-metafor r-nlme))
+    (native-inputs (list gfortran))
+    (home-page "http://www.wias-berlin.de/software/imaging/")
+    (synopsis "Analysis of fMRI experiments")
+    (description
+     "This package contains R-functions to perform an fMRI analysis as
+described in Polzehl and Tabelow (2019) ,
+Tabelow et al. (2006) , Polzehl et
+al. (2010) , Tabelow and Polzehl (2011)
+.")
+    (license license:gpl2+)))
+
 (define-public r-fmsb
   (package
     (name "r-fmsb")
-- 
cgit v1.2.3


From df31b5c6c6a44f2d3be90453f06a554e93606c53 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 11 Aug 2022 14:53:45 +0200
Subject: gnu: Add r-adimpro.

* gnu/packages/cran.scm (r-adimpro): New variable.
---
 gnu/packages/cran.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 736db423fe..3a6f285f0f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14063,6 +14063,31 @@ (define-public r-adgoftest
     ;; Any version of the GPL.
     (license license:gpl3+)))
 
+(define-public r-adimpro
+  (package
+    (name "r-adimpro")
+    (version "0.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "adimpro" version))
+              (sha256
+               (base32
+                "0njw38vcdm02sni193nj10mpv7hiklpamrkjlz5bnhjxx9mvf4cl"))))
+    (properties `((upstream-name . "adimpro")))
+    (build-system r-build-system)
+    (propagated-inputs
+     (list r-awsmethods
+           imagemagick))
+    (native-inputs (list gfortran))
+    (home-page "https://www.wias-berlin.de/software/imaging/")
+    (synopsis "Adaptive smoothing of digital images")
+    (description
+     "This package implements tools for manipulation of digital images and the
+Propagation Separation approach by Polzehl and Spokoiny (2006)
+ for smoothing digital images, see Polzehl and
+Tabelow (2007) .")
+    (license license:gpl2+)))
+
 (define-public r-admisc
   (package
     (name "r-admisc")
-- 
cgit v1.2.3


From 2a38dfbf17b2438496d2ca4423a22585aa179d37 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 11 Aug 2022 15:17:26 +0200
Subject: gnu: Add r-oro-nifti.

* gnu/packages/cran.scm (r-oro-nifti): New variable.
---
 gnu/packages/cran.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3a6f285f0f..61933ecb9f 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14113,6 +14113,27 @@ (define-public r-admisc
 the base function @code{with()}.")
     (license license:gpl3+)))
 
+(define-public r-oro-nifti
+  (package
+    (name "r-oro-nifti")
+    (version "0.11.4")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "oro.nifti" version))
+              (sha256
+               (base32
+                "01mn90qxb7i15zr83xrl2cn4akayfzpm83r5x71zczz3qb9gbr7g"))))
+    (properties `((upstream-name . "oro.nifti")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-abind r-bitops r-rnifti))
+    (home-page "https://rigorousanalytics.blogspot.com")
+    (synopsis "Vizualization of medical imaging data")
+    (description
+     "This package provides functions for the input/output and visualization
+of medical imaging data that follow either the ANALYZE, NIfTI or AFNI formats.
+This package is part of the Rigorous Analytics bundle.")
+    (license license:bsd-3)))
+
 (define-public r-sodium
   (package
     (name "r-sodium")
-- 
cgit v1.2.3


From df63e8ba96befa10a17c6d75af9fa96c5ba2e5c5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 11 Aug 2022 15:17:39 +0200
Subject: gnu: Add r-mritc.

* gnu/packages/cran.scm (r-mritc): New variable.
---
 gnu/packages/cran.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 61933ecb9f..70e66dbeb4 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14134,6 +14134,26 @@ (define-public r-oro-nifti
 This package is part of the Rigorous Analytics bundle.")
     (license license:bsd-3)))
 
+(define-public r-mritc
+  (package
+    (name "r-mritc")
+    (version "0.5-2")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "mritc" version))
+              (sha256
+               (base32
+                "07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"))))
+    (properties `((upstream-name . "mritc")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-lattice r-misc3d r-oro-nifti))
+    (home-page "https://cran.r-project.org/package=mritc")
+    (synopsis "MRI tissue classification")
+    (description "This package provides various methods for MRI tissue
+classification.")
+    ;; Any version of the GPL.
+    (license license:gpl3+)))
+
 (define-public r-sodium
   (package
     (name "r-sodium")
-- 
cgit v1.2.3


From bbc99a6e614d111673fa858c95e0cb404fb31d11 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus 
Date: Thu, 11 Aug 2022 15:17:55 +0200
Subject: gnu: Add r-qmri.

* gnu/packages/cran.scm (r-qmri): New variable.
---
 gnu/packages/cran.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 70e66dbeb4..4ad1bfa760 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -14558,6 +14558,33 @@ (define-public r-qlcmatrix
 @dfn{quantitative language comparison} (QLC).")
     (license license:gpl3)))
 
+(define-public r-qmri
+  (package
+    (name "r-qmri")
+    (version "1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "qMRI" version))
+              (sha256
+               (base32
+                "10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"))))
+    (properties `((upstream-name . "qMRI")))
+    (build-system r-build-system)
+    (propagated-inputs (list r-adimpro r-aws r-awsmethods r-oro-nifti
+                             r-stringr))
+    (native-inputs (list gfortran r-knitr))
+    (home-page "http://www.wias-berlin.de/research/ats/imaging/")
+    (synopsis "Methods for quantitative magnetic resonance imaging (qMRI)")
+    (description
+     "This package provides implementation of methods for estimation of
+quantitative maps from @dfn{Multi-Parameter Mapping} (MPM) acquisitions
+including adaptive smoothing methods in the framework of the ESTATICS model.
+The smoothing method is described in Mohammadi et
+al. (2017). .  Usage of the package is also
+described in Polzehl and Tabelow (2019), Magnetic Resonance Brain Imaging,
+Chapter 6, Springer, Use R! Series. .")
+    (license license:gpl2+)))
+
 (define-public r-ddrtree
   (package
     (name "r-ddrtree")
-- 
cgit v1.2.3


From cbbb5aa9d4ee51c54f56ebef79f7c3552308f32b Mon Sep 17 00:00:00 2001
From: Timotej Lazar 
Date: Thu, 11 Aug 2022 12:12:54 +0200
Subject: gnu: wpa-supplicant-gui: Fix build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/admin.scm (wpa-supplicant-gui)[build-system]: Use
qt-build-system.
[phases]: Use G-exps. Drop trailing #t. Don’t wrap-program as that is done by
the build system. Set $HOME to a writable directory when converting icons to
stop Inkscape complaining.

Signed-off-by: Mathieu Othacehe 
---
 gnu/packages/admin.scm | 51 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 146423d068..4e8da94b5d 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages admin)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system ruby)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
@@ -2145,34 +2146,30 @@ (define-public wpa-supplicant-gui
      ;; For icons.
      (modify-inputs (package-native-inputs wpa-supplicant)
        (prepend imagemagick inkscape/stable)))
+    (build-system qt-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'chdir
-                    (lambda _
-                      (chdir "wpa_supplicant/wpa_gui-qt4")
-                      #t))
-                  (delete 'configure)
-                  (replace 'build
-                    (lambda _
-                      (invoke "qmake" "wpa_gui.pro")
-                      (invoke "make" "-j" (number->string (parallel-job-count)))
-                      (invoke "make" "-C" "icons")))
-                  (replace 'install
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out"))
-                            (qt '("qtbase" "qtsvg-5")))
-                        (install-file "wpa_gui" (string-append out "/bin"))
-                        (install-file "wpa_gui.desktop"
-                                      (string-append out "/share/applications"))
-                        (copy-recursively "icons/hicolor"
-                                          (string-append out "/share/icons/hicolor"))
-                        (wrap-program (string-append out "/bin/wpa_gui")
-                          `("QT_PLUGIN_PATH" ":" prefix
-                            ,(map (lambda (label)
-                                    (string-append (assoc-ref inputs label)
-                                                   "/lib/qt5/plugins/"))
-                                  qt)))
-                        #t))))))
+     (list
+      #:test-target "check"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'chdir
+            (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4")))
+          (replace 'configure
+            (lambda _ (invoke "qmake" "wpa_gui.pro")))
+          (add-after 'build 'build-icons
+            (lambda _
+              ;; Inkscape complains (but works) without a writable $HOME.
+              (setenv "HOME" "/tmp")
+              (invoke "make" "-C" "icons")))
+          (replace 'install
+            (lambda _
+              (install-file "wpa_gui" (string-append #$output "/bin"))
+              (install-file "wpa_gui.desktop"
+                            (string-append #$output
+                                           "/share/applications"))
+              (copy-recursively "icons/hicolor"
+                                (string-append #$output
+                                               "/share/icons/hicolor")))))))
     (synopsis "Graphical user interface for WPA supplicant")))
 
 (define-public hostapd
-- 
cgit v1.2.3


From 1a43e0067b6754b2b1305376c66e8c59eccc89ea Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer 
Date: Wed, 10 Aug 2022 13:14:51 -0400
Subject: gnu: gnome-themes-standard: Deprecate in favor of gnome-themes-extra.

* gnu/packages/gnome.scm (gnome-themes-standard): Mark as deprecated by
gnome-themes-extra.
(gnome)[inputs]: Remove gnome-themes-extra.
---
 gnu/packages/gnome.scm | 40 +++-------------------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3c4251286b..291bd8c3ac 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4321,42 +4321,6 @@ (define-public drawing
      "Drawing is a basic image editor aiming at the GNOME desktop.")
     (license license:gpl3+)))
 
-(define-public gnome-themes-standard
-  (package
-    (name "gnome-themes-standard")
-    (version "3.22.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://gnome/sources/" name "/"
-                           (version-major+minor version) "/" name "-"
-                           version ".tar.xz"))
-       (sha256
-        (base32
-         "0smmiamrgcgf5sa88bsn8hwmvsyx4gczzs359nwxbkv14b2qgp31"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags
-       ;; Don't create 'icon-theme.cache'.
-       (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
-              (true      (string-append coreutils "/bin/true")))
-         (list (string-append "GTK_UPDATE_ICON_CACHE=" true)))))
-    (inputs
-     `(("gtk+" ,gtk+)
-       ("gtk+-2" ,gtk+-2)
-       ("librsvg" ,librsvg)
-       ("libxml2" ,libxml2)
-       ("glib" ,glib)))
-    (native-inputs
-     `(("intltool" ,intltool)
-       ("glib:bin" ,glib "bin")
-       ("pkg-config" ,pkg-config)))
-    (home-page "https://launchpad.net/gnome-themes-standard")
-    (synopsis "Default GNOME 3 themes")
-    (description
-     "The default GNOME 3 themes (Adwaita and some accessibility themes).")
-    (license license:lgpl2.1+)))
-
 (define-public seahorse
   (package
     (name "seahorse")
@@ -9565,7 +9529,6 @@ (define-public gnome
        ("dconf"                     ,dconf)
        ("desktop-file-utils"        ,desktop-file-utils)
        ("gnome-default-applications" ,gnome-default-applications)
-       ("gnome-themes-standard"     ,gnome-themes-standard)
        ("gst-plugins-base"          ,gst-plugins-base)
        ("gst-plugins-good"          ,gst-plugins-good)
        ("gucharmap"                 ,gucharmap)
@@ -11579,6 +11542,9 @@ (define-public gnome-themes-extra
 index files needed for Adwaita to be used outside of GNOME.")
     (license license:lgpl2.1+)))
 
+(define-public gnome-themes-standard
+  (deprecated-package "gnome-themes-standard" gnome-themes-extra))
+
 (define-public gnote
   (package
     (name "gnote")
-- 
cgit v1.2.3


From b0f298e2c656879cf68a8df5e820ab396e860a1d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 11 Aug 2022 17:50:17 +0300
Subject: gnu: lcrq: Use test-target.

* gnu/packages/networking.scm (lcrq)[arguments]: Set test-target. Remove
custom 'check phase.
---
 gnu/packages/networking.scm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 741cd74df8..392e28aad1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -14,7 +14,7 @@
 ;;; Copyright © 2016, 2017 Pjotr Prins 
 ;;; Copyright © 2017 Mathieu Othacehe 
 ;;; Copyright © 2017, 2020, 2021 Leo Famulari 
-;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner 
+;;; Copyright © 2017-2022 Efraim Flashner 
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling 
 ;;; Copyright © 2017, 2019 Gábor Boskovits 
 ;;; Copyright © 2017 Thomas Danckaert 
@@ -260,10 +260,7 @@ (define-public lcrq
                                             (cc-for-target))
                             (string-append "PREFIX="
                                            (assoc-ref %outputs "out"))))
-       #:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda _
-                      (invoke "make" "test"))))))
+       #:test-target "test"))
     (home-page "https://librecast.net/lcrq.html")
     (synopsis "librecast RaptorQ library")
     (description
-- 
cgit v1.2.3


From b62c3fbd779a07a07d2ad3493580dd4fdb617f4d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 11 Aug 2022 17:57:55 +0300
Subject: gnu: librecast: Use test-target.

* gnu/packages/networking.scm (librecast)[arguments]: Set test-target.
Remove custom 'check phase.
---
 gnu/packages/networking.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 392e28aad1..f4d2165c0f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -486,6 +486,7 @@ (define-public librecast
                                             (cc-for-target))
                             (string-append "PREFIX="
                                            (assoc-ref %outputs "out"))))
+       #:test-target "test"
        #:phases (modify-phases %standard-phases
                   (add-before 'check 'remove-network-tests
                     (lambda _
@@ -504,10 +505,7 @@ (define-public librecast
                       (delete-file "./test/0000-0037.c")
                       (delete-file "./test/0000-0038.c")
                       (delete-file "./test/0000-0039.c")
-                      (delete-file "./test/0000-0040.c")))
-                  (replace 'check
-                    (lambda _
-                      (invoke "make" "test"))))))
+                      (delete-file "./test/0000-0040.c"))))))
     (inputs (list libsodium lcrq))
     (synopsis "librecast IPv6 multicast library")
     (description "Librecast is a C library which supports IPv6 multicast
-- 
cgit v1.2.3


From ee981ba5f90bd3ba3f958cd0a2d08a68fd63ce7e Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 11 Aug 2022 18:04:33 +0300
Subject: gnu: lcsync: Use test-target.

* gnu/packages/networking.scm (lcsync)[arguments]: Set test-target.
Remove custom 'check phase.
---
 gnu/packages/networking.scm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f4d2165c0f..8c5ef72f7f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -295,6 +295,7 @@ (define-public lcsync
                             "SETCAP_PROGRAM=true"
                             (string-append "prefix="
                                            (assoc-ref %outputs "out"))))
+       #:test-target "test"
        #:phases (modify-phases %standard-phases
                   (delete 'configure) ;no configure script
                   (add-before 'check 'remove-network-tests
@@ -303,9 +304,6 @@ (define-public lcsync
                       (delete-file "./test/0000-0027.c")
                       (delete-file "./test/0000-0049.c")
                       (delete-file "./test/0000-0074.c")))
-                  (replace 'check
-                    (lambda _
-                      (invoke "make" "test" "CC=gcc")))
                   (add-before 'build 'add-library-paths
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let* ((librecast (assoc-ref inputs "librecast")))
-- 
cgit v1.2.3


From 0f6dc5478063e0f48bfc58fe4db99f17e495991d Mon Sep 17 00:00:00 2001
From: Efraim Flashner 
Date: Thu, 11 Aug 2022 19:34:01 +0300
Subject: gnu: lcsync: Fix building on non-x86 hardware.

* gnu/packages/networking.scm (lcsync)[arguments]: Add phase to use
simde instead of immintrin.h directly.
[native-inputs]: Add simde.
---
 gnu/packages/networking.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 8c5ef72f7f..21c9014cfe 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -89,6 +89,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autogen)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
@@ -304,6 +305,17 @@ (define-public lcsync
                       (delete-file "./test/0000-0027.c")
                       (delete-file "./test/0000-0049.c")
                       (delete-file "./test/0000-0074.c")))
+                  (add-after 'unpack 'remove-immintrin.h
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      (substitute* "Makefile"
+                        (("CFLAGS :=")
+                         (string-append "CFLAGS := -I" (search-input-directory
+                                                         inputs "include/simde"))))
+                      (substitute* (find-files "src")
+                        ((".*immintrin\\.h.*")
+                         (string-append "#include \n"
+                                        "#include \n"))
+                        (("__m128i") "simde__m128i"))))
                   (add-before 'build 'add-library-paths
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let* ((librecast (assoc-ref inputs "librecast")))
@@ -311,6 +323,7 @@ (define-public lcsync
                           (("-llibrecast")
                            (string-append "-L" librecast "/lib -llibrecast")))))))))
     (inputs (list librecast libsodium))
+    (native-inputs (list simde))
     (home-page "https://librecast.net/lcsync.html")
     (synopsis "librecast file and data syncing tool")
     (description
-- 
cgit v1.2.3


From c1a6c6e6d74861b3371fecc9e992b99993564b85 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Thu, 11 Aug 2022 12:13:47 +0200
Subject: gnu: gap: Update to 4.11.1.

* gnu/packages/algebra.scm (gap): Update to 4.11.1.
[source]: Remove trailing #t.
[arguments]: Remove trailing #t. Install missing config.h header.

Co-authored-by: vicvbcun 
---
 gnu/packages/algebra.scm | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index dbf42ce2db..c6b04ada4f 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1206,17 +1206,17 @@ (define-public xtensor-benchmark
 (define-public gap
   (package
     (name "gap")
-    (version "4.11.0")
+    (version "4.11.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://files.gap-system.org/gap-"
                            (version-major+minor version)
-                           "/tar.bz2/gap-"
+                           "/tar.gz/gap-"
                            version
-                           ".tar.bz2"))
+                           ".tar.gz"))
        (sha256
-        (base32 "00l6hvy4iggnlrib4vp805sxdm3j7n3hzpv5zs9hbiiavh80l1xz"))
+        (base32 "01535s81h254zcs84zi95xqmhvvn6fn9qss8761myxc2gpdcadb6"))
        (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
        (snippet
         '(begin
@@ -1249,9 +1249,7 @@ (define-public gap
                    "alnuth-"
                    "autpgrp-"
                    "crisp-"      ; bsd-2
-                   "ctbllib"     ; gpl3+, clarified in the next release;
-                                 ; see
-                                 ; http://www.math.rwth-aachen.de/~Thomas.Breuer/ctbllib/README.md
+                   "ctbllib"     ; gpl3+
                    "FactInt-"
                    "fga"
                    "irredsol-"   ; bsd-2
@@ -1262,8 +1260,7 @@ (define-public gap
                    "resclasses-"
                    "sophus-"
                    "tomlib-"
-                   "utils-"))))
-           #t))))
+                   "utils-"))))))))
     (build-system gnu-build-system)
     (inputs
      (list gmp readline zlib))
@@ -1280,14 +1277,12 @@ (define-public gap
            (lambda _
              (setenv "CONFIG_SHELL" (which "bash"))
              (with-directory-excursion "pkg"
-               (invoke "../bin/BuildPackages.sh")
-             #t)))
+               (invoke "../bin/BuildPackages.sh"))))
          (add-after 'build-packages 'build-doc
            ;; The documentation is bundled, but we create it from source.
            (lambda _
              (with-directory-excursion "doc"
-               (invoke "./make_doc"))
-             #t))
+               (invoke "./make_doc"))))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -1312,6 +1307,8 @@ (define-public gap
                (chmod prog #o755)
                ;; Install the headers and library, which are needed by Sage.
                (invoke "make" "install-headers")
+               (install-file "gen/config.h"
+                             (string-append out "/include/gap"))
                (invoke "make" "install-libgap")
                ;; Remove information on the build directory from sysinfo.gap.
                (substitute* "sysinfo.gap"
@@ -1321,8 +1318,7 @@ (define-public gap
                (invoke "make" "install-gaproot")
                ;; Copy the directory of compiled packages; the make target
                ;; install-pkg is currently empty.
-               (copy-recursively "pkg" (string-append share "/pkg")))
-             #t)))))
+               (copy-recursively "pkg" (string-append share "/pkg"))))))))
     (home-page "https://www.gap-system.org/")
     (synopsis
      "System for computational group theory")
-- 
cgit v1.2.3


From 9a97097af1ca8eb041b55829facca83b516bb024 Mon Sep 17 00:00:00 2001
From: Andreas Enge 
Date: Thu, 11 Aug 2022 19:41:38 +0200
Subject: gnu: gap: Enable compilation of more optional packages.

* gnu/packages/algebra.scm (gap): Add to the whitelist GAP packages
with free licenses clarified in the latest release, and which do not require
additional inputs.
---
 gnu/packages/algebra.scm | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index c6b04ada4f..b3f0823daf 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1242,24 +1242,41 @@ (define-public gap
                    "SmallGrp-"   ; artistic2.0
                    "transgrp"    ; artistic2.0 for data,
                                  ; gpl2 or gpl3 for code
-                   ;; Recommended package.
-                   "io-"         ; gpl3+
-                   ;; Optional packages, searched for at start,
-                   ;; and their depedencies.
+                   ;; Optional packages.
                    "alnuth-"
+                   "AutoDoc-"
+                   "automata-"
                    "autpgrp-"
+                   "crime-"
                    "crisp-"      ; bsd-2
                    "ctbllib"     ; gpl3+
+                   "datastructures"
                    "FactInt-"
                    "fga"
+                   "format"
+                   "groupoids-"
+                   "guarana"
+                   "idrel-"
+                   "images-"     ; mpl2.0
+                   "IntPic-"
+                   "io-"         ; gpl3+
                    "irredsol-"   ; bsd-2
                    "laguna-"
+                   "liering-"
+                   "MapClass-"
+                   "nilmat-"
+                   "NumericalSgps-"
+                   "OpenMath-"
+                   "orb-"        ; gpl3+
                    "polenta-"
                    "polycyclic-"
                    "radiroot-"
+                   "repsn-"
                    "resclasses-"
+                   "simpcomp"
                    "sophus-"
                    "tomlib-"
+                   "unipot-"
                    "utils-"))))))))
     (build-system gnu-build-system)
     (inputs
-- 
cgit v1.2.3


From 358849986b62ceff96cca77dc8d410f40009252e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice 
Date: Sun, 7 Aug 2022 02:00:00 +0200
Subject: gnu: tor: Update to 0.4.7.9 [DoS mitigations].

* gnu/packages/tor.scm (tor): Update to 0.4.7.9.
---
 gnu/packages/tor.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 613575ae0e..a6a1f4edfb 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -60,14 +60,14 @@ (define-module (gnu packages tor)
 (define-public tor
   (package
     (name "tor")
-    (version "0.4.7.8")
+    (version "0.4.7.9")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://dist.torproject.org/tor-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "15g1dyk0y2lrcr039y5b10bnn1zd3xcys55yz3qdbk9ammkmr6ly"))))
+               "08lva4jrash1fhq8vim56alria5kfganmp3y3lhddx08h9cki7fk"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-- 
cgit v1.2.3


From 38069657818acc7974f67ae3d79460c540d51f89 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 11:34:45 +0200
Subject: gnu: python-pyicu: Update home page.

* gnu/packages/python-xyz.scm (python-pyicu)[home-page]: Change to current.
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c21fe67f20..b02bbfc2c9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2820,7 +2820,7 @@ (define-public python-pyicu
      (list icu4c))
     (native-inputs
      (list python-pytest python-six))
-    (home-page "https://github.com/ovalhub/pyicu")
+    (home-page "https://gitlab.pyicu.org/main/pyicu")
     (synopsis "Python extension wrapping the ICU C++ API")
     (description
      "PyICU is a python extension wrapping the ICU C++ API.")
-- 
cgit v1.2.3


From e3e678000d53fc85fcbed305f92aa0a17df414bb Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 11:35:14 +0200
Subject: gnu: python-pyicu: Update to 2.9.

* gnu/packages/python-xyz.scm (python-pyicu): Update to 2.9.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b02bbfc2c9..d262cf37fc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2807,14 +2807,14 @@ (define-public python-simplejson
 (define-public python-pyicu
   (package
     (name "python-pyicu")
-    (version "2.7.4")
+    (version "2.9")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "PyICU" version))
       (sha256
        (base32
-        "0mkz1673qxldxs4mrqg9882xgmz5fhpia17yrsd6z8dfw8156rf0"))))
+        "0y2qhh443vydi3y7kmhyb6kz3z6d7qq7ld0sg88mfqalcp7dca9w"))))
     (build-system python-build-system)
     (inputs
      (list icu4c))
-- 
cgit v1.2.3


From 25a3d3514627ba219e5fb10249a89b57ec110772 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:22:28 +0200
Subject: gnu: catch2@1: Adjust for glibc 2.34 and later.

* gnu/packages/check.scm (catch-framework2-1)[source](modules, snippet): New
fields.
---
 gnu/packages/check.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6ad2b1acd8..75bd20cff9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -452,7 +452,16 @@ (define-public catch-framework2-1
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23"))))
+                "1gdp5wm8khn02g2miz381llw3191k7309qj8s3jd6sasj01rhf23"))
+              (modules '((guix build utils)))
+              (snippet
+               '(substitute* '("include/internal/catch_fatal_condition.hpp"
+                               "single_include/catch.hpp")
+                  ;; In glibc 2.34 and later, SIGSTKSZ is no longer a
+                  ;; compile-time constant.  Hard code a reasonably large
+                  ;; value.
+                  (("SIGSTKSZ")
+                   "32768")))))
     (build-system cmake-build-system)
     (synopsis "Automated test framework for C++ and Objective-C")
     (description "Catch2 stands for C++ Automated Test Cases in Headers and is
-- 
cgit v1.2.3


From 3a76c2bfd94557c9776aa11240fec14580aec1b0 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:23:16 +0200
Subject: gnu: libvirt, python-libvirt: Update to 8.6.0.

* gnu/packages/patches/libvirt-add-install-prefix.patch: Refresh patch.
* gnu/packages/virtualization.scm (libvirt): Update to 8.6.0.
(python-libvirt): Update to 8.6.0.
[arguments]: Remove, as the default test phase works fine.
---
 .../patches/libvirt-add-install-prefix.patch       | 268 +++++++++++++++------
 gnu/packages/virtualization.scm                    |  20 +-
 2 files changed, 198 insertions(+), 90 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/patches/libvirt-add-install-prefix.patch b/gnu/packages/patches/libvirt-add-install-prefix.patch
index 1331fa9b6f..9ad339d82f 100644
--- a/gnu/packages/patches/libvirt-add-install-prefix.patch
+++ b/gnu/packages/patches/libvirt-add-install-prefix.patch
@@ -1,7 +1,8 @@
-Patch from NixOS: 
-https://raw.githubusercontent.com/NixOS/nixpkgs/b98031a49c66095dd1eb9185ecdaeeb5e3cd752d/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+Patch from NixOS:
 
-From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001
+  https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
+
+From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001
 From: Euan Kemp 
 Date: Thu, 14 Jan 2021 00:32:00 -0800
 Subject: [PATCH] meson: patch in an install prefix for building on nix
@@ -9,22 +10,9 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix
 Used in the nixpkgs version of libvirt so that we can install things in
 the nix store, but read them from the root filesystem.
 ---
- meson.build                       |  9 +++++++++
- meson_options.txt                 |  2 ++
- src/libxl/meson.build             |  6 +++---
- src/locking/meson.build           |  8 ++++----
- src/lxc/meson.build               |  6 +++---
- src/meson.build                   | 18 +++++++++---------
- src/network/meson.build           | 12 ++++++------
- src/nwfilter/xml/meson.build      |  2 +-
- src/qemu/meson.build              | 14 +++++++-------
- src/remote/meson.build            |  6 +++---
- src/security/apparmor/meson.build |  8 ++++----
- tools/meson.build                 |  4 ++--
- 12 files changed, 53 insertions(+), 42 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b5164f6..33719f1 100644
+index 9016c0458a..b26e690194 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -39,6 +39,8 @@ if host_machine.system() == 'windows'
@@ -51,7 +39,7 @@ index b5164f6..33719f1 100644
  # sysconfdir as this makes a lot of things break in testing situations
  if prefix == '/usr'
 diff --git a/meson_options.txt b/meson_options.txt
-index e5d79c2..081cd32 100644
+index 5b43cdbd6b..e9dff18441 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,3 +1,5 @@
@@ -60,27 +48,67 @@ index e5d79c2..081cd32 100644
  option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update')
  option('packager', type: 'string', value: '', description: 'Extra packager name')
  option('packager_version', type: 'string', value: '', description: 'Extra packager version')
+diff --git a/src/ch/meson.build b/src/ch/meson.build
+index 66b77907b0..6aa9bbc548 100644
+--- a/src/ch/meson.build
++++ b/src/ch/meson.build
+@@ -64,8 +64,8 @@ if conf.has('WITH_CH')
+   }
+ 
+   virt_install_dirs += [
+-    localstatedir / 'lib' / 'libvirt' / 'ch',
+-    localstatedir / 'log' / 'libvirt' / 'ch',
+-    runstatedir / 'libvirt' / 'ch',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch',
++    install_prefix + localstatedir / 'log' / 'libvirt' / 'ch',
++    install_prefix + runstatedir / 'libvirt' / 'ch',
+   ]
+ endif
+diff --git a/src/interface/meson.build b/src/interface/meson.build
+index 828f274422..2a6b1f8c5e 100644
+--- a/src/interface/meson.build
++++ b/src/interface/meson.build
+@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE')
+   }
+ 
+   virt_install_dirs += [
+-    runstatedir / 'libvirt' / 'interface',
++    install_prefix + runstatedir / 'libvirt' / 'interface',
+   ]
+ endif
 diff --git a/src/libxl/meson.build b/src/libxl/meson.build
-index 3bb6cc5..78d7be0 100644
+index 0cc277db82..48d8c5b962 100644
 --- a/src/libxl/meson.build
 +++ b/src/libxl/meson.build
-@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL')
+@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL')
    }
  
    virt_install_dirs += [
+-    confdir / 'libxl',
+-    confdir / 'libxl' / 'autostart',
 -    localstatedir / 'lib' / 'libvirt' / 'libxl',
--    runstatedir / 'libvirt' / 'libxl',
+-    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
+-    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
+-    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
+-    localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
 -    localstatedir / 'log' / 'libvirt' / 'libxl',
+-    runstatedir / 'libvirt' / 'libxl',
++    install_prefix + confdir / 'libxl',
++    install_prefix + confdir / 'libxl' / 'autostart',
 +    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl',
-+    install_prefix + runstatedir / 'libvirt' / 'libxl',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
 +    install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl',
++    install_prefix + runstatedir / 'libvirt' / 'libxl',
    ]
  endif
 diff --git a/src/locking/meson.build b/src/locking/meson.build
-index 8a28310..9da81cc 100644
+index 72f7780438..abe70d20d5 100644
 --- a/src/locking/meson.build
 +++ b/src/locking/meson.build
-@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD')
+@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD')
    }
  
    virt_install_dirs += [
@@ -100,26 +128,39 @@ index 8a28310..9da81cc 100644
    endif
  endif
 diff --git a/src/lxc/meson.build b/src/lxc/meson.build
-index f8e2a88..96d6687 100644
+index 99d4a34213..aae477c1ee 100644
 --- a/src/lxc/meson.build
 +++ b/src/lxc/meson.build
-@@ -182,8 +182,8 @@ if conf.has('WITH_LXC')
+@@ -176,10 +176,10 @@ if conf.has('WITH_LXC')
    }
  
    virt_install_dirs += [
+-    confdir / 'lxc',
+-    confdir / 'lxc' / 'autostart',
 -    localstatedir / 'lib' / 'libvirt' / 'lxc',
--    runstatedir / 'libvirt' / 'lxc',
 -    localstatedir / 'log' / 'libvirt' / 'lxc',
+-    runstatedir / 'libvirt' / 'lxc',
++    install_prefix + confdir / 'lxc',
++    install_prefix + confdir / 'lxc' / 'autostart',
 +    install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc',
-+    install_prefix + runstatedir / 'libvirt' / 'lxc',
 +    install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc',
++    install_prefix + runstatedir / 'libvirt' / 'lxc',
    ]
  endif
 diff --git a/src/meson.build b/src/meson.build
-index 7c47821..d33d16a 100644
+index b2d951d36c..305716010f 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -669,7 +669,7 @@ endforeach
+@@ -210,7 +210,7 @@ openrc_init_files = []
+ 
+ # virt_install_dirs:
+ #   list of directories to create during installation
+-virt_install_dirs = [ confdir ]
++virt_install_dirs = [ install_prefix + confdir ]
+ 
+ # driver_source_files:
+ #   driver source files to check
+@@ -663,7 +663,7 @@ endforeach
  
  virt_conf_files += 'libvirt.conf'
  
@@ -128,7 +169,7 @@ index 7c47821..d33d16a 100644
  install_data(virt_aug_files, install_dir: virt_aug_dir)
  
  # augeas_test_data:
-@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs
+@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs
      output: '@0@.conf'.format(data['name']),
      configuration: daemon_conf,
      install: true,
@@ -137,15 +178,16 @@ index 7c47821..d33d16a 100644
    )
  
    if data.get('with_ip', false)
-@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD')
+@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD')
  
        install_data(
          init_file,
 -        install_dir: sysconfdir / 'init.d',
 +        install_dir: install_prefix + sysconfdir / 'init.d',
+         install_mode: 'rwxr-xr-x',
          rename: [ init['name'] ],
        )
- 
+@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD')
        if init.has_key('confd')
          install_data(
            init['confd'],
@@ -154,16 +196,7 @@ index 7c47821..d33d16a 100644
            rename: [ init['name'] ],
          )
        endif
-@@ -872,7 +872,7 @@ if init_script != 'none'
-   foreach sysconf : sysconf_files
-     install_data(
-       sysconf['file'],
--      install_dir: sysconfdir / 'sysconfig',
-+      install_dir: install_prefix + sysconfdir / 'sysconfig',
-       rename: [ sysconf['name'] ],
-     )
-   endforeach
-@@ -897,10 +897,10 @@ endif
+@@ -882,10 +882,10 @@ endif
  # Install empty directories
  
  virt_install_dirs += [
@@ -179,23 +212,27 @@ index 7c47821..d33d16a 100644
  
  meson.add_install_script(
 diff --git a/src/network/meson.build b/src/network/meson.build
-index 3ec598c..b02040b 100644
+index b5eff0c3ab..a0f26d624e 100644
 --- a/src/network/meson.build
 +++ b/src/network/meson.build
-@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK')
+@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK')
    }
  
    virt_install_dirs += [
+-    confdir / 'qemu' / 'networks',
+-    confdir / 'qemu' / 'networks' / 'autostart',
 -    localstatedir / 'lib' / 'libvirt' / 'network',
 -    localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
 -    runstatedir / 'libvirt' / 'network',
++    install_prefix + confdir / 'qemu' / 'networks',
++    install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
 +    install_prefix + localstatedir / 'lib' / 'libvirt' / 'network',
 +    install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
 +    install_prefix + runstatedir / 'libvirt' / 'network',
    ]
  
    configure_file(
-@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK')
+@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK')
      output: '@BASENAME@',
      copy: true,
      install: true,
@@ -210,8 +247,37 @@ index 3ec598c..b02040b 100644
      '../default.xml', 'default.xml',
    )
  
+diff --git a/src/node_device/meson.build b/src/node_device/meson.build
+index 1c95975c37..a7831242db 100644
+--- a/src/node_device/meson.build
++++ b/src/node_device/meson.build
+@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES')
+   }
+ 
+   virt_install_dirs += [
+-    runstatedir / 'libvirt' / 'nodedev',
++    install_prefix + runstatedir / 'libvirt' / 'nodedev',
+   ]
+ endif
+diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
+index 55cf8fcce4..d331086f2e 100644
+--- a/src/nwfilter/meson.build
++++ b/src/nwfilter/meson.build
+@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER')
+   }
+ 
+   virt_install_dirs += [
+-    confdir / 'nwfilter',
+-    runstatedir / 'libvirt' / 'nwfilter-binding',
+-    runstatedir / 'libvirt' / 'nwfilter',
++    install_prefix + confdir / 'nwfilter',
++    install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding',
++    install_prefix + runstatedir / 'libvirt' / 'nwfilter',
+   ]
+ 
+   subdir('xml')
 diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build
-index 0d96c54..66c92a1 100644
+index 0d96c54ebe..66c92a1016 100644
 --- a/src/nwfilter/xml/meson.build
 +++ b/src/nwfilter/xml/meson.build
 @@ -25,4 +25,4 @@ nwfilter_xml_files = [
@@ -221,43 +287,71 @@ index 0d96c54..66c92a1 100644
 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
 +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter')
 diff --git a/src/qemu/meson.build b/src/qemu/meson.build
-index 90640b0..8802cec 100644
+index 39f0f615cc..5f6f30f82b 100644
 --- a/src/qemu/meson.build
 +++ b/src/qemu/meson.build
-@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU')
-   }
+@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU')
+   endif
  
    virt_install_dirs += [
--    localstatedir / 'lib' / 'libvirt' / 'qemu',
--    runstatedir / 'libvirt' / 'qemu',
+-    confdir / 'qemu',
+-    confdir / 'qemu' / 'autostart',
 -    localstatedir / 'cache' / 'libvirt' / 'qemu',
--    localstatedir / 'log' / 'libvirt' / 'qemu',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
+-    localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
 -    localstatedir / 'lib' / 'libvirt' / 'swtpm',
--    runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+-    localstatedir / 'log' / 'libvirt' / 'qemu',
 -    localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
-+    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
-+    install_prefix + runstatedir / 'libvirt' / 'qemu',
+-    runstatedir / 'libvirt' / 'qemu',
+-    runstatedir / 'libvirt' / 'qemu' / 'dbus',
+-    runstatedir / 'libvirt' / 'qemu' / 'slirp',
+-    runstatedir / 'libvirt' / 'qemu' / 'swtpm',
++    install_prefix + confdir / 'qemu',
++    install_prefix + confdir / 'qemu' / 'autostart',
 +    install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu',
-+    install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
++    install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
 +    install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm',
-+    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
++    install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
 +    install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
++    install_prefix + runstatedir / 'libvirt' / 'qemu',
++    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus',
++    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp',
++    install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
    ]
  endif
 diff --git a/src/remote/meson.build b/src/remote/meson.build
-index 9ad2f6a..429a15b 100644
+index b2aafe6320..6972d254ca 100644
 --- a/src/remote/meson.build
 +++ b/src/remote/meson.build
-@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE')
+@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE')
      }
  
      virt_install_dirs += [
 -      localstatedir / 'log' / 'libvirt',
+-      runstatedir / 'libvirt',
+-      runstatedir / 'libvirt' / 'common',
 +      install_prefix + localstatedir / 'log' / 'libvirt',
++      install_prefix + runstatedir / 'libvirt',
++      install_prefix + runstatedir / 'libvirt' / 'common',
      ]
  
      logrotate_conf = configuration_data()
-@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE')
+@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE')
        )
        install_data(
          log_file,
@@ -266,7 +360,7 @@ index 9ad2f6a..429a15b 100644
          rename: [ name ],
        )
      endforeach
-@@ -309,7 +309,7 @@ endif
+@@ -301,7 +301,7 @@ endif
  if conf.has('WITH_SASL')
    install_data(
      'libvirtd.sasl',
@@ -275,11 +369,25 @@ index 9ad2f6a..429a15b 100644
      rename: [ 'libvirt.conf' ],
    )
  endif
+diff --git a/src/secret/meson.build b/src/secret/meson.build
+index 1bda59849b..392bc2cb2e 100644
+--- a/src/secret/meson.build
++++ b/src/secret/meson.build
+@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS')
+   }
+ 
+   virt_install_dirs += [
+-    confdir / 'secrets',
+-    runstatedir / 'libvirt' / 'secrets',
++    install_prefix + confdir / 'secrets',
++    install_prefix + runstatedir / 'libvirt' / 'secrets',
+   ]
+ endif
 diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
-index af43780..e2d6c81 100644
+index 990f00b4f3..e5a7a14e1d 100644
 --- a/src/security/apparmor/meson.build
 +++ b/src/security/apparmor/meson.build
-@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles
+@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles
      output: name,
      configuration: apparmor_gen_profiles_conf,
      install: true,
@@ -306,11 +414,28 @@ index af43780..e2d6c81 100644
 +  install_dir: install_prefix + apparmor_dir / 'local',
    rename: 'usr.lib.libvirt.virt-aa-helper',
  )
+diff --git a/src/storage/meson.build b/src/storage/meson.build
+index 26e7ff1a1a..ad5c6eddc3 100644
+--- a/src/storage/meson.build
++++ b/src/storage/meson.build
+@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE')
+   }
+ 
+   virt_install_dirs += [
+-    confdir / 'storage',
+-    confdir / 'storage' / 'autostart',
+-    runstatedir / 'libvirt' / 'storage',
++    install_prefix + confdir / 'storage',
++    install_prefix + confdir / 'storage' / 'autostart',
++    install_prefix + runstatedir / 'libvirt' / 'storage',
+   ]
+ endif
+ 
 diff --git a/tools/meson.build b/tools/meson.build
-index b8c6802..dacd0ff 100644
+index f4b4a16c29..059c73a955 100644
 --- a/tools/meson.build
 +++ b/tools/meson.build
-@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL')
+@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL')
      install_rpath: libvirt_rpath,
    )
  
@@ -319,11 +444,6 @@ index b8c6802..dacd0ff 100644
  endif
  
  if host_machine.system() == 'windows'
-@@ -274,7 +274,7 @@ configure_file(
- if init_script == 'systemd'
-   install_data(
-     'libvirt-guests.sysconf',
--    install_dir: sysconfdir / 'sysconfig',
-+    install_dir: install_prefix + sysconfdir / 'sysconfig',
-     rename: 'libvirt-guests',
-   )
+-- 
+2.35.1
+
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 136574b270..1059dc6f67 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1273,14 +1273,14 @@ (define-public lxd
 (define-public libvirt
   (package
     (name "libvirt")
-    (version "7.9.0")
+    (version "8.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://libvirt.org/sources/libvirt-"
                            version ".tar.xz"))
        (sha256
-        (base32 "131fyxb05rrcr9ih4mhhjyw3cgsxh5l12vj4y109q9vlynsz5742"))
+        (base32 "1qisvbshbcd5305mrb4vni559k52id7c8iw4dwdydbf97b24f658"))
        (patches (search-patches "libvirt-add-install-prefix.patch"))))
     (build-system meson-build-system)
     (arguments
@@ -1400,27 +1400,15 @@ (define-public libvirt-glib
 (define-public python-libvirt
   (package
     (name "python-libvirt")
-    (version "7.9.0")
+    (version "8.6.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://libvirt.org/sources/python/libvirt-python-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0nakisj2ady5a41k4zc95k0kp749f4ppmxgr91b1h1dzbzxcydc5"))))
+        (base32 "0wa86jliq71x60dd4vyzsj4lcrb82i5qsgxz9azvwgsgi9j9mx41"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
-             (when tests?
-               ;; No reason to explicity invoke Python on a wrapped pytest.
-               (substitute* "setup.py"
-                 (("sys\\.executable, pytest") "pytest"))
-               (add-installed-pythonpath inputs outputs)
-               (setenv "LIBVIRT_API_COVERAGE" "whynot")
-               (invoke "python" "setup.py" "test")))))))
     (inputs
      (list libvirt))
     (propagated-inputs
-- 
cgit v1.2.3


From e00b395cb2fd885a7b9af20d2ba8303b736e7c0f Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:24:16 +0200
Subject: gnu: libvirt: Remove input labels.

* gnu/packages/virtualization.scm (libvirt)[inputs, native-inputs]: Remove labels.
---
 gnu/packages/virtualization.scm | 76 ++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 1059dc6f67..7cced7ef34 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1311,49 +1311,49 @@ (define-public libvirt
                 "destdir = '/tmp'"))))
          (add-before 'configure 'disable-broken-tests
            (lambda _
-             (let ((tests (list "commandtest"           ; hangs idly
-                                "qemuxml2argvtest"      ; fails
-                                "virnetsockettest")))   ; tries to network
+             (let ((tests (list "commandtest"         ; hangs idly
+                                "qemuxml2argvtest"    ; fails
+                                "virnetsockettest"))) ; tries to network
                (substitute* "tests/meson.build"
                  (((format #f ".*'name': '(~a)'.*" (string-join tests "|")))
                   ""))))))))
     (inputs
-     `(("acl" ,acl)
-       ("attr" ,attr)
-       ("fuse" ,fuse)
-       ("libxml2" ,libxml2)
-       ("eudev" ,eudev)
-       ("libpciaccess" ,libpciaccess)
-       ("gnutls" ,gnutls)
-       ("dbus" ,dbus)
-       ("libpcap" ,libpcap)
-       ("libnl" ,libnl)
-       ("libssh2" ,libssh2)             ;optional
-       ("libtirpc" ,libtirpc)           ;for 
-       ("libuuid" ,util-linux "lib")
-       ("lvm2" ,lvm2)                   ;for libdevmapper
-       ("curl" ,curl)
-       ("openssl" ,openssl)
-       ("readline" ,readline)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("libyajl" ,libyajl)
-       ("audit" ,audit)
-       ("dmidecode" ,dmidecode)
-       ("dnsmasq" ,dnsmasq)
-       ("ebtables" ,ebtables)
-       ("parted" ,parted)
-       ("iproute" ,iproute)
-       ("iptables" ,iptables)))
+     (list acl
+           attr
+           fuse
+           libxml2
+           eudev
+           libpciaccess
+           gnutls
+           dbus
+           libpcap
+           libnl
+           libssh2                      ;optional
+           libtirpc                     ;for 
+           `(,util-linux "lib")
+           lvm2                         ;for libdevmapper
+           curl
+           openssl
+           readline
+           cyrus-sasl
+           libyajl
+           audit
+           dmidecode
+           dnsmasq
+           ebtables
+           parted
+           iproute
+           iptables))
     (native-inputs
-     `(("bash-completion" ,bash-completion)
-       ("gettext" ,gettext-minimal)
-       ("xsltproc" ,libxslt)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)
-       ("polkit" ,polkit)
-       ("python" ,python-wrapper)
-       ("python-docutils" ,python-docutils) ;for rst2html
-       ("rpcsvc-proto" ,rpcsvc-proto)))     ;for rpcgen
+     (list bash-completion
+           gettext-minimal
+           libxslt
+           perl
+           pkg-config
+           polkit
+           python-wrapper
+           python-docutils              ;for rst2html
+           rpcsvc-proto))               ;for rpcgen
     (home-page "https://libvirt.org")
     (synopsis "Simple API for virtualization")
     (description "Libvirt is a C toolkit to interact with the virtualization
-- 
cgit v1.2.3


From d7d370e4de878bceefbb11354b9e137a5f03838e Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:24:41 +0200
Subject: gnu: libvirt: Use G-expression.

* gnu/packages/virtualization.scm (libvirt)[arguments]: Use gexp.  While at
it, refer to THIS-PACKAGE instead of the NAME and VERSION fields.
---
 gnu/packages/virtualization.scm | 68 +++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 7cced7ef34..7d13c659eb 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1284,39 +1284,41 @@ (define-public libvirt
        (patches (search-patches "libvirt-add-install-prefix.patch"))))
     (build-system meson-build-system)
     (arguments
-     `(#:configure-flags
-       (list "-Ddriver_qemu=enabled"
-             "-Dqemu_user=nobody"
-             "-Dqemu_group=kvm"
-             "-Dstorage_disk=enabled"
-             "-Dstorage_dir=enabled"
-             "-Dpolkit=enabled"
-             ;; XXX The default, but required to make -Dsasl ‘stick’.
-             ;; See 
-             "-Ddriver_remote=enabled"
-             "-Dnls=enabled"            ;translations
-             (string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/"
-                            ,name "-" ,version)
-             "-Dbash_completion=enabled"
-             (string-append "-Dinstall_prefix=" (assoc-ref %outputs "out"))
-             "--sysconfdir=/etc"
-             "--localstatedir=/var")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-directory-confusion
-           (lambda _
-             ;; Don't try to install an (unused) /var outside of the store.
-             (substitute* "scripts/meson-install-dirs.py"
-               (("destdir = .*")
-                "destdir = '/tmp'"))))
-         (add-before 'configure 'disable-broken-tests
-           (lambda _
-             (let ((tests (list "commandtest"         ; hangs idly
-                                "qemuxml2argvtest"    ; fails
-                                "virnetsockettest"))) ; tries to network
-               (substitute* "tests/meson.build"
-                 (((format #f ".*'name': '(~a)'.*" (string-join tests "|")))
-                  ""))))))))
+     (list
+      #:configure-flags
+      #~(list "-Ddriver_qemu=enabled"
+              "-Dqemu_user=nobody"
+              "-Dqemu_group=kvm"
+              "-Dstorage_disk=enabled"
+              "-Dstorage_dir=enabled"
+              "-Dpolkit=enabled"
+              ;; XXX The default, but required to make -Dsasl ‘stick’.
+              ;; See 
+              "-Ddriver_remote=enabled"
+              "-Dnls=enabled"           ;translations
+              (string-append "-Ddocdir=" #$output "/share/doc/"
+                             #$(package-name this-package) "-"
+                             #$(package-version this-package))
+              "-Dbash_completion=enabled"
+              (string-append "-Dinstall_prefix=" #$output)
+              "--sysconfdir=/etc"
+              "--localstatedir=/var")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-directory-confusion
+            (lambda _
+              ;; Don't try to install an (unused) /var outside of the store.
+              (substitute* "scripts/meson-install-dirs.py"
+                (("destdir = .*")
+                 "destdir = '/tmp'"))))
+          (add-before 'configure 'disable-broken-tests
+            (lambda _
+              (let ((tests (list "commandtest"         ; hangs idly
+                                 "qemuxml2argvtest"    ; fails
+                                 "virnetsockettest"))) ; tries to network
+                (substitute* "tests/meson.build"
+                  (((format #f ".*'name': '(~a)'.*" (string-join tests "|")))
+                   ""))))))))
     (inputs
      (list acl
            attr
-- 
cgit v1.2.3


From 9de0dffe79a58ff71a2fe4bbbbdaa7281f874b8b Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:26:18 +0200
Subject: gnu: python-libvirt: Add 'upstream-name' property.

* gnu/packages/virtualization.scm (python-libvirt)[properties]: New field.
---
 gnu/packages/virtualization.scm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 7d13c659eb..d451b8529e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1421,6 +1421,8 @@ (define-public python-libvirt
     (synopsis "Python bindings to libvirt")
     (description "This package provides Python bindings to the libvirt
 virtualization library.")
+    (properties
+     '((upstream-name . "libvirt-python")))
     (license license:lgpl2.1+)))
 
 (define-public virt-manager
-- 
cgit v1.2.3


From c851ea265a58821aa3e2061e7eecd6eff981b2e7 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:33:02 +0200
Subject: gnu: mediasdk: Update to 22.4.4.

* gnu/packages/video.scm (mediasdk): Update to 22.4.4.
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index fa6ed184a1..02ec558994 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -339,7 +339,7 @@ (define-public svt-hevc
 (define-public mediasdk
   (package
     (name "mediasdk")
-    (version "20.1.1")
+    (version "22.4.4")
     (source
      (origin
        (method git-fetch)
@@ -349,7 +349,7 @@ (define-public mediasdk
          (commit (string-append "intel-" name "-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0blwcxr5j8762nylx2cxrq0h53bpgnk859dbs6crq4wr9fcxlx9z"))))
+        (base32 "18mrqringyv1drswm4m8ppw7sks6x4jzp6s0ag0h9hrpd15kn5rx"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
cgit v1.2.3


From 73e0c84d1f99e5b68244f8fcf73ad27ab24bb8a1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:33:36 +0200
Subject: gnu: mediasdk: Remove input labels.

* gnu/packages/video.scm (mediasdk)[native-inputs, inputs]: Remove labels.
---
 gnu/packages/video.scm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 02ec558994..a44c986b46 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -364,14 +364,9 @@ (define-public mediasdk
         (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
                        (assoc-ref %outputs "out") "/lib"))))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("python" ,python-wrapper)))
+     (list pkg-config python-wrapper))
     (inputs
-     `(("libdrm" ,libdrm)
-       ("libva" ,libva)
-       ("pciaccess" ,libpciaccess)
-       ("wayland" ,wayland)
-       ("x11" ,libx11)))
+     (list libdrm libva libpciaccess wayland libx11))
     (synopsis "Intel Media SDK")
     (description "MediaSDK provides a plain C API to access hardware-accelerated
 video decode, encode and filtering on Intel's Gen graphics hardware platforms.")
-- 
cgit v1.2.3


From 65501301080d44bc7a207273707aaf77e475573d Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:34:25 +0200
Subject: gnu: mediasdk: Build reproducibly.

* gnu/packages/video.scm (mediasdk)[arguments]: Add #:phases.  Convert to gexp
while at it.
---
 gnu/packages/video.scm | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a44c986b46..6d0b5ccb58 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -352,17 +352,26 @@ (define-public mediasdk
         (base32 "18mrqringyv1drswm4m8ppw7sks6x4jzp6s0ag0h9hrpd15kn5rx"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       (list
-        "-DENABLE_X11=ON"
-        "-DENABLE_X11_DRI3=ON"
-        "-DENABLE_WAYLAND=ON"
-        "-DENABLE_TEXTLOG=ON"
-        "-DENABLE_STAT=ON"
-        "-DBUILD_TESTS=ON"
-        "-DBUILD_TOOLS=ON"
-        (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
-                       (assoc-ref %outputs "out") "/lib"))))
+     (list
+      #:configure-flags
+      #~(list
+         "-DENABLE_X11=ON"
+         "-DENABLE_X11_DRI3=ON"
+         "-DENABLE_WAYLAND=ON"
+         "-DENABLE_TEXTLOG=ON"
+         "-DENABLE_STAT=ON"
+         "-DBUILD_TESTS=ON"
+         "-DBUILD_TOOLS=ON"
+         (string-append "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath="
+                        #$output "/lib"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'do-not-embed-kernel-version
+            (lambda _
+              (substitute* "builder/FindGlobals.cmake"
+                (("set\\([[:blank:]]+?BUILD_INFO \"\\$\\{CMAKE_SYSTEM\\}\
+ \\$\\{CMAKE_SYSTEM_VERSION\\}")
+                 "set( BUILD_INFO \"Linux")))))))
     (native-inputs
      (list pkg-config python-wrapper))
     (inputs
-- 
cgit v1.2.3


From 691d4657b7431847069198ce8f4276bc1de49e41 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:35:19 +0200
Subject: gnu: folks: Update to 0.15.5.

* gnu/packages/gnome.scm (folks): Update to 0.15.5.
[native-inputs]: Remove INTLTOOL.  Add GETTEXT-MINIMAL.
---
 gnu/packages/gnome.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 291bd8c3ac..cbdf638abd 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9999,7 +9999,7 @@ (define-public gnome-shell-extensions
 (define-public folks
   (package
     (name "folks")
-    (version "0.15.3")
+    (version "0.15.5")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -10008,7 +10008,7 @@ (define-public folks
                     "folks-" version ".tar.xz"))
               (sha256
                (base32
-                "19a4qp9ry8y24jx1v5456qn9lnw843571vkkah3bxx4ky3x3gmr1"))))
+                "11lhfn6b7gml4ckj2dkm6g889j21wpvj90srwjp85k9hcf4qmzqg"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
@@ -10027,10 +10027,10 @@ (define-public folks
            readline
            telepathy-glib))
     (native-inputs
-     (list `(,glib "bin")
+     (list gettext-minimal
+           `(,glib "bin")
            gobject-introspection
            python-dbusmock
-           intltool
            pkg-config
            python
            vala))
-- 
cgit v1.2.3


From f441a149b400d289224a78a7c13c8690080d0926 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:35:54 +0200
Subject: gnu: tracker: Update to 3.3.3.

* gnu/packages/gnome.scm (tracker): Update to 3.3.3.
[native-inputs]: Remove INTLTOOL.  Add GETTEXT-MINIMAL.
---
 gnu/packages/gnome.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cbdf638abd..ae46e55c51 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8888,7 +8888,7 @@ (define-public gnome-autoar
 (define-public tracker
   (package
     (name "tracker")
-    (version "3.3.1")
+    (version "3.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/tracker/"
@@ -8896,7 +8896,7 @@ (define-public tracker
                                   "tracker-" version ".tar.xz"))
               (sha256
                (base32
-                "1lkf353xvwc0hfyi03aq2qjikx3zmva7r56nxiavy7kqjyygbmjs"))))
+                "0r144kdqxdzs51qn495vablzf1zxkhkk6imrlrzj9wiqwc2gg520"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t
@@ -8927,7 +8927,8 @@ (define-public tracker
                (invoke "dbus-run-session" "--" "meson" "test"
                        "--print-errorlogs")))))))
     (native-inputs
-     (list `(,glib "bin")
+     (list gettext-minimal
+           `(,glib "bin")
            gobject-introspection
            docbook-xsl
            docbook-xml
@@ -8937,7 +8938,6 @@ (define-public tracker
            cmake-minimal
            python-pygobject
            gtk-doc/stable
-           intltool
            dbus
            pkg-config
            python
-- 
cgit v1.2.3


From 25c2a2fdb21742f479df113202e7955f3a1ccc52 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 18:51:58 +0200
Subject: gnu: openconnect-sso: Remove input labels.

* gnu/packages/vpn.scm (openconnect-sso)[arguments]: Don't attempt to use a
non-existent QtWebEngine label.  While at it, use SEARCH-INPUT-FILE also for
openconnect and remove trailing #t's.
---
 gnu/packages/vpn.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 17dd163c53..c4e0287bf8 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -722,27 +722,26 @@ (define-public openconnect-sso
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-openconnect
-           (lambda _
+           (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "openconnect_sso/app.py"
                (("\"openconnect\"")
-                (string-append "\"" (which "openconnect") "\"")))
-             #t))
+                (string-append "\""
+                               (search-input-file inputs "/sbin/openconnect")
+                               "\"")))))
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-               (invoke "pytest" "-v"))
-             #t))
+               (invoke "pytest" "-v"))))
          (add-after 'install 'wrap-qt-process-path
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/bin/openconnect-sso"))
-                    (qt-process-path (string-append
-                                       (assoc-ref inputs "qtwebengine-5")
-                                       "/lib/qt5/libexec/QtWebEngineProcess")))
+                    (qt-process-path
+                     (search-input-file inputs
+                                        "/lib/qt5/libexec/QtWebEngineProcess")))
                (wrap-program bin
                  #:sh (search-input-file inputs "bin/bash")
-                 `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
-               #t))))))
+                 `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
     (inputs
      (list openconnect
            python-attrs
-- 
cgit v1.2.3


From 246e8e7f818b43d759da2c6b31de35111a5e1ba1 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 19:04:59 +0200
Subject: gnu: ntfs-3g: Add release-monitoring-url and upstream-name.

* gnu/packages/linux.scm (ntfs-3g)[properties]: New field.
---
 gnu/packages/linux.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index d7d373a92f..cf2cbc7745 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6183,6 +6183,9 @@ (define-public ntfs-3g
      "NTFS-3G provides read-write access to NTFS file systems, which are
 commonly found on Microsoft Windows.  It is implemented as a FUSE file system.
 The package provides additional NTFS tools.")
+    (properties
+     '((release-monitoring-url . "https://github.com/tuxera/ntfs-3g/releases")
+       (upstream-name . "ntfs-3g_ntfsprogs")))
     (license license:gpl2+)))
 
 (define-public ntfs-3g/static
-- 
cgit v1.2.3


From 99b73f60415b282f2be39134f385cbda4840c336 Mon Sep 17 00:00:00 2001
From: Marius Bakke 
Date: Thu, 11 Aug 2022 19:05:49 +0200
Subject: gnu: ntfs-3g: Update to 2022.5.17.

* gnu/packages/linux.scm (ntfs-3g): Update to 2022.5.17.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cf2cbc7745..cc961b1e9b 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -6137,14 +6137,14 @@ (define-public turbostat
 (define-public ntfs-3g
   (package
     (name "ntfs-3g")
-    (version "2021.8.22")
+    (version "2022.5.17")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://tuxera.com/opensource/"
                                   "ntfs-3g_ntfsprogs-" version ".tgz"))
               (sha256
                (base32
-                "1yrf42xr92qv3pads8lzp5nyssz6875ncfgg8v3jwjyr0nm87f2m"))
+                "14zbsl7m32f796dkr334zbkj5rba7xa8smxb2ysf3095jyvgp284"))
               (modules '((guix build utils)))
               (snippet '(begin
                           ;; Install under $prefix.
-- 
cgit v1.2.3