diff options
Diffstat (limited to 'gnu')
280 files changed, 29298 insertions, 10701 deletions
diff --git a/gnu/bootloader.scm b/gnu/bootloader.scm index 2c36d8c6cf..ba06de7618 100644 --- a/gnu/bootloader.scm +++ b/gnu/bootloader.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017 David Craven <david@craven.ch> ;;; Copyright © 2017, 2020, 2022 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> -;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2022 Josselin Poiret <dev@jpoiret.xyz> ;;; Copyright © 2022 Reza Alizadeh Majd <r.majd@pantherx.org> @@ -335,7 +335,7 @@ FILES may contain file like objects produced by procedures like plain-file, local-file, etc., or package contents produced with file-append. HOOKS lists additional hook functions to modify the profile." - (define (efi-bootloader-profile-hook manifest) + (define* (efi-bootloader-profile-hook manifest #:optional system) (define build (with-imported-modules '((guix build utils)) #~(begin @@ -383,6 +383,7 @@ HOOKS lists additional hook functions to modify the profile." (gexp->derivation "efi-bootloader-profile" build + #:system system #:local-build? #t #:substitutable? #f #:properties diff --git a/gnu/build/accounts.scm b/gnu/build/accounts.scm index 1247fc640c..fa6f454b5e 100644 --- a/gnu/build/accounts.scm +++ b/gnu/build/accounts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -525,7 +525,15 @@ password from USERS." (lookup-procedure current-shadow shadow-entry-name)) (define now - (days-since-epoch current-time)) + ;; On machines without a real-time clock (typically Arm SBCs), the system + ;; clock may be at 1970-01-01 while booting, which would lead us to define + ;; NOW as zero. + ;; + ;; However, the 'isexpired' function in Shadow interprets the combination + ;; uninitialized password + last-change = 0 as "The password has expired, + ;; it must be changed", which prevents logins altogether. To avoid that, + ;; never set 'last-change' to zero. + (max (days-since-epoch current-time) 1)) (map (lambda (user passwd) (or (previous-entry (password-entry-name passwd)) diff --git a/gnu/build/icecat-extension.scm b/gnu/build/icecat-extension.scm new file mode 100644 index 0000000000..1e6a9a54e4 --- /dev/null +++ b/gnu/build/icecat-extension.scm @@ -0,0 +1,70 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> +;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu build icecat-extension) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix build-system trivial) + #:export (make-icecat-extension)) + +(define* (make-icecat-extension pkg #:optional (pkg-output "out")) + "Create an Icecat extension from package PKG and return a package that, +when installed, will make the extension contained in PKG available as an +Icecat browser extension. PKG-OUTPUT specifies which output of PKG to use." + (package + (inherit pkg) + (name (string-append (package-name pkg) "-icecat")) + (native-inputs '()) + (inputs '()) + (propagated-inputs (package-propagated-inputs pkg)) + (outputs '("out")) + (build-system trivial-build-system) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (let* ((addon-id #$(assq-ref (package-properties pkg) 'addon-id)) + (moz-app-id "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") + (search-dir (string-append #$output "/lib/icecat/extensions/" + moz-app-id))) + ;; Icecat's iterates over `search-dir` for directories. If a + ;; directory's name is not a valid add-on ID, it is ignored. See + ;; `DirectoryLocation::readAddons()` in XPIProvider.jsm. + + ;; This directory has to be a symlink, because Icecat's + ;; `_readLinkFile(aFile)` calls `normalize()` only if `aFile` is a + ;; symlink. + + ;; Normalizing is required because Icecat compares the add-on path + ;; against its local database to know if there is an extension + ;; update. We want the add-on path to be the package store path, + ;; so that a path change is detected every time the package is + ;; updated. See `updateExistingAddon()` in XPIDatabase.jsm, with + ;; our patch `icecat-compare-paths.patch`. + + ;; We don't want the add-on path to be the profile store path, + ;; which would change too often. We don't want the add-on path to + ;; be hard-coded either because it would never change (but it + ;; wouldn't make sense anyway). + + (mkdir-p search-dir) + (symlink (in-vicinity (ungexp pkg pkg-output) addon-id) + (in-vicinity search-dir addon-id)))))))) diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index 3b1f512663..12cb9c4ba6 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2016, 2018, 2019, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Danny Milosavljevic <dannym@scratchpost.org> +;;; Copyright © 2023 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -208,7 +209,7 @@ modules that can be postloaded, of the soft dependencies of module FILE." (string-take filename extension) filename))) -(define (dot-ko name compression) +(define* (dot-ko name #:optional compression) (let ((suffix (match compression ('xz ".ko.xz") ('gzip ".ko.gz") diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 8d53f2f4d3..44f585aff5 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021-2023 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2022-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2023 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; ;;; This file is part of GNU Guix. ;;; @@ -412,20 +413,32 @@ activation."))) #~(begin (use-modules (guix i18n) (guix diagnostics)) + + (define (claim-first-run file) + (catch #t + (lambda () + ;; This incantation raises an error if FILE already exists, and + ;; creates it otherwise. + (close-fdes + (open-fdes file (logior O_CREAT O_EXCL O_CLOEXEC))) + #t) + (const #f))) + #$%initialize-gettext (let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR") (format #f "/run/user/~a" (getuid)))) (flag-file-path (string-append - xdg-runtime-dir "/on-first-login-executed")) - (touch (lambda (file-name) - (call-with-output-file file-name (const #t))))) + xdg-runtime-dir "/on-first-login-executed"))) ;; XDG_RUNTIME_DIR dissapears on logout, that means such trick ;; allows to launch on-first-login script on first login only ;; after complete logout/reboot. (if (file-exists? xdg-runtime-dir) - (unless (file-exists? flag-file-path) - (begin #$@gexps (touch flag-file-path))) + (when (claim-first-run flag-file-path) + ;; GEXPS can be empty, hence 'begin *unspecified*'. Having just + ;; 'begin' without '*unspecified*' leads to + ;; "Syntax error: ... sequence of zero expressions in form (begin)" + (begin *unspecified* #$@gexps)) ;; TRANSLATORS: 'on-first-login' is the name of a service and ;; shouldn't be translated (warning (G_ "XDG_RUNTIME_DIR doesn't exists, on-first-login script diff --git a/gnu/home/services/desktop.scm b/gnu/home/services/desktop.scm index c4da116100..91465bf168 100644 --- a/gnu/home/services/desktop.scm +++ b/gnu/home/services/desktop.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2022-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2023 conses <contact@conses.eu> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> @@ -30,7 +30,9 @@ #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export (home-redshift-configuration + #:export (home-x11-service-type + + home-redshift-configuration home-redshift-configuration? home-redshift-service-type @@ -45,6 +47,79 @@ ;;; +;;; Waiting for X11. +;;; + +(define (x11-shepherd-service delay) + (list (shepherd-service + (provision '(x11-display)) + (modules '((ice-9 ftw) + (ice-9 match) + (srfi srfi-1))) + (start + #~(lambda* (#:optional (display (getenv "DISPLAY"))) + (define x11-directory + "/tmp/.X11-unix") + + (define (find-display delay) + ;; Wait for an accessible socket to show up in X11-DIRECTORY, + ;; up to DELAY seconds. + (let loop ((attempts delay)) + (define socket + (find (match-lambda + ((or "." "..") #f) + (name + (let ((name (in-vicinity x11-directory + name))) + (access? name O_RDWR)))) + (or (scandir x11-directory) '()))) + + (if (and socket (string-prefix? "X" socket)) + (let ((display (string-append + ":" (string-drop socket 1)))) + (format #t "X11 display server found at ~s.~%" + display) + display) + (if (zero? attempts) + (begin + (format (current-error-port) + "X11 display server did not show up; \ +giving up.\n") + #f) + (begin + (sleep 1) + (loop (- attempts 1))))))) + + (let ((display (or display (find-display #$delay)))) + (when display + ;; Note: 'make-forkexec-constructor' calls take their + ;; default #:environment-variables value before this service + ;; is started and are thus unaffected by the 'setenv' call + ;; below. Users of this service have to explicitly query + ;; its value. + (setenv "DISPLAY" display)) + display))) + (stop #~(lambda (_) + (unsetenv "DISPLAY") + #f)) + (respawn? #f)))) + +(define home-x11-service-type + (service-type + (name 'home-x11-display) + (extensions (list (service-extension home-shepherd-service-type + x11-shepherd-service))) + (default-value 10) + (description + "Create a @code{x11-display} Shepherd service that waits for the X +Window (or ``X11'') graphical display server to be up and running, up to a +configurable delay, and sets the @code{DISPLAY} environment variable of +@command{shepherd} itself accordingly. If no accessible X11 server shows up +during that time, the @code{x11-display} service is marked as failing to +start."))) + + +;;; ;;; Redshift. ;;; @@ -169,11 +244,25 @@ format.")) (list (shepherd-service (documentation "Redshift program.") (provision '(redshift)) - ;; FIXME: This fails to start if Home is first activated from a - ;; non-X11 session. - (start #~(make-forkexec-constructor - (list #$(file-append (home-redshift-configuration-redshift config) "/bin/redshift") - "-c" #$config-file))) + + ;; Depend on 'x11-display', which sets 'DISPLAY' if an X11 server is + ;; available, and fails to start otherwise. + (requirement '(x11-display)) + + (modules '((srfi srfi-1) + (srfi srfi-26))) + (start #~(lambda _ + (fork+exec-command + (list #$(file-append + (home-redshift-configuration-redshift config) + "/bin/redshift") + "-c" #$config-file) + + ;; Inherit the 'DISPLAY' variable set by 'x11-display'. + #:environment-variables + (cons (string-append "DISPLAY=" (getenv "DISPLAY")) + (remove (cut string-prefix? "DISPLAY=" <>) + (default-environment-variables)))))) (stop #~(make-kill-destructor)) (actions (list (shepherd-configuration-action config-file)))))) @@ -181,7 +270,11 @@ format.")) (service-type (name 'home-redshift) (extensions (list (service-extension home-shepherd-service-type - redshift-shepherd-service))) + redshift-shepherd-service) + ;; Ensure 'home-x11-service-type' is instantiated so we + ;; can depend on the Shepherd 'x11-display' service. + (service-extension home-x11-service-type + (const #t)))) (default-value (home-redshift-configuration)) (description "Run Redshift, a program that adjusts the color temperature of display diff --git a/gnu/home/services/ssh.scm b/gnu/home/services/ssh.scm index 34b1fe4658..295707d59f 100644 --- a/gnu/home/services/ssh.scm +++ b/gnu/home/services/ssh.scm @@ -25,6 +25,7 @@ #:use-module (guix deprecation) #:use-module (guix diagnostics) #:use-module (guix i18n) + #:use-module ((guix utils) #:select (%current-system)) #:use-module (gnu services) #:use-module (gnu services configuration) #:use-module (guix modules) @@ -32,7 +33,7 @@ #:use-module (gnu home services shepherd) #:use-module ((gnu home services utils) #:select (object->camel-case-string)) - #:autoload (gnu packages base) (glibc-utf8-locales) + #:autoload (gnu packages base) (libc-utf8-locales-for-target) #:use-module (gnu packages ssh) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) @@ -357,8 +358,9 @@ inserted after each of them." ;; Support non-ASCII file names. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales - "/lib/locale")) + #+(file-append + (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") (call-with-output-file #$output diff --git a/gnu/installer.scm b/gnu/installer.scm index d9b71e2ca8..db79c11530 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -85,9 +85,10 @@ version of this file." (define set-utf8-locale #~(begin (setenv "LOCPATH" - #$(file-append glibc-utf8-locales "/lib/locale/" - (version-major+minor - (package-version glibc-utf8-locales)))) + #$(file-append + (libc-utf8-locales-for-target) "/lib/locale/" + (version-major+minor + (package-version (libc-utf8-locales-for-target))))) (setlocale LC_ALL "en_US.utf8"))) (define builder diff --git a/gnu/local.mk b/gnu/local.mk index 231488a1be..ff2f82a23a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -13,7 +13,7 @@ # Copyright © 2016-2023 Efraim Flashner <efraim@flashner.co.il> # Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> -# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> +# Copyright © 2017, 2018, 2023 Clément Lassieur <clement@lassieur.org> # Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2018, 2019 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> @@ -31,7 +31,7 @@ # Copyright © 2020 R Veera Kumar <vkor@vkten.in> # Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> # Copyright © 2020 Michael Rohleder <mike@rohleder.de> -# Copyright © 2020, 2021, 2022 Felix Gruber <felgru@posteo.net> +# Copyright © 2020, 2021, 2022, 2023 Felix Gruber <felgru@posteo.net> # Copyright © 2020 Ryan Prior <rprior@protonmail.com> # Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> # Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> @@ -59,6 +59,8 @@ # Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com> # Copyright © 2023 Andy Tai <atai@atai.org> +# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> +# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> # # This file is part of GNU Guix. # @@ -126,6 +128,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/anthy.scm \ %D%/packages/antivirus.scm \ %D%/packages/apl.scm \ + %D%/packages/apple.scm \ %D%/packages/apparmor.scm \ %D%/packages/apr.scm \ %D%/packages/arcan.scm \ @@ -174,6 +177,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/chromium.scm \ %D%/packages/ci.scm \ %D%/packages/cinnamon.scm \ + %D%/packages/clifm.scm \ %D%/packages/clojure.scm \ %D%/packages/cluster.scm \ %D%/packages/cmake.scm \ @@ -231,7 +235,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/docbook.scm \ %D%/packages/docker.scm \ %D%/packages/documentation.scm \ - %D%/packages/dunst.scm \ %D%/packages/dvtm.scm \ %D%/packages/easyrpg.scm \ %D%/packages/ebook.scm \ @@ -300,6 +303,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/gnu-pw-mgr.scm \ %D%/packages/gobby.scm \ %D%/packages/golang.scm \ + %D%/packages/golang-check.scm \ %D%/packages/gperf.scm \ %D%/packages/gpodder.scm \ %D%/packages/gps.scm \ @@ -759,6 +763,7 @@ GNU_SYSTEM_MODULES = \ %D%/build/chromium-extension.scm \ %D%/build/cross-toolchain.scm \ %D%/build/dbus-service.scm \ + %D%/build/icecat-extension.scm \ %D%/build/image.scm \ %D%/build/jami-service.scm \ %D%/build/file-systems.scm \ @@ -895,7 +900,9 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-make43.patch \ %D%/packages/patches/agda-categories-remove-incompatible-flags.patch \ %D%/packages/patches/agda-categories-use-find.patch \ + %D%/packages/patches/agda-categories-use-stdlib-1.7.3.patch \ %D%/packages/patches/agda-libdirs-env-variable.patch \ + %D%/packages/patches/agda-use-sphinx-5.patch \ %D%/packages/patches/agda-stdlib-use-runhaskell.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/agg-2.5-gcc8.patch \ @@ -913,6 +920,7 @@ dist_patch_DATA = \ %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ %D%/packages/patches/apr-fix-atomics.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ + %D%/packages/patches/aria2-unbundle-wslay.patch \ %D%/packages/patches/ark-skip-xar-test.patch \ %D%/packages/patches/arpack-ng-propagate-rng-state.patch \ %D%/packages/patches/asli-use-system-libs.patch \ @@ -1012,6 +1020,8 @@ dist_patch_DATA = \ %D%/packages/patches/clang-13.0-libc-search-path.patch \ %D%/packages/patches/clang-14.0-libc-search-path.patch \ %D%/packages/patches/clang-15.0-libc-search-path.patch \ + %D%/packages/patches/clang-16.0-libc-search-path.patch \ + %D%/packages/patches/clang-17.0-libc-search-path.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ @@ -1030,9 +1040,7 @@ dist_patch_DATA = \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/connman-CVE-2022-32292.patch \ - %D%/packages/patches/connman-CVE-2022-32293-pt1.patch \ - %D%/packages/patches/connman-CVE-2022-32293-pt2.patch \ + %D%/packages/patches/connman-add-missing-libppp-compat.h.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ %D%/packages/patches/converseen-hide-updates-checks.patch \ %D%/packages/patches/converseen-hide-non-free-pointers.patch \ @@ -1105,7 +1113,6 @@ dist_patch_DATA = \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-fix-rpath.patch \ %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ - %D%/packages/patches/emacs-debbugs-keep-patch-subject.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ %D%/packages/patches/emacs-exec-path.patch \ @@ -1118,6 +1125,8 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-next-exec-path.patch \ + %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ %D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ @@ -1131,6 +1140,8 @@ dist_patch_DATA = \ %D%/packages/patches/enblend-enfuse-reproducible.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ + %D%/packages/patches/ergodox-firmware-fix-json-target.patch \ + %D%/packages/patches/ergodox-firmware-fix-numpad.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/esmini-no-clutter-log.patch \ %D%/packages/patches/esmini-use-pkgconfig.patch \ @@ -1273,9 +1284,11 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-9.2-grep-warnings.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ %D%/packages/patches/ghc-testsuite-grep-compat.patch \ - %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \ + %D%/packages/patches/ghc-basement-fix-32bit.patch \ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ + %D%/packages/patches/ghc-memory-fix-32bit.patch \ + %D%/packages/patches/ghc-persistent-fix-32bit.patch \ %D%/packages/patches/ghostscript-CVE-2023-36664.patch \ %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch \ %D%/packages/patches/ghostscript-leptonica-hurd.patch \ @@ -1283,6 +1296,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/gitg-fix-positional-argument.patch \ + %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ @@ -1290,6 +1304,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ %D%/packages/patches/glibc-CVE-2019-9169.patch \ %D%/packages/patches/glibc-CVE-2019-19126.patch \ + %D%/packages/patches/glibc-2.35-CVE-2023-4911.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-boot-2.2.5.patch \ @@ -1343,6 +1358,7 @@ dist_patch_DATA = \ %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ + %D%/packages/patches/go-gopkg-in-yaml-v3-32bit.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \ %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \ @@ -1407,6 +1423,7 @@ dist_patch_DATA = \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ + %D%/packages/patches/hplip-usb-timeout.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ @@ -1422,14 +1439,17 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-102-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-compare-paths.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ + %D%/packages/patches/icecat-use-system-wide-dir.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \ %D%/packages/patches/icedtea-7-hotspot-pointer-comparison.patch \ + %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/idris-test-ffi008.patch \ - %D%/packages/patches/igt-gpu-tools-Use-libproc2.patch \ + %D%/packages/patches/igraph-fix-varargs-integer-size.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ @@ -1705,6 +1725,7 @@ dist_patch_DATA = \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onionshare-cli-async-mode.patch \ + %D%/packages/patches/online-judge-tools.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ @@ -1744,8 +1765,9 @@ dist_patch_DATA = \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ - %D%/packages/patches/php-fix-streams-copy-length.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ + %D%/packages/patches/plasp-fix-normalization.patch \ + %D%/packages/patches/plasp-include-iostream.patch \ %D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ @@ -1754,6 +1776,8 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ + %D%/packages/patches/python-accupy-use-matplotx.patch \ + %D%/packages/patches/python-accupy-fix-use-of-perfplot.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ %D%/packages/patches/python-docrepr-fix-tests.patch \ %D%/packages/patches/python-feedparser-missing-import.patch \ @@ -1763,6 +1787,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \ %D%/packages/patches/python-sip-include-dirs.patch \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ + %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ @@ -1864,6 +1889,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-hiredis-fix-header.patch \ %D%/packages/patches/python-hiredis-use-system-hiredis.patch \ + %D%/packages/patches/python-online-judge-api-client-tests.patch \ %D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ @@ -1877,8 +1903,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-parso-unit-tests-in-3.10.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ - %D%/packages/patches/python-pycrypto-time-clock.patch \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ @@ -1907,11 +1931,13 @@ dist_patch_DATA = \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch \ %D%/packages/patches/qtbase-qmake-use-libname.patch \ + %D%/packages/patches/qtbase-5-use-TZDIR.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %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/quilt-grep-compat.patch \ + %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ %D%/packages/patches/ragel-char-signedness.patch \ @@ -1951,6 +1977,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-nokogiri.patch \ %D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ + %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ %D%/packages/patches/rust-ring-0.16-missing-files.patch \ %D%/packages/patches/rust-ring-0.16-test-files.patch \ %D%/packages/patches/i3status-rust-enable-unstable-features.patch \ @@ -1958,7 +1985,6 @@ dist_patch_DATA = \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ - %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ @@ -2032,6 +2058,7 @@ dist_patch_DATA = \ %D%/packages/patches/texinfo-5-perl-compat.patch \ %D%/packages/patches/telegram-desktop-allow-disable-libtgvoip.patch \ %D%/packages/patches/telegram-purple-adjust-test.patch \ + %D%/packages/patches/teuchos-remove-duplicate-using.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ %D%/packages/patches/thefuck-test-environ.patch \ @@ -2042,8 +2069,7 @@ dist_patch_DATA = \ %D%/packages/patches/tla2tools-build-xml.patch \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tofi-32bit-compat.patch \ - %D%/packages/patches/tootle-glib-object-naming.patch \ - %D%/packages/patches/tootle-reason-phrase.patch \ + %D%/packages/patches/tpetra-remove-duplicate-using.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/trytond-add-egg-modules-to-path.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \ @@ -2057,6 +2083,7 @@ dist_patch_DATA = \ %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ %D%/packages/patches/u-boot-fix-u-boot-lib-build.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ + %D%/packages/patches/u-boot-patman-change-id.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ %D%/packages/patches/u-boot-rk3399-enable-emmc-phy.patch \ @@ -2067,7 +2094,6 @@ dist_patch_DATA = \ %D%/packages/patches/ungoogled-chromium-RUNPATH.patch \ %D%/packages/patches/ungoogled-chromium-system-ffmpeg.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ - %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ @@ -2167,6 +2193,7 @@ dist_patch_DATA = \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ + %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \ %D%/packages/patches/zig-use-system-paths.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8f9826d092..30a6df8f04 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -406,7 +406,7 @@ interface and is based on GNU Guile.") (define-public swineherd (package (name "swineherd") - (version "0.0.1") + (version "0.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -415,7 +415,7 @@ interface and is based on GNU Guile.") (file-name (git-file-name name version)) (sha256 (base32 - "18nk0sy5s0dm2rhxnrrn8g0m098b110mxnnxa2vnl1dnvfdzszw8")))) + "0il1ikaj478n7xs4vqgawbshvmwq3nd0gp235mwqvmf4knra6j3g")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var") @@ -1480,14 +1480,18 @@ connection alive.") (("^RELEASEVER=.*") (format #f "RELEASEVER=~a\n" ,bind-release-version))))) ,@(if (%current-target-system) - '((add-before 'configure 'fix-bind-cross-compilation + `((add-before 'configure 'fix-bind-cross-compilation (lambda _ (substitute* "configure" (("--host=\\$host") "--host=$host_alias")) ;; BIND needs a native compiler because the DHCP ;; build system uses the built 'gen' executable. - (setenv "BUILD_CC" "gcc")))) + (setenv "BUILD_CC" "gcc") + ;; powerpc-linux needs to be told to use -latomic. + ,@(if (target-ppc32?) + `((setenv "LIBS" "-latomic")) + '())))) '()) (add-before 'configure 'update-config-scripts (lambda* (#:key native-inputs inputs #:allow-other-keys) @@ -1550,7 +1554,6 @@ connection alive.") (coreutils (assoc-ref inputs "coreutils*")) (inetutils (assoc-ref inputs "inetutils")) (grep (assoc-ref inputs "grep*")) - (net-tools (assoc-ref inputs "net-tools")) (sed (assoc-ref inputs "sed*"))) (substitute* "client/scripts/linux" (("/sbin/ip") @@ -1566,16 +1569,16 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils grep sed)))))))))) + (list inetutils coreutils grep sed)))))))))) (native-inputs (list config perl file)) (inputs `(("inetutils" ,inetutils) ("bash" ,bash-minimal) - ,@(if (target-hurd?) '() - `(("net-tools" ,net-tools) - ("iproute" ,iproute))) + ,@(if (target-hurd?) + '() + `(("iproute" ,iproute))) ;; isc-dhcp bundles a copy of BIND, which has proved vulnerable ;; in the past. Use a BIND-VERSION of our choosing instead. @@ -2831,13 +2834,13 @@ specified directories.") (define-public ansible-core (package (name "ansible-core") - (version "2.14.4") + (version "2.15.5") (source (origin (method url-fetch) (uri (pypi-uri "ansible-core" version)) (sha256 - (base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh")))) + (base32 "00hnwjk4dxgxbz4xlza2wqx20yks5xr7074hzlzsyja3ip5kkicc")))) (build-system python-build-system) (arguments `(#:modules ((guix build python-build-system) @@ -2907,14 +2910,6 @@ test_context)" all) (when tests? ;; Otherwise Ansible fails to create its config directory. (setenv "HOME" "/tmp") - ;; This test module messes up with sys.path and causes many - ;; test failures. - (delete-file "test/units/_vendor/test_vendor.py") - ;; The test fails when run in the container, for reasons - ;; unknown. - (delete-file "test/units/utils/test_display.py") - ;; This test fail for reasons unknown. - (delete-file "test/units/cli/test_adhoc.py") ;; These tests fail in the container; it appears that the ;; mocking of the absolute file names such as /usr/bin/svcs do ;; not work as intended there. @@ -2929,7 +2924,7 @@ test_command_nonexisting.py") ;; does some extra environment setup. Taken from ;; https://raw.githubusercontent.com/ansible/ansible/\ ;; devel/test/utils/shippable/shippable.sh. - (invoke "ansible-test" "units" "-v" + (invoke "./bin/ansible-test" "units" "-v" "--num-workers" (number->string (parallel-job-count))))))))) (native-inputs @@ -2950,7 +2945,7 @@ test_command_nonexisting.py") python-jinja2 python-pyyaml python-packaging ;for version number parsing - python-resolvelib-0.5)) + python-resolvelib)) (home-page "https://www.ansible.com/") (synopsis "Radically simple IT automation") (description "Ansible aims to be a radically simple IT automation system. @@ -2977,13 +2972,13 @@ provides the following commands: (define-public ansible (package (name "ansible") - (version "7.4.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "142barhwz0wx5kn74xi0bfl21iwq2yq3jp14kxajsg9nggndcr09")))) + (base32 "0bazj5h12wraf30bb2schzwk553y20n9vh45km4b5kgmvadm0z1j")))) (build-system python-build-system) (propagated-inputs (list ansible-core)) ;; The Ansible collections are found by ansible-core via the Python search @@ -3506,7 +3501,7 @@ throughput (in the same interval).") (define-public dool (package (name "dool") - (version "1.1.0") + (version "1.3.0") (source (origin (method git-fetch) @@ -3515,7 +3510,7 @@ throughput (in the same interval).") (commit (string-append "v" version)))) (file-name (git-file-name "dool" version)) (sha256 - (base32 "13qq52lq7z3pl2mgrhwqh8c69p9x5rkyjqjswszd6vdbzm7zk7yq")))) + (base32 "1728wxy338gf2l06b0b4j9j8vihadw5whzzj7mi9p3by633h5s8m")))) (build-system python-build-system) (arguments (list @@ -3947,7 +3942,7 @@ buffers.") (define-public igt-gpu-tools (package (name "igt-gpu-tools") - (version "1.27.1") + (version "1.28") (source (origin (method git-fetch) @@ -3956,9 +3951,7 @@ buffers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0d6jsj77qddccv0vfmqmbw3k2prvxzvmgc8zdi83gdi3wpp5i7zd")) - (patches - (search-patches "igt-gpu-tools-Use-libproc2.patch")))) + (base32 "15mnsgzlpd4jkr2zy3jzx0b021g89fa61b8sdm8rjp27gxqkl8mm")))) (build-system meson-build-system) (arguments `(#:tests? #f ; many of the tests try to load kernel modules @@ -3976,7 +3969,8 @@ buffers.") libdrm libpciaccess libunwind - procps)) + procps + python)) (native-inputs (list bison flex pkg-config python-docutils)) (home-page "https://gitlab.freedesktop.org/drm/igt-gpu-tools") @@ -4437,6 +4431,9 @@ late.") " *lmonpl = '\\0'")) #t)))) (build-system gnu-build-system) + (arguments + ;; GCC 11 defaults to c++17 but this package needs something older. + (list #:configure-flags #~'("CXXFLAGS=-std=c++14 -O2 -g"))) (inputs (list openmpi munge @@ -4444,7 +4441,7 @@ late.") libelf libgcrypt libgpg-error)) - (synopsis "Infrastructue for large scale tool daemon launching") + (synopsis "Infrastructure for large-scale tool daemon launching") (description "LaunchMON is a software infrastructure that enables HPC run-time tools to co-locate tool daemons with a parallel job. Its API allows a @@ -4457,7 +4454,7 @@ launch daemons into the relevant nodes.") (define-public spindle (package (name "spindle") - (version "0.10") + (version "0.13") (source (origin ;; We use git checkout to avoid github auto-generated tarballs (method git-fetch) @@ -4467,16 +4464,15 @@ launch daemons into the relevant nodes.") (file-name (git-file-name name version)) (sha256 (base32 - "15n3ay0qq81r5v7fif61q1vdjcq44pp2nynkh3fvbzc9fj3c39wd")))) + "1z594nhash1him9v00qmyqv9jvikzrs4wxqy1cvnfwqwnrrkp707")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-sec-launchmon" "--enable-sec-munge" - "--enable-sec-none"))) + "--enable-sec-none" + ;; Fails to build as c++17. + "CXXFLAGS=-std=c++14 -O2 -g"))) (inputs - `(("mpi" ,openmpi) - ("munge" ,munge) - ("launchmon" ,launchmon) - ("libgcrypt" ,libgcrypt))) + (list openmpi munge launchmon libgcrypt)) (synopsis "Scalable library loading in HPC environments") (description "Spindle is a tool for improving the performance of dynamic library and @@ -5488,7 +5484,7 @@ interfering with any pam-mount configuration."))) (define-public wlgreet (package (name "wlgreet") - (version "0.4") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -5497,25 +5493,24 @@ interfering with any pam-mount configuration."))) (file-name (git-file-name name version)) (sha256 (base32 - "00grp63n9nrgqls3knxfv9wjbc7p0jwr7i2vzxy750dz85gi2kzn")))) + "1k0jmgh0rjbnb49gkvs0a4d7z9xb6pad8v5w5f7my4s0rfpk7wd9")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-chrono" ,rust-chrono-0.4) ("rust-getopts" ,rust-getopts-0.2) - ("rust-greetd-ipc" ,rust-greetd-ipc-0.8) + ("rust-greetd-ipc" ,rust-greetd-ipc-0.9) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-memmap2" ,rust-memmap2-0.3) - ("rust-nix" ,rust-nix-0.15) - ("rust-os-pipe" ,rust-os-pipe-0.8) - ("rust-rusttype" ,rust-rusttype-0.7) + ("rust-nix" ,rust-nix-0.25) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-rusttype" ,rust-rusttype-0.9) ("rust-serde" ,rust-serde-1) ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.15) ("rust-toml" ,rust-toml-0.5) ("rust-wayland-client" ,rust-wayland-client-0.29) - ("rust-wayland-protocols" ,rust-wayland-protocols-0.29) - ("rust-xml-rs" ,rust-xml-rs-0.8)) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-bundled-fonts @@ -5907,34 +5902,54 @@ file or files to several hosts.") (define-public du-dust (package (name "du-dust") - (version "0.8.3") + (version "0.8.6") (source (origin (method url-fetch) (uri (crate-uri "du-dust" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1daif13rdd7wb8m5fbp6zif5b8znqcvmkxrjpp2w2famsp36sahx")))) + "1w52xdz1vi6awsvf4lph791zv13phjvz4ypmxr7f6pgxd3crr77c")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-clap" ,rust-clap-3) + `(#:cargo-test-flags + (list "--release" "--" + "--skip=test_apparent_size") + #:install-source? #f + #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) ("rust-clap" ,rust-clap-3) ("rust-clap-complete" ,rust-clap-complete-3) + ("rust-clap-mangen" ,rust-clap-mangen-0.1) ("rust-config-file" ,rust-config-file-0.2) ("rust-directories" ,rust-directories-4) - ("rust-lscolors" ,rust-lscolors-0.7) + ("rust-lscolors" ,rust-lscolors-0.13) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1) ("rust-stfu8" ,rust-stfu8-0.2) - ("rust-sysinfo" ,rust-sysinfo-0.15) - ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-sysinfo" ,rust-sysinfo-0.27) + ("rust-terminal-size" ,rust-terminal-size-0.2) ("rust-thousands" ,rust-thousands-0.2) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-winapi-util" ,rust-winapi-util-0.1)) - #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-1) - ("rust-tempfile" ,rust-tempfile-3)))) + #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-extras + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (install-file "man-page/dust.1" + (string-append share "/man/man1")) + (mkdir-p (string-append out "/etc/bash_completion.d")) + (copy-file "completions/dust.bash" + (string-append out "/etc/bash_completion.d/dust")) + (install-file "completions/dust.fish" + (string-append share "/fish/vendor_completions.d")) + (install-file "completions/_dust" + (string-append share "/zsh/site-fuctions")))))))) (home-page "https://github.com/bootandy/dust") (synopsis "Graphical disk usage analyzer") (description "This package provides a graphical disk usage analyzer in @@ -5990,7 +6005,7 @@ Discover other RouterOS devices or @command{mactelnetd} hosts. (define-public bfs (package (name "bfs") - (version "3.0.2") + (version "3.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -5999,7 +6014,7 @@ Discover other RouterOS devices or @command{mactelnetd} hosts. (file-name (git-file-name name version)) (sha256 (base32 - "055qn2bhnyk9k96w8aviz7v4wip9hwsv7ak1m3yygm1x3fhdyhyz")))) + "0n2y9m81278j85m8vk242m9nsxdcw62rxsar4hzwszs6p5cjz5ny")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "CC=" @@ -6019,6 +6034,6 @@ Discover other RouterOS devices or @command{mactelnetd} hosts. (description "Bfs is a variant of the UNIX @command{find} command that operates breadth-first rather than depth-first. It is otherwise compatible with many -versions of command{find}, including POSIX, GNU, and *BSD find.") +versions of @command{find}, including POSIX, GNU, and *BSD find.") (home-page "https://tavianator.com/projects/bfs.html") (license license:bsd-0))) diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 3748ab7059..c2ebf09e4a 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -44,7 +44,7 @@ (define-public agda (package (name "agda") - (version "2.6.3") + (version "2.6.4") (source (origin (method git-fetch) @@ -53,12 +53,14 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1s7zd01i8pmvi90ywx497kc07z50nah7h0fc2dn6jzb132k5sh1q")) - (patches (search-patches "agda-libdirs-env-variable.patch")))) + (base32 "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky")) + (patches (search-patches "agda-libdirs-env-variable.patch" + "agda-use-sphinx-5.patch")))) (build-system haskell-build-system) (inputs (list ghc-aeson ghc-alex + ghc-ansi-terminal ghc-async ghc-blaze-html ghc-boxes @@ -73,9 +75,11 @@ ghc-monad-control ghc-murmur-hash ghc-parallel + ghc-peano ghc-regex-tdfa ghc-split ghc-strict + ghc-text-icu ghc-unordered-containers ghc-uri-encode ghc-vector-hashtables @@ -91,6 +95,7 @@ (guix build utils) (srfi srfi-26) (ice-9 match)) + #:configure-flags #~(list "-foptimise-heavily" "-fenable-cluster-counting") #:phases #~(modify-phases %standard-phases ;; This allows us to call the 'agda' binary before installing. @@ -194,7 +199,7 @@ come from Agda's standard library.") (define-public agda-stdlib (package (name "agda-stdlib") - (version "1.7.2") + (version "1.7.3") (source (origin (method git-fetch) (uri (git-reference @@ -203,7 +208,7 @@ come from Agda's standard library.") (file-name (git-file-name name version)) (sha256 (base32 - "065hf24xjpciwdrvk4isslgcgi01q0k93ql0y1sjqqvy5ryg5xmy")))) + "0y6rns64rrkh8hw7mamcf6797329pi4ravpak5zijpnkzdagmlmy")))) (build-system agda-build-system) (arguments (list @@ -241,7 +246,8 @@ try agda-prelude instead.") (base32 "0xwgm2mfl2pxipsv31bin8p14y1yhd9n27lv3clvsxd4z9yc034m")) (patches (search-patches "agda-categories-remove-incompatible-flags.patch" - "agda-categories-use-find.patch")))) + "agda-categories-use-find.patch" + "agda-categories-use-stdlib-1.7.3.patch")))) (build-system agda-build-system) (arguments (list @@ -259,20 +265,18 @@ try agda-prelude instead.") (license license:expat))) (define-public agda-cubical - ;; Upstream's HEAD follows the latest Agda release, but they don't release - ;; until a newer Agda release comes up, so their releases are always one - ;; version late. (package (name "agda-cubical") - (version "0.5") + (version "0.6") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/agda/cubical.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yfg7gr55n08ly1qgzpcp16s15k1abycppbcdi9lzg1hjryqxcg3")))) + "0zq0z328zcjmm43mrv2ks27i1dnbylcf8mhzja2hd4gvz1kq1ays")))) (build-system agda-build-system) (arguments (list @@ -289,10 +293,10 @@ agda-stdlib but using cubical methods.") (license license:expat))) (define-public agda-1lab - ;; Upstream doesn't do releases (yet). Use a commit that builds with 2.6.3, + ;; Upstream doesn't do releases (yet). Use a commit that builds with 2.6.4, ;; since they use Agda HEAD. - (let* ((revision "1") - (commit "47ca1d23640a6f49a3abe3c2fe27738bcc10c9c6")) + (let* ((revision "2") + (commit "549fdb1c948a975e90e70f871993a4a4239aa280")) (package (name "agda-1lab") (version (git-version "0.0" revision commit)) @@ -305,10 +309,12 @@ agda-stdlib but using cubical methods.") (file-name (git-file-name name version)) (sha256 (base32 - "0j7mp6c0xd0849skdxzncklkxynxnyfrbpcjv4qp5p1xfn0dnfqx")))) + "1k4zj8dibyplakpxaw4a8hpsaqhakynjb83dqxrva4h4ssj6gkqj")))) (build-system agda-build-system) (arguments - (list #:plan '(("src/index\\.lagda\\.md$")))) + ;; Check files individually first, to avoid running out of heap :( + (list #:plan '(("src/.+/.+\\.lagda\\.md$") + ("src/index\\.lagda\\.md$")))) (synopsis "Reference resource for mathematics done in Homotopy Type Theory") (description "A formalised, cross-linked reference resource for mathematics done in Homotopy Type Theory. Unlike the HoTT book, the 1lab is diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c061184aee..c454c69164 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -736,14 +736,14 @@ a C program.") (define-public fftw (package (name "fftw") - (version "3.3.8") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.fftw.org/pub/fftw/fftw-" version".tar.gz")) (sha256 (base32 - "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1")))) + "0rv4w90b65b2kvjpj8g9bdkl4xqc42q20f5bzpxdrkajk1a35jan")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -936,7 +936,7 @@ algorithms from the FORTRAN library MINPACK.") (define-public symengine (package (name "symengine") - (version "0.10.1") + (version "0.11.1") (source (origin (method git-fetch) @@ -945,7 +945,7 @@ algorithms from the FORTRAN library MINPACK.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qy5w5msq0zy7drbhdy0vx451zglha8jm5s4zzmvmsja5yyv8fx9")))) + (base32 "105rnnf33vx2n03wwv4962az7bfzgsn1gx6a6wyakmyrfdkb07jc")))) (build-system cmake-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index 6a8d97848b..6f4555d96f 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -28,8 +28,11 @@ #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) + #:use-module (gnu packages java) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) #:use-module (gnu packages readline) @@ -120,3 +123,86 @@ single line drawing characters, as well as the full Unicode APL range, including both uppercase and lowercase underscored alphabets, as-of-yet unused symbols, and almost all Latin-1 accented letters.") (license license:unlicense)))) + +(define-public dzaima-apl + (package + (name "dzaima-apl") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dzaima/APL.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1hnrq0mlff6b9c9129afphcnmzd05wdyyfs905n421diyd5xa0il")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs (list bash-minimal openjdk18)) + (native-inputs (list `(,openjdk18 "jdk") zip)) + (arguments + (list + #:imported-modules `(,@%default-gnu-imported-modules + (guix build ant-build-system)) + #:modules `((guix build gnu-build-system) + ((guix build ant-build-system) #:prefix ant:) + (guix build utils) + (ice-9 ftw) + (ice-9 regex) + (srfi srfi-26)) + #:phases + `(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let* ((javac (search-input-file inputs "/bin/javac")) + (jar (search-input-file inputs "/bin/jar"))) + (mkdir-p "src/build") + (apply invoke javac "-encoding" "UTF-8" "-d" "src/build" + (let ((files '())) + (ftw "src/APL/" + (lambda (filename statinfo flags) + (if (string-match ".*\\.java" filename) + (set! files (cons filename files))) + #t)) + files)) + (with-directory-excursion "src/build" + (invoke jar "--create" "--verbose" + "--file=dzaima-apl.jar" + "--main-class=APL.Main" + "APL"))))) + (delete 'check) ;; Upstream implements no tests + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (share (string-append out "/share/java")) + (wrapper (string-append bin "/dzaima-apl"))) + (mkdir-p share) + (mkdir-p bin) + (install-file "src/build/dzaima-apl.jar" share) + (with-output-to-file wrapper + (lambda _ + (display (string-append + "#!" (search-input-file inputs "/bin/sh") "\n" + (search-input-file inputs "/bin/java") + " -jar " share "/dzaima-apl.jar \"$@\"")))) + (chmod wrapper #o555)))) + (add-after 'install 'reorder-jar-content + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'reorder-jar-content) + #:outputs (list outputs)))) + (add-after 'reorder-jar-content 'generate-jar-indices + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'generate-jar-indices) + #:outputs (list outputs)))) + (add-after 'generate-jar-indices 'reorder-jar-content + (lambda* (#:key outputs #:allow-other-keys) + (apply (assoc-ref ant:%standard-phases 'reorder-jar-content) + #:outputs (list outputs))))))) + (home-page "https://github.com/dzaima/APL") + (synopsis "Implementation of the APL programming language in Java") + (description + "This package provides an implementation of APL in Java, extended from +Dyalog APL.") + (license license:expat))) diff --git a/gnu/packages/apple.scm b/gnu/packages/apple.scm new file mode 100644 index 0000000000..b59eee1802 --- /dev/null +++ b/gnu/packages/apple.scm @@ -0,0 +1,59 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 B. Wilson <elaexuotee@wilsonb.com> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages apple) + #:use-module (gnu packages bison) + #:use-module (guix build-system gnu) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:)) + +(define-public apple-bash + (package + (name "apple-bash") + (version "125") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/apple-oss-distributions/bash.git") + (commit (string-append "bash-" version)))) + (sha256 + (base32 "1d4s1z57yiyhgb6i22kb9al31j1fv9a4rp1bb747ny6grdvc4919")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs (list bison)) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda _ + ;; An XCode project wraps the actual bash source. + (chdir "bash-3.2") + ;; The xlocale.h header was removed in glibc 2.26. + (substitute* "lib/glob/smatch.c" + (("xlocale.h") "locale.h")) + ;; EBADEXEC is XNU-specific. + (substitute* "execute_cmd.c" + (("EBADEXEC") "ENOEXEC"))))))) + (home-page "https://github.com/apple-oss-distributions/bash/") + (synopsis "Bash used on Apple macOS systems") + (description + "This is the version of Bash, forked from GNU Bash 3.2, released on Apple +macOS systems.") + (license license:gpl2+))) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 17ba794201..ffb13025f3 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -398,14 +398,14 @@ dictionaries, including personal ones.") (define-public ispell (package (name "ispell") - (version "3.4.05") + (version "3.4.06") (source (origin (method url-fetch) (uri (string-append "https://www.cs.hmc.edu/~geoff/tars/ispell-" version ".tar.gz")) (sha256 - (base32 "00jni7gvdswjd9sdwip5ixnvjg2qzv56mn3m8gdgl9gxwgnns36g")))) + (base32 "19pbhg3pbnykkk9hla2kfhfanm7wcdja2qria365l1y8shridj8p")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9edb15ef09..90696feff4 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2018–2023 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 by Amar Singh <nly@disroot.org> ;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in> ;;; Copyright © 2020, 2021 Guillaume Le Vaillant <glv@posteo.net> @@ -186,7 +186,7 @@ reused in several astronomical applications, such as @code{wsclean}, (define-public calceph (package (name "calceph") - (version "3.5.2") + (version "3.5.3") (source (origin (method url-fetch) @@ -194,7 +194,7 @@ reused in several astronomical applications, such as @code{wsclean}, "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-" version ".tar.gz")) (sha256 - (base32 "1rnjlaiii4j0agbj4k242p212bqqmqdqa0lni6c3bnhgfnrbjfp4")))) + (base32 "12apl806h8qx1kq74malq3828jqapwfi27cn05pvvxfiq7gfpllx")))) (build-system gnu-build-system) (native-inputs (list gfortran)) @@ -493,6 +493,60 @@ in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) +(define-public python-aplpy + (package + (name "python-aplpy") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "aplpy" version)) + (sha256 + (base32 "0ph9jhv4q4i4z6nkqr6hjw9148kdlnayxsn83qgv5dqn0h3nc9r8")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy + python-matplotlib + python-numpy + python-pillow + python-pyavm + python-pyregion + python-reproject + python-scikit-image + python-shapely)) + (native-inputs + (list python-pytest-astropy + python-pytest-mpl + python-semantic-version)) + (home-page "http://aplpy.github.io") + (synopsis "Astronomical Plotting Library in Python") + (description + "@acronym{APLpy, the Astronomical Plotting Library in Python} is a Python +module aimed at producing publication-quality plots of astronomical imaging data +in FITS format. The module uses @code{matplotlib}, a powerful and interactive +plotting package. It is capable of creating output files in several graphical +formats, including EPS, PDF, PS, PNG, and SVG. + +Main features: +@itemize +@item Make plots interactively or using scripts +@item Show grayscale, colorscale, and 3-color RGB images of FITS files +@item Generate co-aligned FITS cubes to make 3-color RGB images +@item Make plots from FITS files with arbitrary WCS (e.g. position-velocity) +@item Slice multi-dimensional FITS cubes +@item Overlay any number of contour sets +@item Overlay markers with fully customizable symbols +@item Plot customizable shapes like circles, ellipses, and rectangles +@item Overlay ds9 region files +@item Overlay coordinate grids +@item Show colorbars, scalebars, and beams +@item Customize the appearance of labels and ticks +@item Hide, show, and remove different contour and marker layers +@item Pan, zoom, and save any view as a full publication-quality plot +@item Save plots as EPS, PDF, PS, PNG, and SVG +@end itemize") + (license license:expat))) + (define-public python-astroml (package (name "python-astroml") @@ -535,13 +589,13 @@ mining in astronomy.") (define-public python-fitsio (package (name "python-fitsio") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "fitsio" version)) (sha256 - (base32 "04fbg1ffj7qrlzw50xzzkfnlk6qjjqq96j0im7phprmwb1rbvzzh")) + (base32 "19him5rcpjyz14ghkmifnd1xl3ivlyy84h45k6j2pyr5ixc60ky6")) (modules '((guix build utils))) (snippet ;; Remove the bundled cfitsio. When update the package check the @@ -649,7 +703,7 @@ for reading and writing.") (define-public erfa (package (name "erfa") - (version "2.0.0") + (version "2.0.1") (source (origin (method git-fetch) @@ -658,7 +712,7 @@ for reading and writing.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s9dpj0jdkqcg552f00jhd722czji4pffabmpys5pgi6djckq4f4")))) + (base32 "1hxjbcvdlq4871r17fphbaf3bd8dsjagp1rdb3j8v6kr4f1dil9n")))) (build-system gnu-build-system) (native-inputs (list automake autoconf libtool pkg-config)) @@ -711,9 +765,10 @@ corrections.") (uri (string-append "https://www.atnf.csiro.au/people/mcalabre/WCS/" "wcslib-" version ".tar.bz2")) (sha256 - (base32 "17hjnkwn2rd5d9krw2n637q4y8ma4nzk2i55zzn8l2yimdpkxwib")))) - (inputs - (list cfitsio)) + (base32 "17hjnkwn2rd5d9krw2n637q4y8ma4nzk2i55zzn8l2yimdpkxwib")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "C/flexed"))))) (build-system gnu-build-system) (arguments (list @@ -731,6 +786,10 @@ corrections.") (("/bin/sh") "sh"))))))) ;; TODO: Fix build with gfortran and pack missing optional pgplot. ;; (inputs (list gfortran pgplot)) + (inputs + (list cfitsio)) + (native-inputs + (list flex)) (home-page "https://www.atnf.csiro.au/people/mcalabre/WCS") (synopsis "Library which implements the FITS WCS standard") (description "The FITS \"World Coordinate System\" (@dfn{WCS}) standard @@ -751,7 +810,10 @@ header.") (uri (string-append "https://www.atnf.csiro.au/people/mcalabre/WCS/" "wcslib-" version ".tar.bz2")) (sha256 - (base32 "1m3bx6gh5w3c7vvsqcki0x20mg8lilg13m0i8nh7za89w58dxy4w")))) + (base32 "1m3bx6gh5w3c7vvsqcki0x20mg8lilg13m0i8nh7za89w58dxy4w")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "C/flexed"))))) (properties '((hidden? . #t))))) (define-public wcstools @@ -861,7 +923,7 @@ astronomical image-processing packages like Drizzle, Swarp or SExtractor.") libtirpc qtbase-5 zlib)) - (home-page "https://projets.lam.fr/projects/unsio/wiki") + (home-page "https://projets.lam.fr/projects/glnemo2/wiki/Wiki") (synopsis "3D interactive visualization program for n-body like particles") (description "GLNEMO2 is an interactive 3D visualization program which displays @@ -876,7 +938,7 @@ different kinds of input files.") (define-public gnuastro (package (name "gnuastro") - (version "0.20") + (version "0.21") (source (origin (method url-fetch) @@ -884,7 +946,7 @@ different kinds of input files.") version ".tar.lz")) (sha256 (base32 - "05bkad0xbax9k0m2g2507mdmjg2109sfg72dsx16f44yj55llh2n")))) + "1zyk764pmfrsfj45gnc3qp4z1zfmgrv7kcsji2bxfzvs9inzzq4c")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) @@ -1020,7 +1082,7 @@ crowded star fields.") (define-public siril (package (name "siril") - (version "1.0.6") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -1028,16 +1090,18 @@ crowded star fields.") (commit version))) (sha256 (base32 - "0iqxb5zmjyygg4b6lwlq8z82mngxg7kjjpahhzk52m0cypfq0l18")) + "0ss1m9w4cz1752vp5738057nzmqc6k7fc9pi6kr9cwgspi1haall")) (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs (list cmake git glib libconfig pkg-config)) (inputs (list cfitsio exiv2 + ffms2 fftwf gsl gtk+ json-glib + libheif libraw librtprocess opencv)) @@ -1057,7 +1121,7 @@ image formats.") (define-public splash (package (name "splash") - (version "3.8.4") + (version "3.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -1065,7 +1129,7 @@ image formats.") (commit (string-append "v" version)))) (sha256 (base32 - "1l18sqz5mpab9wb5hlbfy18wfwq6fpijc3p9wa5bv6lrcymvpirp")) + "19r5j4jrxhp3gf865ns59vvfnn5a303dqgmb8y2kgcsx26fci1hs")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -1202,7 +1266,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (define-public stellarium (package (name "stellarium") - (version "23.2") + (version "23.3") (source (origin (method git-fetch) @@ -1211,7 +1275,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fkiibc6m8kfmyf5my7ynfrpdlrcri14cl26swpgv3bhzxpmx27h")))) + (base32 "15kl8kn5fmmppbm93w5ki7lpjn09lhyhn245v3jc335xifcwd2vd")))) (build-system cmake-build-system) ;; TODO: Complete documentation build and split into dedicated outputs. (arguments @@ -1321,7 +1385,7 @@ any arbitrary astrometric projection defined in the WCS standard.") (define-public celestia (package (name "celestia") - (version "1.6.3") + (version "1.6.4") (source (origin (method git-fetch) @@ -1330,7 +1394,7 @@ any arbitrary astrometric projection defined in the WCS standard.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dzci5n7gcnm1vq916gsn9zddkhbzhbsakqxrpnmvzibsqznn6c8")))) + (base32 "0nz9k5nd2zmrbwj1qhsfwmvqymqk8c4yjxpybck44isrild2ah9j")))) (build-system gnu-build-system) (arguments (list @@ -1402,13 +1466,13 @@ accurately in real time at any rate desired.") (define-public python-astropy (package (name "python-astropy") - (version "5.3.3") + (version "5.3.4") (source (origin (method url-fetch) (uri (pypi-uri "astropy" version)) (sha256 - (base32 "1fwk7x4q1hgdf9m8q613c6q7045sam1g934vgqv588ksbngxyc03")) + (base32 "1n7iwvjari4xv37094cpiapmjhhm57b04hi4r40wqb5czbigg46l")) (modules '((guix build utils))) (snippet '(begin @@ -1463,7 +1527,9 @@ accurately in real time at any rate desired.") "not remote_data" ;; XXX: Check why this tests failing. " and not test_ignore_sigint" - " and not test_parquet_filter")))))))) + " and not test_parquet_filter" + ;; See https://github.com/astropy/astropy/issues/15537 + " and not test_pvstar")))))))) (native-inputs (list pkg-config python-colorlog @@ -1548,19 +1614,27 @@ astronomy and astrophysics.") (uri (pypi-uri "astroquery" version)) (sha256 (base32 "1vhkzsqlgn3ji5by2rdf2gwklhbyzvpzb1iglalhqjkkrdaaaz1h")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'check 'writable-home - (lambda _ ; some tests need a writable home - (setenv "HOME" (getcwd)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "--pyargs" "astroquery" - ;; Skip tests that require online data. - "-m" "not remote_data"))))))) + (list + #:test-flags + #~(list "--pyargs" "astroquery" + "-m" "not remote_data") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-test-environment + (lambda _ + (setenv "HOME" (getcwd)) ; some tests need a writable home + ;; To solve pytest/conftest issue. Pytest tries to load all + ;; files with word 'test' in them. + ;; + ;; ImportError while loading conftest ... + ;; _pytest.pathlib.ImportPathMismatchError: ... + ;; + (call-with-output-file "pytest.ini" + (lambda (port) + (format port "[pytest] +python_files = test_*.py")))))))) (propagated-inputs (list python-astropy python-beautifulsoup4 @@ -1570,12 +1644,13 @@ astronomy and astrophysics.") python-pyvo python-requests)) (native-inputs - (list python-flask - python-jinja2 + (list python-astropy-healpix python-matplotlib + ;; python-mocpy : Not packed yet, optional python-pytest-astropy - python-pytest-dependency)) - (home-page "https://www.astropy.org/astroquery/") + python-pytest-dependency + python-regions)) + (home-page "https://astroquery.readthedocs.io/en/latest/index.html") (synopsis "Access online astronomical data resources") (description "Astroquery is a package that contains a collection of tools to access online Astronomical data. Each web service has its own sub-package.") @@ -1660,13 +1735,13 @@ Herschel.") (define-public python-casa-formats-io (package (name "python-casa-formats-io") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (pypi-uri "casa-formats-io" version)) (sha256 (base32 - "07cchih2ws6jf6q1a4xhkv0jk96s3w08kzxx9l1911wzqk0pw9pj")))) + "16qwr6yq86qgdb0lvnmfm5mn6g2d29b1vrmfv26v77kxm6szxr8h")))) (build-system pyproject-build-system) (arguments (list @@ -1720,7 +1795,7 @@ bad pixel tracking throughout the reduction process.") (define-public python-cdflib (package (name "python-cdflib") - (version "1.1.0") + (version "1.2.3") (source (origin (method git-fetch) ; no tests in pypi archive @@ -1729,10 +1804,13 @@ bad pixel tracking throughout the reduction process.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qxf13vmfiblcazxdk2b765b02ys57amawvrwlkj9d5x9f5s6061")))) + (base32 "0vpgcbc9pmx0qqfia1frnwq3jkgfp8y3ikqdnzs5bs1sr13p9p3w")))) (build-system pyproject-build-system) (arguments - (list #:phases + ;; Disable shaky test. + ;; See https://github.com/MAVENSDC/cdflib/issues/234 + (list #:test-flags #~(list "-k" "not test_compute_cdfepoch16") + #:phases #~(modify-phases %standard-phases (add-before 'build 'set-env-version (lambda _ @@ -1769,13 +1847,13 @@ attempting to maintain ISTP compliance (define-public python-crds (package (name "python-crds") - (version "11.17.4") + (version "11.17.9") (source (origin (method url-fetch) (uri (pypi-uri "crds" version)) (sha256 (base32 - "0bk6cyd2il7ibqwky6m5kkgs9shrlzyfpnp2rh9jx0xa9habf7zm")))) + "0ha7ibs5lmqs9pcr546jyxzgrmx1xyqps7fsp220rvlsbsisdgm0")))) (build-system pyproject-build-system) (arguments (list @@ -1858,18 +1936,7 @@ Cesium.") (uri (pypi-uri "drms" version)) (sha256 (base32 "0mkrmr55fgca441z7hvsyri6x9cjsh0sfas3hrj0k1k10k8vszbw")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? - #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (setenv "JSOC_EMAIL" "jsoc@sunpy.org") - (invoke "python" "-m" "pytest" "-vv"))))))) + (build-system pyproject-build-system) (native-inputs (list python-astropy python-pytest-astropy @@ -1888,60 +1955,55 @@ used with local NetDRMS sites.") (define-public python-drizzle (package (name "python-drizzle") - (version "1.13.7") - (source (origin - (method git-fetch) ;PyPi doesn't have the test data sets - (uri (git-reference - (url "https://github.com/spacetelescope/drizzle") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x591d9gjasds91fvwcf37bhxp5nra28g0vq5zkykczpc70ywiy8")))) + (version "1.14.3") + (source + (origin + (method git-fetch) ;PyPi doesn't have the test data sets + (uri (git-reference + (url "https://github.com/spacetelescope/drizzle") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04gncwg76yivcaq7rwgsw5k8w4h3c4wcrjcamb53h0d5s820z7dl")))) (build-system pyproject-build-system) (arguments (list - ;; XXX: 2 of 26 tests failed with AssertionError, disable them for now. - ;; Consider mention it in upstream. - #:test-flags #~(list "-k" - (string-append "not test_square_with_point" - " and not test_square_with_grid")) - #:phases #~(modify-phases %standard-phases - (add-before 'build 'set-env-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$version))) - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before running - ;; the tests. - (invoke "python" "setup.py" "build_ext" "--inplace")))))) - (propagated-inputs (list python-astropy python-numpy)) - (native-inputs (list python-coverage python-flake8 python-pytest - python-pytest-cov python-setuptools-scm)) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-env-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list python-astropy python-numpy)) + (native-inputs + (list python-flake8 python-pytest python-setuptools-scm)) (home-page "https://github.com/spacetelescope/drizzle") (synopsis "Astronomical tool for combining dithered images into a single image") (description - "The drizzle library is a Python package for combining dithered images into -a single image. This library is derived from code used in DrizzlePac. Like -DrizzlePac, most of the code is implemented in the C language. The biggest -change from DrizzlePac is that this code passes an array that maps the input to -output image into the C code, while the DrizzlePac code computes the mapping by -using a Python callback. Switching to using an array allowed the code to be -greatly simplified.") + "The drizzle library is a Python package for combining dithered images +into a single image. This library is derived from code used in DrizzlePac. +Like DrizzlePac, most of the code is implemented in the C language. The +biggest change from DrizzlePac is that this code passes an array that maps the +input to output image into the C code, while the DrizzlePac code computes the +mapping by using a Python callback. Switching to using an array allowed the +code to be greatly simplified.") (license license:bsd-3))) (define-public python-ephem (package (name "python-ephem") - (version "4.1.4") + (version "4.1.5") (source (origin (method url-fetch) (uri (pypi-uri "ephem" version)) (sha256 (base32 - "0q67z79lgwdylxagbsjm42xvsmk5jmgvghy36m2n5lb2446rz9bk")))) + "0ainqbnvw320pc61q5b6ad6f2mhn1pvrlnq489cwfx0m82mahr0c")))) (build-system python-build-system) (native-inputs (list tzdata)) (home-page "https://rhodesmill.org/pyephem/") @@ -2059,27 +2121,22 @@ of astronomical sources.") (build-system pyproject-build-system) (arguments (list + #:test-flags + #~(list "-m" "not remote_data" + ;; TODO: Review failing tests later when any upstream + ;; suggestions are provided: + ;; https://github.com/poliastro/poliastro/issues/1618 + "-k" (string-append "not test_czml_add_trajectory" + " and not test_czml_custom_packet" + " and not test_czml_ground_station" + " and not test_czml_groundtrack" + " and not test_czml_preamble")) #:phases #~(modify-phases %standard-phases ;; NOTE: Tests take about 7-10 minutes to pass. (add-before 'check 'prepare-test-environment (lambda _ - (setenv "HOME" "/tmp") - ;; TODO: Review failing tests later when any upstream - ;; suggestions are provided: - ;; https://github.com/poliastro/poliastro/issues/1618 - (substitute* "tests/test_czml.py" - (("def test_czml_add_trajectory") "def __off_test_czml_add_trajectory") - (("def test_czml_custom_packet") "def __off_test_czml_custom_packet") - (("def test_czml_ground_station") "def __off_test_czml_ground_station") - (("def test_czml_groundtrack") "def __off_test_czml_groundtrack") - (("def test_czml_preamble") "def __off_test_czml_preamble")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" - ;; Skip tests that need remote data. - "-m" "not remote_data"))))))) + (setenv "HOME" "/tmp")))))) (native-inputs (list python-coverage python-hypothesis @@ -2161,6 +2218,29 @@ cases for which diffractive rather than geometric optics is the topic of interest, and which require portability between platforms or ease of scripting.") (license license:bsd-3))) +(define-public python-pyavm + (package + (name "python-pyavm") + (version "0.9.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyAVM" version)) + (sha256 + (base32 "0vgjqvddq4a5lnmg8msm7fwqs3r6fc748xzvnhyvc387h0z8pdxk")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy python-numpy)) + (native-inputs + (list python-pillow python-pytest python-setuptools-scm)) + (home-page "https://astrofrog.github.io/pyavm/") + (synopsis "Simple pure-python AVM meta-data handling") + (description + "PyAVM is a module to represent, read, and write metadata following the +@acronym{AVM, Astronomy Visualization Metadata} standard provided by +@url{https://www.virtualastronomy.org/avm_metadata.php, vamp} project.") + (license license:expat))) + (define-public python-pyvo (package (name "python-pyvo") @@ -2225,13 +2305,13 @@ Virtual observatory (VO) using Python.") (define-public python-reproject (package (name "python-reproject") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "reproject" version)) (sha256 - (base32 "0p07qlqinb826m4n5b5invyfyv4z750sai2caqaf598mgj04l61p")))) + (base32 "1cjdfv7wd4c0ia63vqakxf9w8hd5dfz6jzi520scd37rliy1xgld")))) (build-system pyproject-build-system) (arguments (list @@ -2241,6 +2321,9 @@ Virtual observatory (VO) using Python.") ;; from .deforest import map_coordinates ;; E ModuleNotFoundError: No module named 'reproject.adaptive.deforest' ;; + ;; Project removed setup.py and there is no alternative to `python + ;; setup.py build_ext' + ;; See: https://github.com/pypa/setuptools/discussions/3388 #:tests? #f #:phases #~(modify-phases %standard-phases @@ -2286,13 +2369,13 @@ changing the pixel resolution, orientation, coordinate system.") (define-public python-sgp4 (package (name "python-sgp4") - (version "2.22") + (version "2.23") (source (origin (method url-fetch) (uri (pypi-uri "sgp4" version)) (sha256 - (base32 "1yc6gcbhz80i875j0wf6ikx7rzs0m7m1qp72dmdhdjidmpma5w0p")))) + (base32 "0aalbmldks6ykgkcxwkvnp04q0avhv903m5zwvg8i7zvl99xrbfq")))) (build-system python-build-system) (propagated-inputs (list python-numpy)) @@ -2315,13 +2398,13 @@ orbits described in TLE files.") (define-public python-sunpy (package (name "python-sunpy") - (version "5.0.0") + (version "5.0.1") (source (origin (method url-fetch) (uri (pypi-uri "sunpy" version)) (sha256 - (base32 "1w75yc8az86pwbf79h083j4kc2ycfk76ky5kzlmcwgp0ih23mhym")))) + (base32 "1r4phc91k527kvpa2jd1d417x97wqyrm3ydayr9hshwz1k5v5ngf")))) (build-system pyproject-build-system) (arguments (list @@ -2450,6 +2533,60 @@ positions of the sun: dawn, sunrise, solar noon, sunset, dusk, solar elevation, solar azimuth, rahukaalam, and the phases of the moon.") (license license:asl2.0))) +(define-public python-spectral-cube + (package + (name "python-spectral-cube") + (version "0.6.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "spectral-cube" version)) + (sha256 + (base32 "10q76rsgf9w4j7y68mfa870bpxf06m6kqvivj4340jmgnsrfy1zg")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy + python-aplpy + python-casa-formats-io + python-dask + python-distributed + python-fsspec + ;; python-glue-core ; Not packed http://glueviz.org/, optional. + python-joblib + python-matplotlib + python-numpy + python-radio-beam + python-reproject + python-scipy + python-six + ;; python-yt ; Not packed https://yt-project.org/, optional. + python-zarr)) + (native-inputs + (list ;; XXX: Introduce cycle with pvextractor, listed as extra requiremnts + ;; in [noviz] option. + ;; python-pvextractor + python-pytest-astropy + python-regions + python-semantic-version + python-setuptools-scm)) + (home-page "https://spectral-cube.readthedocs.io/en/latest/") + (synopsis "Library for reading and analyzing astrophysical spectral data cubes") + (description + "The spectral-cube package provides an easy way to read, manipulate, +analyze, and write data cubes with two positional dimensions and one spectral +dimension, optionally with Stokes parameters. + +It provides the following main features: +@itemize +@item A uniform interface to spectral cubes, robust to the wide range of conventions +of axis order, spatial projections, and spectral units that exist in the wild. +@item Easy extraction of cube sub-regions using physical coordinates. +@item Ability to easily create, combine, and apply masks to datasets. +@item Basic summary statistic methods like moments and array aggregates. +@item Designed to work with datasets too large to load into memory. +@end itemize") + (license license:bsd-3))) + (define-public python-spherical-geometry (package (name "python-spherical-geometry") @@ -2465,24 +2602,22 @@ elevation, solar azimuth, rahukaalam, and the phases of the moon.") (file-name (git-file-name name version)) (sha256 (base32 "0kzcncqir4v7nhk9lxj9gxr32p3krkaqa58y2i4kksgxxy24qw4z")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list - ;; NOTE: (Sharlatan-20220523T231348+0100): Tests depends on old Python2 - ;; libarry `sphere' - #:tests? #f + ;; XXX: Disable one failing test + ;; See https://github.com/spacetelescope/spherical_geometry/issues/252 + #:test-flags #~(list "-k" "not test_overlap") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'preparations (lambda _ - ;; Fixing: setuptools-scm was unable to detect version for ... - (substitute* "setup.py" - (("use_scm_version=True") - (format #f "version=~s" #$version)) - (("setup_requires=\\['setuptools_scm'\\],.*") - "")) + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) ;; Use our own libraries in place of bundles. - (setenv "USE_SYSTEM_QD" "1")))))) + (setenv "USE_SYSTEM_QD" "1"))) + (add-before 'check 'build-extensions + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list python-pytest python-setuptools-scm)) @@ -2538,7 +2673,7 @@ Science Institute} image array manipulation functions.") (sha256 (base32 "14457izlbnks84dyza75ib3nvx2w8nhlqm9vc1zb7hbhknb5gjvw")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:tests? #f)) ;No tests (propagated-inputs (list python-numpy)) @@ -2566,11 +2701,23 @@ task}.") (build-system pyproject-build-system) (arguments (list - ;; XXX: Fix failing tests. There are errors to load test files. - #:tests? #f)) + #:phases + #~(modify-phases %standard-phases + ;; Test steps are taken from GitHub Actions. + ;; See https://github.com/spacetelescope/stsci.stimage/issues/27 + (replace 'check + (lambda _ + (copy-file (string-append + #$(this-package-native-input "python-waf") "/bin/waf") + "waf") + (invoke "python" "waf" "configure" "build" "do_tests")))))) (propagated-inputs (list python-numpy)) - (native-inputs (list python-codecov python-pytest python-pytest-cov - python-setuptools-scm)) + (native-inputs + (list python-codecov + python-pytest + python-pytest-cov + python-setuptools-scm + python-waf)) (home-page "https://stscistimage.readthedocs.io/en/latest/") (synopsis "STScI image processing") (description "This package provides an astronomical Python package with @@ -2580,27 +2727,38 @@ image processing functions: @code{xyxymatch}, @code{geomap}.") (define-public python-stcal (package (name "python-stcal") - (version "1.4.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "stcal" version)) - (sha256 - (base32 - "163vyqcd9qv2knf8jik8y449z7ljl2lvbd7im82bq61prgi3z2hj")))) + (version "1.4.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "stcal" version)) + (sha256 + (base32 "031ldihdmsdrwz4wl49bfk2bxmzbp1i3kidrw46xz936765zmnc0")))) (build-system pyproject-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - ;; XXX: Can't detect opencv-python version. The input - ;; opencv might not set the version correctly. - (delete 'sanity-check)))) - (propagated-inputs (list opencv ;Provides OpenCV-Python - python-astropy python-numpy python-scipy)) - (native-inputs (list python-psutil - python-pytest - python-pytest-cov - python-pytest-doctestplus - python-pytest-openfiles - python-setuptools-scm)) + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: Can't detect opencv-python version. The input opencv might + ;; not set the version correctly. + (delete 'sanity-check) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list opencv ;Provides OpenCV-Python + python-astropy + python-numpy + python-scipy)) + (native-inputs + (list python-cython + python-psutil + python-pytest + python-pytest-cov + python-pytest-doctestplus + python-pytest-openfiles + python-setuptools-scm)) (home-page "https://github.com/spacetelescope/stcal") (synopsis "STScI tools and algorithms used in calibration pipelines") (description "STScI tools and algorithms used in calibration pipelines.") @@ -2609,53 +2767,60 @@ image processing functions: @code{xyxymatch}, @code{geomap}.") (define-public python-stdatamodels (package (name "python-stdatamodels") - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "stdatamodels" version)) - (sha256 - (base32 - "003h3f07aqf6s24ivwnps81n2h51k545b236s75l8ppvjrm45xfq")))) + (version "1.8.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "stdatamodels" version)) + (sha256 + (base32 "0265xa9nrp6qp1z7v9kmnd3c8jc0dad2vzin657clk3rrsj2qll5")))) (build-system pyproject-build-system) (arguments (list - ;; Disable tests requiring access to CRDS servers to download ~500MiB - ;; of data. + ;; Disable tests requiring access to CRDS servers to download ~500MiB of + ;; data. #:test-flags #~(list "-k" "not test_crds_selectors_vs_datamodel") - #:phases #~(modify-phases %standard-phases - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp")))))) - (propagated-inputs (list python-asdf - python-asdf-astropy - python-astropy - python-numpy - python-psutil)) - (native-inputs (list python-crds - python-pytest - python-pytest-doctestplus - python-scipy - python-semantic-version - python-setuptools-scm)) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp")))))) + (propagated-inputs + (list python-asdf + python-asdf-astropy + python-astropy + python-numpy + python-psutil)) + (native-inputs + (list python-crds + python-pytest + python-pytest-doctestplus + python-scipy + python-semantic-version + python-setuptools-scm)) (home-page "https://github.com/spacetelescope/stdatamodels") (synopsis "Core support for DataModel classes used in calibration pipelines") (description - "Provides DataModel, which is the base class for data models implemented in -the @acronym{JWST, James Webb Space Telescope} and @acronym{Roman, Nancy Grace -Roman Space Telescope} calibration software.") + "Provides @code{DataModel}, which is the base class for data models +implemented in the @acronym{JWST, James Webb Space Telescope} and +@acronym{Roman, Nancy Grace Roman Space Telescope} calibration software.") (license license:bsd-3))) (define-public python-stpipe (package (name "python-stpipe") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (pypi-uri "stpipe" version)) (sha256 (base32 - "17gnwzhl10vbg059lfprdyci19dlh3whkmb9rl7z25wr593rnvcp")))) + "11ccb3v2s20lf851061s4nanljwm9s9xzkcfgb3qhv0hjwziq0vr")))) + (arguments + (list + ;; See https://github.com/spacetelescope/stpipe/issues/114 + #:test-flags #~(list "-k" "not test_roman_datamodel"))) (build-system pyproject-build-system) (propagated-inputs (list python-asdf python-astropy python-crds python-semantic-version python-stdatamodels)) @@ -2820,44 +2985,40 @@ low quality ones") (license license:gpl3+))) (define-public libpasastro - ;; NOTE: (Sharlatan-20210122T215921+0000): the version tag has a build - ;; error on spice which is resolved with the latest commit. - (let ((commit "e3c218d1502a18cae858c83a9a8812ab197fcb60") - (revision "1")) - (package - (name "libpasastro") - (version (git-version "1.4.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pchev/libpasastro") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0asp2sn34nds5va2ghppwc41vb6j3d1mf049j949rgrll817kx47")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:make-flags - (list - ,(match (or (%current-target-system) (%current-system)) - ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux") - "OS_TARGET=linux") - (_ #f)) - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "CPU_TARGET=i386") - ("x86_64-linux" "CPU_TARGET=x86_64") - ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l") - (_ #f)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) - (home-page "https://github.com/pchev/libpasastro") - (synopsis "Interface to astronomy library for use from Pascal program") - (description - "This package provides shared libraries to interface Pascal program with + (package + (name "libpasastro") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pchev/libpasastro") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h92p9ph3zi4w8krny1azd9wgwna2nf07ims983jcky1chkfm0is")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags + (list + ,(match (or (%current-target-system) (%current-system)) + ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux") + "OS_TARGET=linux") + (_ #f)) + ,(match (or (%current-target-system) (%current-system)) + ("i686-linux" "CPU_TARGET=i386") + ("x86_64-linux" "CPU_TARGET=x86_64") + ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l") + (_ #f)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/pchev/libpasastro") + (synopsis "Interface to astronomy library for use from Pascal program") + (description + "This package provides shared libraries to interface Pascal program with standard astronomy libraries: @itemize @@ -2866,12 +3027,12 @@ standard astronomy libraries: @item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS. @item @code{libpasspice.so}: To work with NAIF/SPICE kernel. @end itemize\n") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public libxisf (package (name "libxisf") - (version "0.2.9") + (version "0.2.10") (source (origin (method git-fetch) @@ -2880,7 +3041,7 @@ standard astronomy libraries: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02cxv86h0ng4kmvyjkf7cr2ak2i3vpf0q0ik7jg4nmqjsidcs796")))) + (base32 "0q5qipn8887yhrk9pmi4fksxxmqas3w2aw2p194yhzkjapxk2k9h")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DUSE_BUNDLED_LIBS=OFF"))) @@ -2999,23 +3160,21 @@ Mercator, Mollweide, Peters, polyconic, orthographic and rectangular.") (sha256 (base32 "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7")))) (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list "CFLAGS=-O2 -g -fcommon") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Remove reference to non-existent file. + (substitute* "po/POTFILES.in" + (("src/gtk-sat-tree\\.c") ""))))))) (native-inputs - `(("intltool" ,intltool) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + (list gettext-minimal intltool pkg-config)) (inputs (list curl glib goocanvas gtk+)) - (arguments - `(#:configure-flags '("CFLAGS=-O2 -g -fcommon") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - ;; Remove reference to non-existent file. - (substitute* "po/POTFILES.in" - (("src/gtk-sat-tree\\.c") - "")) - #t))))) + (home-page "http://gpredict.oz9aec.net/index.php") (synopsis "Satellite tracking and orbit prediction application") (description "Gpredict is a real-time satellite tracking and orbit prediction @@ -3023,7 +3182,6 @@ application. It can track a large number of satellites and display their position and other data in lists, tables, maps, and polar plots (radar view). Gpredict can also predict the time of future passes for a satellite, and provide you with detailed information about each pass.") - (home-page "http://gpredict.oz9aec.net/index.php") (license license:gpl2+))) (define-public sgp4 @@ -3077,19 +3235,8 @@ It can be used to calculate the trajectory of satellites.") (base32 "0a6wb1a9adwd01dmy0r03xxp8iz9y7mvh30088ajilhj4lf90vxa")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;no test provided - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p "build") - (chdir "build") - (invoke - "cmake" - "-G" "Unix Makefiles" - "-DCMAKE_BUILD_TYPE=Release" - (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref outputs "out")) - "..")))))) + (list ;; No test provided + #:tests? #f)) (native-inputs (list boost pkg-config)) (inputs @@ -3109,10 +3256,10 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, 32-bit floating-point.") (license license:gpl3+))) -(define-public indi +(define-public indi-2.0 (package (name "indi") - (version "1.9.9") + (version "2.0.4") (source (origin (method git-fetch) @@ -3121,7 +3268,7 @@ floating-point (no compression, LZW- or ZIP-compressed), FITS 8-bit, 16-bit, (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vfcas59nlw8v7n6qhxhcm4isf5wk0crip5rmsallq3bsv3zznfr")))) + (base32 "1pp72bqxrvdij47fqfrnyxwqw1w8prxvs1igjsazcw8ncbrdbbjc")))) (build-system cmake-build-system) (arguments ;; TODO: fix failing tests on aarch64-system. @@ -3170,6 +3317,24 @@ more.") license:lgpl2.0+ license:lgpl2.1+)))) +(define-public indi-1.9 + (package + (inherit indi-2.0) + (version "1.9.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indilib/indi") + (commit (string-append "v" version)))) + (file-name (git-file-name "indi" version)) + (sha256 + (base32 "1vfcas59nlw8v7n6qhxhcm4isf5wk0crip5rmsallq3bsv3zznfr")))))) + +(define-public indi + ;; Default version of INDI.. + indi-1.9) + (define-public sunclock (let ((commit "f4106eb0a81f7594726d6b2859efd8fc64cc1225") (revision "1")) @@ -3232,43 +3397,44 @@ Moon position, etc.") (define-public python-jplephem (package (name "python-jplephem") - (version "2.18") + (version "2.20") (source (origin (method url-fetch) (uri (pypi-uri "jplephem" version)) (sha256 - (base32 "1rgswy52ismij0bkmfqwbml5zikzvzzs1f833dwk0y64lkl12aa9")))) - (build-system python-build-system) + (base32 "1yp1l3n07849411099f976ps0pyv8jk8k5l9da9nhv54ir86v65v")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (let ((out (assoc-ref outputs "out"))) - (add-installed-pythonpath inputs outputs) - (setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) - (invoke "python" "-m" "unittest" "discover" "-s" "test")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover" "-s" "test"))))))) (inputs (list python-numpy)) (home-page "https://github.com/brandon-rhodes/python-jplephem") (synopsis "Python version of NASA DE4xx ephemerides") (description - "The package is a Python implementation of the mathematics that standard -JPL ephemerides use to predict raw (x,y,z) planetary positions.") + "@code{skyfield} computes positions for the stars, planets, and +satellites in orbit around the Earth. Its results should agree with the +positions generated by the United States Naval Observatory and their +Astronomical Almanac to within 0.0005 arcseconds (half a @emph{mas} or +milliarcsecond).") (license license:expat))) (define-public python-jwst (package (name "python-jwst") - (version "1.11.4") + (version "1.12.5") (source (origin (method url-fetch) (uri (pypi-uri "jwst" version)) (sha256 (base32 - "1q3kpdjr8j1y8hkpidy80aqxsp3k13sz4j5aagq3wnzvpnds3x73")))) + "0blrl00lz1snhcnr7j59nh05rnpqxdnfp8hhgagkr50h85q4smrn")))) (build-system pyproject-build-system) (arguments (list @@ -3329,13 +3495,13 @@ exposures and high-level data products (mosaics, extracted spectra, etc.).") (define-public python-pyerfa (package (name "python-pyerfa") - (version "2.0.0.3") + (version "2.0.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pyerfa" version)) (sha256 - (base32 "0f8zykzxjsiwv5ibdn5asla2ng2xl0xdkrcrrd61j31mb3xbnzyp")) + (base32 "0swsdkipnk73iflsa7qbaw89wahbnfyvplqaxwi0yfrxippp9b6v")) (modules '((guix build utils))) (snippet #~(begin @@ -3346,6 +3512,7 @@ exposures and high-level data products (mosaics, extracted spectra, etc.).") (list ;; Disable only one failing test: ;; AttributeError: __warningregistry__ + ;; See https://github.com/liberfa/pyerfa/issues/126 #:test-flags #~(list "-k" "not test_errwarn_reporting") #:phases #~(modify-phases %standard-phases @@ -3374,13 +3541,21 @@ functions, so that they can be called with scalar or array inputs.") (define-public python-pynbody (package (name "python-pynbody") - (version "1.3.1") + (version "1.4.2") (source (origin - (method url-fetch) - (uri (pypi-uri "pynbody" version)) + (method git-fetch) ;PyPi doesn't have not prebuit version. + (uri (git-reference + (url "https://github.com/pynbody/pynbody") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1yp7ja66zqmbnh7bbwbyimxq1nkrmjrcif2rzfm1hswm0fp2fbga")))) + (base32 "1lwjs8vf3pc4a64c93fa5k6r276g1c60722swns2r10ig1s4wk0a")) + (modules '((guix build utils))) + (snippet + ;; Symlink goes to not existing directory. + #~(for-each delete-file '("docs/testdata" + "docs/tutorials/example_code/testdata"))))) (build-system pyproject-build-system) (arguments (list #:test-flags #~(list @@ -3411,7 +3586,12 @@ functions, so that they can be called with scalar or array inputs.") "--ignore=tests/sph_smooth_test.py" "--ignore=tests/subfind_test.py" "--ignore=tests/subfindhdf_gadget4_test.py" - "--ignore=tests/tipsy_test.py"))) + "--ignore=tests/tipsy_test.py") + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-compiler + (lambda _ + (setenv "CC" #$(cc-for-target))))))) (native-inputs (list python-cython python-pandas @@ -3429,6 +3609,46 @@ astrophysical simulations supporting PKDGRAV/Gasoline, Gadget, Gadget4/Arepo, N-Chilada and RAMSES AMR outputs.") (license license:gpl3+))) +(define-public python-pyregion + (package + (name "python-pyregion") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyregion" version)) + (sha256 + (base32 "0l7qb7r8fnv46mdih4m5b8jaxixgpw6m7v37dpikjkblgh0vigaw")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (propagated-inputs + (list python-astropy python-numpy python-pyparsing)) + (native-inputs + (list python-cython + python-pytest + python-pytest-astropy-header + python-setuptools-scm)) + (home-page "https://github.com/astropy/pyregion") + (synopsis "Python parser for ds9 region files") + (description + "@code{pyregion} is a python module to parse ds9 region files. It also +supports ciao region files. +Features: +@itemize +@item ds9 and ciao region files. +@item (physical, WCS) coordinate conversion to the image coordinate. +@item convert regions to matplotlib patches. +@item convert regions to spatial filter (i.e., generate mask images) +@end itemize") + (license license:expat))) + (define-public python-pysynphot (package (name "python-pysynphot") @@ -3510,9 +3730,21 @@ datetime object.") (build-system pyproject-build-system) (arguments (list - ;; XXX: Test needs more love to pass. - ;; ERROR collecting synphot/tests/test_utils.py - #:tests? #f)) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'prepare-test-environment + (lambda _ + (invoke "python" "setup.py" "build_ext" "--inplace") + ;; To solve pytest/conftest issue. Pytest tries to load all + ;; files with word 'test' in them. + ;; + ;; ImportError while loading conftest ... + ;; _pytest.pathlib.ImportPathMismatchError: ... + ;; + (call-with-output-file "pytest.ini" + (lambda (port) + (format port "[pytest] +python_files = test_*.py")))))))) (propagated-inputs (list python-astropy python-numpy python-scipy)) (native-inputs (list python-pytest python-pytest-astropy python-setuptools-scm)) @@ -3527,13 +3759,13 @@ of the old packages.") (define-public python-tweakwcs (package (name "python-tweakwcs") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (pypi-uri "tweakwcs" version)) (sha256 (base32 - "1500w737n9vf5hv16xkybk4shl7g4wfzb2ji9mc4vgzj41gkrwl4")))) + "09bd8b77rpn641cwmkhcyzx43xkx3va83wdcb47wcqqa7qgx9f1m")))) (build-system pyproject-build-system) (propagated-inputs (list python-astropy python-gwcs @@ -3558,32 +3790,23 @@ between image and reference catalogs. Currently only aligning images with @code{FITS WCS} and @code{JWST gWCS} are supported.") (license license:bsd-3))) -(define-public python-asdf +(define-public python-asdf-3.0 (package (name "python-asdf") - (version "2.15.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (pypi-uri "asdf" version)) (sha256 - (base32 "11s56797l5330kkhppkyz0bsvms016knmyswj4gx91zrxf8iqvv8")))) + (base32 "1jsk7b4mx04l0a08j832vnl309dba3gjnha9mbd61dzs9ridrfna")))) (build-system pyproject-build-system) - (arguments - (list #:test-flags - #~(list "-k" (string-append - "not test_overwrite" - " and not test_tagging_scalars" - " and not test_info_command" - " and not test_array_inline_threshold_recursive")))) (native-inputs - (list python-astropy - python-fsspec + (list python-fsspec python-packaging python-psutil python-pytest python-pytest-doctestplus - python-pytest-openfiles python-pytest-remotedata python-semantic-version python-setuptools-scm)) @@ -3591,10 +3814,9 @@ between image and reference catalogs. Currently only aligning images with (list python-asdf-standard python-asdf-transform-schemas python-asdf-unit-schemas + python-attrs ;; for vendorized jsonschema python-importlib-metadata - python-importlib-resources python-jmespath - python-jsonschema python-lz4 python-numpy python-pyyaml)) @@ -3606,6 +3828,34 @@ interchange format for scientific data. This package contains the Python implementation of the ASDF Standard.") (license license:bsd-3))) +(define-public python-asdf-2.15 + (package + (inherit python-asdf-3.0) + (version "2.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asdf" version)) + (sha256 + (base32 "11s56797l5330kkhppkyz0bsvms016knmyswj4gx91zrxf8iqvv8")))) + (arguments + (list #:test-flags + #~(list "-k" (string-append + "not test_overwrite" + " and not test_tagging_scalars" + " and not test_info_command" + " and not test_array_inline_threshold_recursive")))) + (native-inputs + (modify-inputs (package-native-inputs python-asdf-3.0) + (prepend python-astropy python-pytest-openfiles))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-asdf-3.0) + (prepend python-jsonschema python-importlib-resources))))) + +(define-public python-asdf + ;; Default version of ASDF.. + python-asdf-2.15) + (define-public python-asdf-standard (package (name "python-asdf-standard") @@ -3850,13 +4100,13 @@ install an implementation package such as gwcs.") (define-public python-gwcs (package (name "python-gwcs") - (version "0.18.3") + (version "0.19.0") (source (origin (method url-fetch) (uri (pypi-uri "gwcs" version)) (sha256 - (base32 "0mgyk5mgmj242g8nl7glcj689vry3ncwf04b8q3hasjcc9bs0rm4")))) + (base32 "1f3h41aq4nwcl6k80jb9s8shn2mhvz32mx9qhcm1xmcqrflqyf52")))) (build-system pyproject-build-system) (native-inputs (list python-jsonschema @@ -3888,13 +4138,13 @@ default) to world coordinates.") (define-public python-rad (package (name "python-rad") - (version "0.17.1") + (version "0.18.0") (source (origin (method url-fetch) (uri (pypi-uri "rad" version)) (sha256 (base32 - "11jhh3qmd00g8sn6hcfshbpb2qy1rfj0xkxn30pd63lqazg4ra3p")))) + "1wgnbhldgq0j55yzg33y11vd5k5nzwckiccxywvmq518qh19pky5")))) (build-system pyproject-build-system) (arguments (list @@ -3913,16 +4163,50 @@ format, which are used by ASDF to serialize and deserialize data for the Nancy Grace Roman Space Telescope.") (license license:bsd-3))) +(define-public python-radio-beam + (package + (name "python-radio-beam") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "radio-beam" version)) + (sha256 + (base32 "19c6gmm1wvyp5nn1yfbzl428rkysdq273j2yaarxpivv7cwj7qjk")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-astropy + python-matplotlib + python-numpy + python-scipy + python-six)) + (native-inputs (list python-pytest-astropy python-setuptools-scm)) + (home-page "https://radio-beam.readthedocs.io/en/latest/") + (synopsis "Operations for radio astronomy beams with Astropy") + (description + "Radio Beam is a simple toolkit for reading beam information from FITS +headers and manipulating beams. +Some example applications include: +@itemize +@item Convolution and deconvolution +@item Unit conversion (Jy to/from K) +@item Handle sets of beams for spectral cubes with varying resolution between +channels +@item Find the smallest common beam from a set of beams +@item Add the beam shape to a matplotlib plot +@end itemize") + (license license:bsd-3))) + (define-public python-roman-datamodels (package (name "python-roman-datamodels") - (version "0.17.1") + (version "0.18.0") (source (origin (method url-fetch) (uri (pypi-uri "roman_datamodels" version)) (sha256 (base32 - "1y12cp8172i4a314gmhpi86jw6pfylz1adh0rzr5zqmvd3mrjqlj")))) + "0crlmd99p2nyqmrbykdqqng7v8zb4sibm8j9aqrq3ppak3r3r7q1")))) (build-system pyproject-build-system) (arguments (list @@ -3960,7 +4244,7 @@ pipelines.") (define-public python-astroalign (package (name "python-astroalign") - (version "2.4.2") + (version "2.5.1") (source (origin ;; There are no tests in the PyPI tarball. @@ -3970,7 +4254,7 @@ pipelines.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hly20a65540hr3l1lsd1i4d90a0vdrbwnn6zx3z8s89ha9lq3pb")))) + (base32 "1kr5cszcxvrdbksy7mvv3ps1h1jzrn4yamfr6x7whkbi6bpqf7xp")))) (build-system pyproject-build-system) (native-inputs (list python-astropy @@ -4018,13 +4302,13 @@ orbit around the Earth.") (define-public python-wiimatch (package (name "python-wiimatch") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (pypi-uri "wiimatch" version)) (sha256 (base32 - "0x6p5z6a2cqinckwlpinjxagvmswl149s1jn6ihmdxk4k0h8rrz0")))) + "15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8")))) (build-system pyproject-build-system) (propagated-inputs (list python-numpy python-scipy)) (native-inputs (list python-codecov python-pytest python-pytest-cov diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index acfcdac218..cd6425a1d3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -736,7 +736,7 @@ purposes developed at Queen Mary, University of London.") (define-public ardour (package (name "ardour") - (version "7.5") + (version "8.0") (source (origin (method git-fetch) (uri (git-reference @@ -753,68 +753,69 @@ purposes developed at Queen Mary, University of London.") namespace ARDOUR { const char* revision = \"" version "\" ; const char* date = \"\"; }"))))) (sha256 (base32 - "18pgxnxfp0pqsy24cmf3hanr6vh0pnimsh48x5nfbflqy7ljsrkj")) + "1a2dbysd64njiw087ypkwlvr31qz3dvfaca55nq2bc4fmm71mgv4")) (file-name (string-append name "-" version)))) (build-system waf-build-system) (arguments - `(#:configure-flags '("--cxx11" ; required by gtkmm - "--optimize" - "--no-phone-home" ; don't contact ardour.org - "--freedesktop" ; build .desktop file - "--test" ; build unit tests - "--use-external-libs") ; use system libraries + (list + #:configure-flags + '(list "--cxx11" ;required by gtkmm + "--optimize" + "--no-phone-home" ;don't contact ardour.org + "--freedesktop" ;build .desktop file + "--test" ;build unit tests + "--use-external-libs") ;use system libraries #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-rpath-in-LDFLAGS - (lambda* (#:key outputs #:allow-other-keys) - (let ((libdir (string-append (assoc-ref outputs "out") - "/lib/ardour" - ,(version-major version)))) - (substitute* "wscript" - (("linker_flags = \\[\\]") - (string-append "linker_flags = [\"" - "-Wl,-rpath=" - libdir ":" - libdir "/backends" ":" - libdir "/engines" ":" - libdir "/panners" ":" - libdir "/surfaces" ":" - libdir "/vamp" "\"]")))))) - (add-after 'build 'build-i18n - (lambda _ - (invoke "python" "waf" "i18n"))) - (add-after 'install 'install-freedesktop-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share")) - (ver ,(version-major version))) - (for-each - (lambda (size) - (let ((dir (string-append share "/icons/hicolor/" - size "x" size "/apps"))) - (mkdir-p dir) - (copy-file + #~(modify-phases %standard-phases + (add-after 'unpack 'set-rpath-in-LDFLAGS + (lambda _ + (let ((libdir (string-append #$output + "/lib/ardour" + #$(version-major version)))) + (substitute* "wscript" + (("linker_flags = \\[\\]") + (string-append "linker_flags = [\"" + "-Wl,-rpath=" + libdir ":" + libdir "/backends" ":" + libdir "/engines" ":" + libdir "/panners" ":" + libdir "/surfaces" ":" + libdir "/vamp" "\"]")))))) + (add-after 'build 'build-i18n + (lambda _ + (invoke "python" "waf" "i18n"))) + (add-after 'install 'install-freedesktop-files + (lambda _ + (let ((share (string-append #$output "/share")) + (ver #$(version-major version))) + (for-each + (lambda (size) + (let ((dir (string-append share "/icons/hicolor/" + size "x" size "/apps"))) + (mkdir-p dir) + (copy-file (string-append "gtk2_ardour/resources/Ardour-icon_" size "px.png") (string-append dir "/ardour" ver ".png")))) - '("16" "22" "32" "48" "256")) - (install-file (string-append "build/gtk2_ardour/ardour" - ver ".desktop") - (string-append share "/applications/")) - (install-file (string-append "build/gtk2_ardour/ardour" - ver ".appdata.xml") - (string-append share "/appdata/"))))) - (add-after 'install 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (install-file "ardour.1" (string-append (assoc-ref outputs "out") - "/share/man/man1")))) - (add-after 'install 'install-bundled-media - (lambda* (#:key outputs #:allow-other-keys) - (invoke "unzip" "-d" (string-append (assoc-ref outputs "out") - "/share/ardour" - ,(version-major version) - "/media/") - ,ardour-bundled-media)))) + '("16" "22" "32" "48" "256")) + (install-file (string-append "build/gtk2_ardour/ardour" + ver ".desktop") + (string-append share "/applications/")) + (install-file (string-append "build/gtk2_ardour/ardour" + ver ".appdata.xml") + (string-append share "/appdata/"))))) + (add-after 'install 'install-man-page + (lambda _ + (install-file "ardour.1" (string-append #$output + "/share/man/man1")))) + (add-after 'install 'install-bundled-media + (lambda _ + (invoke "unzip" "-d" (string-append #$output + "/share/ardour" + #$(version-major version) + "/media/") + #$ardour-bundled-media)))) #:test-target "test")) (inputs (list alsa-lib @@ -6321,7 +6322,7 @@ and DSD streams.") (define-public qpwgraph (package (name "qpwgraph") - (version "0.5.3") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -6330,7 +6331,7 @@ and DSD streams.") (file-name (git-file-name name version)) (sha256 (base32 - "1i9p8gqm9swa2szr7i8rf3dhqxlaqjslb6yd5s9z1rs1jdb9lhp7")))) + "17jl347rwagdyx6pgnp83l1ffhlyfl0s4jf7ii2i1j3s1m9sz7y0")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ; no tests diff --git a/gnu/packages/aux-files/guix.vim b/gnu/packages/aux-files/guix.vim index 9397c53701..24a6b941a8 100644 --- a/gnu/packages/aux-files/guix.vim +++ b/gnu/packages/aux-files/guix.vim @@ -1,13 +1,8 @@ -" This appends all of the vim plugins to the end of Vim's runtimepath. +" This appends all applicable vim paths to the end of packagepath. Once we +" have told vim the packagepath vim will add it to the runtimepath for us. for directory in ["/run/current-system/profile", $HOME . "/.guix-profile", $HOME ."/.guix-home/profile", $GUIX_PROFILE, $GUIX_ENVIRONMENT] let vimplugins = directory . "/share/vim/vimfiles" if isdirectory(vimplugins) - let &rtp = join([&rtp,vimplugins], ',') + let &pp = join([&pp,vimplugins], ',') endif endfor -" Unconditionally add */after directories last, as intended by upstream -" TODO: Remove duplicate */after directories -for directory in [$VIM . "/vimfiles", $HOME ."/.vim"] - let vimplugins = directory . "/after" - let &rtp = join([&rtp,vimplugins], ',') -endfor diff --git a/gnu/packages/aux-files/linux-libre/6.4-arm.conf b/gnu/packages/aux-files/linux-libre/6.6-arm.conf index d14f0320ee..8d79eb54a0 100644 --- a/gnu/packages/aux-files/linux-libre/6.4-arm.conf +++ b/gnu/packages/aux-files/linux-libre/6.6-arm.conf @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.4.2 Kernel Configuration +# Linux/arm 6.6.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110300 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=23800 @@ -243,8 +243,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y CONFIG_RSEQ=y +CONFIG_CACHESTAT_SYSCALL=y # CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_PERF_USE_VMALLOC=y # CONFIG_PC104 is not set @@ -259,6 +259,15 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +# end of Kexec and crash features # end of General setup CONFIG_ARM=y @@ -348,6 +357,7 @@ CONFIG_ARCH_EXYNOS5=y # Exynos SoCs # CONFIG_CPU_EXYNOS4210=y +CONFIG_SOC_EXYNOS4212=y CONFIG_SOC_EXYNOS4412=y CONFIG_SOC_EXYNOS5250=y CONFIG_SOC_EXYNOS5260=y @@ -615,6 +625,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y # Boot options # CONFIG_USE_OF=y +CONFIG_ARCH_WANT_FLAT_DTB_INSTALL=y CONFIG_ATAGS=y # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_ZBOOT_ROM_TEXT=0x0 @@ -624,9 +635,9 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_CMDLINE="" -CONFIG_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC=y CONFIG_ATAGS_PROC=y -# CONFIG_CRASH_DUMP is not set +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_AUTO_ZRELADDR=y CONFIG_EFI_STUB=y CONFIG_EFI=y @@ -733,8 +744,8 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y # # General architecture-dependent options # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_CORE_SYNC=y +CONFIG_HOTPLUG_CORE_SYNC_DEAD=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set @@ -757,6 +768,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_KEEPINITRD=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_32BIT_OFF_T=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y @@ -942,6 +954,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set +# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -962,11 +975,15 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 # # SLAB allocator options # -CONFIG_SLAB=y -# CONFIG_SLUB is not set +# CONFIG_SLAB_DEPRECATED is not set +CONFIG_SLUB=y +# CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y +# CONFIG_SLUB_STATS is not set +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set # end of SLAB allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y @@ -991,7 +1008,6 @@ CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set @@ -1009,6 +1025,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_DMAPOOL_TEST is not set CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y +CONFIG_MEMFD_CREATE=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y CONFIG_LRU_GEN=y @@ -1032,6 +1049,7 @@ CONFIG_DAMON_LRU_SORT=y CONFIG_NET=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y @@ -1934,10 +1952,12 @@ CONFIG_PCI_QUIRKS=y CONFIG_PCI_STUB=m CONFIG_PCI_DOE=y CONFIG_PCI_ECAM=y +CONFIG_PCI_BRIDGE_EMUL=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set CONFIG_PCI_LABEL=y +# CONFIG_PCI_DYNAMIC_OF_NODES is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set @@ -1955,6 +1975,7 @@ CONFIG_PCIE_BRCMSTB=m # CONFIG_PCI_FTPCI100 is not set CONFIG_PCI_HOST_COMMON=y CONFIG_PCI_HOST_GENERIC=y +CONFIG_PCI_MVEBU=m CONFIG_PCIE_MEDIATEK=m # CONFIG_PCIE_MICROCHIP_HOST is not set CONFIG_PCI_TEGRA=y @@ -2014,6 +2035,7 @@ CONFIG_CXL_PCI=m CONFIG_CXL_MEM=m CONFIG_CXL_PORT=m CONFIG_CXL_SUSPEND=y +CONFIG_CXL_PMU=m # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set @@ -2095,6 +2117,11 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_BUS_EP=m # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -2433,6 +2460,8 @@ CONFIG_MISC_RTSX=m CONFIG_HISI_HIKEY_USB=m # CONFIG_OPEN_DICE is not set CONFIG_VCPU_STALL_DETECTOR=m +CONFIG_TPS6594_ESM=m +CONFIG_TPS6594_PFSM=m CONFIG_C2PORT=m # @@ -2693,6 +2722,7 @@ CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m +CONFIG_MD_BITMAP_FILE=y CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -2799,6 +2829,7 @@ CONFIG_AMT=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_TUN=m @@ -3055,7 +3086,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_BRIDGE=y CONFIG_MLX5_CORE_EN_DCB=y # CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLX5_EN_MACSEC=y +# CONFIG_MLX5_MACSEC is not set CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y CONFIG_MLX5_SF_MANAGER=y @@ -3239,7 +3270,8 @@ CONFIG_LXT_PHY=m # CONFIG_INTEL_XWAY_PHY is not set CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m -# CONFIG_MARVELL_10G_PHY is not set +CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88Q2XXX_PHY is not set CONFIG_MARVELL_88X2222_PHY=m CONFIG_MAXLINEAR_GPHY=m CONFIG_MEDIATEK_GE_PHY=m @@ -3321,6 +3353,7 @@ CONFIG_CAN_8DEV_USB=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB=m CONFIG_CAN_ETAS_ES58X=m +CONFIG_CAN_F81604=m CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m # CONFIG_CAN_MCBA_USB is not set @@ -3352,6 +3385,7 @@ CONFIG_MDIO_MVUSB=m CONFIG_MDIO_MSCC_MIIM=m # CONFIG_MDIO_IPQ4019 is not set CONFIG_MDIO_IPQ8064=m +CONFIG_MDIO_REGMAP=m # # MDIO Multiplexers @@ -3377,6 +3411,11 @@ CONFIG_PPP_MPPE=m CONFIG_PPP_MULTILINK=y CONFIG_PPPOATM=m CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 CONFIG_PPTP=m CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m @@ -3671,9 +3710,11 @@ CONFIG_RTL8XXXU=m CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8851B=m CONFIG_RTW89_8852A=m CONFIG_RTW89_8852B=m CONFIG_RTW89_8852C=m +CONFIG_RTW89_8851BE=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_8852BE=m CONFIG_RTW89_8852CE=m @@ -3888,7 +3929,6 @@ CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m CONFIG_TOUCHSCREEN_IMAGIS=m # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m # CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m @@ -3945,6 +3985,7 @@ CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_TOUCHSCREEN_COLIBRI_VF50=m # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set +# CONFIG_TOUCHSCREEN_IQS7211 is not set CONFIG_TOUCHSCREEN_ZINITIX=m CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m CONFIG_INPUT_MISC=y @@ -4224,7 +4265,9 @@ CONFIG_I2C_ALTERA=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BRCMSTB=m # CONFIG_I2C_CBUS_GPIO is not set -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +CONFIG_I2C_DESIGNWARE_CORE=m +# CONFIG_I2C_DESIGNWARE_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=m # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EMEV2 is not set CONFIG_I2C_EXYNOS5=m @@ -4390,6 +4433,7 @@ CONFIG_PTP_1588_CLOCK_QORIQ=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_OCP=m # end of PTP clock support @@ -4524,6 +4568,7 @@ CONFIG_GPIO_MSC313=y # # CONFIG_GPIO_ADNP is not set CONFIG_GPIO_FXL6408=m +# CONFIG_GPIO_DS4520 is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set @@ -4754,6 +4799,7 @@ CONFIG_SENSORS_G762=m CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_GXP_FAN_CTRL is not set # CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_HS3001 is not set # CONFIG_SENSORS_IIO_HWMON is not set # CONFIG_SENSORS_IT87 is not set CONFIG_SENSORS_JC42=m @@ -4780,6 +4826,7 @@ CONFIG_SENSORS_MAX1668=m # CONFIG_SENSORS_MAX31722 is not set CONFIG_SENSORS_MAX31730=m CONFIG_SENSORS_MAX31760=m +# CONFIG_MAX31827 is not set # CONFIG_SENSORS_MAX6620 is not set CONFIG_SENSORS_MAX6621=m CONFIG_SENSORS_MAX6639=m @@ -4846,7 +4893,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m # CONFIG_SENSORS_SCH5636 is not set # CONFIG_SENSORS_STTS751 is not set -CONFIG_SENSORS_SMM665=m # CONFIG_SENSORS_ADC128D818 is not set CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -5041,10 +5087,11 @@ CONFIG_MFD_AXP20X=y CONFIG_MFD_AXP20X_I2C=y # CONFIG_MFD_AXP20X_RSB is not set CONFIG_MFD_CROS_EC_DEV=m +# CONFIG_MFD_CS42L43_I2C is not set CONFIG_MFD_MADERA=m CONFIG_MFD_MADERA_I2C=m CONFIG_MFD_MADERA_SPI=m -CONFIG_MFD_MAX597X=m +# CONFIG_MFD_MAX5970 is not set # CONFIG_MFD_CS47L15 is not set # CONFIG_MFD_CS47L35 is not set # CONFIG_MFD_CS47L85 is not set @@ -5075,6 +5122,7 @@ CONFIG_MFD_IQS62X=m # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_MAX14577 is not set +CONFIG_MFD_MAX77541=m # CONFIG_MFD_MAX77620 is not set # CONFIG_MFD_MAX77650 is not set CONFIG_MFD_MAX77686=y @@ -5103,7 +5151,9 @@ CONFIG_MFD_RT4831=m # CONFIG_MFD_RT5033 is not set CONFIG_MFD_RT5120=m # CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=y +CONFIG_MFD_RK8XX=m +CONFIG_MFD_RK8XX_I2C=m +CONFIG_MFD_RK8XX_SPI=m # CONFIG_MFD_RN5T618 is not set CONFIG_MFD_SEC_CORE=y # CONFIG_MFD_SI476X_CORE is not set @@ -5141,6 +5191,9 @@ CONFIG_MFD_PALMAS=y # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set +CONFIG_MFD_TPS6594=m +CONFIG_MFD_TPS6594_I2C=m +CONFIG_MFD_TPS6594_SPI=m CONFIG_TWL4030_CORE=y CONFIG_TWL4030_POWER=y CONFIG_MFD_TWL4030_AUDIO=y @@ -5186,6 +5239,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_ARM_SCMI=m CONFIG_REGULATOR_AS3722=y +# CONFIG_REGULATOR_AW37503 is not set CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD71815=m CONFIG_REGULATOR_BD71828=m @@ -5209,7 +5263,8 @@ CONFIG_REGULATOR_GPIO=m # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set -CONFIG_REGULATOR_MAX597X=m +# CONFIG_REGULATOR_MAX77541 is not set +# CONFIG_REGULATOR_MAX77857 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set CONFIG_REGULATOR_MAX8893=m @@ -5240,6 +5295,7 @@ CONFIG_REGULATOR_PFUZE100=m # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set # CONFIG_REGULATOR_PWM is not set +# CONFIG_REGULATOR_RAA215300 is not set CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_ROHM=m @@ -5256,6 +5312,7 @@ CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m +# CONFIG_REGULATOR_RTQ2208 is not set CONFIG_REGULATOR_S2MPA01=m CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m @@ -5268,9 +5325,11 @@ CONFIG_REGULATOR_SY8827N=m # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set CONFIG_REGULATOR_TPS6286X=m +# CONFIG_REGULATOR_TPS6287X is not set # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_TPS65132 is not set +CONFIG_REGULATOR_TPS6594=m # CONFIG_REGULATOR_TPS6524X is not set CONFIG_REGULATOR_TWL4030=y # CONFIG_REGULATOR_VCTRL is not set @@ -5363,10 +5422,10 @@ CONFIG_VIDEO_TUNER=m CONFIG_V4L2_H264=m CONFIG_V4L2_VP9=m CONFIG_V4L2_MEM2MEM_DEV=m -CONFIG_V4L2_FWNODE=m -CONFIG_V4L2_ASYNC=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_V4L2_FWNODE=y +CONFIG_V4L2_ASYNC=y +CONFIG_V4L2_CCI=m +CONFIG_V4L2_CCI_I2C=m # end of Video4Linux options # @@ -5469,7 +5528,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m # @@ -5706,6 +5764,7 @@ CONFIG_VIDEO_TEGRA_VDE=m # NXP media platform drivers # CONFIG_VIDEO_IMX7_CSI=m +# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX8_ISI=m # CONFIG_VIDEO_IMX8_ISI_M2M is not set @@ -5833,10 +5892,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=y - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m @@ -5865,6 +5921,7 @@ CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_OG01A1B=m +# CONFIG_VIDEO_OV01A10 is not set CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -5904,7 +5961,6 @@ CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_ST_VGXY61=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -# end of Camera sensor devices # # Lens drivers @@ -5912,6 +5968,7 @@ CONFIG_VIDEO_ET8EK8=m CONFIG_VIDEO_AD5820=m CONFIG_VIDEO_AK7375=m CONFIG_VIDEO_DW9714=m +# CONFIG_VIDEO_DW9719 is not set CONFIG_VIDEO_DW9768=m CONFIG_VIDEO_DW9807_VCM=m # end of Lens drivers @@ -6033,6 +6090,14 @@ CONFIG_VIDEO_THS7303=m # end of Miscellaneous helper chips # +# Video serializers and deserializers +# +# CONFIG_VIDEO_DS90UB913 is not set +# CONFIG_VIDEO_DS90UB953 is not set +# CONFIG_VIDEO_DS90UB960 is not set +# end of Video serializers and deserializers + +# # Media SPI Adapters # # CONFIG_CXD2880_SPI_DRV is not set @@ -6260,6 +6325,8 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +# CONFIG_AUXDISPLAY is not set +# CONFIG_PANEL is not set # CONFIG_TEGRA_HOST1X is not set CONFIG_IMX_IPUV3_CORE=m CONFIG_DRM=m @@ -6445,6 +6512,7 @@ CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20=m CONFIG_DRM_PANEL_SAMSUNG_DB7430=m # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set @@ -6462,6 +6530,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set CONFIG_DRM_PANEL_SONY_TD4353_JDI=m # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set +# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set @@ -6469,6 +6538,7 @@ CONFIG_DRM_PANEL_SONY_TD4353_JDI=m # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set CONFIG_DRM_PANEL_WIDECHIPS_WS2401=m CONFIG_DRM_PANEL_XINPENG_XPP055C272=m # end of Display Panels @@ -6541,6 +6611,7 @@ CONFIG_DRM_IMX_LCDC=m CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m # CONFIG_DRM_VC4_HDMI_CEC is not set +# CONFIG_DRM_LOONGSON is not set CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y CONFIG_DRM_LOGICVC=m @@ -6579,27 +6650,8 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=m -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set CONFIG_FB_ARMCLCD=y @@ -6652,10 +6704,30 @@ CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y -CONFIG_FB_MX3=y CONFIG_FB_SIMPLE=m # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_BACKLIGHT=m +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -6715,6 +6787,8 @@ CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_UMP=m +# CONFIG_SND_UMP_LEGACY_RAWMIDI is not set CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y CONFIG_SND_OSSEMUL=y @@ -6742,6 +6816,8 @@ CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EMUL=m CONFIG_SND_SEQ_VIRMIDI=m +# CONFIG_SND_SEQ_UMP is not set +CONFIG_SND_SEQ_UMP_CLIENT=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL3_LIB_SEQ=m @@ -6749,6 +6825,7 @@ CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set CONFIG_SND_ALOOP=m +# CONFIG_SND_PCMTEST is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set CONFIG_SND_MTS64=m @@ -6864,6 +6941,7 @@ CONFIG_SND_ARM=y CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_MIDI_V2=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y CONFIG_SND_USB_UA101=m CONFIG_SND_USB_CAIAQ=m @@ -6937,6 +7015,7 @@ CONFIG_SND_SOC_IMX_HDMI=m CONFIG_SND_SOC_IMX_CARD=m # end of SoC Audio for Freescale CPUs +# CONFIG_SND_SOC_CHV3_I2S is not set # CONFIG_SND_I2S_HI6210_I2S is not set # CONFIG_SND_KIRKWOOD_SOC is not set # CONFIG_SND_SOC_IMG is not set @@ -7056,11 +7135,14 @@ CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALC5632=m +# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set # CONFIG_SND_SOC_AW8738 is not set CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m +# CONFIG_SND_SOC_AW88261 is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set +# CONFIG_SND_SOC_CHV3_CODEC is not set CONFIG_SND_SOC_CROS_EC_CODEC=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set @@ -7115,6 +7197,7 @@ CONFIG_SND_SOC_MAX98090=m # CONFIG_SND_SOC_MAX98520 is not set CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_I2C=m +# CONFIG_SND_SOC_MAX98388 is not set # CONFIG_SND_SOC_MAX98390 is not set # CONFIG_SND_SOC_MAX98396 is not set # CONFIG_SND_SOC_MAX9860 is not set @@ -7155,6 +7238,7 @@ CONFIG_SND_SOC_SRC4XXX=m # CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM2602_I2C is not set +# CONFIG_SND_SOC_SSM3515 is not set # CONFIG_SND_SOC_SSM4567 is not set # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set @@ -7164,6 +7248,7 @@ CONFIG_SND_SOC_SRC4XXX=m # CONFIG_SND_SOC_TAS2764 is not set # CONFIG_SND_SOC_TAS2770 is not set # CONFIG_SND_SOC_TAS2780 is not set +# CONFIG_SND_SOC_TAS2781_I2C is not set # CONFIG_SND_SOC_TAS5086 is not set # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set @@ -7289,6 +7374,7 @@ CONFIG_HID_GLORIOUS=m CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y # CONFIG_HID_GOOGLE_HAMMER is not set +# CONFIG_HID_GOOGLE_STADIA_FF is not set # CONFIG_HID_VIVALDI is not set # CONFIG_HID_GT683R is not set CONFIG_HID_KEYTOUCH=m @@ -7326,6 +7412,7 @@ CONFIG_HID_MULTITOUCH=m # CONFIG_HID_NINTENDO is not set # CONFIG_HID_NTI is not set CONFIG_HID_NTRIG=m +# CONFIG_HID_NVIDIA_SHIELD is not set CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y @@ -7748,6 +7835,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y +# CONFIG_USB_CONFIGFS_F_MIDI2 is not set CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y @@ -7854,7 +7942,6 @@ CONFIG_MMC_SDHCI_AM654=m CONFIG_SCSI_UFSHCD=m # CONFIG_SCSI_UFS_BSG is not set CONFIG_SCSI_UFS_CRYPTO=y -CONFIG_SCSI_UFS_HPB=y CONFIG_SCSI_UFS_HWMON=y CONFIG_SCSI_UFSHCD_PCI=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set @@ -7887,6 +7974,7 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m # LED drivers # # CONFIG_LEDS_AN30259A is not set +# CONFIG_LEDS_AW200XX is not set # CONFIG_LEDS_AW2013 is not set # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set @@ -7911,6 +7999,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA955X_GPIO is not set # CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PCA995X is not set CONFIG_LEDS_DA9052=m CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m @@ -7944,6 +8033,7 @@ CONFIG_LEDS_LM3697=m # # RGB LED drivers # +# CONFIG_LEDS_GROUP_MULTICOLOR is not set CONFIG_LEDS_PWM_MULTICOLOR=m CONFIG_LEDS_MT6370_RGB=m @@ -8056,7 +8146,7 @@ CONFIG_RTC_DRV_DS1307=y # CONFIG_RTC_DRV_MAX6900 is not set CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_NCT3018Y=m -CONFIG_RTC_DRV_RK808=y +CONFIG_RTC_DRV_RK808=m # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set @@ -8128,7 +8218,6 @@ CONFIG_RTC_DRV_EFI=y # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_ZYNQMP is not set CONFIG_RTC_DRV_CROS_EC=m @@ -8188,13 +8277,12 @@ CONFIG_IMX_SDMA=y # CONFIG_INTEL_IDMA64 is not set CONFIG_MV_XOR=y CONFIG_MXS_DMA=y -CONFIG_MX3_IPU=y -CONFIG_MX3_IPU_IRQS=4 # CONFIG_NBPFAXI_DMA is not set CONFIG_PL330_DMA=y CONFIG_PLX_DMA=m # CONFIG_TEGRA186_GPC_DMA is not set CONFIG_TEGRA20_APB_DMA=y +# CONFIG_XILINX_DMA is not set CONFIG_XILINX_XDMA=m CONFIG_XILINX_ZYNQMP_DPDMA=m # CONFIG_QCOM_HIDMA_MGMT is not set @@ -8229,8 +8317,6 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -# CONFIG_AUXDISPLAY is not set -# CONFIG_PANEL is not set CONFIG_UIO=m CONFIG_UIO_CIF=m # CONFIG_UIO_PDRV_GENIRQ is not set @@ -8302,6 +8388,7 @@ CONFIG_XEN_PVCALLS_FRONTEND=m # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m +# CONFIG_XEN_PRIVCMD_IRQFD is not set CONFIG_XEN_EFI=y CONFIG_XEN_AUTO_XLATE=y CONFIG_XEN_GRANT_DMA_IOMMU=y @@ -8431,6 +8518,7 @@ CONFIG_COMMON_CLK_PALMAS=m # CONFIG_COMMON_CLK_PWM is not set CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SI521XX=m +# CONFIG_COMMON_CLK_VC3 is not set # CONFIG_COMMON_CLK_VC5 is not set CONFIG_COMMON_CLK_VC7=m # CONFIG_COMMON_CLK_BD718XX is not set @@ -8844,6 +8932,7 @@ CONFIG_MAX11205=m CONFIG_MAX11410=m # CONFIG_MAX1241 is not set # CONFIG_MAX1363 is not set +# CONFIG_MAX77541_ADC is not set # CONFIG_MAX9611 is not set # CONFIG_MCP320X is not set # CONFIG_MCP3422 is not set @@ -8858,6 +8947,7 @@ CONFIG_RICHTEK_RTQ6056=m CONFIG_SD_ADC_MODULATOR=m # CONFIG_STMPE_ADC is not set # CONFIG_SUN4I_GPADC is not set +# CONFIG_SUN20I_GPADC is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -8939,6 +9029,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # end of Hid Sensor IIO Common +CONFIG_IIO_INV_SENSORS_TIMESTAMP=m + # # IIO SCMI Sensors # @@ -8991,6 +9083,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m CONFIG_MAX5522=m # CONFIG_MAX5821 is not set # CONFIG_MCP4725 is not set +# CONFIG_MCP4728 is not set # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC5571 is not set @@ -9125,6 +9218,7 @@ CONFIG_BH1780=m CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m # CONFIG_JSA1212 is not set +# CONFIG_ROHM_BU27008 is not set CONFIG_ROHM_BU27034=m # CONFIG_RPR0521 is not set # CONFIG_LTR501 is not set @@ -9134,6 +9228,7 @@ CONFIG_LTRF216A=m # CONFIG_MAX44009 is not set # CONFIG_NOA1305 is not set # CONFIG_OPT3001 is not set +# CONFIG_OPT4001 is not set # CONFIG_PA12203001 is not set # CONFIG_SI1133 is not set # CONFIG_SI1145 is not set @@ -9216,6 +9311,7 @@ CONFIG_AD5110=m # CONFIG_MCP4531 is not set # CONFIG_MCP41010 is not set # CONFIG_TPL0102 is not set +# CONFIG_X9250 is not set # end of Digital potentiometers # @@ -9237,6 +9333,7 @@ CONFIG_HID_SENSOR_PRESS=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set # CONFIG_MPL3115 is not set +# CONFIG_MPRLS0025PA is not set # CONFIG_MS5611 is not set # CONFIG_MS5637 is not set # CONFIG_IIO_ST_PRESS is not set @@ -9255,6 +9352,7 @@ CONFIG_HID_SENSOR_PRESS=m # Proximity and distance sensors # CONFIG_CROS_EC_MKBP_PROXIMITY=m +# CONFIG_IRSD200 is not set # CONFIG_ISL29501 is not set # CONFIG_LIDAR_LITE_V2 is not set # CONFIG_MB1232 is not set @@ -9407,6 +9505,8 @@ CONFIG_PHY_MVEBU_CP110_UTMI=m # CONFIG_PHY_OCELOT_SERDES is not set CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_QCOM_USB_HSIC=m +# CONFIG_PHY_RTK_RTD_USB2PHY is not set +# CONFIG_PHY_RTK_RTD_USB3PHY is not set CONFIG_PHY_ROCKCHIP_DP=m # CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set CONFIG_PHY_ROCKCHIP_EMMC=m @@ -9451,6 +9551,7 @@ CONFIG_PHY_TI_GMII_SEL=m CONFIG_ARM_PMU=y CONFIG_ARM_PMUV3=y CONFIG_FSL_IMX8_DDR_PMU=m +# CONFIG_FSL_IMX9_DDR_PMU is not set # end of Performance monitor support CONFIG_RAS=y @@ -9480,6 +9581,7 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m # CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_IMX_OCOTP=m +# CONFIG_NVMEM_IMX_OCOTP_ELE is not set CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m @@ -9535,6 +9637,7 @@ CONFIG_HTE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -9611,7 +9714,6 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m @@ -9621,6 +9723,7 @@ CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches @@ -9676,7 +9779,7 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y -CONFIG_MEMFD_CREATE=y +# CONFIG_TMPFS_QUOTA is not set CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=m # end of Pseudo filesystems @@ -9804,8 +9907,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y @@ -9890,6 +9991,7 @@ CONFIG_NLS_MAC_INUIT=m CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=m +CONFIG_NLS_UCS2_UTILS=m CONFIG_DLM=m CONFIG_DLM_DEBUG=y CONFIG_UNICODE=y @@ -9915,7 +10017,6 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set @@ -9925,6 +10026,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# CONFIG_SECURITY_SELINUX_DEBUG is not set # CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 @@ -9966,7 +10068,6 @@ CONFIG_IMA_APPRAISE=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_MODSIG is not set -CONFIG_IMA_TRUSTED_KEYRING=y # CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y @@ -9982,22 +10083,29 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" # # Kernel hardening options # -CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_ZERO_CALL_USED_REGS=y # end of Memory initialization +# +# Hardening of kernel data structures +# +CONFIG_LIST_HARDENED=y +CONFIG_BUG_ON_DATA_CORRUPTION=y +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set @@ -10019,6 +10127,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y CONFIG_CRYPTO_HASH=y @@ -10037,7 +10146,7 @@ CONFIG_CRYPTO_USER=m # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_NULL2=m CONFIG_CRYPTO_PCRYPT=m # CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_AUTHENC=m @@ -10112,6 +10221,7 @@ CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GENIV=m CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ESSIV=m @@ -10173,6 +10283,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y # CONFIG_CRYPTO_DRBG_CTR is not set CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_JITTERENTROPY=m +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set # end of Random number generation # @@ -10241,6 +10352,7 @@ CONFIG_CRYPTO_DEV_VIRTIO=m # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set +# CONFIG_CRYPTO_DEV_JH7110 is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_X509_CERTIFICATE_PARSER=y @@ -10374,10 +10486,10 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_RESTRICTED_POOL=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_CMA=y -CONFIG_DMA_PERNUMA_CMA=y # # Default contiguous memory area size: @@ -10428,6 +10540,7 @@ CONFIG_FONT_6x8=y CONFIG_SG_SPLIT=y CONFIG_SG_POOL=y CONFIG_ARCH_STACKWALK=y +CONFIG_STACKDEPOT=y CONFIG_SBITMAP=y # end of Library routines @@ -10514,7 +10627,8 @@ CONFIG_HAVE_KCSAN_COMPILER=y # Memory Debugging # CONFIG_PAGE_EXTENSION=y -# CONFIG_DEBUG_SLAB is not set +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG_ON is not set # CONFIG_PAGE_OWNER is not set CONFIG_PAGE_POISONING=y # CONFIG_DEBUG_PAGE_REF is not set @@ -10558,10 +10672,13 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y +# CONFIG_HARDLOCKUP_DETECTOR is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set # CONFIG_TEST_LOCKUP is not set # end of Debug Oops, Lockups and Hangs @@ -10606,7 +10723,6 @@ CONFIG_DEBUG_LIST=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures diff --git a/gnu/packages/aux-files/linux-libre/6.4-arm64.conf b/gnu/packages/aux-files/linux-libre/6.6-arm64.conf index bfa1d2d664..c8e5f81d20 100644 --- a/gnu/packages/aux-files/linux-libre/6.4-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/6.6-arm64.conf @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.4.2 Kernel Configuration +# Linux/arm64 6.6.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110300 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=23800 @@ -174,6 +174,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y @@ -265,8 +266,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y CONFIG_RSEQ=y +CONFIG_CACHESTAT_SYSCALL=y # CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y # CONFIG_PC104 is not set @@ -281,6 +282,17 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_SIG is not set +CONFIG_CRASH_DUMP=y +# end of Kexec and crash features # end of General setup CONFIG_ARM64=y @@ -302,7 +314,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SMP=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y @@ -339,6 +350,7 @@ CONFIG_ARCH_NXP=y # CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_MXC=y # CONFIG_ARCH_S32 is not set +CONFIG_ARCH_MA35=y CONFIG_ARCH_NPCM=y CONFIG_ARCH_QCOM=y # CONFIG_ARCH_REALTEK is not set @@ -346,6 +358,7 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SEATTLE=y CONFIG_ARCH_INTEL_SOCFPGA=y +CONFIG_ARCH_STM32=y CONFIG_ARCH_SYNQUACER=y CONFIG_ARCH_TEGRA=y # CONFIG_ARCH_SPRD is not set @@ -365,6 +378,7 @@ CONFIG_ARCH_XGENE=y # # ARM errata workarounds via the alternatives framework # +CONFIG_AMPERE_ERRATUM_AC03_CPU_38=y CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y CONFIG_ARM64_ERRATUM_826319=y CONFIG_ARM64_ERRATUM_827319=y @@ -396,6 +410,7 @@ CONFIG_ARM64_ERRATUM_2067961=y CONFIG_ARM64_ERRATUM_2441009=y CONFIG_ARM64_ERRATUM_2457168=y CONFIG_ARM64_ERRATUM_2645198=y +CONFIG_ARM64_ERRATUM_2966298=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23144=y CONFIG_CAVIUM_ERRATUM_23154=y @@ -440,10 +455,13 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -# CONFIG_KEXEC_SIG is not set -CONFIG_CRASH_DUMP=y +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SELECTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y CONFIG_TRANS_TABLE=y CONFIG_XEN_DOM0=y CONFIG_XEN=y @@ -505,7 +523,6 @@ CONFIG_ARM64_EPAN=y CONFIG_ARM64_SVE=y CONFIG_ARM64_SME=y -CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -678,7 +695,6 @@ CONFIG_KVM_MMIO=y CONFIG_HAVE_KVM_MSI=y CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y CONFIG_KVM_VFIO=y -CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y CONFIG_HAVE_KVM_IRQ_BYPASS=y CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y @@ -691,8 +707,8 @@ CONFIG_KVM=y # # General architecture-dependent options # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_CORE_SYNC=y +CONFIG_HOTPLUG_CORE_SYNC_DEAD=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set @@ -757,6 +773,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_HUGE_VMALLOC=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y @@ -935,6 +952,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set +# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -955,7 +973,7 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 # # SLAB allocator options # -# CONFIG_SLAB is not set +# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -963,6 +981,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set # end of SLAB allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y @@ -978,6 +997,7 @@ CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y # CONFIG_MEMORY_HOTPLUG is not set +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y @@ -1006,7 +1026,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set @@ -1030,6 +1049,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y @@ -1058,6 +1078,7 @@ CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y @@ -1995,6 +2016,7 @@ CONFIG_PCI_IOV=y # CONFIG_PCI_PASID is not set CONFIG_PCI_LABEL=y CONFIG_PCI_HYPERV=m +# CONFIG_PCI_DYNAMIC_OF_NODES is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set @@ -2088,6 +2110,7 @@ CONFIG_CXL_PORT=y CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set +CONFIG_CXL_PMU=y # CONFIG_PCCARD is not set # CONFIG_RAPIDIO is not set @@ -2167,6 +2190,11 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_BUS_EP=m # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -2376,6 +2404,7 @@ CONFIG_MTD_NAND_HISI504=m CONFIG_MTD_NAND_QCOM=m CONFIG_MTD_NAND_MXIC=m CONFIG_MTD_NAND_TEGRA=m +CONFIG_MTD_NAND_STM32_FMC2=m CONFIG_MTD_NAND_MESON=m CONFIG_MTD_NAND_GPIO=m CONFIG_MTD_NAND_PLATFORM=m @@ -2542,6 +2571,8 @@ CONFIG_MISC_RTSX=m CONFIG_HISI_HIKEY_USB=m # CONFIG_OPEN_DICE is not set CONFIG_VCPU_STALL_DETECTOR=m +CONFIG_TPS6594_ESM=m +CONFIG_TPS6594_PFSM=m CONFIG_C2PORT=m # @@ -2829,6 +2860,7 @@ CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m +CONFIG_MD_BITMAP_FILE=y CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -2936,6 +2968,7 @@ CONFIG_AMT=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_TUN=m @@ -3070,6 +3103,7 @@ CONFIG_THUNDER_NIC_VF=m CONFIG_THUNDER_NIC_BGX=m CONFIG_THUNDER_NIC_RGX=m CONFIG_CAVIUM_PTP=y +CONFIG_LIQUIDIO_CORE=m CONFIG_LIQUIDIO=m # CONFIG_LIQUIDIO_VF is not set CONFIG_NET_VENDOR_CHELSIO=y @@ -3206,7 +3240,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_BRIDGE=y CONFIG_MLX5_CORE_EN_DCB=y # CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLX5_EN_MACSEC=y +# CONFIG_MLX5_MACSEC is not set CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y @@ -3328,6 +3362,7 @@ CONFIG_DWMAC_MESON=m CONFIG_DWMAC_QCOM_ETHQOS=m CONFIG_DWMAC_ROCKCHIP=m CONFIG_DWMAC_SOCFPGA=m +CONFIG_DWMAC_STM32=m CONFIG_DWMAC_SUNXI=m CONFIG_DWMAC_SUN8I=m CONFIG_DWMAC_IMX8=m @@ -3375,7 +3410,7 @@ CONFIG_SWPHY=y # CONFIG_LED_TRIGGER_PHY is not set CONFIG_PHYLIB_LEDS=y CONFIG_FIXED_PHY=m -# CONFIG_SFP is not set +CONFIG_SFP=m # # MII PHY device drivers @@ -3401,6 +3436,7 @@ CONFIG_LXT_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88Q2XXX_PHY is not set CONFIG_MARVELL_88X2222_PHY=m CONFIG_MAXLINEAR_GPHY=m CONFIG_MEDIATEK_GE_PHY=m @@ -3440,6 +3476,7 @@ CONFIG_CAN_VCAN=m CONFIG_CAN_NETLINK=y CONFIG_CAN_CALC_BITTIMING=y CONFIG_CAN_RX_OFFLOAD=y +CONFIG_CAN_BXCAN=m CONFIG_CAN_CAN327=m CONFIG_CAN_FLEXCAN=m # CONFIG_CAN_GRCAN is not set @@ -3481,6 +3518,7 @@ CONFIG_CAN_8DEV_USB=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB=m CONFIG_CAN_ETAS_ES58X=m +CONFIG_CAN_F81604=m CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m # CONFIG_CAN_MCBA_USB is not set @@ -3510,11 +3548,13 @@ CONFIG_MDIO_BITBANG=m CONFIG_MDIO_CAVIUM=m CONFIG_MDIO_GPIO=m CONFIG_MDIO_HISI_FEMAC=m +CONFIG_MDIO_I2C=m CONFIG_MDIO_MVUSB=m CONFIG_MDIO_MSCC_MIIM=m # CONFIG_MDIO_OCTEON is not set # CONFIG_MDIO_IPQ4019 is not set CONFIG_MDIO_IPQ8064=m +CONFIG_MDIO_REGMAP=m CONFIG_MDIO_THUNDER=m # @@ -3543,6 +3583,11 @@ CONFIG_PPP_MPPE=m CONFIG_PPP_MULTILINK=y CONFIG_PPPOATM=m CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 CONFIG_PPTP=m CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m @@ -3851,6 +3896,7 @@ CONFIG_RTW88_8822CE=m CONFIG_RTW88_8822CS=m CONFIG_RTW88_8822CU=m CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8723DS=m CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CE=m CONFIG_RTW88_8821CS=m @@ -3860,9 +3906,11 @@ CONFIG_RTW88_8821CU=m CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8851B=m CONFIG_RTW89_8852A=m CONFIG_RTW89_8852B=m CONFIG_RTW89_8852C=m +CONFIG_RTW89_8851BE=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_8852BE=m CONFIG_RTW89_8852CE=m @@ -4196,8 +4244,10 @@ CONFIG_SERIAL_RP2_NR_UARTS=32 # CONFIG_SERIAL_FSL_LINFLEXUART is not set # CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set # CONFIG_SERIAL_SPRD is not set +CONFIG_SERIAL_STM32=m CONFIG_SERIAL_MVEBU_UART=y CONFIG_SERIAL_MVEBU_CONSOLE=y +CONFIG_SERIAL_NUVOTON_MA35D1=m # end of Serial drivers CONFIG_SERIAL_MCTRL_GPIO=y @@ -4241,7 +4291,9 @@ CONFIG_HW_RANDOM_IPROC_RNG200=m # CONFIG_HW_RANDOM_OMAP is not set CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_HISI=m +CONFIG_HW_RANDOM_HISTB=m CONFIG_HW_RANDOM_XGENE=m +CONFIG_HW_RANDOM_STM32=m CONFIG_HW_RANDOM_MESON=m CONFIG_HW_RANDOM_CAVIUM=m CONFIG_HW_RANDOM_OPTEE=m @@ -4350,6 +4402,8 @@ CONFIG_I2C_QCOM_GENI=m CONFIG_I2C_QUP=m CONFIG_I2C_RK3X=m CONFIG_I2C_SIMTEC=m +CONFIG_I2C_STM32F4=m +CONFIG_I2C_STM32F7=m CONFIG_I2C_SYNQUACER=m CONFIG_I2C_TEGRA=m CONFIG_I2C_TEGRA_BPMP=y @@ -4373,6 +4427,7 @@ CONFIG_I2C_VIPERBOARD=m # # Other I2C/SMBus bus drivers # +# CONFIG_I2C_MLXCPLD is not set CONFIG_I2C_CROS_EC_TUNNEL=m CONFIG_I2C_XGENE_SLIMPRO=m CONFIG_I2C_VIRTIO=m @@ -4444,6 +4499,8 @@ CONFIG_SPI_QUP=m # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set CONFIG_SPI_SN_F_OSPI=m +CONFIG_SPI_STM32=m +CONFIG_SPI_STM32_QSPI=m # CONFIG_SPI_SUN4I is not set # CONFIG_SPI_SUN6I is not set CONFIG_SPI_SYNQUACER=m @@ -4470,7 +4527,9 @@ CONFIG_SPI_MUX=m # CONFIG_SPI_SPIDEV is not set # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_SLAVE is not set +CONFIG_SPI_SLAVE=y +CONFIG_SPI_SLAVE_TIME=m +CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=y CONFIG_SPMI_HISI3670=m @@ -4504,6 +4563,7 @@ CONFIG_PTP_1588_CLOCK_QORIQ=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_MOCK is not set CONFIG_PTP_1588_CLOCK_OCP=m # end of PTP clock support @@ -4554,12 +4614,14 @@ CONFIG_PINCTRL_MESON_AXG_PMX=y CONFIG_PINCTRL_MESON_G12A=y CONFIG_PINCTRL_MESON_A1=y CONFIG_PINCTRL_MESON_S4=y +CONFIG_PINCTRL_AMLOGIC_C3=y CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_AP806=y CONFIG_PINCTRL_ARMADA_CP110=y CONFIG_PINCTRL_AC5=y CONFIG_PINCTRL_ARMADA_37XX=y CONFIG_PINCTRL_MSM=y +CONFIG_PINCTRL_IPQ5018=m CONFIG_PINCTRL_IPQ5332=m # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL_IPQ6018 is not set @@ -4574,8 +4636,6 @@ CONFIG_PINCTRL_MSM8996=y # CONFIG_PINCTRL_QCM2290 is not set # CONFIG_PINCTRL_QCS404 is not set # CONFIG_PINCTRL_QDF2XXX is not set -CONFIG_PINCTRL_QCOM_SPMI_PMIC=y -CONFIG_PINCTRL_QCOM_SSBI_PMIC=y CONFIG_PINCTRL_QDU1000=m CONFIG_PINCTRL_SA8775P=m # CONFIG_PINCTRL_SC7180 is not set @@ -4585,6 +4645,7 @@ CONFIG_PINCTRL_SA8775P=m # CONFIG_PINCTRL_SDM660 is not set # CONFIG_PINCTRL_SDM670 is not set # CONFIG_PINCTRL_SDM845 is not set +CONFIG_PINCTRL_SDX75=m # CONFIG_PINCTRL_SM6115 is not set # CONFIG_PINCTRL_SM6125 is not set # CONFIG_PINCTRL_SM6350 is not set @@ -4595,6 +4656,8 @@ CONFIG_PINCTRL_SM8250=m # CONFIG_PINCTRL_SM8350 is not set # CONFIG_PINCTRL_SM8450 is not set CONFIG_PINCTRL_SM8550=m +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_QCOM_SSBI_PMIC=y # CONFIG_PINCTRL_LPASS_LPI is not set # @@ -4602,6 +4665,8 @@ CONFIG_PINCTRL_SM8550=m # # end of Renesas pinctrl drivers +CONFIG_PINCTRL_STM32=y +CONFIG_PINCTRL_STM32MP257=y CONFIG_PINCTRL_SUNXI=y # CONFIG_PINCTRL_SUN4I_A10 is not set # CONFIG_PINCTRL_SUN5I is not set @@ -4631,6 +4696,7 @@ CONFIG_PINCTRL_TEGRA=y CONFIG_PINCTRL_TEGRA124=y CONFIG_PINCTRL_TEGRA210=y CONFIG_PINCTRL_TEGRA194=y +CONFIG_PINCTRL_TEGRA234=y CONFIG_PINCTRL_TEGRA_XUSB=y CONFIG_PINCTRL_VISCONTI=y CONFIG_PINCTRL_TMPV7700=y @@ -4687,6 +4753,7 @@ CONFIG_GPIO_XLP=y # # CONFIG_GPIO_ADNP is not set CONFIG_GPIO_FXL6408=m +# CONFIG_GPIO_DS4520 is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set @@ -4704,6 +4771,7 @@ CONFIG_GPIO_BD71815=m CONFIG_GPIO_BD71828=m CONFIG_GPIO_MADERA=m CONFIG_GPIO_MAX77620=y +CONFIG_GPIO_TPS65219=m CONFIG_GPIO_WM8994=m # end of MFD GPIO expanders @@ -4860,6 +4928,7 @@ CONFIG_CHARGER_CROS_PCHG=m # CONFIG_CHARGER_UCS1002 is not set CONFIG_CHARGER_BD99954=m CONFIG_BATTERY_UG3105=m +CONFIG_CHARGER_QCOM_SMB2=m CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -4907,6 +4976,7 @@ CONFIG_SENSORS_G760A=m # CONFIG_SENSORS_G762 is not set # CONFIG_SENSORS_GPIO_FAN is not set # CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_HS3001 is not set CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m # CONFIG_SENSORS_IIO_HWMON is not set @@ -4935,6 +5005,7 @@ CONFIG_SENSORS_MAX1668=m # CONFIG_SENSORS_MAX31722 is not set CONFIG_SENSORS_MAX31730=m CONFIG_SENSORS_MAX31760=m +CONFIG_MAX31827=m CONFIG_SENSORS_MAX6620=m # CONFIG_SENSORS_MAX6621 is not set CONFIG_SENSORS_MAX6639=m @@ -5002,7 +5073,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m # CONFIG_SENSORS_SCH5636 is not set # CONFIG_SENSORS_STTS751 is not set -CONFIG_SENSORS_SMM665=m # CONFIG_SENSORS_ADC128D818 is not set CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -5081,6 +5151,13 @@ CONFIG_BCM2835_THERMAL=m # end of Broadcom thermal drivers # +# STMicroelectronics thermal drivers +# +CONFIG_ST_THERMAL=m +CONFIG_ST_THERMAL_MEMMAP=m +# end of STMicroelectronics thermal drivers + +# # NVIDIA Tegra thermal drivers # CONFIG_TEGRA_SOCTHERM=y @@ -5120,6 +5197,7 @@ CONFIG_BD957XMUF_WATCHDOG=m CONFIG_GPIO_WATCHDOG=m # CONFIG_WDAT_WDT is not set # CONFIG_XILINX_WATCHDOG is not set +CONFIG_XILINX_WINDOW_WATCHDOG=m # CONFIG_ZIIRAVE_WATCHDOG is not set CONFIG_ARM_SP805_WATCHDOG=m CONFIG_ARM_SBSA_WATCHDOG=m @@ -5138,12 +5216,14 @@ CONFIG_QCOM_WDT=m CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m CONFIG_ARM_SMC_WATCHDOG=m +CONFIG_STM32_WATCHDOG=y CONFIG_PM8916_WATCHDOG=m CONFIG_VISCONTI_WATCHDOG=m CONFIG_APPLE_WATCHDOG=m # CONFIG_ALIM7101_WDT is not set # CONFIG_I6300ESB_WDT is not set CONFIG_HP_WATCHDOG=m +CONFIG_MARVELL_GTI_WDT=y CONFIG_BCM2835_WDT=m CONFIG_BCM7038_WDT=m # CONFIG_MEN_A21_WDT is not set @@ -5205,10 +5285,11 @@ CONFIG_MFD_AXP20X=m # CONFIG_MFD_AXP20X_I2C is not set CONFIG_MFD_AXP20X_RSB=m CONFIG_MFD_CROS_EC_DEV=y +# CONFIG_MFD_CS42L43_I2C is not set CONFIG_MFD_MADERA=m CONFIG_MFD_MADERA_I2C=m CONFIG_MFD_MADERA_SPI=m -CONFIG_MFD_MAX597X=m +CONFIG_MFD_MAX5970=m # CONFIG_MFD_CS47L15 is not set # CONFIG_MFD_CS47L35 is not set # CONFIG_MFD_CS47L85 is not set @@ -5238,6 +5319,7 @@ CONFIG_MFD_IQS62X=m # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set # CONFIG_MFD_MAX14577 is not set +CONFIG_MFD_MAX77541=m CONFIG_MFD_MAX77620=y # CONFIG_MFD_MAX77650 is not set # CONFIG_MFD_MAX77686 is not set @@ -5267,7 +5349,9 @@ CONFIG_MFD_RT4831=m # CONFIG_MFD_RT5033 is not set CONFIG_MFD_RT5120=m # CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=m +CONFIG_MFD_RK8XX=m +CONFIG_MFD_RK8XX_I2C=m +CONFIG_MFD_RK8XX_SPI=m # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set @@ -5296,6 +5380,9 @@ CONFIG_MFD_TPS65219=m # CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_TPS65912_I2C is not set # CONFIG_MFD_TPS65912_SPI is not set +CONFIG_MFD_TPS6594=m +CONFIG_MFD_TPS6594_I2C=m +CONFIG_MFD_TPS6594_SPI=m # CONFIG_TWL4030_CORE is not set # CONFIG_TWL6040_CORE is not set # CONFIG_MFD_WL1273_CORE is not set @@ -5314,6 +5401,8 @@ CONFIG_MFD_WM8994=m CONFIG_MFD_ROHM_BD718XX=m CONFIG_MFD_ROHM_BD71828=m CONFIG_MFD_ROHM_BD957XMUF=m +# CONFIG_MFD_STM32_LPTIMER is not set +CONFIG_MFD_STM32_TIMERS=m # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STMFX is not set CONFIG_MFD_ATC260X=m @@ -5341,6 +5430,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_ARM_SCMI=m CONFIG_REGULATOR_ATC260X=m +# CONFIG_REGULATOR_AW37503 is not set CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BD71815=m CONFIG_REGULATOR_BD71828=m @@ -5364,8 +5454,10 @@ CONFIG_REGULATOR_HI6421V600=m # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set -CONFIG_REGULATOR_MAX597X=m +# CONFIG_REGULATOR_MAX5970 is not set +CONFIG_REGULATOR_MAX77541=m CONFIG_REGULATOR_MAX77620=m +# CONFIG_REGULATOR_MAX77857 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8893 is not set @@ -5390,10 +5482,12 @@ CONFIG_REGULATOR_PF8X00=m # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set CONFIG_REGULATOR_PWM=m +# CONFIG_REGULATOR_QCOM_REFGEN is not set CONFIG_REGULATOR_QCOM_RPM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_ROHM=m @@ -5410,7 +5504,11 @@ CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m +# CONFIG_REGULATOR_RTQ2208 is not set CONFIG_REGULATOR_SLG51000=m +CONFIG_REGULATOR_STM32_BOOSTER=m +CONFIG_REGULATOR_STM32_VREFBUF=m +CONFIG_REGULATOR_STM32_PWR=y CONFIG_REGULATOR_SY7636A=m CONFIG_REGULATOR_SY8106A=m CONFIG_REGULATOR_SY8824X=m @@ -5418,10 +5516,12 @@ CONFIG_REGULATOR_SY8827N=m # CONFIG_REGULATOR_TPS51632 is not set # CONFIG_REGULATOR_TPS62360 is not set # CONFIG_REGULATOR_TPS6286X is not set +CONFIG_REGULATOR_TPS6287X=m # CONFIG_REGULATOR_TPS65023 is not set # CONFIG_REGULATOR_TPS6507X is not set # CONFIG_REGULATOR_TPS65132 is not set # CONFIG_REGULATOR_TPS65219 is not set +CONFIG_REGULATOR_TPS6594=m # CONFIG_REGULATOR_TPS6524X is not set # CONFIG_REGULATOR_VCTRL is not set # CONFIG_REGULATOR_VEXPRESS is not set @@ -5484,6 +5584,7 @@ CONFIG_CEC_CROS_EC=m CONFIG_CEC_MESON_AO=m CONFIG_CEC_MESON_G12A_AO=m CONFIG_CEC_GPIO=m +CONFIG_CEC_STM32=m CONFIG_CEC_TEGRA=m CONFIG_USB_PULSE8_CEC=m CONFIG_USB_RAINSHADOW_CEC=m @@ -5527,8 +5628,8 @@ CONFIG_V4L2_VP9=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FWNODE=m CONFIG_V4L2_ASYNC=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_V4L2_CCI=m +CONFIG_V4L2_CCI_I2C=m # end of Video4Linux options # @@ -5631,7 +5732,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m # @@ -5779,6 +5879,7 @@ CONFIG_DVB_BUDGET_CORE=m CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m +# CONFIG_IPU_BRIDGE is not set CONFIG_RADIO_ADAPTERS=m # CONFIG_RADIO_MAXIRADIO is not set # CONFIG_RADIO_SAA7706H is not set @@ -5865,6 +5966,7 @@ CONFIG_VIDEO_TEGRA_VDE=m # NXP media platform drivers # # CONFIG_VIDEO_IMX7_CSI is not set +# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX8_ISI=m CONFIG_VIDEO_IMX8_ISI_M2M=y @@ -5894,6 +5996,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m # # STMicroelectronics media platform drivers # +CONFIG_VIDEO_STM32_DCMI=m +CONFIG_VIDEO_STM32_DMA2D=m # # Sunxi media platform drivers @@ -5980,10 +6084,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m @@ -6012,6 +6113,7 @@ CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_OG01A1B=m +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -6053,7 +6155,6 @@ CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_ST_VGXY61=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -# end of Camera sensor devices # # Lens drivers @@ -6061,6 +6162,7 @@ CONFIG_VIDEO_ET8EK8=m CONFIG_VIDEO_AD5820=m CONFIG_VIDEO_AK7375=m CONFIG_VIDEO_DW9714=m +# CONFIG_VIDEO_DW9719 is not set CONFIG_VIDEO_DW9768=m CONFIG_VIDEO_DW9807_VCM=m # end of Lens drivers @@ -6180,6 +6282,14 @@ CONFIG_VIDEO_THS7303=m # end of Miscellaneous helper chips # +# Video serializers and deserializers +# +# CONFIG_VIDEO_DS90UB913 is not set +# CONFIG_VIDEO_DS90UB953 is not set +# CONFIG_VIDEO_DS90UB960 is not set +# end of Video serializers and deserializers + +# # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m @@ -6407,6 +6517,8 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +# CONFIG_AUXDISPLAY is not set +# CONFIG_PANEL is not set CONFIG_TEGRA_HOST1X_CONTEXT_BUS=y CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y @@ -6428,6 +6540,7 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m +CONFIG_DRM_EXEC=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6460,6 +6573,7 @@ CONFIG_DRM_AMDGPU=m CONFIG_DRM_AMDGPU_SI=y CONFIG_DRM_AMDGPU_CIK=y CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_WERROR is not set # # ACP (Audio CoProcessor) Configuration @@ -6526,6 +6640,8 @@ CONFIG_DRM_MSM_HDMI_HDCP=y CONFIG_DRM_TEGRA=m # CONFIG_DRM_TEGRA_DEBUG is not set CONFIG_DRM_TEGRA_STAGING=y +CONFIG_DRM_STM=m +CONFIG_DRM_STM_DSI=m CONFIG_DRM_PANEL=y # @@ -6586,6 +6702,7 @@ CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set +CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0=m # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set @@ -6603,6 +6720,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set CONFIG_DRM_PANEL_SONY_TD4353_JDI=m CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m +# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set @@ -6610,6 +6728,7 @@ CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set CONFIG_DRM_PANEL_XINPENG_XPP055C272=m # end of Display Panels @@ -6663,6 +6782,7 @@ CONFIG_DRM_I2C_ADV7511_CEC=y CONFIG_DRM_CDNS_DSI=m CONFIG_DRM_CDNS_DSI_J721E=y CONFIG_DRM_CDNS_MHDP8546=m +CONFIG_DRM_IMX_LDB_HELPER=m CONFIG_DRM_IMX8QM_LDB=m CONFIG_DRM_IMX8QXP_LDB=m CONFIG_DRM_IMX8QXP_PIXEL_COMBINER=m @@ -6681,6 +6801,7 @@ CONFIG_DRM_IMX_LCDC=m CONFIG_DRM_V3D=m CONFIG_DRM_VC4=m # CONFIG_DRM_VC4_HDMI_CEC is not set +# CONFIG_DRM_LOONGSON is not set CONFIG_DRM_ETNAVIV=m CONFIG_DRM_ETNAVIV_THERMAL=y CONFIG_DRM_HISI_HIBMC=m @@ -6691,6 +6812,7 @@ CONFIG_DRM_MXS=y CONFIG_DRM_IMX_LCDIF=m CONFIG_DRM_MESON=m CONFIG_DRM_MESON_DW_HDMI=m +CONFIG_DRM_MESON_DW_MIPI_DSI=m # CONFIG_DRM_ARCPGU is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6724,26 +6846,8 @@ CONFIG_DRM_PRIVACY_SCREEN=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y CONFIG_FB_SVGALIB=m -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set CONFIG_FB_ARMCLCD=y @@ -6786,11 +6890,31 @@ CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_FB_MB862XX=m CONFIG_FB_MB862XX_PCI_GDC=y CONFIG_FB_MB862XX_I2C=y -# CONFIG_FB_MX3 is not set CONFIG_FB_HYPERV=m CONFIG_FB_SIMPLE=m # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -6862,6 +6986,8 @@ CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_UMP=m +# CONFIG_SND_UMP_LEGACY_RAWMIDI is not set CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y @@ -6890,6 +7016,8 @@ CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EMUL=m CONFIG_SND_SEQ_VIRMIDI=m +CONFIG_SND_SEQ_UMP=y +CONFIG_SND_SEQ_UMP_CLIENT=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL3_LIB_SEQ=m @@ -6897,6 +7025,7 @@ CONFIG_SND_AC97_CODEC=m CONFIG_SND_DRIVERS=y # CONFIG_SND_DUMMY is not set CONFIG_SND_ALOOP=m +# CONFIG_SND_PCMTEST is not set # CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set CONFIG_SND_MTS64=m @@ -6991,6 +7120,9 @@ CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m +# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set +# CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_SIGMATEL=m @@ -7022,6 +7154,7 @@ CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_MIDI_V2=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y CONFIG_SND_USB_UA101=m CONFIG_SND_USB_CAIAQ=m @@ -7098,6 +7231,7 @@ CONFIG_SND_SOC_IMX_RPMSG=m CONFIG_SND_SOC_IMX_CARD=m # end of SoC Audio for Freescale CPUs +CONFIG_SND_SOC_CHV3_I2S=m CONFIG_SND_I2S_HI6210_I2S=m # CONFIG_SND_KIRKWOOD_SOC is not set # CONFIG_SND_SOC_IMG is not set @@ -7163,6 +7297,10 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m # # STMicroelectronics STM32 SOC audio support # +CONFIG_SND_SOC_STM32_SAI=m +CONFIG_SND_SOC_STM32_I2S=m +CONFIG_SND_SOC_STM32_SPDIFRX=m +CONFIG_SND_SOC_STM32_DFSDM=m # end of STMicroelectronics STM32 SOC audio support # @@ -7242,11 +7380,14 @@ CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK5558=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALC5632=m +# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set # CONFIG_SND_SOC_AW8738 is not set CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m +# CONFIG_SND_SOC_AW88261 is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set +CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m # CONFIG_SND_SOC_CS35L32 is not set # CONFIG_SND_SOC_CS35L33 is not set @@ -7303,6 +7444,7 @@ CONFIG_SND_SOC_MAX98927=m CONFIG_SND_SOC_MAX98520=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_I2C=m +CONFIG_SND_SOC_MAX98388=m # CONFIG_SND_SOC_MAX98390 is not set # CONFIG_SND_SOC_MAX98396 is not set # CONFIG_SND_SOC_MAX9860 is not set @@ -7342,13 +7484,14 @@ CONFIG_SND_SOC_SGTL5000=m CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m CONFIG_SND_SOC_SIMPLE_MUX=m CONFIG_SND_SOC_SMA1303=m -# CONFIG_SND_SOC_SPDIF is not set +CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_SRC4XXX_I2C=m CONFIG_SND_SOC_SRC4XXX=m # CONFIG_SND_SOC_SSM2305 is not set CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM2602_I2C is not set +CONFIG_SND_SOC_SSM3515=m # CONFIG_SND_SOC_SSM4567 is not set # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set @@ -7358,6 +7501,9 @@ CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_TAS2764 is not set # CONFIG_SND_SOC_TAS2770 is not set # CONFIG_SND_SOC_TAS2780 is not set +CONFIG_SND_SOC_TAS2781_COMLIB=m +CONFIG_SND_SOC_TAS2781_FMWLIB=m +CONFIG_SND_SOC_TAS2781_I2C=m # CONFIG_SND_SOC_TAS5086 is not set # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set @@ -7483,6 +7629,7 @@ CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y CONFIG_HID_VIVALDI_COMMON=m # CONFIG_HID_GOOGLE_HAMMER is not set +# CONFIG_HID_GOOGLE_STADIA_FF is not set CONFIG_HID_VIVALDI=m # CONFIG_HID_GT683R is not set CONFIG_HID_KEYTOUCH=m @@ -7521,6 +7668,8 @@ CONFIG_HID_NINTENDO=m CONFIG_NINTENDO_FF=y # CONFIG_HID_NTI is not set CONFIG_HID_NTRIG=m +CONFIG_HID_NVIDIA_SHIELD=m +CONFIG_NVIDIA_SHIELD_FF=y CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y @@ -7918,6 +8067,7 @@ CONFIG_USB_NET2280=m # CONFIG_USB_GADGET_XILINX is not set CONFIG_USB_MAX3420_UDC=m CONFIG_USB_TEGRA_XUDC=m +CONFIG_USB_CDNS2_UDC=m # CONFIG_USB_DUMMY_HCD is not set # end of USB Peripheral Controller @@ -7960,6 +8110,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y +# CONFIG_USB_CONFIGFS_F_MIDI2 is not set CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y @@ -8002,6 +8153,7 @@ CONFIG_TYPEC_MT6360=m CONFIG_TYPEC_TCPCI_MT6370=m CONFIG_TYPEC_TCPCI_MAXIM=m CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_QCOM_PMIC=m CONFIG_TYPEC_UCSI=m CONFIG_UCSI_CCG=m CONFIG_UCSI_ACPI=m @@ -8012,7 +8164,6 @@ CONFIG_TYPEC_ANX7411=m CONFIG_TYPEC_RT1719=m CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC_STUSB160X=m -CONFIG_TYPEC_QCOM_PMIC=m CONFIG_TYPEC_WUSB3801=m # @@ -8021,6 +8172,7 @@ CONFIG_TYPEC_WUSB3801=m CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m +CONFIG_TYPEC_MUX_NB7VPQ904M=m # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8099,7 +8251,6 @@ CONFIG_MMC_SDHCI_AM654=m CONFIG_SCSI_UFSHCD=m # CONFIG_SCSI_UFS_BSG is not set CONFIG_SCSI_UFS_CRYPTO=y -CONFIG_SCSI_UFS_HPB=y CONFIG_SCSI_UFS_HWMON=y CONFIG_SCSI_UFSHCD_PCI=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set @@ -8132,6 +8283,7 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y # LED drivers # # CONFIG_LEDS_AN30259A is not set +CONFIG_LEDS_AW200XX=m # CONFIG_LEDS_AW2013 is not set # CONFIG_LEDS_BCM6328 is not set # CONFIG_LEDS_BCM6358 is not set @@ -8155,6 +8307,7 @@ CONFIG_LEDS_LP55XX_COMMON=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA955X_GPIO is not set # CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PCA995X is not set CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m @@ -8177,6 +8330,7 @@ CONFIG_LEDS_LT3593=m CONFIG_LEDS_SPI_BYTE=m CONFIG_LEDS_TI_LMU_COMMON=m CONFIG_LEDS_LM3697=m +CONFIG_LEDS_BCM63138=y # # Flash and Torch LED drivers @@ -8185,6 +8339,7 @@ CONFIG_LEDS_LM3697=m # # RGB LED drivers # +# CONFIG_LEDS_GROUP_MULTICOLOR is not set CONFIG_LEDS_PWM_MULTICOLOR=m CONFIG_LEDS_QCOM_LPG=m CONFIG_LEDS_MT6370_RGB=m @@ -8285,6 +8440,7 @@ CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_XGENE=m # CONFIG_EDAC_QCOM is not set CONFIG_EDAC_DMC520=m +CONFIG_EDAC_NPCM=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y @@ -8384,7 +8540,6 @@ CONFIG_RTC_DRV_EFI=y # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_OPTEE is not set # CONFIG_RTC_DRV_ZYNQMP is not set @@ -8412,6 +8567,7 @@ CONFIG_RTC_DRV_BBNSM=m CONFIG_RTC_DRV_IMX_SC=m CONFIG_RTC_DRV_XGENE=y # CONFIG_RTC_DRV_R7301 is not set +CONFIG_RTC_DRV_STM32=m # # HID Sensor RTC drivers @@ -8447,10 +8603,11 @@ CONFIG_K3_DMA=m CONFIG_MV_XOR=y CONFIG_MV_XOR_V2=y # CONFIG_MXS_DMA is not set -CONFIG_MX3_IPU=y -CONFIG_MX3_IPU_IRQS=4 CONFIG_PL330_DMA=m CONFIG_PLX_DMA=m +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y CONFIG_TEGRA186_GPC_DMA=m CONFIG_TEGRA20_APB_DMA=y CONFIG_TEGRA210_ADMA=y @@ -8489,8 +8646,6 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -# CONFIG_AUXDISPLAY is not set -# CONFIG_PANEL is not set CONFIG_UIO=m CONFIG_UIO_CIF=m # CONFIG_UIO_PDRV_GENIRQ is not set @@ -8503,17 +8658,38 @@ CONFIG_UIO_NETX=m CONFIG_UIO_MF624=m CONFIG_UIO_HV_GENERIC=m CONFIG_VFIO=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_VIRQFD=y + +# +# VFIO support for PCI devices +# CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y CONFIG_VFIO_PCI=m CONFIG_MLX5_VFIO_PCI=m CONFIG_HISI_ACC_VFIO_PCI=m +# CONFIG_PDS_VFIO_PCI is not set +# end of VFIO support for PCI devices + +# +# VFIO support for platform devices +# +CONFIG_VFIO_PLATFORM_BASE=m # CONFIG_VFIO_PLATFORM is not set +CONFIG_VFIO_AMBA=m + +# +# VFIO platform reset drivers +# +# end of VFIO platform reset drivers +# end of VFIO support for platform devices + +CONFIG_VFIO_CDX=m CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y CONFIG_NITRO_ENCLAVES=m @@ -8540,6 +8716,7 @@ CONFIG_MLX5_VDPA_NET=m # CONFIG_MLX5_VDPA_STEERING_DEBUG is not set CONFIG_VP_VDPA=m CONFIG_SNET_VDPA=m +CONFIG_PDS_VDPA=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m CONFIG_VHOST_TASK=y @@ -8580,6 +8757,7 @@ CONFIG_XEN_PCIDEV_STUB=m # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m +# CONFIG_XEN_PRIVCMD_IRQFD is not set CONFIG_XEN_EFI=y CONFIG_XEN_AUTO_XLATE=y CONFIG_XEN_FRONT_PGDIR_SHBUF=m @@ -8716,7 +8894,7 @@ CONFIG_COMMON_CLK_APPLE_NCO=m CONFIG_COMMON_CLK_MAX9485=m CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_HI655X=m -CONFIG_COMMON_CLK_SCMI=m +CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SI5341=m # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_SI514 is not set @@ -8731,6 +8909,7 @@ CONFIG_COMMON_CLK_XGENE=y # CONFIG_COMMON_CLK_PWM is not set CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SI521XX=m +# CONFIG_COMMON_CLK_VC3 is not set # CONFIG_COMMON_CLK_VC5 is not set CONFIG_COMMON_CLK_VC7=m # CONFIG_COMMON_CLK_BD718XX is not set @@ -8770,12 +8949,15 @@ CONFIG_COMMON_CLK_MESON_PHASE=m CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_SCLK_DIV=m CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y +CONFIG_COMMON_CLK_MESON_CLKC_UTILS=y CONFIG_COMMON_CLK_MESON_AO_CLKC=y CONFIG_COMMON_CLK_MESON_EE_CLKC=y CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y CONFIG_COMMON_CLK_GXBB=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXG_AUDIO=m +CONFIG_COMMON_CLK_A1_PLL=m +CONFIG_COMMON_CLK_A1_PERIPHERALS=m CONFIG_COMMON_CLK_G12A=y # end of Clock support for Amlogic platforms @@ -8783,6 +8965,8 @@ CONFIG_ARMADA_AP_CP_HELPER=y CONFIG_ARMADA_37XX_CLK=y CONFIG_ARMADA_AP806_SYSCON=y CONFIG_ARMADA_CP110_SYSCON=y +CONFIG_COMMON_CLK_NUVOTON=y +CONFIG_CLK_MA35D1=y CONFIG_QCOM_GDSC=y CONFIG_QCOM_RPMCC=y CONFIG_COMMON_CLK_QCOM=y @@ -8790,34 +8974,20 @@ CONFIG_QCOM_A53PLL=y CONFIG_QCOM_A7PLL=m CONFIG_QCOM_CLK_APCS_MSM8916=m CONFIG_QCOM_CLK_APCC_MSM8996=m -CONFIG_QCOM_CLK_APCS_SDX55=m CONFIG_QCOM_CLK_RPM=m CONFIG_QCOM_CLK_SMD_RPM=m -# CONFIG_APQ_GCC_8084 is not set -# CONFIG_APQ_MMCC_8084 is not set # CONFIG_IPQ_APSS_PLL is not set # CONFIG_IPQ_APSS_6018 is not set # CONFIG_IPQ_GCC_4019 is not set +# CONFIG_IPQ_GCC_5018 is not set CONFIG_IPQ_GCC_5332=m # CONFIG_IPQ_GCC_6018 is not set -# CONFIG_IPQ_GCC_806X is not set -# CONFIG_IPQ_LCC_806X is not set # CONFIG_IPQ_GCC_8074 is not set CONFIG_IPQ_GCC_9574=m -# CONFIG_MSM_GCC_8660 is not set -CONFIG_MSM_GCC_8909=m CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8917=m # CONFIG_MSM_GCC_8939 is not set -# CONFIG_MSM_GCC_8960 is not set -# CONFIG_MSM_LCC_8960 is not set -CONFIG_MDM_GCC_9607=m -# CONFIG_MDM_GCC_9615 is not set -# CONFIG_MDM_LCC_9615 is not set -# CONFIG_MSM_MMCC_8960 is not set # CONFIG_MSM_GCC_8953 is not set -# CONFIG_MSM_GCC_8974 is not set -# CONFIG_MSM_MMCC_8974 is not set # CONFIG_MSM_GCC_8976 is not set # CONFIG_MSM_MMCC_8994 is not set # CONFIG_MSM_GCC_8994 is not set @@ -8844,6 +9014,7 @@ CONFIG_SC_GCC_8280XP=m # CONFIG_SC_GPUCC_7280 is not set CONFIG_SC_GPUCC_8280XP=m # CONFIG_SC_LPASSCC_7280 is not set +CONFIG_SC_LPASSCC_8280XP=m CONFIG_SC_LPASS_CORECC_7180=m CONFIG_SC_LPASS_CORECC_7280=m # CONFIG_SC_MSS_7180 is not set @@ -8861,8 +9032,7 @@ CONFIG_SDM_GPUCC_845=m CONFIG_SDM_VIDEOCC_845=m CONFIG_SDM_DISPCC_845=m CONFIG_SDM_LPASSCC_845=m -CONFIG_SDX_GCC_55=m -CONFIG_SDX_GCC_65=m +CONFIG_SDX_GCC_75=m CONFIG_SM_CAMCC_6350=m CONFIG_SM_CAMCC_8250=m CONFIG_SM_CAMCC_8450=m @@ -8890,13 +9060,18 @@ CONFIG_SM_GPUCC_6350=m # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SM_GPUCC_8350=m +CONFIG_SM_GPUCC_8450=m +CONFIG_SM_GPUCC_8550=m CONFIG_SM_TCSRCC_8550=m # CONFIG_SM_VIDEOCC_8150 is not set # CONFIG_SM_VIDEOCC_8250 is not set +CONFIG_SM_VIDEOCC_8350=m +CONFIG_SM_VIDEOCC_8550=m # CONFIG_SPMI_PMIC_CLKDIV is not set # CONFIG_QCOM_HFPLL is not set # CONFIG_KPSS_XCC is not set # CONFIG_CLK_GFM_LPASS_SM8250 is not set +CONFIG_SM_VIDEOCC_8450=m CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_CLK_PX30=y CONFIG_CLK_RK3308=y @@ -9012,6 +9187,7 @@ CONFIG_REMOTEPROC_CDEV=y CONFIG_IMX_REMOTEPROC=m CONFIG_IMX_DSP_REMOTEPROC=m CONFIG_QCOM_SYSMON=m +CONFIG_STM32_RPROC=m # end of Remoteproc drivers # @@ -9075,6 +9251,12 @@ CONFIG_FSL_RCPM=y # end of fujitsu SoC drivers # +# Hisilicon SoC drivers +# +# CONFIG_KUNPENG_HCCS is not set +# end of Hisilicon SoC drivers + +# # i.MX SoC drivers # CONFIG_IMX_GPCV2_PM_DOMAINS=y @@ -9109,6 +9291,7 @@ CONFIG_QCOM_PMIC_GLINK=m CONFIG_QCOM_QMI_HELPERS=m CONFIG_QCOM_RAMP_CTRL=m # CONFIG_QCOM_RMTFS_MEM is not set +CONFIG_QCOM_RPM_MASTER_STATS=m # CONFIG_QCOM_RPMH is not set CONFIG_QCOM_RPMPD=m CONFIG_QCOM_SMD_RPM=m @@ -9116,6 +9299,7 @@ CONFIG_QCOM_SPM=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_QCOM_APR=m CONFIG_QCOM_ICC_BWMON=m +CONFIG_QCOM_INLINE_CRYPTO_ENGINE=m # end of Qualcomm SoC drivers CONFIG_ROCKCHIP_GRF=y @@ -9180,15 +9364,16 @@ CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON_USBC_TUSB320=m CONFIG_MEMORY=y # CONFIG_ARM_PL172_MPMC is not set +CONFIG_STM32_FMC2_EBI=m CONFIG_TEGRA_MC=y CONFIG_TEGRA210_EMC_TABLE=y CONFIG_TEGRA210_EMC=m CONFIG_IIO=m CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set +CONFIG_IIO_BUFFER_CB=m CONFIG_IIO_BUFFER_DMA=m CONFIG_IIO_BUFFER_DMAENGINE=m -# CONFIG_IIO_BUFFER_HW_CONSUMER is not set +CONFIG_IIO_BUFFER_HW_CONSUMER=m CONFIG_IIO_KFIFO_BUF=m CONFIG_IIO_TRIGGERED_BUFFER=m # CONFIG_IIO_CONFIGFS is not set @@ -9299,6 +9484,7 @@ CONFIG_MAX11205=m CONFIG_MAX11410=m # CONFIG_MAX1241 is not set # CONFIG_MAX1363 is not set +CONFIG_MAX77541_ADC=m # CONFIG_MAX9611 is not set # CONFIG_MCP320X is not set # CONFIG_MCP3422 is not set @@ -9317,6 +9503,11 @@ CONFIG_QCOM_SPMI_VADC=m # CONFIG_ROCKCHIP_SARADC is not set CONFIG_RICHTEK_RTQ6056=m # CONFIG_SD_ADC_MODULATOR is not set +CONFIG_STM32_ADC_CORE=m +CONFIG_STM32_ADC=m +CONFIG_STM32_DFSDM_CORE=m +CONFIG_STM32_DFSDM_ADC=m +# CONFIG_SUN20I_GPADC is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set # CONFIG_TI_ADC084S021 is not set @@ -9398,6 +9589,8 @@ CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # end of Hid Sensor IIO Common +CONFIG_IIO_INV_SENSORS_TIMESTAMP=m + # # IIO SCMI Sensors # @@ -9446,7 +9639,10 @@ CONFIG_AD5446=m CONFIG_MAX5522=m # CONFIG_MAX5821 is not set # CONFIG_MCP4725 is not set +# CONFIG_MCP4728 is not set # CONFIG_MCP4922 is not set +CONFIG_STM32_DAC=m +CONFIG_STM32_DAC_CORE=m # CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC5571 is not set # CONFIG_TI_DAC7311 is not set @@ -9583,6 +9779,7 @@ CONFIG_BH1780=m CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m # CONFIG_JSA1212 is not set +CONFIG_ROHM_BU27008=m CONFIG_ROHM_BU27034=m # CONFIG_RPR0521 is not set # CONFIG_LTR501 is not set @@ -9592,6 +9789,7 @@ CONFIG_LTRF216A=m # CONFIG_MAX44009 is not set # CONFIG_NOA1305 is not set # CONFIG_OPT3001 is not set +CONFIG_OPT4001=m # CONFIG_PA12203001 is not set # CONFIG_SI1133 is not set # CONFIG_SI1145 is not set @@ -9650,6 +9848,7 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m # Triggers - standalone # # CONFIG_IIO_INTERRUPT_TRIGGER is not set +CONFIG_IIO_STM32_TIMER_TRIGGER=m # CONFIG_IIO_SYSFS_TRIGGER is not set # end of Triggers - standalone @@ -9674,6 +9873,7 @@ CONFIG_AD5110=m # CONFIG_MCP4531 is not set # CONFIG_MCP41010 is not set # CONFIG_TPL0102 is not set +CONFIG_X9250=m # end of Digital potentiometers # @@ -9695,6 +9895,7 @@ CONFIG_HID_SENSOR_PRESS=m # CONFIG_MPL115_I2C is not set # CONFIG_MPL115_SPI is not set # CONFIG_MPL3115 is not set +CONFIG_MPRLS0025PA=m # CONFIG_MS5611 is not set # CONFIG_MS5637 is not set # CONFIG_IIO_ST_PRESS is not set @@ -9713,6 +9914,7 @@ CONFIG_HID_SENSOR_PRESS=m # Proximity and distance sensors # CONFIG_CROS_EC_MKBP_PROXIMITY=m +# CONFIG_IRSD200 is not set # CONFIG_ISL29501 is not set # CONFIG_LIDAR_LITE_V2 is not set # CONFIG_MB1232 is not set @@ -9776,6 +9978,7 @@ CONFIG_PWM_NTXEC=m # CONFIG_PWM_PCA9685 is not set CONFIG_PWM_RASPBERRYPI_POE=m CONFIG_PWM_ROCKCHIP=m +CONFIG_PWM_STM32=m CONFIG_PWM_SUN4I=m CONFIG_PWM_TEGRA=m CONFIG_PWM_VISCONTI=m @@ -9823,6 +10026,7 @@ CONFIG_RESET_IMX7=y CONFIG_RESET_MESON=y # CONFIG_RESET_MESON_AUDIO_ARB is not set CONFIG_RESET_NPCM=y +CONFIG_RESET_NUVOTON_MA35D1=y # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set CONFIG_RESET_RASPBERRYPI=m @@ -9900,15 +10104,18 @@ CONFIG_PHY_QCOM_QMP_PCIE=m CONFIG_PHY_QCOM_QMP_PCIE_8996=m CONFIG_PHY_QCOM_QMP_UFS=m CONFIG_PHY_QCOM_QMP_USB=m +# CONFIG_PHY_QCOM_QMP_USB_LEGACY is not set CONFIG_PHY_QCOM_QUSB2=m CONFIG_PHY_QCOM_SNPS_EUSB2=m CONFIG_PHY_QCOM_EUSB2_REPEATER=m +# CONFIG_PHY_QCOM_M31_USB is not set CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m CONFIG_PHY_QCOM_USB_HSIC=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_SS=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_DPHY_RX0=m CONFIG_PHY_ROCKCHIP_EMMC=m @@ -9922,6 +10129,7 @@ CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m CONFIG_PHY_ROCKCHIP_TYPEC=m CONFIG_PHY_ROCKCHIP_USB=m # CONFIG_PHY_SAMSUNG_USB2 is not set +CONFIG_PHY_STM32_USBPHYC=m CONFIG_PHY_TEGRA_XUSB=m CONFIG_PHY_TEGRA194_P2U=m CONFIG_PHY_TUSB1210=m @@ -9944,6 +10152,7 @@ CONFIG_ARM_SMMU_V3_PMU=m CONFIG_ARM_PMUV3=y # CONFIG_ARM_DSU_PMU is not set CONFIG_FSL_IMX8_DDR_PMU=m +CONFIG_FSL_IMX9_DDR_PMU=m # CONFIG_QCOM_L2_PMU is not set # CONFIG_QCOM_L3_PMU is not set CONFIG_THUNDERX2_PMU=m @@ -9999,15 +10208,19 @@ CONFIG_NVMEM_LAYOUT_SL28_VPD=m CONFIG_NVMEM_APPLE_EFUSES=y CONFIG_NVMEM_IMX_IIM=m CONFIG_NVMEM_IMX_OCOTP=m +CONFIG_NVMEM_IMX_OCOTP_ELE=m CONFIG_NVMEM_IMX_OCOTP_SCU=m CONFIG_NVMEM_MESON_EFUSE=m CONFIG_NVMEM_MESON_MX_EFUSE=m CONFIG_NVMEM_QCOM_QFPROM=m +# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_ROCKCHIP_EFUSE=m CONFIG_NVMEM_ROCKCHIP_OTP=m CONFIG_NVMEM_SNVS_LPGPR=m CONFIG_NVMEM_SPMI_SDAM=m +CONFIG_NVMEM_STM32_BSEC_OPTEE_TA=y +CONFIG_NVMEM_STM32_ROMEM=m CONFIG_NVMEM_SUNXI_SID=m CONFIG_NVMEM_U_BOOT_ENV=m @@ -10054,6 +10267,7 @@ CONFIG_INTERCONNECT_QCOM_QCM2290=m # CONFIG_INTERCONNECT_QCOM_QCS404 is not set CONFIG_INTERCONNECT_QCOM_SDM660=m CONFIG_INTERCONNECT_QCOM_SMD_RPM=m +CONFIG_INTERCONNECT_CLK=m # CONFIG_COUNTER is not set # CONFIG_MOST is not set # CONFIG_PECI is not set @@ -10062,7 +10276,6 @@ CONFIG_HTE_TEGRA194=m # CONFIG_HTE_TEGRA194_TEST is not set CONFIG_CDX_BUS=y CONFIG_CDX_CONTROLLER=m -# CONFIG_MCDI_LOGGING is not set # end of Device Drivers # @@ -10071,6 +10284,7 @@ CONFIG_CDX_CONTROLLER=m CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -10147,7 +10361,6 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=m CONFIG_CUSE=m @@ -10158,6 +10371,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches @@ -10218,10 +10432,10 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=m @@ -10299,15 +10513,7 @@ CONFIG_ROMFS_ON_BLOCK=y CONFIG_ROMFS_ON_MTD=y CONFIG_PSTORE=y CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -# CONFIG_PSTORE_ZSTD_COMPRESS is not set CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_FTRACE is not set @@ -10365,8 +10571,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y @@ -10451,6 +10655,7 @@ CONFIG_NLS_MAC_INUIT=m CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=m +CONFIG_NLS_UCS2_UTILS=m CONFIG_DLM=m CONFIG_DLM_DEBUG=y CONFIG_UNICODE=y @@ -10478,7 +10683,6 @@ CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y # CONFIG_FORTIFY_SOURCE is not set # CONFIG_STATIC_USERMODEHELPER is not set @@ -10488,6 +10692,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# CONFIG_SECURITY_SELINUX_DEBUG is not set # CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 @@ -10525,16 +10730,16 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" # # Kernel hardening options # -CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_GCC_PLUGIN_STACKLEAK=y # CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 @@ -10546,6 +10751,13 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_ZERO_CALL_USED_REGS=y # end of Memory initialization +# +# Hardening of kernel data structures +# +CONFIG_LIST_HARDENED=y +CONFIG_BUG_ON_DATA_CORRUPTION=y +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set @@ -10567,6 +10779,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y CONFIG_CRYPTO_HASH=y @@ -10585,7 +10798,7 @@ CONFIG_CRYPTO_USER=m # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set # CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_NULL2=m CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m @@ -10661,6 +10874,7 @@ CONFIG_CRYPTO_AEGIS128_SIMD=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_GENIV=m CONFIG_CRYPTO_SEQIV=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ESSIV=m @@ -10722,6 +10936,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y # CONFIG_CRYPTO_DRBG_CTR is not set CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_JITTERENTROPY=m +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set # end of Random number generation # @@ -10797,6 +11012,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_PRNG_API=y CONFIG_CRYPTO_DEV_FSL_CAAM_BLOB_GEN=y +# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_TEST is not set CONFIG_CRYPTO_DEV_SAHARA=m CONFIG_CRYPTO_DEV_ATMEL_I2C=m CONFIG_CRYPTO_DEV_ATMEL_ECC=m @@ -10835,6 +11051,9 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=m # CONFIG_CRYPTO_DEV_ROCKCHIP is not set CONFIG_CRYPTO_DEV_CHELSIO=m CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_STM32_CRC=m +CONFIG_CRYPTO_DEV_STM32_HASH=m +CONFIG_CRYPTO_DEV_STM32_CRYP=m CONFIG_CRYPTO_DEV_SAFEXCEL=m # CONFIG_CRYPTO_DEV_CCREE is not set CONFIG_CRYPTO_DEV_HISI_SEC=m @@ -10843,7 +11062,6 @@ CONFIG_CRYPTO_DEV_HISI_QM=m CONFIG_CRYPTO_DEV_HISI_ZIP=m CONFIG_CRYPTO_DEV_HISI_HPRE=m CONFIG_CRYPTO_DEV_HISI_TRNG=m -CONFIG_CRYPTO_DEV_HISTB_TRNG=m CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m # CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set CONFIG_ASYMMETRIC_KEY_TYPE=y @@ -10935,7 +11153,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y CONFIG_AUDIT_COMPAT_GENERIC=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=m @@ -10979,6 +11197,7 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_FLAGS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y @@ -10989,12 +11208,14 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set +CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y CONFIG_DMA_RESTRICTED_POOL=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_CMA=y -CONFIG_DMA_PERNUMA_CMA=y +# CONFIG_DMA_NUMA_CMA is not set # # Default contiguous memory area size: @@ -11191,10 +11412,18 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_HARDLOCKUP_DETECTOR_PERF is not set +CONFIG_HARDLOCKUP_DETECTOR_BUDDY=y +# CONFIG_HARDLOCKUP_DETECTOR_ARCH is not set +CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER=y +# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set # CONFIG_TEST_LOCKUP is not set # end of Debug Oops, Lockups and Hangs @@ -11241,7 +11470,6 @@ CONFIG_DEBUG_LIST=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -11267,6 +11495,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS=y @@ -11286,6 +11515,7 @@ CONFIG_FTRACE=y # CONFIG_BOOTTIME_TRACING is not set CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_FUNCTION_GRAPH_RETVAL=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y @@ -11330,6 +11560,8 @@ CONFIG_SYNTH_EVENTS=y # CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_RV is not set # CONFIG_SAMPLES is not set +CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y +CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y @@ -11353,6 +11585,7 @@ CONFIG_FUNCTION_ERROR_INJECTION=y # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_DHRY is not set # CONFIG_LKDTM is not set diff --git a/gnu/packages/aux-files/linux-libre/6.4-i686.conf b/gnu/packages/aux-files/linux-libre/6.6-i686.conf index 10d53e521b..aea156c31d 100644 --- a/gnu/packages/aux-files/linux-libre/6.4-i686.conf +++ b/gnu/packages/aux-files/linux-libre/6.6-i686.conf @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 6.4.2 Kernel Configuration +# Linux/i386 6.6.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110300 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=23800 @@ -259,8 +259,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y CONFIG_RSEQ=y +CONFIG_CACHESTAT_SYSCALL=y # CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y # CONFIG_PC104 is not set @@ -275,6 +275,18 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_KEXEC=y +CONFIG_KEXEC_JUMP=y +CONFIG_CRASH_DUMP=y +CONFIG_CRASH_HOTPLUG=y +CONFIG_CRASH_MAX_MEMORY_RANGES=8192 +# end of Kexec and crash features # end of General setup CONFIG_X86_32=y @@ -307,7 +319,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # Processor type and features # CONFIG_SMP=y -CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set # CONFIG_X86_CPU_RESCTRL is not set @@ -430,8 +441,6 @@ CONFIG_X86_IOPL_IOPERM=y # CONFIG_TOSHIBA is not set CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y # CONFIG_MICROCODE_LATE_LOADING is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -476,17 +485,19 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -CONFIG_CRASH_DUMP=y -CONFIG_KEXEC_JUMP=y +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y +CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_CMDLINE_BOOL is not set CONFIG_MODIFY_LDT_SYSCALL=y @@ -502,7 +513,7 @@ CONFIG_SPECULATION_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y +# CONFIG_GDS_FORCE_MITIGATION is not set # # Power management and ACPI options @@ -623,6 +634,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=y CONFIG_X86_AMD_PSTATE=y +CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=3 # CONFIG_X86_AMD_PSTATE_UT is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -720,18 +732,22 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_SMM=y CONFIG_KVM_XEN=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y +CONFIG_AS_WRUSS=y # # General architecture-dependent options # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y CONFIG_HOTPLUG_SMT=y +CONFIG_HOTPLUG_CORE_SYNC=y +CONFIG_HOTPLUG_CORE_SYNC_DEAD=y +CONFIG_HOTPLUG_CORE_SYNC_FULL=y +CONFIG_HOTPLUG_SPLIT_STARTUP=y CONFIG_GENERIC_ENTRY=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y @@ -761,6 +777,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y @@ -807,6 +824,7 @@ CONFIG_HAVE_MOVE_PMD=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y @@ -979,6 +997,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set +# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -999,7 +1018,7 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 # # SLAB allocator options # -# CONFIG_SLAB is not set +# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1007,6 +1026,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set # end of SLAB allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y @@ -1019,6 +1039,7 @@ CONFIG_SPARSEMEM_STATIC=y CONFIG_HAVE_FAST_GUP=y CONFIG_MEMORY_ISOLATION=y CONFIG_EXCLUSIVE_SYSTEM_RAM=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y @@ -1041,7 +1062,6 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set @@ -1065,6 +1085,7 @@ CONFIG_GUP_GET_PXX_LOW_HIGH=y CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y CONFIG_KMAP_LOCAL=y +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y @@ -1086,6 +1107,7 @@ CONFIG_DAMON_LRU_SORT=y CONFIG_NET=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y @@ -2003,6 +2025,7 @@ CONFIG_NFC_SHDLC=y # Near Field Communication (NFC) devices # CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m CONFIG_NFC_PORT100=m CONFIG_NFC_VIRTUAL_NCI=m @@ -2010,12 +2033,14 @@ CONFIG_NFC_FDP=m CONFIG_NFC_FDP_I2C=m CONFIG_NFC_PN544=m CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_PN533=m CONFIG_NFC_PN533_USB=m CONFIG_NFC_PN533_I2C=m CONFIG_NFC_PN532_UART=m CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m CONFIG_NFC_MRVL_UART=m @@ -2145,6 +2170,7 @@ CONFIG_CXL_PORT=m CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set +CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2247,6 +2273,11 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_BUS_EP=m # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -2605,6 +2636,8 @@ CONFIG_DW_XDATA_PCIE=m # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_XILINX_SDFEC=m CONFIG_MISC_RTSX=m +CONFIG_TPS6594_ESM=m +CONFIG_TPS6594_PFSM=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -2633,11 +2666,13 @@ CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m -# CONFIG_INTEL_MEI is not set -# CONFIG_INTEL_MEI_ME is not set +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set +CONFIG_INTEL_MEI_GSC=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set +CONFIG_INTEL_MEI_GSC_PROXY=m CONFIG_VMWARE_VMCI=m CONFIG_ECHO=m CONFIG_BCM_VK=m @@ -2939,6 +2974,7 @@ CONFIG_PATA_LEGACY=m CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y +CONFIG_MD_BITMAP_FILE=y CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -3050,6 +3086,7 @@ CONFIG_AMT=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_NTB_NETDEV=m @@ -3328,7 +3365,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_BRIDGE=y CONFIG_MLX5_CORE_EN_DCB=y # CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLX5_EN_MACSEC=y +# CONFIG_MLX5_MACSEC is not set CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y @@ -3528,9 +3565,11 @@ CONFIG_INTEL_XWAY_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m +# CONFIG_MARVELL_88Q2XXX_PHY is not set CONFIG_MARVELL_88X2222_PHY=m CONFIG_MAXLINEAR_GPHY=m CONFIG_MEDIATEK_GE_PHY=m +# CONFIG_MEDIATEK_GE_SOC_PHY is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_T1S_PHY=m CONFIG_MICROCHIP_PHY=m @@ -3616,6 +3655,7 @@ CONFIG_CAN_8DEV_USB=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB=m CONFIG_CAN_ETAS_ES58X=m +CONFIG_CAN_F81604=m CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_MCBA_USB=m @@ -3643,6 +3683,7 @@ CONFIG_MDIO_GPIO=m CONFIG_MDIO_I2C=m CONFIG_MDIO_MVUSB=m CONFIG_MDIO_MSCC_MIIM=m +CONFIG_MDIO_REGMAP=m # # MDIO Multiplexers @@ -3654,7 +3695,6 @@ CONFIG_MDIO_MSCC_MIIM=m CONFIG_PCS_XPCS=m CONFIG_PCS_LYNX=m CONFIG_PCS_MTK_LYNXI=m -CONFIG_PCS_ALTERA_TSE=m # end of PCS device drivers CONFIG_PLIP=m @@ -3666,6 +3706,11 @@ CONFIG_PPP_MPPE=m CONFIG_PPP_MULTILINK=y CONFIG_PPPOATM=m CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 CONFIG_PPTP=m CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m @@ -3987,9 +4032,11 @@ CONFIG_RTL8XXXU_UNTESTED=y CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8851B=m CONFIG_RTW89_8852A=m CONFIG_RTW89_8852B=m CONFIG_RTW89_8852C=m +CONFIG_RTW89_8851BE=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_8852BE=m CONFIG_RTW89_8852CE=m @@ -4343,6 +4390,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TOUCHSCREEN_COLIBRI_VF50=m CONFIG_TOUCHSCREEN_ROHM_BU21023=m CONFIG_TOUCHSCREEN_IQS5XX=m +# CONFIG_TOUCHSCREEN_IQS7211 is not set CONFIG_TOUCHSCREEN_ZINITIX=m CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m CONFIG_INPUT_MISC=y @@ -4543,7 +4591,6 @@ CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m CONFIG_IPWIRELESS=m CONFIG_N_GSM=m @@ -4833,6 +4880,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_MOCK is not set # CONFIG_PTP_1588_CLOCK_VMW is not set CONFIG_PTP_1588_CLOCK_OCP=m CONFIG_PTP_DFL_TOD=m @@ -4905,13 +4953,13 @@ CONFIG_GPIO_ICH=m CONFIG_GPIO_MB86S7X=m CONFIG_GPIO_MENZ127=m CONFIG_GPIO_TANGIER=m -CONFIG_GPIO_VX855=m CONFIG_GPIO_AMD_FCH=m # end of Memory mapped GPIO drivers # # Port-mapped I/O GPIO drivers # +CONFIG_GPIO_VX855=m CONFIG_GPIO_F7188X=m CONFIG_GPIO_IT87=m CONFIG_GPIO_SCH=m @@ -4924,6 +4972,7 @@ CONFIG_GPIO_WS16C48=m # I2C GPIO expanders # CONFIG_GPIO_FXL6408=m +# CONFIG_GPIO_DS4520 is not set CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m @@ -5117,6 +5166,7 @@ CONFIG_CHARGER_TPS65090=m CONFIG_BATTERY_GAUGE_LTC2941=m CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT5033=m CONFIG_CHARGER_RT9455=m CONFIG_CHARGER_RT9467=m CONFIG_CHARGER_RT9471=m @@ -5183,6 +5233,7 @@ CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_G762=m CONFIG_SENSORS_HIH6130=m +# CONFIG_SENSORS_HS3001 is not set CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IIO_HWMON=m @@ -5213,6 +5264,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX31722=m CONFIG_SENSORS_MAX31730=m CONFIG_SENSORS_MAX31760=m +CONFIG_MAX31827=m CONFIG_SENSORS_MAX6620=m CONFIG_SENSORS_MAX6621=m CONFIG_SENSORS_MAX6639=m @@ -5292,6 +5344,7 @@ CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m +# CONFIG_SENSORS_MP2975_REGULATOR is not set CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m @@ -5334,7 +5387,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m -CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -5379,6 +5431,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ASUS_WMI=m CONFIG_SENSORS_ASUS_EC=m +CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set @@ -5389,6 +5442,7 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_BANG_BANG=y @@ -5494,6 +5548,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m CONFIG_NI903X_WDT=m CONFIG_NIC7018_WDT=m CONFIG_SIEMENS_SIMATIC_IPC_WDT=m @@ -5557,6 +5612,7 @@ CONFIG_MFD_BD9571MWV=m CONFIG_MFD_AXP20X=m CONFIG_MFD_AXP20X_I2C=m CONFIG_MFD_CROS_EC_DEV=m +# CONFIG_MFD_CS42L43_I2C is not set CONFIG_MFD_MADERA=m CONFIG_MFD_MADERA_I2C=m CONFIG_MFD_MADERA_SPI=m @@ -5597,6 +5653,7 @@ CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m CONFIG_MFD_88PM860X=y CONFIG_MFD_MAX14577=y +CONFIG_MFD_MAX77541=m CONFIG_MFD_MAX77693=y CONFIG_MFD_MAX77843=y CONFIG_MFD_MAX8907=m @@ -5643,6 +5700,9 @@ CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y +CONFIG_MFD_TPS6594=m +CONFIG_MFD_TPS6594_I2C=m +CONFIG_MFD_TPS6594_SPI=m CONFIG_TWL4030_CORE=y CONFIG_MFD_TWL4030_AUDIO=y CONFIG_TWL6040_CORE=y @@ -5689,6 +5749,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_AS3711=m CONFIG_REGULATOR_ATC260X=m +# CONFIG_REGULATOR_AW37503 is not set CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BCM590XX=m CONFIG_REGULATOR_BD9571MWV=m @@ -5712,6 +5773,8 @@ CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX14577=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77541=m +# CONFIG_REGULATOR_MAX77857 is not set CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8893=m @@ -5749,6 +5812,7 @@ CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m @@ -5764,6 +5828,7 @@ CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m +# CONFIG_REGULATOR_RTQ2208 is not set CONFIG_REGULATOR_SKY81452=m CONFIG_REGULATOR_SLG51000=m CONFIG_REGULATOR_SY7636A=m @@ -5876,8 +5941,8 @@ CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FLASH_LED_CLASS=m CONFIG_V4L2_FWNODE=m CONFIG_V4L2_ASYNC=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_V4L2_CCI=m +CONFIG_V4L2_CCI_I2C=m # end of Video4Linux options # @@ -5980,7 +6045,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m # @@ -6133,7 +6197,8 @@ CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m -CONFIG_CIO2_BRIDGE=y +# CONFIG_INTEL_VSC is not set +CONFIG_IPU_BRIDGE=m CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m @@ -6329,10 +6394,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m @@ -6357,6 +6419,7 @@ CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_OG01A1B=m +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -6394,7 +6457,6 @@ CONFIG_VIDEO_S5K5BAF=m CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -# end of Camera sensor devices # # Lens drivers @@ -6402,6 +6464,7 @@ CONFIG_VIDEO_ET8EK8=m CONFIG_VIDEO_AD5820=m CONFIG_VIDEO_AK7375=m CONFIG_VIDEO_DW9714=m +# CONFIG_VIDEO_DW9719 is not set CONFIG_VIDEO_DW9768=m CONFIG_VIDEO_DW9807_VCM=m # end of Lens drivers @@ -6520,6 +6583,11 @@ CONFIG_VIDEO_THS7303=m # end of Miscellaneous helper chips # +# Video serializers and deserializers +# +# end of Video serializers and deserializers + +# # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m @@ -6747,6 +6815,27 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +CONFIG_AUXDISPLAY=y +CONFIG_CHARLCD=m +CONFIG_LINEDISP=m +CONFIG_HD44780_COMMON=m +CONFIG_HD44780=m +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_HT16K33=m +CONFIG_LCD2S=m +CONFIG_PARPORT_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y +CONFIG_PANEL=m CONFIG_AGP=y CONFIG_AGP_ALI=m CONFIG_AGP_ATI=m @@ -6777,6 +6866,7 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m +CONFIG_DRM_EXEC=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6805,6 +6895,7 @@ CONFIG_DRM_AMDGPU=m # CONFIG_DRM_AMDGPU_SI is not set # CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_WERROR is not set # # ACP (Audio CoProcessor) Configuration @@ -6894,6 +6985,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges +# CONFIG_DRM_LOONGSON is not set # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6924,28 +7016,9 @@ CONFIG_DRM_PRIVACY_SCREEN=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=m -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y @@ -7034,6 +7107,27 @@ CONFIG_FB_HYPERV=m CONFIG_FB_SIMPLE=y CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_BACKLIGHT=m +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -7126,6 +7220,8 @@ CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_UMP=m +# CONFIG_SND_UMP_LEGACY_RAWMIDI is not set CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y @@ -7155,6 +7251,8 @@ CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EMUL=m CONFIG_SND_SEQ_VIRMIDI=m +CONFIG_SND_SEQ_UMP=y +CONFIG_SND_SEQ_UMP_CLIENT=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL4_LIB=m @@ -7166,6 +7264,7 @@ CONFIG_SND_DRIVERS=y CONFIG_SND_PCSP=m CONFIG_SND_DUMMY=m CONFIG_SND_ALOOP=m +# CONFIG_SND_PCMTEST is not set CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m @@ -7305,6 +7404,9 @@ CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m +# CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set +# CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set +# CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_SIGMATEL=m @@ -7337,6 +7439,7 @@ CONFIG_SND_INTEL_BYT_PREFER_SOF=y CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_MIDI_V2=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y CONFIG_SND_USB_UA101=m CONFIG_SND_USB_USX2Y=m @@ -7389,6 +7492,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_AMD_ACP_CONFIG=m CONFIG_SND_SOC_AMD_ACP_COMMON=m CONFIG_SND_SOC_AMD_ACP_PDM=m +CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON=m CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m @@ -7427,6 +7531,7 @@ CONFIG_SND_SOC_FSL_RPMSG=m CONFIG_SND_SOC_IMX_AUDMUX=m # end of SoC Audio for Freescale CPUs +CONFIG_SND_SOC_CHV3_I2S=m CONFIG_SND_I2S_HI6210_I2S=m # CONFIG_SND_SOC_IMG is not set CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y @@ -7460,6 +7565,7 @@ CONFIG_SND_SOC_INTEL_AVS=m # CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m +# CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336 is not set CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m @@ -7470,6 +7576,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +# CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663 is not set CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m # end of Intel AVS Machine drivers @@ -7537,7 +7644,9 @@ CONFIG_SND_SOC_SOF_INTEL_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m +# CONFIG_SND_SOC_SOF_AMD_VANGOGH is not set CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m +CONFIG_SND_SOC_SOF_ACP_PROBES=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7564,6 +7673,8 @@ CONFIG_SND_SOC_SOF_ELKHARTLAKE=m CONFIG_SND_SOC_SOF_ALDERLAKE=m CONFIG_SND_SOC_SOF_INTEL_MTL=m CONFIG_SND_SOC_SOF_METEORLAKE=m +CONFIG_SND_SOC_SOF_INTEL_LNL=m +CONFIG_SND_SOC_SOF_LUNARLAKE=m CONFIG_SND_SOC_SOF_HDA_COMMON=m CONFIG_SND_SOC_SOF_HDA_MLINK=m CONFIG_SND_SOC_SOF_HDA_LINK=y @@ -7614,11 +7725,14 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_ALC5623=m +# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m +# CONFIG_SND_SOC_AW88261 is not set CONFIG_SND_SOC_BD28623=m CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L32=m CONFIG_SND_SOC_CS35L33=m @@ -7684,6 +7798,7 @@ CONFIG_SND_SOC_MAX98927=m CONFIG_SND_SOC_MAX98520=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_I2C=m +CONFIG_SND_SOC_MAX98388=m CONFIG_SND_SOC_MAX98390=m CONFIG_SND_SOC_MAX98396=m CONFIG_SND_SOC_MAX9860=m @@ -7762,6 +7877,9 @@ CONFIG_SND_SOC_TAS2562=m CONFIG_SND_SOC_TAS2764=m CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS2780=m +CONFIG_SND_SOC_TAS2781_COMLIB=m +CONFIG_SND_SOC_TAS2781_FMWLIB=m +CONFIG_SND_SOC_TAS2781_I2C=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TAS5720=m @@ -7890,6 +8008,7 @@ CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y CONFIG_HID_VIVALDI_COMMON=m CONFIG_HID_GOOGLE_HAMMER=m +# CONFIG_HID_GOOGLE_STADIA_FF is not set CONFIG_HID_VIVALDI=m CONFIG_HID_GT683R=m CONFIG_HID_KEYTOUCH=m @@ -7928,6 +8047,8 @@ CONFIG_HID_NINTENDO=m CONFIG_NINTENDO_FF=y CONFIG_HID_NTI=m CONFIG_HID_NTRIG=m +CONFIG_HID_NVIDIA_SHIELD=m +CONFIG_NVIDIA_SHIELD_FF=y CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y @@ -8300,6 +8421,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_MAX3420_UDC=m +CONFIG_USB_CDNS2_UDC=m # CONFIG_USB_DUMMY_HCD is not set # end of USB Peripheral Controller @@ -8343,6 +8465,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y +# CONFIG_USB_CONFIGFS_F_MIDI2 is not set CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y @@ -8407,6 +8530,7 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_NB7VPQ904M=m # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8456,7 +8580,6 @@ CONFIG_MMC_SDHCI_XENON=m CONFIG_SCSI_UFSHCD=m # CONFIG_SCSI_UFS_BSG is not set CONFIG_SCSI_UFS_CRYPTO=y -CONFIG_SCSI_UFS_HPB=y CONFIG_SCSI_UFS_HWMON=y CONFIG_SCSI_UFSHCD_PCI=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set @@ -8491,6 +8614,8 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m # CONFIG_LEDS_88PM860X=m CONFIG_LEDS_APU=m +CONFIG_LEDS_AW200XX=m +CONFIG_LEDS_CHT_WCOVE=m CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3532=m CONFIG_LEDS_LM3533=m @@ -8508,6 +8633,7 @@ CONFIG_LEDS_LP8788=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA955X_GPIO is not set CONFIG_LEDS_PCA963X=m +# CONFIG_LEDS_PCA995X is not set CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_WM8350=m CONFIG_LEDS_DA903X=m @@ -8585,6 +8711,9 @@ CONFIG_LEDS_TRIGGER_TTY=m # Simple LED drivers # CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_APOLLOLAKE=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_F7188X=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_ELKHARTLAKE=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m @@ -8752,7 +8881,6 @@ CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_WM831X=m CONFIG_RTC_DRV_WM8350=m @@ -8787,6 +8915,7 @@ CONFIG_INTEL_IDMA64=m CONFIG_PCH_DMA=m CONFIG_PLX_DMA=m CONFIG_TIMB_DMA=m +# CONFIG_XILINX_DMA is not set CONFIG_XILINX_XDMA=m CONFIG_QCOM_HIDMA_MGMT=m CONFIG_QCOM_HIDMA=m @@ -8818,27 +8947,6 @@ CONFIG_SYNC_FILE=y # CONFIG_DMABUF_SYSFS_STATS is not set # end of DMABUF options -CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m -CONFIG_LINEDISP=m -CONFIG_HD44780_COMMON=m -CONFIG_HD44780=m -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_IMG_ASCII_LCD=m -CONFIG_HT16K33=m -CONFIG_LCD2S=m -CONFIG_PARPORT_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -# CONFIG_CHARLCD_BL_OFF is not set -# CONFIG_CHARLCD_BL_ON is not set -CONFIG_CHARLCD_BL_FLASH=y -CONFIG_PANEL=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m @@ -8852,10 +8960,15 @@ CONFIG_UIO_MF624=m CONFIG_UIO_HV_GENERIC=m CONFIG_UIO_DFL=m CONFIG_VFIO=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_VIRQFD=y + +# +# VFIO support for PCI devices +# CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y @@ -8863,6 +8976,8 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m +# end of VFIO support for PCI devices + CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y CONFIG_VMGENID=y @@ -8932,6 +9047,7 @@ CONFIG_XEN_PVCALLS_FRONTEND=m # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m +# CONFIG_XEN_PRIVCMD_IRQFD is not set CONFIG_XEN_AUTO_XLATE=y CONFIG_XEN_ACPI=y CONFIG_XEN_FRONT_PGDIR_SHBUF=m @@ -9240,11 +9356,12 @@ CONFIG_MXM_WMI=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_XIAOMI_WMI=m CONFIG_GIGABYTE_WMI=m -CONFIG_YOGABOOK_WMI=m +CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m CONFIG_AMD_PMF=m +# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m CONFIG_ADV_SWBUTTON=m CONFIG_APPLE_GMUX=m @@ -9281,6 +9398,7 @@ CONFIG_X86_PLATFORM_DRIVERS_HP=y CONFIG_HP_ACCEL=m CONFIG_HP_WMI=m CONFIG_TC1100_WMI=m +CONFIG_HP_BIOSCFG=m CONFIG_WIRELESS_HOTKEY=m CONFIG_IBM_RTL=m CONFIG_IDEAPAD_LAPTOP=m @@ -9349,7 +9467,12 @@ CONFIG_INTEL_SCU_PCI=y CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m CONFIG_WINMATE_FM07_KEYS=m +# CONFIG_SEL3350_PLATFORM is not set CONFIG_P2SB=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -9644,6 +9767,7 @@ CONFIG_MAX11205=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX77541_ADC=m CONFIG_MAX9611=m CONFIG_MCP320X=m CONFIG_MCP3422=m @@ -9749,6 +9873,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # end of Hid Sensor IIO Common +CONFIG_IIO_INV_SENSORS_TIMESTAMP=m CONFIG_IIO_MS_SENSORS_I2C=m # @@ -9805,6 +9930,7 @@ CONFIG_MAX517=m CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m +# CONFIG_MCP4728 is not set CONFIG_MCP4922=m CONFIG_TI_DAC082S085=m CONFIG_TI_DAC5571=m @@ -9965,6 +10091,7 @@ CONFIG_ISL29125=m CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m +CONFIG_ROHM_BU27008=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m @@ -9975,6 +10102,7 @@ CONFIG_MAX44000=m CONFIG_MAX44009=m CONFIG_NOA1305=m CONFIG_OPT3001=m +CONFIG_OPT4001=m CONFIG_PA12203001=m CONFIG_SI1133=m CONFIG_SI1145=m @@ -10066,6 +10194,7 @@ CONFIG_MCP4131=m CONFIG_MCP4531=m CONFIG_MCP41010=m CONFIG_TPL0102=m +CONFIG_X9250=m # end of Digital potentiometers # @@ -10091,6 +10220,7 @@ CONFIG_MPL115=m CONFIG_MPL115_I2C=m CONFIG_MPL115_SPI=m CONFIG_MPL3115=m +CONFIG_MPRLS0025PA=m CONFIG_MS5611=m CONFIG_MS5611_I2C=m CONFIG_MS5611_SPI=m @@ -10115,6 +10245,7 @@ CONFIG_AS3935=m # Proximity and distance sensors # CONFIG_CROS_EC_MKBP_PROXIMITY=m +# CONFIG_IRSD200 is not set CONFIG_ISL29501=m CONFIG_LIDAR_LITE_V2=m CONFIG_MB1232=m @@ -10343,6 +10474,7 @@ CONFIG_HTE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -10420,7 +10552,6 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=y CONFIG_CUSE=m @@ -10430,6 +10561,7 @@ CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches @@ -10489,9 +10621,9 @@ CONFIG_SYSFS=y CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y +# CONFIG_TMPFS_QUOTA is not set CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y -CONFIG_MEMFD_CREATE=y CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=y # end of Pseudo filesystems @@ -10569,15 +10701,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -# CONFIG_PSTORE_ZSTD_COMPRESS is not set CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_FTRACE is not set @@ -10635,8 +10759,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y @@ -10721,6 +10843,7 @@ CONFIG_NLS_MAC_INUIT=m CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=m +CONFIG_NLS_UCS2_UTILS=m CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set CONFIG_UNICODE=y @@ -10749,7 +10872,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_INTEL_TXT=y CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set @@ -10759,6 +10881,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# CONFIG_SECURITY_SELINUX_DEBUG is not set CONFIG_SECURITY_SMACK=y # CONFIG_SECURITY_SMACK_BRINGUP is not set CONFIG_SECURITY_SMACK_NETFILTER=y @@ -10804,8 +10927,7 @@ CONFIG_IMA_APPRAISE=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_MODSIG is not set -CONFIG_IMA_TRUSTED_KEYRING=y -CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y @@ -10826,16 +10948,16 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" # # Kernel hardening options # -CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_GCC_PLUGIN_STACKLEAK=y # CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 @@ -10847,6 +10969,13 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_ZERO_CALL_USED_REGS=y # end of Memory initialization +# +# Hardening of kernel data structures +# +# CONFIG_LIST_HARDENED is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set @@ -10868,6 +10997,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y CONFIG_CRYPTO_HASH=y @@ -10961,6 +11091,7 @@ CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GENIV=y CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ESSIV=m @@ -10982,7 +11113,7 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SHA3=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_STREEBOG=m @@ -11022,6 +11153,7 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -11205,12 +11337,13 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_FLAGS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_CMA=y -CONFIG_DMA_PERNUMA_CMA=y # # Default contiguous memory area size: @@ -11403,13 +11536,19 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set -CONFIG_HARDLOCKUP_DETECTOR_PERF=y +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY is not set +CONFIG_HARDLOCKUP_DETECTOR_PERF=y +# CONFIG_HARDLOCKUP_DETECTOR_BUDDY is not set +# CONFIG_HARDLOCKUP_DETECTOR_ARCH is not set +CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set # CONFIG_TEST_LOCKUP is not set # end of Debug Oops, Lockups and Hangs @@ -11456,7 +11595,6 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -11486,6 +11624,7 @@ CONFIG_HAVE_RETHOOK=y CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y @@ -11508,6 +11647,7 @@ CONFIG_FTRACE=y # CONFIG_BOOTTIME_TRACING is not set CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_FUNCTION_GRAPH_RETVAL=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y @@ -11527,6 +11667,7 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_FPROBE_EVENTS=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y diff --git a/gnu/packages/aux-files/linux-libre/6.4-x86_64.conf b/gnu/packages/aux-files/linux-libre/6.6-x86_64.conf index 5abcfc6683..c2d950408e 100644 --- a/gnu/packages/aux-files/linux-libre/6.4-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/6.6-x86_64.conf @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.4.2 Kernel Configuration +# Linux/x86 6.6.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.3.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110300 +CONFIG_GCC_VERSION=130200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=23800 @@ -271,8 +271,8 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y CONFIG_RSEQ=y +CONFIG_CACHESTAT_SYSCALL=y # CONFIG_DEBUG_RSEQ is not set -# CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y CONFIG_GUEST_PERF_EVENTS=y # CONFIG_PC104 is not set @@ -287,6 +287,21 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y + +# +# Kexec and crash features +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HAVE_IMA_KEXEC=y +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_SIG is not set +CONFIG_KEXEC_JUMP=y +CONFIG_CRASH_DUMP=y +CONFIG_CRASH_HOTPLUG=y +CONFIG_CRASH_MAX_MEMORY_RANGES=8192 +# end of Kexec and crash features # end of General setup CONFIG_64BIT=y @@ -322,7 +337,6 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y # Processor type and features # CONFIG_SMP=y -CONFIG_X86_FEATURE_NAMES=y CONFIG_X86_X2APIC=y CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set @@ -426,8 +440,6 @@ CONFIG_X86_ESPFIX64=y CONFIG_X86_VSYSCALL_EMULATION=y CONFIG_X86_IOPL_IOPERM=y CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y # CONFIG_MICROCODE_LATE_LOADING is not set CONFIG_X86_MSR=m CONFIG_X86_CPUID=m @@ -458,12 +470,14 @@ CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y +CONFIG_X86_CET=y CONFIG_X86_KERNEL_IBT=y CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_X86_INTEL_TSX_MODE_OFF=y # CONFIG_X86_INTEL_TSX_MODE_ON is not set # CONFIG_X86_INTEL_TSX_MODE_AUTO is not set CONFIG_X86_SGX=y +# CONFIG_X86_USER_SHADOW_STACK is not set CONFIG_EFI=y CONFIG_EFI_STUB=y CONFIG_EFI_HANDOVER_PROTOCOL=y @@ -476,12 +490,16 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y -CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -CONFIG_ARCH_HAS_KEXEC_PURGATORY=y -# CONFIG_KEXEC_SIG is not set -CONFIG_CRASH_DUMP=y -CONFIG_KEXEC_JUMP=y +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SELECTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_PURGATORY=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG_FORCE=y +CONFIG_ARCH_SUPPORTS_KEXEC_BZIMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_JUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_SUPPORTS_CRASH_HOTPLUG=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_RELOCATABLE=y CONFIG_RANDOMIZE_BASE=y @@ -492,8 +510,6 @@ CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa CONFIG_ADDRESS_MASKING=y CONFIG_HOTPLUG_CPU=y -# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set -# CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_COMPAT_VDSO is not set # CONFIG_LEGACY_VSYSCALL_XONLY is not set CONFIG_LEGACY_VSYSCALL_NONE=y @@ -522,9 +538,10 @@ CONFIG_CALL_DEPTH_TRACKING=y # CONFIG_CALL_THUNKS_DEBUG is not set CONFIG_CPU_IBPB_ENTRY=y CONFIG_CPU_IBRS_ENTRY=y +CONFIG_CPU_SRSO=y CONFIG_SLS=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_HAS_ADD_PAGES=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # # Power management and ACPI options @@ -650,6 +667,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_X86_INTEL_PSTATE=y CONFIG_X86_PCC_CPUFREQ=y CONFIG_X86_AMD_PSTATE=y +CONFIG_X86_AMD_PSTATE_DEFAULT_MODE=3 # CONFIG_X86_AMD_PSTATE_UT is not set CONFIG_X86_ACPI_CPUFREQ=y CONFIG_X86_ACPI_CPUFREQ_CPB=y @@ -731,20 +749,24 @@ CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y CONFIG_KVM_SMM=y CONFIG_KVM_XEN=y +# CONFIG_KVM_PROVE_MMU is not set CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y CONFIG_AS_AVX512=y CONFIG_AS_SHA1_NI=y CONFIG_AS_SHA256_NI=y CONFIG_AS_TPAUSE=y CONFIG_AS_GFNI=y +CONFIG_AS_WRUSS=y # # General architecture-dependent options # -CONFIG_CRASH_CORE=y -CONFIG_KEXEC_CORE=y -CONFIG_HAVE_IMA_KEXEC=y CONFIG_HOTPLUG_SMT=y +CONFIG_HOTPLUG_CORE_SYNC=y +CONFIG_HOTPLUG_CORE_SYNC_DEAD=y +CONFIG_HOTPLUG_CORE_SYNC_FULL=y +CONFIG_HOTPLUG_SPLIT_STARTUP=y +CONFIG_HOTPLUG_PARALLEL=y CONFIG_GENERIC_ENTRY=y CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y @@ -774,6 +796,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y @@ -827,6 +850,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_HUGE_VMALLOC=y CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y @@ -1018,6 +1042,7 @@ CONFIG_ZPOOL=y CONFIG_SWAP=y CONFIG_ZSWAP=y # CONFIG_ZSWAP_DEFAULT_ON is not set +# CONFIG_ZSWAP_EXCLUSIVE_LOADS_DEFAULT_ON is not set # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set @@ -1038,7 +1063,7 @@ CONFIG_ZSMALLOC_CHAIN_SIZE=8 # # SLAB allocator options # -# CONFIG_SLAB is not set +# CONFIG_SLAB_DEPRECATED is not set CONFIG_SLUB=y # CONFIG_SLUB_TINY is not set CONFIG_SLAB_MERGE_DEFAULT=y @@ -1046,6 +1071,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y CONFIG_SLAB_FREELIST_HARDENED=y # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set # end of SLAB allocator options CONFIG_SHUFFLE_PAGE_ALLOCATOR=y @@ -1054,7 +1080,8 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_ARCH_WANT_OPTIMIZE_VMEMMAP=y +CONFIG_ARCH_WANT_OPTIMIZE_DAX_VMEMMAP=y +CONFIG_ARCH_WANT_OPTIMIZE_HUGETLB_VMEMMAP=y CONFIG_HAVE_FAST_GUP=y CONFIG_NUMA_KEEP_MEMINFO=y CONFIG_MEMORY_ISOLATION=y @@ -1066,6 +1093,7 @@ CONFIG_MEMORY_HOTPLUG=y # CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set CONFIG_MEMORY_HOTREMOVE=y CONFIG_MHP_MEMMAP_ON_MEMORY=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_MEMORY_BALLOON=y @@ -1096,7 +1124,6 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set @@ -1126,6 +1153,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y CONFIG_MAPPING_DIRTY_HELPERS=y +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y CONFIG_ANON_VMA_NAME=y CONFIG_USERFAULTFD=y @@ -1157,6 +1185,7 @@ CONFIG_WANT_COMPAT_NETLINK_MESSAGES=y CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_NET_REDIRECT=y CONFIG_SKB_EXTENSIONS=y @@ -2069,6 +2098,7 @@ CONFIG_NFC_SHDLC=y # Near Field Communication (NFC) devices # CONFIG_NFC_TRF7970A=m +CONFIG_NFC_MEI_PHY=m CONFIG_NFC_SIM=m CONFIG_NFC_PORT100=m CONFIG_NFC_VIRTUAL_NCI=m @@ -2076,12 +2106,14 @@ CONFIG_NFC_FDP=m CONFIG_NFC_FDP_I2C=m CONFIG_NFC_PN544=m CONFIG_NFC_PN544_I2C=m +CONFIG_NFC_PN544_MEI=m CONFIG_NFC_PN533=m CONFIG_NFC_PN533_USB=m CONFIG_NFC_PN533_I2C=m CONFIG_NFC_PN532_UART=m CONFIG_NFC_MICROREAD=m CONFIG_NFC_MICROREAD_I2C=m +CONFIG_NFC_MICROREAD_MEI=m CONFIG_NFC_MRVL=m CONFIG_NFC_MRVL_USB=m CONFIG_NFC_MRVL_UART=m @@ -2213,6 +2245,7 @@ CONFIG_CXL_PORT=m CONFIG_CXL_SUSPEND=y CONFIG_CXL_REGION=y # CONFIG_CXL_REGION_INVALIDATION_TEST is not set +CONFIG_CXL_PMU=m CONFIG_PCCARD=m CONFIG_PCMCIA=m CONFIG_PCMCIA_LOAD_CIS=y @@ -2315,6 +2348,11 @@ CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_BUS_EP=m # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + CONFIG_CONNECTOR=y CONFIG_PROC_EVENTS=y @@ -2363,6 +2401,7 @@ CONFIG_EFI_EARLYCON=y CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y # CONFIG_EFI_DISABLE_RUNTIME is not set CONFIG_EFI_COCO_SECRET=y +CONFIG_UNACCEPTED_MEMORY=y # end of EFI (Extensible Firmware Interface) Support CONFIG_UEFI_CPER=y @@ -2659,6 +2698,8 @@ CONFIG_DW_XDATA_PCIE=m # CONFIG_PCI_ENDPOINT_TEST is not set CONFIG_XILINX_SDFEC=m CONFIG_MISC_RTSX=m +CONFIG_TPS6594_ESM=y +CONFIG_TPS6594_PFSM=y CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -2687,11 +2728,13 @@ CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_ALTERA_STAPL=m -# CONFIG_INTEL_MEI is not set -# CONFIG_INTEL_MEI_ME is not set +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=m # CONFIG_INTEL_MEI_TXE is not set +CONFIG_INTEL_MEI_GSC=m # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_PXP is not set +CONFIG_INTEL_MEI_GSC_PROXY=m CONFIG_VMWARE_VMCI=m CONFIG_GENWQE=m CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 @@ -2980,6 +3023,7 @@ CONFIG_PATA_LEGACY=m CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y +CONFIG_MD_BITMAP_FILE=y CONFIG_MD_LINEAR=m CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m @@ -3092,6 +3136,7 @@ CONFIG_AMT=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_NTB_NETDEV=m @@ -3263,6 +3308,7 @@ CONFIG_THUNDER_NIC_VF=m CONFIG_THUNDER_NIC_BGX=m CONFIG_THUNDER_NIC_RGX=m CONFIG_CAVIUM_PTP=m +CONFIG_LIQUIDIO_CORE=m CONFIG_LIQUIDIO=m CONFIG_LIQUIDIO_VF=m CONFIG_NET_VENDOR_CHELSIO=y @@ -3374,7 +3420,7 @@ CONFIG_MLX5_ESWITCH=y CONFIG_MLX5_BRIDGE=y CONFIG_MLX5_CORE_EN_DCB=y # CONFIG_MLX5_CORE_IPOIB is not set -CONFIG_MLX5_EN_MACSEC=y +# CONFIG_MLX5_MACSEC is not set CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_SF=y @@ -3573,9 +3619,11 @@ CONFIG_INTEL_XWAY_PHY=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MARVELL_PHY=m CONFIG_MARVELL_10G_PHY=m +CONFIG_MARVELL_88Q2XXX_PHY=m CONFIG_MARVELL_88X2222_PHY=m CONFIG_MAXLINEAR_GPHY=m CONFIG_MEDIATEK_GE_PHY=m +# CONFIG_MEDIATEK_GE_SOC_PHY is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_T1S_PHY=m CONFIG_MICROCHIP_PHY=m @@ -3660,6 +3708,7 @@ CONFIG_CAN_8DEV_USB=m CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB=m CONFIG_CAN_ETAS_ES58X=m +CONFIG_CAN_F81604=m CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_MCBA_USB=m @@ -3688,6 +3737,7 @@ CONFIG_MDIO_GPIO=m CONFIG_MDIO_I2C=m CONFIG_MDIO_MVUSB=m CONFIG_MDIO_MSCC_MIIM=m +CONFIG_MDIO_REGMAP=m CONFIG_MDIO_THUNDER=m # @@ -3700,7 +3750,6 @@ CONFIG_MDIO_THUNDER=m CONFIG_PCS_XPCS=m CONFIG_PCS_LYNX=m CONFIG_PCS_MTK_LYNXI=m -CONFIG_PCS_ALTERA_TSE=m # end of PCS device drivers CONFIG_PLIP=m @@ -3712,6 +3761,11 @@ CONFIG_PPP_MPPE=m CONFIG_PPP_MULTILINK=y CONFIG_PPPOATM=m CONFIG_PPPOE=m +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 CONFIG_PPTP=m CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m @@ -4045,6 +4099,7 @@ CONFIG_RTW88_8822CE=m CONFIG_RTW88_8822CS=m CONFIG_RTW88_8822CU=m CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8723DS=m CONFIG_RTW88_8723DU=m CONFIG_RTW88_8821CE=m CONFIG_RTW88_8821CS=m @@ -4054,9 +4109,11 @@ CONFIG_RTW88_8821CU=m CONFIG_RTW89=m CONFIG_RTW89_CORE=m CONFIG_RTW89_PCI=m +CONFIG_RTW89_8851B=m CONFIG_RTW89_8852A=m CONFIG_RTW89_8852B=m CONFIG_RTW89_8852C=m +CONFIG_RTW89_8851BE=m CONFIG_RTW89_8852AE=m CONFIG_RTW89_8852BE=m CONFIG_RTW89_8852CE=m @@ -4348,7 +4405,6 @@ CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_NOVATEK_NVT_TS=m CONFIG_TOUCHSCREEN_IMAGIS=m CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m CONFIG_TOUCHSCREEN_PENMOUNT=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_TOUCHRIGHT=m @@ -4403,6 +4459,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_TOUCHSCREEN_COLIBRI_VF50=m CONFIG_TOUCHSCREEN_ROHM_BU21023=m CONFIG_TOUCHSCREEN_IQS5XX=m +CONFIG_TOUCHSCREEN_IQS7211=m CONFIG_TOUCHSCREEN_ZINITIX=m CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m CONFIG_INPUT_MISC=y @@ -4503,8 +4560,6 @@ CONFIG_HYPERV_KEYBOARD=m CONFIG_SERIO_GPIO_PS2=m CONFIG_USERIO=m CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m CONFIG_GAMEPORT_EMU10K1=m CONFIG_GAMEPORT_FM801=m # end of Hardware I/O ports @@ -4595,7 +4650,6 @@ CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_NONSTANDARD=y CONFIG_MOXA_INTELLIO=m CONFIG_MOXA_SMARTIO=m -CONFIG_SYNCLINK_GT=m CONFIG_N_HDLC=m CONFIG_IPWIRELESS=m CONFIG_N_GSM=m @@ -4798,6 +4852,7 @@ CONFIG_SPI_AXI_SPI_ENGINE=m CONFIG_SPI_BITBANG=m CONFIG_SPI_BUTTERFLY=m CONFIG_SPI_CADENCE=m +CONFIG_SPI_CS42L43=m CONFIG_SPI_DESIGNWARE=m # CONFIG_SPI_DW_DMA is not set CONFIG_SPI_DW_PCI=m @@ -4875,6 +4930,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_IDT82P33=m CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_MOCK is not set # CONFIG_PTP_1588_CLOCK_VMW is not set CONFIG_PTP_1588_CLOCK_OCP=m CONFIG_PTP_DFL_TOD=m @@ -4892,6 +4948,7 @@ CONFIG_PINCTRL_MCP23S08_I2C=m CONFIG_PINCTRL_MCP23S08_SPI=m CONFIG_PINCTRL_MCP23S08=m CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_CS42L43=m CONFIG_PINCTRL_MADERA=m # @@ -4947,13 +5004,13 @@ CONFIG_GPIO_ICH=m CONFIG_GPIO_MB86S7X=m CONFIG_GPIO_MENZ127=m CONFIG_GPIO_TANGIER=m -CONFIG_GPIO_VX855=m CONFIG_GPIO_AMD_FCH=m # end of Memory mapped GPIO drivers # # Port-mapped I/O GPIO drivers # +CONFIG_GPIO_VX855=m CONFIG_GPIO_F7188X=m CONFIG_GPIO_IT87=m CONFIG_GPIO_SCH=m @@ -4966,6 +5023,7 @@ CONFIG_GPIO_WS16C48=m # I2C GPIO expanders # CONFIG_GPIO_FXL6408=m +CONFIG_GPIO_DS4520=m CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m @@ -5156,6 +5214,7 @@ CONFIG_CHARGER_TPS65090=m CONFIG_BATTERY_GAUGE_LTC2941=m CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_RT5033=m +CONFIG_CHARGER_RT5033=m CONFIG_CHARGER_RT9455=m CONFIG_CHARGER_RT9467=m CONFIG_CHARGER_RT9471=m @@ -5224,6 +5283,7 @@ CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_G762=m CONFIG_SENSORS_HIH6130=m +CONFIG_SENSORS_HS3001=m CONFIG_SENSORS_IBMAEM=m CONFIG_SENSORS_IBMPEX=m CONFIG_SENSORS_IIO_HWMON=m @@ -5254,6 +5314,7 @@ CONFIG_SENSORS_MAX197=m CONFIG_SENSORS_MAX31722=m CONFIG_SENSORS_MAX31730=m CONFIG_SENSORS_MAX31760=m +CONFIG_MAX31827=m CONFIG_SENSORS_MAX6620=m CONFIG_SENSORS_MAX6621=m CONFIG_SENSORS_MAX6639=m @@ -5333,6 +5394,7 @@ CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m CONFIG_SENSORS_MP2888=m CONFIG_SENSORS_MP2975=m +CONFIG_SENSORS_MP2975_REGULATOR=y CONFIG_SENSORS_MP5023=m CONFIG_SENSORS_MPQ7932_REGULATOR=y CONFIG_SENSORS_MPQ7932=m @@ -5375,7 +5437,6 @@ CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_STTS751=m -CONFIG_SENSORS_SMM665=m CONFIG_SENSORS_ADC128D818=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -5420,6 +5481,7 @@ CONFIG_SENSORS_ACPI_POWER=m CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ASUS_WMI=m CONFIG_SENSORS_ASUS_EC=m +CONFIG_SENSORS_HP_WMI=m CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_STATISTICS is not set @@ -5430,6 +5492,7 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_DEFAULT_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_BANG_BANG=y @@ -5534,6 +5597,7 @@ CONFIG_W83877F_WDT=m CONFIG_W83977F_WDT=m CONFIG_MACHZ_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m +CONFIG_INTEL_MEI_WDT=m CONFIG_NI903X_WDT=m CONFIG_NIC7018_WDT=m CONFIG_SIEMENS_SIMATIC_IPC_WDT=m @@ -5589,6 +5653,9 @@ CONFIG_MFD_BD9571MWV=m CONFIG_MFD_AXP20X=m CONFIG_MFD_AXP20X_I2C=m CONFIG_MFD_CROS_EC_DEV=m +CONFIG_MFD_CS42L43=m +CONFIG_MFD_CS42L43_I2C=m +CONFIG_MFD_CS42L43_SDW=m CONFIG_MFD_MADERA=m CONFIG_MFD_MADERA_I2C=m CONFIG_MFD_MADERA_SPI=m @@ -5629,6 +5696,7 @@ CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m CONFIG_MFD_88PM860X=y CONFIG_MFD_MAX14577=y +CONFIG_MFD_MAX77541=m CONFIG_MFD_MAX77693=y CONFIG_MFD_MAX77843=y CONFIG_MFD_MAX8907=m @@ -5674,6 +5742,9 @@ CONFIG_MFD_TPS65910=y CONFIG_MFD_TPS65912=y CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y +CONFIG_MFD_TPS6594=y +CONFIG_MFD_TPS6594_I2C=y +CONFIG_MFD_TPS6594_SPI=y CONFIG_TWL4030_CORE=y CONFIG_MFD_TWL4030_AUDIO=y CONFIG_TWL6040_CORE=y @@ -5719,6 +5790,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_AS3711=m CONFIG_REGULATOR_ATC260X=m +CONFIG_REGULATOR_AW37503=m CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_BCM590XX=m CONFIG_REGULATOR_BD9571MWV=m @@ -5742,6 +5814,8 @@ CONFIG_REGULATOR_LTC3589=m CONFIG_REGULATOR_LTC3676=m CONFIG_REGULATOR_MAX14577=m CONFIG_REGULATOR_MAX1586=m +CONFIG_REGULATOR_MAX77541=m +CONFIG_REGULATOR_MAX77857=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8893=m @@ -5779,6 +5853,7 @@ CONFIG_REGULATOR_PV88090=m CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RC5T583=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m @@ -5794,6 +5869,7 @@ CONFIG_REGULATOR_RT6245=m CONFIG_REGULATOR_RTQ2134=m CONFIG_REGULATOR_RTMV20=m CONFIG_REGULATOR_RTQ6752=m +CONFIG_REGULATOR_RTQ2208=m CONFIG_REGULATOR_SKY81452=m CONFIG_REGULATOR_SLG51000=m CONFIG_REGULATOR_SY7636A=m @@ -5906,8 +5982,8 @@ CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FLASH_LED_CLASS=m CONFIG_V4L2_FWNODE=m CONFIG_V4L2_ASYNC=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_V4L2_CCI=m +CONFIG_V4L2_CCI_I2C=m # end of Video4Linux options # @@ -6010,7 +6086,6 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m # @@ -6162,7 +6237,8 @@ CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m CONFIG_VIDEO_IPU3_CIO2=m -CONFIG_CIO2_BRIDGE=y +CONFIG_INTEL_VSC=m +CONFIG_IPU_BRIDGE=m CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_MAXIRADIO=m CONFIG_RADIO_SAA7706H=m @@ -6343,10 +6419,7 @@ CONFIG_MEDIA_ATTACH=y # IR I2C driver auto-selected by 'Autoselect ancillary drivers' # CONFIG_VIDEO_IR_I2C=m - -# -# Camera sensor devices -# +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_APTINA_PLL=m CONFIG_VIDEO_CCS_PLL=m CONFIG_VIDEO_AR0521=m @@ -6371,6 +6444,7 @@ CONFIG_VIDEO_MT9V011=m CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_MT9V111=m CONFIG_VIDEO_OG01A1B=m +CONFIG_VIDEO_OV01A10=m CONFIG_VIDEO_OV02A10=m CONFIG_VIDEO_OV08D10=m CONFIG_VIDEO_OV08X40=m @@ -6408,7 +6482,6 @@ CONFIG_VIDEO_S5K5BAF=m CONFIG_VIDEO_S5K6A3=m CONFIG_VIDEO_CCS=m CONFIG_VIDEO_ET8EK8=m -# end of Camera sensor devices # # Lens drivers @@ -6416,6 +6489,7 @@ CONFIG_VIDEO_ET8EK8=m CONFIG_VIDEO_AD5820=m CONFIG_VIDEO_AK7375=m CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9719=m CONFIG_VIDEO_DW9768=m CONFIG_VIDEO_DW9807_VCM=m # end of Lens drivers @@ -6534,6 +6608,11 @@ CONFIG_VIDEO_THS7303=m # end of Miscellaneous helper chips # +# Video serializers and deserializers +# +# end of Video serializers and deserializers + +# # Media SPI Adapters # CONFIG_CXD2880_SPI_DRV=m @@ -6761,6 +6840,27 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +CONFIG_AUXDISPLAY=y +CONFIG_CHARLCD=m +CONFIG_LINEDISP=m +CONFIG_HD44780_COMMON=m +CONFIG_HD44780=m +CONFIG_KS0108=m +CONFIG_KS0108_PORT=0x378 +CONFIG_KS0108_DELAY=2 +CONFIG_CFAG12864B=m +CONFIG_CFAG12864B_RATE=20 +CONFIG_IMG_ASCII_LCD=m +CONFIG_HT16K33=m +CONFIG_LCD2S=m +CONFIG_PARPORT_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y +CONFIG_PANEL=m CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y @@ -6785,6 +6885,7 @@ CONFIG_DRM_DISPLAY_HDMI_HELPER=y # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_TTM=m +CONFIG_DRM_EXEC=m CONFIG_DRM_BUDDY=m CONFIG_DRM_VRAM_HELPER=m CONFIG_DRM_TTM_HELPER=m @@ -6813,6 +6914,7 @@ CONFIG_DRM_AMDGPU=m # CONFIG_DRM_AMDGPU_SI is not set # CONFIG_DRM_AMDGPU_CIK is not set CONFIG_DRM_AMDGPU_USERPTR=y +# CONFIG_DRM_AMDGPU_WERROR is not set # # ACP (Audio CoProcessor) Configuration @@ -6905,6 +7007,7 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m CONFIG_DRM_ANALOGIX_DP=m # end of Display Interface Bridges +CONFIG_DRM_LOONGSON=m # CONFIG_DRM_ETNAVIV is not set CONFIG_DRM_BOCHS=m CONFIG_DRM_CIRRUS_QEMU=m @@ -6935,28 +7038,9 @@ CONFIG_DRM_PRIVACY_SCREEN=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y CONFIG_FB_HECUBA=m CONFIG_FB_SVGALIB=m -CONFIG_FB_BACKLIGHT=m -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# CONFIG_FB_CIRRUS=m CONFIG_FB_PM2=m CONFIG_FB_PM2_FIFO_DISCONNECT=y @@ -7039,6 +7123,27 @@ CONFIG_FB_HYPERV=m CONFIG_FB_SIMPLE=y CONFIG_FB_SSD1307=m CONFIG_FB_SM712=m +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DEVICE=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_BACKLIGHT=m +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y # end of Frame buffer Devices # @@ -7132,6 +7237,8 @@ CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_SEQ_DEVICE=m CONFIG_SND_RAWMIDI=m +CONFIG_SND_UMP=m +CONFIG_SND_UMP_LEGACY_RAWMIDI=y CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y @@ -7161,6 +7268,8 @@ CONFIG_SND_SEQ_MIDI_EVENT=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EMUL=m CONFIG_SND_SEQ_VIRMIDI=m +CONFIG_SND_SEQ_UMP=y +CONFIG_SND_SEQ_UMP_CLIENT=m CONFIG_SND_MPU401_UART=m CONFIG_SND_OPL3_LIB=m CONFIG_SND_OPL3_LIB_SEQ=m @@ -7170,6 +7279,7 @@ CONFIG_SND_DRIVERS=y CONFIG_SND_PCSP=m CONFIG_SND_DUMMY=m CONFIG_SND_ALOOP=m +# CONFIG_SND_PCMTEST is not set CONFIG_SND_VIRMIDI=m CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m @@ -7268,6 +7378,10 @@ CONFIG_SND_HDA_SCODEC_CS35L41=m CONFIG_SND_HDA_CS_DSP_CONTROLS=m CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m +CONFIG_SND_HDA_SCODEC_CS35L56=m +CONFIG_SND_HDA_SCODEC_CS35L56_I2C=m +CONFIG_SND_HDA_SCODEC_CS35L56_SPI=m +CONFIG_SND_HDA_SCODEC_TAS2781_I2C=m CONFIG_SND_HDA_CODEC_REALTEK=m CONFIG_SND_HDA_CODEC_ANALOG=m CONFIG_SND_HDA_CODEC_SIGMATEL=m @@ -7300,6 +7414,7 @@ CONFIG_SND_INTEL_BYT_PREFER_SOF=y CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_MIDI_V2=y CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y CONFIG_SND_USB_UA101=m CONFIG_SND_USB_USX2Y=m @@ -7352,6 +7467,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m CONFIG_SND_AMD_ACP_CONFIG=m CONFIG_SND_SOC_AMD_ACP_COMMON=m CONFIG_SND_SOC_AMD_ACP_PDM=m +CONFIG_SND_SOC_AMD_ACP_LEGACY_COMMON=m CONFIG_SND_SOC_AMD_ACP_I2S=m CONFIG_SND_SOC_AMD_ACP_PCM=m CONFIG_SND_SOC_AMD_ACP_PCI=m @@ -7390,6 +7506,7 @@ CONFIG_SND_SOC_FSL_RPMSG=m CONFIG_SND_SOC_IMX_AUDMUX=m # end of SoC Audio for Freescale CPUs +CONFIG_SND_SOC_CHV3_I2S=m CONFIG_SND_I2S_HI6210_I2S=m # CONFIG_SND_SOC_IMG is not set CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y @@ -7423,6 +7540,7 @@ CONFIG_SND_SOC_INTEL_AVS=m # CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m +CONFIG_SND_SOC_INTEL_AVS_MACH_ES8336=m CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98927=m @@ -7433,6 +7551,7 @@ CONFIG_SND_SOC_INTEL_AVS_MACH_PROBE=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5663=m CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m # end of Intel AVS Machine drivers @@ -7500,7 +7619,9 @@ CONFIG_SND_SOC_SOF_INTEL_IPC4=y CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m CONFIG_SND_SOC_SOF_AMD_COMMON=m CONFIG_SND_SOC_SOF_AMD_RENOIR=m +CONFIG_SND_SOC_SOF_AMD_VANGOGH=m CONFIG_SND_SOC_SOF_AMD_REMBRANDT=m +CONFIG_SND_SOC_SOF_ACP_PROBES=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m @@ -7527,6 +7648,8 @@ CONFIG_SND_SOC_SOF_ELKHARTLAKE=m CONFIG_SND_SOC_SOF_ALDERLAKE=m CONFIG_SND_SOC_SOF_INTEL_MTL=m CONFIG_SND_SOC_SOF_METEORLAKE=m +CONFIG_SND_SOC_SOF_INTEL_LNL=m +CONFIG_SND_SOC_SOF_LUNARLAKE=m CONFIG_SND_SOC_SOF_HDA_COMMON=m CONFIG_SND_SOC_SOF_HDA_MLINK=m CONFIG_SND_SOC_SOF_HDA_LINK=y @@ -7578,11 +7701,14 @@ CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_ALC5623=m +CONFIG_SND_SOC_AUDIO_IIO_AUX=m CONFIG_SND_SOC_AW8738=m CONFIG_SND_SOC_AW88395_LIB=m CONFIG_SND_SOC_AW88395=m +CONFIG_SND_SOC_AW88261=m CONFIG_SND_SOC_BD28623=m CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CHV3_CODEC=m CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L32=m CONFIG_SND_SOC_CS35L33=m @@ -7604,6 +7730,8 @@ CONFIG_SND_SOC_CS35L56_SDW=m CONFIG_SND_SOC_CS42L42_CORE=m CONFIG_SND_SOC_CS42L42=m CONFIG_SND_SOC_CS42L42_SDW=m +CONFIG_SND_SOC_CS42L43=m +CONFIG_SND_SOC_CS42L43_SDW=m CONFIG_SND_SOC_CS42L51=m CONFIG_SND_SOC_CS42L51_I2C=m CONFIG_SND_SOC_CS42L52=m @@ -7652,6 +7780,7 @@ CONFIG_SND_SOC_MAX98363=m CONFIG_SND_SOC_MAX98373=m CONFIG_SND_SOC_MAX98373_I2C=m CONFIG_SND_SOC_MAX98373_SDW=m +CONFIG_SND_SOC_MAX98388=m CONFIG_SND_SOC_MAX98390=m CONFIG_SND_SOC_MAX98396=m CONFIG_SND_SOC_MAX9860=m @@ -7686,6 +7815,7 @@ CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT1011=m CONFIG_SND_SOC_RT1015=m CONFIG_SND_SOC_RT1015P=m +CONFIG_SND_SOC_RT1017_SDCA_SDW=m CONFIG_SND_SOC_RT1019=m CONFIG_SND_SOC_RT1308=m CONFIG_SND_SOC_RT1308_SDW=m @@ -7715,6 +7845,7 @@ CONFIG_SND_SOC_RT711_SDW=m CONFIG_SND_SOC_RT711_SDCA_SDW=m CONFIG_SND_SOC_RT712_SDCA_SDW=m CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW=m +CONFIG_SND_SOC_RT722_SDCA_SDW=m CONFIG_SND_SOC_RT715=m CONFIG_SND_SOC_RT715_SDW=m CONFIG_SND_SOC_RT715_SDCA_SDW=m @@ -7745,6 +7876,9 @@ CONFIG_SND_SOC_TAS2562=m CONFIG_SND_SOC_TAS2764=m CONFIG_SND_SOC_TAS2770=m CONFIG_SND_SOC_TAS2780=m +CONFIG_SND_SOC_TAS2781_COMLIB=m +CONFIG_SND_SOC_TAS2781_FMWLIB=m +CONFIG_SND_SOC_TAS2781_I2C=m CONFIG_SND_SOC_TAS5086=m CONFIG_SND_SOC_TAS571X=m CONFIG_SND_SOC_TAS5720=m @@ -7769,6 +7903,7 @@ CONFIG_SND_SOC_TS3A227E=m CONFIG_SND_SOC_TSCS42XX=m CONFIG_SND_SOC_TSCS454=m CONFIG_SND_SOC_UDA1334=m +CONFIG_SND_SOC_WCD_CLASSH=m CONFIG_SND_SOC_WCD_MBHC=m CONFIG_SND_SOC_WCD938X=m CONFIG_SND_SOC_WCD938X_SDW=m @@ -7803,6 +7938,7 @@ CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8985=m CONFIG_SND_SOC_WSA881X=m CONFIG_SND_SOC_WSA883X=m +CONFIG_SND_SOC_WSA884X=m CONFIG_SND_SOC_ZL38060=m CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MT6351=m @@ -7878,6 +8014,7 @@ CONFIG_HID_HOLTEK=m CONFIG_HOLTEK_FF=y CONFIG_HID_VIVALDI_COMMON=m CONFIG_HID_GOOGLE_HAMMER=m +CONFIG_HID_GOOGLE_STADIA_FF=m CONFIG_HID_VIVALDI=m CONFIG_HID_GT683R=m CONFIG_HID_KEYTOUCH=m @@ -7916,6 +8053,8 @@ CONFIG_HID_NINTENDO=m CONFIG_NINTENDO_FF=y CONFIG_HID_NTI=m CONFIG_HID_NTRIG=m +CONFIG_HID_NVIDIA_SHIELD=m +CONFIG_NVIDIA_SHIELD_FF=y CONFIG_HID_ORTEK=m CONFIG_HID_PANTHERLORD=m CONFIG_PANTHERLORD_FF=y @@ -8310,6 +8449,7 @@ CONFIG_USB_NET2280=m CONFIG_USB_GOKU=m CONFIG_USB_EG20T=m CONFIG_USB_MAX3420_UDC=m +CONFIG_USB_CDNS2_UDC=m # CONFIG_USB_DUMMY_HCD is not set # end of USB Peripheral Controller @@ -8333,6 +8473,7 @@ CONFIG_USB_F_UAC1=m CONFIG_USB_F_UAC2=m CONFIG_USB_F_UVC=m CONFIG_USB_F_MIDI=m +CONFIG_USB_F_MIDI2=m CONFIG_USB_F_HID=m CONFIG_USB_F_PRINTER=m CONFIG_USB_F_TCM=m @@ -8353,6 +8494,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_MIDI2=y CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y CONFIG_USB_CONFIGFS_F_PRINTER=y @@ -8417,6 +8559,7 @@ CONFIG_TYPEC_MUX_FSA4480=m CONFIG_TYPEC_MUX_GPIO_SBU=m CONFIG_TYPEC_MUX_PI3USB30532=m CONFIG_TYPEC_MUX_INTEL_PMC=m +CONFIG_TYPEC_MUX_NB7VPQ904M=m # end of USB Type-C Multiplexer/DeMultiplexer Switch support # @@ -8466,7 +8609,6 @@ CONFIG_MMC_SDHCI_XENON=m CONFIG_SCSI_UFSHCD=m # CONFIG_SCSI_UFS_BSG is not set CONFIG_SCSI_UFS_CRYPTO=y -CONFIG_SCSI_UFS_HPB=y CONFIG_SCSI_UFS_HWMON=y CONFIG_SCSI_UFSHCD_PCI=m # CONFIG_SCSI_UFS_DWC_TC_PCI is not set @@ -8501,6 +8643,8 @@ CONFIG_LEDS_CLASS_MULTICOLOR=m # CONFIG_LEDS_88PM860X=m CONFIG_LEDS_APU=m +CONFIG_LEDS_AW200XX=m +CONFIG_LEDS_CHT_WCOVE=m CONFIG_LEDS_LM3530=m CONFIG_LEDS_LM3532=m CONFIG_LEDS_LM3533=m @@ -8516,6 +8660,7 @@ CONFIG_LEDS_LP8788=m CONFIG_LEDS_PCA955X=m # CONFIG_LEDS_PCA955X_GPIO is not set CONFIG_LEDS_PCA963X=m +CONFIG_LEDS_PCA995X=m CONFIG_LEDS_WM831X_STATUS=m CONFIG_LEDS_WM8350=m CONFIG_LEDS_DA903X=m @@ -8592,6 +8737,9 @@ CONFIG_LEDS_TRIGGER_TTY=m # Simple LED drivers # CONFIG_LEDS_SIEMENS_SIMATIC_IPC=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_APOLLOLAKE=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_F7188X=m +CONFIG_LEDS_SIEMENS_SIMATIC_IPC_ELKHARTLAKE=m # CONFIG_ACCESSIBILITY is not set CONFIG_INFINIBAND=m CONFIG_INFINIBAND_USER_MAD=m @@ -8774,7 +8922,6 @@ CONFIG_RTC_DRV_M48T86=m CONFIG_RTC_DRV_M48T35=m CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_MSM6242=m -CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_WM831X=m CONFIG_RTC_DRV_WM8350=m @@ -8813,6 +8960,7 @@ CONFIG_INTEL_IDXD_SVM=y CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IOATDMA=m CONFIG_PLX_DMA=m +CONFIG_XILINX_DMA=m CONFIG_XILINX_XDMA=m CONFIG_AMD_PTDMA=m CONFIG_QCOM_HIDMA_MGMT=m @@ -8847,27 +8995,6 @@ CONFIG_SYNC_FILE=y # end of DMABUF options CONFIG_DCA=m -CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m -CONFIG_LINEDISP=m -CONFIG_HD44780_COMMON=m -CONFIG_HD44780=m -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -CONFIG_CFAG12864B=m -CONFIG_CFAG12864B_RATE=20 -CONFIG_IMG_ASCII_LCD=m -CONFIG_HT16K33=m -CONFIG_LCD2S=m -CONFIG_PARPORT_PANEL=m -CONFIG_PANEL_PARPORT=0 -CONFIG_PANEL_PROFILE=5 -# CONFIG_PANEL_CHANGE_MESSAGE is not set -# CONFIG_CHARLCD_BL_OFF is not set -# CONFIG_CHARLCD_BL_ON is not set -CONFIG_CHARLCD_BL_FLASH=y -CONFIG_PANEL=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m @@ -8881,10 +9008,15 @@ CONFIG_UIO_MF624=m CONFIG_UIO_HV_GENERIC=m CONFIG_UIO_DFL=m CONFIG_VFIO=m +CONFIG_VFIO_GROUP=y CONFIG_VFIO_CONTAINER=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_VIRQFD=y + +# +# VFIO support for PCI devices +# CONFIG_VFIO_PCI_CORE=m CONFIG_VFIO_PCI_MMAP=y CONFIG_VFIO_PCI_INTX=y @@ -8892,6 +9024,9 @@ CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_IGD=y CONFIG_MLX5_VFIO_PCI=m +CONFIG_PDS_VFIO_PCI=m +# end of VFIO support for PCI devices + CONFIG_VFIO_MDEV=m CONFIG_IRQ_BYPASS_MANAGER=m CONFIG_VIRT_DRIVERS=y @@ -8925,6 +9060,7 @@ CONFIG_MLX5_VDPA_NET=m CONFIG_VP_VDPA=m CONFIG_ALIBABA_ENI_VDPA=m CONFIG_SNET_VDPA=m +CONFIG_PDS_VDPA=m CONFIG_VHOST_IOTLB=m CONFIG_VHOST_RING=m CONFIG_VHOST_TASK=y @@ -8969,6 +9105,7 @@ CONFIG_XEN_PVCALLS_FRONTEND=m # CONFIG_XEN_PVCALLS_BACKEND is not set CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_PRIVCMD_IRQFD=y CONFIG_XEN_ACPI_PROCESSOR=y CONFIG_XEN_MCE_LOG=y CONFIG_XEN_HAVE_PVMMU=y @@ -9299,11 +9436,12 @@ CONFIG_MXM_WMI=m CONFIG_NVIDIA_WMI_EC_BACKLIGHT=m CONFIG_XIAOMI_WMI=m CONFIG_GIGABYTE_WMI=m -CONFIG_YOGABOOK_WMI=m +CONFIG_YOGABOOK=m CONFIG_ACERHDF=m CONFIG_ACER_WIRELESS=m CONFIG_ACER_WMI=m CONFIG_AMD_PMF=m +# CONFIG_AMD_PMF_DEBUG is not set CONFIG_AMD_PMC=m CONFIG_AMD_HSMP=m CONFIG_ADV_SWBUTTON=m @@ -9340,6 +9478,7 @@ CONFIG_GPD_POCKET_FAN=m CONFIG_X86_PLATFORM_DRIVERS_HP=y CONFIG_HP_ACCEL=m CONFIG_HP_WMI=m +CONFIG_HP_BIOSCFG=m CONFIG_WIRELESS_HOTKEY=m CONFIG_IBM_RTL=m CONFIG_IDEAPAD_LAPTOP=m @@ -9378,6 +9517,7 @@ CONFIG_INTEL_WMI_THUNDERBOLT=m # # Intel Uncore Frequency Control # +CONFIG_INTEL_UNCORE_FREQ_CONTROL_TPMI=m CONFIG_INTEL_UNCORE_FREQ_CONTROL=m # end of Intel Uncore Frequency Control @@ -9428,7 +9568,12 @@ CONFIG_INTEL_SCU_PCI=y CONFIG_INTEL_SCU_PLATFORM=m CONFIG_INTEL_SCU_IPC_UTIL=m CONFIG_SIEMENS_SIMATIC_IPC=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_APOLLOLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_ELKHARTLAKE=m +CONFIG_SIEMENS_SIMATIC_IPC_BATT_F7188X=m CONFIG_WINMATE_FM07_KEYS=m +CONFIG_SEL3350_PLATFORM=m CONFIG_P2SB=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -9737,6 +9882,7 @@ CONFIG_MAX11205=m CONFIG_MAX11410=m CONFIG_MAX1241=m CONFIG_MAX1363=m +CONFIG_MAX77541_ADC=m CONFIG_MAX9611=m CONFIG_MCP320X=m CONFIG_MCP3422=m @@ -9842,6 +9988,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m CONFIG_HID_SENSOR_IIO_TRIGGER=m # end of Hid Sensor IIO Common +CONFIG_IIO_INV_SENSORS_TIMESTAMP=m CONFIG_IIO_MS_SENSORS_I2C=m # @@ -9898,6 +10045,7 @@ CONFIG_MAX517=m CONFIG_MAX5522=m CONFIG_MAX5821=m CONFIG_MCP4725=m +CONFIG_MCP4728=m CONFIG_MCP4922=m CONFIG_TI_DAC082S085=m CONFIG_TI_DAC5571=m @@ -10060,6 +10208,7 @@ CONFIG_ISL29125=m CONFIG_HID_SENSOR_ALS=m CONFIG_HID_SENSOR_PROX=m CONFIG_JSA1212=m +CONFIG_ROHM_BU27008=m CONFIG_ROHM_BU27034=m CONFIG_RPR0521=m CONFIG_SENSORS_LM3533=m @@ -10070,6 +10219,7 @@ CONFIG_MAX44000=m CONFIG_MAX44009=m CONFIG_NOA1305=m CONFIG_OPT3001=m +CONFIG_OPT4001=m CONFIG_PA12203001=m CONFIG_SI1133=m CONFIG_SI1145=m @@ -10161,6 +10311,7 @@ CONFIG_MCP4131=m CONFIG_MCP4531=m CONFIG_MCP41010=m CONFIG_TPL0102=m +CONFIG_X9250=m # end of Digital potentiometers # @@ -10186,6 +10337,7 @@ CONFIG_MPL115=m CONFIG_MPL115_I2C=m CONFIG_MPL115_SPI=m CONFIG_MPL3115=m +CONFIG_MPRLS0025PA=m CONFIG_MS5611=m CONFIG_MS5611_I2C=m CONFIG_MS5611_SPI=m @@ -10210,6 +10362,7 @@ CONFIG_AS3935=m # Proximity and distance sensors # CONFIG_CROS_EC_MKBP_PROXIMITY=m +CONFIG_IRSD200=m CONFIG_ISL29501=m CONFIG_LIDAR_LITE_V2=m CONFIG_MB1232=m @@ -10321,6 +10474,7 @@ CONFIG_PHY_INTEL_LGM_EMMC=m CONFIG_POWERCAP=y CONFIG_INTEL_RAPL_CORE=m CONFIG_INTEL_RAPL=m +CONFIG_INTEL_RAPL_TPMI=m CONFIG_IDLE_INJECT=y CONFIG_MCB=m CONFIG_MCB_PCI=m @@ -10452,6 +10606,7 @@ CONFIG_HTE=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -10536,7 +10691,6 @@ CONFIG_QUOTA_TREE=m CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m CONFIG_QUOTACTL=y -CONFIG_AUTOFS4_FS=m CONFIG_AUTOFS_FS=m CONFIG_FUSE_FS=y CONFIG_CUSE=m @@ -10548,6 +10702,7 @@ CONFIG_OVERLAY_FS=m # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches @@ -10609,11 +10764,11 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set CONFIG_HUGETLBFS=y CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y # CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=m CONFIG_EFIVAR_FS=y @@ -10692,15 +10847,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 -CONFIG_PSTORE_DEFLATE_COMPRESS=m -# CONFIG_PSTORE_LZO_COMPRESS is not set -# CONFIG_PSTORE_LZ4_COMPRESS is not set -# CONFIG_PSTORE_LZ4HC_COMPRESS is not set -# CONFIG_PSTORE_842_COMPRESS is not set -# CONFIG_PSTORE_ZSTD_COMPRESS is not set CONFIG_PSTORE_COMPRESS=y -CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y -CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set # CONFIG_PSTORE_FTRACE is not set @@ -10758,8 +10905,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y @@ -10844,6 +10989,7 @@ CONFIG_NLS_MAC_INUIT=m CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=m +CONFIG_NLS_UCS2_UTILS=m CONFIG_DLM=m # CONFIG_DLM_DEBUG is not set # CONFIG_UNICODE is not set @@ -10871,7 +11017,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y CONFIG_INTEL_TXT=y CONFIG_LSM_MMAP_MIN_ADDR=0 -CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y # CONFIG_STATIC_USERMODEHELPER is not set @@ -10881,6 +11026,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +CONFIG_SECURITY_SELINUX_DEBUG=y CONFIG_SECURITY_SMACK=y # CONFIG_SECURITY_SMACK_BRINGUP is not set CONFIG_SECURITY_SMACK_NETFILTER=y @@ -10927,8 +11073,7 @@ CONFIG_IMA_APPRAISE=y # CONFIG_IMA_APPRAISE_BUILD_POLICY is not set CONFIG_IMA_APPRAISE_BOOTPARAM=y # CONFIG_IMA_APPRAISE_MODSIG is not set -CONFIG_IMA_TRUSTED_KEYRING=y -CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set # CONFIG_IMA_LOAD_X509 is not set CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y @@ -10949,16 +11094,16 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" # # Kernel hardening options # -CONFIG_GCC_PLUGIN_STRUCTLEAK=y # # Memory initialization # +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set +# CONFIG_INIT_STACK_ALL_PATTERN is not set +CONFIG_INIT_STACK_ALL_ZERO=y CONFIG_GCC_PLUGIN_STACKLEAK=y # CONFIG_GCC_PLUGIN_STACKLEAK_VERBOSE is not set CONFIG_STACKLEAK_TRACK_MIN_SIZE=100 @@ -10970,6 +11115,13 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y CONFIG_ZERO_CALL_USED_REGS=y # end of Memory initialization +# +# Hardening of kernel data structures +# +# CONFIG_LIST_HARDENED is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set @@ -10991,6 +11143,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y CONFIG_CRYPTO_HASH=y @@ -11084,6 +11237,7 @@ CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CCM=m CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GENIV=y CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ESSIV=m @@ -11105,7 +11259,7 @@ CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SHA3=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3_GENERIC=m CONFIG_CRYPTO_STREEBOG=m @@ -11145,6 +11299,7 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set CONFIG_CRYPTO_KDF800108_CTR=y # end of Random number generation @@ -11312,7 +11467,7 @@ CONFIG_CRC64=y # CONFIG_CRC4 is not set CONFIG_CRC7=m CONFIG_LIBCRC32C=m -CONFIG_CRC8=m +CONFIG_CRC8=y CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_842_COMPRESS=m @@ -11364,13 +11519,15 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HAS_DMA=y CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_FLAGS=y CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_CMA=y -CONFIG_DMA_PERNUMA_CMA=y +# CONFIG_DMA_NUMA_CMA is not set # # Default contiguous memory area size: @@ -11576,14 +11733,20 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_LOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y +CONFIG_HARDLOCKUP_DETECTOR=y +# CONFIG_HARDLOCKUP_DETECTOR_PREFER_BUDDY is not set CONFIG_HARDLOCKUP_DETECTOR_PERF=y +# CONFIG_HARDLOCKUP_DETECTOR_BUDDY is not set +# CONFIG_HARDLOCKUP_DETECTOR_ARCH is not set +CONFIG_HARDLOCKUP_DETECTOR_COUNTS_HRTIMER=y CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y -CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT is not set # CONFIG_TEST_LOCKUP is not set # end of Debug Oops, Lockups and Hangs @@ -11631,7 +11794,6 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures @@ -11661,6 +11823,7 @@ CONFIG_HAVE_RETHOOK=y CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y @@ -11686,6 +11849,7 @@ CONFIG_FTRACE=y # CONFIG_BOOTTIME_TRACING is not set CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y +# CONFIG_FUNCTION_GRAPH_RETVAL is not set CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y @@ -11706,6 +11870,7 @@ CONFIG_TRACER_SNAPSHOT=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_FPROBE_EVENTS=y CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y diff --git a/gnu/packages/avr-xyz.scm b/gnu/packages/avr-xyz.scm index e8844b8d43..e0db2e3a0c 100644 --- a/gnu/packages/avr-xyz.scm +++ b/gnu/packages/avr-xyz.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages avr) + #:use-module (gnu packages documentation) #:use-module (gnu packages elf) #:use-module (gnu packages gl) #:use-module (gnu packages pkg-config) @@ -95,3 +97,84 @@ directly, and there is even a way to specify simulation parameterps directly in the emulated code using an @code{.elf} section. You can also load multipart HEX files.") (license license:gpl3))) + +(define-public lufa + (package + (name "lufa") + (version "210130") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abcminiuser/lufa") + (commit (string-append "LUFA-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g")))) + (outputs '("bootloaders" "demos" "projects" "doc")) + (build-system gnu-build-system) + (arguments + ;; There are tests, but even LUFA's own CI doesn't run them (they are + ;; only built). + (list + #:tests? #f + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 match) + (srfi srfi-26)) + #:make-flags + #~(list (string-append "SHELL="(search-input-file %build-inputs + "bin/sh"))) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'build-documentation + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-j" (number->string + (or (parallel-job-count) + 1)) + "doxygen" + ;; Ignore errors (see: + ;; https://github.com/abcminiuser/lufa/issues/90). + "-i" + make-flags))) + (replace 'install + ;; There is no default install target as the library is + ;; intended to be integrated in source form in a + ;; project. Install the example projects and demos + ;; binaries as well as the documentation. + (lambda _ + (let ((doc (string-append #$output:doc + "/share/doc/lufa/")) + (html-dirs (find-files "." "^html$" + #:directories? #t))) + (for-each (cut install-file <> #$output:bootloaders) + (find-files "Bootloaders" "\\.hex$")) + (for-each (cut install-file <> #$output:demos) + (find-files "Demos" "\\.hex$")) + (for-each (cut install-file <> #$output:projects) + (find-files "Projects" "\\.hex$")) + ;; Install Doxygen generated HTML documentation. + (for-each + (lambda (html) + (let* ((suffix "Documentation/html") + (l (string-length suffix)) + (dest (string-append + doc + (string-drop + (if (string-suffix? suffix html) + (string-drop-right html l) + (error "unexpected path" html)) + 1)))) ;drop leading "." + (mkdir-p dest) + (copy-recursively html dest))) + html-dirs))))))) + (native-inputs (list doxygen (make-avr-toolchain))) + (home-page "https://www.lufa-lib.org/") + (synopsis "Lightweight USB Framework for AVRs") + (description "UFA is a simple to use, lightweight framework which sits +atop the hardware USB controller in specific AVR microcontroller models, and +allows for the quick and easy creation of complex USB devices and hosts. This +package contains the user-submitted projects and bootloaders for use with +compatible microcontroller models, as well as the demos and the +documentation.") + (license license:expat))) ;see LUFA/License.txt diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index bc583ddff3..a66abbbd3a 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,115 +59,122 @@ (inherit (cross-binutils "avr")) (name "avr-binutils")))) -(define make-avr-gcc - (mlambda () - (let ((xgcc (cross-gcc "avr" #:xbinutils (make-avr-binutils)))) - (package - (inherit xgcc) - (name "avr-gcc") - (arguments - (substitute-keyword-arguments (package-arguments xgcc) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default compiler from CPLUS_INCLUDE_PATH - ;; to prevent header conflict with the GCC from - ;; native-inputs. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:)) - ":")) - (format #t - "environment variable `CPLUS_INCLUDE_PATH' \ +(define* (make-avr-gcc/implementation #:key (xgcc gcc)) + "Return a XGCC-base cross-compiler for the AVR target." + (let ((xgcc (cross-gcc "avr" #:xgcc xgcc #:xbinutils (make-avr-binutils)))) + (package + (inherit xgcc) + (name "avr-gcc") + (arguments + (substitute-keyword-arguments (package-arguments xgcc) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default compiler from CPLUS_INCLUDE_PATH + ;; to prevent header conflict with the GCC from + ;; native-inputs. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' \ changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH"))))) - ;; Without a working multilib build, the resulting GCC lacks - ;; support for nearly every AVR chip. - (add-after 'unpack 'fix-genmultilib - (lambda _ - ;; patch-shebang doesn't work here because there are - ;; actually several scripts inside this script, each with - ;; a #!/bin/sh that needs patching. - (substitute* "gcc/genmultilib" - (("#!/bin/sh") (string-append "#!" (which "sh")))))))) - ((#:configure-flags flags) - #~(delete "--disable-multilib" #$flags)))) - (native-search-paths - (list (search-path-specification - (variable "CROSS_C_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_OBJC_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_OBJCPLUS_INCLUDE_PATH") - (files '("avr/include"))) - (search-path-specification - (variable "CROSS_LIBRARY_PATH") - (files '("avr/lib"))))) - (native-inputs - `(("gcc" ,gcc) - ,@(package-native-inputs xgcc))))))) + (getenv "CPLUS_INCLUDE_PATH"))))) + ;; Without a working multilib build, the resulting GCC lacks + ;; support for nearly every AVR chip. + (add-after 'unpack 'fix-genmultilib + (lambda _ + ;; patch-shebang doesn't work here because there are + ;; actually several scripts inside this script, each with + ;; a #!/bin/sh that needs patching. + (substitute* "gcc/genmultilib" + (("#!/bin/sh") (string-append "#!" (which "sh")))))))) + ((#:configure-flags flags) + #~(delete "--disable-multilib" #$flags)))) + (native-search-paths + (list (search-path-specification + (variable "CROSS_C_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJC_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJCPLUS_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_LIBRARY_PATH") + (files '("avr/lib"))))) + (native-inputs + `(("gcc" ,gcc) + ,@(package-native-inputs xgcc)))))) + +(define make-avr-gcc + (memoize make-avr-gcc/implementation)) + +(define* (make-avr-libc/implementation #:key (xgcc gcc)) + (package + (name "avr-libc") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah//avr-libc/avr-libc-" + version ".tar.bz2")) + (sha256 + (base32 + "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj")))) + (build-system gnu-build-system) + (arguments + '(#:out-of-source? #t + #:configure-flags '("--host=avr"))) + (native-inputs `(("avr-binutils" ,(make-avr-binutils)) + ("avr-gcc" ,(make-avr-gcc #:xgcc xgcc)))) + (home-page "https://www.nongnu.org/avr-libc/") + (synopsis "The AVR C Library") + (description + "AVR Libc is a project whose goal is to provide a high quality C library +for use with GCC on Atmel AVR microcontrollers.") + (license + (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt")))) (define make-avr-libc - (mlambda () - (package - (name "avr-libc") - (version "2.0.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://savannah//avr-libc/avr-libc-" - version ".tar.bz2")) - (sha256 - (base32 - "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj")))) - (build-system gnu-build-system) - (arguments - '(#:out-of-source? #t - #:configure-flags '("--host=avr"))) - (native-inputs `(("avr-binutils" ,(make-avr-binutils)) - ("avr-gcc" ,(make-avr-gcc)))) - (home-page "https://www.nongnu.org/avr-libc/") - (synopsis "The AVR C Library") - (description - "AVR Libc is a project whose goal is to provide a high quality C -library for use with GCC on Atmel AVR microcontrollers.") - (license - (license:non-copyleft "http://www.nongnu.org/avr-libc/LICENSE.txt"))))) + (memoize make-avr-libc/implementation)) -(define make-avr-toolchain - (mlambda () - (let ((avr-binutils (make-avr-binutils)) - (avr-libc (make-avr-libc)) - (avr-gcc (make-avr-gcc))) - ;; avr-libc checks the compiler version and passes "--enable-device-lib" - ;; for avr-gcc > 5.1.0. It wouldn't install the library for atmega32u4 - ;; etc if we didn't use the corret avr-gcc. - (package - (name "avr-toolchain") - (version (package-version avr-gcc)) - (source #f) - (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (propagated-inputs - `(("avrdude" ,avrdude) - ("binutils" ,avr-binutils) - ("gcc" ,avr-gcc) - ("libc" ,avr-libc))) - (synopsis "Complete GCC tool chain for AVR microcontroller development") - (description "This package provides a complete GCC tool chain for AVR +(define* (make-avr-toolchain/implementation #:key (xgcc gcc)) + (let ((avr-binutils (make-avr-binutils)) + (avr-libc (make-avr-libc #:xgcc xgcc)) + (avr-gcc (make-avr-gcc #:xgcc xgcc))) + ;; avr-libc checks the compiler version and passes "--enable-device-lib" + ;; for avr-gcc > 5.1.0. It wouldn't install the library for atmega32u4 + ;; etc if we didn't use the corret avr-gcc. + (package + (name "avr-toolchain") + (version (package-version avr-gcc)) + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (propagated-inputs + `(("avrdude" ,avrdude) + ("binutils" ,avr-binutils) + ("gcc" ,avr-gcc) + ("libc" ,avr-libc))) + (synopsis "Complete GCC tool chain for AVR microcontroller development") + (description "This package provides a complete GCC tool chain for AVR microcontroller development. This includes the GCC AVR cross compiler and avrdude for firmware flashing. The supported programming languages are C and C++.") - (home-page (package-home-page avr-libc)) - (license (package-license avr-gcc)))))) + (home-page (package-home-page avr-libc)) + (license (package-license avr-gcc))))) + +(define make-avr-toolchain + (memoize make-avr-toolchain/implementation)) (define-public microscheme (package diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 23f34a0a36..394c4ea628 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -105,34 +105,32 @@ (define-public duplicity (package (name "duplicity") - (version "0.8.21") + (version "2.1.4") (source (origin - (method url-fetch) - (uri (string-append "https://code.launchpad.net/duplicity/" - (version-major+minor version) - "-series/" version "/+download/duplicity-" - version ".tar.gz")) - (sha256 - (base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/duplicity/duplicity") + (commit (string-append "rel." version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14x5brpq1l400i9l2hnyqmbn19cc1hnbmj5fn8cs8zzwzbgrfxng")))) (build-system python-build-system) (native-inputs - `(("gettext" ,gettext-minimal) ; for msgfmt - ("util-linux" ,util-linux) ; setsid command, for the tests - ("par2cmdline" ,par2cmdline) - ("python-fasteners" ,python-fasteners) - ("python-future" ,python-future) ; for tests - ("python-paramiko" ,python-paramiko) - ("python-pexpect" ,python-pexpect) - ("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner) - ("python-setuptools-scm" ,python-setuptools-scm) - ("tzdata" ,tzdata-for-tests) - ("mock" ,python-mock))) + (list gettext-minimal ; for msgfmt + util-linux ; setsid command, for the tests + par2cmdline + python-fasteners + python-future ; for tests + python-paramiko + python-pexpect + python-pytest + python-pytest-runner + python-setuptools-scm + tzdata-for-tests + python-mock)) (propagated-inputs - `(("lockfile" ,python-lockfile) - ("pygobject" ,python-pygobject) - ("urllib3" ,python-urllib3))) + (list python-lockfile python-pygobject python-urllib3)) (inputs (list dbus ; dbus-launch (Gio backend) librsync @@ -140,30 +138,41 @@ gnupg ; gpg executable needed util-linux)) ; for setsid (arguments - `(#:test-target "test" - #:phases - (modify-phases %standard-phases - (add-before 'build 'use-store-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "duplicity/gpginterface.py" - (("self.call = u'gpg'") - (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) - (substitute* "duplicity/backends/giobackend.py" - (("subprocess.Popen\\(\\[u'dbus-launch'\\]") - (string-append "subprocess.Popen([u'" - (assoc-ref inputs "dbus") - "/bin/dbus-launch']"))) - (substitute* '("testing/functional/__init__.py" - "testing/overrides/bin/lftp") - (("/bin/sh") (which "sh"))))) - (add-before 'check 'set-up-tests - (lambda* (#:key inputs #:allow-other-keys) - (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME - (setenv "TZDIR" ; some timestamp checks need TZDIR - (search-input-directory inputs "share/zoneinfo")) - ;; Some things respect TMPDIR, others hard-code /tmp, and the - ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp")))))) + (list #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'use-store-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "duplicity/gpginterface.py" + (("self.call = u'gpg'") + (string-append "self.call = '" + (search-input-file inputs + "/bin/gpg") + "'"))) + (substitute* "duplicity/backends/giobackend.py" + (("subprocess.Popen\\(\\[u'dbus-launch'\\]") + (string-append "subprocess.Popen([u'" + (search-input-file inputs + "/bin/dbus-launch") "']"))) + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") + (("/bin/sh") + (which "sh"))))) + (add-before 'build 'fix-version + (lambda _ + (substitute* "duplicity/__init__.py" + (("\\$version") + #$(package-version this-package))))) + (add-before 'check 'set-up-tests + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" + (getcwd)) ; gpg needs to write to $HOME + (setenv "TZDIR" ; some timestamp checks need TZDIR + (search-input-directory inputs + "share/zoneinfo")) + ;; Some things respect TMPDIR, others hard-code /tmp, and the + ;; defaults don't match up, breaking test_restart. Fix it. + (setenv "TMPDIR" "/tmp")))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 311d598c8e..235ad7fecc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -77,6 +77,8 @@ #:use-module (srfi srfi-26) #:export (glibc libc-for-target + libc-locales-for-target + libc-utf8-locales-for-target make-ld-wrapper libiconv-if-needed %final-inputs)) @@ -1110,7 +1112,8 @@ with the Linux kernel.") (sha256 (base32 "0bpm1kfi09dxl4c6aanc5c9951fmf6ckkzay60cx7k37dcpp68si")) - (patches (search-patches "glibc-ldd-powerpc.patch" + (patches (search-patches "glibc-2.35-CVE-2023-4911.patch" + "glibc-ldd-powerpc.patch" "glibc-ldd-x86_64.patch" "glibc-dl-cache.patch" "glibc-versioned-locpath.patch" @@ -1560,6 +1563,11 @@ command.") (delete 'build))))) ; nothing to build (supported-systems %hurd-systems))) +(define-public glibc-utf8-locales/hurd + ;; Locales for the libc version used on GNU/Hurd. + (hidden-package + (make-glibc-utf8-locales glibc/hurd))) + (define* (libc-for-target #:optional (target (or (%current-target-system) (%current-system)))) @@ -1569,6 +1577,26 @@ command.") (_ glibc))) +(define-public glibc-locales/hurd + ;; Locales again; hide them because their 'supported-systems' field suggests + ;; they're Hurd-only, making them non-installable on GNU/Linux. + (hidden-package + (make-glibc-locales glibc/hurd))) + +(define* (libc-locales-for-target #:optional + (target (or (%current-target-system) + (%current-system)))) + (if (target-hurd? target) + glibc-locales/hurd + glibc-locales)) + +(define* (libc-utf8-locales-for-target #:optional + (target (or (%current-target-system) + (%current-system)))) + (if (target-hurd? target) + glibc-utf8-locales/hurd + glibc-utf8-locales)) + (define-public tzdata (package (name "tzdata") diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9f00548724..1f2d5eb0a7 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -79,14 +79,14 @@ (define-public fio (package (name "fio") - (version "3.35") + (version "3.36") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "0dvxv771hzb72zs995wsq3i1kryv8vfzkndd79i0w2v7ssxnldb3")))) + "0ppg2rn57diz2mvbbps4cjxd903zn380hdkdsrbzal4l513w32h0")))) (build-system gnu-build-system) (arguments (list #:modules @@ -137,7 +137,7 @@ is to write a job file matching the I/O load one wants to simulate.") (define-public intel-mpi-benchmarks/openmpi (package (name "intel-mpi-benchmarks") - (version "2019.6") + (version "2021.3") (source (origin (method git-fetch) (uri (git-reference @@ -146,7 +146,7 @@ is to write a job file matching the I/O load one wants to simulate.") (file-name (git-file-name name version)) (sha256 (base32 - "02hxbk9g9nl59bk5qcfl3djj7b58vsqys340m1xdbyqwcrbnahh9")) + "04kczch2hlfzbgk929vcxx480kc6raba8rbz246j7d26k1z1zh8h")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4213d133c0..7ff364ee55 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -37,10 +37,12 @@ #:use-module (guix git-download) #:use-module (guix build-system r) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bioinformatics) #:use-module (gnu packages boost) + #:use-module (gnu packages chemistry) #:use-module (gnu packages cran) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -66,6 +68,184 @@ ;;; Annotations +(define-public r-bsgenome-hsapiens-ucsc-hg38-masked + (package + (name "r-bsgenome-hsapiens-ucsc-hg38-masked") + (version "1.4.5") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BSgenome.Hsapiens.UCSC.hg38.masked" version + 'annotation)) + (sha256 + (base32 "0j71hdxqvvc0s8mc6jp6zk502mrf095qazj95yzzb4rm6sjvd20m")))) + (properties `((upstream-name . "BSgenome.Hsapiens.UCSC.hg38.masked"))) + (build-system r-build-system) + (propagated-inputs (list r-bsgenome r-bsgenome-hsapiens-ucsc-hg38 + r-genomeinfodb)) + (home-page + "https://bioconductor.org/packages/BSgenome.Hsapiens.UCSC.hg38.masked") + (synopsis + "Full masked genomic sequences for Homo sapiens (UCSC version hg38)") + (description + "This package provides the complete genome sequences for Homo sapiens as +provided by UCSC (genome hg38, based on assembly GRCh38.p14 since 2023/01/31). +The sequences are the same as in BSgenome.Hsapiens.UCSC.hg38, except that each +of them has the 4 following masks on top: + +@enumerate +@item the mask of assembly gaps (AGAPS mask); +@item the mask of intra-contig ambiguities (AMB mask); +@item the mask of repeats from @code{RepeatMasker} (RM mask); +@item the mask of repeats from Tandem Repeats Finder (TRF mask). +@end enumerate + +Only the AGAPS and AMB masks are \"active\" by default. The sequences are stored +in @code{MaskedDNAString} objects.") + (license license:artistic2.0))) + +(define-public r-hpo-db + (package + (name "r-hpo-db") + (version "0.99.2") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "HPO.db" version + 'annotation)) + (sha256 + (base32 "1brzrnafvyh76h8a663gk5lprhixxpi9xi65vwgxwf7jh6yw0was")))) + (properties `((upstream-name . "HPO.db"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'avoid-internet-access + (lambda* (#:key inputs #:allow-other-keys) + (let* ((cache (string-append #$output "/share/HPO.db/cache")) + (file (string-append cache "/118333"))) + (mkdir-p cache) + (copy-file #$(this-package-native-input "HPO.sqlite") file) + (substitute* "R/zzz.R" + (("ah <- suppressMessages\\(AnnotationHub\\(\\)\\)" m) + (string-append + "if (Sys.getenv(\"NIX_BUILD_TOP\") == \"\") { " m " };")) + (("dbfile <- ah.*" m) + (string-append + "if (Sys.getenv(\"NIX_BUILD_TOP\") != \"\") { dbfile <- \"" + file "\";} else { " m " }\n"))))))))) + (propagated-inputs + (list r-annotationdbi r-annotationhub r-biocfilecache r-dbi)) + (native-inputs + `(("r-knitr" ,r-knitr) + ("HPO.sqlite" + ,(origin + (method url-fetch) + (uri "https://annotationhub.bioconductor.org/fetch/118333") + (file-name "HPO.sqlite") + (sha256 + (base32 "1wwdwf27iil0p41183qgygh2ifphhmlljjkgjm2h8sr25qycf0md")))))) + (home-page "https://bioconductor.org/packages/HPO.db") + (synopsis + "Annotation maps describing the entire Human Phenotype Ontology") + (description + "Human Phenotype Ontology (HPO) was developed to create a consistent +description of gene products with disease perspectives, and is essential for +supporting functional genomics in disease context. Accurate disease +descriptions can discover new relationships between genes and disease, and new +functions for previous uncharacteried genes and alleles.") + (license license:artistic2.0))) + +(define-public r-mafh5-gnomad-v3-1-2-grch38 + (package + (name "r-mafh5-gnomad-v3-1-2-grch38") + (version "3.15.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MafH5.gnomAD.v3.1.2.GRCh38" version + 'annotation)) + (sha256 + (base32 "18hzw7f41ii16qpm3ch516b773900l1m1id5z6a763m01fg0mhiq")))) + (properties `((upstream-name . "MafH5.gnomAD.v3.1.2.GRCh38"))) + (build-system r-build-system) + (propagated-inputs (list r-bsgenome + r-genomeinfodb + r-genomicranges + r-genomicscores + r-hdf5array + r-iranges + r-rhdf5 + r-s4vectors)) + (home-page "https://bioconductor.org/packages/MafH5.gnomAD.v3.1.2.GRCh38") + (synopsis + "Minor allele frequency data from gnomAD version 3.1.2 for GRCh38") + (description + "This package is designed to store minor allele frequency data. +It retrieves this data from the Genome Aggregation Database +(@code{gnomAD} version 3.1.2) for the human genome version GRCh38.") + (license license:artistic2.0))) + +(define-public r-mpo-db + (package + (name "r-mpo-db") + (version "0.99.7") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MPO.db" version + 'annotation)) + (sha256 + (base32 "0x1rcikg189akbd71yh0p02482km9hry6i69s2srdf5mlgqficvl")))) + (properties `((upstream-name . "MPO.db"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'avoid-internet-access + (lambda* (#:key inputs #:allow-other-keys) + (let* ((cache (string-append #$output "/share/MPO.db/cache")) + (file (string-append cache "/118299"))) + (mkdir-p cache) + (copy-file #$(this-package-native-input "MPO.sqlite") file) + (substitute* "R/zzz.R" + (("ah <- suppressMessages\\(AnnotationHub\\(\\)\\)" m) + (string-append + "if (Sys.getenv(\"NIX_BUILD_TOP\") == \"\") { " m " };")) + (("dbfile <- ah.*" m) + (string-append + "if (Sys.getenv(\"NIX_BUILD_TOP\") != \"\") { dbfile <- \"" + file "\";} else { " m " }\n"))))))))) + (propagated-inputs + (list r-annotationdbi r-annotationhub r-biocfilecache r-dbi)) + (native-inputs + `(("r-knitr" ,r-knitr) + ("MPO.sqlite" + ,(origin + (method url-fetch) + (uri "https://annotationhub.bioconductor.org/fetch/118299") + (file-name "MPO.sqlite") + (sha256 + (base32 "12rf5dpnjrpw55bgnbn68dni2g0p87nvs9c7mamqk0ayafs61zl0")))))) + (home-page "https://github.com/YuLab-SMU/MPO.db") + (synopsis "set of annotation maps describing the Mouse Phenotype Ontology") + (description + "This is the human disease ontology R package HDO.db, which provides the +semantic relationship between human diseases. Relying on the DOSE and +GO@code{SemSim} packages, this package can carry out disease enrichment and +semantic similarity analyses. Many biological studies are achieved through +mouse models, and a large number of data indicate the association between +genotypes and phenotypes or diseases. The study of model organisms can be +transformed into useful knowledge about normal human biology and disease to +facilitate treatment and early screening for diseases. Organism-specific +genotype-phenotypic associations can be applied to cross-species phenotypic +studies to clarify previously unknown phenotypic connections in other species. +Using the same principle to diseases can identify genetic associations and +even help to identify disease associations that are not obvious.") + (license license:artistic2.0))) + (define-public r-org-eck12-eg-db (package (name "r-org-eck12-eg-db") @@ -363,6 +543,28 @@ Finder (TRF mask). Only the AGAPS and AMB masks are \"active\" by default.") as provided by UCSC (danRer11, May 2017) and stored in Biostrings objects.") (license license:artistic2.0))) +(define-public r-bsgenome-ecoli-ncbi-20080805 + (package + (name "r-bsgenome-ecoli-ncbi-20080805") + (version "1.3.1000") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BSgenome.Ecoli.NCBI.20080805" version + 'annotation)) + (sha256 + (base32 "1l7mjyys1kaq4mbia9jamyw6sd0ij1wypwxvwy8aksan3gcfnh27")))) + (properties `((upstream-name . "BSgenome.Ecoli.NCBI.20080805"))) + (build-system r-build-system) + (propagated-inputs (list r-bsgenome)) + (home-page + "https://bioconductor.org/packages/BSgenome.Ecoli.NCBI.20080805") + (synopsis "Escherichia coli full genomes") + (description + "This package provides Escherichia coli full genomes for several strains +as provided by NCBI on 2008/08/05 and stored in Biostrings objects.") + (license license:artistic2.0))) + (define-public r-bsgenome-hsapiens-1000genomes-hs37d5 (package (name "r-bsgenome-hsapiens-1000genomes-hs37d5") @@ -1431,6 +1633,26 @@ biscuiteer.") demonstrate functionalities of the @code{breakpointR} package.") (license license:expat))) +(define-public r-breastcancervdx + (package + (name "r-breastcancervdx") + (version "1.40.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "breastCancerVDX" version + 'experiment)) + (sha256 + (base32 "12r8zql30ssr0cxy8v1qawwsky54321c737ny19n2yrl7sm08gf0")))) + (properties `((upstream-name . "breastCancerVDX"))) + (build-system r-build-system) + (home-page "https://bioconductor.org/packages/breastCancerVDX") + (synopsis "Gene expression datasets") + (description + "This package is a collection of gene expression data from a breast +cancer study published in Wang et al. 2005 and Minn et al 2007.") + (license license:artistic2.0))) + (define-public r-celldex (package (name "r-celldex") @@ -1809,6 +2031,40 @@ LC-MSMS and MRM files from proteomics experiments; and PSI mzIdentML example files for various search engines.") (license license:gpl2+))) +(define-public r-msexperiment + (package + (name "r-msexperiment") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MsExperiment" version)) + (sha256 + (base32 "06m0i60zh3xjqmsz6dpp0il833xzdfj0fm6xbhl7kmicvfrcnyfg")))) + (properties `((upstream-name . "MsExperiment"))) + (build-system r-build-system) + (propagated-inputs (list r-iranges + r-protgenerics + r-qfeatures + r-s4vectors + r-spectra + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/RforMassSpectrometry/MsExperiment") + (synopsis "Infrastructure for Mass Spectrometry experiments") + (description + "This package provides infrastructure to store and manage all aspects +related to a complete proteomics or metabolomics mass spectrometry (MS) +experiment. The @code{MsExperiment} package provides light-weight and +flexible containers for MS experiments building on the new MS infrastructure +provided by the Spectra, QFeatures and related packages. Along with raw data +representations, links to original data files and sample annotations, +additional metadata or annotations can also be stored within the +@code{MsExperiment} container. To guarantee maximum flexibility only minimal +constraints are put on the type and content of the data within the +containers.") + (license license:artistic2.0))) + (define-public r-msigdb (package (name "r-msigdb") @@ -2103,13 +2359,13 @@ and @code{Sailfish}. Alevin example output is also included.") (define-public r-abarray (package (name "r-abarray") - (version "1.68.0") + (version "1.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ABarray" version)) (sha256 (base32 - "0vrsyx06acdkb3hq350zdnx3bqzz43grf1w8n0pmxlcr2dncchv9")))) + "0p9q2x6n6n1d4w2hfbhhj54qflc6rf1w1qm9p2zqv9fcrm3g153v")))) (properties `((upstream-name . "ABarray"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-multtest)) @@ -2129,13 +2385,13 @@ into folders according to the analysis settings used.") (define-public r-absseq (package (name "r-absseq") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ABSSeq" version)) (sha256 (base32 - "1my2slp88qpb15qidjd646hlslvn8brv6i553h21c4c76jzxzsiz")))) + "0y8j66yargvipwxg2ffcs62idk5q5r8vracfldbd1x5rgq7lf6nq")))) (properties `((upstream-name . "ABSSeq"))) (build-system r-build-system) (propagated-inputs (list r-limma r-locfit)) @@ -2158,13 +2414,13 @@ ranking by fold-change and visualization.") (define-public r-adacgh2 (package (name "r-adacgh2") - (version "2.40.0") + (version "2.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ADaCGH2" version)) (sha256 - (base32 "1mmckrxhv23kl3g4d3n4hfdm97sfg2k36khzy9i6d73g7c033hsv")))) + (base32 "0lzgn4zqckv37jsgd1azvshblb38khrlcncm98g74qhkswqj5wx3")))) (properties `((upstream-name . "ADaCGH2"))) (build-system r-build-system) (arguments @@ -2200,13 +2456,13 @@ storing data.") (define-public r-adam (package (name "r-adam") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ADAM" version)) (sha256 (base32 - "1hy7xdf6v2fqggvc9rdl90gn0l6vfbmvb23c61i8q45s3qsaxksp")))) + "0gz3mpkj1q4j7w08ylfzclpa6saxsz7wyp0cldllhxpcj9lxljs5")))) (properties `((upstream-name . "ADAM"))) (build-system r-build-system) (propagated-inputs (list r-dplyr @@ -2235,13 +2491,13 @@ functionally associated genes} (GFAG).") (define-public r-adamgui (package (name "r-adamgui") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ADAMgui" version)) (sha256 (base32 - "0jc0sbmmc98z75x73ns3qwcvklvx73wqla87cki8sls6ywa8w93j")))) + "10m5dplkzxsxm7dxcmybihv81yflm3f7q6fmgb1dvwr8lsn1dm03")))) (properties `((upstream-name . "ADAMgui"))) (build-system r-build-system) (propagated-inputs @@ -2283,13 +2539,13 @@ the @code{GFAGpathUi} function.") (define-public r-adimpute (package (name "r-adimpute") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ADImpute" version)) (sha256 (base32 - "0a3r4bkf6g28lgsq21077ag9ba6zrfv6yflawx9fg73zdx4266jp")))) + "0299yyin2j8577db2w6mrxmsq68cjlzwyh7z1wvhbj0n1p75r871")))) (properties `((upstream-name . "ADImpute"))) (build-system r-build-system) (propagated-inputs @@ -2332,13 +2588,13 @@ results from different methods into an ensemble.") (define-public r-adsplit (package (name "r-adsplit") - (version "1.70.0") + (version "1.72.0") (source (origin (method url-fetch) (uri (bioconductor-uri "adSplit" version)) (sha256 (base32 - "0nbdcrc2wiq3mkpayjslz66ik2vk3h3f18zg6df9xaivanxrkk5z")))) + "0av0kji4r788cn5808g13svqpydq6xk4d2awpzpsckz7xbjyx0ya")))) (properties `((upstream-name . "adSplit"))) (build-system r-build-system) (propagated-inputs @@ -2360,13 +2616,13 @@ the supporting gene set is determined.") (define-public r-affixcan (package (name "r-affixcan") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AffiXcan" version)) (sha256 (base32 - "0nf5dkidar6zp5rvpd7i19gdb7mnam9rmca3z3anxi0pdnalwc9d")))) + "1f508sz5vsmmmvp2mcyd2l4hislg2xhnn11xxva010l3i7by8c2r")))) (properties `((upstream-name . "AffiXcan"))) (build-system r-build-system) (propagated-inputs @@ -2388,13 +2644,13 @@ expression values are known.") (define-public r-affyilm (package (name "r-affyilm") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyILM" version)) (sha256 - (base32 "02g0bg21ms0gmq6dvdcj91b0p47ppqcfvgj73y0mbdx6prrmcagx")))) + (base32 "1sbgc787gvcnpjhm0hv80rsms679wlvphq2ch7s28zdlaa2vz7sv")))) (properties `((upstream-name . "affyILM"))) (build-system r-build-system) (propagated-inputs @@ -2415,13 +2671,13 @@ concentrations on behal of the Langmuir model.") (define-public r-affylmgui (package (name "r-affylmgui") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affylmGUI" version)) (sha256 - (base32 "1m1gvz313h4x080889b05fjq60wn57dxlgq03qkwy65scl3x2fcn")))) + (base32 "1431zmh9van9605lh0i96as48zih17s3cfhjw94v37rswfq09fkg")))) (properties `((upstream-name . "affylmGUI"))) (build-system r-build-system) (propagated-inputs @@ -2447,13 +2703,13 @@ limma packages.") (define-public r-affyplm (package (name "r-affyplm") - (version "1.76.1") + (version "1.78.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyPLM" version)) (sha256 - (base32 "1660nn4541f2k5qpzxkkkf9h92ndzqr0j1jpzh4czs466766kn8y")))) + (base32 "0l7rfwj1bdkk9vd5j0zby2ijpapmd5k0s6l84zy4ld47vabxyaa6")))) (properties `((upstream-name . "affyPLM"))) (build-system r-build-system) (inputs (list zlib)) @@ -2478,13 +2734,13 @@ also provided.") (define-public r-affyrnadegradation (package (name "r-affyrnadegradation") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AffyRNADegradation" version)) (sha256 (base32 - "14s3kvxcc3qj931bf5ya088flijmn5z89hps3di98kkdsl3w6d4g")))) + "0i7929cyqvbx81v1d629g53480m48cbdpxfv0k6lwjfzf4yvazhf")))) (properties `((upstream-name . "AffyRNADegradation"))) (build-system r-build-system) (propagated-inputs (list r-affy)) @@ -2503,13 +2759,13 @@ of samples that are affected by RNA degradation.") (define-public r-agdex (package (name "r-agdex") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AGDEX" version)) (sha256 (base32 - "0p9qmwhi4ik24m51cvgxnny4yfqv4v0rvra16bj5d3w9bw9yf3an")))) + "06z74p3khw3r8dnwrpyyikq3ifcdvffxgfwcic9j8vc9s8pf921s")))) (properties `((upstream-name . "AGDEX"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-gseabase)) @@ -2530,13 +2786,13 @@ experiment.") (define-public r-aggregatebiovar (package (name "r-aggregatebiovar") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "aggregateBioVar" version)) (sha256 (base32 - "0g7n6dj1scad833y2182946hn3yh4jad20wvw9ic8gmqb438vihj")))) + "1i04hhncz9lhjp730gyknd8v7zakz1whc2a5pw3pn37h8k9mq5la")))) (properties `((upstream-name . "aggregateBioVar"))) (build-system r-build-system) (propagated-inputs @@ -2564,13 +2820,13 @@ bulk RNA-seq tools.") (define-public r-agilp (package (name "r-agilp") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "agilp" version)) (sha256 (base32 - "0rm646iqc8hf8vfk0pdg064hm9k4k371bp1q4k7z2l16zhs8a07r")))) + "0xbbcmnbnj7y3a1wndv6zhqhrwdpdj6207wh4n0qz794akciw84a")))) (properties `((upstream-name . "agilp"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/agilp") @@ -2586,13 +2842,13 @@ but which also provides utilities which may be useful for other platforms.") (define-public r-adductomicsr (package (name "r-adductomicsr") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "adductomicsR" version)) (sha256 (base32 - "17cm65n2awbwmk5i8h1n30abk6pww42ngcy9m24dxz1qdbnvx5fn")))) + "0fb670gxzl5aq6vmb5d2l04r0408gxrqs06k1a3b3pzkdbd7qxwm")))) (properties `((upstream-name . "adductomicsR"))) (build-system r-build-system) (propagated-inputs @@ -2661,13 +2917,13 @@ objects are used so that other packages could be used as well.") (define-public r-aims (package (name "r-aims") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AIMS" version)) (sha256 (base32 - "1mbwv70ypkb3x086css94m89wq9pqzd23i7nar1844vbqpw3j83q")))) + "0fmzyd8vypcfadqfa8w11mxr12h4a9shgiqpi2n2y150fvhlqf6c")))) (properties `((upstream-name . "AIMS"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-e1071)) @@ -2685,13 +2941,13 @@ well as on dataset of gene expression data.") (define-public r-airpart (package (name "r-airpart") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "airpart" version)) (sha256 (base32 - "024vcxf23irlysc8srqii3zqhhldpwdcj0i4zzhz18x3bdy9cbj0")))) + "1bdlg078nlpibbn3y1cbkglhlm440crx3alzhv9k0psv6arg2kqb")))) (properties `((upstream-name . "airpart"))) (build-system r-build-system) (propagated-inputs @@ -2732,13 +2988,13 @@ datasets.") (define-public r-amountain (package (name "r-amountain") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AMOUNTAIN" version)) (sha256 (base32 - "12ml67882lscv05np4m80fg9d48dwkaa6kx5cga6x19kdx6xs2cj")))) + "1c65vn2k3hzzymik9ia7nk32sf0hr83q27yzf561a1hgv3m67d65")))) (properties `((upstream-name . "AMOUNTAIN"))) (build-system r-build-system) (inputs (list gsl)) @@ -2756,13 +3012,13 @@ in multi-layer WGCN using a continuous optimization approach.") (define-public r-amplican (package (name "r-amplican") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "amplican" version)) (sha256 (base32 - "1bws4awpjvswzj53zwn9x5ra76ngpqn2h8hlr6y0x7j9wwwqldc7")))) + "0xsw6226yyyl5zgmcyfim6dxj04zrpzbd1288l0hysq1s3b1yslw")))) (properties `((upstream-name . "amplican"))) (build-system r-build-system) (propagated-inputs @@ -2803,13 +3059,13 @@ problems.") (define-public r-amaretto (package (name "r-amaretto") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AMARETTO" version)) (sha256 (base32 - "1yp2npw9mdjy0wchbp0y1r1ifyy63hdz2y3y8cia9c76nfv4627f")))) + "1h0ci2sak2x5dhcshmgk4hy53ggjvrz3kaj61m47w5fjkj0lz79s")))) (properties `((upstream-name . "AMARETTO"))) (build-system r-build-system) (propagated-inputs @@ -2855,13 +3111,13 @@ canonical cancer pathways.") (define-public r-anaquin (package (name "r-anaquin") - (version "2.24.0") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Anaquin" version)) (sha256 (base32 - "0f2xc0pm7ld72fnmqirr0q2a5xfh12cag6s2yysblslh9ajyzcmw")))) + "1f2xf1i9l1s7433mvqjsralpm77qg0m73dw1rq9jsxbpk1f502ld")))) (properties `((upstream-name . "Anaquin"))) (build-system r-build-system) (propagated-inputs @@ -2885,13 +3141,13 @@ analysis, modelling, and visualization of spike-in controls.") (define-public r-ancombc (package (name "r-ancombc") - (version "2.2.2") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ANCOMBC" version)) (sha256 (base32 - "0jws3wqgwc0gnp7smc0lsqfw9jbcik36pl7vz9a8ndgwpp9c8653")))) + "1m63k1b9xh5mv4zb5m9nlrdcqkh2h477x1zyfk8j89idcvk9jil7")))) (properties `((upstream-name . "ANCOMBC"))) (build-system r-build-system) (propagated-inputs @@ -2993,13 +3249,13 @@ to understand their data better and discover new insights.") (define-public r-annotationhubdata (package (name "r-annotationhubdata") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHubData" version)) (sha256 - (base32 "109gi5cs82j135q00wg9dfx0z5m9bs1kc7s246ym13ik43z0h3qq")))) + (base32 "0jkz65z7l9vaxid6vpsr4rdavarkayfrgkybzhwf9va82jsnkd3z")))) (properties `((upstream-name . "AnnotationHubData"))) (build-system r-build-system) (arguments @@ -3044,13 +3300,13 @@ for use in Bioconductor’s AnnotationHub.") (define-public r-anvil (package (name "r-anvil") - (version "1.12.4") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnVIL" version)) (sha256 (base32 - "05wgrr16vaqb7982j7nyri6rrhx90ljgxc37afhw190wc5dj07n0")))) + "0syd1m992i2xqw2djw6s07zwwvrzvd0aksix1cbhx9plpswd2245")))) (properties `((upstream-name . "AnVIL"))) (build-system r-build-system) (propagated-inputs @@ -3085,19 +3341,22 @@ to transform JSON responses to formats more amenable to manipulation in R.") (define-public r-aldex2 (package (name "r-aldex2") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ALDEx2" version)) (sha256 (base32 - "0gdkc8qwx3vpk5i09znlfrag7gk87piz61z90k96v6bm6x8sclb8")))) + "0wchlw9dprw7vkw26h26ypx06xv2j0cxbidw61pcqaxmrrh14dhz")))) (properties `((upstream-name . "ALDEx2"))) (build-system r-build-system) (propagated-inputs (list r-biocparallel + r-directlabels r-genomicranges r-iranges + r-lattice + r-latticeextra r-multtest r-rfast r-s4vectors @@ -3126,13 +3385,13 @@ paired or unpaired study designs.") (define-public r-alevinqc (package (name "r-alevinqc") - (version "1.16.1") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "alevinQC" version)) (sha256 (base32 - "137bvqyh1cqmhf9x3xl6n1dv0380lpcr2nxhd60b7zqiw4p14i5a")))) + "0lhbh9xgkbrad9fqvxl4c6y0f2kgibn6sinp8znysk5m9z0ngpwp")))) (properties `((upstream-name . "alevinQC"))) (build-system r-build-system) (propagated-inputs @@ -3160,13 +3419,13 @@ generated as HTML or PDF files, or as Shiny applications.") (define-public r-alphabeta (package (name "r-alphabeta") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AlphaBeta" version)) (sha256 (base32 - "11431d453xszzjyxr10npnblhlrfw8hl5jgabpxla7cj77w02wnr")))) + "0zja8mysw0ljkvk6vqdx4c9wpf45zs64iyazh90mlf6xhbrvqfvq")))) (properties `((upstream-name . "AlphaBeta"))) (build-system r-build-system) (propagated-inputs @@ -3240,13 +3499,13 @@ data.") (define-public r-alpsnmr (package (name "r-alpsnmr") - (version "4.2.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AlpsNMR" version)) (sha256 (base32 - "0rp82y7163pjbl7n6fyywh4l0sgzn1z8kp83v0kg7xk3810mj9sm")))) + "0141kayx20mm8skqr2210bpl76ra560ik7gf71iar03r3izcfczq")))) (properties `((upstream-name . "AlpsNMR"))) (build-system r-build-system) (propagated-inputs @@ -3294,13 +3553,13 @@ data. Efficient plotting with 1-D data is also available. Basic reading of (define-public r-altcdfenvs (package (name "r-altcdfenvs") - (version "2.62.0") + (version "2.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "altcdfenvs" version)) (sha256 (base32 - "1jpimj195rdw86pp623ylrmcxkxmn8qmc84vsw9prnf3gdz3q18b")))) + "17kgiqa5dbfp74jrm565wlx9sj4ydbds2y8ahs7dikvdvm725qsn")))) (properties `((upstream-name . "altcdfenvs"))) (build-system r-build-system) (propagated-inputs @@ -3325,37 +3584,37 @@ create an alternative mapping from sequences.") (define-public r-aneufinder (package (name "r-aneufinder") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AneuFinder" version)) (sha256 (base32 - "1l33yb20pynkvlla1dmgbwjhnhxh067fci0ciryxmbzqwq2sn1kc")))) + "0x7v60j1c1g12qlqxgshpmbnwzjbmlnkrfh60wl43inr0wyllq1l")))) (build-system r-build-system) (native-inputs (list r-knitr)) (propagated-inputs - (list r-genomicranges - r-aneufinderdata + (list r-aneufinderdata + r-bamsignals + r-biocgenerics + r-biostrings + r-cowplot + r-dnacopy + r-doparallel r-ecp r-foreach - r-doparallel - r-biocgenerics - r-s4vectors r-genomeinfodb - r-iranges - r-rsamtools - r-bamsignals - r-dnacopy - r-biostrings r-genomicalignments - r-ggplot2 - r-reshape2 + r-genomicranges r-ggdendro + r-ggplot2 r-ggrepel + r-iranges r-mclust - r-cowplot)) + r-reshape2 + r-rsamtools + r-s4vectors)) (home-page "https://bioconductor.org/packages/AneuFinder/") (synopsis "Copy number variation analysis in single-cell-sequencing data") (description "This package implements functions for copy number variant @@ -3394,13 +3653,13 @@ network fusion.") (define-public r-annmap (package (name "r-annmap") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annmap" version)) (sha256 (base32 - "0gilb8yxba1cqi678w9xkq77m8lf3k8dqcldh68cll61xsgihl1v")))) + "1gf0qdhj4ijgb6b67fh94zx084k5r87la3d7vc0qxs413rvr4mj8")))) (properties `((upstream-name . "annmap"))) (build-system r-build-system) (propagated-inputs @@ -3428,13 +3687,13 @@ Functions to plot gene architecture and BAM file data are also provided.") (define-public r-antiprofiles (package (name "r-antiprofiles") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "antiProfiles" version)) (sha256 (base32 - "0ix0r36fs6vr0gyryi1j15pcc0hvpynsg9505w95dsn3p4fdnhg8")))) + "14lzyq08gnm9r99xwaqh50sz0dwzhmiyyylkg239dlbw80zmv404")))) (properties `((upstream-name . "antiProfiles"))) (build-system r-build-system) (propagated-inputs @@ -3454,13 +3713,13 @@ tumor samples from healthy controls.") (define-public r-arrayexpress (package (name "r-arrayexpress") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ArrayExpress" version)) (sha256 (base32 - "1ib33fw379sakk084csa3pwcc3wvba38ily6mmv2ax1wh16i0pfz")))) + "0cnb6r6rqbz5qph32aa1mghr0w2rhl6znyiblj0cbkv45mx2k4jr")))) (properties `((upstream-name . "ArrayExpress"))) (build-system r-build-system) (propagated-inputs @@ -3481,13 +3740,13 @@ structures: @code{ExpressionSet}, @code{AffyBatch}, @code{NChannelSet}.") (define-public r-arrayqualitymetrics (package (name "r-arrayqualitymetrics") - (version "3.56.0") + (version "3.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "arrayQualityMetrics" version)) (sha256 (base32 - "06plgmgla7hvryqfcid4y35s24r50s39d9f8sjchwbxqciwy72wj")))) + "1k80ih7r3hf48r9rp9dl2wl8m17620dqr4fch49kdsq97hm5q5dm")))) (properties `((upstream-name . "arrayQualityMetrics"))) (build-system r-build-system) (propagated-inputs (list r-affy @@ -3519,13 +3778,13 @@ supported.") (define-public r-arraymvout (package (name "r-arraymvout") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "arrayMvout" version)) (sha256 - (base32 "1wdqcfa0h070lky4m2h5k4wg8lg7014y0gk95gip5zags29zjwqb")))) + (base32 "0z3ksx0yigan5aiq7vsdx78khlrcdxa4yd5b46rfn83gsrjbxzhz")))) (properties `((upstream-name . "arrayMvout"))) (build-system r-build-system) (arguments @@ -3555,13 +3814,13 @@ fixed Type I error rate.") (define-public r-arrayquality (package (name "r-arrayquality") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "arrayQuality" version)) (sha256 - (base32 "0lq59y4pi13z4v1i1ah78xlchxy34x1lplsh0n42wlk88rk0rqxd")))) + (base32 "1bm46zf5c1i7fd848bqajv3agl05b93xsvam7034033ypyx6bf1z")))) (properties `((upstream-name . "arrayQuality"))) (build-system r-build-system) (propagated-inputs @@ -3580,13 +3839,13 @@ quality assessment.") (define-public r-asafe (package (name "r-asafe") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASAFE" version)) (sha256 (base32 - "05xw42552x7by63psb05hvjraax66flg94i331ca61zx107q7fai")))) + "13pn2s59npp8lhc2sk9sa7dq8fy6jlq22c71n3rcjgxrrh690nb8")))) (properties `((upstream-name . "ASAFE"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -3603,13 +3862,13 @@ pairs.") (define-public r-aseb (package (name "r-aseb") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASEB" version)) (sha256 (base32 - "1dq6b5rg9iw6hdjmd7g0w64z7cxm52yg1cjyv355qs064dx26nph")))) + "1hiapxdbp1fg6wk62s31nkv9mkxzvd23hn3zhmf9n0nvqfhi7bdf")))) (properties `((upstream-name . "ASEB"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/ASEB") @@ -3630,13 +3889,13 @@ RNAs.") (define-public r-asgsca (package (name "r-asgsca") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASGSCA" version)) (sha256 (base32 - "0vb37rvrb08qvv0i2k9jnqpajzpj044ww05w3kq1kypbby0c84zs")))) + "13nk19rccrp0xl1s5gjwydpl1ayc7zc2izjrij9iz7fh2r79gn7f")))) (properties `((upstream-name . "ASGSCA"))) (build-system r-build-system) (propagated-inputs (list r-mass r-matrix)) @@ -3653,13 +3912,13 @@ model as latent variables.") (define-public r-asics (package (name "r-asics") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASICS" version)) (sha256 (base32 - "0svl9wnfn9z88j1yyl30b1f3d14h01x4cga8q04x530723xnjws7")))) + "10wlmnlpn6ji256fp81rhsm2rsbsqsbvbjqqpw9vib11cwpam9wd")))) (properties `((upstream-name . "ASICS"))) (build-system r-build-system) (propagated-inputs @@ -3687,13 +3946,13 @@ the spectra of the library with a sparse penalty.") (define-public r-aspli (package (name "r-aspli") - (version "2.10.0") + (version "2.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASpli" version)) (sha256 (base32 - "0462hf7anpmmqq4585kmjilw1q229r38lijbxq8xg0f3m8xvr1ga")))) + "0rj103vvff2c20r018491i71393x0idq22ri4zg3qibx2accd7jy")))) (properties `((upstream-name . "ASpli"))) (build-system r-build-system) (propagated-inputs @@ -3735,13 +3994,13 @@ that might arise in splicing patterns.") (define-public r-assessorf (package (name "r-assessorf") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AssessORF" version)) (sha256 (base32 - "16nv6sh7z3l6ff3a7zrixkc04mhrak38q045xlirgljkcragz1c5")))) + "0v64d3nmvcj6bz8zplyqzslm7kz6j3y0nl316h76g094hify64lk")))) (properties `((upstream-name . "AssessORF"))) (build-system r-build-system) (propagated-inputs @@ -3764,13 +4023,13 @@ start codons as the forms of evidence.") (define-public r-asset (package (name "r-asset") - (version "2.18.0") + (version "2.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ASSET" version)) (sha256 (base32 - "1vksbfd4wd2xcc0nl3wp53vm0jyqy97p0hqps2aml04745vkg023")))) + "0mm15i59vsnz8zh2d10xnab3a6kq08hwd3pzm3r12g4wcrdsxfxc")))) (properties `((upstream-name . "ASSET"))) (build-system r-build-system) (propagated-inputs (list r-mass r-msm r-rmeta)) @@ -3791,13 +4050,13 @@ variant.") (define-public r-atena (package (name "r-atena") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "atena" version)) (sha256 (base32 - "1057mkxrjfnqhb1mydhd7vlb1s8h7n4zc4cl063gw4sgj6mw99ij")))) + "1qfgy76d65hbx32fw1yf20n1vavylcafb9fgqqp02r455vk3xzng")))) (properties `((upstream-name . "atena"))) (build-system r-build-system) (propagated-inputs @@ -3832,13 +4091,13 @@ transcripts in an integrated manner.") (define-public r-atsnp (package (name "r-atsnp") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "atSNP" version)) (sha256 (base32 - "14j8lbry4wpn8izch1nra5npg4qsh49ql4bf21jvvr3gl3qa1g7l")))) + "1nksx6al1cr6apknvrabi3gdbr7m61ms81nmkq4qykx5aysmp8mv")))) (properties `((upstream-name . "atSNP"))) (build-system r-build-system) (propagated-inputs @@ -3865,13 +4124,13 @@ SNP-led changes in motif matches.") (define-public r-attract (package (name "r-attract") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "attract" version)) (sha256 (base32 - "1lb6npxm5f82z8278v6fh7k5w8d4z73881iplm3ashc27wiw6sz3")))) + "0lk8gfbccrxly7gn629497sxz0mj3m9wcwdahqv1m7l6fjnf5563")))) (properties `((upstream-name . "attract"))) (build-system r-build-system) (propagated-inputs @@ -3896,13 +4155,13 @@ transcriptionally-coordinated changes in gene expression.") (define-public r-awfisher (package (name "r-awfisher") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AWFisher" version)) (sha256 (base32 - "1c6rr1z1rhvn8w1kb3nnjlfacfr22vwm1rsa1xqm2hmghs01bq4x")))) + "10c5qi040z2w46k7qdcd2yap11mzllllrbr0nx7gd9gfzwlx089s")))) (properties `((upstream-name . "AWFisher"))) (build-system r-build-system) (propagated-inputs @@ -3920,13 +4179,13 @@ meta-pattern.") (define-public r-awst (package (name "r-awst") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "awst" version)) (sha256 (base32 - "0nwpfxfrx9rw4vl02vr311ivmmk96ajlwyhwms642hjv74j2yiji")))) + "0hry7ynv69hqbwyhlsilf1f9w8yadidbn2ckm5dx9mnb5ihgkyvj")))) (properties `((upstream-name . "awst"))) (build-system r-build-system) (propagated-inputs (list r-summarizedexperiment)) @@ -3947,13 +4206,13 @@ artifacts.") (define-public r-baalchip (package (name "r-baalchip") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BaalChIP" version)) (sha256 (base32 - "0bp8p7cn59iv08cf4yw9xl1f83dcr6v1kqvggxjals8y4gmls9nz")))) + "0d08mp12lw4qdy7w7i474ywcy2zgv940nc44w0gbb9h9dfl22crv")))) (properties `((upstream-name . "BaalChIP"))) (build-system r-build-system) (inputs (list perl)) ; extra/get.overlaps.v2_chrXY.perl @@ -3984,16 +4243,37 @@ BaalChIP is able to account for copy number differences between the two alleles, a known phenotypical feature of cancer samples.") (license license:artistic2.0))) +(define-public r-bags + (package + (name "r-bags") + (version "2.42.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BAGS" version)) + (sha256 + (base32 "0356ragpcldr48yycqj91sn3bcqvvfp5spv2z02r8g6hs0dndwdh")))) + (properties `((upstream-name . "BAGS"))) + (build-system r-build-system) + (propagated-inputs (list r-biobase r-breastcancervdx)) + (home-page "https://bioconductor.org/packages/BAGS") + (synopsis "Bayesian approach for geneset selection") + (description + "This R package is providing functions to perform geneset significance +analysis over simple cross-sectional data between 2 and 5 phenotypes of +interest.") + (license license:artistic2.0))) + (define-public r-basespacer (package (name "r-basespacer") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BaseSpaceR" version)) (sha256 (base32 - "15aqf2s51gl6gcnv24170v9hlq1vgya58qh1f5vjmark7j2k8vvm")))) + "1ldsgrhxb1nm8xj7mws461apjknp9c2bhq3738f63i2qj9g25j4g")))) (properties `((upstream-name . "BaseSpaceR"))) (build-system r-build-system) (propagated-inputs (list r-rcurl r-rjsonio)) @@ -4034,13 +4314,13 @@ you will have to normalize your data beforehand.") (define-public r-bader (package (name "r-bader") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BADER" version)) (sha256 (base32 - "0g3yvgrarpdcxpvjrxg0gbdcagknh80cr0xyzinzpmiiz0rywmzc")))) + "0zmf7a7lwsnk9gcg48vmzdvfmzhvnbawwg77pb4gy3cw9sjdz5ym")))) (properties `((upstream-name . "BADER"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/BADER") @@ -4058,13 +4338,13 @@ can be used for further down-stream analyses such as gene set enrichment.") (define-public r-badregionfinder (package (name "r-badregionfinder") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BadRegionFinder" version)) (sha256 (base32 - "04bzb3i461gwkq9ygkjljpjk32c3arqr08hfzxyig1sarrryzl3q")))) + "17smlghl8s667n6cjx64mqli9drmv0pkq51mhjlyjy2v019im7l9")))) (properties `((upstream-name . "BadRegionFinder"))) (build-system r-build-system) (propagated-inputs @@ -4085,13 +4365,13 @@ Various visual and textual types of output are available.") (define-public r-bambu (package (name "r-bambu") - (version "3.2.6") + (version "3.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bambu" version)) (sha256 (base32 - "0h7ps32vbcn4hjpfb343nn8b50zq9my0k61847fi69vc4siwcx5k")))) + "02pcab8jfwlx4y00yky63anba61bb1h884m0f6ajvasfpgl30w6i")))) (properties `((upstream-name . "bambu"))) (build-system r-build-system) (propagated-inputs @@ -4128,13 +4408,13 @@ usage.") (define-public r-bandits (package (name "r-bandits") - (version "1.16.1") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BANDITS" version)) (sha256 (base32 - "04l6iy0sij7zhzswhxjzir3xmrjnp6aapp0a93xp01xiv2sgdzni")))) + "1xdyi61scfay5l5v7c40wjjl83kcvagvypxnfvsws4avh08x3ni3")))) (properties `((upstream-name . "BANDITS"))) (build-system r-build-system) (propagated-inputs @@ -4166,13 +4446,13 @@ the posterior densities for the average relative abundance of transcripts.") (define-public r-banocc (package (name "r-banocc") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "banocc" version)) (sha256 (base32 - "0yi70y87isb34jc1wrnz4gr0d0f2zw44555s50j3qdnj1x8cld9y")))) + "0y6mizkbx3s2x6465g53q87q0sixxrxhjvjmvwiilhirxf4x7hgp")))) (properties `((upstream-name . "banocc"))) (build-system r-build-system) (propagated-inputs @@ -4194,13 +4474,13 @@ estimates for each correlation element.") (define-public r-barcodetrackr (package (name "r-barcodetrackr") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "barcodetrackR" version)) (sha256 (base32 - "155lxqqq2mgrz9i04xvv8y7gh2iacw6qd3mzijzbvrbm605qb3p8")))) + "1w5p6dqagf3g27ymqsxdim0qhnwm11rrs3nnpp4mj8jcxm8wjsh9")))) (properties `((upstream-name . "barcodetrackR"))) (build-system r-build-system) (propagated-inputs @@ -4236,14 +4516,14 @@ retrieval analyses, or similar technologies.") (define-public r-biocversion (package (name "r-biocversion") - (version "3.17.1") + (version "3.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocVersion" version)) (sha256 (base32 - "0n29adnb62agp9li8rmn68z653d2m41iy9zjz75h43a05drlgp33")))) + "07zcf19gcbki2d18xgyrdzp3vn90cz2ww45p8ra4lc1mif5gy0c3")))) (properties `((upstream-name . "BiocVersion"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/BiocVersion/") @@ -4256,13 +4536,13 @@ of Bioconductor.") (define-public r-biocgenerics (package (name "r-biocgenerics") - (version "0.46.0") + (version "0.48.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocGenerics" version)) (sha256 (base32 - "19kwpis282i8x31xlh8nc3z6vvn23p3wpx7wmrqhclf8ymq61c7z")))) + "0av525j9l0y3kjdy5wl6s35sh4nsabmdclq3687l5258kmq2dq8k")))) (properties `((upstream-name . "BiocGenerics"))) (build-system r-build-system) @@ -4276,13 +4556,13 @@ packages.") (define-public r-breakpointr (package (name "r-breakpointr") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "breakpointR" version)) (sha256 (base32 - "001n99lilymgqxmpi4v89gw60j1mx13rvppv1ff1pbnk1zcmg53n")))) + "1jhgimybc2ib201k6vs5nfyi1whpkkzn7nj562yhz74208fx793a")))) (properties `((upstream-name . "breakpointR"))) (build-system r-build-system) (propagated-inputs @@ -4310,13 +4590,13 @@ export of Strand-seq data.") (define-public r-cardelino (package (name "r-cardelino") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cardelino" version)) (sha256 (base32 - "0ivhqd3da23iy2qklk2nljkjjr943m9r2y1q51fphld33izmv64v")))) + "0y4d3db01jwahz01hx3dswc4gg0x5k7325v4n1illgw3ddj2mvgn")))) (properties `((upstream-name . "cardelino"))) (build-system r-build-system) (propagated-inputs (list r-combinat @@ -4348,20 +4628,20 @@ stochastic dropout events as well as systematic allelic imbalance is used.") (define-public r-cellid (package (name "r-cellid") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CelliD" version)) (sha256 (base32 - "0vigvqjrlqbi5kviaj8qvyq3v8afgbc5pjrz7zmx2ckf4hdp0g03")))) + "1x4kp8i204rqas2bgg4qanwdncafilymlpvxvfyv39zpdji91yv5")))) (properties `((upstream-name . "CelliD"))) (build-system r-build-system) (propagated-inputs - (list r-data-table - r-biocparallel + (list r-biocparallel + r-data-table r-fastmatch - r-fgsea + r-fgsea r-ggplot2 r-glue r-irlba @@ -4372,13 +4652,14 @@ stochastic dropout events as well as systematic allelic imbalance is used.") r-rcpparmadillo r-reticulate r-rtsne + r-scater r-seurat + r-singlecellexperiment r-stringr - r-tictoc - r-singlecellexperiment r-summarizedexperiment + r-tictoc r-umap)) - (native-inputs (list r-knitr r-scater)) + (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/CelliD") (synopsis "Single cell gene signature extraction using multiple correspondence analysis") @@ -4390,24 +4671,69 @@ omics protocols. The package can also be used to explore functional pathways enrichment in single cell data.") (license license:gpl3))) +(define-public r-coregx + (package + (name "r-coregx") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "CoreGx" version)) + (sha256 + (base32 "0ffbi5afw759mi5r657h67hdh9yr5jrzvl3aigp960jzb5542105")))) + (properties `((upstream-name . "CoreGx"))) + (build-system r-build-system) + (propagated-inputs + (list r-bench + r-biobase + r-biocgenerics + r-biocparallel + r-bumpymatrix + r-checkmate + r-crayon + r-data-table + r-glue + r-lsa + r-matrixgenerics + r-multiassayexperiment + r-piano + r-rlang + r-s4vectors + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/CoreGx") + (synopsis + "Classes and functions to serve as the basis for other Gx packages") + (description + "This package provides a collection of functions and classes which serve +as the foundation for packages such as PharmacoGx and RadioGx. It was created +to abstract shared functionality to increase ease of maintainability and +reduce code repetition in current and future Gx suite programs. Major +features include a @code{CoreSet} class, from which RadioSet and PharmacoSet +are derived, along with get and set methods for each respective slot. +Additional functions related to fitting and plotting dose response curves, +quantifying statistical correlation and calculating @acronym{AUC, area under +the curve} or @acronym{SF, survival fraction} are included.") + (license license:gpl3+))) + (define-public r-coverageview (package (name "r-coverageview") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CoverageView" version)) (sha256 (base32 - "1ci07y75nvvv1mxy23v6jp5xb6n023fvlqh9il5lsdqwyfl5nz9s")))) + "1sj1vr84nsbygkh5mmp7zm21zzk4zcw3bwcvcazmy54zs553blpf")))) (build-system r-build-system) (propagated-inputs - (list r-s4vectors - r-iranges + (list r-genomicalignments r-genomicranges - r-genomicalignments + r-iranges + r-rsamtools r-rtracklayer - r-rsamtools)) + r-s4vectors)) (home-page "https://bioconductor.org/packages/CoverageView/") (synopsis "Coverage visualization package for R") (description "This package provides a framework for the visualization of @@ -4420,13 +4746,13 @@ how the coverage distributed across the genome.") (define-public r-cummerbund (package (name "r-cummerbund") - (version "2.42.0") + (version "2.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cummeRbund" version)) (sha256 (base32 - "1xin1azby96xxp4yyd4wc3rfcjc2g9p01ksfd89bk2vxcclccqxn")))) + "1a5x3jzagd1a385yk1brs4say02r0l21qqjak4cl6fsv8ihhy05s")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -4450,13 +4776,13 @@ used visualizations.") (define-public r-dama (package (name "r-dama") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "daMA" version)) (sha256 (base32 - "0z4y57hna312pkhkchair8calm7wl40rx8lcm8i6h1789hba063d")))) + "1ckk8h6adylaxq6bh14ym9vvrrhsfglnaigqz16v96vsj8q9i336")))) (properties `((upstream-name . "daMA"))) (build-system r-build-system) (propagated-inputs (list r-mass)) @@ -4472,13 +4798,13 @@ factorial microarray data.") (define-public r-damefinder (package (name "r-damefinder") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DAMEfinder" version)) (sha256 (base32 - "0m8g1sp55mxa0qswpqkzk73myhhy3s49c21hf97sk0lxis5lagcd")))) + "0mbm884dm30b4fwf3qr1w96j18dxdmr2bn11dw83hh0wrbhp8njm")))) (properties `((upstream-name . "DAMEfinder"))) (build-system r-build-system) (propagated-inputs @@ -4513,14 +4839,14 @@ offers nice visualization of methyl-circle plots.") (define-public r-dearseq (package (name "r-dearseq") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "dearseq" version)) (sha256 (base32 - "12ld1f3892ag1a3lmkwjlkk6pd79ibykg8jrmddx2x33k23cv67g")))) + "1ldxw457zsfphm6izxz2kvxy3719gszhxb8mymx8njg6islljy27")))) (build-system r-build-system) (propagated-inputs (list r-compquadform @@ -4552,13 +4878,13 @@ set analyses, and can deal with repeated or longitudinal data.") (define-public r-debcam (package (name "r-debcam") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "debCAM" version)) (sha256 (base32 - "11vqfkyd3fklc8fhn850kklph8x4pmwclb9xbqji4i21222m89hh")) + "1swqqrlwin2i2qq46qyfziblbfsfyd5hf6w39hygp7fdkpic14b7")) (snippet '(for-each delete-file '("inst/java/CornerDetect.jar" @@ -4567,9 +4893,6 @@ set analyses, and can deal with repeated or longitudinal data.") (build-system r-build-system) (arguments (list - ;; XXX: since the upgrade to R 4.3.0 this package takes too long to be - ;; loaded. - #:tests? #false #:configure-flags '(list "--fake") #:modules '((guix build r-build-system) @@ -4597,7 +4920,7 @@ set analyses, and can deal with repeated or longitudinal data.") (add-after 'install 'strip-jar-timestamps (assoc-ref ant:%standard-phases 'strip-jar-timestamps))))) (inputs - (list (list icedtea "jdk") + (list (list openjdk11 "jdk") java-pj)) (propagated-inputs (list r-apcluster @@ -4629,13 +4952,13 @@ knowledge can achieve semi-supervised deconvolution of mixtures.") (define-public r-decipher (package (name "r-decipher") - (version "2.28.0") + (version "2.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DECIPHER" version)) (sha256 (base32 - "16z6yk8rr2115z6g1l7fl01binxm29vnxsnsm2wzfvc5vv49927n")))) + "1ri8ldx3dqcpfvn3mz0022f77zi6ki04mh27qp132bbrjkj6zl79")))) (build-system r-build-system) (propagated-inputs (list r-biostrings @@ -4728,13 +5051,13 @@ mechanism based on the shared signatures.") (define-public r-decomptumor2sig (package (name "r-decomptumor2sig") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "decompTumor2Sig" version)) (sha256 (base32 - "028sczy1d108i05ymr1wpj6jdrcds476wbmmc7rzzflzyg4aix75")))) + "13vwrg82zprb9h72azdqd0rkm5k2xm4mw7viawbzwkkqvg6azsdj")))) (properties `((upstream-name . "decompTumor2Sig"))) (build-system r-build-system) (inputs (list perl)) ;script/extractSpecColumns.pl @@ -4771,13 +5094,13 @@ of the signatures to the mutation load of the tumor.") (define-public r-deconrnaseq (package (name "r-deconrnaseq") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DeconRNASeq" version)) (sha256 (base32 - "0bmkyci31p7g097i8fvc0s1fz47hv6vp5rcfqqkvclm86wfkkmkc")))) + "1k5xrx97w9g0jfvjzawyfsqyz2fj9r463nj849djxgmcw8vp53vg")))) (properties `((upstream-name . "DeconRNASeq"))) (build-system r-build-system) (propagated-inputs @@ -4798,13 +5121,13 @@ single expression profiles.") (define-public r-decontam (package (name "r-decontam") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "decontam" version)) (sha256 (base32 - "08niwixy4m6gqmazisxzbbla9nsxicpa685jy3r6knapwaznvcb2")))) + "0m4zd6qxsrp7w9a8psg8xcrviim6plwgwn4rgdxy8ag0c442fsvk")))) (properties `((upstream-name . "decontam"))) (build-system r-build-system) (propagated-inputs @@ -4824,13 +5147,13 @@ negative control samples.") (define-public r-deconvr (package (name "r-deconvr") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "deconvR" version)) (sha256 (base32 - "1r5js5prwy1libnf1g1a4pdi15pj216bb8ajhzii3symn5r0cdj9")))) + "0pl4nwaf8swwz9nl2ynf9mm38d0x223gpz89qrj03yihxszy2n13")))) (properties `((upstream-name . "deconvR"))) (build-system r-build-system) (propagated-inputs @@ -4869,13 +5192,13 @@ make mapping WGBS data to their probe IDs easier.") (define-public r-decoupler (package (name "r-decoupler") - (version "2.6.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "decoupleR" version)) (sha256 - (base32 "012d76jwgg6fwfjc00zdws59y6jbj0grzd4lgjrqs2afp2ycmh9s")))) + (base32 "1vnlrkza33nb80qf810yfz66m3j84p8chhfdxak5lvpciqwx7dh9")))) (properties `((upstream-name . "decoupleR"))) (build-system r-build-system) (propagated-inputs @@ -4910,13 +5233,13 @@ targeted by a kinase.") (define-public r-deepsnv (package (name "r-deepsnv") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "deepSNV" version)) (sha256 (base32 - "11cnyy3hyn8akhmax25293mx2blcs8ba5vfax6mx6hjhb577hkwb")))) + "16dkjqy9ba5v8nikaxdjcz7rr60dg46sfsgrjjlp82rf3256bf8r")))) (properties `((upstream-name . "deepSNV"))) (build-system r-build-system) (propagated-inputs @@ -4946,13 +5269,13 @@ bases such as COSMIC.") (define-public r-degreport (package (name "r-degreport") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DEGreport" version)) (sha256 (base32 - "15xm1l2qgsyzaw820a1fq5qdzh5pj4dmr1hx6s6b6wm2p02cvvai")) + "1ska9fh1bzdqd9pi67vqgx0vz4wz2r5kzmh73fb9zh9m0gnjjr23")) (snippet '(delete-file "docs/jquery.sticky-kit.min.js")))) (properties `((upstream-name . "DEGreport"))) @@ -5017,13 +5340,13 @@ fold changes mean and variability for each selected gene.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.26.7") + (version "0.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "1xsq85nm1gk537mw6ppsyykpw70kczv6wn1nll63b0k8xs4wj0ha")))) + "0mf30vdns64mpm11zcz9qx6nh5clr6krjvcmr7dqv2xg5ig0a1f7")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) @@ -5033,7 +5356,8 @@ fold changes mean and variability for each selected gene.") r-matrix r-matrixgenerics r-s4arrays - r-s4vectors)) + r-s4vectors + r-sparsearray)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/DelayedArray") @@ -5051,17 +5375,21 @@ array-like objects like @code{DataFrame} objects (typically with Rle columns), (define-public r-densvis (package (name "r-densvis") - (version "1.10.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "densvis" version)) (sha256 (base32 - "1nkii02bj49z9qm3rj8lzwpz7dllrsa5zf7dn5ffcczyxr3b1ap9")))) + "164pyy5l69qhdgqkxjginapvfjy0rjx4p6m83cijz6jbz6kf6gks")))) (properties `((upstream-name . "densvis"))) (build-system r-build-system) - (propagated-inputs (list r-assertthat r-basilisk r-irlba r-rcpp - r-reticulate)) + (propagated-inputs (list r-assertthat + r-basilisk + r-irlba + r-rcpp + r-reticulate + r-rtsne)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/densvis") (synopsis @@ -5082,13 +5410,13 @@ heterogeneity in the original high-dimensional space.") (define-public r-derfinder (package (name "r-derfinder") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "derfinder" version)) (sha256 (base32 - "1gb65hk26ffn0njsgwgk43z9i9bcvx89pz5m9x951c2a07c1xrcw")))) + "0rj3szlpbxiwj3rajmr6ccnbs1mkcskql12iip8zgswmhz76rxh1")))) (properties `((upstream-name . "derfinder"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -5128,13 +5456,13 @@ The DER Finder approach can also be used to identify differentially bounded (define-public r-derfinderhelper (package (name "r-derfinderhelper") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "derfinderHelper" version)) (sha256 - (base32 "0ww4lvwmm8rf44wgksg98bqh7zlm503c4gc8dwilb1w0dz2k7qll")))) + (base32 "01vq8xnszxqhijranzaciapw8mcn6px0jhx9zb9lyqhsvaffjh5r")))) (properties `((upstream-name . "derfinderHelper"))) (build-system r-build-system) (propagated-inputs @@ -5194,13 +5522,13 @@ possibly confounded by SNPs and cross-hybridisation. It includes (define-public r-drimseq (package (name "r-drimseq") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DRIMSeq" version)) (sha256 - (base32 "1i9lcp31g94mllkwcyfablj27qr8v7vqk9j96ywrdfpj8dmcrw98")))) + (base32 "1nf044cfqywfnglm081xbppamva87z2j2xz0f51z8mra11apj6i6")))) (properties `((upstream-name . "DRIMSeq"))) (build-system r-build-system) (propagated-inputs @@ -5229,13 +5557,13 @@ results.") (define-public r-dropletutils (package (name "r-dropletutils") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DropletUtils" version)) (sha256 - (base32 "09xwfb4ihpsp465vb1zbcwm6ww6qi3spn9d8p4i1gczyc0p9pf1y")))) + (base32 "0bnxk72a0ygh4nqwyjzzi79zc4md8pwk0pr6jn43in0wdk054wf6")))) (properties `((upstream-name . "DropletUtils"))) (build-system r-build-system) (propagated-inputs @@ -5299,13 +5627,13 @@ Beta-Binomial distributions.") (define-public r-dyndoc (package (name "r-dyndoc") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DynDoc" version)) (sha256 (base32 - "16cb4pby6ja0xy8ygbgr6zfbyp4agyhlds5sayc5ryq50vafykah")))) + "0d2axaszy7rpi47yg4vhd1z70m53nx40znapgg5pq6ahrx7if5f1")))) (properties `((upstream-name . "DynDoc"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/DynDoc") @@ -5318,13 +5646,13 @@ dynamic documents and vignettes.") (define-public r-bluster (package (name "r-bluster") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bluster" version)) (sha256 (base32 - "15f103lpl686730vl8g69fhki9iq2ncgr5dm6qm2xc9bq9vh65s9")))) + "16zkv567d39258syhfb215y04sq3pnfjh9pgbp5z85hcfpz4qmhc")))) (properties `((upstream-name . "bluster"))) (build-system r-build-system) (propagated-inputs @@ -5348,21 +5676,21 @@ and evaluate clustering results.") (define-public r-ideoviz (package (name "r-ideoviz") - (version "1.36.0") + (version "1.37.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IdeoViz" version)) (sha256 (base32 - "1za1cxf734mar9hbvqrijdg61g0jag9jdzmi8p8ka62xbikxqa3s")))) + "1bhari5ghag5f5dlrgm79hckbh0bamd9567z04qi0spnfr97wf3s")))) (build-system r-build-system) (propagated-inputs (list r-biobase - r-iranges + r-genomeinfodb r-genomicranges + r-iranges r-rcolorbrewer - r-rtracklayer - r-genomeinfodb)) + r-rtracklayer)) (home-page "https://bioconductor.org/packages/IdeoViz/") (synopsis "Plots data along a chromosomal ideogram") (description "This package provides functions to plot data associated with @@ -5372,14 +5700,14 @@ arbitrary genomic intervals along chromosomal ideogram.") (define-public r-infercnv (package (name "r-infercnv") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "infercnv" version)) (sha256 (base32 - "19fk4pzhwj9pfh4vg943xb4cdfpq65ax75d61w1mm3f71gg56z5g")))) + "1yxg04644yqy3wbqbsf4hcvvimkk8z60xizpy4rc48i3hxjm7nbf")))) (properties `((upstream-name . "infercnv"))) (build-system r-build-system) (inputs (list python)) @@ -5411,8 +5739,8 @@ arbitrary genomic intervals along chromosomal ideogram.") r-rcolorbrewer r-reshape2 r-rjags - r-singlecellexperiment r-seurat + r-singlecellexperiment r-summarizedexperiment r-tidyr)) (native-inputs (list r-knitr)) @@ -5432,13 +5760,13 @@ over-abundant or less-abundant as compared to that of normal cells.") (define-public r-iranges (package (name "r-iranges") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "013a3vcw1v5vn0sg2d9cwrdksch48kilvxp8cr79y0nr4vk58q9z")))) + "0rhh82hrsm32bdjamfah84p7zi8fvr4shyq2rdjfxzdp9qy5rh2q")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) @@ -5460,13 +5788,13 @@ possible.") (define-public r-isoformswitchanalyzer (package (name "r-isoformswitchanalyzer") - (version "2.0.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IsoformSwitchAnalyzeR" version)) (sha256 - (base32 "1zjwhxlayz2sb77vspw280didhawj282i5gvxnydcdparg165zwf")))) + (base32 "1yin2jv06g3jrzadq6yjcr14jz1zzwyxipzna5csgr013dkkrl8h")))) (properties `((upstream-name . "IsoformSwitchAnalyzeR"))) (build-system r-build-system) (propagated-inputs @@ -5541,13 +5869,13 @@ AE et al 2011, <doi: 10.1093/bioinformatics/btr171>).") (define-public r-italics (package (name "r-italics") - (version "2.60.0") + (version "2.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ITALICS" version)) (sha256 - (base32 "09yia158mrv9r32iw88jlbfd6l7hzmglv8ni7i28x18qvnhp2a08")))) + (base32 "0zk9n94nqw6vpw908ka32zppxwqkki9krzxib06y1nic3bri3w9i")))) (properties `((upstream-name . "ITALICS"))) (build-system r-build-system) (propagated-inputs @@ -5676,13 +6004,13 @@ mapping.") (define-public r-nebulosa (package (name "r-nebulosa") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Nebulosa" version)) (sha256 (base32 - "0lqm9mfmaxdhhs9di2kjg2rixng78lrrikyp7blmpyqk4c41j3nh")))) + "0kzkdwxrhl7plbcbqr58gnadhhbhx2811ian0s4kds14y4mxl26c")))) (properties `((upstream-name . "Nebulosa"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 @@ -5752,14 +6080,14 @@ performing parallel computations on multicore machines.") (define-public r-affy (package (name "r-affy") - (version "1.78.2") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affy" version)) (sha256 (base32 - "0zsr87zsw5rp5rgdiv1bbsi6fx6b7qzlgjirzczky6fmf4dqwgnm")))) + "0lsvcv7nprmsh62d0r2v44a5n915crvv1cbj9ba6fdggj7wp8zyk")))) (build-system r-build-system) (propagated-inputs (list r-affyio @@ -5780,14 +6108,14 @@ analysis.") (define-public r-affycomp (package (name "r-affycomp") - (version "1.76.1") + (version "1.78.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affycomp" version)) (sha256 (base32 - "0wccj8q8sl0zc68nr5qf1qih8awqf1h6bwi5hq9d7r59p4g4r9n1")))) + "0818mgwny9hznw7lawrvmk11nwy0wxgjnlkf083vv3js4aq31gfp")))) (properties `((upstream-name . "affycomp"))) (build-system r-build-system) (propagated-inputs (list r-biobase)) @@ -5846,14 +6174,14 @@ Command Console} (AGCC)-compatible sample annotation files.") (define-public r-affycontam (package (name "r-affycontam") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyContam" version)) (sha256 (base32 - "07a6kd51rlj433yxmyd2j8nl8qn1hw8wv3mk270dp8xxlk613y3p")))) + "1jxp4qacclfl07ig8dfwy5gpnsqrfqnjbci1a7znc7acqg0kv0zv")))) (properties `((upstream-name . "affyContam"))) (build-system r-build-system) (propagated-inputs @@ -5911,14 +6239,14 @@ to streamline the more common analyses that a Biostatistician might see.") (define-public r-affyio (package (name "r-affyio") - (version "1.70.0") + (version "1.72.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affyio" version)) (sha256 (base32 - "1r1c0iwix0n8r433x4bv8hvzhkablc4xkdgg2b1fk4ijhd1iwf3c")))) + "01shv7936cb5yynxkdssczl752ayv2rx4qkrkddqhi5smksw13z9")))) (build-system r-build-system) (propagated-inputs (list r-zlibbioc)) @@ -5935,14 +6263,14 @@ CDF file formats.") (define-public r-affxparser (package (name "r-affxparser") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "affxparser" version)) (sha256 (base32 - "0n86my3bzy3g7xn60kizs5ym5m016zrkg7dv96kx246mrnv0ax8y")))) + "18qjdsgkmdhwv2c4sbixp7fn69sbjdipn363jnms95dksdj2xvr9")))) (properties `((upstream-name . "affxparser"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/affxparser") @@ -5963,14 +6291,14 @@ structure.") (define-public r-annotate (package (name "r-annotate") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotate" version)) (sha256 (base32 - "1104r6jdy3nza8329xmq428ljfbfi2xwkd92sw519g0yqryh09vy")))) + "10mdlbgbvdj967bih6wpvxmy91r10p8frhgcwv8mhv4g94ardasd")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -5990,13 +6318,13 @@ microarrays.") (define-public r-annotationdbi (package (name "r-annotationdbi") - (version "1.62.2") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationDbi" version)) (sha256 (base32 - "0vprm84k79pfnkkg9vf3gyb1nhzmin5lp5375rsaj6fnzbd46dw9")))) + "0nyw3x5ivq969p2w788zi4pp0pwjv5hhpjpl5lyfzhak9ydylgh6")))) (properties `((upstream-name . "AnnotationDbi"))) (build-system r-build-system) @@ -6020,13 +6348,13 @@ annotation data packages using SQLite data storage.") (define-public r-annotationfilter (package (name "r-annotationfilter") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationFilter" version)) (sha256 (base32 - "10jkxjmsshrr08c397qvkgrcfwzvrbd2hci1nal4vd5mm77f9cl9")))) + "0cd2vcnx0pn5wba3x5q32vddjjp7fvix7yd7jrwv07a2fkv9c4p5")))) (properties `((upstream-name . "AnnotationFilter"))) (build-system r-build-system) @@ -6045,14 +6373,14 @@ used by @code{ensembldb}, @code{Organism.dplyr}, and other packages.") (define-public r-annotationforge (package (name "r-annotationforge") - (version "1.42.2") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationForge" version)) (sha256 (base32 - "0b4dmjv7y50c1rn76wlhnlz93kidvg1byj72vq2s11kdzyq3pmss")))) + "0dbbg0wvk1ndv20d5j80waaz0z1bsp7y2k2m17jly4ax2hc5frc9")))) (properties `((upstream-name . "AnnotationForge"))) (build-system r-build-system) @@ -6077,14 +6405,14 @@ databases. Packages produced are intended to be used with AnnotationDbi.") (define-public r-annotationhub (package (name "r-annotationhub") - (version "3.8.0") + (version "3.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AnnotationHub" version)) (sha256 (base32 - "0ri8qj5j10bhprkb810c2hl5sl944kpb8rf5lab6nxykzgyz73v0")))) + "1mx3vip1rx5lq0vnkxpmkyksnq4vygmww85vxq3spr0fah1pwnkr")))) (properties `((upstream-name . "AnnotationHub"))) (build-system r-build-system) (propagated-inputs @@ -6118,14 +6446,14 @@ by the user, helping with quick and reproducible access.") (define-public r-aroma-light (package (name "r-aroma-light") - (version "3.30.0") + (version "3.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "aroma.light" version)) (sha256 (base32 - "118yqvbj4ad2b2bik0zi3ir15kxh9fbdi9qqyk52isvcdbv6069p")))) + "1i6rml0slfsf01a3sphyzrxp2z759psq5bv9cfy5dxx44fnav8b8")))) (properties `((upstream-name . "aroma.light"))) (build-system r-build-system) (propagated-inputs @@ -6142,14 +6470,14 @@ classes.") (define-public r-bamsignals (package (name "r-bamsignals") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bamsignals" version)) (sha256 (base32 - "18058j3fc47qcwvzgpb8mbc7cd1pywzrz3a36iqz93ihzjmymydk")))) + "1qv2gydn8awrkbhdrgxm8zxpicphqc29rwzkj3vyaa9glmnx2y34")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -6172,13 +6500,13 @@ paired-end data.") (define-public r-biobase (package (name "r-biobase") - (version "2.60.0") + (version "2.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Biobase" version)) (sha256 (base32 - "1xjs5nxr3dffllp599hf0cx71a2czqmhf7zj2sp6rz06kcxib905")))) + "0znkawzr3hgbp2dkdk30ziqa6ylbq2nf0xmz4vi089cw9763lxgg")))) (properties `((upstream-name . "Biobase"))) (build-system r-build-system) @@ -6195,13 +6523,13 @@ on Bioconductor or which replace R functions.") (define-public r-biomart (package (name "r-biomart") - (version "2.56.1") + (version "2.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0jqv2mv4ridi5lffva20a5s479bzpxhblyymricb17fd400rag8f")))) + "1m6c6m9z0d1k6s2q0ikd78ahcq72gzqnhlprdn0xvkjxrgh1i2lf")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) @@ -6235,13 +6563,13 @@ powerful online queries from gene annotation to database mining.") (define-public r-biomartr (package (name "r-biomartr") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "biomartr" version)) (sha256 (base32 - "14nw44dkyrfw43dc4zwsnvkrmdhsl131m9w1wa80j3qkbhyaypfl")))) + "06wd8s2cssw58xp9d078fc7iycpxryccnclrk3gnh757j1h0vzim")))) (properties `((upstream-name . "biomartr"))) (build-system r-build-system) (propagated-inputs @@ -6280,13 +6608,13 @@ only one command.") (define-public r-biocparallel (package (name "r-biocparallel") - (version "1.34.2") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocParallel" version)) (sha256 (base32 - "0j0yi0g0zri0liy9xm2j3k848smhib5mmkvwcw6281iwnpn7yypq")))) + "19h80qf0zdxfg3pkcwwywh9gg0ymv92n51qpimnw4c3w5iaszy6b")))) (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) @@ -6331,13 +6659,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.68.1") + (version "2.70.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "13cnjbq2iykv83ycb4151d7yys21s3v15fc72v3s02m1i92lqyq4")))) + "198y36yfkncsp4sw00ij8cal45al67f9nx84bbszhygaq0jh504y")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) @@ -6348,6 +6676,7 @@ objects.") r-iranges r-s4vectors r-xvector)) + (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/Biostrings") (synopsis "String objects and algorithms for biological sequences") (description @@ -6359,14 +6688,14 @@ biological sequences or sets of sequences.") (define-public r-biovizbase (package (name "r-biovizbase") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biovizBase" version)) (sha256 (base32 - "0na37f2nfavgxd2xhprfb6bv68zm2h6glbkffspc3gsnw1q5h6da")))) + "01hli49aq1fjjgpk465znq1ki0qi7nxg71pqg18fz6nblg3ny9z5")))) (properties `((upstream-name . "biovizBase"))) (build-system r-build-system) (propagated-inputs @@ -6401,18 +6730,19 @@ effort and encourages consistency.") (define-public r-bsgenome (package (name "r-bsgenome") - (version "1.68.0") + (version "1.70.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BSgenome" version)) (sha256 (base32 - "0fx2mkzyhbn8iayw14nr913wd4xhp76b1zjb85akrxaab2dm4zz8")))) + "1bdrh1kp7ihnlyvgdvwdzly69l9zy5rr09gizm0l59zy4kh59nih")))) (properties `((upstream-name . "BSgenome"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics + r-biocio r-biostrings r-genomeinfodb r-genomicranges @@ -6432,14 +6762,14 @@ genome data packages and support for efficient SNP representation.") (define-public r-category (package (name "r-category") - (version "2.66.0") + (version "2.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Category" version)) (sha256 (base32 - "1wjf6xbnys7nv8z4xrzck1wk5xifkdni672kigs0aqdxqj8d80f5")))) + "19qyxqky1gsrjylmc2h0sndbqlk2ibrps7123gqwn19p8kg4nhf0")))) (properties `((upstream-name . "Category"))) (build-system r-build-system) (propagated-inputs @@ -6447,12 +6777,12 @@ genome data packages and support for efficient SNP representation.") r-annotationdbi r-biobase r-biocgenerics + r-dbi r-genefilter r-graph r-gseabase r-matrix - r-rbgl - r-dbi)) + r-rbgl)) (home-page "https://bioconductor.org/packages/Category") (synopsis "Category analysis") (description @@ -6525,13 +6855,13 @@ regions and to highlight copy number alterations.") (define-public r-chipseeker (package (name "r-chipseeker") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPseeker" version)) (sha256 (base32 - "0nngygci1g8bb3rsica348zi59hskr6hf8319csia6cman89gvqm")))) + "0bx85y5888w85miif73y0yd9j4kdmjn1cfck1xshnqnsrh7p3m50")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -6540,18 +6870,17 @@ regions and to highlight copy number alterations.") r-aplot r-biocgenerics r-boot + r-dplyr r-enrichplot - r-iranges r-genomeinfodb - r-genomicranges r-genomicfeatures + r-genomicranges r-ggplot2 r-gplots r-gtools - r-dplyr - r-plotrix - r-dplyr + r-iranges r-magrittr + r-plotrix r-rtracklayer r-s4vectors r-tibble @@ -6573,14 +6902,14 @@ annotation, distance to TSS, and overlap of peaks or genes.") (define-public r-chipseq (package (name "r-chipseq") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "chipseq" version)) (sha256 (base32 - "0q83c4dm9qbdxlh4cbdzp357fn4sa16d7dqb4s65650pcnjg3a48")))) + "1fw99xnll4jwdmp49jh59zxcbp3qs2850pjdg403sv4cg1bgfdyi")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -6600,14 +6929,14 @@ experiments.") (define-public r-complexheatmap (package (name "r-complexheatmap") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ComplexHeatmap" version)) (sha256 (base32 - "08jpbw7qns736zq1fwk9lyr4qm7rgzzw3hksv59zwb1458a79pzy")))) + "0zzp0kci5daffpyv56advdcs05pz3nmjn07bmm7r3hwpk0nr3fcf")))) (properties `((upstream-name . "ComplexHeatmap"))) (build-system r-build-system) @@ -6762,14 +7091,14 @@ distribution.") (define-public r-deseq2 (package (name "r-deseq2") - (version "1.40.2") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq2" version)) (sha256 (base32 - "0rb6b2aqn3an5ria4yjasjr7aldr5606rkc4yw275x9ddii22djg")))) + "1mz7v0vcl741zjvj63mk48hhbq6sk2fl2dwn9y1a6hr8fb79vy1a")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) (propagated-inputs @@ -6780,6 +7109,7 @@ distribution.") r-ggplot2 r-iranges r-locfit + r-matrixgenerics r-matrixstats r-rcpp r-rcpparmadillo @@ -6799,14 +7129,14 @@ distribution.") (define-public r-dexseq (package (name "r-dexseq") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DEXSeq" version)) (sha256 (base32 - "0z4i3lsaziq3hprk64akx7jl6b757kmd8k6gv5pn36pavc6x1a0g")))) + "1q59agaidf0nkq599iz54a253sjxzillj39za86ihfj5xws24f8w")))) (properties `((upstream-name . "DEXSeq"))) (build-system r-build-system) (propagated-inputs @@ -6844,13 +7174,13 @@ exploration of the results.") (define-public r-diffcyt (package (name "r-diffcyt") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "diffcyt" version)) (sha256 - (base32 "1vsn9z06vmfw6741x7dri3d9wh4rqhzak9r506y3c3h2gjjwilv1")))) + (base32 "1k3gzzgda29m2v7v8hqw7c2s8z778p0plqxag443lhsxcm6izcxi")))) (properties `((upstream-name . "diffcyt"))) (build-system r-build-system) (propagated-inputs @@ -6882,14 +7212,14 @@ adapted from transcriptomics.") (define-public r-dirichletmultinomial (package (name "r-dirichletmultinomial") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DirichletMultinomial" version)) (sha256 (base32 - "1vslg6hp498ar4l1b8rdxscz5wj1xci866j8975wr378lnymb942")))) + "1rvic3acrf4qdag423f8xa6bnqrqr31vj7k4l7a5kzf1fjm359wy")))) (properties `((upstream-name . "DirichletMultinomial"))) (build-system r-build-system) @@ -6909,13 +7239,13 @@ originally made available by Holmes, Harris, and Quince, 2012, PLoS ONE 7(2): (define-public r-dittoseq (package (name "r-dittoseq") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "dittoSeq" version)) (sha256 (base32 - "0gpgmy1yqgxvxiyrinxnn78w68w81ldqyhzwz3yxj2brlld6ycd1")))) + "17ks6bbhv8iw8grzlkibgqmwggrqp5hikg1p49m4a6b6bayillv2")))) (properties `((upstream-name . "dittoSeq"))) (build-system r-build-system) (propagated-inputs @@ -6953,14 +7283,14 @@ code{dittoColors()}.") (define-public r-edaseq (package (name "r-edaseq") - (version "2.34.0") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EDASeq" version)) (sha256 (base32 - "0gf4k02b5qywrg5rpg6hs9gyzcdlpw36ndgz3ca19plicair4mih")))) + "0xvi5mynkf1n74bn2k6gxmyhp1piwzsljd37biibdfzy14r1ir08")))) (properties `((upstream-name . "EDASeq"))) (build-system r-build-system) (propagated-inputs @@ -6993,17 +7323,18 @@ global-scaling and full-quantile normalization.") (define-public r-edger (package (name "r-edger") - (version "3.42.4") + (version "4.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "1lyn017jqgn6d987zrk0kp2p2nw3mxf8zjspk31pky532p9pkhs3")))) + "0vjydwjazl7br0hvshy7jip3z6w73bif9vaky20im5rv40pqnchh")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs (list r-limma r-locfit r-rcpp)) + (native-inputs (list r-knitr)) (home-page "https://bioinf.wehi.edu.au/edgeR") (synopsis "EdgeR does empirical analysis of digital gene expression data") (description "This package can do differential expression analysis of @@ -7018,13 +7349,13 @@ CAGE.") (define-public r-enhancedvolcano (package (name "r-enhancedvolcano") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EnhancedVolcano" version)) (sha256 (base32 - "1mcyhgdvfmkkh0rlhf51an7j1zi96lqdhifki2aqmlx0lqvg4qxq")))) + "097w3957m47m03iy8xc1m7pdgm3qy0kzqbllic8pd79qglrla802")))) (properties `((upstream-name . "EnhancedVolcano"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-ggrepel)) @@ -7046,13 +7377,13 @@ parameter configurations.") (define-public r-enmix (package (name "r-enmix") - (version "1.36.0") + (version "1.38.01") (source (origin (method url-fetch) (uri (bioconductor-uri "ENmix" version)) (sha256 (base32 - "1cwj45rnb6ra1bnd0plkjfvfsix25xr51yh6rwrfj524c35r70w1")))) + "1wh9lri9dp3904c2n6562z7p9gqx39dmag55imx8zrqnayxamc03")))) (properties `((upstream-name . "ENmix"))) (build-system r-build-system) (propagated-inputs @@ -7069,9 +7400,9 @@ parameter configurations.") r-illuminaio r-impute r-iranges + r-irlba r-matrixstats r-minfi - r-preprocesscore r-quadprog r-rpmm r-s4vectors @@ -7088,14 +7419,14 @@ visualization of Illumina DNA methylation array data.") (define-public r-ensembldb (package (name "r-ensembldb") - (version "2.24.1") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ensembldb" version)) (sha256 (base32 - "1x73lln0rlnypl8iia54srl3wrazs94f8rspmjsaqsxwknkym319")))) + "010fp03x1splddxmhpxlfv1i3paqgbcxm7l9z2lmm6zfixhb158a")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -7133,18 +7464,19 @@ chromosome region or transcript models of lincRNA genes.") (define-public r-fastseg (package (name "r-fastseg") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fastseg" version)) (sha256 (base32 - "0gygyf1xq1z6vzand43n965p366zh0k3rv58gnyqa81whj4dvcq3")))) + "10g9mdh7nzdz2b1k5gg5hk35lpapcnbs3p3z17k15aq040lpm236")))) (build-system r-build-system) (propagated-inputs (list r-biobase r-biocgenerics r-genomicranges r-iranges r-s4vectors)) + (native-inputs (list r-knitr)) (home-page "https://www.bioinf.jku.at/software/fastseg/index.html") (synopsis "Fast segmentation algorithm for genetic sequencing data") (description @@ -7160,14 +7492,14 @@ microarrays or GRanges for sequencing data.") (define-public r-gage (package (name "r-gage") - (version "2.50.0") + (version "2.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gage" version)) (sha256 (base32 - "16wx2w70i12420022xz2zx8pizzyxb7z1pcmqn515cs89f1qcnli")))) + "0bm5hvy3cdcm46527w45mnnnk95qm28xzdk1m53615gh55ix4iy8")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi r-go-db r-graph r-keggrest)) @@ -7188,14 +7520,14 @@ analysis using other methods.") (define-public r-genefilter (package (name "r-genefilter") - (version "1.82.1") + (version "1.84.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genefilter" version)) (sha256 (base32 - "1wpg8banz6s6smycfqf9hqryp4kf2gs069s7npyvpq53wy0kxyny")))) + "0q80z872d3z1jy69b53qxzvmshf5zx4qssmp4gj7fwdpfxj9qqjw")))) (build-system r-build-system) (native-inputs (list gfortran r-knitr)) @@ -7212,16 +7544,16 @@ high-throughput sequencing experiments.") (define-public r-geneoverlap (package (name "r-geneoverlap") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GeneOverlap" version)) (sha256 (base32 - "1bimsayaf68j15im591r6rbvydhbmiqcp1pphd5zzg6hzp6va927")))) + "074d3inz8sh8xxjliisa0p99rgy6r9fg9ljaka5bf1waxwpknzpw")))) (build-system r-build-system) (propagated-inputs - (list r-rcolorbrewer r-gplots)) + (list r-gplots r-rcolorbrewer)) (home-page "https://www.bioconductor.org/packages/GeneOverlap/") (synopsis "Test and visualize gene overlaps") (description "This package can be used to test two sets of gene lists @@ -7231,13 +7563,13 @@ and visualize the results.") (define-public r-genomation (package (name "r-genomation") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "genomation" version)) (sha256 (base32 - "0y6a2qxxp5mnkllcq46j00069z22ixnrbkd15s007a35lhkibz21")))) + "1vbpx187m5d5g307f4jiwyy1sw4jgj1s18622y3a458ixv540zkc")))) (build-system r-build-system) (propagated-inputs (list r-biostrings @@ -7278,13 +7610,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.36.4") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "0wwh72sj894m3awk4g2zmkkwqafdjyxzsr49vnd1fiyz909hw02a")))) + "1a82xx1ijmfxk6d4pjqy45cdrnf75yrs7l7l64brl5d5dif45s42")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) @@ -7304,13 +7636,13 @@ names in their natural, rather than lexicographic, order.") (define-public r-genomicalignments (package (name "r-genomicalignments") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicAlignments" version)) (sha256 (base32 - "1irzcz9s97gqbyj9j71wxv2ikdfd8g14296fg33w2ykfdm80nzf0")))) + "06xa3dcdk6jprvpyvr3pfbv6qv8xrqw2n6rrfp8q8qizx3ifj431")))) (properties `((upstream-name . "GenomicAlignments"))) (build-system r-build-system) @@ -7337,13 +7669,13 @@ alignments.") (define-public r-genomicdatacommons (package (name "r-genomicdatacommons") - (version "1.24.3") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicDataCommons" version)) (sha256 (base32 - "1grvria7lx7p0py3w8yi0j41bpfx951lds5db7jdiq0j8l75fh38")))) + "1inikcczkhav6h6a46ix9ixkf7b1n8rf766m5hmhmx09sspzsm5w")))) (properties `((upstream-name . "GenomicDataCommons"))) (build-system r-build-system) (propagated-inputs (list r-dplyr @@ -7369,13 +7701,13 @@ Commons RESTful service.") (define-public r-genomicfeatures (package (name "r-genomicfeatures") - (version "1.52.2") + (version "1.54.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "0givyx77gvx24wgq180jsb2q1b8g4j49rs6bxdmd0l04a87hm9cr")))) + "1b2rx16l7zd4lisqssbkcwi534s7m7h1w6k72km6c835x2cdxfs4")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) @@ -7413,14 +7745,14 @@ extracting the desired features in a convenient format.") (define-public r-genomicfiles (package (name "r-genomicfiles") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFiles" version)) (sha256 (base32 - "0nxz8lvpmyllgs1ksgbha8qqs4fhppkg5casppnas9x47dj4bxph")))) + "1kvys60hhb0ndjvjdanfgciq3jc42iag8r0a199gv6w5bjaxp6wm")))) (properties `((upstream-name . "GenomicFiles"))) (build-system r-build-system) (propagated-inputs @@ -7448,13 +7780,13 @@ provide added flexibility for data combination and manipulation.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.52.0") + (version "1.54.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "0vbr8nqn4pk0w3wx94q4f44psy6lxgx4b7p8hp0vf46flwggj2lj")))) + "1vrs3r8dyhhwj0s3vwvr168s84x5hj10lnpg1xf5c2kbj26bdv0w")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) @@ -7475,13 +7807,13 @@ manipulating genomic intervals and variables defined along a genome.") (define-public r-glad (package (name "r-glad") - (version "2.64.0") + (version "2.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GLAD" version)) (sha256 (base32 - "0fi7wwn0ai4bwy8wgwl4dh3fbl6zhrkcy662dc1fcnk5i7rnv3y5")))) + "04wyzn56crz7sa453qj07p90vvg8nwrqz54m9ms9vf9z8adpck51")))) (properties `((upstream-name . "GLAD"))) (build-system r-build-system) (inputs (list gsl)) @@ -7499,13 +7831,13 @@ regions identified.") (define-public r-globalancova (package (name "r-globalancova") - (version "4.18.0") + (version "4.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GlobalAncova" version)) (sha256 (base32 - "1fld18rmi6rqm2nr549a4740w1iq3mf5df67v9ba6h42r4abs1ar")))) + "0j1ma04zjsvf668idms8hx1vnw3sh5yy8fbhwscyk1qbfy708cfh")))) (properties `((upstream-name . "GlobalAncova"))) (build-system r-build-system) (propagated-inputs (list r-annotate @@ -7531,13 +7863,13 @@ linear models via the extra sum of squares principle.") (define-public r-globaltest (package (name "r-globaltest") - (version "5.54.0") + (version "5.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "globaltest" version)) (sha256 (base32 - "0jjhhg4vi44xqlvmcd80m30m93qyd4c79i7m9jn5hz3mw211xaig")))) + "14kcsx1gynl0fijq67qb5zvfxn4yqj8809p7535y455rd0vddp5r")))) (properties `((upstream-name . "globaltest"))) (build-system r-build-system) (propagated-inputs @@ -7555,14 +7887,14 @@ facilitate the use of this test for gene set testing of GO and KEGG terms.") (define-public r-gostats (package (name "r-gostats") - (version "2.66.0") + (version "2.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOstats" version)) (sha256 (base32 - "1jjcjc1zp42l3gw36rr84al07ghih0cjx4p8gn8rlmv1jsz6kp1h")))) + "1v10ss1gf4a3qp6hbwa2f0la9sgiwhszg4c45qd6gv0dja2v30fs")))) (properties `((upstream-name . "GOstats"))) (build-system r-build-system) (propagated-inputs @@ -7573,8 +7905,8 @@ facilitate the use of this test for gene set testing of GO and KEGG terms.") r-category r-go-db r-graph - r-rgraphviz - r-rbgl)) + r-rbgl + r-rgraphviz)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/GOstats") (synopsis "Tools for manipulating GO and microarrays") @@ -7587,14 +7919,14 @@ testing and other simple calculations.") (define-public r-gseabase (package (name "r-gseabase") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GSEABase" version)) (sha256 (base32 - "0xfcgvsglcwkwsb1azmp4n4hx95fxnjk7rlwggb1f5rjw440qjnh")))) + "1y7z3627shskwss8bzjz1xm02rv4s7cdi91v1xqdsbdayjkrh1nb")))) (properties `((upstream-name . "GSEABase"))) (build-system r-build-system) (propagated-inputs @@ -7616,13 +7948,13 @@ Enrichment Analysis} (GSEA).") (define-public r-gsva (package (name "r-gsva") - (version "1.48.3") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GSVA" version)) (sha256 (base32 - "0ljfw65ray9ks8g55bfzn0c1w4412y4a7996zddywn5qj5pkjkfb")))) + "01w5j7fmi3hsfd282kcn4v41mi58z2yfhapff2zgf9swdfps4m6z")))) (properties `((upstream-name . "GSVA"))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -7656,13 +7988,13 @@ manner.") (define-public r-harshlight (package (name "r-harshlight") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Harshlight" version)) (sha256 (base32 - "1rg3gx42a68jqbdmbqx7lh97y0rird1lci7146hnxa4svj827d5p")))) + "1djs95l04b3qrqcb7jkzhfmxzbsn2riyydz8p2lmilg6z9rkdqx7")))) (properties `((upstream-name . "Harshlight"))) (build-system r-build-system) (propagated-inputs @@ -7683,14 +8015,14 @@ matrix to solve the memory problem.") (define-public r-hpar (package (name "r-hpar") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hpar" version)) (sha256 (base32 - "1sg0mjada72a13xh3k6xsiaff7xj4mp76r6i8iab8nfkvng07p4i")))) + "19jdy0q3larl5lxjzqlnyynq9rya56fyvf1yx9pwsyag1c148z08")))) (build-system r-build-system) (arguments (list @@ -7715,19 +8047,120 @@ matrix to solve the memory problem.") the Human Protein Atlas project.") (license license:artistic2.0))) +(define-public r-r3cseq + (package + (name "r-r3cseq") + (version "1.48.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "r3Cseq" version)) + (sha256 + (base32 "1llkfcy13h0c973703jmpgp2n6xxfsizb9iw1wxzgkbp1v0iy268")))) + (properties `((upstream-name . "r3Cseq"))) + (build-system r-build-system) + (propagated-inputs + (list r-biostrings + r-data-table + r-genomeinfodb + r-genomicranges + r-iranges + r-qvalue + r-rcolorbrewer + r-rsamtools + r-rtracklayer + r-sqldf + r-vgam)) + (home-page "http://r3cseq.genereg.net/Site/index.html") + (synopsis + "Analysis of Chromosome conformation capture and Next-generation sequencing") + (description + "This package is used for the analysis of long-range chromatin +interactions from 3C-seq assay.") + (license license:gpl3))) + +(define-public r-r4rna + (package + (name "r-r4rna") + (version "1.30.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "R4RNA" version)) + (sha256 + (base32 "1qmr1s7z2f126wkwxjpr9fvak4i7mzgvfflkycgavbdqshn1rk6l")))) + (properties `((upstream-name . "R4RNA"))) + (build-system r-build-system) + (propagated-inputs (list r-biostrings)) + (home-page "https://www.e-rna.org/r-chie/") + (synopsis "RNA visualization and analysis") + (description + "This package provides a package for RNA basepair analysis, including the +visualization of basepairs as arc diagrams for easy comparison and annotation of +sequence and structure. Arc diagrams can additionally be projected onto +multiple sequence alignments to assess basepair conservation and covariation, +with numerical methods for computing statistics for each.") + (license license:gpl3))) + +(define-public r-radiogx + (package + (name "r-radiogx") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RadioGx" version)) + (sha256 + (base32 "0ykmvva5h1y7x9bxhqqfc18car9nasy06v1jjban7dlm95dl8nmk")))) + (properties `((upstream-name . "RadioGx"))) + (build-system r-build-system) + (propagated-inputs + (list r-assertthat + r-biobase + r-biocgenerics + r-biocparallel + r-catools + r-coregx + r-data-table + r-downloader + r-magicaxis + r-matrixstats + r-rcolorbrewer + r-reshape2 + r-s4vectors + r-scales + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/RadioGx") + (synopsis "Analysis of large-scale radio-genomic data") + (description + "This package is a computational tool box for radio-genomic analysis +which integrates radio-response data, radio-biological modelling and +comprehensive cell line annotations for hundreds of cancer cell lines. The +@code{RadioSet} class enables creation and manipulation of standardized +datasets including information about cancer cells lines, radio-response assays +and dose-response indicators. Included methods allow fitting and plotting +dose-response data using established radio-biological models along with +quality control to validate results. Additional functions related to fitting +and plotting dose response curves, quantifying statistical correlation and +calculating @acronym{AUC, area under the curve} or @acronym{SF, survival +fraction} are included.") + (license license:gpl3))) + (define-public r-raggedexperiment (package (name "r-raggedexperiment") - (version "1.24.2") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RaggedExperiment" version)) (sha256 (base32 - "0aa886mmk1c5h1i3xnk4niq4ylrawpsn2f62hwmfj5dsyl8a36ka")))) + "07wx2icvxgrds1w7cx9pn99z6rzk2ih938j8g1laxmgx9sya74v6")))) (properties `((upstream-name . "RaggedExperiment"))) (build-system r-build-system) - (propagated-inputs (list r-biocgenerics + (propagated-inputs (list r-biocbaseutils + r-biocgenerics r-genomeinfodb r-genomicranges r-iranges @@ -7751,13 +8184,13 @@ rectangular dataset.") (define-public r-rdisop (package (name "r-rdisop") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rdisop" version)) (sha256 (base32 - "02mj02sa9qxc6678irx7g3yzab4sa5sf4jkdjzsi9i6519xd7sa4")))) + "1jz063hsrrbrqqx8p5yknagw19hsw51arck591h95dckncxd0006")))) (properties `((upstream-name . "Rdisop"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -7773,14 +8206,14 @@ be calculated to search in MS peak lists.") (define-public r-rhtslib (package (name "r-rhtslib") - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhtslib" version)) (sha256 (base32 - "1p8imns26knh21r254n7i9xvy8xzz3zizx0kq4si7cdaf2b4xayi")))) + "1h0hzs4f4mmnpi436dgib9lakljacznkyyssy7c4mdd419431aq2")))) (properties `((upstream-name . "Rhtslib"))) (build-system r-build-system) ;; Without this a temporary directory ends up in the Rhtslib.so binary, @@ -7799,16 +8232,52 @@ nucleotide sequence analysis. The package is primarily useful to developers of other R packages who wish to make use of HTSlib.") (license license:lgpl2.0+))) +(define-public r-rnbeads + (package + (name "r-rnbeads") + (version "2.20.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RnBeads" version)) + (sha256 + (base32 "15z7l4nmpy01xm19717l27nwf3rfsn6wjv211fn2y4ls40mz75qp")))) + (properties `((upstream-name . "RnBeads"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocgenerics + r-cluster + r-ff + r-fields + r-genomicranges + r-ggplot2 + r-gplots + r-gridextra + r-illuminaio + r-iranges + r-limma + r-mass + r-matrixstats + r-methylumi + r-plyr + r-s4vectors)) + (home-page "https://bioconductor.org/packages/RnBeads") + (synopsis "RnBeads") + (description + "@code{RnBeads} facilitates comprehensive analysis of various types of DNA +methylation data at the genome scale.") + (license license:gpl3))) + (define-public r-impute (package (name "r-impute") - (version "1.74.1") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "impute" version)) (sha256 (base32 - "0nz8ggzk2g5w20yyhp6av6hy69kbmg3ncfpq9ppmq6p5a0msx92l")))) + "0q7mnx99ndna1r2r0v7jc3w8ly8qw33flwbgkcvrfhk6dzvbn4pl")))) (native-inputs (list gfortran)) (build-system r-build-system) @@ -7819,16 +8288,17 @@ of other R packages who wish to make use of HTSlib.") microarray data, using nearest neighbor averaging.") (license license:gpl2+))) +;; TODO: check javascript (define-public r-interactivedisplay (package (name "r-interactivedisplay") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "interactiveDisplay" version)) (sha256 (base32 - "1y9fdnpz1bagrwhyj8jikp2q5fd9y74j48l5z7f0s88v88sa7szl")) + "0w81c5kc48gjavln50ysgr3vaf8s4fb6632ckzb1q225j9ik2gia")) (snippet '(for-each delete-file '("inst/www/js/jquery.js" @@ -7865,9 +8335,7 @@ microarray data, using nearest neighbor averaging.") (propagated-inputs (list r-annotationdbi r-biocgenerics - r-biocmanager r-category - r-dt r-ggplot2 r-gridsvg r-interactivedisplaybase @@ -7875,7 +8343,6 @@ microarray data, using nearest neighbor averaging.") r-rcolorbrewer r-reshape2 r-shiny - r-zlibbioc r-xml)) (native-inputs `(("esbuild" ,esbuild) @@ -7906,14 +8373,14 @@ visualizations and interfaces for working with Bioconductor data.") (define-public r-interactivedisplaybase (package (name "r-interactivedisplaybase") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "interactiveDisplayBase" version)) (sha256 (base32 - "1p3lwk8g14srkhl3x3i0v2d9071251ldy9964mii11k1bp2g08am")))) + "14cw90qlp8y4k0fs7xim8qvhzwbb8sn334mc72fkxg1h4bs8bxjw")))) (properties `((upstream-name . "interactiveDisplayBase"))) (build-system r-build-system) @@ -7931,14 +8398,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.40.1") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "13pbw5nlkjwplliv2pdwazv2idfjklvw0ykx5ja8rchvzs5f1vk4")))) + "05fc1i1bcdvvy4mr4m2cdqxd3jrj1rxkxy7c43yrliv5dlikyb07")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs @@ -7955,13 +8422,13 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-lea (package (name "r-lea") - (version "3.12.2") + (version "3.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "LEA" version)) (sha256 (base32 - "1kxrrl8pxhaipmzsw8gs4gs8g8xbp8169z9f7bcpgrfapnawafm9")))) + "1rhlrcp9rzf64rkabgk3gd8jqdg8ldwpkxvpfb6g49bgpkg1h6b1")))) (properties `((upstream-name . "LEA"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -7986,13 +8453,13 @@ scale with the dimensions of large data sets.") (define-public r-lfa (package (name "r-lfa") - (version "2.0.11") + (version "2.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "lfa" version)) (sha256 - (base32 "0x169fxwlccsqwj1bpviaky3hfr0zdwsdrlgfvrb4j6j95qfgnns")))) + (base32 "1xrwvw7227znd1h7426k8l86197yc24b4v608issh5fqglmhljns")))) (properties `((upstream-name . "lfa"))) (build-system r-build-system) (propagated-inputs (list r-corpcor r-rspectra)) @@ -8007,14 +8474,16 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.56.2") + (version "3.58.1") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0miyba9frn1p4pkclzpr0bfazsk0br2jgpwpwwh773d3103hkn0r")))) + "01byjnhhjyxk9x871rk8bgqq6lkp1a6dylqbdphpzp88b1jf2f9m")))) (build-system r-build-system) + (native-inputs (list r-knitr)) + (propagated-inputs (list r-statmod)) (home-page "https://bioinf.wehi.edu.au/limma") (synopsis "Package for linear models for microarray and RNA-seq data") (description "This package can be used for the analysis of gene expression @@ -8026,13 +8495,13 @@ different technologies, including microarrays, RNA-seq, and quantitative PCR.") (define-public r-maaslin2 (package (name "r-maaslin2") - (version "1.14.1") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Maaslin2" version)) (sha256 - (base32 "06mb72hbzihdficv73yqbb2m86bkw78w3vbw1rm98n0npxq2fch6")))) + (base32 "1d95dv46b36ncwb7zdn0wvshg4v73qjfs3hij0jmbkkxvf2il9iq")))) (properties `((upstream-name . "Maaslin2"))) (build-system r-build-system) (propagated-inputs @@ -8074,13 +8543,13 @@ of data exploration, normalization, and transformation methods.") (define-public r-made4 (package (name "r-made4") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "made4" version)) (sha256 (base32 - "1233l5160msxp85vm2h0j3k073vv5d9wj55709x4s657fi9la6ij")))) + "03fhiszlmjh8nvz3gppf45r9kpcjrdb601ar17c4f2aygjpkf0cg")))) (properties `((upstream-name . "made4"))) (build-system r-build-system) (propagated-inputs @@ -8103,13 +8572,13 @@ datasets (coinertia analysis).") (define-public r-makecdfenv (package (name "r-makecdfenv") - (version "1.76.0") + (version "1.78.0") (source (origin (method url-fetch) (uri (bioconductor-uri "makecdfenv" version)) (sha256 (base32 - "1a6kngwmc7nvzlgpnhdv4j180847gjh4i3dshld0pcvy3b6bjv8r")))) + "0mggcw0390i1y2wn4k8570gjmbsx6hbipi8fkhz2zj9icsx89x1l")))) (properties `((upstream-name . "makecdfenv"))) (build-system r-build-system) (inputs (list zlib)) @@ -8130,13 +8599,13 @@ package that automatically loads that environment.") (define-public r-manor (package (name "r-manor") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MANOR" version)) (sha256 - (base32 "0ili9xy7vvw17mz44lxadv1vkf3ahpks2l34qa9yfccpalwhzriw")))) + (base32 "10zf6c1vx6cp4wg6axpmbpxk2hlmf6mga7rdh765fznwb71r4h0x")))) (properties `((upstream-name . "MANOR"))) (build-system r-build-system) (propagated-inputs (list r-glad)) @@ -8153,13 +8622,13 @@ experiments.") (define-public r-maser (package (name "r-maser") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "maser" version)) (sha256 (base32 - "1ma5d1i56gw8hm2pgvzzvmdd1cm2xb42rgf5lb6sf4v47yzlyb9f")))) + "0h7x1fyfvnjc30w9ydbnlqijz58q2kcxv4yy784rf4adsrdhwh45")))) (properties `((upstream-name . "maser"))) (build-system r-build-system) (propagated-inputs @@ -8185,13 +8654,13 @@ and visualizaton of alternative splicing events generated by rMATS.") (define-public r-mdqc (package (name "r-mdqc") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mdqc" version)) (sha256 - (base32 "0y35z9sw3h77a5g4ah0fxrk5xh7irdw9z0y2jhh6dp0xxcqh6i0k")))) + (base32 "0q6ig9qdf2s9329wysrvgh13yq5c7n76as2c3mahqm78xb0mpplf")))) (properties `((upstream-name . "mdqc"))) (build-system r-build-system) (propagated-inputs @@ -8207,16 +8676,42 @@ array against the quality of the other arrays. Then, arrays with unusually high distances can be flagged as potentially low-quality.") (license license:lgpl2.0+))) +(define-public r-metabocoreutils + (package + (name "r-metabocoreutils") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MetaboCoreUtils" version)) + (sha256 + (base32 "0bs24dwqlm8isp231jds51l7v16q0gjli1qmhjxyva3qmi5yb4dl")))) + (properties `((upstream-name . "MetaboCoreUtils"))) + (build-system r-build-system) + (propagated-inputs (list r-mscoreutils)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/RforMassSpectrometry/MetaboCoreUtils") + (synopsis "Core utils for Metabolomics data") + (description + "@code{MetaboCoreUtils} defines metabolomics-related core functionality +provided as low-level functions to allow a data structure-independent usage +across various R packages. This includes functions to calculate between +ion (adduct) and compound mass-to-charge ratios and masses or functions to +work with chemical formulas. The package provides also a set of adduct +definitions and information on some commercially available internal standard +mixes commonly used in MS experiments.") + (license license:artistic2.0))) + (define-public r-metagenomeseq (package (name "r-metagenomeseq") - (version "1.42.0") + (version "1.43.0") (source (origin (method url-fetch) (uri (bioconductor-uri "metagenomeSeq" version)) (sha256 - (base32 "0293c531l0sjz8qxy7nrajfl081v9df0af9242017msbvyszq6wk")))) + (base32 "1m19qkwrbfr4yhbr1izfjka3brn1qasqql6alczv55l5h52m4s4b")))) (properties `((upstream-name . "metagenomeSeq"))) (build-system r-build-system) (propagated-inputs @@ -8244,13 +8739,13 @@ correlations.") (define-public r-metaneighbor (package (name "r-metaneighbor") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MetaNeighbor" version)) (sha256 (base32 - "151ip70la12kj80c0airi1yyjbj69gnkshd6kfk88wsvq7s179id")))) + "0y8nk9jq0z48phg13mf6hsfg8l54w6z6b67g0k1c9gmsb7aqq04d")))) (properties `((upstream-name . "MetaNeighbor"))) (build-system r-build-system) (propagated-inputs @@ -8277,16 +8772,54 @@ on the basis that cells of the same type should have more similar gene expressio profiles than cells of different types.") (license license:expat))) +(define-public r-methylaid + (package + (name "r-methylaid") + (version "1.36.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "MethylAid" version)) + (sha256 + (base32 "0mzml9j6f7yycf9747ikkpfvxnwji07h8jhwa9a54ix2d0wyxk3d")))) + (properties `((upstream-name . "MethylAid"))) + (build-system r-build-system) + (propagated-inputs + (list r-biobase + r-biocgenerics + r-biocparallel + r-ggplot2 + r-gridbase + r-hexbin + r-matrixstats + r-minfi + r-rcolorbrewer + r-shiny + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://git.bioconductor.org/packages/MethylAid") + (synopsis + "Quality control of large Illumina DNA Methylation array data sets") + (description + "This package provides a visual and interactive web application using +RStudio's shiny package. Bad quality samples are detected using sample-dependent +and sample-independent controls present on the array and user adjustable +thresholds. In depth exploration of bad quality samples can be performed using +several interactive diagnostic plots of the quality control probes present on +the array. Furthermore, the impact of any batch effect provided by the user can +be explored.") + (license license:gpl2+))) + (define-public r-methylkit (package (name "r-methylkit") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "methylKit" version)) (sha256 (base32 - "1qi4gwlxsxr4cgs8s12qybrs89vr79xwd7n9in1af3hyn0swikn1")))) + "0y45wa45kblm2g3nylvybvyfc34sjlynhsz3dirhs1favb83sdiv")))) (properties `((upstream-name . "methylKit"))) (build-system r-build-system) (propagated-inputs @@ -8327,13 +8860,13 @@ TAB-Seq.") (define-public r-mfuzz (package (name "r-mfuzz") - (version "2.60.0") + (version "2.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Mfuzz" version)) (sha256 (base32 - "0rfna5ycwkx4xb2gv1wpfn7f7nz6f79w5nlkb7719l5730d81wnz")))) + "0v2l3fi9331lxfam6az265rfk52g4n75hh4rg12ykhp86ihplzpf")))) (properties `((upstream-name . "Mfuzz"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-e1071 r-tkwidgets)) @@ -8347,13 +8880,13 @@ time-series data (including a graphical user interface).") (define-public r-mmuphin (package (name "r-mmuphin") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MMUPHin" version)) (sha256 - (base32 "14cn1mg9ffhzy1vgschl2h0wzah3c1g67q367f2m050a3z2i2ndy")) + (base32 "0lhvsx5yjvqh5d3h860sv8cf3h73nrzvljpkqrd9ks0irc4gcm6d")) ;; Delete generated files. (snippet '(for-each delete-file @@ -8442,14 +8975,14 @@ throughput genetic sequencing data sets using regression methods.") (define-public r-muscat (package (name "r-muscat") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "muscat" version)) (sha256 (base32 - "1jcy07m8ywpgsmwkq6s7zj32w7gvxqj52j562irv2h2q429awdxk")))) + "0vasr9rwnfjxbb3y2saq7gqzis5xyamgvns2rlywdxv1jm0nr8y3")))) (properties `((upstream-name . "muscat"))) (build-system r-build-system) (propagated-inputs @@ -8492,14 +9025,14 @@ platform that mimics both single and multi-sample scRNA-seq data.") (define-public r-mutationalpatterns (package (name "r-mutationalpatterns") - (version "3.10.0") + (version "3.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MutationalPatterns" version)) (sha256 (base32 - "1p9n5afnr4cx690w9d5q1hkwqffsbnsn72wibqcl5rbqgfsvhf8h")))) + "19ya4ax6pa727hdn0118l9pwa9dxgh89dz54mm66dawxga3jhar4")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -8538,13 +9071,13 @@ in SNV base substitution data.") (define-public r-msa (package (name "r-msa") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "msa" version)) (sha256 (base32 - "08fg4y8rmkvilsx2hxqwxa90p2wqrl4iyndp7wfjicvplmaxp708")))) + "1csa8j64xrfr6kdnndr3876bplclca9wf6ydy9kg97xsjq7gz8q5")))) (properties `((upstream-name . "msa"))) (build-system r-build-system) (propagated-inputs @@ -8569,14 +9102,14 @@ package TeXshade.") (define-public r-msnbase (package (name "r-msnbase") - (version "2.26.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnbase" version)) (sha256 (base32 - "0qpgpvzg0vw45ia3dpkpfs56dj06crjrrg4i9l46bj8f2pgzcf0g")))) + "0dway94j3k2dq5p8lqzj49ql85xrxxxgmlgppqg0h8k56xqrmf5i")))) (properties `((upstream-name . "MSnbase"))) (build-system r-build-system) (propagated-inputs @@ -8614,14 +9147,14 @@ of mass spectrometry based proteomics data.") (define-public r-msnid (package (name "r-msnid") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MSnID" version)) (sha256 (base32 - "1mxlr76xrgp3limhr20naanhqr6b0d2wbk9l63j0pi2yckszxjjc")))) + "1hmfh7v7p5d741x2wh1njqwkmfmf3xmwkqy88kalrcjzrdwfpv9b")))) (properties `((upstream-name . "MSnID"))) (build-system r-build-system) (arguments @@ -8642,8 +9175,8 @@ of mass spectrometry based proteomics data.") r-foreach r-ggplot2 r-iterators - r-msnbase r-msmstests + r-msnbase r-mzid r-mzr r-protgenerics @@ -8671,14 +9204,14 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (define-public r-mzid (package (name "r-mzid") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzID" version)) (sha256 (base32 - "0grl7798vnpxb6nw98zj0lbvsrhkjfsyn0y15bi4v7vhyhkk26xm")))) + "1rgkd9iv0lxj1zxh96sifwa312ivw5kl5jw82ma4fmapr4iqhzsh")))) (properties `((upstream-name . "mzID"))) (build-system r-build-system) (propagated-inputs @@ -8702,14 +9235,14 @@ specific parser.") (define-public r-mzr (package (name "r-mzr") - (version "2.34.1") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mzR" version)) (sha256 (base32 - "1jsna4xwyph1gg72wwqlpavb65g5nc3db1vmcs1qcw1mdgasdjhk")) + "0z6ckp69syrdzhp6n4n399k2lar3w4n2d1ji2f90951c4ds6hkh8")) (modules '((guix build utils))) (snippet '(delete-file-recursively "src/boost")))) @@ -8822,14 +9355,14 @@ Gao et al in Nature Biotechnology 2022}.") (define-public r-organism-dplyr (package (name "r-organism-dplyr") - (version "1.28.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Organism.dplyr" version)) (sha256 (base32 - "0yrd7a7c0n6c987gyy76jidpvsdwrv2097f9wkvh4y5dd1w0mk7p")))) + "1s55fiqgxrdznn43qhm5yv9gp8d1msr2f39wxih0b5bm4wxhkq45")))) (properties `((upstream-name . "Organism.dplyr"))) (build-system r-build-system) (propagated-inputs @@ -8861,14 +9394,14 @@ functionality of the @code{TxDb} packages (e.g., (define-public r-organismdbi (package (name "r-organismdbi") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "OrganismDbi" version)) (sha256 (base32 - "1pw3qd6n0xf7vq3x73612bndcqhwrqkpi29f6crazdzjcy3fivlb")))) + "0g75y21lqmwsh28nx99zp2gxr6rhlhbw76f66qx5hrh6bm2zpm7j")))) (properties `((upstream-name . "OrganismDbi"))) (build-system r-build-system) (propagated-inputs @@ -8894,13 +9427,13 @@ the fact that each of these packages implements a select methods.") (define-public r-oscope (package (name "r-oscope") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Oscope" version)) (sha256 (base32 - "055j7y1icikqivc795hzl1l5v5ga2bfcqk2x0kivawbrqvj4yq5v")))) + "1li2l9mdq2q0580a7qzvfid5n15v62fr9ys87j42k3l2w5a26smf")))) (properties `((upstream-name . "Oscope"))) (build-system r-build-system) (propagated-inputs (list r-biocparallel r-cluster r-ebseq r-testthat)) @@ -8920,14 +9453,14 @@ insertion module to recover the base cycle order for each oscillator group.") (define-public r-pcaexplorer (package (name "r-pcaexplorer") - (version "2.26.1") + (version "2.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pcaExplorer" version)) (sha256 (base32 - "04r4qsiasbfb0pwqyqmw2w3qdkhgwixwffp1s8hjflwnb63hxzjx")))) + "0ihc9jqjy0nl4pfgcxczfdf973nb99325agk73y0222ad1mpkc07")))) (properties `((upstream-name . "pcaExplorer"))) (build-system r-build-system) (propagated-inputs @@ -8975,14 +9508,14 @@ application encapsulates the whole analysis.") (define-public r-pcamethods (package (name "r-pcamethods") - (version "1.92.0") + (version "1.94.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pcaMethods" version)) (sha256 (base32 - "14awrgq56s948x74j4iv9k1yy5b7axw1kqzg827y5znjc1i3aqy6")))) + "1asm4iafdzm98iv2j9sxvn5y9ss2p679cx7gwjipq8mf1d7bzfp0")))) (properties `((upstream-name . "pcaMethods"))) (build-system r-build-system) (propagated-inputs @@ -9002,13 +9535,13 @@ structure (pcaRes) to provide a common interface to the PCA results.") (define-public r-pfamanalyzer (package (name "r-pfamanalyzer") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pfamAnalyzeR" version)) (sha256 (base32 - "0zff887lc4bjrv683kqsw47vjwmf6886wybklsf2wd6hpy23mxfy")))) + "0qxxp7kfwbb9q471mgwc4bd8dmyid56ddyzw2jlg4gb1wcq9py67")))) (properties `((upstream-name . "pfamAnalyzeR"))) (build-system r-build-system) (propagated-inputs (list r-dplyr r-magrittr r-readr r-stringr r-tibble)) @@ -9022,6 +9555,74 @@ isotypes. This R package enables the identification and classification of such domain isotypes from pfam data.") (license license:expat))) +(define-public r-piano + (package + (name "r-piano") + (version "2.18.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "piano" version)) + (sha256 + (base32 "0rw55ig3pbvi2kyg10rx60ldcncsd4gki2h1zpr1nhmqg3fv0l5y")))) + (properties `((upstream-name . "piano"))) + (build-system r-build-system) + (propagated-inputs + (list r-biobase + r-biocgenerics + r-dt + r-fgsea + r-gplots + r-htmlwidgets + r-igraph + r-marray + r-relations + r-scales + r-shiny + r-shinydashboard + r-shinyjs + r-visnetwork)) + (native-inputs (list r-knitr)) + (home-page "https://varemo.github.io/piano/") + (synopsis "Platform for integrative analysis of omics data") + (description + "Piano performs gene set analysis using various statistical methods, from +different gene level statistics and a wide range of gene-set collections. The +package contains functions for combining the results of multiple runs of gene +set analyses.") + (license license:gpl2+))) + +(define-public r-powertcr + (package + (name "r-powertcr") + (version "1.22.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "powerTCR" version)) + (sha256 + (base32 "06fmphdq95pjbbvm8m8h1wajbp3vhl0zj7ddbzks9fy7ankp1n3i")))) + (properties `((upstream-name . "powerTCR"))) + (build-system r-build-system) + (propagated-inputs + (list r-cubature + r-doparallel + r-evmix + r-foreach + r-magrittr + r-purrr + r-truncdist + r-vegan + r-vgam)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/powerTCR") + (synopsis "Model-based comparative analysis of the TCR repertoire") + (description + "This package provides a model for the clone size distribution of the +@acronym{TCR, T-cell receptor} repertoire. Further, it permits comparative +analysis of TCR repertoire libraries based on theoretical model fits.") + (license license:artistic2.0))) + ;; This is a CRAN package, but it depends on a Bioconductor package: ;; r-aroma-light, r-dnacopy.. (define-public r-pscbs @@ -9067,14 +9668,14 @@ chromosome. Both tumor-normal paired and tumor-only analyses are supported.") (define-public r-protgenerics (package (name "r-protgenerics") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ProtGenerics" version)) (sha256 (base32 - "0fgsb47qrvrl4y3yr094mas22rai5h5yl9mciadd6zcpamp2p01i")))) + "1gjva76nxa9nzzmc9hya3bq7hswfmjd768v21f6m3gyygxvl581m")))) (properties `((upstream-name . "ProtGenerics"))) (build-system r-build-system) (home-page "https://github.com/lgatto/ProtGenerics") @@ -9087,14 +9688,14 @@ proteomics packages.") (define-public r-rbgl (package (name "r-rbgl") - (version "1.76.0") + (version "1.78.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RBGL" version)) (sha256 (base32 - "0y6ghiwraw3whs57i31qnvlvqlbl9143wxv2yg48rp7qxipxvn6s")))) + "0hxhl1l6qdi355w5y7fdq8vlba2pknfizggkgr2fp8f1f3zqh494")))) (properties `((upstream-name . "RBGL"))) (build-system r-build-system) (propagated-inputs @@ -9110,13 +9711,13 @@ the graph algorithms contained in the Boost library.") (define-public r-rcas (package (name "r-rcas") - (version "1.26.0") + (version "1.28.2") (source (origin (method url-fetch) (uri (bioconductor-uri "RCAS" version)) (sha256 (base32 - "073fhbh0pzyca90q2irbaiwj21sci8jf9ksflx9pm9fr1giy37i4")))) + "19ildsck3g8v4w0g2f473sb8hyhn4avprdi78fim0prva5f9nqnv")))) (properties `((upstream-name . "RCAS"))) (build-system r-build-system) (propagated-inputs @@ -9142,9 +9743,9 @@ the graph algorithms contained in the Boost library.") r-plotrix r-proxy r-ranger + r-rmarkdown r-rsqlite r-rtracklayer - r-rmarkdown r-s4vectors pandoc)) (native-inputs @@ -9160,14 +9761,14 @@ library implementing most of the pipeline's features.") (define-public r-regioner (package (name "r-regioner") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "regioneR" version)) (sha256 (base32 - "0grlqga9d6mch9l487fdll65wi0m2kpq2097igfhx185i8jvwsz1")))) + "1qcgbj7d2fngs3p9a9apnj14x35kc651fy3m0651dnqrxz8j5yij")))) (properties `((upstream-name . "regioneR"))) (build-system r-build-system) (propagated-inputs @@ -9274,16 +9875,16 @@ browser.") (define-public r-rhdf5 (package (name "r-rhdf5") - (version "2.44.0") + (version "2.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rhdf5" version)) (sha256 (base32 - "1akbr55lylwp20b2j351h1gcj1sc5y2j2pjjdpz43m6b7mji23a0")))) + "1csf5nrg2nkdwh8cz26idz6wrhj7bgnfh559mzlpdj4licnf1ymc")))) (build-system r-build-system) (propagated-inputs - (list r-rhdf5filters r-rhdf5lib)) + (list r-rhdf5filters r-rhdf5lib r-s4vectors)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/rhdf5") @@ -9301,42 +9902,26 @@ the available RAM.") (define-public r-rhdf5filters (package (name "r-rhdf5filters") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rhdf5filters" version)) (sha256 (base32 - "1v9wxa5q0iwphrmkf9x70jpbq9r9rqz2hm94smqnnpfxszila49m")))) + "1appjnggyljrn77nvv9adkwxplbrrlgkrrd1bf2b5r0nsa505hdc")))) (properties `((upstream-name . "rhdf5filters"))) (build-system r-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'use-system-libraries - (lambda _ - (substitute* "src/blosc/Makefile.in" - (("libblosc.a: blosc") "libwhatever.a:") - (("libblosc.a") - (string-append #$(this-package-input "c-blosc") - "/lib/libblosc.so")) - (("../zstd/libzstd.a") "-lzstd")) - (substitute* "src/bzip2/Makefile" - (("libH5Zbz2.so: bzip2-1.0.8/libbz2.a") "libH5Zbz2.so:") - (("./bzip2-1.0.8/libbz2.a") "-lbz2")) - (substitute* "src/zstd/Makefile" - (("libH5Zzstd.so: libzstd.a") "libH5Zzstd.so:") - (("libzstd.a") "-lzstd")) - (substitute* "src/vbz/Makefile" - (("../zstd/libzstd.a") "-lzstd"))))))) + #:configure-flags + '(list "--without-bundled-libs"))) (propagated-inputs (list r-rhdf5lib)) (inputs (list bzip2 c-blosc zlib (list zstd "lib"))) (native-inputs - (list r-biocstyle r-knitr r-rmarkdown)) + (list r-knitr)) (home-page "https://github.com/grimbough/rhdf5filters") (synopsis "HDF5 compression filters") (description @@ -9347,13 +9932,13 @@ HDF5 datasets.") (define-public r-rsamtools (package (name "r-rsamtools") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsamtools" version)) (sha256 (base32 - "18kh6vmyjmv7zklqr5ifpfixjwldxgwj550c69mqfkk7m0zk52cl")))) + "0bcapiwdzv7rqgs4hmw7hq290r3pz5vvhg4apxard0yybq83na1g")))) (properties `((upstream-name . "Rsamtools"))) (build-system r-build-system) @@ -9376,7 +9961,8 @@ HDF5 datasets.") r-iranges r-rhtslib r-s4vectors - r-xvector)) + r-xvector + r-zlibbioc)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") (synopsis "Interface to samtools, bcftools, and tabix") @@ -9413,13 +9999,13 @@ tab-delimited (tabix) files.") (define-public r-rtcga (package (name "r-rtcga") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RTCGA" version)) (sha256 (base32 - "1y7ciq1270dc1c9y490fygrsylyzwl52fqi1vj7r75hy3rnwnv25")))) + "1lzdwkisvzj1wyx3wx4ll1c2j9ww3xz8kpbngmpf8cdrw4h3jrg1")))) (properties `((upstream-name . "RTCGA"))) (build-system r-build-system) (propagated-inputs (list r-assertthat @@ -9458,13 +10044,13 @@ transforms TCGA data to tidy form which is convenient to use.") (define-public r-rtcgatoolbox (package (name "r-rtcgatoolbox") - (version "2.30.0") + (version "2.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "RTCGAToolbox" version)) (sha256 (base32 - "03p5rgjzc1265q60jkvk92vhcib5wdnv6bz997r70q9c39y03wm5")))) + "1a38b30nsg2bnlnijf4aa4rn4db2y4v86awfbf6a6qzqwlzknrcq")))) (properties `((upstream-name . "RTCGAToolbox"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -9474,7 +10060,6 @@ transforms TCGA data to tidy form which is convenient to use.") r-genomicranges r-httr r-raggedexperiment - r-rcircos r-rcurl r-rjsonio r-rvest @@ -9498,13 +10083,13 @@ pre-processed data.") (define-public r-rtracklayer (package (name "r-rtracklayer") - (version "1.60.1") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rtracklayer" version)) (sha256 (base32 - "06z02sz8zjg2lxp2q4qwhvh6dsi6srirdmhcdvmi3as50nnjmzd8")))) + "1jxhv2fq62lz0j6kbwq43c8ggk14ccsjg0xgfqjqy941dj9ig0n2")))) (build-system r-build-system) (arguments `(#:phases @@ -9577,13 +10162,13 @@ differential expression analysis, RNAseq data and related problems.") (define-public r-saturn (package (name "r-saturn") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "satuRn" version)) (sha256 (base32 - "0frm7iblxkc8ajcdqrfgsvf4krn6x8cr3mx7fnzq06xij0mqm3sj")))) + "12bivj0cnp38apwi3jqmil8bwsfa96cjp5f132a5raacd2z87gqf")))) (properties `((upstream-name . "satuRn"))) (build-system r-build-system) (propagated-inputs (list r-biocparallel @@ -9611,13 +10196,13 @@ transcripts in groups of interest.") (define-public r-scannotatr (package (name "r-scannotatr") - (version "1.6.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scAnnotatR" version)) (sha256 - (base32 "0mxq2dknrhgj1487kfshkayx963c7qdgxwmlh9fbfr0lwc7gljfn")))) + (base32 "13wrxxdwphngi0f9vxakykk54bqngw8g38w6wkk96999lzb3p57p")))) (properties `((upstream-name . "scAnnotatR"))) (build-system r-build-system) (propagated-inputs @@ -9648,13 +10233,13 @@ cell types based on specific research needs.") (define-public r-scdblfinder (package (name "r-scdblfinder") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scDblFinder" version)) (sha256 - (base32 "0lvacrgfj9i8mwlcv5ykxs69hd3bm6bvr6fsddxffsr7cckpn31w")))) + (base32 "1f3n1m6fjx965wm2jllzk51ssj92ifxb4bln4vwk25qxd3g0bna8")))) (properties `((upstream-name . "scDblFinder"))) (build-system r-build-system) (propagated-inputs @@ -9730,13 +10315,13 @@ method applicable to massive single-cell datasets (>10,000 cells).") (define-public r-scmap (package (name "r-scmap") - (version "1.22.3") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scmap" version)) (sha256 - (base32 "06i3r7zybwcgnak9ml2jaz7fy70zjqdh28v03ckaqhvck49kdqdm")))) + (base32 "1sd5ixs8fbiqqp1p4p505l1f0lncmagkhzh4xrk8wrca6db6k6d8")))) (properties `((upstream-name . "scmap"))) (build-system r-build-system) (propagated-inputs @@ -9769,16 +10354,59 @@ a scRNA-seq experiment onto the cell-types or individual cells identified in a different experiment.") (license license:gpl3))) +(define-public r-screpertoire + (package + (name "r-screpertoire") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "scRepertoire" version)) + (sha256 + (base32 "1wgs8dv5zl82iciy86w5ws1gq8v2piklcifbw7gmbw60kijyr2l1")))) + (properties `((upstream-name . "scRepertoire"))) + (build-system r-build-system) + (propagated-inputs + (list r-doparallel + r-dplyr + r-ggalluvial + r-ggplot2 + r-ggraph + r-igraph + r-plyr + r-powertcr + r-reshape2 + r-rlang + r-seuratobject + r-singlecellexperiment + r-stringdist + r-stringr + r-summarizedexperiment + r-tidygraph + r-vegan)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/scRepertoire") + (synopsis "Toolkit for single-cell immune receptor profiling") + (description + "The scRepertoire package was built to process data derived from the 10x +Genomics Chromium Immune Profiling for both @acronym{TCR, T-cell receptor} and +@acronym{Ig, immunoglobulin} enrichment workflows and subsequently interacts with +the popular Seurat and SingleCellExperiment R packages. It also allows for +general analysis of single-cell clonotype information without the use of +expression information. The package functions as a wrapper for Startrac and +powerTCR R packages.") + (license license:gpl2))) + (define-public r-scry (package (name "r-scry") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scry" version)) (sha256 (base32 - "0406slld468m9lxswv1akcdmap6izvzz6zljyrs5av546nfxpmrz")))) + "0hbdsjsn0jl0dr2ly5vx0wb4bnz7nl15kkypryywjvis9rdasjj3")))) (properties `((upstream-name . "scry"))) (build-system r-build-system) (propagated-inputs @@ -9803,13 +10431,13 @@ single-cell RNA-seq.") (define-public r-seqarray (package (name "r-seqarray") - (version "1.40.1") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SeqArray" version)) (sha256 (base32 - "1771vk23psjavvi1nf2z8i2xawygdh4amawlijnskci8y9w4x5dm")))) + "0zs60yh3x6kgy6izn11d400vw59ww2w6bmhg6fw5ijinknyr3ixc")))) (properties `((upstream-name . "SeqArray"))) (build-system r-build-system) (propagated-inputs (list r-biostrings @@ -9833,14 +10461,14 @@ data access using the R programming language.") (define-public r-seqlogo (package (name "r-seqlogo") - (version "1.66.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqLogo" version)) (sha256 (base32 - "0727yrmm194gskrcpmq4fh0qmi6dnp70gx627psrpvzlk6vlcl8k")))) + "106359wn4v0m53b33x4zjsyjsj4j8h7bnvd1whamsig982h6szp2")))) (properties `((upstream-name . "seqLogo"))) (build-system r-build-system) (native-inputs @@ -9856,13 +10484,13 @@ Stephens (1990).") (define-public r-seqpattern (package (name "r-seqpattern") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqPattern" version)) (sha256 (base32 - "033hss67dxi6fbvn6ya7vc61f60m20hwms9kmdia0icyp8nv2yil")))) + "0rs9dy540d4agp7fc8glbrcnly4s6qcxqsq4yv8y555bbdld6dv0")))) (properties `((upstream-name . "seqPattern"))) (build-system r-build-system) @@ -9879,13 +10507,13 @@ reference point and sorted by a user defined feature.") (define-public r-sesame (package (name "r-sesame") - (version "1.18.4") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sesame" version)) (sha256 (base32 - "1il33ygys6y72l8p3fhx301q16w9kylfy6w92b64n8gqkn6dmsmn")))) + "0yh4mrsj3pqhjkrq5dwmcpcqwixs0pmjy7dfa3cr0mf52fgzcvmr")))) (properties `((upstream-name . "sesame"))) (build-system r-build-system) (propagated-inputs (list r-biocfilecache @@ -9921,13 +10549,13 @@ and advanced quality control routines.") (define-public r-shinymethyl (package (name "r-shinymethyl") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "shinyMethyl" version)) (sha256 (base32 - "0hq1q66vjd9pwdwm9zx8q45ws65bn6cm87zmjmyc3md8dwvb8cck")))) + "1gkj15q1rxvsdzbsp3gkk02kvvx0kq4wsqycf3ln1bszb9688jw6")))) (properties `((upstream-name . "shinyMethyl"))) (build-system r-build-system) (propagated-inputs @@ -9949,14 +10577,14 @@ methylation array data. Both the 450k and EPIC array are supported.") (define-public r-shortread (package (name "r-shortread") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ShortRead" version)) (sha256 (base32 - "0wpr3ksr7j5yk6m1zaa47dwdgznajsz8as4p9vf7schaqvhq1wc4")))) + "0fgiszb5qhplppfngpi4s33sx62ff5sdhd6n31a3b6l7fnlvk51m")))) (properties `((upstream-name . "ShortRead"))) (build-system r-build-system) (inputs @@ -9969,11 +10597,11 @@ methylation array data. Both the 450k and EPIC array are supported.") r-genomeinfodb r-genomicalignments r-genomicranges - r-rhtslib r-hwriter r-iranges r-lattice r-latticeextra + r-rhtslib r-rsamtools r-s4vectors r-xvector @@ -9992,14 +10620,14 @@ ungapped alignment formats.") (define-public r-simplifyenrichment (package (name "r-simplifyenrichment") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "simplifyEnrichment" version)) (sha256 (base32 - "1vs57j361fbwv7vaybs71vc208qn76djmbmakhwwcvxwrx77jp5f")))) + "0qhrlhf881mi2v0n0y410c0bf2cm3imrlglq8argnw86n9xj51pw")))) (properties `((upstream-name . "simplifyEnrichment"))) (build-system r-build-system) @@ -10033,13 +10661,13 @@ and comparing the clusterings.") (define-public r-singscore (package (name "r-singscore") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "singscore" version)) (sha256 (base32 - "1s1kyvkbfgwskf0hi4b44c2yx256rjp1yk9ijpld9qlm7z7pi67q")))) + "0hafzbhbik1512pisjvnnzmy8pl2shrgra6l06kpvsrczkqlmi04")))) (properties `((upstream-name . "singscore"))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -10071,13 +10699,13 @@ level.") (define-public r-tcgautils (package (name "r-tcgautils") - (version "1.20.4") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TCGAutils" version)) (sha256 (base32 - "02mkijvh2h58wg7hsi76ycw6gapl0ai190agckaw4l54sqpsx91q")))) + "0r79iiqv7q83wz5w3lm271dn3jdrkggmvjdyj1wnjsih1n2viy7d")))) (properties `((upstream-name . "TCGAutils"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -10110,13 +10738,13 @@ identifier translation via the GDC API.") (define-public r-tkwidgets (package (name "r-tkwidgets") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tkWidgets" version)) (sha256 (base32 - "1xp0gdfrhhfzfww4ig3y90f7334y24rhzrmlxmm4wav8slvcran2")))) + "11a8rflmga2d63l5nzdlbkyfnzsf20dzg2sy6qr143hg9sjzqrrj")))) (properties `((upstream-name . "tkWidgets"))) (build-system r-build-system) (propagated-inputs (list r-dyndoc r-widgettools)) @@ -10126,16 +10754,17 @@ identifier translation via the GDC API.") "This package implements widgets to provide user interfaces.") (license license:artistic2.0))) +;; TODO: check javascript (define-public r-trackviewer (package (name "r-trackviewer") - (version "1.36.2") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "trackViewer" version)) (sha256 (base32 - "1ngfpd308y8i3vgv07cggk2azs64lsyyc9zfi3pz0gapr33ha6a1")) + "15agkyqx6gl5zzdxra5nl0czd4j7mw456r587w039l9hzwznwbr8")) (snippet '(delete-file "inst/htmlwidgets/lib/d3/d3.v4.min.js")))) (properties `((upstream-name . "trackViewer"))) @@ -10195,13 +10824,13 @@ methylation data.") (define-public r-transcriptr (package (name "r-transcriptr") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "transcriptR" version)) (sha256 - (base32 "0i38zs33drzk9szy2mdfs9ff9c3ccjgiyyynrrsinrx0szc8l22r")))) + (base32 "1lbla2syljpmgdf7da7vl1260fy54xs3hk6m2gjpark0dka0kqbh")))) (properties `((upstream-name . "transcriptR"))) (build-system r-build-system) (propagated-inputs @@ -10245,14 +10874,14 @@ able to deal also with novel and case specific events.") (define-public r-trajectoryutils (package (name "r-trajectoryutils") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TrajectoryUtils" version)) (sha256 (base32 - "1q3c226fskl45gq28xj2w5paz2s9n9kxm0bkkgg0329w399cs09k")))) + "0pqdl0v16q90ffxla34rp07mq0if1q9izpbimfnq0rx7633mk95v")))) (properties `((upstream-name . "TrajectoryUtils"))) (build-system r-build-system) @@ -10272,13 +10901,13 @@ structures to hold pseudotime inference results.") (define-public r-scds (package (name "r-scds") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scds" version)) (sha256 (base32 - "059gahl679if8xsfgpxmi3h9fiagb6v08rd6rs7yv96s3pb8qywn")))) + "0cmzvc1m29ijhzs2p407bhhxfqbflzsnrk7nq0jshjyw6v6pkfn0")))) (properties `((upstream-name . "scds"))) (build-system r-build-system) (propagated-inputs (list r-dplyr @@ -10300,13 +10929,13 @@ scRNA-seq data computationally.") (define-public r-slingshot (package (name "r-slingshot") - (version "2.8.0") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "slingshot" version)) (sha256 (base32 - "1xr17rg8nfpcvdwa19qrcaqffkz048l5lkqlm6gw0abm8bg2k8x7")))) + "0q3j0jpc4mnmjb3xha5cmfhk1qdr1jiz7kdghznk4zqxn4bchc1d")))) (build-system r-build-system) (propagated-inputs (list r-igraph @@ -10372,19 +11001,20 @@ tools either included in speaq or available elsewhere on CRAN.") (define-public r-spectra (package (name "r-spectra") - (version "1.10.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Spectra" version)) (sha256 (base32 - "1fx6xkl29frfk8bzz5jvr1cn0hjyi46ck23izb1cypiag4lsrf8v")))) + "07zs9x5fzxzwicjc5x29sv33yidmq1ar70ss91py094zbw9i63qy")))) (properties `((upstream-name . "Spectra"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics r-biocparallel r-fs r-iranges + r-metabocoreutils r-mscoreutils r-protgenerics r-s4vectors)) @@ -10403,13 +11033,13 @@ data sets ensuring a small memory footprint.") (define-public r-stager (package (name "r-stager") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "stageR" version)) (sha256 - (base32 "0advih0g2g5w8bx9f21chz8a66f4v84qn3p5skxi084pp142v5ms")))) + (base32 "064hvx8qyw5hdhihwl9k0jqhg6saz4ng2m37d2ipr5pz9v8adspb")))) (properties `((upstream-name . "stageR"))) (build-system r-build-system) (propagated-inputs (list r-summarizedexperiment)) @@ -10426,13 +11056,13 @@ Biology at (define-public r-stringdb (package (name "r-stringdb") - (version "2.12.1") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "STRINGdb" version)) (sha256 - (base32 "1c0m9k3gjmj160k8xyj2r60lpx4qgp7xibljfg8ljxr33f8aqyaz")))) + (base32 "1ffn73sx0qbzbh8cjil9r159g0fjnvi6y8rlbg6nf7p3zx3aya54")))) (properties `((upstream-name . "STRINGdb"))) (build-system r-build-system) (propagated-inputs @@ -10459,13 +11089,13 @@ that integrates the various evidences.") (define-public r-structuralvariantannotation (package (name "r-structuralvariantannotation") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "StructuralVariantAnnotation" version)) (sha256 - (base32 "0gkps2pls9bpqr8sxm8zwdkn156g8r6mhf4bx17nif5s35qld1rb")))) + (base32 "1h3l3xbxwf2w2dl0qz72v68h5g77zhd2rr0g86l2dhn67mhy8ml2")))) (build-system r-build-system) (propagated-inputs (list r-assertthat @@ -10496,13 +11126,13 @@ involving two separate genomic loci encoded as GRanges objects.") (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") - (version "1.30.2") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SummarizedExperiment" version)) (sha256 (base32 - "05dy57fi43rpq9bhbsc4apa62xki99r84098pbvi3rjmac811425")))) + "1949k2658drmcrrr7v6748b40g2qym39n0ch50jxf0xmmlb1r04z")))) (properties `((upstream-name . "SummarizedExperiment"))) (build-system r-build-system) @@ -10531,13 +11161,13 @@ samples.") (define-public r-survcomp (package (name "r-survcomp") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "survcomp" version)) (sha256 (base32 - "1va0ijx3qk3rjhzaflygfwlzn5a670y833qly8in8p5r3al9bdj6")))) + "18a81vv88xj3frkdy5l6w2fc4xzr1k6vgbz4j4marlmh6mz6skin")))) (properties `((upstream-name . "survcomp"))) (build-system r-build-system) (propagated-inputs (list r-bootstrap @@ -10558,22 +11188,22 @@ of risk prediction (survival) models.") (define-public r-sva (package (name "r-sva") - (version "3.48.0") + (version "3.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sva" version)) (sha256 (base32 - "1f6ia57fn2sn7c2zdfswvj9kx8xayssrgf5q6hrr9nrxc0jq19g3")))) + "0p4zgw1pi5vnaqxn6jmvhpy0h5hnnqp41n0k2v0chhqgqxgn67x1")))) (build-system r-build-system) (propagated-inputs - (list r-edger + (list r-biocparallel + r-edger r-genefilter - r-mgcv - r-biocparallel + r-limma r-matrixstats - r-limma)) + r-mgcv)) (home-page "https://bioconductor.org/packages/sva") (synopsis "Surrogate variable analysis") (description @@ -10589,14 +11219,14 @@ unmodeled, or latent sources of noise.") (define-public r-systempiper (package (name "r-systempiper") - (version "2.6.3") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "systemPipeR" version)) (sha256 (base32 - "068rikfq32awhvj0abl30bghv5k2z4zlfkbxpmsdapxhmdzhgnba")))) + "01amqib9ahrf19xpy4ivlsss82zyp3w7fbgwrwp53zfbg0cninga")))) (properties `((upstream-name . "systemPipeR"))) (build-system r-build-system) (propagated-inputs @@ -10632,21 +11262,21 @@ annotation infrastructure.") (define-public r-topgo (package (name "r-topgo") - (version "2.52.0") + (version "2.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "topGO" version)) (sha256 (base32 - "0avjjvih387qhw8n4vjz4jq66q7sicgacsw53b85lq2c6ppib662")))) + "1sznyx11kzw8d8zg5ynl9sp6m0daf2yw3f2b24maxbpr1xkif9nx")))) (properties `((upstream-name . "topGO"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi - r-dbi r-biobase r-biocgenerics + r-dbi r-go-db r-graph r-lattice @@ -10665,13 +11295,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-tximport (package (name "r-tximport") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tximport" version)) (sha256 (base32 - "0km1vfn4jcp05jk5srrqanjngq6ghh5im6h1c424b926g9s7w7k1")))) + "0m6avd815xcv3py5sym083pdccvd4crdyyc7sfpxccnksgchyrf2")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -10724,15 +11354,16 @@ R, enabling interactive analysis and visualization of genome-scale data.") (define-public r-variantannotation (package (name "r-variantannotation") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantAnnotation" version)) (sha256 (base32 - "0masx496cd4ypz6r0l8kk8vi81sipqdnx4iyifjvkrds1p87mvsm")))) + "1r1cyimr5l5jzgxvmrm3vq8mvz3f1klfdwy9mz31xvnvgjacr58p")))) (properties `((upstream-name . "VariantAnnotation"))) + (build-system r-build-system) (propagated-inputs (list r-annotationdbi r-biobase @@ -10745,14 +11376,14 @@ R, enabling interactive analysis and visualization of genome-scale data.") r-genomicranges r-iranges r-matrixgenerics - r-summarizedexperiment r-rhtslib r-rsamtools r-rtracklayer r-s4vectors + r-summarizedexperiment r-xvector r-zlibbioc)) - (build-system r-build-system) + (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/VariantAnnotation") (synopsis "Package for annotation of genetic variants") (description "This R package can annotate variants, compute amino acid @@ -10762,14 +11393,14 @@ coding changes and predict coding outcomes.") (define-public r-vsn (package (name "r-vsn") - (version "3.68.0") + (version "3.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "vsn" version)) (sha256 (base32 - "0i6c0wyhj0gcq0mw13zyk60cza2baq4yrj1n2dzqgsqkmhm5lfla")))) + "0li0yxf8m34xpmrgv5vciy8zdsbfdlajl9cmnxr4g4nmarik2bkh")))) (build-system r-build-system) (propagated-inputs (list r-affy r-biobase r-ggplot2 r-lattice r-limma)) @@ -10831,13 +11462,13 @@ inference.") (define-public r-xina (package (name "r-xina") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "XINA" version)) (sha256 - (base32 "1byk8xgn9rwfbi677b99ysxi4a9n58fr3hbnwjzhnziy2n2cd703")))) + (base32 "1cnw2zbjfs8qcgqrx557g00m59h5pldcx788v9r4gn2f70rx7vx3")))) (properties `((upstream-name . "XINA"))) (build-system r-build-system) (propagated-inputs @@ -10867,13 +11498,13 @@ molecular functions, respectively, and produces intuitive graphical outputs.") (define-public r-xmapbridge (package (name "r-xmapbridge") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "xmapbridge" version)) (sha256 - (base32 "09pskmhjymqvhk26mk5yy1k195v536a2qp4k6xdd67xhf5ag260i")))) + (base32 "0pby2h8m12xlngpk33dvh3nkrpgqi4f2mb7g9jafyiv3sl8pjd19")))) (properties `((upstream-name . "xmapbridge"))) (build-system r-build-system) (home-page "https://git.bioconductor.org/packages/xmapbridge") @@ -10894,13 +11525,13 @@ describing each of the graphs.") (define-public r-xvector (package (name "r-xvector") - (version "0.40.0") + (version "0.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "XVector" version)) (sha256 (base32 - "1v10hfz658gnb6p7pzdl28jbyypv91wx70i0dvi384nfgznhvmj2")))) + "0h03imdl0pyy714kmddsdnsv69bd8kr7bhi9wq9z18y8ahg5cqx1")))) (properties `((upstream-name . "XVector"))) (build-system r-build-system) @@ -10917,7 +11548,7 @@ describing each of the graphs.") (inputs (list zlib)) (propagated-inputs - (list r-biocgenerics r-iranges r-s4vectors)) + (list r-biocgenerics r-iranges r-s4vectors r-zlibbioc)) (home-page "https://bioconductor.org/packages/XVector") (synopsis "Representation and manpulation of external sequences") (description @@ -10928,13 +11559,13 @@ describing each of the graphs.") (define-public r-zlibbioc (package (name "r-zlibbioc") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zlibbioc" version)) (sha256 (base32 - "0x3d5kihckqnfjkc7dxk6mc194vwwr03jfjx2qh15g5494gfmm53")))) + "043xwgw3yclxnxlfl7fdwf7qf7fajzvqdv34qxnngxj9wpgha3gv")))) (properties `((upstream-name . "zlibbioc"))) (build-system r-build-system) @@ -10947,13 +11578,13 @@ libraries for systems that do not have these available via other means.") (define-public r-zellkonverter (package (name "r-zellkonverter") - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zellkonverter" version)) (sha256 - (base32 "1p89i2dfwcgrdchdnxrywp3jjjn5jjs5bisrx5kav26yh2pyx1wk")))) + (base32 "02q9icblcnh0l7vah29mnhcczw8w0gpgd57v19gy7222nrqpcd9m")))) (properties `((upstream-name . "zellkonverter"))) (build-system r-build-system) (propagated-inputs @@ -10979,14 +11610,14 @@ saving AnnData objects to disk.") (define-public r-geneplotter (package (name "r-geneplotter") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "geneplotter" version)) (sha256 (base32 - "03x90l7rvxk0z03p5immqbyyhiygi3mkik636al1cjdcxl9dr5f8")))) + "0zvb84jlsvmr2dvwyy4xjqv353qrxpls0v2vz0nmj1q4m7lrpl1k")))) (build-system r-build-system) (propagated-inputs (list r-annotate @@ -10995,6 +11626,8 @@ saving AnnData objects to disk.") r-biocgenerics r-lattice r-rcolorbrewer)) + (native-inputs + (list r-knitr)) (home-page "https://bioconductor.org/packages/geneplotter") (synopsis "Graphics functions for genomic data") (description @@ -11004,14 +11637,14 @@ saving AnnData objects to disk.") (define-public r-oligoclasses (package (name "r-oligoclasses") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "oligoClasses" version)) (sha256 (base32 - "0i745q2kx7rdfbkz3cwzzp1m4diny25mc301vy0sh4z5lpi5mdm8")))) + "1gdvjvyjfpvvrqyj9rq1l4dnq00hr8vr8knnlb9gnjk21sbcf1d7")))) (properties `((upstream-name . "oligoClasses"))) (build-system r-build-system) (propagated-inputs @@ -11039,14 +11672,14 @@ packages.") (define-public r-oligo (package (name "r-oligo") - (version "1.64.1") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "oligo" version)) (sha256 (base32 - "0gs26h0hm8xlv3aayz4w0vwmw15x5602g02728spsm3n0qra3b1j")))) + "0pqn5qslynylx235wknwj71a6j7xf5i6pb7wjm00jwrdbqwvdlp6")))) (properties `((upstream-name . "oligo"))) (build-system r-build-system) (inputs (list zlib)) @@ -11075,13 +11708,13 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (define-public r-qfeatures (package (name "r-qfeatures") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "QFeatures" version)) (sha256 (base32 - "1xnmd14nf4cqbfxkjsl6af312k7l27ars5g8qdnljylkn8kq276z")))) + "1g744fpb6g690bjbjs4v2899wwv6qc7n5cyq977pm8f3wln0m7mx")))) (properties `((upstream-name . "QFeatures"))) (build-system r-build-system) (propagated-inputs (list r-annotationfilter @@ -11110,13 +11743,13 @@ proteins) in a coherent and tractable format.") (define-public r-quantsmooth (package (name "r-quantsmooth") - (version "1.66.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "quantsmooth" version)) (sha256 - (base32 "05lja0viz5jgc7g3b8qfhd1x596vczid0dz8278qpl4zwv9i17vx")))) + (base32 "050nnwhxk3ld615f6ij4cc3d6wzrrxykvv02fr20fg5gzdj0z08a")))) (properties `((upstream-name . "quantsmooth"))) (build-system r-build-system) (propagated-inputs (list r-quantreg)) @@ -11137,14 +11770,14 @@ on the location of the probe, and other useful tools.") (define-public r-qvalue (package (name "r-qvalue") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "qvalue" version)) (sha256 (base32 - "1552390pf3wrrir6c9xshgll69a33fhbdnh2cvpnznma1ag490ki")))) + "10v5khnrs1fa84d430zy52f9466rwb1byaw1l3c9nivbhmaxhvyi")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-reshape2)) @@ -11192,13 +11825,13 @@ problems in genomics, brain imaging, astrophysics, and data mining.") (define-public r-apcomplex (package (name "r-apcomplex") - (version "2.66.0") + (version "2.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "apComplex" version)) (sha256 - (base32 "057p1bsqqw3r49bsx78prqc4jha468bfx50gpl62giix0cfs007f")))) + (base32 "1y3c3358y7ynn5lj2gcy9ll2gxnnlv689pj0bgr2gsnhbss1kw1r")))) (properties `((upstream-name . "apComplex"))) (build-system r-build-system) (propagated-inputs @@ -11217,13 +11850,13 @@ spectrometry} data.") (define-public r-apeglm (package (name "r-apeglm") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "apeglm" version)) (sha256 (base32 - "19r1mhpkn3xy6l188c14k9xgn25xqc718bwrlmnz63lak6mp4ws7")))) + "0cj9yzmh9w3fk3rxmk2k5j55r42mmz9znszmr4l160mr23alkzx4")))) (properties `((upstream-name . "apeglm"))) (build-system r-build-system) (propagated-inputs @@ -11244,13 +11877,13 @@ posterior for individual coefficients.") (define-public r-greylistchip (package (name "r-greylistchip") - (version "1.32.1") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GreyListChIP" version)) (sha256 (base32 - "0z89yikglx077x18qhq6f8f2fa9xni12jz8my9p5sa6zmvnj4dnm")))) + "1k974cvfbkl8ffn7k2la843bv2pf33cr5f6fahiiy24d68lxwifr")))) (properties `((upstream-name . "GreyListChIP"))) (build-system r-build-system) (propagated-inputs @@ -11271,14 +11904,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.10.1") + (version "3.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "12frl2wfvfz4gpq4fjsmglqyqfxdk3zjbhqkc78rzylbw37xx3bf")))) + "1nlcx4fl1cpcg38cn9p55f75bv6pcg6h2jv4z94g2b7g1gwjd686")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs @@ -11349,13 +11982,13 @@ processing to visualization and annotation.") (define-public r-mbecs (package (name "r-mbecs") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MBECS" version)) (sha256 - (base32 "0gfr3c5k7xjd342zfdksgh22mrk3ryr4cp89nar0mlpgzxg4l4vz")))) + (base32 "1j7vb26n2fnf5fkk8hfz552yx91g4zg719alhg4hg2vvjd1qx2l1")))) (properties `((upstream-name . "MBECS"))) (build-system r-build-system) (arguments @@ -11374,7 +12007,6 @@ processing to visualization and annotation.") r-lme4 r-lmertest r-magrittr - r-markdown r-matrix r-pheatmap r-phyloseq @@ -11400,13 +12032,13 @@ before and after correcting for batch effects.") (define-public r-mbkmeans (package (name "r-mbkmeans") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mbkmeans" version)) (sha256 (base32 - "0c48ycgba1m10p1w2qz9r7yxw15nqzlz8fp44d6lbrvj3svmgjwi")))) + "1x7azijfs28iz2w40b9hnpgwh4jxgihl8cj6h91b2wgz79sq649l")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -11432,13 +12064,13 @@ large datasets, including support for on-disk data representation.") (define-public r-multibac (package (name "r-multibac") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiBaC" version)) (sha256 - (base32 "1qwf1mvw81hb929xpnx5x910f7qnax9lkylhwzcdw1814s4zj25i")))) + (base32 "1mwfibakrxgs3r572bqqqmzq7ys6cs0bpn0wfrcb08ww2197xc4j")))) (properties `((upstream-name . "MultiBaC"))) (build-system r-build-system) (propagated-inputs @@ -11462,17 +12094,17 @@ the batches considered.") (define-public r-multtest (package (name "r-multtest") - (version "2.56.0") + (version "2.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "multtest" version)) (sha256 (base32 - "19c6l8pkyp0m2zdzhr81cnmx5lqf501sap9h6ig5iiv66sf2ysmz")))) + "0s8x2rg2xp6awg2cikybgxrxpi9f91jah7dskk5dnfkazd20di4j")))) (build-system r-build-system) (propagated-inputs - (list r-survival r-biocgenerics r-biobase r-mass)) + (list r-biobase r-biocgenerics r-mass r-survival)) (home-page "https://bioconductor.org/packages/multtest") (synopsis "Resampling-based multiple hypothesis testing") (description @@ -11497,13 +12129,13 @@ expressed genes in DNA microarray experiments.") (define-public r-graph (package (name "r-graph") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "graph" version)) (sha256 (base32 - "184izzxc8bpagcac8wqinjp8kmf9zpvjibl0g32nnr64kp9f4rsn")))) + "0p7g7ykpkngbs3h1dsackfy93l8lvc301lr64ffsiaw60gllcx01")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics)) @@ -11540,13 +12172,13 @@ fitting of some classes of graphical Markov models.") (define-public r-ggtreeextra (package (name "r-ggtreeextra") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggtreeExtra" version)) (sha256 (base32 - "19xikly6ksh03kgpz35wj2d2gdbpikhrk71ahj9ghhkmlwdyjbcr")))) + "0q8k81mq5q9fym4zyrkzapgyww23lkxpkyj2s9r1y0ciclk90zdc")))) (properties `((upstream-name . "ggtreeExtra"))) (build-system r-build-system) (propagated-inputs (list r-cli @@ -11571,13 +12203,13 @@ rectangular layout tree built by ggtree with the grammar of ggplot2.") (define-public r-ggpicrust2 (package (name "r-ggpicrust2") - (version "1.7.2") + (version "1.7.3") (source (origin (method url-fetch) (uri (cran-uri "ggpicrust2" version)) (sha256 (base32 - "0yk62cc0vmv6dyfiwvvbgpsqlvp1cw61db60153xvzmcdvd077cl")))) + "0zjlsvzl2f74fvqw4ijnai23qwhlcpgd5p8z9dclnwnsgdbm6hcq")))) (properties `((upstream-name . "ggpicrust2"))) (build-system r-build-system) (propagated-inputs (list r-aldex2 @@ -11640,13 +12272,13 @@ a given recall, F-score for single and multiple classes are available.") (define-public r-pepsnmr (package (name "r-pepsnmr") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "PepsNMR" version)) (sha256 (base32 - "17rbadvay3kbp4r6p023yww4biw9cl359q200ciygr7d2ffcas85")))) + "013jw9l7r87j4bmpjrvq5qn91kp44wj5vd68cl5axbqhjg7fq4ww")))) (properties `((upstream-name . "PepsNMR"))) (build-system r-build-system) (propagated-inputs @@ -11696,14 +12328,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.34.1") + (version "3.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "0y9qskkdkl2vdbn66md4xisny0i7g2biasylp357vrkv41d3al6l")))) + "012hhakhk81qk1hi4igfa4vji678gmyvdxi05z9mdsx721lwwy2i")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -11750,13 +12382,13 @@ enrichedGO (addGeneIDs).") (define-public r-matrixgenerics (package (name "r-matrixgenerics") - (version "1.12.3") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MatrixGenerics" version)) (sha256 (base32 - "07hrafzn3787vprdwdk3cfyhi8df7hjvxg9vq7ad8raqzb37lqil")))) + "14x5jib5xh2006lg96v3b9n2pnbjcbsd5igqybqsv0c53rk9394d")))) (properties `((upstream-name . "MatrixGenerics"))) (build-system r-build-system) @@ -11777,12 +12409,12 @@ incompatibilities.") (define-public r-marray (package (name "r-marray") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "marray" version)) (sha256 - (base32 "1z8fx47ng1av8nfpk0i7wpb8k8lsrn66k613p36mbh19m5fx05ks")))) + (base32 "1gj4mdbni5fk2z3zrk2cnhy610ihhhwjb9l1crglkklwxhkqlkvd")))) (build-system r-build-system) (propagated-inputs (list r-limma)) @@ -11796,12 +12428,12 @@ normalization and quality checking.") (define-public r-cghbase (package (name "r-cghbase") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHbase" version)) (sha256 - (base32 "1r050acahvfp2ib88sy9xj4yjzy2d8h73hndi1s075h0zv12mjj7")))) + (base32 "1iw03gq1kvmn9a6h0kw389l9i7h99fbxcsag9f3gkfznjv0vp5k4")))) (properties `((upstream-name . "CGHbase"))) (build-system r-build-system) (propagated-inputs @@ -11815,16 +12447,16 @@ the @code{arrayCGH} packages.") (define-public r-cghcall (package (name "r-cghcall") - (version "2.62.0") + (version "2.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CGHcall" version)) (sha256 - (base32 "02d8j0al062k33h6n3ihn7kwbqp3pjwg9zzbr45ay1m1jm6bappi")))) + (base32 "1x2zfr40bm42zd1bljwpbz3cz1q23a3yy1g277lwsp78gxbn3zly")))) (properties `((upstream-name . "CGHcall"))) (build-system r-build-system) (propagated-inputs - (list r-biobase r-cghbase r-impute r-dnacopy r-snowfall)) + (list r-biobase r-cghbase r-dnacopy r-impute r-snowfall)) (home-page "https://bioconductor.org/packages/CGHcall") (synopsis "Base functions and classes for arrayCGH data analysis") (description "This package contains functions and classes that are needed by @@ -11834,12 +12466,12 @@ the @code{arrayCGH} packages.") (define-public r-qdnaseq (package (name "r-qdnaseq") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "QDNAseq" version)) (sha256 - (base32 "0lcf5zkv44s7xsa2svxia7inv6iz2k1kilfj5zcq80r339pj3vx4")))) + (base32 "1n2qngqqw3hfv1yscksnpg8wslc85dlvaqw1hz2qvsxf1gcq2mks")))) (properties `((upstream-name . "QDNAseq"))) (build-system r-build-system) (propagated-inputs @@ -11866,14 +12498,14 @@ respectively.") (define-public r-bayseq (package (name "r-bayseq") - (version "2.31.0") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "baySeq" version)) (sha256 (base32 - "0lq2wfm3ibrpha9mqhhp6dgsx4jm2kwxvvrj0b62dzqspvg743wh")))) + "1b5vvzl0kkm6kb03vr6m6sdlr3azpc24933a7ayxkiffmf2wbi0g")))) (properties `((upstream-name . "baySeq"))) (build-system r-build-system) (propagated-inputs @@ -11890,14 +12522,14 @@ more complex hypotheses) via empirical Bayesian methods.") (define-public r-chipcomp (package (name "r-chipcomp") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPComp" version)) (sha256 (base32 - "1v27bqik5cgcvs1kb67s52r56v6fakvmi81iybvvvbxvcn1dmy9r")))) + "061d2z1rrcyad6cf19si14ab9a3dxdi17sfbkx3vx8kdsfs3djy9")))) (properties `((upstream-name . "ChIPComp"))) (build-system r-build-system) (propagated-inputs @@ -11924,14 +12556,14 @@ datasets.") (define-public r-riboprofiling (package (name "r-riboprofiling") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RiboProfiling" version)) (sha256 (base32 - "0qgzq82v4glkc0krk81zj9z71cnrvflsf1w45r9zmaw6bq45rfqd")))) + "1bd37ypxsj9p94p2851hhc9ind59b5pkg1lyalha1nfw5gf8iay3")))) (properties `((upstream-name . "RiboProfiling"))) (build-system r-build-system) (propagated-inputs @@ -11965,14 +12597,14 @@ assessment, principal component analysis on codon coverage.") (define-public r-riboseqr (package (name "r-riboseqr") - (version "1.32.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "riboSeqR" version)) (sha256 (base32 - "0la8kmxxh5jnqsrmmvyhi313bjdbqkiq16hcxar6mgyjhxlsm610")))) + "1cigbp3pc70ipja9mmprkrs91723r1zwgxbzyp87n5mb0i4q8xqh")))) (properties `((upstream-name . "riboSeqR"))) (build-system r-build-system) (propagated-inputs @@ -11993,14 +12625,14 @@ parsing of genetic sequencing data from ribosome profiling experiments.") (define-public r-interactionset (package (name "r-interactionset") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "InteractionSet" version)) (sha256 (base32 - "1vs3mqf3x8zk7p83jkv41kag1bmn5zxrr3j1ldqk6wxsl77h55c5")))) + "0mpgxcwhb734pyn6bj93xknb704yrjkprxpa7kqwl24rbqyjydqs")))) (properties `((upstream-name . "InteractionSet"))) (build-system r-build-system) @@ -12027,14 +12659,14 @@ experiments.") (define-public r-genomicinteractions (package (name "r-genomicinteractions") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicInteractions" version)) (sha256 (base32 - "0qhb2mm5nynnw0cj5da0i6hb1bz7cyns0gp7xy0wscmfyh2wahbv")))) + "13rnxig22agykzv3q7wm4wr9c5aw56q6q1zv8m5g5ngjcssy8l4c")))) (properties `((upstream-name . "GenomicInteractions"))) (build-system r-build-system) @@ -12068,14 +12700,14 @@ information and producing various plots and statistics.") (define-public r-ctc (package (name "r-ctc") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ctc" version)) (sha256 (base32 - "0ph22v1an2havnh9sm7hms0q2pq4fjad2cm4dffiy3344cv70sn1")))) + "10a83rr0qhnzdhvlbyn0y690hxnl8q86z47dpimr6sq41w463im3")))) (build-system r-build-system) (propagated-inputs (list r-amap)) (home-page "https://bioconductor.org/packages/ctc/") @@ -12088,14 +12720,14 @@ trees and clusters to other programs.") (define-public r-goseq (package (name "r-goseq") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "goseq" version)) (sha256 (base32 - "1r13n64s9fbx951yaa4mpna71vynbkjz78irk96yzh2x2zzxpjvx")))) + "0waw5hhxh8yab8fqw9gnd3l39s6wkmp8690rhs4llarpqz6ssrhk")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -12114,14 +12746,14 @@ defined categories which are over/under represented in RNA-seq data.") (define-public r-glimma (package (name "r-glimma") - (version "2.10.0") + (version "2.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Glimma" version)) (sha256 (base32 - "0171wizl516chzzwnbc2z2bf5sk4a491fcs4yhq5ycqaqpjmbg35")) + "0pkh15jjjb83pq7d49yzwb2gyc95x4rww78qnzpdrzhycgmcapii")) (modules '((guix build utils))) (snippet '(with-directory-excursion "inst/htmlwidgets/lib/" @@ -12199,13 +12831,13 @@ information.") (define-public r-glmgampoi (package (name "r-glmgampoi") - (version "1.12.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "glmGamPoi" version)) (sha256 (base32 - "0d6q8vn8z90k8ffskcn9jmgg5x5pfb3wjv67bqskasy38inn1zg7")))) + "1qc3f1spzkcjk95b07jpxgrjiwmlamwwx6mlhml4lgzy5qby7dpw")))) (properties `((upstream-name . "glmGamPoi"))) (build-system r-build-system) (propagated-inputs @@ -12235,14 +12867,14 @@ experiments.") (define-public r-rots (package (name "r-rots") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ROTS" version)) (sha256 (base32 - "0b2fl4wn696ia2kxihc6088ncnvd87ffq40bz58qi1bhq6krcmwv")))) + "1zd5w3mq0vjs3ivdb23x6d28sqq0dsfv13d64k1yijr4vdk3wvp6")))) (properties `((upstream-name . "ROTS"))) (build-system r-build-system) (propagated-inputs @@ -12258,14 +12890,14 @@ in omics data.") (define-public r-plgem (package (name "r-plgem") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "plgem" version)) (sha256 (base32 - "1kzrscaqsrsvdq2c9g93l7bjmv1s5p1l3cbrz6skkqls9h4gsw08")))) + "0s5hia3xvddi0gaawcr5zsh34v6sh2zdi5gsjis8ar2g2p7agqgg")))) (build-system r-build-system) (propagated-inputs (list r-biobase r-mass)) @@ -12282,13 +12914,13 @@ genes or proteins in these datasets.") (define-public r-plyranges (package (name "r-plyranges") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "plyranges" version)) (sha256 (base32 - "1qv8snpcxpg16v5ji7sq3bnmgrgghz9h4mh246mcnnxfhi44b6nv")))) + "1z4pc9slbd6ji3c6g9flxhvvf0anjmywrlnjblv1mpgsh88avp7w")))) (properties `((upstream-name . "plyranges"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -12316,14 +12948,14 @@ accessiblity for new Bioconductor users is hopefully increased.") (define-public r-inspect (package (name "r-inspect") - (version "1.30.0") + (version "1.31.0") (source (origin (method url-fetch) (uri (bioconductor-uri "INSPEcT" version)) (sha256 (base32 - "1nyfl78fjj956bk1xf32k3jdqhlffx6grbl7vajn48q5ldsx8kcx")))) + "0c7bw9cnav41vals2scv2gh5mj5nx2mgzagdb8g99sprdqv5924n")))) (properties `((upstream-name . "INSPEcT"))) (build-system r-build-system) (propagated-inputs @@ -12362,14 +12994,14 @@ modeling the rates that determines changes in mature mRNA levels.") (define-public r-dnabarcodes (package (name "r-dnabarcodes") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNABarcodes" version)) (sha256 (base32 - "1jys0lj92zkqa3bb22fg35q5y8ij5pqhy3yvzg8zc8bjpzdvrg3a")))) + "12x4k55kshvwyzl83zkgkp0ylryr8wd3kz44ngp60k4pkwhkl9h9")))) (properties `((upstream-name . "DNABarcodes"))) (build-system r-build-system) (propagated-inputs @@ -12389,14 +13021,14 @@ demultiplexed, i.e. assigned to their original reference barcode.") (define-public r-ruvseq (package (name "r-ruvseq") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RUVSeq" version)) (sha256 (base32 - "0kxaaqf6py7kfndgpd0faxv6g610zj16pyvn9b4x9s3b22ib06j1")))) + "04byggwsvmqrl77268smbas0wax460cdshmp4v5iqc5fghl7n0p2")))) (properties `((upstream-name . "RUVSeq"))) (build-system r-build-system) (propagated-inputs @@ -12414,14 +13046,14 @@ samples.") (define-public r-biocneighbors (package (name "r-biocneighbors") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocNeighbors" version)) (sha256 (base32 - "1i4b37n9darizfq9i4vvbnxgrwhkvvd25a4cpfjv7nqywjfbsfjd")))) + "0a5wg099fgwjbzd6r3mr4l02rcmjqlkdcz1w97qzwx1mir41fmas")))) (properties `((upstream-name . "BiocNeighbors"))) (build-system r-build-system) (propagated-inputs @@ -12442,14 +13074,14 @@ achieved for all methods using the BiocParallel framework.") (define-public r-scaledmatrix (package (name "r-scaledmatrix") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ScaledMatrix" version)) (sha256 (base32 - "0xhw77w28r3agv0hw7fjpn1fp2p9bz7kdzwzx7gsa8411nffmd4d")))) + "1aigca0s8cmi46458pl9p9vwlkrmqawbgi0xmbwslz646x2s2h4a")))) (properties `((upstream-name . "ScaledMatrix"))) (build-system r-build-system) (propagated-inputs @@ -12468,19 +13100,18 @@ multiplication.") (define-public r-treeio (package (name "r-treeio") - (version "1.24.3") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "treeio" version)) (sha256 (base32 - "0shm0mdqvsk5qipdqbz3251kks6ii1vpx1pph0ms271nzs6fcvif")))) + "1kvzdryw74r74gwxddsrng81ww49p3s7hgxn8ggl0p8fvz3sfgir")))) (properties `((upstream-name . "treeio"))) (build-system r-build-system) (propagated-inputs (list r-ape - r-cli r-dplyr r-jsonlite r-magrittr @@ -12501,13 +13132,13 @@ platform for merging tree with associated data and converting file formats.") (define-public r-treesummarizedexperiment (package (name "r-treesummarizedexperiment") - (version "2.8.0") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TreeSummarizedExperiment" version)) (sha256 (base32 - "1grnz82a7l5dpwssc24yxhllqdcvza2gc4h4cc6zxjcdg5r4l1ra")))) + "1yvqixlivapasx0ircfhmc8ckr7sw86d9vfvnqj97p4r667x6z6g")))) (properties `((upstream-name . "TreeSummarizedExperiment"))) (build-system r-build-system) (propagated-inputs @@ -12534,14 +13165,14 @@ data.") (define-public r-ggtree (package (name "r-ggtree") - (version "3.8.2") + (version "3.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggtree" version)) (sha256 (base32 - "0l8llnvmg8k5qgag6vfgx1gdv0x46p3ypfz5apv23qhlbx4jfjja")))) + "12w2l1q0c5aznd5fls04wvgsmjidqhr1kkqj4gajz1abj9f49cqf")))) (properties `((upstream-name . "ggtree"))) (build-system r-build-system) (propagated-inputs @@ -12572,14 +13203,14 @@ data.") (define-public r-metapod (package (name "r-metapod") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "metapod" version)) (sha256 (base32 - "0lr2sgbgdbqq626nsm3vyhghs8nalg5cxycr4cwsqh9nqrmip3wa")))) + "1nhxwj6gwc3hqji7icp1q6n0hj1gnvv1y5zhd2myhm7kj3sic2qc")))) (properties `((upstream-name . "metapod"))) (build-system r-build-system) (propagated-inputs @@ -12601,14 +13232,14 @@ missing values and weighting where appropriate.") (define-public r-biocsingular (package (name "r-biocsingular") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSingular" version)) (sha256 (base32 - "1a33zsw353pryq30178sbj9jzsmb4m7spqbx11hsicri8s1c0lb9")))) + "0z1p02329wk2x058ij42q5pyvp0vhsihaxmizgzcj4sww6i28j33")))) (properties `((upstream-name . "BiocSingular"))) (build-system r-build-system) (propagated-inputs @@ -12636,14 +13267,14 @@ possible, parallelization is achieved using the BiocParallel framework.") (define-public r-destiny (package (name "r-destiny") - (version "3.14.0") + (version "3.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "destiny" version)) (sha256 (base32 - "0hc85dq68h7dy5jcflpjj05231ny7na9i4lksfsw89jhmxgzhacd")))) + "06xwyqlsas98lxmd0qw5ysjwbk397kyapd5jq5pzjrynsj4r9xn6")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -12701,14 +13332,14 @@ Viewer (SAV) files, access data, and generate QC plots.") (define-public r-chipexoqual (package (name "r-chipexoqual") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPexoQual" version)) (sha256 (base32 - "1iysqs2k0xxiwd48ymahf6rywwj9ingjcfmnhx9d1x6w2h00v7lz")))) + "04dhkm8cq87x3c9f114z6q1pcw77xgs33rmhgzk4ajzxywhklq4j")))) (properties `((upstream-name . "ChIPexoQual"))) (build-system r-build-system) (propagated-inputs @@ -12761,14 +13392,14 @@ penalized least squares regression method.") (define-public r-dnacopy (package (name "r-dnacopy") - (version "1.74.1") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DNAcopy" version)) (sha256 (base32 - "1bj87ksvch5cm5zxwgfiiql0j94pvzbpn59wp6bacyip65z7w3ax")))) + "0hyjin75v8l2a8qymsd6rjb8m7svv2q07s6z1dllqag09wja1yfz")))) (properties `((upstream-name . "DNAcopy"))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -12859,18 +13490,23 @@ and regression inferences from RNA-sequencing data.") (define-public r-ebseq (package (name "r-ebseq") - (version "1.40.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBSeq" version)) (sha256 (base32 - "0y23k607f61csj2ciaqnl8pzsjisqlcnnhlasv36446n8f3silx5")))) + "07x9fh8akgiixsv1xddkvs2q8xxfsibas01kdx0kw6wak3nihn4w")))) (properties `((upstream-name . "EBSeq"))) (build-system r-build-system) (propagated-inputs - (list r-blockmodeling r-gplots r-testthat)) + (list r-bh + r-blockmodeling + r-gplots + r-rcpp + r-rcppeigen + r-testthat)) (home-page "https://bioconductor.org/packages/EBSeq") (synopsis "Differential expression analysis of RNA-seq data") (description @@ -12881,13 +13517,13 @@ gene and isoform level using RNA-seq data") (define-public r-karyoploter (package (name "r-karyoploter") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "karyoploteR" version)) (sha256 (base32 - "1nqcm2jlazm8wsa4p6a59m1j8y1qdwg0w3kii4dqnkann3q2q68x")))) + "0jr9lp250s9066hh40vxb6c6yhdd8yrnk0zklwylkf3jpbdgl621")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -12919,14 +13555,14 @@ coordinates.") (define-public r-lpsymphony (package (name "r-lpsymphony") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "lpsymphony" version)) (sha256 (base32 - "08b4d7k5qx19bpg12pw89ckk8x6r2n28qjdxbmy1cxn6dcgzhijd")))) + "1946wlw9zvyxdd99rs2rliks54ff5dkibavxd48aj7cqjsjh6b7g")))) (build-system r-build-system) (arguments (list @@ -12941,7 +13577,7 @@ coordinates.") (inputs (list zlib)) (native-inputs - (list gfortran pkg-config r-knitr)) + (list pkg-config r-knitr)) (home-page "https://r-forge.r-project.org/projects/rsymphony") (synopsis "Symphony integer linear programming solver in R") (description @@ -12958,14 +13594,14 @@ to install interface to SYMPHONY.") (define-public r-ihw (package (name "r-ihw") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IHW" version)) (sha256 (base32 - "0i4yahgkrg9rnc0xldm026k6bd1bn5nkgkaf6kpyyday41rxzyq8")))) + "1pix38lg9snw0jdihh8sifnmckyw1lniwp95r93ca524g6swfc8b")))) (properties `((upstream-name . "IHW"))) (build-system r-build-system) (propagated-inputs @@ -12987,14 +13623,14 @@ independent of the p-value under the null hypothesis.") (define-public r-icobra (package (name "r-icobra") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "iCOBRA" version)) (sha256 (base32 - "120bcakhhl6xqsfclzgmn7rcxmld289bjl6j7nrli7aiq5ilz8h4")))) + "1f0j10wha60vv592vsnv2pcqwz7g2fkld8pnar9rpwwb7qd0wcnf")))) (properties `((upstream-name . "iCOBRA"))) (build-system r-build-system) (propagated-inputs @@ -13024,14 +13660,14 @@ interactive exploration of results.") (define-public r-residualmatrix (package (name "r-residualmatrix") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ResidualMatrix" version)) (sha256 (base32 - "1yay0i0nh2ax35ayqlpnmq0839syl5991hacyrbv3li3gqjc9qqv")))) + "06py71xbygfwq55kawh2x340idrf5mmxmnsz5m6lph2ka086dc5v")))) (properties `((upstream-name . "ResidualMatrix"))) (build-system r-build-system) @@ -13053,14 +13689,14 @@ multiplication and calculation of row/column sums or means.") (define-public r-batchelor (package (name "r-batchelor") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "batchelor" version)) (sha256 (base32 - "1cswij2mdjsdh99rmyh68wscg6h7cs0cff69gnki4gzzjfxy8x3f")))) + "1d5zik3bhz26ky2kpxd9kdzs9ff696qqys5gl8qwmmp8qym520l2")))) (properties `((upstream-name . "batchelor"))) (build-system r-build-system) (propagated-inputs @@ -13096,14 +13732,14 @@ the numbers of cells across batches.") (define-public r-mast (package (name "r-mast") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MAST" version)) (sha256 (base32 - "0vm7v2anbrci6mcans9y9svd6xjm4waf2kny3rz0cjgsasw60ycx")) + "17iycxxp6jb56ra21546kh2zlrm8by2vrlvsxvx8xmbpk32fb4lp")) (snippet '(delete-file "docs/jquery.sticky-kit.min.js")))) (properties `((upstream-name . "MAST"))) @@ -13153,14 +13789,14 @@ single cell assay data.") (define-public r-monocle (package (name "r-monocle") - (version "2.28.0") + (version "2.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "monocle" version)) (sha256 (base32 - "05pix638s4hkig2i048m5jjhvw6cqr2b5qvfkk14i64p9kpifmqj")))) + "0i1qnmiaf3gf8955nlqzd81xzg4siliq154k699jmsz0fyyykia1")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -13244,13 +13880,13 @@ several functions from the R igraph package.") (define-public r-sangerseqr (package (name "r-sangerseqr") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sangerseqR" version)) (sha256 (base32 - "0hhq5zsx4srd9ndr370m44f80qdlrqafjv1838wf65gzijffhfqb")))) + "1vggjvxfmmm2gcyfay22wahkib15i164ic148jdps36pxapl6hi3")))) (properties `((upstream-name . "sangerseqR"))) (build-system r-build-system) (propagated-inputs (list r-biostrings r-shiny r-stringr)) @@ -13360,14 +13996,14 @@ user-defined and/or data-driven sets of hypotheses.") (define-public r-noiseq (package (name "r-noiseq") - (version "2.44.0") + (version "2.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "NOISeq" version)) (sha256 (base32 - "0cxhy4yrww6bh4z603389fikhix8rhfy04ylhm74fdmdng4jblg6")))) + "0qs0sc47n3p9wmf5cmc39cb30i8pbsyizhr29b3ld197pi1ba5wb")))) (properties `((upstream-name . "NOISeq"))) (build-system r-build-system) (propagated-inputs @@ -13386,14 +14022,14 @@ assumptions.") (define-public r-scdd (package (name "r-scdd") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scDD" version)) (sha256 (base32 - "1ndb1zcbdy00xkfx18slrm5bnld9ci5scysc37clhsq2lq5xb25z")))) + "15hzsq8ckw8v8ccz30kia9qr1iymmcszc9z31g5arrx1y816zgbq")))) (properties `((upstream-name . "scDD"))) (build-system r-build-system) (propagated-inputs @@ -13424,14 +14060,14 @@ distributions.") (define-public r-scone (package (name "r-scone") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scone" version)) (sha256 (base32 - "0v3rd2h0n52qz9kqxa3l49rjfssfk252dy7j2nvi34y85win2p1w")))) + "1y0blhh75hb60h9jmvz2naqfzky4zgw5gn81fbj74jfph9y712lp")))) (build-system r-build-system) (propagated-inputs (list r-aroma-light @@ -13468,14 +14104,14 @@ high-throughput analyses.") (define-public r-geoquery (package (name "r-geoquery") - (version "2.68.0") + (version "2.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GEOquery" version)) (sha256 (base32 - "1xyrfj8b7j2wdjlbmwhx1c0hfbvr7l7jxyw2v64fbw8604zprv4s")))) + "1xjfh9lx2cfwzkk61pdarajsa86nzhy3dz7r4zws20pz4xkhwv87")))) (properties `((upstream-name . "GEOquery"))) (build-system r-build-system) (propagated-inputs @@ -13503,14 +14139,14 @@ the bridge between GEO and BioConductor.") (define-public r-illuminaio (package (name "r-illuminaio") - (version "0.42.0") + (version "0.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "illuminaio" version)) (sha256 (base32 - "190i3b9qmh26bic1lzi54mw4p1nrg57qijl1pg6b29w3i6srq692")))) + "15i47b995dqh0dlg60lss5vgj31as3cwhb2z5fqbnknx3lj7s6rl")))) (build-system r-build-system) (propagated-inputs (list r-base64)) @@ -13524,14 +14160,14 @@ files, including IDAT.") (define-public r-siggenes (package (name "r-siggenes") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "siggenes" version)) (sha256 (base32 - "0h5asj2w4xgfj9xapjawmxldnhq789py39drlr8illyhcczkzkbz")))) + "0jzxwg28ih1i0f7hal99g60zply0g613b4wrjsbv738cmlsai2kc")))) (build-system r-build-system) (propagated-inputs (list r-biobase r-multtest r-scrime)) @@ -13548,14 +14184,14 @@ Bayes Analyses of Microarrays} (EBAM).") (define-public r-bumphunter (package (name "r-bumphunter") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bumphunter" version)) (sha256 (base32 - "1xghz87702fg9r6n1igygf4ybb8mw8ff0i02qkx9jmm6vmmfhv18")))) + "0vnm0m9abf8478f7lair58vw1v4mxj8sbmrxcpf8622ygf2na4qc")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -13582,13 +14218,13 @@ studies.") (define-public r-bumpymatrix (package (name "r-bumpymatrix") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BumpyMatrix" version)) (sha256 (base32 - "021xn5d08phmwv6g8a5d4ap5kcf5syhm6vpr784l4k54lflssr5i")))) + "0ic87fjxwb39nmys09zb6k3ghcx8mmmj9pifljs10449i2lgzl2r")))) (properties `((upstream-name . "BumpyMatrix"))) (build-system r-build-system) (propagated-inputs (list r-iranges r-matrix r-s4vectors)) @@ -13608,13 +14244,13 @@ data in a format that is compatible with two-dimensional containers like the (define-public r-mia (package (name "r-mia") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mia" version)) (sha256 (base32 - "1p78yacx0cgihva7m2n3vnll5w4b47vl98hy12pq9rnmhk6r591z")))) + "044spfxsf7xijnbh0933cwdkycmg05zsfqhbx5pkfajysh6w5cxp")))) (properties `((upstream-name . "mia"))) (build-system r-build-system) (propagated-inputs @@ -13622,6 +14258,7 @@ data in a format that is compatible with two-dimensional containers like the r-biocgenerics r-biocparallel r-biostrings + r-bluster r-decipher r-decontam r-delayedarray @@ -13630,6 +14267,7 @@ data in a format that is compatible with two-dimensional containers like the r-dplyr r-iranges r-mass + r-matrixgenerics r-multiassayexperiment r-rlang r-s4vectors @@ -13656,13 +14294,13 @@ summarization.") (define-public r-microbiome (package (name "r-microbiome") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "microbiome" version)) (sha256 (base32 - "120wyjv2r9cbjgxbp70nzf249hai8cqn59gcbgwnazynfy5ih1w8")))) + "0xmkwf7v89nwlpjrzqxv87lbsn6za99v7f0yxkgzfk5n6fadrf05")))) (properties `((upstream-name . "microbiome"))) (build-system r-build-system) (propagated-inputs @@ -13727,13 +14365,13 @@ experiments.") (define-public r-milor (package (name "r-milor") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "miloR" version)) (sha256 (base32 - "073s239aqkixsrarqxfv4nmpcj025k32nhql63qaxrkrvvdd34di")))) + "1hnvw9x0xwjb0br4yvzkzn73nvm8p3j3wmcw8jrid105j0fz6vcj")))) (properties `((upstream-name . "miloR"))) (build-system r-build-system) (propagated-inputs @@ -13775,14 +14413,14 @@ model.") (define-public r-minfi (package (name "r-minfi") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "minfi" version)) (sha256 (base32 - "18b9yg9hnnm1saaiprm2hj86aajjwm1zwvpj0yadfa3s811pw4nq")))) + "13lldzj68vmmmrp5fi2rfxbchbivaa1scq56hl0v9mxxicw72a0x")))) (build-system r-build-system) (propagated-inputs (list r-beanplot @@ -13826,13 +14464,13 @@ methylation arrays.") (define-public r-missmethyl (package (name "r-missmethyl") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "missMethyl" version)) (sha256 (base32 - "1jvrdr57mv93pcbyazcg1bcx1zd0kp72hi1if839gw54hk3igs3h")))) + "1nv4rm5pbx0s7m5zak3jzmwz4pkf8ghkj0ckdcsnmw3k364ny856")))) (properties `((upstream-name . "missMethyl"))) (build-system r-build-system) (propagated-inputs @@ -13876,14 +14514,14 @@ into account multi-gene associated probes.") (define-public r-methylumi (package (name "r-methylumi") - (version "2.46.0") + (version "2.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "methylumi" version)) (sha256 (base32 - "1aa0pwjyp2p9a4mx4n4qw88ndgrj56p669yzdkd7hxhc3x55nzlf")))) + "1vracrvy56kk3hc9midxdaxhad2zf1lspn0zzxjjbsyzx3r0ip0n")))) (build-system r-build-system) (propagated-inputs (list r-annotate @@ -13923,13 +14561,13 @@ and Infinium HD arrays are also included.") (define-public r-lefser (package (name "r-lefser") - (version "1.10.1") + (version "1.11.5") (source (origin (method url-fetch) (uri (bioconductor-uri "lefser" version)) (sha256 (base32 - "1ifmbbsbyzcyvjni9ww27c9qsqliv7vj2rv9mg9c7gnqgbg6h2c4")))) + "1fnccnjllgxf51dlmcvv0r66xs0wvfxrj66qrqisqd99hrpxhws2")))) (properties `((upstream-name . "lefser"))) (build-system r-build-system) (propagated-inputs @@ -13947,14 +14585,14 @@ to find biomarkers of groups and sub-groups.") (define-public r-lumi (package (name "r-lumi") - (version "2.52.0") + (version "2.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "lumi" version)) (sha256 (base32 - "1lxxqr7x9jdjrsj5j95jb0dbd7p208vifxw3j4s4140zh1ppxnpj")))) + "0iwkag84w1sc703jcdfx0h799hlchdiqvlps8g8lwmil5b0xlsw5")))) (build-system r-build-system) (propagated-inputs (list r-affy @@ -13986,14 +14624,14 @@ especially Illumina Infinium methylation microarrays.") (define-public r-linnorm (package (name "r-linnorm") - (version "2.24.1") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Linnorm" version)) (sha256 (base32 - "1sqkmjah2lxahnvwv04a970za2b8kzvmxnb41k9xrnvj0akigc2d")))) + "1ax5zmby8zw0mgxjd8yhlk4ai0s03zq59qwzqgv8zqlms8yjpvs2")))) (properties `((upstream-name . "Linnorm"))) (build-system r-build-system) (propagated-inputs @@ -14047,14 +14685,14 @@ evaluation of DEG analysis methods.") (define-public r-ioniser (package (name "r-ioniser") - (version "2.24.0") + (version "2.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "IONiseR" version)) (sha256 (base32 - "1yrsd5n9zam6wslc6savfn122v3wzzcc46w20mb849qq2np4frf0")))) + "1y595hq40kpsasp74wsbf3ngd2rrriqg65z9y4svcwdygj03pgrz")))) (properties `((upstream-name . "IONiseR"))) (build-system r-build-system) (propagated-inputs @@ -14114,14 +14752,14 @@ are standardized and usable by the accompanying mutossGUI package.") (define-public r-metap (package (name "r-metap") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "metap" version)) (sha256 (base32 - "0asmypxfxly4xmcjf3yzid5zqlzg88z0brij2splfk4avsl035gf")))) + "1w4mv7vb94d4pkllvabz9az8sbrbfhigxw4is3j0jzi1pnlyc8kg")))) (build-system r-build-system) (propagated-inputs (list r-lattice @@ -14143,13 +14781,13 @@ published results; and a routine for graphical display.") (define-public r-tradeseq (package (name "r-tradeseq") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tradeSeq" version)) (sha256 (base32 - "14b90x9h34mhbc4sdpzkygrrswf84pi1ddwpzxhvlvr9gs443xqs")))) + "06k0jib20nq7zqc5vbgag8v1lbadjlg0idh5jwn5bcjc74dx15vj")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -14212,14 +14850,14 @@ peak definition in combination with known profile characteristics.") (define-public r-varianttools (package (name "r-varianttools") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantTools" version)) (sha256 (base32 - "1vkdw626r1ffdsvry6qwhd1i3lkyb9wzrp9zf3dfafi02cap6r47")))) + "1ibg4cdpbv4ph3y4r90j8zfwr1cy1z33p4bazhzyi2zv3xa1nrq6")))) (properties `((upstream-name . "VariantTools"))) (build-system r-build-system) (propagated-inputs @@ -14252,14 +14890,14 @@ gmapR.") (define-public r-heatplus (package (name "r-heatplus") - (version "3.8.0") + (version "3.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Heatplus" version)) (sha256 (base32 - "031f25w960jp5nhd78v3iv6pib266cpbawhi9rrd7csw89vnswfx")))) + "1vs7x4dc2vrfi2wi300bjr2hl1wwp4v27sgzycr6qv6x2nx9i5xq")))) (properties `((upstream-name . "Heatplus"))) (build-system r-build-system) (propagated-inputs @@ -14277,18 +14915,18 @@ information about samples and features can be added to the plot.") (define-public r-gosemsim (package (name "r-gosemsim") - (version "2.26.1") + (version "2.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOSemSim" version)) (sha256 (base32 - "15z7wqnp0s8fiysl3qc76pjaj3xik2br2mz2z3nmf28vxig69mx9")))) + "10jhjzgf10w9cmr97qzc3mqvgvgx9h7pqk7zkkqwhg7anv6wa788")))) (properties `((upstream-name . "GOSemSim"))) (build-system r-build-system) (propagated-inputs - (list r-annotationdbi r-go-db r-rcpp)) + (list r-annotationdbi r-go-db r-rcpp r-rlang)) (native-inputs (list r-knitr)) (home-page "https://guangchuangyu.github.io/software/GOSemSim") @@ -14304,14 +14942,14 @@ sets of GO terms, gene products and gene clusters.") (define-public r-anota (package (name "r-anota") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "anota" version)) (sha256 (base32 - "0ic12p1qyfrmh3l1wv7s9yi8sr84crj4nksmcx0lybb6rak9gy0x")))) + "1b1r7jwilwvl89fw3rqascyhy8wnm8y81lnx85pwjk55ld56jlb1")))) (build-system r-build-system) (propagated-inputs (list r-multtest r-qvalue)) @@ -14334,13 +14972,13 @@ the data set is suitable for such analysis.") (define-public r-anota2seq (package (name "r-anota2seq") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "anota2seq" version)) (sha256 - (base32 "0pmk45276bl3qppzxlp4jpc8bsvdpca8nzrdl6c4n9r3xhzfpyq0")))) + (base32 "0kyxwhj5vq5z4v3x3hfb9ks3h37axqskyj9rzyj2bzsy2yk9hajn")))) (properties `((upstream-name . "anota2seq"))) (build-system r-build-system) (propagated-inputs @@ -14367,38 +15005,16 @@ mRNA levels or buffering, a mechanism regulating translational efficiency so that protein levels remain constant despite fluctuating total mRNA levels.") (license license:gpl3))) -(define-public r-sigpathway - (package - (name "r-sigpathway") - (version "1.66.2") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "sigPathway" version)) - (sha256 - (base32 - "0k86hlz7zbbw7559bd2sl59pr441kihgwvg8nr75mj8d50n783sy")))) - (properties `((upstream-name . "sigPathway"))) - (build-system r-build-system) - (home-page "https://www.pnas.org/cgi/doi/10.1073/pnas.0506577102") - (synopsis "Pathway analysis") - (description - "This package is used to conduct pathway analysis by calculating the NT_k -and NE_k statistics in a statistical framework for determining whether a -specified group of genes for a pathway has a coordinated association with a -phenotype of interest.") - (license license:gpl2))) - (define-public r-fcscan (package (name "r-fcscan") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fcScan" version)) (sha256 - (base32 "071sylwwj27bk39pkn5a29r7bmfpmyaixkkg7dqcdq230c1dsrps")))) + (base32 "0hhad9vg43j0yz8fp2w7qdhvdy77yr7anv0fi170042x3piq1q7r")))) (properties `((upstream-name . "fcScan"))) (build-system r-build-system) (propagated-inputs @@ -14425,14 +15041,14 @@ presence of additional sites within the allowed window size.") (define-public r-fgsea (package (name "r-fgsea") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fgsea" version)) (sha256 (base32 - "0chnrwiwk31crrx4am1yrbxjdqd3jycgjgczqzj7lxaa9v7lvm7z")))) + "0sykd4ingpw41615hbr3vw9yd1ks225hdb5qxnhbk4m4wxj814ql")))) (build-system r-build-system) (propagated-inputs (list r-bh @@ -14458,14 +15074,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.26.1") + (version "3.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "1whvgzw8p0nm3kchdndrxj4x3fhmq0vgbz77d54sqq1qri4j35qx")))) + "1xirazskw2d0fllyf27jvsm69amcil1znx81m9d613vl03dpwswy")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -14475,6 +15091,8 @@ to multiple hypothesis correction.") r-ggplot2 r-gosemsim r-hdo-db + r-hpo-db + r-mpo-db r-qvalue r-reshape2)) (native-inputs @@ -14493,13 +15111,13 @@ data.") (define-public r-enrichedheatmap (package (name "r-enrichedheatmap") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EnrichedHeatmap" version)) (sha256 (base32 - "18p2vjcg76rrjzjl03zgm4yxrgllbd42hg8rvsdbfb0s7brzr7ya")))) + "0j87x26qimsx4gi311bm1g9bldwq9r4z3aflxf8p91zlavjbv8zp")))) (properties `((upstream-name . "EnrichedHeatmap"))) (build-system r-build-system) (propagated-inputs (list r-circlize @@ -14525,14 +15143,14 @@ correspondance between different data sources.") (define-public r-enrichplot (package (name "r-enrichplot") - (version "1.20.3") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "enrichplot" version)) (sha256 (base32 - "11hgxs42wvirv6b9ywr2jb51s67k4r0pm21dkvm7xjbsbarlkhmh")))) + "05ps96adbn4h8i0mqflzm1h6chjlrmfz6hx393232bhb995jfllx")))) (build-system r-build-system) (propagated-inputs (list r-aplot @@ -14593,14 +15211,14 @@ attempts to assess their statistical significance.") (define-public r-clusterprofiler (package (name "r-clusterprofiler") - (version "4.8.3") + (version "4.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterProfiler" version)) (sha256 (base32 - "1kihrpa8cb2bqk5dck0w6yzgfpl72qxlrxwpidg1ar27q3ivz8w3")))) + "1vlrybyczfci5qnw50k0y2j2853r2p1ff5bpj35rdca4ja0iqh2q")))) (properties `((upstream-name . "clusterProfiler"))) (build-system r-build-system) @@ -14613,6 +15231,8 @@ attempts to assess their statistical significance.") r-go-db r-gosemsim r-gson + r-httr + r-igraph r-magrittr r-plyr r-qvalue @@ -14631,13 +15251,13 @@ profiles (GO and KEGG) of gene and gene clusters.") (define-public r-clusterexperiment (package (name "r-clusterexperiment") - (version "2.20.0") + (version "2.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterExperiment" version)) (sha256 (base32 - "0h22zh6jpd2wsh6b9rnrmx8897aqlrsnw82kwphx8lay4r1vv706")))) + "1qnxrdpp75m342q4chwaig413l52giz1h7nd4p9y4b472dqx9hh4")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -14677,14 +15297,14 @@ expression data sets.") (define-public r-mlinterfaces (package (name "r-mlinterfaces") - (version "1.80.0") + (version "1.82.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MLInterfaces" version)) (sha256 (base32 - "1s5b27n01crfzrpshhiv6g0q0qf0dip1gw4nkrkg5sh5x9dsikq6")))) + "0aga7xhx5d1xp09n2im7yqi9y1b3v22l554hi35ahg2lwwvxjiw1")))) (properties `((upstream-name . "MLInterfaces"))) (build-system r-build-system) (propagated-inputs @@ -14721,14 +15341,14 @@ data in R and Bioconductor containers.") (define-public r-annaffy (package (name "r-annaffy") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annaffy" version)) (sha256 (base32 - "0jy3qk31lb11bixncb2w2hw1ibvik31bfi2l5vyq5wjyxndfyax6")))) + "1mdv0x9lnr0bm96h5f9104nqg2j6cjqvp5prrxx10j0d6464vmkw")))) (build-system r-build-system) (arguments `(#:phases @@ -14753,14 +15373,14 @@ It allows searching of biological metadata using various criteria.") (define-public r-a4core (package (name "r-a4core") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Core" version)) (sha256 (base32 - "14q9q3dxnmmm491af53hd0dwwqiz47xxrwy05axh85x4fh01j3xx")))) + "0iismcsnkyb7m4dwmxw5pyvscj2bhp6zw9hpdb2ff91viynbknq1")))) (properties `((upstream-name . "a4Core"))) (build-system r-build-system) (propagated-inputs @@ -14777,14 +15397,14 @@ arrays.") (define-public r-a4classif (package (name "r-a4classif") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Classif" version)) (sha256 (base32 - "1z5xypz5jvb06pk71x6953iirhh1w1mggm0pxqibg0ag9lx2zzmv")))) + "1wxkyqyhb3mj04kmaisd09dapywjpc081ihaig5rs04k611ddvhi")))) (properties `((upstream-name . "a4Classif"))) (build-system r-build-system) (propagated-inputs @@ -14807,14 +15427,14 @@ Affymetrix arrays.") (define-public r-a4preproc (package (name "r-a4preproc") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Preproc" version)) (sha256 (base32 - "1dxh0zbv4z4gqnwbv7yn247gx7cqv68vb43p6f98c2kyqilfpjg9")))) + "19nf3bc0gdwixif50f3bs47a1kw1w1lir1dz4l8zqdp3h8gfmj60")))) (properties `((upstream-name . "a4Preproc"))) (build-system r-build-system) (propagated-inputs @@ -14831,14 +15451,14 @@ is used for preprocessing the arrays.") (define-public r-a4reporting (package (name "r-a4reporting") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Reporting" version)) (sha256 (base32 - "0lx7fx2vlpq3c347gx842qlcvnzl0r25i5a55l0qbf8rb5liq2yv")))) + "16lgbwsgwp77x9a8c3hr1aqhp36skzz72xhbzm0a7w3kagmd8gn6")))) (properties `((upstream-name . "a4Reporting"))) (build-system r-build-system) (propagated-inputs @@ -14855,14 +15475,14 @@ provides reporting features.") (define-public r-a4base (package (name "r-a4base") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4Base" version)) (sha256 (base32 - "01c8rps321820b0pchfqv8shglb26rys7hqkwygpzzx3jj310v8x")))) + "0hin5lpwa7cxa862jh3y7d8kq3q9bv76ri08b27jxzyr5p7xwcr2")))) (properties `((upstream-name . "a4Base"))) (build-system r-build-system) (propagated-inputs @@ -14886,14 +15506,14 @@ Affymetrix arrays.") (define-public r-a4 (package (name "r-a4") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "a4" version)) (sha256 (base32 - "0n49scwwmg51gcakbc0bfjcy1lcpdxg974l11yk35kj0bg9ynpgi")))) + "1hdqnipg326z2k7vs6sc1brc9lvvhmr2l6cjp4f9a205g4q7r9rr")))) (build-system r-build-system) (propagated-inputs (list r-a4base r-a4classif r-a4core r-a4preproc r-a4reporting)) @@ -14907,14 +15527,14 @@ Affymetrix arrays.") (define-public r-abseqr (package (name "r-abseqr") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "abseqR" version)) (sha256 (base32 - "05kcwmv3d59lrdnpi82701biwawnnpfvpwr170xdi3hfdff6g59c")))) + "0s865nahgm0by2nvjydkjlhkj2sxmrvcrhw7rmm46ld4g10xsrc8")))) (properties `((upstream-name . "abseqR"))) (build-system r-build-system) (inputs @@ -14955,14 +15575,14 @@ further downstream analysis on its output.") (define-public r-bacon (package (name "r-bacon") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bacon" version)) (sha256 (base32 - "1h2yh85c6d4j2abdh5l7m6zcxh9i5xzrwwjkwas4nfs48h74z293")))) + "065b4xf5i1bx08494nm3r497bs47s5vf99l2g37nlpvxf7pypvrz")))) (build-system r-build-system) (propagated-inputs (list r-biocparallel r-ellipse r-ggplot2)) @@ -14980,14 +15600,14 @@ fitting a three-component normal mixture on z-scores.") (define-public r-rgadem (package (name "r-rgadem") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rGADEM" version)) (sha256 (base32 - "08li2wql2zhg06z0rjws9qcnv3ishgnpc6k8xyjcf7yfyg7qpk1d")))) + "14jcsqb56vn67hjmcjjnwswzbilsarkk8kblc715c7da72q7fzpn")))) (properties `((upstream-name . "rGADEM"))) (build-system r-build-system) (propagated-inputs @@ -15034,12 +15654,12 @@ distributions, modules and filter motifs.") (define-public r-motifdb (package (name "r-motifdb") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MotifDb" version)) (sha256 - (base32 "18d0qj9sn4bhfjy2mwsz2nnm41xlsqjslsv69nkhv19w9zd842pw")))) + (base32 "1z72f5f3sh2ak6zjcfc6j6rblkllmdkli0kb57nwxg2j5hrys3xr")))) (properties `((upstream-name . "MotifDb"))) (build-system r-build-system) (propagated-inputs @@ -15061,12 +15681,12 @@ frequency matrices from nine public sources, for multiple organisms.") (define-public r-motifbreakr (package (name "r-motifbreakr") - (version "2.14.2") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifbreakR" version)) (sha256 - (base32 "13fv0rkyb32grswlgzd3zr35p9xpibj2iq62sr23if4w6z5nbml2")))) + (base32 "02i3hkffhhsbzmn97mv8wc2px5caq9xnp45z0l53dp1jxbmms1h0")))) (properties `((upstream-name . "motifbreakR"))) (build-system r-build-system) (propagated-inputs @@ -15111,40 +15731,29 @@ Bioconductor.") (define-public r-motifstack (package (name "r-motifstack") - (version "1.44.1") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifStack" version)) (sha256 (base32 - "1g46cxn1h3cqr0yrj6ancshzygiqr9finf1vmmig3h9g0ijgr5lz")) + "10hmqwkysifd59as9zx00p3gj595lwj30ywn9pqb1920q6f5mx2i")) (snippet '(delete-file "inst/htmlwidgets/lib/d3/d3.v4.min.js")))) (properties `((upstream-name . "motifStack"))) (build-system r-build-system) (arguments (list - #:modules '((guix build utils) - (guix build r-build-system) - (srfi srfi-1)) #:phases '(modify-phases %standard-phases (add-after 'unpack 'process-javascript (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "inst/htmlwidgets/lib/d3" - (call-with-values - (lambda () - (unzip2 - `((,(assoc-ref inputs "_") - "d3.v4.min.js")))) - (lambda (sources targets) - (for-each (lambda (source target) - (format #true "Processing ~a --> ~a~%" - source target) - (invoke "esbuild" source "--minify" - (string-append "--outfile=" target))) - sources targets))))))))) + (let ((source (assoc-ref inputs "_")) + (target "d3.v4.min.js")) + (invoke "esbuild" source "--minify" + (string-append "--outfile=" target))))))))) (propagated-inputs (list r-ade4 r-biostrings @@ -15174,14 +15783,14 @@ type and symbol colors.") (define-public r-genomicscores (package (name "r-genomicscores") - (version "2.12.0") + (version "2.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicScores" version)) (sha256 (base32 - "1z8h9sbr6xqwbsfisr33qdxg0xdrw8r4vvxl1pf4x8vv08zw0vx6")))) + "1plpmi1sb9vv03480njf3awnc7i19f9iaxi3j6bvjzpi6zmw40dq")))) (properties `((upstream-name . "GenomicScores"))) (build-system r-build-system) (propagated-inputs @@ -15212,14 +15821,14 @@ position-specific scores within R and Bioconductor.") (define-public r-atacseqqc (package (name "r-atacseqqc") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ATACseqQC" version)) (sha256 (base32 - "0mcrkmirss484d2mskikyjdz5cmbhdk52yxkffz9g8g5m9lkq5xk")))) + "1b53rkhyqnyh5vangh3hy4yccx1yackwbv1pxdimbp840ji6d122")))) (properties `((upstream-name . "ATACseqQC"))) (build-system r-build-system) (propagated-inputs @@ -15259,14 +15868,14 @@ footprints.") (define-public r-gofuncr (package (name "r-gofuncr") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GOfuncR" version)) (sha256 (base32 - "05509xf768x8asqadjj5s50m0yqnklrxi28bmqd22cn6cbmahszw")))) + "1baa3aabkhmwq66xkzf4jk5nz85kkx1ks0mqc91s2ra9916wj6cd")))) (properties `((upstream-name . "GOfuncR"))) (build-system r-build-system) (propagated-inputs @@ -15364,14 +15973,14 @@ different identifieres using the Biocore Data Team data-packages (e.g. (define-public r-annotationtools (package (name "r-annotationtools") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotationTools" version)) (sha256 (base32 - "0dwbh2h2mp8gy0kwqmkri3q2glnzcj8cn83j1qyh7lk15anc33g8")))) + "0g086rj06k3wac24zx66dw1yc1bzv25bmlbjbpcpgdcmyjb1i8sf")))) (properties `((upstream-name . "annotationTools"))) (build-system r-build-system) @@ -15389,14 +15998,14 @@ text files).") (define-public r-allelicimbalance (package (name "r-allelicimbalance") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AllelicImbalance" version)) (sha256 (base32 - "1ms3x3x2gvhgllff3nwawg5jlpmgx6dhwll0dghklnv3lssbx4c7")))) + "0p7l856a46zzla8brsg901pmh5738j63h7h7rn3da94ny8k417mf")))) (properties `((upstream-name . "AllelicImbalance"))) (build-system r-build-system) @@ -15432,14 +16041,14 @@ investigation using RNA-seq data.") (define-public r-aucell (package (name "r-aucell") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "AUCell" version)) (sha256 (base32 - "1zqjmg8nxxj30lxppl685ihynbz44vw7qm3kwjq6cp83c5556hz9")))) + "1d1icbq8i7mwsc7lv9pn4r0vs7azx1lwng5p3ghnray1ygqclbi0")))) (properties `((upstream-name . "AUCell"))) (build-system r-build-system) (propagated-inputs @@ -15473,14 +16082,14 @@ needed.") (define-public r-ebimage (package (name "r-ebimage") - (version "4.42.0") + (version "4.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBImage" version)) (sha256 (base32 - "0z0ajmy1zx7mqcjm2ibyk2qg3cj00kl76padyksbdbmwdncxs8yb")))) + "0jdi5cn4v5ll43xb3l6sy062snd5p9n2nrryc5aqd2ki18mdmghy")))) (properties `((upstream-name . "EBImage"))) (build-system r-build-system) (propagated-inputs @@ -15512,14 +16121,14 @@ visualization with image data.") (define-public r-yamss (package (name "r-yamss") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "yamss" version)) (sha256 (base32 - "0kjlp62s2393jdwp0crizsgp4iqagbgnd3hdl9vpbr9qrjxg4s7m")))) + "16rdy35wmydcx322pf9j7l7z2mzgrksg1whr8i8xdmdqfnqz3xyb")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -15545,14 +16154,14 @@ analysis.") (define-public r-gtrellis (package (name "r-gtrellis") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gtrellis" version)) (sha256 (base32 - "1kk7ysscq8xdbn35b20s8sn8gl93sy0c718fmvr1yrhiqaxq5alr")))) + "022wn0l2wfizlz6d5plkphjsjbmxw2wcvxrzr4vanczjzzyxv5c5")))) (build-system r-build-system) (propagated-inputs (list r-circlize r-genomicranges r-getoptlong r-iranges)) @@ -15571,14 +16180,14 @@ genomic categories and to add self-defined graphics in the plot.") (define-public r-somaticsignatures (package (name "r-somaticsignatures") - (version "2.36.0") + (version "2.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SomaticSignatures" version)) (sha256 (base32 - "075w88x7lv2fkp2ipqgxp4pzh6kbjw3nmp0qra2p4fss4j3g8d6s")))) + "0s9kjjh1n4a55ycjvcw8ymjcclcj8b35aygx4x1k5af1hf3f7wyb")))) (properties `((upstream-name . "SomaticSignatures"))) (build-system r-build-system) @@ -15610,14 +16219,14 @@ decomposition algorithms.") (define-public r-yapsa (package (name "r-yapsa") - (version "1.26.8") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "YAPSA" version)) (sha256 (base32 - "16rr2bkni3jx5qskr5fz5lvf23d03xgd3m4068mnd3n9r23hpb4p")))) + "07dxhaywad9ivkrc454hhizfw6a5yvarrc5fp5za2jgsznv408wl")))) (properties `((upstream-name . "YAPSA"))) (build-system r-build-system) (propagated-inputs @@ -15659,14 +16268,14 @@ provided.") (define-public r-gcrma (package (name "r-gcrma") - (version "2.72.0") + (version "2.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gcrma" version)) (sha256 (base32 - "0k4fsmqkv82d3a6v3gwphvbri5sgbd3f1s4qyv960rhyk2xj2b4p")))) + "07ina8w8p5bm382v452i2wpmv90gvgli393lsgp7xy0h9in7h6yg")))) (build-system r-build-system) (propagated-inputs (list r-affy @@ -15741,14 +16350,14 @@ chips with the MAQC reference datasets.") (define-public r-quantro (package (name "r-quantro") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "quantro" version)) (sha256 (base32 - "08m94q65c11isbkx9xljm2bx2aq2rml1bqh5i1cg81xg2ilm9h6a")))) + "032qxwgldl1hbgsgb5q3fi7nfg1nx3k0yppqkvim5cif613m1nzq")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -15774,14 +16383,14 @@ groups.") (define-public r-yarn (package (name "r-yarn") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "yarn" version)) (sha256 (base32 - "0ddfl4jp0n8sb665hcpsij959fl28rj22n1h61wp2374kpc0fwfj")))) + "12d806pyiks5xbvxng4pxn0xqvgs4c526gp2pp2qhdxw0w2m29rj")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -15811,14 +16420,14 @@ large RNA-seq experiments.") (define-public r-roar (package (name "r-roar") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "roar" version)) (sha256 (base32 - "0p5q6nyp8d0gl95rd89xrs08gv87m1q6d0x4ws2b6sd4gc1nw2ny")))) + "0pibk6zdqlbm0rxnb95pd94v6lbg67rwmjnpfxizq7wv36pw6kdr")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -15879,14 +16488,14 @@ genes.") (define-public r-massspecwavelet (package (name "r-massspecwavelet") - (version "1.66.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MassSpecWavelet" version)) (sha256 (base32 - "1nc1imxia71sxxvi77f91yhwxza2l8kk1d7zkp5680xzw6yd6ajr")))) + "044rz2xsz2v8i9ha20hxn2cwf7wa74p5f25jql8ancp6r3gim9sy")))) (properties `((upstream-name . "MassSpecWavelet"))) (build-system r-build-system) @@ -15903,14 +16512,14 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") (define-public r-xcms (package (name "r-xcms") - (version "3.22.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (bioconductor-uri "xcms" version)) (sha256 (base32 - "112g2lpi074cr8g09cqwjbcwv9aw4djr7ashxpnxjycd3ayc0j3v")))) + "10bvxww489mb4bl5v9ma6klyg359zb9ady5rl95q1mkp54hahdw8")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -15920,16 +16529,19 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") r-lattice r-massspecwavelet r-mscoreutils + r-msexperiment r-msfeatures r-msnbase r-multtest r-mzr r-plyr + r-progress r-protgenerics r-rann r-rcolorbrewer r-robustbase r-s4vectors + r-spectra r-summarizedexperiment)) (native-inputs (list r-knitr)) @@ -15945,13 +16557,13 @@ data for high-throughput, untargeted analyte profiling.") (define-public r-wppi (package (name "r-wppi") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wppi" version)) (sha256 (base32 - "06y4pq8msjzwrw1jgyj9yskgpfhvcz54qcsv0h14bakhyrwk00pg")))) + "04wg645c0gww8mq3vg70gqlwm12dmqxmvk704zvmxcpifhrvpn2b")))) (properties `((upstream-name . "wppi"))) (build-system r-build-system) ;; This is necessary because omnipathr attempts to write a configuration @@ -15986,14 +16598,14 @@ scores and a path search algorithm.") (define-public r-wrench (package (name "r-wrench") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Wrench" version)) (sha256 (base32 - "18x12395928d0mf8kffmdjqkdxrzgqzzhhvs7sdzldwyas6hfg2h")))) + "11g6a2315hllf197ssccybhv6i7p48n7bv2amzpgxs7bs7qg3k9d")))) (properties `((upstream-name . "Wrench"))) (build-system r-build-system) (propagated-inputs @@ -16010,14 +16622,14 @@ that arising from 16s metagenomic surveys.") (define-public r-wiggleplotr (package (name "r-wiggleplotr") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wiggleplotr" version)) (sha256 (base32 - "15gbs10bi1alxxbxaj4h3hzfgck4nxygy896y34x81w1rn7in3vp")))) + "1gq0hxmnnis0g1y6hiphz02dmk3pfjz874xb2bxqw49z7387fwm8")))) (build-system r-build-system) (propagated-inputs (list r-assertthat @@ -16044,14 +16656,14 @@ visualization of exonic read coverage.") (define-public r-widgettools (package (name "r-widgettools") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "widgetTools" version)) (sha256 (base32 - "03bvh2jk97jj40z35q5n1is2wxrs4dggw08ndyywy4pzx1diqdc4")))) + "1zkc275sb1qbban7sghqziv3xkg7wjdpghddklv451n7j282k6w1")))) (properties `((upstream-name . "widgetTools"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/widgetTools/") @@ -16065,14 +16677,14 @@ widgets in R.") (define-public r-webbioc (package (name "r-webbioc") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "webbioc" version)) (sha256 (base32 - "0z2sixzs0rwdwdhxs5mqzghgiw4g64l8p9ag5lw289bzs4c4kqnd")))) + "1ca41q7hxy6p8kvc3qbjplvn40k4jwhf0mb03njifry4xi1xipgy")))) (build-system r-build-system) (inputs (list netpbm perl)) @@ -16097,14 +16709,14 @@ Currently only Affymetrix oligonucleotide analysis is supported.") (define-public r-zinbwave (package (name "r-zinbwave") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zinbwave" version)) (sha256 (base32 - "1bmxbzpgmwama42a3vi1n0sic166v5zs0kl9mhmrh0rrx0nv303k")))) + "1lp8x9grc07kaz9iy7yc45mk708g9dplsl86fq0ip8rs51c8f31i")))) (build-system r-build-system) (propagated-inputs (list r-biocparallel @@ -16130,14 +16742,14 @@ the data.") (define-public r-zfpkm (package (name "r-zfpkm") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "zFPKM" version)) (sha256 (base32 - "1fkzyq282xafyapgi5xi1c2dmfkyikqvf622pycjs80fas38044h")))) + "18pnzc51r7l1ypnhavl83r3gy7l91qnqzvl6771zid04g99pk844")))) (properties `((upstream-name . "zFPKM"))) (build-system r-build-system) (propagated-inputs @@ -16155,14 +16767,14 @@ This algorithm is based on the publication by Hart et al., 2013 (Pubmed ID (define-public r-rbowtie2 (package (name "r-rbowtie2") - (version "2.6.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rbowtie2" version)) (sha256 (base32 - "11h4irhi0pxd0l378im455amqfamqypyl0ri2cs8nk1lg184ridr")))) + "0dx1psk6f27p1kiw4qwj1nf55gpqgisibzipvlnn5m9q3q8g70gv")))) (properties `((upstream-name . "Rbowtie2"))) (build-system r-build-system) (propagated-inputs @@ -16182,14 +16794,14 @@ rapid adapter trimming, identification, and read merging.") (define-public r-progeny (package (name "r-progeny") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "progeny" version)) (sha256 (base32 - "047x6by3xa15gvi3kny5pkqxaq8d2kzcfi55ic5j7a351715l6l7")))) + "1plgwi2fmx7bh648fqpzzfqnh84fsgnn5jfcbdf9yia6zzigicql")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -16214,14 +16826,14 @@ expression\".") (define-public r-arrmnormalization (package (name "r-arrmnormalization") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ARRmNormalization" version)) (sha256 (base32 - "001nwl605prg942vmnbb1rwjwgpscpjs27ssic3h10rlmpb65yzp")))) + "1fd1pfw2ggqb0k2npvibfy8liix57m01cxfxp10shvfbzjjy4wjm")))) (properties `((upstream-name . "ARRmNormalization"))) (build-system r-build-system) @@ -16237,14 +16849,14 @@ Infinium HumanMethylation 450k assay.") (define-public r-biocfilecache (package (name "r-biocfilecache") - (version "2.8.0") + (version "2.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocFileCache" version)) (sha256 (base32 - "1qk1n50arlk0mfkv9p3zl3lqbapzfkjdbadv51hsp4h9lyaw9sbg")))) + "044kh1rfgb608y2v4wzbzddirhw5crj3k6i28wr78qgnzqc89mdm")))) (properties `((upstream-name . "BiocFileCache"))) (build-system r-build-system) (propagated-inputs @@ -16269,14 +16881,14 @@ and data files used across sessions.") (define-public r-iclusterplus (package (name "r-iclusterplus") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "iClusterPlus" version)) (sha256 (base32 - "1lbkmin9pkk9yzpmwrfyniyqnwmp0wcgiirq8prmzi5mvndl6wm3")))) + "0p56w6431jg921416dkyiykccvr7alq6x6r1gcx5d9hkcpyncks1")))) (properties `((upstream-name . "iClusterPlus"))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -16299,14 +16911,14 @@ Gaussian distributions.") (define-public r-rbowtie (package (name "r-rbowtie") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rbowtie" version)) (sha256 (base32 - "1hfr1zdvikvygzgyy58f5rnz5jkmsrhwa930h331wx5012hhmnv7")))) + "1arwr8gisc5g9bwxlachf3lvxpd2767ahnwdf2p1lidwpfism8l8")))) (properties `((upstream-name . "Rbowtie"))) (build-system r-build-system) (arguments @@ -16335,14 +16947,14 @@ alignment tool.") (define-public r-sgseq (package (name "r-sgseq") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SGSeq" version)) (sha256 (base32 - "0qsmy85400in2xvw3bnzjnk8ni3lipqjc81npk3fmvbp6cb85njq")))) + "1h44r0frrw54s9nqa539ifg270ggmm634gj9cyhn4z7nhxxh134c")))) (properties `((upstream-name . "SGSeq"))) (build-system r-build-system) (propagated-inputs @@ -16378,14 +16990,14 @@ interpretation.") (define-public r-rhisat2 (package (name "r-rhisat2") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhisat2" version)) (sha256 (base32 - "1x9phnrk27v2r3ldqa9cd6yp2q3y5p2rm9wmra3wgrmhz9gxq1qy")))) + "1pxlpwqzbdii0b1swy9vcq905934yfmyqwfx2j3f7n5n4dgglc2q")))) (properties `((upstream-name . "Rhisat2"))) (build-system r-build-system) (arguments @@ -16416,14 +17028,14 @@ index.") (define-public r-quasr (package (name "r-quasr") - (version "1.40.1") + (version "1.42.1") (source (origin (method url-fetch) (uri (bioconductor-uri "QuasR" version)) (sha256 (base32 - "08vns1wbgpxw1x6djp84f9hl3gqaybbw9917ghfzk0x3ijpvggbg")))) + "0695pjvp742qn629kxly4a9crbg6vakdx1ygnyshprjsz6xz2vnn")))) (properties `((upstream-name . "QuasR"))) (build-system r-build-system) (propagated-inputs @@ -16458,14 +17070,14 @@ quantification of genomic regions of interest.") (define-public r-rqc (package (name "r-rqc") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rqc" version)) (sha256 (base32 - "15w5bmcl7h3fz6qhdqz4qc3qkg3pxcmzapg4mnnckzmyg8kh0i4l")))) + "0hrhfgv0b9ycw2vmzkpmrv9m9jvvq1n6asnxnrgvzlz81xak84ic")))) (properties `((upstream-name . "Rqc"))) (build-system r-build-system) (propagated-inputs @@ -16501,14 +17113,14 @@ graphics.") (define-public r-birewire (package (name "r-birewire") - (version "3.32.0") + (version "3.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiRewire" version)) (sha256 (base32 - "1741raw1834093y5zhgx9jywfgz0wl0idlkynvab2c8vi40kc9a8")))) + "1h5pmd38b9zpbz1nngmk1s0cag4z0vx93yi2n7r85nca9z02cxad")))) (properties `((upstream-name . "BiRewire"))) (build-system r-build-system) (propagated-inputs @@ -16554,14 +17166,14 @@ Markov-Chain-Monte-Carlo is applied to sample the activity states.") (define-public r-multidataset (package (name "r-multidataset") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiDataSet" version)) (sha256 (base32 - "1qyvwhmdv27xsyljyzyh52pn6x0wqx8rslvr2j7vqcjyywv270x6")))) + "1n17bpzj95hkljvgqpyv92jm4bk1d3j3mdg7106pb3dffvwv52sk")))) (properties `((upstream-name . "MultiDataSet"))) (build-system r-build-system) (propagated-inputs @@ -16591,14 +17203,14 @@ packages.") (define-public r-ropls (package (name "r-ropls") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ropls" version)) (sha256 (base32 - "1cq5ixaxag5r6nvl73c8bznxkdjhxw1r7qx90ml7qm4jr7wyi173")))) + "1k3j1cbapzqk0qr3v4gijskp487xyz2n4lv4kia9y5pmplddxp7v")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -16633,14 +17245,14 @@ coefficients).") (define-public r-biosigner (package (name "r-biosigner") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biosigner" version)) (sha256 (base32 - "19sl75168zv6qqmgsfnhcyw1z0lp0phmky40lsl6bbmy4k2hfw38")))) + "1j3wkqvha6pzd6d3wm2q4lihn8p9ycw0wmddjqpnqvglb1x7c0f8")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -16668,14 +17280,14 @@ datasets.") (define-public r-annotatr (package (name "r-annotatr") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "annotatr" version)) (sha256 (base32 - "1vjbk1vpqjxy9wv2a6sc32yyk0bhkbvdx9hl3vs5yjifwdswh2pw")))) + "16nkxnbsmr0y6km794x2iwbkyrkf0svg6ln3qkqnw0a47a3cbm65")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -16709,14 +17321,14 @@ annotations.") (define-public r-rsubread (package (name "r-rsubread") - (version "2.14.2") + (version "2.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "1dgbvhsd0rki1skwrb4acd3cfy7c9slsjq1s7r2469zbs3xf12xc")))) + "0bhq8q3dch09r3digf3snfvhyj6w7j1qqw8gl28b29in8azg6v4d")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs (list zlib)) @@ -16735,13 +17347,13 @@ and to both short and long sequence reads.") (define-public r-flowai (package (name "r-flowai") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowAI" version)) (sha256 (base32 - "0ydy98qsiqpw0b6fvmlv09kza94qjcl40ma9pknzgbq21ac4z25g")))) + "1bi13f8q7267lai71sl640w9zgd5a1iln5r4ri2dcskkwb2qxzkz")))) (properties `((upstream-name . "flowAI"))) (build-system r-build-system) (propagated-inputs @@ -16801,14 +17413,14 @@ the quality control enables the detection and removal of anomalies.") (define-public r-consensusclusterplus (package (name "r-consensusclusterplus") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ConsensusClusterPlus" version)) (sha256 (base32 - "0ig6xfhd70my5j4xrdy8srg1wi8nb3kcxlrld9py47psrq9vdadm")))) + "11xcz9b4mg3inz8c8f2vckgai67s740qjyynjim4ahf9zd0j7rxs")))) (properties `((upstream-name . "ConsensusClusterPlus"))) (build-system r-build-system) @@ -16867,14 +17479,14 @@ of the analyses while minimizing technical noise.") (define-public r-cytolib (package (name "r-cytolib") - (version "2.12.1") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cytolib" version)) (sha256 (base32 - "0mfv259k92vz0g7zv8zir2av2nlmx6na1f6q9zyj24s18m7mrkqz")))) + "1r2slhzrp3gf45k5gknqgj3vjz7p0rx2yjzrbp020inj82fp4mgi")))) (properties `((upstream-name . "cytolib"))) (build-system r-build-system) (native-inputs @@ -16891,14 +17503,14 @@ interact with gated cytometry data.") (define-public r-flowcore (package (name "r-flowcore") - (version "2.12.2") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowCore" version)) (sha256 (base32 - "1z3xsp1ymvdjhwcj5mkhl1d586rlr5i8vji9y5gs595w3naa4r0h")))) + "11aic1nzlw0gdpcpmky5jzljxgxcrimi29f0zl3yjvgb48qa88bd")))) (properties `((upstream-name . "flowCore"))) (build-system r-build-system) (propagated-inputs @@ -16923,14 +17535,14 @@ with flow cytometry data.") (define-public r-flowmeans (package (name "r-flowmeans") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowMeans" version)) (sha256 (base32 - "18lp1pickpd68fl7a4nidyvyh4yf53gbgn2f2yxaxfp2mk3mj88w")))) + "06n35c5fdkd3l8d5q8a23yslanirwhbf07b4f0zmf9a43zi642bv")))) (properties `((upstream-name . "flowMeans"))) (build-system r-build-system) (propagated-inputs @@ -16946,14 +17558,14 @@ change point detection.") (define-public r-ncdfflow (package (name "r-ncdfflow") - (version "2.46.0") + (version "2.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ncdfFlow" version)) (sha256 (base32 - "0nrj4g02kx763wb70fzvhidmzp82gr1g3fp1aa1bv34cj4lnp47q")))) + "0z9vgd8v69iq8gv23iiaxrk77j2aq8y2n5k8x9jmxphbm0cm19a0")))) (properties `((upstream-name . "ncdfFlow"))) (build-system r-build-system) (propagated-inputs @@ -16976,14 +17588,14 @@ manipulation of flow cytometry data.") (define-public r-ggcyto (package (name "r-ggcyto") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggcyto" version)) (sha256 (base32 - "1hgw8g0b62k2lyswp3m81qczzwsyid7zdrnyjvl9388k29w2105s")))) + "13zc5952drl187fl07v1nh6gv0g6ba11vxpxl4ghvavnknvi5phd")))) (properties `((upstream-name . "ggcyto"))) (build-system r-build-system) (propagated-inputs @@ -17013,14 +17625,14 @@ statistics to the plot.") (define-public r-flowviz (package (name "r-flowviz") - (version "1.64.0") + (version "1.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowViz" version)) (sha256 (base32 - "0y16hzadpr5c99cwkphc07vh6lypgfk5nacbmn7mmrw01b3gbk67")))) + "1hn021p2220a47qzlya8qabc9xgmxk9gcs505m7wx6gx6ysdn418")))) (properties `((upstream-name . "flowViz"))) (build-system r-build-system) (propagated-inputs @@ -17044,14 +17656,14 @@ statistics to the plot.") (define-public r-flowclust (package (name "r-flowclust") - (version "3.38.0") + (version "3.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowClust" version)) (sha256 (base32 - "1gmkmx6gzx4w39ijcad3lx2xnr2b833mhs8gcmc6k21k57aznzs2")))) + "1xg0hdxh0c1c1wc6d8gcynq8168hi61c3gjdf1223qvqwc39nsby")))) (properties `((upstream-name . "flowClust"))) (build-system r-build-system) (arguments @@ -17078,14 +17690,14 @@ model with Box-Cox transformation.") (define-public r-rprotobuflib (package (name "r-rprotobuflib") - (version "2.12.1") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "RProtoBufLib" version)) (sha256 (base32 - "097nxjijblqyz6nbpal7292qfijmk7x8dbx7plryr132xbaw5hdm")))) + "1i1a4ikfdyrrn0r53y1aipfm9dzzn6yzp5w651hvd6zav77cdh6q")))) (properties `((upstream-name . "RProtoBufLib"))) (build-system r-build-system) (arguments @@ -17107,14 +17719,14 @@ for other R packages to compile and link against.") (define-public r-flowworkspace (package (name "r-flowworkspace") - (version "4.12.2") + (version "4.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowWorkspace" version)) (sha256 (base32 - "1g1hym2anysgy7v46fnnxyzac3wzi1713vlih2gqzi23k8r2xx26")))) + "09cpbf33b3x9b06yf41qy2fy8zviwrznrpkb9fq3an8vg8gf51lp")))) (properties `((upstream-name . "flowWorkspace"))) (build-system r-build-system) (propagated-inputs @@ -17154,19 +17766,20 @@ matches the flowJo analysis.") (define-public r-flowstats (package (name "r-flowstats") - (version "4.12.0") + (version "4.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "flowStats" version)) (sha256 (base32 - "13mdpdndalm0d6azjancw0xcbdc674ivkj8kp6ccfpdd7gydhr4j")))) + "1f7qawn9wb8221npnmmygmvi4w1rq5lb74j3vmfzcak5kyga5xck")))) (properties `((upstream-name . "flowStats"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-biocgenerics + r-clue r-cluster r-corpcor r-fda @@ -17192,14 +17805,14 @@ package.") (define-public r-opencyto (package (name "r-opencyto") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "openCyto" version)) (sha256 (base32 - "0z0p09mkap1jqlq1x33i2ik87pbhwq85xgqyfsx4r360nhv06pna")))) + "12b4a65zgswzddkfdyl4j06qp7w9lkxv4h05m4z8hfff8c9x5bls")))) (properties `((upstream-name . "openCyto"))) (build-system r-build-system) (propagated-inputs @@ -17228,14 +17841,14 @@ sequential way to mimic the manual gating strategy.") (define-public r-cytoml (package (name "r-cytoml") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CytoML" version)) (sha256 (base32 - "19rlg15nk2205vma4whpqmvlazww5i3ibxhmk9cljsaj4ql560vf")))) + "0wq9ganas6l2jw8bnajr7vwli35kykpgv2lca4qh79nfgxlicff9")))) (properties `((upstream-name . "CytoML"))) (build-system r-build-system) (inputs @@ -17273,14 +17886,14 @@ standard to exchange gated cytometry data with other software platforms.") (define-public r-flowsom (package (name "r-flowsom") - (version "2.8.0") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "FlowSOM" version)) (sha256 (base32 - "13y0ny61skj14mfhjwpa5zmflzdqxy2vf6gd4m9358g4wxfbhkv0")))) + "170xz3b4kfsxpqirfz9vk4j8dkdmz4qd0a1nm3yaya1rddpg9m3l")))) (properties `((upstream-name . "FlowSOM"))) (build-system r-build-system) (propagated-inputs @@ -17309,14 +17922,14 @@ self-organizing map clustering and minimal spanning trees.") (define-public r-mixomics (package (name "r-mixomics") - (version "6.24.0") + (version "6.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "mixOmics" version)) (sha256 (base32 - "0dqndpmi56g772sra49vdrkjs4m9h2gzimwv3bwmw2l0krh2ax8s")))) + "0ifi89s611kblncnpvsrbl6sq2zi36binz63njrhya9wkyaxj6pc")))) (properties `((upstream-name . "mixOmics"))) (build-system r-build-system) (propagated-inputs @@ -17324,8 +17937,8 @@ self-organizing map clustering and minimal spanning trees.") r-corpcor r-dplyr r-ellipse - r-ggrepel r-ggplot2 + r-ggrepel r-gridextra r-igraph r-lattice @@ -17355,18 +17968,19 @@ delete entire rows with missing data.") (define-public r-depecher (package ;Source/Weave error (name "r-depecher") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DepecheR" version)) (sha256 (base32 - "1kn1w1fs19gjvg8nhbvj6hyp32h6k81dnal4ab12xl1jgaa3xj5p")))) + "1b3c1wg5xnhh4bdcjls26j6nsp0vx1g5y3grqv7x4ds01vmh3q2w")))) (properties `((upstream-name . "DepecheR"))) (build-system r-build-system) (propagated-inputs (list r-beanplot + r-collapse r-dosnow r-dplyr r-fnn @@ -17443,14 +18057,14 @@ genes in the gene-set that are ranked above the leading edge).") (define-public r-chicago (package (name "r-chicago") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Chicago" version)) (sha256 (base32 - "04h4a5nyc78jlsg9pj8ay559bwb8y1nm80v9zvyxd7r490yn7k7s")))) + "1mcpx785ag0jcsh08df34hx3wp55zd1vggnl3fflkinb78178n38")))) (properties `((upstream-name . "Chicago"))) (build-system r-build-system) (propagated-inputs @@ -17489,14 +18103,14 @@ expression space.") (define-public r-cicero (package (name "r-cicero") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "cicero" version)) (sha256 (base32 - "12zdygnwqjla99wzvvxzcmiwmh4v0rmnx4yix02gbj8xl4bxmm51")))) + "19vn31w74r45pq5m9pn5db1sz1qg757mghzzs933cdssnqf4m6y5")))) (build-system r-build-system) (propagated-inputs (list r-assertthat @@ -17556,14 +18170,14 @@ accessibility data.") (define-public r-circrnaprofiler (package (name "r-circrnaprofiler") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "circRNAprofiler" version)) (sha256 (base32 - "0gagfm7v5bnnfj1zy6zf4cg91bj8nvv4vm38f3a1s4q2xc8pcvfj")))) + "098fbrszph5cnh4n9zjhj92sg1bi6h6k57wm2vlaqkq0nab63r63")))) (properties `((upstream-name . "circRNAprofiler"))) (build-system r-build-system) @@ -17691,14 +18305,14 @@ cisTopics and explore the nature and regulatory proteins driving them.") (define-public r-genie3 (package (name "r-genie3") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GENIE3" version)) (sha256 (base32 - "1q4wi3k95c8vsyfx6359p2p29ascjg1cxmpp9bf99ixbjs71rd33")))) + "0bsid8qhcqgalqghr2b2592pzm4viyi7wq8h5dmhrrl7gky8l60k")))) (properties `((upstream-name . "GENIE3"))) (build-system r-build-system) (propagated-inputs @@ -17715,14 +18329,14 @@ regulatory networks from expression data.") (define-public r-roc (package (name "r-roc") - (version "1.76.0") + (version "1.78.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ROC" version)) (sha256 (base32 - "0fq59bwc5i8zdw0v0jr5j5lm4hk6p7b88i2xndsgj4fq65yr50g1")))) + "12msc6skvcx4ajk20l71k32rj8lsiafjxwcsrd51kyy5x2yj2v4m")))) (properties `((upstream-name . "ROC"))) (build-system r-build-system) (native-inputs @@ -17737,14 +18351,14 @@ Characteristic} (ROC) curves, with a focus on micro arrays.") (define-public r-watermelon (package (name "r-watermelon") - (version "2.6.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wateRmelon" version)) (sha256 (base32 - "0qslh2xhhyaf0nsgcqav6qgh05n8kp0s6p1zggc02iid30i1ibrj")))) + "1ra21qzni9cny52ag9zxi46vb9grabyqjyk01dqqp3r9i0b4999l")))) (properties `((upstream-name . "wateRmelon"))) (build-system r-build-system) (propagated-inputs @@ -17775,14 +18389,14 @@ metrics, with methods for objects produced by the @code{methylumi} and (define-public r-gdsfmt (package (name "r-gdsfmt") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gdsfmt" version)) (sha256 (base32 - "11qib2znznzvyb0x9qm1nfg9lhyqy63yrdjicy7n3n6l8dfd2lx7")) + "03qgiww523kijrkciln3fw3djn20rnvwz2j0i3p518h6fbl7vlpm")) (modules '((guix build utils))) ;; Remove bundled sources of zlib, lz4, and xz. Don't attempt to build ;; them and link with system libraries instead. @@ -17833,14 +18447,14 @@ with multiple R processes supported by the package @code{parallel}.") (define-public r-bigmelon (package (name "r-bigmelon") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bigmelon" version)) (sha256 (base32 - "1l1ym89qqbq6qx07bm2p8gcl5zd9xh0nbw10fb7s0pfbrkj8xy64")))) + "1j80f7k39p23s6fym3nia73g8d1v44hdiv73igcq6fnsllxg40hr")))) (properties `((upstream-name . "bigmelon"))) (build-system r-build-system) (propagated-inputs @@ -17863,18 +18477,18 @@ with multiple R processes supported by the package @code{parallel}.") (define-public r-seqbias (package (name "r-seqbias") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "seqbias" version)) (sha256 (base32 - "1sspl03m2hf6s5rw6nfqrycb236nvcgygql6apdlg3cjnikf090j")))) + "18pdpi855y1hhka96xc5886nqffjn1jhz9jr9p305iikdrsvmjp1")))) (properties `((upstream-name . "seqbias"))) (build-system r-build-system) (propagated-inputs - (list r-biostrings r-genomicranges r-rhtslib)) + (list r-biostrings r-genomicranges r-rhtslib r-zlibbioc)) (home-page "https://bioconductor.org/packages/seqbias/") (synopsis "Estimation of per-position bias in high-throughput sequencing data") (description @@ -17887,14 +18501,14 @@ genome sequence.") (define-public r-reqon (package (name "r-reqon") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ReQON" version)) (sha256 (base32 - "1knzla5d8n22121a9licrjh2rxrmh05304a9d4bs2f1r7aiwhgnh")))) + "0w28b3ma8r8rshijdm5jj1z64v91my7hcvw18r9pdwjprh05bw0g")))) (properties `((upstream-name . "ReQON"))) (build-system r-build-system) (propagated-inputs @@ -17910,14 +18524,14 @@ format.") (define-public r-wavcluster (package (name "r-wavcluster") - (version "2.34.0") + (version "2.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "wavClusteR" version)) (sha256 (base32 - "0491x3m0015g83m6a7pkc4783768clgykhlcmd2xr6cgrhih10g2")))) + "1y2bk1kla0l72xgdam2l9c0k7584ckdqscqnc184cxvqm6fb335j")))) (properties `((upstream-name . "wavClusteR"))) (build-system r-build-system) (propagated-inputs @@ -17957,13 +18571,13 @@ procedures that induce nucleotide substitutions (e.g. BisSeq).") (define-public r-tilingarray (package (name "r-tilingarray") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tilingArray" version)) (sha256 (base32 - "0wj3wb4x9s0v189p20rlwghsx82x314yyhhsnfmrl266qb1ambrn")))) + "01j4wj0mdfrlyhp2alf1xfy78f17x43w9i0wb41ljw6pm313np58")))) (properties `((upstream-name . "tilingArray"))) (build-system r-build-system) (propagated-inputs @@ -18039,14 +18653,14 @@ provides methods for retrieving enriched pathways.") (define-public r-variantfiltering (package (name "r-variantfiltering") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "VariantFiltering" version)) (sha256 (base32 - "0v0shsv0s9fzakdb4p84jfc4z57ryan27r1dkbvb3v25kjrhd8fi")))) + "01czx88dzqm8qv44kyy1n7b999wgfklxzgvmjh10chf677phnzsr")))) (properties `((upstream-name . "VariantFiltering"))) (build-system r-build-system) @@ -18083,76 +18697,17 @@ model, amino acid change consequence, minor allele frequencies across human populations, splice site strength, conservation, etc.") (license license:artistic2.0))) -(define-public r-genomegraphs - (package - (name "r-genomegraphs") - (version "1.46.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "GenomeGraphs" version)) - (sha256 - (base32 - "05vavhz936v7cknig2f2mn3fd9fiy54r3swlvifpawramblp1ags")))) - (properties `((upstream-name . "GenomeGraphs"))) - (build-system r-build-system) - (propagated-inputs - (list r-biomart)) - (home-page "https://bioconductor.org/packages/GenomeGraphs/") - (synopsis "Plotting genomic information from Ensembl") - (description - "Genomic data analyses requires integrated visualization of known genomic -information and new experimental data. GenomeGraphs uses the biomaRt package -to perform live annotation queries to Ensembl and translates this to e.g. -gene/transcript structures in viewports of the grid graphics package. This -results in genomic information plotted together with your data. Another -strength of GenomeGraphs is to plot different data types such as array CGH, -gene expression, sequencing and other data, together in one plot using the -same genome coordinate system.") - (license license:artistic2.0))) - -(define-public r-wavetiling - (package - (name "r-wavetiling") - (version "1.28.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "waveTiling" version)) - (sha256 - (base32 - "0d7l559zlmly8mncmh1zhkqmsml0bwwfpm7ccp8l26y852vwf7hf")))) - (properties `((upstream-name . "waveTiling"))) - (build-system r-build-system) - (propagated-inputs - (list r-affy - r-biobase - r-biostrings - r-genomegraphs - r-genomicranges - r-iranges - r-oligo - r-oligoclasses - r-preprocesscore - r-waveslim)) - (home-page "https://r-forge.r-project.org/projects/wavetiling/") - (synopsis "Wavelet-based models for tiling array transcriptome analysis") - (description - "This package is designed to conduct transcriptome analysis for tiling -arrays based on fast wavelet-based functional models.") - (license license:gpl2+))) - (define-public r-variancepartition (package (name "r-variancepartition") - (version "1.30.2") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "variancePartition" version)) (sha256 (base32 - "17jssd327l0miw52iadag2dbk8w4mhv2vwjpzdw89p8gww47bmbv")))) + "1pr321hv5q2sl8lc998hkwdl2mfyzcgf2l70ny2m3hfmlclq5lnn")))) (properties `((upstream-name . "variancePartition"))) (build-system r-build-system) @@ -18160,8 +18715,8 @@ arrays based on fast wavelet-based functional models.") (list r-aod r-biobase r-biocparallel - r-doparallel - r-foreach + r-corpcor + r-fancova r-ggplot2 r-gplots r-iterators @@ -18171,7 +18726,6 @@ arrays based on fast wavelet-based functional models.") r-mass r-matrix r-pbkrtest - r-progress r-rdpack r-remacor r-reshape2 @@ -18194,14 +18748,14 @@ measures.") (define-public r-htqpcr (package (name "r-htqpcr") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HTqPCR" version)) (sha256 (base32 - "12p0jb9bpz4x612vwj77d6l5h8rihfkzmhp8qy1gvv2zmn2a54jf")))) + "14cff36ikbqhd5xizihpxzsv9jimcpbgnd381jd154pgi60bil0m")))) (properties `((upstream-name . "HTqPCR"))) (build-system r-build-system) (propagated-inputs @@ -18224,13 +18778,13 @@ features (e.g. genes, microRNAs).") (define-public r-ucell (package (name "r-ucell") - (version "2.4.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (bioconductor-uri "UCell" version)) (sha256 (base32 - "01qcwmiqri4xvwr3j4k1g062rfj6bbc0bvh0ifq1jq2xrm1azw9y")))) + "1ds11f1q6v89sfcj1sinrkv7aw3s0prf5nxf7pz4hdsvqn4zp467")))) (properties `((upstream-name . "UCell"))) (build-system r-build-system) (propagated-inputs (list r-biocneighbors @@ -18255,14 +18809,14 @@ directly interact with SingleCellExperiment and Seurat objects.") (define-public r-unifiedwmwqpcr (package (name "r-unifiedwmwqpcr") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "unifiedWMWqPCR" version)) (sha256 (base32 - "1gza678sd5m2rbki0l5hniki6gmds2cljkmywmk5v5m9swh9azq7")))) + "0v3jpnm3nq66xvckmc8447xl7wngfhhiwq6vjx54wgc6f586vmgd")))) (properties `((upstream-name . "unifiedWMWqPCR"))) (build-system r-build-system) @@ -18279,14 +18833,14 @@ data.") (define-public r-universalmotif (package (name "r-universalmotif") - (version "1.18.1") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "universalmotif" version)) (sha256 (base32 - "0v1085dl16a3494f1fxc9rk1ffz3si89mdwbmnnczyhj5p13pfx8")))) + "0wy7zplypjiqv4wjq0l30xb5xj63fxb7z2wmmfrmzfkbgbm0xyha")))) (properties `((upstream-name . "universalmotif"))) (build-system r-build-system) @@ -18328,13 +18882,13 @@ motifs, and others.") (define-public r-ace (package (name "r-ace") - (version "1.18.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ACE" version)) (sha256 (base32 - "158v25ivbmsh54ywb5spfsd1nrmvfq83s8fkp14i7q5ckr2kvjhm")))) + "0ll0lksz6nzfj5ivmyrp5w24bhfl083amjpr0m8qlzpdw6k3wi98")))) (properties `((upstream-name . "ACE"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-genomicranges r-ggplot2 r-qdnaseq)) @@ -18357,13 +18911,13 @@ of @dfn{tumor cells} (cells with divergent segments).") (define-public r-acgh (package (name "r-acgh") - (version "1.78.0") + (version "1.80.0") (source (origin (method url-fetch) (uri (bioconductor-uri "aCGH" version)) (sha256 (base32 - "0k8fbwhh1w0b0zy5qgixmcnwxi3v78f1bjmjg1yx6paniwk58bzn")))) + "1qckqdil1cq8lbrj9di96w9934r1fp48xpmfdwp4f2vw9pjadi1q")))) (properties `((upstream-name . "aCGH"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-cluster r-multtest r-survival)) @@ -18381,13 +18935,13 @@ printing and plotting @code{aCGH} objects.") (define-public r-acme (package (name "r-acme") - (version "2.56.0") + (version "2.58.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ACME" version)) (sha256 (base32 - "1z6j4wy355pljn9wf12zzq4zqrhaik0i2phy7jg89jsys7n2mlxy")))) + "0cy1f4ki4j7yxc9cws5s17ljd4ac0yxhijms0pm31im81qz2djax")))) (properties `((upstream-name . "ACME"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-biocgenerics)) @@ -18408,13 +18962,13 @@ on whole-genome tiling array experiments quite easily with enough memory.") (define-public r-acde (package (name "r-acde") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "acde" version)) (sha256 (base32 - "088dq6mc9m1bx0dprcz8cdpfp447lnxq7420r139mhcik0z21vky")))) + "1rqyjj4lgqxs372qx8p3qx2napww0djh4jz8hzgv86x9r202kk9p")))) (properties `((upstream-name . "acde"))) (build-system r-build-system) (propagated-inputs (list r-boot)) @@ -18473,14 +19027,14 @@ using whole genome sequencing data.") (define-public r-activepathways (package (name "r-activepathways") - (version "2.0.2") + (version "2.0.3") (source (origin (method url-fetch) (uri (cran-uri "ActivePathways" version)) (sha256 (base32 - "1h0ih87pf6b5mdhmh65frv3nqx7v5adqv37wn2p3gkpszd6hwc79")))) + "0mgvxpqaq0jncr1kzmwhqkv3pajx2fz6vwhv5arw7fgla6w09p9h")))) (properties `((upstream-name . "ActivePathways"))) (build-system r-build-system) @@ -18534,14 +19088,14 @@ gene expression.") (define-public r-bgx (package (name "r-bgx") - (version "1.66.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bgx" version)) (sha256 (base32 - "1g6k3ryj8dz17asa4imnrk77z4dk9an5ssrqr17r0g797d5f4qjm")))) + "0v85i0lwmxq5yq9ygfzljgy8fsflqq1p53rq8aasnndd6gsm8ld2")))) (properties `((upstream-name . "bgx"))) (build-system r-build-system) (arguments @@ -18570,14 +19124,14 @@ Affymetrix GeneChips.") (define-public r-bhc (package (name "r-bhc") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BHC" version)) (sha256 (base32 - "0w60h1jr9kwvgg5d6bcrq4gl1aa1v6xrn43ymsc2312019psrrjy")))) + "1m289q9bs7i7d15g5mzdmzw7yppnqspr8illkya8kxlv1i2sify1")))) (properties `((upstream-name . "BHC"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/BHC/") @@ -18596,14 +19150,14 @@ algorithm which is more efficient for larger data sets.") (define-public r-bicare (package (name "r-bicare") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BicARE" version)) (sha256 (base32 - "1q7dsvj6nvczs76jcxyy77298vgk4zk083bldmbbgnwparrgjii9")))) + "10inwxl1cmkdp8037wcwkj5wzxsrrcysxfbqhnkh7pzhzvwnzz9h")))) (properties `((upstream-name . "BicARE"))) (build-system r-build-system) (propagated-inputs @@ -18618,14 +19172,14 @@ results.") (define-public r-bifet (package (name "r-bifet") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiFET" version)) (sha256 (base32 - "05lwz2pw2vnhmlhp5vv9j45jrc5ssdw4lx6mkxnsvds8zl3y9294")))) + "056zqlql39q44snvx5nzc5snrihpr1kj3jdbpbb401hxi9r64f4r")))) (properties `((upstream-name . "BiFET"))) (build-system r-build-system) (propagated-inputs @@ -18647,14 +19201,14 @@ the read count and GC content bias.") (define-public r-rsbml (package (name "r-rsbml") - (version "2.58.0") + (version "2.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rsbml" version)) (sha256 (base32 - "0mgg1qfvxgyjk6fw4x0cv486vrsgf1kbqr6nqhgxj6lk8w6909fm")))) + "0pvj0qgc6hd02g9ppfc610gvfn412rw69rxh43y4dr3n894kdm2i")))) (properties `((upstream-name . "rsbml"))) (build-system r-build-system) (inputs @@ -18673,13 +19227,13 @@ validating output, provides an S4 SBML DOM, converts SBML to R graph objects.") (define-public r-hybridmtest (package (name "r-hybridmtest") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HybridMTest" version)) (sha256 - (base32 "19pycad35hc7ylnsz75bv029y1r6j9xvrbhzk4i64i7jn8gi7ngh")))) + (base32 "1jkihcad453d7jqb78fl03yfqz169jz75c40y53569ndp2j4rg71")))) (properties `((upstream-name . "HybridMTest"))) (build-system r-build-system) (propagated-inputs @@ -18704,14 +19258,14 @@ then the law of total EBPs.") (define-public r-hypergraph (package (name "r-hypergraph") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hypergraph" version)) (sha256 (base32 - "13f3m8m6i99hzm94hriry645jcn0a1ki8z8wmn3mkasdi6bzx20h")))) + "16bjjfzcndjfqsywzw2cn551fgqlnll2gi975w0qqxhkh3jssgmi")))) (properties `((upstream-name . "hypergraph"))) (build-system r-build-system) (propagated-inputs @@ -18726,14 +19280,14 @@ manipulating hypergraphs.") (define-public r-hyperdraw (package (name "r-hyperdraw") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "hyperdraw" version)) (sha256 (base32 - "0vhfvmv6b3kab6a8hy2y9zwxgzwb5vliaaxhlrgz8i4pvvq5nhqb")))) + "1lgfpw9f7095lgk46gdpxq3z52c24xw4ajl7yid3pcgw19bfcgk5")))) (properties `((upstream-name . "hyperdraw"))) (build-system r-build-system) (inputs (list graphviz)) @@ -18748,14 +19302,14 @@ manipulating hypergraphs.") (define-public r-biggr (package (name "r-biggr") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiGGR" version)) (sha256 (base32 - "03pd4a3l912zdfk35flagikqimp01wp76nslid32l43d7yg9p57w")))) + "1pdsxkh9fkgn80f7p21902pb6xp2qafq10p29ifb55qwz8gma2ff")))) (properties `((upstream-name . "BiGGR"))) (build-system r-build-system) (propagated-inputs @@ -18852,17 +19406,58 @@ coordinate plots, volcano plots, and litre plots. It includes examples for visualizing RNA-sequencing datasets and differentially expressed genes.") (license license:gpl3))) +(define-public r-chemmineob + (package + (name "r-chemmineob") + (version "1.40.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ChemmineOB" version)) + (sha256 + (base32 "0mfajzwzldmra6g5kni5yw7m2n719456p1vd3hxx2r7l1phdjixi")))) + (properties `((upstream-name . "ChemmineOB"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* "src/Makevars.in" + (("/usr/include/openbabel3") + (string-append #$(this-package-input "openbabel") + "/include/openbabel3")) + (("/usr/include/eigen3") + (string-append #$(this-package-input "eigen") + "/include/eigen3")))))))) + (inputs (list eigen openbabel)) + (propagated-inputs (list r-bh r-biocgenerics r-rcpp r-zlibbioc)) + (native-inputs (list pkg-config r-knitr)) + (home-page "https://github.com/girke-lab/ChemmineOB") + (synopsis "R interface to a subset of OpenBabel functionalities") + (description + "@code{ChemmineOB} provides an R interface to a subset of cheminformatics +functionalities implemented by the @code{OpelBabel} C++ project. +@code{OpenBabel} is an open source cheminformatics toolbox that includes +utilities for structure format interconversions, descriptor calculations, +compound similarity searching and more. @code{ChemineOB} aims to make a subset +of these utilities available from within R. For non-developers, +@code{ChemineOB} is primarily intended to be used from @code{ChemmineR} as an +add-on package rather than used directly.") + (license license:asl2.0))) + (define-public r-chemminer (package (name "r-chemminer") - (version "3.52.0") + (version "3.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChemmineR" version)) (sha256 (base32 - "1m4vgq3z0kya7kbncawr9csvbwnh74mh012w7g2ialwd3nwdf91x")))) + "1328mwmghflrvir1i3crlq8q36wq60x2an11saabg63hnx4paa81")))) (properties `((upstream-name . "ChemmineR"))) (build-system r-build-system) (propagated-inputs @@ -18898,13 +19493,13 @@ structures.") (define-public r-fmcsr (package (name "r-fmcsr") - (version "1.42.0") + (version "1.44.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fmcsR" version)) (sha256 - (base32 "0ci77gbz93i3s2j2gjp7y3ssn6bcdcmqnl23smnjai7qjmln64dp")))) + (base32 "17il9mi1iagl474ia1lz0ajx1wq67jw5famkr1fmjlis8ymw8hnd")))) (properties `((upstream-name . "fmcsR"))) (build-system r-build-system) (propagated-inputs @@ -18927,14 +19522,14 @@ searching and clustering.") (define-public r-bioassayr (package (name "r-bioassayr") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bioassayR" version)) (sha256 (base32 - "0ilwniyrp3m8mi1vmggd17f9g6wdw7a78l2db190w29alzpbfmp6")))) + "1mm1nzdz9cl8mf33yiyaspqkx4sbqhhs6m9jfgl42fhscrhaxfsi")))) (properties `((upstream-name . "bioassayR"))) (build-system r-build-system) (propagated-inputs @@ -18962,14 +19557,14 @@ available bioactivity data.") (define-public r-biobroom (package (name "r-biobroom") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biobroom" version)) (sha256 (base32 - "0kb6ylq94vywfky0mcrva109darcv361sqvwb19qn92p8vh5199l")))) + "1ivclipy2igf8ax7f0pqrcqflcm7h0a8ny6nfa0200vp99an8ymf")))) (properties `((upstream-name . "biobroom"))) (build-system r-build-system) (propagated-inputs @@ -18991,14 +19586,14 @@ visualize bioinformatics analyses.") (define-public r-graphite (package (name "r-graphite") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "graphite" version)) (sha256 (base32 - "1fhjkgl6567qchi5sfdqnznalm1l7c7pabz8jc9d7ib9x4g922q5")))) + "1h8j10jx02zsxs6rzids3gy4xchdhgzkifa5grrfbn8faf9ycy2n")))) (properties `((upstream-name . "graphite"))) (build-system r-build-system) (propagated-inputs @@ -19015,14 +19610,14 @@ symbols).") (define-public r-reactomepa (package (name "r-reactomepa") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ReactomePA" version)) (sha256 (base32 - "1hy8qz7d2826kf6pkl3v8cjwx35ap8xr92jw5wv445p3xcd1clzn")))) + "0kflwlmyckyivr8xh7fsmpl7jfkq5kavwpkswmvdfqckbd0n9xsc")))) (properties `((upstream-name . "ReactomePA"))) (build-system r-build-system) (propagated-inputs @@ -19048,14 +19643,14 @@ enrichment analysis and several functions for visualization.") (define-public r-ebarrays (package (name "r-ebarrays") - (version "2.64.0") + (version "2.66.0") (source (origin (method url-fetch) (uri (bioconductor-uri "EBarrays" version)) (sha256 (base32 - "1k50br4hpkrwv1lnn0wp1c7kj32vk0gg19aivmw5d6brjdd39c1f")))) + "1m8dy1lmx9m8p5jjk0i7yllb4pvq77kynszk1nz8cc1niz6xs47q")))) (properties `((upstream-name . "EBarrays"))) (build-system r-build-system) (propagated-inputs @@ -19070,13 +19665,13 @@ microarray data.") (define-public r-biocbaseutils (package (name "r-biocbaseutils") - (version "1.2.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocBaseUtils" version)) (sha256 (base32 - "143fmjbi8spaj3njvc1xvsjszfxs7bv3vxik8pisw5y8lqzx7hqm")))) + "189jz8krhv0vdnk47m3cmy95zfg3l328w6dbhg6djvlkca17i275")))) (properties `((upstream-name . "BiocBaseUtils"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -19114,20 +19709,22 @@ monograph.") (define-public r-bioccheck (package (name "r-bioccheck") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocCheck" version)) (sha256 (base32 - "0a0fnmqln13iglnw8smbbr4k7hdvacipxa04zhqylygpsq1246bc")))) + "11d67dfwxc34n7yzpz58ficjk7sxnbxrajhnqlcxvsifgmybkb4d")))) (properties `((upstream-name . "BiocCheck"))) (build-system r-build-system) (propagated-inputs - (list r-biocfilecache + (list r-biocbaseutils + r-biocfilecache r-biocmanager r-biocviews + r-callr r-codetools r-graph r-httr @@ -19144,14 +19741,14 @@ checks on R packages that are to be submitted to the Bioconductor repository.") (define-public r-biocgraph (package (name "r-biocgraph") - (version "1.62.0") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biocGraph" version)) (sha256 (base32 - "0fnncmi82qb9lkg1zfyps7n3nrw1s3wcqbixh420w53hmdyryryl")))) + "1yy0bwvfa5b531jvmbiwrd4xg8cdvrgwr8l6bxasrh6yrbv8drml")))) (properties `((upstream-name . "biocGraph"))) (build-system r-build-system) (propagated-inputs @@ -19166,13 +19763,13 @@ different graph related packages produced by Bioconductor.") (define-public r-biocstyle (package (name "r-biocstyle") - (version "2.28.1") + (version "2.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "11v3gzy88fai0rhdymvj9k74g7hjc6n9fihfrrnw0qfr447z1d61")))) + "17pkdi3vn62pw1nzmgz0i45czynqjchq078ij8v1xvflg6lf7flw")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) @@ -19190,13 +19787,13 @@ functionality.") (define-public r-biocviews (package (name "r-biocviews") - (version "1.68.2") + (version "1.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biocViews" version)) (sha256 (base32 - "1icnaj1ifndym7nl1yafzd0y0fxyhzjyb4qzqpcnsqhh4yi3pnm5")))) + "0fpka47shrxcbc1k057f5zv79406daic0y34v8p5lsvxbgzh0m8b")))) (properties `((upstream-name . "biocViews"))) (build-system r-build-system) @@ -19219,14 +19816,14 @@ also known as views, in a controlled vocabulary.") (define-public r-experimenthub (package (name "r-experimenthub") - (version "2.8.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ExperimentHub" version)) (sha256 (base32 - "1md6lan98h95jv776zyvl5im39gz4h6fdxw571vfahgr4b2nxvm4")))) + "1prl24sg5l142155z3iaxrvig2wv2xqajq02nj30jjjih4p4936w")))) (properties `((upstream-name . "ExperimentHub"))) (build-system r-build-system) (propagated-inputs @@ -19252,14 +19849,14 @@ access.") (define-public r-grohmm (package (name "r-grohmm") - (version "1.34.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "groHMM" version)) (sha256 (base32 - "1zg30cb4s97zdv6c0f53ix6a97aan5w3lx698sa4cqvi4hbz8f35")))) + "15ibdbpj7vqypxfnp2w06w9lync11z3azzss6s97xhadkgsbw4vq")))) (properties `((upstream-name . "groHMM"))) (build-system r-build-system) (propagated-inputs @@ -19279,14 +19876,14 @@ access.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "00xgca1q9ai5x730bvx73f25lpwkr3dn2sia3msa49fpl4nrzr20")))) + "0dmhqymh800mljcpdf817nbyg20czp8y9bg13p3r4bfj6axxckch")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) @@ -19316,14 +19913,14 @@ rownames.") (define-public r-bioconcotk (package (name "r-bioconcotk") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocOncoTK" version)) (sha256 (base32 - "11135a4l0vn84qmpyclz052zy45s0m38av94604jqxgb51q9lwyf")))) + "1xymgfiv9abyaq5s7m683ml8a1ls9mqvbh9qjiz3jqbbpvmsm502")))) (properties `((upstream-name . "BiocOncoTK"))) (build-system r-build-system) (propagated-inputs @@ -19362,14 +19959,14 @@ tools for genome-scale analysis of cancer studies.") (define-public r-biocor (package (name "r-biocor") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioCor" version)) (sha256 (base32 - "1aw8yh9l0jbjvkqgyzyr0wmwjh3ppmb0lwg8hxsfcv52ycsmvk7p")))) + "0710dl05hs590fimp3dhg5hzvk6s79i0kwk6w6sj59pcawx2l6il")))) (properties `((upstream-name . "BioCor"))) (build-system r-build-system) (propagated-inputs @@ -19389,14 +19986,14 @@ gene selection, testing relationships, and so on.") (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.18.1") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "16d0sjkzagc0jxha28qxplg6iihwg2q05sig0s1291lm7kh5k9j8")) + "0swi6xiads31xcndc2cfzh0ivdl0wc88s83s1p1gxh51rgmgkb14")) (snippet '(for-each delete-file '("inst/htmlwidgets/lib/bioc_explore/bootstrap.min.js" @@ -19503,14 +20100,14 @@ analytics on packages.") (define-public r-biocset (package (name "r-biocset") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocSet" version)) (sha256 (base32 - "1q5794gsinpy9hv5n1vx79bkqxi1jxzxjl95jlw9pqjmlnki07i5")))) + "0sk4kmvl86xm85dqaf8gvii0qavyycyn2qp0v6dmfcjqai528v2x")))) (properties `((upstream-name . "BiocSet"))) (build-system r-build-system) (propagated-inputs @@ -19541,14 +20138,14 @@ accessing web references for elements/sets are also available in BiocSet.") (define-public r-biocworkflowtools (package (name "r-biocworkflowtools") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocWorkflowTools" version)) (sha256 (base32 - "1zvjj0hpqwdv7yifqwyb14166ppxw91d964gz4xclism5z5lvyln")))) + "0mh7lsiprshq56ns3b8pbv1j1mjcbdzqydvli0ynmvf5smn2j4m5")))) (properties `((upstream-name . "BiocWorkflowTools"))) (build-system r-build-system) @@ -19574,14 +20171,14 @@ Rmarkdown and LaTeX documents when authoring a Bioconductor Workflow.") (define-public r-biodist (package (name "r-biodist") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bioDist" version)) (sha256 (base32 - "1mx4abv7p76qsa0yzj0b4d03xklx09im01bx02lwa1w527gdmfc3")))) + "0ngpysb89wag4wvcq83ddjxhy1zhl32b2fy2fg5laa4g8xfrqaxz")))) (properties `((upstream-name . "bioDist"))) (build-system r-build-system) (propagated-inputs @@ -19596,14 +20193,14 @@ distance measures.") (define-public r-pcatools (package (name "r-pcatools") - (version "2.12.0") + (version "2.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "PCAtools" version)) (sha256 (base32 - "07kl7s2zd7nkhg4hib2mr3w5lhqy780aw53yqsd7bfsjh53k8g95")))) + "18rzv4kldjmm2zvz9pzrpspig2hy6mcvb45hgmw49ba4jdcxh31s")))) (properties `((upstream-name . "PCAtools"))) (build-system r-build-system) (propagated-inputs @@ -19642,14 +20239,14 @@ dimensional mass cytometry data.") (define-public r-rgreat (package (name "r-rgreat") - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "rGREAT" version)) (sha256 (base32 - "0qq3fqzd973jlf6ibfww5yicnyz2qvs2b2mn35p77k2mp4d7qp52")))) + "09fvmfiavawfwbxaj1585l2n00fibx9z3r17dv06hc6b40a1sa12")))) (properties `((upstream-name . "rGREAT"))) (build-system r-build-system) (propagated-inputs @@ -19669,8 +20266,8 @@ dimensional mass cytometry data.") r-org-hs-eg-db r-progress r-rcolorbrewer - r-rcurl r-rcpp + r-rcurl r-rjson r-s4vectors r-shiny @@ -19688,14 +20285,14 @@ user's input and automatically retrieving results from GREAT web server.") (define-public r-m3c (package (name "r-m3c") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "M3C" version)) (sha256 (base32 - "158brq3w5h735s9yq93xx0y4p79yhgz72rpy0cyk4fjia5yaij5c")))) + "0q6npc5pglmhzm9270pi11kbp5wg3ncvflp4rhv3w778qza2zlk1")))) (properties `((upstream-name . "M3C"))) (build-system r-build-system) (propagated-inputs @@ -19721,14 +20318,14 @@ hypothesis @code{K=1}.") (define-public r-icens (package (name "r-icens") - (version "1.72.0") + (version "1.74.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Icens" version)) (sha256 (base32 - "1aq4iwk1cp96jzldhx7d4q7i77zbdg8nzkzh12g29yhwzj39nl3q")))) + "0fz66bchf41jzgabs1s8drpi3f7g27lid5g50lxwh6ph3i02cpaw")))) (properties `((upstream-name . "Icens"))) (build-system r-build-system) (propagated-inputs @@ -19844,14 +20441,14 @@ generated.") (define-public r-preprocesscore (package (name "r-preprocesscore") - (version "1.62.1") + (version "1.64.0") (source (origin (method url-fetch) (uri (bioconductor-uri "preprocessCore" version)) (sha256 (base32 - "0z37ag22j1wh80vwq1kyr99rvadj9ppkddapfqyql3vj5x44cf4d")))) + "15fy3vwnjx6rwrkhbwxyvdykkfdis8c0m18x6y7irvyij9lm6x1y")))) (properties `((upstream-name . "preprocessCore"))) (build-system r-build-system) @@ -19865,13 +20462,13 @@ routines.") (define-public r-s4arrays (package (name "r-s4arrays") - (version "1.0.6") + (version "1.2.0") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Arrays" version)) (sha256 (base32 - "011n4lyznlrya5l8d7m30x81k7h81wbp07b12s6a4s5sy9fzd5jb")))) + "0x420l98f6b10r3qrdjq5ijs2p0msdcg6d6aghr3yvj1f9g06h8y")))) (properties `((upstream-name . "S4Arrays"))) (build-system r-build-system) (propagated-inputs @@ -19902,13 +20499,13 @@ array-like semantic. It also provides: (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.38.2") + (version "0.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "0n1w451647pxii6qrrxbvdi9z6rqdwibczkbs7k7a9j33bv3nqv8")))) + "0pja00ssl1pd16v3bls3aybml2cwanylx8igf596zha5srcf5l5h")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) @@ -19970,14 +20567,14 @@ data manipulation and visualization.") (define-public r-rgraphviz (package (name "r-rgraphviz") - (version "2.44.0") + (version "2.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rgraphviz" version)) (sha256 (base32 - "1dv1vk73achjz5b5zzw2d517nbjfrlj7gppd48pfhk1w0mvz3q61")))) + "03l6yr76inv4fivy10g0h2qafgywrcjnnhs694lwqz1y6r0gm1sy")))) (properties `((upstream-name . "Rgraphviz"))) (build-system r-build-system) (arguments @@ -20008,13 +20605,13 @@ objects from the @code{graph} package.") (define-public r-fishpond (package (name "r-fishpond") - (version "2.6.2") + (version "2.8.0") (source (origin (method url-fetch) (uri (bioconductor-uri "fishpond" version)) (sha256 (base32 - "0zsw4j6gk25303xpdwnkda2sq3mb4zb4p1mzwiyf7hdyf87zis05")))) + "04vl4cp0izghm7h4xk7x48lqkq0dpl47dkd068lva33jygwwpvcz")))) (properties `((upstream-name . "fishpond"))) (build-system r-build-system) (propagated-inputs @@ -20044,13 +20641,13 @@ working with Salmon and Alevin quantification files.") (define-public r-fithic (package (name "r-fithic") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "FitHiC" version)) (sha256 (base32 - "0mqrzh1rcwyqlhq9wxcy4gp47hsb70qrsissm9nj0cb9j6ihi407")))) + "0ygcq3xi55swsmysn539cr3m504rfb6zm30w747pa46r63dfjda7")))) (properties `((upstream-name . "FitHiC"))) (build-system r-build-system) (propagated-inputs @@ -20068,13 +20665,13 @@ assays such as Hi-C.") (define-public r-hitc (package (name "r-hitc") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HiTC" version)) (sha256 (base32 - "00csfr3yhbllwc8797xg49qb0djpvbpfi6mbnps284nlqy5vpdwh")))) + "16svq29fm9xl3rl9v6lyxf564manvp8ryxj1mbxc4pb360wmi780")))) (properties `((upstream-name . "HiTC"))) (build-system r-build-system) (propagated-inputs @@ -20097,14 +20694,14 @@ provided.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.28.1") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "1riwxxnbi4z0lf42psh3m3ivxlgmmlnqhgsih6911c754r6s39qg")))) + "0p52n96mydqszpq1ysmbh5xs4n4icqsd0gbxl5wpkcwvvhxliw8b")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs @@ -20129,14 +20726,14 @@ block processing.") (define-public r-rhdf5lib (package (name "r-rhdf5lib") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Rhdf5lib" version)) (sha256 (base32 - "1007i2rzz86k04kswa4h53p8zzh52k31m9d8im6iw0n91inqbcj9")) + "10n2grfdnri686sx52shz7y0csmcz4cky23k07803dz6qm1ljvmf")) (modules '((guix build utils))) (snippet '(begin @@ -20174,8 +20771,6 @@ block processing.") (substitute* "Makevars" (("@BUILD_HDF5@") "") (("@COPY_SZIP@") "") - (("@ZLIB_LIB@") "-lz") - (("@ZLIB_INCLUDE@") "") (("HDF5_CXX_LIB=.*") (string-append "HDF5_CXX_LIB=" (assoc-ref inputs "hdf5") "/lib/libhdf5_cpp.a\n")) @@ -20192,6 +20787,9 @@ block processing.") (("HDF5_HL_CXX_LIB=.*") (string-append "HDF5_HL_CXX_LIB=" (assoc-ref inputs "hdf5") "/lib/libhdf5_hl_cpp.a\n")) + (("@ZLIB_LIB_PATH@") "-lz") + (("@ZLIB_INCLUDE_PATH@") "") + ;; szip is non-free software (("cp \"\\$\\{SZIP_LIB\\}.*") "") (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n")))))))) @@ -20209,17 +20807,17 @@ packages.") (define-public r-beachmat (package (name "r-beachmat") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "beachmat" version)) (sha256 (base32 - "0ga9y9npl885jdx7gw5h6lh7fr0z5p7cvcwpz3hvwm4dy235j6gj")))) + "1yixv6vs1q2k4vx17bq4nar3g4v2076i5dq77gh63mlka46qr3g2")))) (build-system r-build-system) (propagated-inputs - (list r-biocgenerics r-delayedarray r-matrix r-rcpp)) + (list r-biocgenerics r-delayedarray r-matrix r-rcpp r-sparsearray)) (native-inputs (list r-knitr)) (home-page "https://bioconductor.org/packages/beachmat") @@ -20232,13 +20830,13 @@ matrices.") (define-public r-beadarray (package (name "r-beadarray") - (version "2.50.0") + (version "2.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "beadarray" version)) (sha256 (base32 - "0rd41193rq6v4a97ibp0l2bz140nsv91plhn7iim8d8n9hgxqhjp")))) + "0qwka7549mlv2x80bjrzdsy4a6h35yxrhj2cxss9aigwsbjb7sjr")))) (properties `((upstream-name . "beadarray"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -20265,13 +20863,13 @@ quality assessment and low-level analysis are provided.") (define-public r-beadarraysnp (package (name "r-beadarraysnp") - (version "1.66.0") + (version "1.68.0") (source (origin (method url-fetch) (uri (bioconductor-uri "beadarraySNP" version)) (sha256 - (base32 "1pymsm4j3wiyjvgsjb3vhjwdvhfmh91pxdhg4ihrj71pqpif3w9m")))) + (base32 "1vrizh7fpzv1w2gki0qxhphrfj1jj6m6bjsjsbw0b4n4invybzps")))) (properties `((upstream-name . "beadarraySNP"))) (build-system r-build-system) (propagated-inputs (list r-biobase r-quantsmooth)) @@ -20285,13 +20883,13 @@ performs copy number calculations and reports.") (define-public r-beaddatapackr (package (name "r-beaddatapackr") - (version "1.52.0") + (version "1.54.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BeadDataPackR" version)) (sha256 (base32 - "0hm4brxg2rxazdcnhjiz6f4di2q8wssrrp35m79vm93sac9w42y3")))) + "0sfpdpw6qqffzb9skzx9w1ggcixc3wry9c6f2kwpsykbdsnk90xz")))) (properties `((upstream-name . "BeadDataPackR"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -20308,13 +20906,13 @@ decompression of raw bead-level data from the Illumina BeadArray platform.") (define-public r-cner (package (name "r-cner") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CNEr" version)) (sha256 - (base32 "04arfcr2ay71hyy0xsh6jzappmcnnzfr1nyj1l7dqhhhk81ksjfd")))) + (base32 "0kpz15l3yz26s2kskxk4093313c7vwi131y24wbpcdahicpqys2m")))) (properties `((upstream-name . "CNEr"))) (build-system r-build-system) (inputs (list zlib)) @@ -20356,14 +20954,14 @@ advanced visualization of sets of conserved noncoding elements.") (define-public r-tfbstools (package (name "r-tfbstools") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TFBSTools" version)) (sha256 (base32 - "136s96cmd1aq878xy9mqd4k46awywqpmm55lpvash8mv4gg02vg8")))) + "18msr889nygk1c3wsjxc9bv989zakkl9f1h2a6cnfy8rxhbxpvwq")))) (properties `((upstream-name . "TFBSTools"))) (build-system r-build-system) (propagated-inputs @@ -20402,13 +21000,13 @@ provides a wrapper of de novo motif discovery software.") (define-public r-maftools (package (name "r-maftools") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "maftools" version)) (sha256 - (base32 "1jvmqn33hxzscr8j7y9zw5sngglcy0zkl0386053lx5dl5s5iqyq")))) + (base32 "025wlqnx13ldzyrf72mrfj492d62i4xyjbhpmgavgld0jwfmr3ga")))) (properties `((upstream-name . "maftools"))) (build-system r-build-system) (propagated-inputs @@ -20431,14 +21029,14 @@ customizable visualzations with minimal effort.") (define-public r-motifmatchr (package (name "r-motifmatchr") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "motifmatchr" version)) (sha256 (base32 - "0vqsxfbrxs25xr27vsr5syqjn6fwvn5dw0g76w4rdqk5d08p56ci")))) + "13kkg9xpyvgqpsaz5f96pd43i8a45jrbnzqmax793zkv4ai8p16j")))) (properties `((upstream-name . "motifmatchr"))) (build-system r-build-system) (propagated-inputs @@ -20465,13 +21063,13 @@ This package wraps C++ code from the MOODS motif calling library.") (define-public r-chromvar (package (name "r-chromvar") - (version "1.22.1") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "chromVAR" version)) (sha256 - (base32 "001133rfcwmf4p3dbif933y9i1mkr3krw38g646wj4ikycszwih4")))) + (base32 "1vy650625b9b2dgnkgh5h0kw5bkdvfin133091asf1nw4jgnn1vx")))) (properties `((upstream-name . "chromVAR"))) (build-system r-build-system) (propagated-inputs @@ -20512,14 +21110,14 @@ sequence (@code{DNAse-seq}) experiments.") (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") - (version "1.22.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SingleCellExperiment" version)) (sha256 (base32 - "1v2px6gvr0wzj2cyml57hxj5ghynlvizkchbywd3kx05j1h2mckd")))) + "0q44n97mly1ldh52r0sb1jwhz8bn4n7sfw99qs5h4s44w9s0fry4")))) (properties `((upstream-name . "SingleCellExperiment"))) (build-system r-build-system) @@ -20540,13 +21138,13 @@ libraries.") (define-public r-singler (package (name "r-singler") - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SingleR" version)) (sha256 - (base32 "0dwlg86wkivsag5ffjk81nlq34lwl3kk065k9l6lak24ziq6c4ij")))) + (base32 "0s7m3qdbgrqaq93k6rvyj34h36kdjvppn9ilflrcaa5w498fzfhf")))) (properties `((upstream-name . "SingleR"))) (build-system r-build-system) (propagated-inputs @@ -20572,14 +21170,14 @@ cell types to infer the cell of origin of each single cell independently.") (define-public r-scuttle (package (name "r-scuttle") - (version "1.10.2") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scuttle" version)) (sha256 (base32 - "0225fk3ca540b9z3dd5q2zngxsa524nq7zrv1z5qnmr2knc0yxfb")))) + "090arfacfs09x7g60qxz4bj2gqb97y3kmhafywkgnrj7pz1z0qzq")))) (properties `((upstream-name . "scuttle"))) (build-system r-build-system) (propagated-inputs @@ -20607,13 +21205,13 @@ of other packages.") (define-public r-scater (package (name "r-scater") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "0v6qaflv7b504yxxv6bmnlikg36bhfahgqxigpq6qcfrhqapmqck")))) + "0a8wfrcp09z0aflalqhhwvz675aa32wgprqphk1axvdppknsg7vf")))) (build-system r-build-system) (propagated-inputs (list r-beachmat @@ -20622,13 +21220,12 @@ of other packages.") r-biocparallel r-biocsingular r-delayedarray - r-delayedmatrixstats - r-densvis r-ggbeeswarm r-ggplot2 - r-ggrepel r-ggrastr + r-ggrepel r-matrix + r-matrixgenerics r-pheatmap r-rcolorbrewer r-rcppml @@ -20652,14 +21249,14 @@ quality control.") (define-public r-scran (package (name "r-scran") - (version "1.28.2") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "scran" version)) (sha256 (base32 - "1la55s14frvsjp8ly02fbrkzvv7lzvcd7jc1axmwh494b9zy5jmd")))) + "0vq3216jk389mjnz5kx0i6fwmkypp21rshvv9ldcy327h6vk1ylj")))) (build-system r-build-system) (propagated-inputs (list r-beachmat @@ -20692,17 +21289,54 @@ cell-specific biases, assignment of cell cycle phase, and detection of highly variable and significantly correlated genes.") (license license:gpl3))) +(define-public r-sparsearray + (package + (name "r-sparsearray") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "SparseArray" version)) + (sha256 + (base32 "0a1xg8vkjybgdr09bk2z4i82m06qnw2nhbzviyijadxiwvz6pgsz")))) + (properties `((upstream-name . "SparseArray"))) + (build-system r-build-system) + (propagated-inputs (list r-biocgenerics + r-iranges + r-matrix + r-matrixgenerics + r-matrixstats + r-s4arrays + r-s4vectors + r-xvector)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/SparseArray") + (synopsis + "Efficient in-memory representation of multidimensional sparse arrays") + (description + "The @code{SparseArray} package is an infrastructure package that +provides an array-like container for efficient in-memory representation of +multidimensional sparse data in R. The package defines the @code{SparseArray} +virtual class and two concrete subclasses: @code{COO_SparseArray} and +@code{SVT_SparseArray}. Each subclass uses its own internal representation of +the nonzero multidimensional data, the \"COO layout\" and the \"SVT layout\", +respectively. @code{SVT_SparseArray} objects mimic as much as possible the +behavior of ordinary matrix and array objects in base R. In particular, they +suppport most of the \"standard matrix and array API\" defined in base R and +in the @code{matrixStats} package from CRAN.") + (license license:artistic2.0))) + (define-public r-sparsematrixstats (package (name "r-sparsematrixstats") - (version "1.12.2") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "sparseMatrixStats" version)) (sha256 (base32 - "00jalzg6yphi8ci4iid7x38jlsrvvdswrq7cqa7jybs26ayjldw1")))) + "0r2jxwha2xjp8iy7al85s5vib4xvl47gmlbbvvjj4wnz2gfzic9r")))) (properties `((upstream-name . "sparseMatrixStats"))) (build-system r-build-system) @@ -20720,18 +21354,17 @@ data in the column sparse format.") (define-public r-spatialexperiment (package (name "r-spatialexperiment") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SpatialExperiment" version)) (sha256 (base32 - "18fcfyjvp9nzadlicsnz62wva8ik0z6jqg1b906avm2vk6rbxw70")))) + "1s42jzq95f662h39zmbf06qmrrglbch8sgygpnwqblrjbrqgm7n4")))) (properties `((upstream-name . "SpatialExperiment"))) (build-system r-build-system) (propagated-inputs (list r-biocfilecache r-biocgenerics - r-dropletutils r-magick r-rjson r-s4vectors @@ -20752,14 +21385,14 @@ Visium platform.") (define-public r-delayedmatrixstats (package (name "r-delayedmatrixstats") - (version "1.22.6") + (version "1.24.0") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedMatrixStats" version)) (sha256 (base32 - "0jaaqa2fm61dmsphm5y4rlwf2dm1l5rs0vpq0f5r35iyw2m12lh8")))) + "18r5rfx46lac0kaakha4gqs4pj8vb39z0908gpclmp3ajca4hzb1")))) (properties `((upstream-name . "DelayedMatrixStats"))) (build-system r-build-system) @@ -20768,7 +21401,6 @@ Visium platform.") r-iranges r-matrix r-matrixgenerics - r-matrixstats r-s4vectors r-sparsematrixstats)) (native-inputs @@ -20788,14 +21420,14 @@ memory usage and processing time is minimized.") (define-public r-mscoreutils (package (name "r-mscoreutils") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MsCoreUtils" version)) (sha256 (base32 - "055xzlq37d75ghfk87bxbsv4yifidnwxc3w2gp8mcqxwkxxhd70a")))) + "0faj4fxfsv7ir935sn9zainhk55vdfi6abgr0s321kwmvs6prc0p")))) (properties `((upstream-name . "MsCoreUtils"))) (build-system r-build-system) (propagated-inputs @@ -20817,13 +21449,13 @@ within the R for Mass Spectrometry packages.") (define-public r-msfeatures (package (name "r-msfeatures") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MsFeatures" version)) (sha256 - (base32 "0cb4b0mf5yh8amqwa3r0mbk2f3rgq40gdlkhifk50fxnqdy4fjsh")))) + (base32 "0vpsc7i6j2skn6wba178iy406yvd4p8xf3lq2qmm2inimxl983cs")))) (properties `((upstream-name . "MsFeatures"))) (build-system r-build-system) (propagated-inputs @@ -20847,14 +21479,14 @@ the respective packages (such as e.g. @code{xcms}).") (define-public r-biocio (package (name "r-biocio") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocIO" version)) (sha256 (base32 - "03hslg7k6khchf54gmlbkvwbkfn5ppz0wp7lh75gsnr0licsjkwx")))) + "0bn2jknvj2ag1yv67kjqr7gsq771rmqv3my9njjkwcc9nzrxzhbp")))) (properties `((upstream-name . "BiocIO"))) (build-system r-build-system) (propagated-inputs @@ -20880,14 +21512,14 @@ as well as local access. Developers can register a file extension, e.g., (define-public r-msmseda (package (name "r-msmseda") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "msmsEDA" version)) (sha256 (base32 - "108azzd6ibcgb1gqgcrz4shk3rdr3vfpzy0z6zknlsxwz7sbcnfi")))) + "0xxjkr3x654n61q2yda09cghvssyx4ml9g22gfzfhbzjp8j7pm2c")))) (properties `((upstream-name . "msmsEDA"))) (build-system r-build-system) (propagated-inputs @@ -20903,14 +21535,14 @@ experiments, and visualize de influence of the involved factors.") (define-public r-msmstests (package (name "r-msmstests") - (version "1.38.0") + (version "1.40.0") (source (origin (method url-fetch) (uri (bioconductor-uri "msmsTests" version)) (sha256 (base32 - "1y3nklhlib2l9smcl6slv1653vyg9ip29if286l59rjrdwh50cwa")))) + "0dif4yvm9hfrnamjph5xa9cbf41f2v8lbgyr88f11alwwbf0dg69")))) (properties `((upstream-name . "msmsTests"))) (build-system r-build-system) (propagated-inputs @@ -20932,14 +21564,14 @@ relevant, and the minimum expression of the most abundant condition.") (define-public r-catalyst (package (name "r-catalyst") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "CATALYST" version)) (sha256 (base32 - "0f6h0qngv7my83k402rydvi1pla695r5kxq02k1s5caxcsi1caza")))) + "0dfg9ib0imk8bmhycqrspnn8yvfdlchwvx39wgqxi5fb9zrppfz4")))) (properties `((upstream-name . "CATALYST"))) (build-system r-build-system) (propagated-inputs @@ -20956,7 +21588,6 @@ relevant, and the minimum expression of the most abundant condition.") r-ggrepel r-ggridges r-gridextra - r-magrittr r-matrix r-matrixstats r-nnls @@ -20995,14 +21626,14 @@ preprocessing of cytometry data, including: (define-public r-erma (package (name "r-erma") - (version "1.16.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "erma" version)) (sha256 (base32 - "14rgj8g9x248p2cc86aqn289qamsd91d6fnydi5d34q605ph73yj")))) + "0vapjfzhwlzxd049fsr00jd7lp48h9qwd95m2sqhqryqz1vsi7hz")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -21035,14 +21666,14 @@ by Ernst and Kellis.") (define-public r-ggbio (package (name "r-ggbio") - (version "1.48.0") + (version "1.50.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ggbio" version)) (sha256 (base32 - "0n7nghrrs7fp0b7jk2pfbkzl0lbv55xxk2xqnq2i77ps22ms0h9y")))) + "1chs58ifpwz4crcl5ymnb8ah3wf2jrn9lla3ljsywqiqn0r3i1am")))) (build-system r-build-system) (arguments `(#:phases @@ -21203,14 +21834,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.44.2") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "0laismy8kklzkg81r5vf1194fbhp2hw952g6jc3zvn2z5y2d4524")))) + "0b707xxi0ch4kfxid5id16gkh9pnqwrgqpsvgbm0rc89kg73g4jz")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs @@ -21252,14 +21883,14 @@ with your data.") (define-public r-gwascat (package (name "r-gwascat") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "gwascat" version)) (sha256 (base32 - "1i64bk0ac2v0w5yjxdhnbjh05l6n9fi7gxap0zp73wxj7kl75wkd")))) + "028n8v1pgkr1q5s9wslql8ayk1cbx6a9a2rjka9pdwz6rq1iyagy")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -21286,13 +21917,13 @@ EMBL-EBI GWAS catalog.") (define-public r-gwastools (package (name "r-gwastools") - (version "1.46.0") + (version "1.48.0") (source (origin (method url-fetch) (uri (bioconductor-uri "GWASTools" version)) (sha256 (base32 - "1g86xg2d9wi6xijhc89zxhbw190aviw9nkwvbwgz85jf71wf34hv")))) + "1rjgdcw65zmmg5dy9mdaz720nvqk03bfsfvkdsa1wwhvlnxmscp8")))) (properties `((upstream-name . "GWASTools"))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -21307,6 +21938,7 @@ EMBL-EBI GWAS catalog.") r-rsqlite r-sandwich r-survival)) + (native-inputs (list r-knitr)) (home-page "https://github.com/smgogarten/GWASTools") (synopsis "Tools for Genome Wide Association Studies") (description @@ -21317,13 +21949,13 @@ annotation, and functions for GWAS data cleaning and analysis.") (define-public r-kegggraph (package (name "r-kegggraph") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGgraph" version)) (sha256 - (base32 "0bgigkmnz5zvsygcifk2fc7i8rahmqr4brk65qa3104clqqvdfkl")))) + (base32 "0i9iqr87mqih0rkbjx3wa383x4yfyzpcb0b0xzairbqgygvcq4kl")))) (properties `((upstream-name . "KEGGgraph"))) (build-system r-build-system) (propagated-inputs @@ -21341,14 +21973,14 @@ functionalities including parsing, graph operation, visualization and etc.") (define-public r-ldblock (package (name "r-ldblock") - (version "1.30.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ldblock" version)) (sha256 (base32 - "18gqmwwi1i4gndqljy809n5zzx38agawxxwhlknpas6k2iskd1xq")))) + "1caxzc99kga2c90m2ydmnvcd8lfp0igmmickpl0ikrhwjlbfnc0p")))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -21397,14 +22029,14 @@ on the plot.") (define-public r-abn (package (name "r-abn") - (version "3.0.0") + (version "3.0.3") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "100nafmyddz0c1h01fbqw5q6pji7zhg2196rkyak88za6s5ms0s4")))) + "1yh9nhfphalxh77132r0fkpp71mqsfhb8jk11is4d5nvlvr5316z")))) (build-system r-build-system) (inputs (list gsl)) @@ -21463,13 +22095,13 @@ other functional sequencing data.") (define-public r-parody (package (name "r-parody") - (version "1.58.0") + (version "1.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "parody" version)) (sha256 - (base32 "0n2pmpnpwh16hb58v821xn42jm4a7wjsdf6sqxapjjw9w432mjac")))) + (base32 "05mhbkhyh92bwmx37fpviprr9i4z0i6g24l71zk17gq0f8hwb4jj")))) (properties `((upstream-name . "parody"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -21484,13 +22116,13 @@ methods based on resistant statistics.") (define-public r-pathview (package (name "r-pathview") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "pathview" version)) (sha256 - (base32 "0mld7vys6s5k8snk1gniph9wkw3726vsx430nhyyr76fp4ps2mks")))) + (base32 "17kl7yvpjhsb52kz1pw3jnk6s480lnpvvh9rragndixsl8bkmqmc")))) (properties `((upstream-name . "pathview"))) (build-system r-build-system) (propagated-inputs @@ -21518,13 +22150,13 @@ large-scale and fully automated analysis.") (define-public r-snapcgh (package (name "r-snapcgh") - (version "1.70.0") + (version "1.72.0") (source (origin (method url-fetch) (uri (bioconductor-uri "snapCGH" version)) (sha256 (base32 - "0yz5q7w3lqv8ac6a764xlbm4hq3ncnngqng879qbpmzhgb4r155g")))) + "0knjspxzc3z5dhx0a6kx9rkic85w65l84vy552x5bv8jzxkcwrsj")))) (properties `((upstream-name . "snapCGH"))) (build-system r-build-system) (propagated-inputs @@ -21546,13 +22178,13 @@ segmented data for individual and multiple arrays.") (define-public r-snprelate (package (name "r-snprelate") - (version "1.34.1") + (version "1.36.0") (source (origin (method url-fetch) (uri (bioconductor-uri "SNPRelate" version)) (sha256 (base32 - "0js932qvhlwmnrr2jfvsch2zm6w6a1z5wydns3r1bw24r817dlgh")))) + "0jw9ziz0a472mnnvmqwas5w646xfgx8dn1bdpwz8c99m663d8ayp")))) (properties `((upstream-name . "SNPRelate"))) (build-system r-build-system) (propagated-inputs (list r-gdsfmt)) @@ -21581,14 +22213,14 @@ whole-genome and whole-exome variant data.") (define-public r-snpstats (package (name "r-snpstats") - (version "1.50.0") + (version "1.52.0") (source (origin (method url-fetch) (uri (bioconductor-uri "snpStats" version)) (sha256 (base32 - "1v2j2943apphs8i68ap9c8sxd4j5a04qda5scq4dqqkzqd0c5b6i")))) + "0a4kyv93ljv7n62ghx66l81q6sw24llr0998nsalidyws1wldbyr")))) (properties `((upstream-name . "snpStats"))) (build-system r-build-system) (inputs (list zlib)) @@ -21605,14 +22237,14 @@ the earlier snpMatrix package, allowing for uncertainty in genotypes.") (define-public r-chromstar (package (name "r-chromstar") - (version "1.26.0") + (version "1.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "chromstaR" version)) (sha256 (base32 - "1qrcmydk080m1rzwbzx2km4vpbahnq5y73mrnpgjjjrxbndz9xz9")))) + "1yykcqxp8y7by4jgh6dfl25m0pnghj36qy21990n2sdfv1kpg2x6")))) (properties `((upstream-name . "chromstaR"))) (build-system r-build-system) (propagated-inputs @@ -21643,14 +22275,14 @@ analyses.") (define-public r-guitar (package (name "r-guitar") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "Guitar" version)) (sha256 (base32 - "1v1yw90waq0ccj6pxdipipy5bnk0k762m5kadl4h3jgpcrkf2fvc")))) + "09i6j8dcmzvd9gh9629523hw0hbng18jdqw5gf1r31ck8m8wwmnc")))) (properties `((upstream-name . "Guitar"))) (build-system r-build-system) (propagated-inputs @@ -21696,14 +22328,14 @@ visualizations for publication-quality multi-panel figures.") (define-public r-ballgown (package (name "r-ballgown") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ballgown" version)) (sha256 (base32 - "05lvpvy4gs3vg4ks23prx0mdp730h1m9kpg4al03ah062gyq3ahx")))) + "1r3qz6y97zhp7swcv2ls1h6cz0l66y5ap00wx9wlqxv14sljd135")))) (properties `((upstream-name . "ballgown"))) (build-system r-build-system) (propagated-inputs @@ -21730,14 +22362,14 @@ to annotation.") (define-public r-megadepth (package (name "r-megadepth") - (version "1.10.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "megadepth" version)) (sha256 (base32 - "1zzhgfnrr3r5ismbbj9jcqss8mr8ll6p4d3z026ya2khb0i7clc7")))) + "0g9d4q6vh2ys1la15fqgbc4ckfbjbzzaqa49x9liqrhpnrp59vc3")))) (properties `((upstream-name . "megadepth"))) (build-system r-build-system) (inputs (list megadepth)) @@ -21763,14 +22395,14 @@ regions or annotations of your choice from BigWig files.") (define-public r-beclear (package (name "r-beclear") - (version "2.16.0") + (version "2.18.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BEclear" version)) (sha256 (base32 - "1sdw69dhrzkcpc7flvp1gkixvpsbrckyg756rlm17hjjwfxlz5lb")))) + "1a8jmlx17qcx9qzcaxbnlk6qji6hqxcnzmr8zvar9jrfhx0cv9x1")))) (properties `((upstream-name . "BEclear"))) (build-system r-build-system) (propagated-inputs @@ -21797,14 +22429,14 @@ real numbers.") (define-public r-bgeecall (package (name "r-bgeecall") - (version "1.16.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BgeeCall" version)) (sha256 (base32 - "0j83scxpq51bhxwfps7chcawzsqrd7pk7x2jg29zj4zbp1jbrnl0")))) + "1ipypkyfqx6mahiwl0gzdsi7z9j9cm5rgfw4ybgh6blfq8kg9qyk")))) (properties `((upstream-name . "BgeeCall"))) (build-system r-build-system) (propagated-inputs @@ -21833,14 +22465,14 @@ all RNA-Seq libraries of each species integrated in Bgee.") (define-public r-bgeedb (package (name "r-bgeedb") - (version "2.26.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BgeeDB" version)) (sha256 (base32 - "1s6v17bavidlfy6habi4bv6lmwkrx8c5was1zcq0kb05qdvpn4ph")))) + "1ahip21wihwg9yhq0ya1cyzd2cq423hz9pd6iql6y3yhld4j5rnn")))) (properties `((upstream-name . "BgeeDB"))) (build-system r-build-system) (propagated-inputs @@ -21867,14 +22499,14 @@ anatomical terms, mapped to genes by expression patterns.") (define-public r-biobtreer (package (name "r-biobtreer") - (version "1.12.0") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biobtreeR" version)) (sha256 (base32 - "0cbhlxh0w736695niyjd59fcvplna2f2x2av9k0sd1r3dy6lrcd4")))) + "18p5r67ppkw8wxxkrj76q68ljlhdbhar5hc89ffdsgr3zzdyk875")))) (properties `((upstream-name . "biobtreeR"))) (build-system r-build-system) (propagated-inputs @@ -21891,14 +22523,14 @@ mappings functionalities.") (define-public r-minet (package (name "r-minet") - (version "3.58.0") + (version "3.60.0") (source (origin (method url-fetch) (uri (bioconductor-uri "minet" version)) (sha256 (base32 - "04ll8nqhmyj2v12n2xskia8dh5px8mzj8fbyw1pzahk9vp085gkr")))) + "17v2x7cyw74h0zfsz33pyl1kqk976pdzw7mrgprz9l7w5120niw5")))) (properties `((upstream-name . "minet"))) (build-system r-build-system) (propagated-inputs @@ -21913,14 +22545,14 @@ information networks from data.") (define-public r-genetclassifier (package (name "r-genetclassifier") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "geNetClassifier" version)) (sha256 (base32 - "1bn7h8jwmmgqzp0s3xdbsicm8pxmrgvnxmjnjs10d1rvp8znzjnn")))) + "1k61aka780xmf1vhqm6zvzjr2626hv71f8gp1s81az939crxlrqd")))) (properties `((upstream-name . "geNetClassifier"))) (build-system r-build-system) @@ -21938,14 +22570,14 @@ interface to query the classifier.") (define-public r-dir-expiry (package (name "r-dir-expiry") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "dir.expiry" version)) (sha256 (base32 - "1vccq28734s7zk7pc7i9zq4rzbi373xqqvgkzamjpii36phkdmlw")))) + "191b8qhldxvsw09l2c0ffc1ldmx0mqxgsx6m074f28l01d3c1d9q")))) (properties `((upstream-name . "dir.expiry"))) (build-system r-build-system) (propagated-inputs (list r-filelock)) @@ -21959,17 +22591,133 @@ within a certain time frame are deleted. This aims to reduce disk usage by eliminating obsolete caches generated by old versions of packages.") (license license:gpl3))) +(define-public r-basic4cseq + (package + (name "r-basic4cseq") + (version "1.38.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "Basic4Cseq" version)) + (sha256 + (base32 "1vlrrkg885w77w34m2q8hngr95hhh5bkw9hrzyhnp39igjkcwqx4")))) + (properties `((upstream-name . "Basic4Cseq"))) + (build-system r-build-system) + (propagated-inputs + (list r-biostrings + r-bsgenome-ecoli-ncbi-20080805 + r-catools + r-genomicalignments + r-genomicranges + r-rcircos)) + (home-page "https://bioconductor.org/packages/Basic4Cseq") + (synopsis "Analyzing 4C-seq data") + (description + "Basic4Cseq is an R package for basic filtering, analysis and subsequent +visualization of @acronym{4C-seq, circular chromosome conformation capture +sequencing} data. Virtual fragment libraries can be created for any BSGenome +package, and filter functions for both reads and fragments and basic quality +controls are included. Fragment data in the vicinity of the experiment's +viewpoint can be visualized as a coverage plot based on a running median +approach and a multi-scale contact profile.") + (license license:lgpl3))) + +(define-public r-basics + (package + (name "r-basics") + (version "2.14.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BASiCS" version)) + (sha256 + (base32 "0kf215n151sxphc5w9h4i2xsk7lmysi4abwcpyz4slbwhpki3ac8")))) + (properties `((upstream-name . "BASiCS"))) + (build-system r-build-system) + (propagated-inputs + (list r-assertthat + r-biobase + r-biocgenerics + r-biocparallel + r-coda + r-cowplot + r-ggextra + r-ggplot2 + r-hexbin + r-mass + r-matrix + r-matrixstats + r-posterior + r-rcpp + r-rcpparmadillo + r-reshape2 + r-s4vectors + r-scran + r-scuttle + r-singlecellexperiment + r-summarizedexperiment + r-viridis)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/catavallejos/BASiCS") + (synopsis "Bayesian analysis of single-cell sequencing data") + (description + "@acronym{BASiCS, Bayesian analysis of single-cell sequencing data} is an +integrated Bayesian hierarchical model to perform statistical analyses of +single-cell RNA sequencing datasets in the context of supervised experiments +(where the groups of cells of interest are known a priori. BASiCS performs +built-in data normalisation (global scaling) and technical noise quantification +(based on spike-in genes). BASiCS provides an intuitive detection criterion +for highly (or lowly) variable genes within a single group of cells. +Additionally, BASiCS can compare gene expression patterns between two or more +pre-specified groups of cells.") + (license license:gpl3))) + +(define-public r-basicstarrseq + (package + (name "r-basicstarrseq") + (version "1.30.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BasicSTARRseq" version)) + (sha256 + (base32 "1dw6bv1qk2bn0l3m458sqgvm3s1karh4n3431pl7r0jj2r3mr6xa")))) + (properties `((upstream-name . "BasicSTARRseq"))) + (build-system r-build-system) + (propagated-inputs + (list r-genomeinfodb + r-genomicalignments + r-genomicranges + r-iranges + r-s4vectors)) + (native-inputs (list r-knitr)) + (home-page "https://bioconductor.org/packages/BasicSTARRseq") + (synopsis "Basic peak calling on STARR-seq data") + (description + "This package implements a method that aims to identify enhancers on +large scale. The STARR-seq data consists of two sequencing datasets of the +same targets in a specifc genome. The input sequences show which regions +where tested for enhancers. Significant enriched peaks i.e. a lot more +sequences in one region than in the input where enhancers in the genomic DNA +are, can be identified. So the approach pursued is to call peak every region +in which there is a lot more +(significant in a binomial model) STARR-seq signal than input signal and +propose an enhancer at that very same position. Enhancers then are called +weak or strong dependent of there degree of enrichment in comparison to +input.") + (license license:lgpl3))) + (define-public r-basilisk-utils (package (name "r-basilisk-utils") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "basilisk.utils" version)) (sha256 (base32 - "0g5apvna9wzjlm7g9hdafy44nrg5rp3qh4anwpgwwp2vr0vxn37k")))) + "08wsn2znw56svyv5vpxxzcynz93h5hzw1n2r6hb9h3rvc7afyvxl")))) (properties `((upstream-name . "basilisk.utils"))) (build-system r-build-system) @@ -21986,14 +22734,14 @@ package, primarily for creation of the underlying Conda instance.") (define-public r-basilisk (package (name "r-basilisk") - (version "1.12.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (bioconductor-uri "basilisk" version)) (sha256 (base32 - "0bg6jfl12jsmhgby7x7g2vfmi61rx0jdksi97hb0zajgh1nvhirh")))) + "1z482gw04psvkgspclmxlkd9qi7srgbnr56ajngcng28sc6zqdhs")))) (properties `((upstream-name . "basilisk"))) (build-system r-build-system) (propagated-inputs @@ -22009,17 +22757,177 @@ Functions are also provided to enable smooth interoperability of multiple Python environments in a single R session.") (license license:gpl3))) +(define-public r-bayesknockdown + (package + (name "r-bayesknockdown") + (version "1.28.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BayesKnockdown" version)) + (sha256 + (base32 "1argd4gfld2yb0vvpgb5k7m6agmi58712f6g5dj4gnb7kg4rp1l8")))) + (properties `((upstream-name . "BayesKnockdown"))) + (build-system r-build-system) + (propagated-inputs (list r-biobase)) + (home-page "https://bioconductor.org/packages/BayesKnockdown") + (synopsis "Posterior probabilities for edges from knockdown data") + (description + "This package provides a simple, fast Bayesian method for computing +posterior probabilities for relationships between a single predictor variable +and multiple potential outcome variables, incorporating prior probabilities of +relationships. In the context of knockdown experiments, the predictor +variable is the knocked-down gene, while the other genes are potential +targets. It can also be used for differential expression/2-class data.") + (license license:gpl3))) + +(define-public r-bayesspace + (package + (name "r-bayesspace") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BayesSpace" version)) + (sha256 + (base32 "1mqgsylnrvf197cin5zzihjv31bm2q0m5a612ncbglys6n1jd105")))) + (properties `((upstream-name . "BayesSpace"))) + (build-system r-build-system) + (propagated-inputs + (list r-assertthat + r-biocfilecache + r-biocsingular + r-coda + r-dirichletreg + r-ggplot2 + r-matrix + r-mclust + r-purrr + r-rcpp + r-rcpparmadillo + r-rcppdist + r-rcppprogress + r-rcurl + r-rhdf5 + r-s4vectors + r-scales + r-scater + r-scran + r-singlecellexperiment + r-summarizedexperiment + r-xgboost)) + (native-inputs (list r-knitr)) + (home-page "https://www.ezstatconsulting.com/BayesSpace/") + (synopsis "Clustering and resolution enhancement of spatial transcriptomes") + (description + "This package provides tools for clustering and enhancing the resolution +of spatial gene expression experiments. BayesSpace clusters a low-dimensional +representation of the gene expression matrix, incorporating a spatial prior to +encourage neighboring spots to cluster together. The method can enhance the +resolution of the low-dimensional representation into \"sub-spots\", for which +features such as gene expression or cell type composition can be imputed.") + (license license:expat))) + +(define-public r-baynorm + (package + (name "r-baynorm") + (version "1.20.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "bayNorm" version)) + (sha256 + (base32 "01lv4w1x43x3f9sdrqikhsr1gdvkgqzrgcd9wnjj76qsljn57ifq")))) + (properties `((upstream-name . "bayNorm"))) + (build-system r-build-system) + (propagated-inputs + (list r-bb + r-biocparallel + r-dosnow + r-fitdistrplus + r-foreach + r-iterators + r-locfit + r-mass + r-matrix + r-rcpp + r-rcpparmadillo + r-rcppprogress + r-singlecellexperiment + r-summarizedexperiment)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/WT215/bayNorm") + (synopsis "Single-cell RNA sequencing data normalization") + (description + "The bayNorm package is used for normalizing single-cell RNA-seq data. +The main function is @code{bayNorm}, which is a wrapper function for gene +specific prior parameter estimation and normalization. The input is a matrix +of scRNA-seq data with rows different genes and coloums different cells. The +output is either point estimates from posterior (2D array) or samples from +posterior (3D array).") + (license license:gpl2+))) + +(define-public r-bbcanalyzer + (package + (name "r-bbcanalyzer") + (version "1.32.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BBCAnalyzer" version)) + (sha256 + (base32 "108jcgsf5hyj348y17hcw8m3zcfjgzpx8nz4n5jgxp2lgxjyizy1")))) + (properties `((upstream-name . "BBCAnalyzer"))) + (build-system r-build-system) + (propagated-inputs + (list r-biostrings + r-genomicranges + r-iranges + r-rsamtools + r-summarizedexperiment + r-variantannotation)) + (home-page "https://bioconductor.org/packages/BBCAnalyzer") + (synopsis "Visualizing base counts") + (description + "BBCAnalyzer is a package for visualizing the relative or absolute number +of bases, deletions and insertions at defined positions in sequence alignment +data available as bam files in comparison to the reference bases. Markers for +the relative base frequencies, the mean quality of the detected bases, known +mutations or polymorphisms and variants called in the data may additionally be +included in the plots.") + (license license:lgpl3))) + +(define-public r-bcrank + (package + (name "r-bcrank") + (version "1.64.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "BCRANK" version)) + (sha256 + (base32 "1m1ccacryf8wjzp0d37n9n1kpa6734ddb8nvv1sy0sz5gplrars9")))) + (properties `((upstream-name . "BCRANK"))) + (build-system r-build-system) + (propagated-inputs (list r-biostrings)) + (home-page "https://bioconductor.org/packages/BCRANK") + (synopsis "Predicting binding site consensus from ranked DNA sequences") + (description + "This package provides functions and classes for de novo prediction of +transcription factor binding consensus by heuristic search.") + (license license:gpl2))) + (define-public r-biocthis (package (name "r-biocthis") - (version "1.10.3") + (version "1.12.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biocthis" version)) (sha256 (base32 - "1v0qrypdzl1bg85k8i7qamb6709cgk4ypmisjh6bn5r36nqd5qx4")))) + "0lxcsw70ib8wvkp3ii1l8vd4g2ddhj6g0x22dwcmwacr2myk3bg8")))) (properties `((upstream-name . "biocthis"))) (build-system r-build-system) (arguments @@ -22076,14 +22984,14 @@ the Bioconductor project.") (define-public r-biodb (package (name "r-biodb") - (version "1.8.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biodb" version)) (sha256 (base32 - "18j70ma85qb42qqpzz8fw3g4x6cav4j0pc2ab5ym22791dr8izck")))) + "18w062s0wwdisl6a9a79in6h4052x3janinc5isip0x6p9g9d9bk")))) (properties `((upstream-name . "biodb"))) (build-system r-build-system) (propagated-inputs @@ -22122,14 +23030,14 @@ separate published packages.") (define-public r-biomformat (package (name "r-biomformat") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biomformat" version)) (sha256 (base32 - "04kl2432wq6ybdhispvp98ylgyk3kkhmjx1nxdvcal7bfpy2vskk")))) + "1ccnrz8rkg533kil3sc8wnjqsmiyrpqqmk7av7ls01avglcjdjq1")))) (properties `((upstream-name . "biomformat"))) (build-system r-build-system) (propagated-inputs @@ -22151,14 +23059,14 @@ as extensions of common core functions/methods.") (define-public r-mvcclass (package (name "r-mvcclass") - (version "1.74.0") + (version "1.76.0") (source (origin (method url-fetch) (uri (bioconductor-uri "MVCClass" version)) (sha256 (base32 - "1vrn2c5m4w7g13s1zd1am5b02lp026zg6gvpg8dvsras0j56rhr6")))) + "16finp6q89n6x5q2v1khpfp5ys7d4dvlh3kacv5qbdh1bsb3fpax")))) (properties `((upstream-name . "MVCClass"))) (build-system r-build-system) (home-page "https://bioconductor.org/packages/MVCClass") @@ -22171,14 +23079,14 @@ design.") (define-public r-biomvcclass (package (name "r-biomvcclass") - (version "1.68.0") + (version "1.70.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioMVCClass" version)) (sha256 (base32 - "07iay2dpq3margh1ny2snlc75g7fpfs5bf2gmhv88d31b8blg57r")))) + "04ckv1y5iqawd0dvnn0bbpnmyys0ivcmf0my6dld3hib3idjzwfx")))) (properties `((upstream-name . "BioMVCClass"))) (build-system r-build-system) (propagated-inputs @@ -22203,6 +23111,15 @@ design.") "0n026b744ah5kcnipsyiqqs7vlz5n5im1kgv35i2pgxyzvf7a8sn")))) (properties `((upstream-name . "biomvRCNS"))) (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'patch-constants + (lambda _ + (substitute* "src/biomvRCNS.c" + (("DOUBLE_XMIN") "DBL_MIN") + (("DOUBLE_XMAX") "DBL_MAX"))))))) (propagated-inputs (list r-genomicranges r-gviz r-iranges r-mvtnorm)) (home-page "https://bioconductor.org/packages/biomvRCNS") @@ -22218,14 +23135,14 @@ using aCGH or sequencing.") (define-public r-bionero (package (name "r-bionero") - (version "1.8.7") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioNERO" version)) (sha256 (base32 - "0yvd05yikvblnhimnmn4srcsimab4qml5k582n0c9h4rppffmvy4")))) + "0pq5fiacb2x8l5jk3p6bnha9bcwg91grpklgx2nirrlwwr80gf2h")))) (properties `((upstream-name . "BioNERO"))) (build-system r-build-system) (propagated-inputs @@ -22274,14 +23191,14 @@ networks.") (define-public r-bionet (package (name "r-bionet") - (version "1.60.0") + (version "1.62.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioNet" version)) (sha256 (base32 - "19caj3aj6gndkxkrd9s2x8v59hcdwdyxrx0ji473c3d5qrykskl1")))) + "122rj6rg4j9q9brhxyrbkc91fml3davk044s2yxwyjnwn2yjw0bq")))) (properties `((upstream-name . "BioNet"))) (build-system r-build-system) (propagated-inputs @@ -22303,14 +23220,14 @@ scoring subnetwork.") (define-public r-bionetstat (package (name "r-bionetstat") - (version "1.20.0") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioNetStat" version)) (sha256 (base32 - "0bvfgppsdih6s70iizd7zh3zkb0hg4s4h1728xmyjqbvkl8fsdf4")) + "1rbb36v64b9xbk2dsf6wsyrhwwbkysrj8fp1g22y3gisdk170sg8")) (snippet '(delete-file "inst/datatables/js/jquery.dataTables.min.js")))) (properties `((upstream-name . "BioNetStat"))) @@ -22358,14 +23275,14 @@ network and metabolic pathways view.") (define-public r-bioqc (package (name "r-bioqc") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioQC" version)) (sha256 (base32 - "0g6imi03l4xm0chx3i9wd2vdy0ls78lnylp294fq0jldl4n6y0nw")))) + "15kmg102259h2yl3b6ncq2p545kdac4hk4kwm1s5492y5rg7qkla")))) (properties `((upstream-name . "BioQC"))) (build-system r-build-system) (propagated-inputs @@ -22384,14 +23301,14 @@ optimised for high performance.") (define-public r-biotip (package (name "r-biotip") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "BioTIP" version)) (sha256 (base32 - "0lqnxaycrva2092h4swmk6na2pq2kp951dmicyw399djd1i7yj50")))) + "1bbjfv3bi20xlk8h7r5ipav6mfs27lmj0zjb5mk1gmp071dmnk0y")))) (properties `((upstream-name . "BioTIP"))) (build-system r-build-system) (propagated-inputs @@ -22414,14 +23331,14 @@ help unravel disease regulatory trajectory.") (define-public r-biotmle (package (name "r-biotmle") - (version "1.24.0") + (version "1.26.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biotmle" version)) (sha256 (base32 - "1hjkhwbld8m52lsy2ba6cnp02n0xykaxm9650r5zmzry38dw9nb5")))) + "0h796sxv7fvwx9m8ikamf3bvaac7rimp33lv1j3ngsjifigdkvfy")))) (properties `((upstream-name . "biotmle"))) (build-system r-build-system) (propagated-inputs @@ -22456,14 +23373,14 @@ ensemble machine learning for the estimation of nuisance functions.") (define-public r-bsseq (package (name "r-bsseq") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (bioconductor-uri "bsseq" version)) (sha256 (base32 - "1mvhh99h1l6f5rlz0fzqkjpz9hblj2rbv8nx4j9n93g8riz7wsi3")))) + "0afpzr52mf2ab7gr9swdf6609787ymw8s8wksis0d4ap0y0wdgg0")))) (properties `((upstream-name . "bsseq"))) (build-system r-build-system) (propagated-inputs @@ -22502,13 +23419,13 @@ visualizing bisulfite sequencing data.") (define-public r-dada2 (package (name "r-dada2") - (version "1.28.0") + (version "1.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "dada2" version)) (sha256 (base32 - "1vxy2106rzygy0dr38wmw84zrqp9gsvaphliikdmhx0n2gv6xhd1")))) + "0rvnwbknvwksm50f4rw9965gnhy13rjgdfvv428xsqixgkkkyrf6")))) (properties `((upstream-name . "dada2"))) (build-system r-build-system) (propagated-inputs @@ -22539,14 +23456,14 @@ fragments by exact matching.") (define-public r-dmrseq (package (name "r-dmrseq") - (version "1.20.1") + (version "1.22.0") (source (origin (method url-fetch) (uri (bioconductor-uri "dmrseq" version)) (sha256 (base32 - "1lxrirgy42xnpdj7b2nrabbki33an8ri6j1mgxp3jn4h0a88c280")))) + "0z53vh5qirkyn7yw3g2m2kj6dzii96l81vc8j59n2dl7p602l9a2")))) (properties `((upstream-name . "dmrseq"))) (build-system r-build-system) (propagated-inputs @@ -22585,13 +23502,13 @@ interest on transformed methylation proportions.") (define-public r-omicade4 (package (name "r-omicade4") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (bioconductor-uri "omicade4" version)) (sha256 (base32 - "086nh0m82gjlxyg6i230wpkin4zc3a7cfla0qzvj28h0n8irkm5r")))) + "0i4ln95ayl1irr8sr3639x35ilysdi663kksw7g93q1ry91yav8r")))) (properties `((upstream-name . "omicade4"))) (build-system r-build-system) (propagated-inputs (list r-ade4 r-biobase r-made4)) @@ -22604,13 +23521,13 @@ interest on transformed methylation proportions.") (define-public r-omnipathr (package (name "r-omnipathr") - (version "3.8.2") + (version "3.10.1") (source (origin (method url-fetch) (uri (bioconductor-uri "OmnipathR" version)) (sha256 - (base32 "13ac98jj03vkzrc1ghrs98qrfvr74wz099w26lgc7jw2yxj575as")))) + (base32 "1wbzb4kh7bzsvixr3vxzih9rfkpjx00f33i0yl0dqj0yixnrghwr")))) (properties `((upstream-name . "OmnipathR"))) (build-system r-build-system) (arguments @@ -22629,6 +23546,7 @@ interest on transformed methylation proportions.") r-jsonlite r-later r-logger + r-lubridate r-magrittr r-progress r-purrr @@ -22638,6 +23556,7 @@ interest on transformed methylation proportions.") r-rlang r-rmarkdown r-rvest + r-stringi r-stringr r-tibble r-tidyr @@ -22659,14 +23578,14 @@ for ligand activity prediction from transcriptomics data.") (define-public r-biscuiteer (package (name "r-biscuiteer") - (version "1.14.0") + (version "1.16.0") (source (origin (method url-fetch) (uri (bioconductor-uri "biscuiteer" version)) (sha256 (base32 - "07nak6mfw9m8ldl336sqgkl3638ibv1hxwd89hwxdrn914wz3hw3")))) + "1q90p14qj5plz6cbvwxq875y29in6jg7adyni5wd33pf9i4gsxzi")))) (properties `((upstream-name . "biscuiteer"))) (build-system r-build-system) (propagated-inputs @@ -22711,13 +23630,13 @@ estimates, etc.") (define-public r-tcgabiolinks (package (name "r-tcgabiolinks") - (version "2.28.3") + (version "2.30.0") (source (origin (method url-fetch) (uri (bioconductor-uri "TCGAbiolinks" version)) (sha256 - (base32 "1hh09ya4jg062k1ibp1cpvdrgv6gwr95ch57iycgd3cjc5g0xhii")))) + (base32 "1k8xiv4bmil420176ckfda2r6y0s46dk1cm8dbywav86q28bmzzx")))) (properties `((upstream-name . "TCGAbiolinks"))) (build-system r-build-system) (propagated-inputs @@ -22766,13 +23685,13 @@ starburst plots) in order to easily develop complete analysis pipelines.") (define-public r-tricycle (package (name "r-tricycle") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tricycle" version)) (sha256 (base32 - "1ags05rhi431jsk0kqs7rmxj853mf5c0ibfqknbwy2wmbz8p1vq6")))) + "1dawkp681pz9hf7fp2nag9pcfxx5rq0z4j9czlalf0sylsjbirkd")))) (properties `((upstream-name . "tricycle"))) (build-system r-build-system) (propagated-inputs @@ -22805,14 +23724,14 @@ embeddings and functions to build new reference.") (define-public r-tximeta (package (name "r-tximeta") - (version "1.18.3") + (version "1.20.0") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "01s8x8a3rb0a5i599pxc5miz84ssvh10b4vha79nmbhkqccffvml")))) + "0wn7r1dzckiq3zacvcv2w780fj9bvz1vbyzcazv2qvsicbwc4vd8")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs @@ -22846,13 +23765,13 @@ reproducibility.") (define-public r-phyloseq (package (name "r-phyloseq") - (version "1.44.0") + (version "1.46.0") (source (origin (method url-fetch) (uri (bioconductor-uri "phyloseq" version)) (sha256 - (base32 "0rmv8f1m8ck97v991wdly3fma2rjczhi974lh7ikwx6rcx6fp9ah")))) + (base32 "06gnpjcniqm8i52xh9xl3nn0wm9nn9rkqd3w3fjv7ii142xypjln")))) (properties `((upstream-name . "phyloseq"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d637c8db55..77bc2eba14 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -94,6 +94,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages glib) #:use-module (gnu packages graph) #:use-module (gnu packages graphics) @@ -876,6 +877,38 @@ attributes of microbiome data - zero-inflation and over-dispersion, are simultaneously considered.") (license license:gpl3)))) +(define-public r-ewastools + (let ((commit "f7646cacd73266708479b3fea5d625054d179f95") + (revision "1")) + (package + (name "r-ewastools") + (version (git-version "1.7.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hhhh5/ewastools/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0irarlnxfnasa755adxsn67rxsy01zwhjhw18g4cag08cqiyyw41")))) + (properties `((upstream-name . "ewastools"))) + (build-system r-build-system) + (propagated-inputs + (list r-data-table + r-igraph + r-illuminaio + r-mblm + r-quadprog)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/hhhh5/ewastools/") + (synopsis + "Quality control toolset for the Illumina Infinium DNA methylation") + (description + "This package provides a collection of useful functions for working +with DNA methylation micro-array data.") + (license license:unlicense)))) + (define-public r-numbat (let ((commit "4ab7752e7d267a3f443756675728521a9b0a7295") (revision "1")) @@ -1063,11 +1096,11 @@ plotnames, filenames and paths.") (license license:gpl3)))) (define-public r-readwriter - (let ((commit "71454f4aa706f5d2fbe606acd95abc14224e7058") + (let ((commit "12d32cb6533ef4b9eab4d707d1502525c2034aee") (revision "1")) (package (name "r-readwriter") - (version (git-version "0.2.9" revision commit)) + (version (git-version "0.3.2" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1076,7 +1109,7 @@ plotnames, filenames and paths.") (file-name (git-file-name name version)) (sha256 (base32 - "0sp27smhdva2hi2x0svia2l56k8xrh7p5akn78g5b0lcvz4x3hd7")))) + "1hy47g8d7zppr2i9zlkwl2yb0ii8x710hqk07h089ldx9171qxab")))) (properties `((upstream-name . "ReadWriter"))) (build-system r-build-system) (propagated-inputs @@ -4697,26 +4730,16 @@ accurately delineate genomic rearrangements throughout the genome.") (arguments (list #:install-source? #false ;fails - #:tests? #false ;"cargo test" ignores build.rs #:phases #~(modify-phases %standard-phases (add-after 'unpack 'prepare-test-files (lambda _ (delete-file "Cargo.lock") - (substitute* "liftover-rs/Cargo.toml" - (("anyhow = \"1\"") "anyhow = \"1.0.65\"")) (substitute* "liftover-rs/prepare-test.sh" (("/bin/bash") (string-append #$(this-package-native-input "bash") "/bin/bash"))) (invoke "bash" "prepare-test-files.sh"))) - (add-before 'patch-cargo-checksums 'do-not-build-xz - (lambda _ - ;; Detection of liblzma (in rust-lzma-sys, pulled in by - ;; rust-hts-sys) doesn't seem to work, or perhaps it really does - ;; request a static build somewhere. - (substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs" - (("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") "")))) (add-before 'install 'chdir (lambda _ (chdir "transanno")))) #:cargo-inputs @@ -4738,7 +4761,8 @@ accurately delineate genomic rearrangements throughout the genome.") #:cargo-development-inputs `(("rust-clap" ,rust-clap-2) ("rust-lazy-static" ,rust-lazy-static-1)))) - (native-inputs (list bash)) + (native-inputs (list bash pkg-config)) + (inputs (list xz)) (home-page "https://github.com/informationsea/transanno") (synopsis "LiftOver tool for new genome assemblies") (description "This package provides an accurate VCF/GFF3/GTF LiftOver tool @@ -5171,13 +5195,25 @@ software to answer ad hoc questions.") python-pysam python-pyyaml python-scipy + r-biocmanager + r-dplyr + r-genomicranges + r-here + r-openxlsx + r-optparse + r-readr + r-rsamtools + r-stringr + r-tidyr + r-upsetr + r-yaml snakemake-7)) (native-inputs (list python-cython python-pyfakefs python-pytest)) (home-page "https://github.com/dieterich-lab/Baltica") (synopsis "Integrated splice junction usage analysis") (description "This framework facilitates the execution of @dfn{differential junction -usage} (DJU) methods. Additionally, it enables the integration of results from +usage} (DJU) methods. Additionally, it enables the integration of results from multiple DJU methods.") (license license:expat))) @@ -9879,6 +9915,51 @@ tasks.") Pore-C concatemers.") (license license:gpl3)))) +(define-public r-dnamcrosshyb + ;; There aren't any releases. + (let ((commit "fe8acb33667e81f00dcb84e0fa75c87ab2db5d8f") + (revision "1")) + (package + (name "r-dnamcrosshyb") + (version (git-version "0.0.0.9000" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjhop/DNAmCrosshyb") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12j1xsiqpvny5rp23z1az0k4cj5ajbcwkg65z00s16vywi2rx6nb")))) + (properties `((upstream-name . "DNAmCrosshyb"))) + (build-system r-build-system) + (propagated-inputs + (list r-biocgenerics + r-biocparallel + r-biostrings + r-bsgenome-hsapiens-ucsc-hg19-masked + r-bsgenome-hsapiens-ucsc-hg38-masked + r-dplyr + r-genomicranges + r-ggplot2 + r-iranges + r-magrittr + r-minfi + r-purrr + r-s4vectors + r-shiny + r-stringi + r-stringr + r-tibble + r-tidyr + r-watermelon)) + (home-page "https://github.com/pjhop/DNAmCrosshyb") + (synopsis "DNAmCrosshyb") + (description + "This package provides helper functions to detect cross-hybridization +on Illumina DNAm arrays.") + (license license:gpl3)))) + (define-public r-doubletcollection (let ((commit "c0d62f1853942ee6a087eaf7b000d9e4261e2dfd") (revision "1")) @@ -10277,6 +10358,66 @@ figures. This tool will create clean markdown reports about what you just discovered.") (license license:gpl3)))) +(define-public r-metacell + (let ((commit "d6a6926d103ee0cb34a611c753572429c94a53d9") + (revision "1")) + (package + (name "r-metacell") + (version (git-version "0.3.41" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tanaylab/metacell/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zrsckr3y35x37mj3ibm6scyqx925s84wzrz1i42fnm9n3msc265")))) + (properties `((upstream-name . "metacell"))) + (build-system r-build-system) + (propagated-inputs (list r-cluster + r-cowplot + r-data-table + r-dbscan + r-domc + r-dplyr + r-entropy + r-ggplot2 + r-graph + r-igraph + r-kernsmooth + r-magrittr + r-matrix + r-matrixstats + r-pdist + r-pheatmap + r-plyr + r-rcolorbrewer + r-rcurl + r-rgraphviz + r-slam + r-singlecellexperiment + r-svglite + r-tgconfig + r-tgstat + r-tgutil + r-tidyr + r-umap + r-umap + r-zoo)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/tanaylab/metacell/") + (synopsis "Meta cell analysis for single cell RNA-seq data") + (description + "This package facilitates the analysis of single-cell RNA-seq UMI matrices. +It does this by computing partitions of a cell similarity graph into +small homogeneous groups of cells, which are defined as metacells (MCs). +The derived MCs are then used for building different representations of +the data, allowing matrix or 2D graph visualization forming a basis for +analysis of cell types, subtypes, transcriptional gradients,cell-cycle +variation, gene modules and their regulatory models and more.") + (license license:expat)))) + (define-public r-snapatac (package (name "r-snapatac") @@ -10593,6 +10734,40 @@ of transcriptional heterogeneity among single cells.") ;; See https://github.com/hms-dbmi/scde/issues/38 (license license:gpl2))) +(define-public r-miamiplot + (let ((commit "beede9c5d6431b4d822aa42e064e01baeb5dd4a0") + (revision "1")) + (package + (name "r-miamiplot") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/juliedwhite/miamiplot") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wxxk1lk9jbf0imf59qp302ffasvs84idinkvzirs3dw9w3589n9")))) + (properties `((upstream-name . "miamiplot"))) + (build-system r-build-system) + (propagated-inputs (list r-checkmate + r-dplyr + r-ggplot2 + r-ggrepel + r-gridextra + r-magrittr + r-rlang)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/juliedwhite/miamiplot") + (synopsis "Create a ggplot2 miami plot") + (description + "This package generates a Miami plot with centered chromosome labels. +The output is a ggplot2 object. Users can specify which data they want +plotted on top vs. bottom, whether to display significance line(s), what +colors to give chromosomes, and what points to label.") + (license license:gpl2)))) + (define-public r-millefy (package (name "r-millefy") @@ -15474,6 +15649,41 @@ analysing cytometry data in R.") spatial single-cell expression data.") (license license:expat)))) +;; Variant of r-illuminahumanmethylationepicmanifest in the +;; (gnu packages bioconductor) module. +(define-public r-illuminahumanmethylationepicmanifest-latest + (let ((commit "a9ffbad36f5e496ece6c4c37b80e2f4f7e02d0c3") + (revision "1")) + (package + (name "r-illuminahumanmethylationepicmanifest") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url + "https://github.com/achilleasNP/IlluminaHumanMethylationEPICmanifest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v8f0hl0v8gwi61vgqw56rn5j09h95hj54rb8pzbn0znm162n4fc")))) + (properties `((upstream-name . "IlluminaHumanMethylationEPICmanifest"))) + (build-system r-build-system) + (home-page + "https://github.com/achilleasNP/IlluminaHumanMethylationEPICmanifest") + (synopsis "Illumina Human Methylation Manifest 1.0 B5 for R and minfi") + (description + "This is a drop-in replacement for the +@code{IlluminaHumanMethylationEPIC} package. It utilizes a Manifest based on +1.0B5 annotation. As of version 0.3.0, the +@code{IlluminaHumanMethylationEPIC} package still employs the 1.0B2 annotation +manifest. A corresponding annotation package, +@code{IlluminaHumanMethylationEPICanno.ilm10b5.hg38}, is available to ensure +proper annotation. The decision to maintain the same name is due to +complications in downstream processing caused by array name lookup in certain +preprocessing options.") + (license license:artistic2.0)))) + (define-public r-illuminahumanmethylationepicanno-ilm10b5-hg38 (let ((commit "3db06910e27f626e0cc8b335ff45cf9a4050a36a") (revision "1")) @@ -18740,6 +18950,73 @@ transcriptional derivatives and visualization of the resulting velocity patterns.") (license license:gpl3)))) +(define-public r-voltron + (let ((commit "5057b703479239a9aaba761f07e65d849f6111f8") + (revision "1")) + (package + (name "r-voltron") + (version (git-version "1.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BIMSBbioinfo/VoltRon") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nximl4708a7fdwn8ysxpni3mp6dx33cphavlay7hh1pa55pnzgn")) + (modules '((guix build utils))) + ;; The tripack package is not available under a free license, + ;; but interp provides free implementations of "tri.mesh" and + ;; "neighbours". + (snippet + '(substitute* '("DESCRIPTION" "NAMESPACE" "R/spatial.R") + (("tripack") "interp"))))) + (properties `((upstream-name . "VoltRon"))) + (build-system r-build-system) + (inputs (list opencv tbb zlib)) + (propagated-inputs (list r-anndata + r-data-table + r-dplyr + r-ebimage + r-fastdummies + r-fnn + r-ggforce + r-ggplot2 + r-ggpubr + r-ggrepel + r-hdf5r + r-htmltools + r-igraph + r-interp + r-irlba + r-magick + r-matrix + r-morpho + r-raster + r-rcpp + r-reshape2 + r-rjson + r-rlang + r-s4vectors + r-scales + r-shiny + r-shinyjs + r-stringr + r-terra + r-umap + r-xml)) + (native-inputs (list pkg-config)) + (home-page "https://github.com/BIMSBbioinfo/VoltRon") + (synopsis "VoltRon for Spatial Data Integration and Analysis") + (description + "@code{VoltRon} is a toolbox for spatial data analysis, multi-omics +integration using spatial image registration. @code{VoltRon} is capable of +analyzing multiple types and modalities of spatially-aware datasets. +@code{VoltRon} visualizes and analyzes regions of interests (ROIs), spots, +cells and even molecules.") + (license license:expat)))) + (define-public methyldackel (package (name "methyldackel") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 05f1e24d2b..be5b9650b2 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -46,11 +46,13 @@ #:use-module ((guix licenses) #:prefix l:) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages certs) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -78,12 +80,14 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) + #:use-module (gnu packages web) #:use-module (gnu packages xml)) (define-public transmission (package (name "transmission") - (version "4.0.3") + (version "4.0.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/transmission/transmission" @@ -91,7 +95,7 @@ version ".tar.xz")) (sha256 (base32 - "0njlmpcdsxwx8vwdk9dvsby51l6f6awks9d0mgvi9fs2ivaizc5n")))) + "19nm7f4x3zq610da5fl63vpycj4kv07np6ldm8czpgyziwqv9xqm")))) (build-system cmake-build-system) (outputs '("out" ; library and command-line interface "gui")) ; graphical user interface @@ -112,8 +116,9 @@ (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (if tests? - ;; XXX this test fails... - (invoke "ctest" "-E" "usesBootstrapFile" + (invoke "ctest" + ;; XXX this test fails... + "-E" "usesBootstrapFile" "-j" (if parallel-tests? (number->string (parallel-job-count)) "1")) @@ -156,7 +161,7 @@ (native-inputs (list intltool pkg-config)) (home-page "https://transmissionbt.com/") - (synopsis "Fast and easy BitTorrent client") + (synopsis "BitTorrent client") (description "Transmission is a BitTorrent client that comes with graphical, textual, and Web user interfaces. Transmission also has a daemon for @@ -285,7 +290,7 @@ Transmission BitTorrent daemon.") (define-public aria2 (package (name "aria2") - (version "1.36.0") + (version "1.37.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/aria2/aria2/releases/" @@ -293,7 +298,12 @@ Transmission BitTorrent daemon.") "/aria2-" version ".tar.xz")) (sha256 (base32 - "1987x4ywnnrhhfs9hi2h820c200d7nas9nd35414yh0jiihfglaq")))) + "0sxng4pynhj2qinranpv6wyzys3d42kz1gg2nrn63sw5f2nj1930")) + (patches (search-patches "aria2-unbundle-wslay.patch")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "deps") + (delete-file "configure"))))) (build-system gnu-build-system) (arguments (list @@ -312,7 +322,11 @@ Transmission BitTorrent daemon.") (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text) (string-append "// " text)))))))) (native-inputs - (list cppunit ; for the tests + (list autoconf ; since we adjusted configure.ac + automake + gettext-minimal + libtool + cppunit ; for the tests pkg-config)) (inputs (list c-ares @@ -322,6 +336,7 @@ Transmission BitTorrent daemon.") libxml2 nettle sqlite + wslay zlib)) (home-page "https://aria2.github.io/") (synopsis "Utility for parallel downloading files") @@ -403,10 +418,16 @@ and will take advantage of multiple processor cores where possible.") (license (list l:public-domain ; sha1.*, used to build without OpenSSL l:gpl2+)))) ; with permission to link with OpenSSL +(define %v2_empty_file.torrent + (origin (method url-fetch) + (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent") + (sha256 + (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn")))) + (define-public libtorrent-rasterbar (package (name "libtorrent-rasterbar") - (version "1.2.18") + (version "2.0.9") (source (origin (method url-fetch) @@ -415,41 +436,70 @@ and will take advantage of multiple processor cores where possible.") "releases/download/v" version "/" "libtorrent-rasterbar-" version ".tar.gz")) (sha256 - (base32 "0wpsaqadcicxl4lf1nc1i93c4yzjv8hpzhhrw1hdkrp4gn0vdwpy")))) + (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch")) + ;; https://github.com/arvidn/libtorrent/issues/7566 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + (modules '((guix build utils))) + (snippet + #~(substitute* "test/test_copy_file.cpp" + (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all) + (string-append all ", TMPFS_MAGIC\n")))))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-Dpython-bindings=ON" "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'extend-test-timeout - (lambda _ - (substitute* "test/test_remove_torrent.cpp" - ;; Extend the test timeout from 3 seconds to 10. - (("i > 30") "i > 100")))) + ;; https://github.com/arvidn/libtorrent/issues/7567 + ;; Remove when resolved. I would hope this to be fixed in 2.0.10. + ;; Do not forget to remove the %v2_empty_file.torrent variable. + (add-before 'configure 'copy-v2_empty_file.torrent + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (copy-file (assoc-ref (or native-inputs inputs) + "%v2_empty_file.torrent") + "test/test_torrents/v2_empty_file.torrent"))) (replace 'check (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let ((disabled-tests - ;; test_upnp requires a non-localhost IPv4 interface. - '("test_upnp"))) + (let* ((disabled-tests + '( + ;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. - (setenv "FAKETIME_ONLY_CMDS" "test_ssl") + ;; + ;; At the same time, faketime happens to cause + ;; test_fast_extension, test_privacy and test_resolve_links + ;; to hang, even with FAKETIME_ONLY_CMDS. Not sure why. So + ;; execute only test_ssl under faketime. (invoke "faketime" "2022-10-24" "ctest" - "--exclude-regex" (string-join disabled-tests "|") - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "--rerun-failed" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout "--output-on-failure")))))))) (inputs (list boost openssl)) - (native-inputs - (list libfaketime - python-wrapper - pkg-config)) + (native-inputs `(("libfaketime" ,libfaketime) + ("python-wrapper" ,python-wrapper) + ("pkg-config" ,pkg-config) + ("%v2_empty_file.torrent" ,%v2_empty_file.torrent))) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description @@ -458,10 +508,24 @@ focusing on efficiency and scalability. It runs on embedded devices as well as desktops.") (license l:bsd-2))) +(define-public libtorrent-rasterbar-1.2 + (package + (inherit libtorrent-rasterbar) + (version "1.2.19") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/arvidn/libtorrent/" + "releases/download/v" version "/" + "libtorrent-rasterbar-" version ".tar.gz")) + (sha256 + (base32 "03p4nvsll568zlyqifid0cn135sg5whbk7g48gkbapnw92ayks7f")))))) + (define-public qbittorrent (package (name "qbittorrent") - (version "4.5.5") + (version "4.6.2") (source (origin (method git-fetch) @@ -470,7 +534,7 @@ desktops.") (commit (string-append "release-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ngvvwhafi9mi05r2l9dk9x05za8x35y12p230wpzprydhlgwsxd")))) + (base32 "1wps17iv4gj7y751fibvcxk51v09wyniv6xm2yx429dj7z8rfmzs")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DTESTING=ON") @@ -479,7 +543,7 @@ desktops.") (list qttools-5)) (inputs (list boost - libtorrent-rasterbar + libtorrent-rasterbar-1.2 openssl python-wrapper qtsvg-5 @@ -515,7 +579,7 @@ features.") (package (inherit qbittorrent) (name "qbittorrent-enhanced") - (version "4.5.5.10") + (version "4.6.1.10") (source (origin (method git-fetch) @@ -525,7 +589,7 @@ features.") (file-name (git-file-name name version)) (sha256 (base32 - "029crx8yd8apssg2k4alnc0py5i2sp3bhjkwki5fvvnpgkrhfqf0")))) + "101a9n2vk9d6b4vc3schkmpc56l0i0i60fcjh8hwadc6amc2ymvy")))) (home-page "https://github.com/c0re100/qBittorrent-Enhanced-Edition") (description "qBittorrent Enhanced is a bittorrent client based on qBittorrent with @@ -549,7 +613,7 @@ the following features: (define-public deluge (package (name "deluge") - (version "2.0.5") + (version "2.1.1") (source (origin (method url-fetch) @@ -558,12 +622,13 @@ the following features: (version-major+minor version) "/deluge-" version ".tar.xz")) (sha256 (base32 - "1n15dzfnz1gvb4cf046yhi404i3gs933qgz0ichna6r1znmh9gf4")))) + "1xyz8bscwqmd7d8b43svxl42w54pnisvwkkrndx46hifh0cx73bn")))) (build-system python-build-system) (inputs (list bash-minimal)) (propagated-inputs (list gtk+ libtorrent-rasterbar + nss-certs python-pycairo python-chardet python-dbus @@ -581,6 +646,9 @@ the following features: (native-inputs (list intltool python-wheel (librsvg-for-system))) + (native-search-paths + (list $SSL_CERT_DIR + $SSL_CERT_FILE)) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm index 97a7e3b45c..c3504bb4ff 100644 --- a/gnu/packages/books.scm +++ b/gnu/packages/books.scm @@ -42,7 +42,7 @@ (define-public book-sparc (package (name "book-sparc") - (version "1.0.1") + (version "1.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -50,12 +50,11 @@ (commit (string-append "v" version)))) (sha256 (base32 - "0dswwwkb3h88cl3mhiy79s8i7sa9lmw6fxaj782vxgif795lcpxs")) + "0k1miyrnh5362qy50jzp5j3ww0c8hr7wk3y5kg6xlqgk9f8msvag")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet #~(begin - (delete-file "sparc.pdf") (substitute* "version.tex.in" (("@COMMIT@") "")) (substitute* "Makefile" @@ -86,6 +85,7 @@ texlive-collection-langcyrillic texlive-fontspec texlive-glossaries + texlive-glossaries-english texlive-glossaries-extra texlive-koma-script texlive-lilyglyphs diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 0f2da3fb83..4f032352f3 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2018, 2020, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019, 2020 Giacomo Leidi <goodoldpaul@autistici.org> @@ -44,6 +44,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages icu4c) #:use-module (gnu packages llvm) @@ -445,15 +446,18 @@ signals and slots system.") (define-public mdds (package (name "mdds") - (version "2.0.3") + (version "2.1.1") (source (origin - (method url-fetch) - (uri (string-append "https://kohei.us/files/mdds/src/mdds-" - version ".tar.xz")) - (sha256 - (base32 - "1r68kxqppmhfg0dhz54d0hqzs5882cqrv1x6wpg7lak6gyyws0bc")))) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mdds/mdds") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0866020brc1kmiryh7dmhjamnywlsd56ks649hy87283k0p7d3bb")))) (build-system gnu-build-system) + (native-inputs (list autoconf automake)) (propagated-inputs (list boost)) ; inclusion of header files (home-page "https://gitlab.com/mdds/mdds") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8869680b24..982c869ded 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> -;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; @@ -295,6 +295,71 @@ menu to select one of the installed operating systems.") #t)))))))) +(define-public grub-coreboot + (package + (inherit grub) + (name "grub-coreboot") + (synopsis "GRand Unified Boot loader (Coreboot payload version)") + (arguments + `(,@(substitute-keyword-arguments (package-arguments grub) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'disable-broken-tests + (lambda _ + (setenv "DISABLE_HARD_ERRORS" "1") + (setenv + "XFAIL_TESTS" + (string-join + ;; TODO: All the tests below use grub shell + ;; (tests/util/grub-shell.in), and here grub-shell uses + ;; QEMU and a Coreboot image to run the tests. Since we + ;; don't have a Coreboot package in Guix yet these tests + ;; are disabled. See the Guix bug #64667 for more details + ;; (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=64667). + (list + "pata_test" + "ahci_test" + "uhci_test" + "ehci_test" + "example_grub_script_test" + "ohci_test" + "grub_script_eval" + "grub_script_echo1" + "grub_script_test" + "grub_script_leading_whitespace" + "grub_script_echo_keywords" + "grub_script_vars1" + "grub_script_for1" + "grub_script_while1" + "grub_script_if" + "grub_script_comments" + "grub_script_functions" + "grub_script_continue" + "grub_script_break" + "grub_script_shift" + "grub_script_blockarg" + "grub_script_return" + "grub_script_setparams" + "grub_cmd_date" + "grub_cmd_sleep" + "grub_cmd_regexp" + "grub_script_not" + "grub_cmd_echo" + "grub_script_expansion" + "grub_script_gettext" + "grub_script_escape_comma" + "help_test" + "grub_script_strcmp" + "test_sha512sum" + "grub_cmd_tr" + "test_unset" + "file_filter_test") + " ")))))) + ((#:configure-flags flags + ''()) + `(cons* "--with-platform=coreboot" + ,flags))))))) + (define-public grub-efi (package (inherit grub) @@ -654,7 +719,8 @@ tree binary files. These are board description files used by Linux and BSD.") %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch (search-patch "u-boot-fix-build-python-3.10.patch") - (search-patch "u-boot-fix-u-boot-lib-build.patch"))) + (search-patch "u-boot-fix-u-boot-lib-build.patch") + (search-patch "u-boot-patman-change-id.patch"))) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 3f6da8d77a..21c519eda3 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> +;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,9 @@ #:use-module (guix build-system gnu) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu build chromium-extension) + #:use-module (gnu build icecat-extension) #:use-module (gnu packages compression) + #:use-module (gnu packages password-utils) #:use-module (gnu packages python)) (define play-to-kodi @@ -54,8 +57,8 @@ supported content to the Kodi media center.") ;; Arbitrary commit of branch master, ;; Update when updating uBlockOrigin. (let* ((name "ublock-main-assets") - (commit "c8783488f377723165e3661062bd124ae6d57165") - (revision "0") + (commit "d93605b8584df8cd47bcc91b3d932feecd9e3a2a") + (revision "1") (version (git-version "0" revision commit))) (origin (method git-fetch) @@ -64,14 +67,14 @@ supported content to the Kodi media center.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1b6a1m6s060r49vg563f32rsy057af6i4jcyprym4sdci3z90nls"))))) + (base32 "1bbwxmb5rb1afh6i5a7m1ysaw0022wi5g091vpahi4h805p1s7a2"))))) (define ublock-prod-assets ;; Arbitrary commit of branch gh-pages, ;; Update when updating uBlockOrigin. (let* ((name "ublock-prod-assets") - (commit "fbcfe9229ab6b865ef349c01a4eac73943be8418") - (revision "0") + (commit "1d3df32ef6672763f44b27a95fd5cb3b5770d5e2") + (revision "1") (version (git-version "0" revision commit))) (origin (method git-fetch) @@ -80,12 +83,12 @@ supported content to the Kodi media center.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0s5rvaz8lc9lk44yfc8463vah8yppy1ybmag0dpd4m1hyj6165h0"))))) + (base32 "1cbx7w1nzdcjq0z4z7j9nr8922i27nslprrw5dy03xcdqwc3x4l6"))))) (define ublock-origin (package (name "ublock-origin") - (version "1.51.0") + (version "1.53.2") (home-page "https://github.com/gorhill/uBlock") (source (origin (method git-fetch) @@ -95,9 +98,10 @@ supported content to the Kodi media center.") (file-name (git-file-name name version)) (sha256 (base32 - "1i8rnij3sbwg6vj6znprrsca0n5xjzhmhppaa8v6jyxg6wrrfch1")))) + "0mz1k5ghyc25v51md02qx7chrbg4cxagvqi18bcbs4agq8ix6sp7")))) (build-system gnu-build-system) (outputs '("xpi" "firefox" "chromium")) + (properties '((addon-id . "uBlock0@raymondhill.net"))) (arguments (list #:tests? #f ;no tests @@ -125,9 +129,11 @@ supported content to the Kodi media center.") (invoke "./tools/make-chromium.sh"))) (add-after 'build-chromium 'install (lambda* (#:key outputs #:allow-other-keys) - (let ((firefox (assoc-ref outputs "firefox")) - (xpi (assoc-ref outputs "xpi")) - (chromium (assoc-ref outputs "chromium"))) + (let* ((addon-id #$(assq-ref properties 'addon-id)) + (firefox (in-vicinity + (assoc-ref outputs "firefox") addon-id)) + (xpi (assoc-ref outputs "xpi")) + (chromium (assoc-ref outputs "chromium"))) (install-file "dist/build/uBlock0.firefox.xpi" (string-append xpi "/lib/mozilla/extensions")) (copy-recursively "dist/build/uBlock0.firefox" firefox) @@ -142,3 +148,76 @@ ungoogled-chromium.") (define-public ublock-origin/chromium (make-chromium-extension ublock-origin "chromium")) + +(define-public ublock-origin/icecat + (make-icecat-extension ublock-origin "firefox")) + +(define-public passff-host + (package + (name "passff-host") + (version "1.2.3") + (home-page "https://github.com/passff/passff-host") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p18l1jh20x4v8dj64z9qjlp96fxsl5h069iynxfpbkzj6hd74yl")))) + (build-system copy-build-system) + (arguments + (let ((native-manifests "lib/icecat/native-messaging-hosts")) + (list + #:install-plan + `'(("src" ,native-manifests #:include ("passff.json" "passff.py"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + (substitute* "src/passff.json" + (("PLACEHOLDER") + (format #f "~a/~a/passff.py" #$output #$native-manifests))) + (substitute* "src/passff.py" + (("_VERSIONHOLDER_") #$version) + (("^COMMAND = .*") + (format #f "COMMAND = \"~a/bin/pass\"~%" + #$(this-package-input "password-store")))) + (patch-shebang "src/passff.py"))))))) + (inputs (list password-store python)) + (synopsis "Host app for the WebExtension PassFF") + (description "This piece of software wraps around the zx2c4 pass shell +command. It has to be installed for the PassFF browser extension to work +properly.") + (license license:gpl2+))) + +(define passff + (package + (name "passff") + (version "1.15") + (home-page "https://github.com/passff/passff") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gymqyqppr8k9fqv5js7f6pk6hcc47qpf51x5cy6aahsk2v1qssj")))) + (propagated-inputs (list passff-host)) + (build-system copy-build-system) + (properties '((addon-id . "passff@invicem.pro"))) + (arguments + `(#:install-plan '(("src" ,(assq-ref properties 'addon-id))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'substitute-placeholder + (lambda _ + (substitute* "src/manifest.json" + (("_VERSIONHOLDER_") ,version))))))) + (synopsis "zx2c4 pass management extension for Mozilla Firefox") + (description "This extension will allow you to access your zx2c4 pass +repository directly from your web browser. You can choose to automatically +fill and submit login forms if a matching password entry is found.") + (license license:gpl2+))) + +(define-public passff/icecat + (make-icecat-extension passff)) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index ea58c68262..ac83336ba5 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Pierre Neidhardt <mail@ambrevar.xyz> -;;; Copyright © 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2019, 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2023 David Elsing <david.elsing@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1198,7 +1199,7 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.") (define-public mimalloc (package (name "mimalloc") - (version "2.0.9") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -1207,10 +1208,13 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "19w0i28p6knjd192rrcw1ayc3x0qp6rcm48cwkls4kwn8fng81fj")))) + "1pyf05snc1ib7zjjm9kspvbmynd8lmxqw72qcpz8lcyzyywmz24i")))) (build-system cmake-build-system) (arguments - `(#:build-type "Release")) + `(#:build-type "Release" + ,@(if (target-ppc32?) + `(#:configure-flags '("-DMI_USE_LIBATOMIC=ON")) + '()))) (synopsis "General purpose memory allocator") (description "@code{mimalloc} is a drop-in replacement for @code{malloc}.") (home-page "https://microsoft.github.io/mimalloc/") @@ -1585,3 +1589,57 @@ serial program, though the execution model is actually that a number of program instances execute in parallel on the hardware.") (home-page "https://github.com/ispc/ispc") (license license:bsd-3))) + +(define-public pcg-c + (let ((commit "83252d9c23df9c82ecb42210afed61a7b42402d7") + (revision "1")) + (package + (name "pcg-c") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/imneme/pcg-c") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0768h0vw75a3smk39qsz1504v04a43s5w1ili1ijbixxv8gm42nf")) + (modules '((guix build utils))) + ;; Autogenerated files with some tests from test-high. If + ;; 128-bit integers are not supported, the build fails, but + ;; this is checked when building the tests. + (snippet #~(delete-file-recursively "sample")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "test" + #:make-flags + #~(list + "CC=gcc" + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'disable-sample + (lambda _ + (substitute* "Makefile" + ((".*cd sample.*") "")))) + (add-after 'unpack 'set-shared-library + (lambda _ + (substitute* '("Makefile" "src/Makefile") + (("\\.a") "\\.so") + ((".*ar .*") "\t$(CC) $(CFLAGS) -o $@ $(LDFLAGS) -shared $^") + ((".*ranlib.*") "") + ((".*CFLAGS \\+=.*O3.*" orig) + (string-append orig "CFLAGS += -fPIC\n"))))) + (add-before 'install 'make-dirs + (lambda _ + (mkdir-p (string-append #$output "/lib")) + (mkdir-p (string-append #$output "/include"))))))) + (home-page "https://www.pcg-random.org") + (synopsis "C implementation of the PCG random generators") + (description "The Permuted Congruential Generator (PCG) extends the +Linear Congruential Generator (LCG) with a permutation function to increase +output randomness while retaining speed, simplicity, and conciseness.") + (license (list license:expat license:asl2.0))))) ; dual licensed diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index 26a71f40ef..a1af25df2b 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021, 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -62,7 +62,11 @@ ;; Tests require a writable HOME. (lambda _ (setenv "HOME" (getenv "TMPDIR"))))))) - (native-inputs (list perl ruby-asciidoctor which)) + (native-inputs + (append (list perl which) + (if (supported-package? ruby-asciidoctor) + (list ruby-asciidoctor) + '()))) (inputs (list zlib `(,zstd "lib"))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 131dd6e4e4..813c3a4963 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -551,7 +551,7 @@ graphical interface.") (define-public libcue (package (name "libcue") - (version "2.2.1") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -560,7 +560,7 @@ graphical interface.") (file-name (git-file-name name version)) (sha256 (base32 - "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm")))) + "1lkcj31fc0wjqr9lgr1ws6invx6ayvrk7v5kd9lm7956q1mi9ib4")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -951,7 +951,7 @@ CD data, and more. It's mostly compatible with @code{cdrtools}.") (define-public libmirage (package (name "libmirage") - (version "3.2.6") + (version "3.2.7") (source (origin (method url-fetch) (uri (string-append @@ -959,7 +959,7 @@ CD data, and more. It's mostly compatible with @code{cdrtools}.") version ".tar.xz")) (sha256 (base32 - "19pjdmxhzl8y3brhg8fsv99b6jg4lfnl8jvcjgm4jmqrr684czr5")))) + "1lxkpmad8l2wl0afp26jahzf5cxp10p0zl1a56lcqjwmsy0292gs")))) (build-system cmake-build-system) (native-inputs (list pkg-config intltool)) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5af3b49280..5181d3a164 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2358,14 +2358,14 @@ programs, something like CSmith, a random generator of C programs.") (define-public python-lit (package (name "python-lit") - (version "16.0.0") + (version "17.0.6") (source (origin (method url-fetch) (uri (pypi-uri "lit" version)) (sha256 (base32 - "04dyv8b2nbdbn61zdgm042a21dwidyapn9zbinlf879a29rc6jiw")))) + "06z3p85gsy5hw3rbk0ym8aig9mvry1327gz7dfjhjigwandszafz")))) (build-system python-build-system) (arguments `(#:phases @@ -2374,8 +2374,8 @@ programs, something like CSmith, a random generator of C programs.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "lit.py" "tests"))))))) - (native-inputs - (list llvm-14)) + ;; This can be built with any version of llvm. + (native-inputs (list llvm)) (home-page "https://llvm.org/") (synopsis "LLVM Software Testing Tool") (description "@code{lit} is a portable tool for executing LLVM and Clang @@ -2551,7 +2551,7 @@ mypy plugins.") (define-public python-pytest-perf (package (name "python-pytest-perf") - (version "0.12.0") + (version "0.13.1") (source (origin (method git-fetch) (uri (git-reference @@ -2560,26 +2560,21 @@ mypy plugins.") (file-name (git-file-name name version)) (sha256 (base32 - "05mgknvrmyz1kmkgw8jzvisavc68wz1g2wxv69i6xvzgqxf17m9f")))) - (build-system python-build-system) + "1hrccvrbccqwba04pqj749hdzn4sgldmbpg74nf3fzz7wyg6jxqk")))) + (build-system pyproject-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-k" - (string-append - ;; Do not test the myproject.toml build as it tries to pull - ;; dependencies from the internet. - "not project " - ;; The benchmark test attempts to install the - ;; package, failing to pull its dependencies from the - ;; network. - "and not BenchmarkRunner " - ;; The upstream_url test requires networking. - "and not upstream_url")))))))) + #:test-flags '(list "-k" + (string-append + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the internet. + "not project " + ;; The benchmark test attempts to install the + ;; package, failing to pull its dependencies from the + ;; network. + "and not BenchmarkRunner " + ;; The upstream_url test requires networking. + "and not upstream_url")))) (native-inputs (list python-pytest python-pytest-black @@ -2726,7 +2721,7 @@ possible to write plugins to add your own checks.") (base32 "16a1ac5n7k7sx15cnk03gw3fmslab3a7m74dc45rgpldgiff3577")))) (build-system python-build-system) - (propagated-inputs (list python-pylint)) + (propagated-inputs (list python-tomli python-pylint)) (home-page "https://github.com/johnnoone/setuptools-pylint") (synopsis "Run pylint with @command{python setup.py lint}") (description "This package expose pylint as a lint command into @@ -3548,7 +3543,7 @@ that can be used to verify that future runs produce the same data.") (define-public guile-proba (package (name "guile-proba") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -3557,7 +3552,7 @@ that can be used to verify that future runs produce the same data.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mjnrbb6gv5f95i1ihn75yh7ya445pcnj13cy34x2v58h9n2r80s")))) + (base32 "17ab304ylylm9z980ij5lv188inx6331r1mn1s7qrlxly9fzx888")))) (build-system guile-build-system) (inputs (list bash-minimal guile-3.0)) (native-inputs (list texinfo)) @@ -3599,8 +3594,8 @@ that can be used to verify that future runs produce the same data.") (copy-file "proba.scm" script) (chmod script #o555) (wrap-program script - `("GUILE_LOAD_PATH" = (,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" = + `("GUILE_LOAD_PATH" prefix (,(getenv "GUILE_LOAD_PATH"))) + `("GUILE_LOAD_COMPILED_PATH" prefix (,(getenv "GUILE_LOAD_COMPILED_PATH"))))))) (add-after 'install 'install-manual (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index aaa3a678d4..9c01f05fff 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -968,7 +968,7 @@ testing.") (name "ungoogled-chromium-wayland") (native-inputs '()) (inputs - (list bash-minimal glibc-utf8-locales ungoogled-chromium)) + (list bash-minimal (libc-utf8-locales-for-target) ungoogled-chromium)) (build-system trivial-build-system) (arguments (list diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 3ba3ea6f2c..4b1254932c 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR)) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -59,11 +60,11 @@ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "797b26a4ef80dce278481b1cc3391791ef2cbbaf") - (revision "19")) + (let ((commit "bdc1f9f304a3f5931ec507dcfe0b91b185b70708") + (revision "1")) (package (name "cuirass") - (version (git-version "1.1.0" revision commit)) + (version (git-version "1.2.0" revision commit)) (source (origin (method git-fetch) @@ -73,73 +74,66 @@ (file-name (git-file-name name version)) (sha256 (base32 - "10hs9nxl9xlnswm7qv8mw5s3rf65q4ip8ikqvgq5rprcv1lf26ad")))) + "031vv3rk7vzal611iq8sgq5yackp78kdpz8qn78j561pl9bip80n")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build utils) - (guix build gnu-build-system) - (ice-9 rdelim) - (ice-9 popen)) - #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass - ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them - ;; on that architecture for now. - #:tests? ,(let ((s (or (%current-target-system) - (%current-system)))) - (not (string-prefix? "aarch64" s))) - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'fix-version-gen - (lambda _ - (patch-shebang "build-aux/git-version-gen") + (list #:modules `((guix build utils) + (guix build gnu-build-system) + (ice-9 match) + (ice-9 rdelim) + (ice-9 popen) + (srfi srfi-1)) + #:configure-flags #~'("--localstatedir=/var") ;for /var/log/cuirass + ;; XXX: HTTP tests fail on aarch64 due to Fibers errors, disable them + ;; on that architecture for now. + #:tests? (let ((s (or (%current-target-system) + (%current-system)))) + (not (string-prefix? "aarch64" s))) + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'bootstrap 'fix-version-gen + (lambda _ + (patch-shebang "build-aux/git-version-gen") - (call-with-output-file ".tarball-version" - (lambda (port) - (display ,version port))))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Wrap the 'cuirass' command to refer to the right modules. - (let* ((out (assoc-ref outputs "out")) - (avahi (assoc-ref inputs "guile-avahi")) - (gcrypt (assoc-ref inputs "guile-gcrypt")) - (json (assoc-ref inputs "guile-json")) - (zmq (assoc-ref inputs "guile-simple-zmq")) - (squee (assoc-ref inputs "guile-squee")) - (git (assoc-ref inputs "guile-git")) - (bytes (assoc-ref inputs "guile-bytestructures")) - (fibers (assoc-ref inputs "guile-fibers")) - (zlib (assoc-ref inputs "guile-zlib")) - (matd (assoc-ref inputs "guile-mastodon")) - (tls (assoc-ref inputs "guile-gnutls")) - (mail (assoc-ref inputs "mailutils")) - (guix (assoc-ref inputs "guix")) - (deps (list avahi gcrypt json zmq squee git bytes - fibers zlib matd tls mail guix)) - (guile (assoc-ref inputs "guile")) - (effective - (read-line - (open-pipe* OPEN_READ - (string-append guile "/bin/guile") - "-c" "(display (effective-version))"))) - (mods - (string-drop-right ;drop trailing colon - (string-join deps - (string-append "/share/guile/site/" - effective ":") - 'suffix) - 1)) - (objs - (string-drop-right - (string-join deps - (string-append "/lib/guile/" effective - "/site-ccache:") - 'suffix) - 1))) - ;; Make sure 'cuirass' can find the relevant Guile modules. - (wrap-program (string-append out "/bin/cuirass") - `("PATH" ":" prefix (,(string-append out "/bin"))) - `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs))))))))) + (call-with-output-file ".tarball-version" + (lambda (port) + (display #$(package-version this-package) port))))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Wrap the 'cuirass' command to refer to the right modules. + ;; Do so by collecting the subset of INPUTS that provides Guile + ;; modules. This includes direct inputs as well as their + ;; propagated inputs--e.g., 'guix' propagates 'guile-zstd'. + (define (sub-directory suffix) + (match-lambda + ((label . directory) + (let ((directory (string-append directory suffix))) + (and (directory-exists? directory) + directory))))) + + (let* ((out (assoc-ref outputs "out")) + (effective + (read-line + (open-pipe* OPEN_READ (which "guile") "-c" + "(display (effective-version))"))) + (mods (filter-map (sub-directory + (string-append + "/share/guile/site/" + effective)) + inputs)) + (objs (filter-map (sub-directory + (string-append + "/lib/guile/" effective + "/site-ccache")) + inputs))) + (wrap-program (string-append out "/bin/cuirass") + `("PATH" ":" prefix + (,(string-append out "/bin"))) + `("GUILE_LOAD_PATH" ":" prefix + ,mods) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + ,objs)))))))) (inputs (list bash-minimal guile-3.0-latest diff --git a/gnu/packages/clifm.scm b/gnu/packages/clifm.scm new file mode 100644 index 0000000000..92d14f1072 --- /dev/null +++ b/gnu/packages/clifm.scm @@ -0,0 +1,62 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Rodion Goritskov <rodion.goritskov@gmail.com> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages clifm) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages readline) + #:use-module (gnu packages acl) + #:use-module (gnu packages linux)) + +(define-public clifm + (package + (name "clifm") + (version "1.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/leo-arch/clifm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r9pxlyn8jg0wmzbmbc71l42098lz5k32k6yid09yz6d0gaax7g1")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "CC=" + ,(cc-for-target)) + (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (delete 'check)))) + (inputs (list readline acl libcap)) + (home-page "https://github.com/leo-arch/clifm") + (synopsis "Command-line file manager") + (description "Clifm a shell-like, text-based terminal file manager that +sits on the command line. + +It is built with command line principles in mind: instead of navigating +through a big menu of files, it lets you type, exactly as you do in your +regular shell, but easier and faster.") + (license license:gpl2+))) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 6c69d390f4..f342d159e1 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Andrew Miloradovsky <andrew@interpretmath.pw> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021 Dion Mendel <guix@dm9.info> +;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,14 +75,18 @@ (arguments (list #:configure-flags - #~(list "--sysconfdir=/etc" - "--localstatedir=/var" - ;; Do not install sysv or systemd init scripts. - "--with-initscripttype=none" - ;; Disable support for DRBD 8.3 as it is only for - ;; Linux-Libre versions < 3.8. 8.4 is the latest - ;; kernel driver as of Linux 5.18. - "--without-83support") + #~(append + (list "--sysconfdir=/etc" + "--localstatedir=/var" + ;; Do not install sysv or systemd init scripts. + "--with-initscripttype=none" + ;; Disable support for DRBD 8.3 as it is only for + ;; Linux-Libre versions < 3.8. 8.4 is the latest + ;; kernel driver as of Linux 5.18. + "--without-83support") + #$(if (this-package-native-input "ruby-asciidoctor") + #~'() + #~(list "--without-manual"))) #:test-target "test" #:make-flags #~(list "WANT_DRBD_REPRODUCIBLE_BUILD=yesplease") #:phases @@ -126,15 +131,18 @@ (("\\$\\(DESTDIR\\)\\$\\(DRBD_LIB_DIR\\)") "$(DESTDIR)$(prefix)$(DRBD_LIB_DIR)"))))))) (native-inputs - (list clitest - eudev ;just to satisfy a configure check - flex - ;; For the documentation. - docbook-xml - docbook-xml-4.4 ;used by documentation/ra2refentry.xsl - docbook-xsl - libxslt ;for xsltproc - ruby-asciidoctor)) + (append (list clitest + eudev ;just to satisfy a configure check + flex) + ;; For the documentation. + (if (supported-package? ruby-asciidoctor) + (list docbook-xml + docbook-xml-4.4 ;used by documentation/ra2refentry.xsl + docbook-xsl + libxml2 ;for XML_CATALOG_FILES + libxslt ;for xsltproc + ruby-asciidoctor) + '()))) (home-page "https://www.linbit.com/drbd/") (synopsis "Replicate block devices between machines") (description diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index bc14286070..1592703f8d 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -263,6 +263,7 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-bootstrap) (name "cmake-minimal") + (properties (alist-delete 'hidden? (package-properties cmake-bootstrap))) (source (origin (inherit (package-source cmake-bootstrap)) ;; Purge CMakes bundled dependencies as they are no longer needed. diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a3c8d2139b..b11a86d5cc 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -237,8 +237,9 @@ highlighting your own code that seemed comprehensible when you wrote it.") (lambda _ ;; Install the plugin files in the right place. (let* ((data (string-append #$output "/share/gtags")) - (vim (string-append #$output - "/share/vim/vimfiles/plugin")) + (vim (string-append + #$output + "/share/vim/vimfiles/pack/guix/start/global/plugin")) (lisp (string-append #$output "/share/emacs/site-lisp/" #$(package-name this-package) "-" #$(package-version this-package)))) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 6c0f295f30..988e497ee7 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2927,7 +2927,7 @@ memoized as a function of '%current-system'." ;; store path has no dependencies. Actually, the really-final libc is ;; built just below; the only difference is that this one uses the ;; bootstrap Bash. - (let ((libc (libc-for-target))) + (let ((libc (libc-for-target (%current-system)))) (package (inherit libc) (name "glibc-intermediate") @@ -3101,7 +3101,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define/system-dependent glibc-final ;; The final glibc, which embeds the statically-linked Bash built above. ;; Use 'package/inherit' so we get the 'replacement' of 'glibc', if any. - (let ((libc (libc-for-target))) + (let ((libc (libc-for-target (%current-system)))) (package/inherit libc (name "glibc") (source (bootstrap-origin (package-source libc))) @@ -3370,6 +3370,16 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(("glibc" ,glibc-final) ("gzip" ,(with-boot4 gzip)))))) +(define-public glibc-utf8-locales-final/hurd + ;; Locales for the libc version used on GNU/Hurd. + (package + (inherit glibc-utf8-locales/hurd) + (properties `((hidden? . #t) + ,@(package-properties glibc-utf8-locales/hurd))) + (native-inputs + `(("glibc" ,glibc-final) + ("gzip" ,(with-boot4 gzip)))))) + (define-public ld-wrapper ;; The final 'ld' wrapper, which uses the final Guile and Binutils. (make-ld-wrapper "ld-wrapper" @@ -3388,7 +3398,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built ;; with an older libc, which cannot load the new locale format. See ;; <https://lists.gnu.org/archive/html/guix-devel/2015-08/msg00737.html>. - `(("locales" ,glibc-utf8-locales-final) + `(("locales" ,(if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final)) ,@(%boot4-inputs))) (define with-boot5 @@ -3493,7 +3505,9 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("gcc" ,gcc-final) ("libc" ,glibc-final) ("libc:static" ,glibc-final "static") - ("locales" ,glibc-utf8-locales-final)))))) + ("locales" ,(if (target-hurd? (%current-system)) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final))))))) (define-public canonical-package (let ((name->package (mlambda (system) diff --git a/gnu/packages/conky.scm b/gnu/packages/conky.scm index bd26cdd015..e29c6e1070 100644 --- a/gnu/packages/conky.scm +++ b/gnu/packages/conky.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> -;;; Copyright © 2019 Vasile Dumitrascu <va511e@yahoo.com> +;;; Copyright © 2019, 2023 Vasile Dumitrascu <va511e@yahoo.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (package (name "conky") (home-page "https://github.com/brndnmtthws/conky") - (version "1.19.4") + (version "1.19.6") (source (origin (method git-fetch) @@ -49,7 +49,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03zzssdg1qdv83p4c3dbjgr0g1n0spc0ndk9bds1rd2n82i6g6sy")))) + (base32 "02mdqsizc36v3zqhxnyv2mch9w0gqnl4a25yxishka9yv5ni5iig")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 5e21ce4ebd..a13b6d199e 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -47,17 +47,16 @@ (define-public connman (package (name "connman") - (version "1.41") + (version "1.42") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/network/connman/" "connman-" version ".tar.xz")) (sha256 - (base32 "12g5ilcnymx6i45z3359yds3cgd2dfqjyncfm92hqlymzps41yvr")) - (patches (search-patches "connman-CVE-2022-32292.patch" - "connman-CVE-2022-32293-pt1.patch" - "connman-CVE-2022-32293-pt2.patch")))) + (base32 "1an24caah35chc1c48p67ln8kpj9fr7slg5fklpfz0f0dzjbmrm3")) + (patches + (search-patches "connman-add-missing-libppp-compat.h.patch")))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 232d994fe3..a3aa9ac1db 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2023 Zongyuan Li <zongyuan.li@c0x0o.me> +;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,7 +160,7 @@ runtime (like runc or crun) for a single container.") (define-public distrobox (package (name "distrobox") - (version "1.4.2.1") + (version "1.5.0.2") (source (origin (method git-fetch) @@ -167,7 +168,7 @@ runtime (like runc or crun) for a single container.") (url "https://github.com/89luca89/distrobox") (commit version))) (sha256 - (base32 "0gs81m1bvlyq6ad22zsdsw1q6s3agy79vx94kdf6zjzngbanlydk")) + (base32 "0h6rpgbcmg33vriyzh9nkdxj8yhfn0y35i1wh1zmb7zss3ik9kxj")) (file-name (git-file-name name version)))) (build-system copy-build-system) (inputs @@ -177,7 +178,7 @@ runtime (like runc or crun) for a single container.") #~(modify-phases %standard-phases (add-before 'install 'refer-to-inputs (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "^distrobox.*[^1]$") + (substitute* (find-files "." "^distrobox[^.]*[^1]$") (("podman") (search-input-file inputs "/bin/podman")) (("wget") (search-input-file inputs "/bin/wget")) (("command -v") "test -x")))) diff --git a/gnu/packages/coq.scm b/gnu/packages/coq.scm index 09ca4030ea..f30f231f3b 100644 --- a/gnu/packages/coq.scm +++ b/gnu/packages/coq.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages texinfo) #:use-module (guix build-system dune) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix git-download) @@ -285,6 +286,32 @@ multi-precision arithmetic. It also supports efficient numerical computations inside Coq.") (license license:lgpl3+))) +;; Union of coq and coq-ide-server as vim-coqtail expects coqc and coqidetop +;; to be in the same bin folder, when vim-coqtail is installed coqc and +;; coqidetop will be in the "same" bin folder in the profile, so this is only +;; required for testing the package. +;; +;; This is deeply ingrained in the internals of vim-coqtail so this is why +;; it's necessary. +(define-public coq-for-coqtail + (hidden-package + (package + (inherit coq) + (name "coq-for-coqtail") + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (inputs (list coq coq-ide-server))))) + (define-public coq-gappa (package (name "coq-gappa") diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d93f1ab205..bc7f3b2725 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -31,13 +31,14 @@ ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022, 2023 David Elsing <david.elsing@posteo.net> ;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2023 Sughosha <Sughosha@proton.me> ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2023 Paul A. Patience <paul@apatience.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,6 +83,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages datastructures) + #:use-module (gnu packages disk) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) @@ -94,6 +96,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -606,6 +609,47 @@ container which uses the order in which keys were inserted to the container as ordering relation.") (license license:expat))) +(define-public frozen + ;; The test suite fails to compile with the latest 1.1.1 release; use a + ;; newer commit (see: + ;; https://github.com/serge-sans-paille/frozen/issues/163). + (let ((commit "dd1f58c5f6c97fbf0832cc4e84676663839b913e") + (revision "0")) + (package + (name "frozen") + (version (git-version "1.1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/serge-sans-paille/frozen") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06i307a7v6alxfy24d47b1sjkz5f4mrqwl2vb4j8zx7wlgnrf08b")))) + (build-system cmake-build-system) + (home-page "https://github.com/serge-sans-paille/frozen") + (synopsis "C++ constexpr alternative header-only library") + (description "@code{frozen} is a header-only library that provides zero +cost initialization for immutable containers, fixed-size containers, and +various algorithms. It provides features such as: +@itemize +@item +immutable (also known as frozen), @code{constexpr}-compatible versions of +{std::set}, {std::unordered_set}, {std::map} and {std::unordered_map} +@item +fixed-capacity, @code{constinit}-compatible versions of @code{std::map} and +@code{std::unordered_map} with immutable, compile-time selected keys mapped to +mutable values. +@item +zero cost initialization version of @code{std::search} for frozen needles +using Boyer-Moore or Knuth-Morris-Pratt algorithms. +@end itemize +The @code{unordered_*} containers are guaranteed perfect (no hash +collision) and the extra storage is linear with respect to the number of +keys.") + (license license:asl2.0)))) + (define-public json-dto (package (name "json-dto") @@ -1039,6 +1083,82 @@ Model and CSP-like channels. The goal of SObjectizer is to simplify development of concurrent and multithreaded applications in C++.") (license license:bsd-3))) +(define-public taskflow + (package + (name "taskflow") + (version "3.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/taskflow/taskflow") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cv74l181137lchc1rxygcg401cnq216ymq5qz2njsw99j342br3")))) + (build-system cmake-build-system) + (home-page "https://taskflow.github.io/") + (synopsis + "General-purpose parallel and heterogeneous task programming system") + (description + "Taskflow is a C++ library for writing parallel and heterogeneous task +programs.") + (license license:expat))) + +(define-public kokkos + (package + (name "kokkos") + (version "4.1.00") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kokkos/kokkos") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15kjpa54ssrrbid9h2nr94nh85qna5c4vq2152i4iy7gaagigy3c")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled googletest. + #~(delete-file-recursively "tpls/gtest")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + ;; deal.II uses only the serial backend, so do not enable the + ;; others yet. + #~(list "-DBUILD_SHARED_LIBS=ON" + "-DKokkos_ENABLE_SERIAL=ON" + "-DKokkos_ENABLE_TESTS=ON" + "-DKokkos_ENABLE_EXAMPLES=ON" + "-DKokkos_ENABLE_HWLOC=ON" + "-DKokkos_ENABLE_MEMKIND=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'install-license-files 'remove-cruft + (lambda _ + (delete-file + (string-append #$output "/share/doc/" + #$name "-" #$version + "/LICENSE_FILE_HEADER"))))))) + (native-inputs + (list googletest python)) + (inputs + (list `(,hwloc "lib") memkind)) + (home-page "https://github.com/kokkos/kokkos") + (synopsis "C++ abstractions for parallel execution and data management") + (description + "Kokkos Core implements a programming model in C++ for writing performance +portable applications targeting all major HPC platforms. For that purpose it +provides abstractions for both parallel execution of code and data management. +Kokkos is designed to target complex node architectures with N-level memory +hierarchies and multiple types of execution resources.") + + ;; Code exhibits integer size mismatches when compiled on 32-bit systems. + (supported-systems %64bit-supported-systems) + + (license license:asl2.0))) ; With LLVM exception + (define-public tweeny (package (name "tweeny") @@ -1143,7 +1263,7 @@ Google's C++ code base.") ((#:configure-flags flags) #~(cons* "-DCMAKE_CXX_STANDARD=11" #$flags))))))) -(define-public abseil-cpp +(define-public abseil-cpp-20220623.1 (let ((base abseil-cpp-20200923.3)) (package (inherit base) @@ -1164,22 +1284,59 @@ Google's C++ code base.") `(cons* "-DABSL_BUILD_TESTING=ON" (delete "-DABSL_RUN_TESTS=ON" ,flags)))))))) -(define (abseil-cpp-for-c++-standard version) +(define-public abseil-cpp + (let ((base abseil-cpp-20220623.1)) + (package + (inherit base) + (name "abseil-cpp") + (version "20230802.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abseil/abseil-cpp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ydkkbanrpkp5i814arzsk973kyzhhjhagnp392rq6rrv16apldq")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'check 'set-env-vars + (lambda* (#:key inputs #:allow-other-keys) + ;; absl_time_test requires this environment variable. + (setenv "TZDIR" (string-append #$(package-source base) + "/absl/time/internal/cctz/testdata/zoneinfo"))))))))))) + +(define (abseil-cpp-for-c++-standard base version) + (hidden-package + (package/inherit base + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" + (number->string version)) + #$flags))))))) + +(define (make-static-abseil-cpp version) (let ((base abseil-cpp)) (hidden-package (package/inherit base (arguments (substitute-keyword-arguments (package-arguments base) ((#:configure-flags flags) - #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" - (number->string version)) - #$flags)))))))) + #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) (define-public abseil-cpp-cxxstd17 - (abseil-cpp-for-c++-standard 17)) ;XXX: the default with GCC 11? + (abseil-cpp-for-c++-standard abseil-cpp 17)) ;XXX: the default with GCC 11? (define-public abseil-cpp-cxxstd11 - (abseil-cpp-for-c++-standard 11)) + (abseil-cpp-for-c++-standard abseil-cpp-20220623.1 11)) ;last version on C++11 + +(define-public static-abseil-cpp + (make-static-abseil-cpp abseil-cpp)) (define-public pegtl (package @@ -1264,7 +1421,7 @@ standard GNU style syntax for options.") (define-public folly (package (name "folly") - (version "2022.10.31.00") + (version "2023.11.06.00") (source (origin (method git-fetch) (uri (git-reference @@ -1273,7 +1430,7 @@ standard GNU style syntax for options.") (file-name (git-file-name name version)) (sha256 (base32 - "06r9xnj8ilghc0vv6r17k5apl3w19iwd76nr02svnv96c74bz2aa")))) + "0z0jhkma2qacc2kc27qsiwqwqkv07i9mwpc4vwcbawyzdajq6hd0")))) (build-system cmake-build-system) (arguments '(;; Tests must be explicitly enabled @@ -2669,6 +2826,43 @@ Main features: @end itemize") (license license:expat))) +(define-public mapbox-variant + (package + (name "mapbox-variant") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mapbox/variant") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03cmxm34ralh8y07bs80gz3v4pql51206dn5h7lcnm7vishkk241")) + (modules '((guix build utils))) + (snippet #~(begin + (delete-file "test/include/catch.hpp") + (substitute* (find-files "test" "\\.[ch]pp") + (("\"catch.hpp\"") "<catch/catch.hpp>")))))) + (build-system gnu-build-system) + (arguments + (list #:test-target "test" + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "include" + (string-append (assoc-ref outputs "out") + "/include"))))))) + (native-inputs (list catch2-1)) + (home-page "https://github.com/mapbox/variant") + (synopsis "Implementation of std::variant for C++11/14") + (description "This package provides a header-only implementation of +std::variant (formerly boost::variant) for C++11/14.") + (license license:bsd-3))) + (define-public mpark-variant (package (name "mpark-variant") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fb8a0095b5..221a81612c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -147,13 +147,13 @@ the vignette \"AER\" for a package overview.)") (define-public r-afpt (package (name "r-afpt") - (version "1.1.0.3") + (version "1.1.0.4") (source (origin (method url-fetch) (uri (cran-uri "afpt" version)) (sha256 (base32 - "18izncbr3ljckil97xx2w1y0y7qjykp06wm0ap8ismahqvia3xz3")))) + "15pa4p78p6r478l05481lzx6z4ahswj728s1sb3xp3pvn6rv4jfj")))) (properties `((upstream-name . "afpt"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -305,6 +305,30 @@ are included as well.") ;; Any version of the GPL. (license license:gpl3+))) +(define-public r-celestial + (package + (name "r-celestial") + (version "1.4.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "celestial" version)) + (sha256 + (base32 "1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z")))) + (properties `((upstream-name . "celestial"))) + (build-system r-build-system) + (propagated-inputs (list r-nistunits r-pracma r-rann)) + (home-page "https://cran.r-project.org/package=celestial") + (synopsis + "Collection of common astronomical conversion routines and functions") + (description + "This package contains a number of common astronomy conversion routines, +particularly the HMS and degrees schemes, which can be fiddly to convert between +on mass due to the textural nature of the former. It allows users to coordinate +match datasets quickly. It also contains functions for various cosmological +calculations.") + (license license:gpl3))) + ;; The package sources include multiple non-minified JavaScript files and the ;; v5.1.0 variant of d3.js. The d3.js file is not minified. (define-public r-chromomap @@ -341,6 +365,61 @@ Shiny applications.") (license (list license:gpl3 license:isc)))) ;for bundled d3js +(define-public r-consort + (package + (name "r-consort") + (version "1.2.1") + (source (origin + (method url-fetch) + (uri (cran-uri "consort" version)) + (sha256 + (base32 + "03xkypy4r84mdif6m331c27haxnyi1s87vvj2f83xxw0m0s5im5j")))) + (properties `((upstream-name . "consort"))) + (build-system r-build-system) + (native-inputs (list r-knitr)) + (home-page "https://github.com/adayim/consort/") + (synopsis "Create Consort Diagrams") + (description + "To make it easy to create CONSORT diagrams for the transparent reporting of +participant allocation in randomized, controlled clinical trials. This is done +by creating a standardized disposition data, and using this data as the source +for the creation a standard CONSORT diagram. Human effort by supplying text +labels on the node can also be achieved.") + (license license:expat))) + +(define-public r-collapse + (package + (name "r-collapse") + (version "2.0.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "collapse" version)) + (sha256 + (base32 "0azyl6667dzwns9knp3fplv6f9nav36wsrv42qzv90p5kzcaa872")))) + (properties `((upstream-name . "collapse"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp)) + (native-inputs (list r-knitr)) + (home-page "https://sebkrantz.github.io/collapse/") + (synopsis "Advanced and fast data transformation") + (description + "This is a C/C++ based package for advanced data transformation and +statistical computing in R that is extremely fast, class-agnostic, robust and +programmer friendly. Core functionality includes a rich set of S3 generic +grouped and weighted statistical functions for vectors, matrices and data +frames, which provide efficient low-level vectorizations, @code{OpenMP} +multithreading, and skip missing values by default. These are integrated with +fast grouping and ordering algorithms (also callable from C), and efficient +data manipulation functions. The package also provides a flexible and +rigorous approach to time series and panel data in R. It further includes +fast functions for common statistical procedures, detailed (grouped, weighted) +summary statistics, powerful tools to work with nested data, fast data object +conversions, functions for memory efficient R programming, and helpers to +effectively deal with variable labels, attributes, and missing data.") + (license (list license:gpl2+)))) + (define-public r-collections (package (name "r-collections") @@ -777,6 +856,64 @@ dumbbell charts, the ability to encircle points and coordinate-system-based text annotations.") (license license:agpl3))) +(define-public r-ggbreak + (package + (name "r-ggbreak") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggbreak" version)) + (sha256 + (base32 "14rx16v66xd0fjlywi89dq9dbw41zn7hpq14wgvf0178cxdp2fw4")))) + (properties `((upstream-name . "ggbreak"))) + (build-system r-build-system) + (propagated-inputs (list r-aplot r-ggfun r-ggplot2 r-ggplotify r-rlang)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/YuLab-SMU/ggbreak") + (synopsis "Set axis break for ggplot2") + (description + "This package provides an implementation of scale functions for setting +axis breaks of a ggplot.") + (license license:artistic2.0))) + +(define-public r-ggdist + (package + (name "r-ggdist") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggdist" version)) + (sha256 + (base32 "0b15b972wrllsvqqn0nc2c81fd9jl618fvqsfi50hjxwwpdach8l")))) + (properties `((upstream-name . "ggdist"))) + (build-system r-build-system) + (propagated-inputs (list r-cli + r-distributional + r-dplyr + r-ggplot2 + r-glue + r-numderiv + r-quadprog + r-rlang + r-scales + r-tibble + r-tidyselect + r-vctrs + r-withr)) + (native-inputs (list r-knitr)) + (home-page "https://mjskay.github.io/ggdist/") + (synopsis "Visualizations of distributions and uncertainty") + (description + "This package provides primitives for visualizing distributions using +ggplot2 that are particularly tuned for visualizing uncertainty in either a +frequentist or Bayesian mode. Both analytical distributions (such as +frequentist confidence distributions or Bayesian priors) and distributions +represented as samples (such as bootstrap distributions or Bayesian posterior +samples) are easily visualized.") + (license license:gpl3+))) + (define-public r-ggfittext (package (name "r-ggfittext") @@ -1242,6 +1379,37 @@ engines that convert R Markdown into HTML pages. Various themes and syntax highlight styles are supported.") (license license:asl2.0))) +(define-public r-profmem + (package + (name "r-profmem") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "profmem" version)) + (sha256 + (base32 "0gg6ja0ifwn9jj42rw1gnyil55sl9r2y5rjb6yjcvqwd5arajp3l")))) + (properties `((upstream-name . "profmem"))) + (build-system r-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-before 'install 'set-HOME + (lambda _ + ;; Needed for building vignettes + (setenv "HOME" "/tmp")))))) + (native-inputs + (list r-r-rsp r-markdown)) ;for vignettes + (home-page "https://github.com/HenrikBengtsson/profmem") + (synopsis "Simple memory profiling for R") + (description + "This package provides a simple and light-weight API for memory profiling +of R expressions. The profiling is built on top of R's built-in memory +profiler @code{utils::Rprofmem()}, which records every memory allocation done +by R (also native code).") + (license license:lgpl2.1+))) + (define-public r-proj4 (package (name "r-proj4") @@ -1322,14 +1490,14 @@ RUV-I, and RUV-III, along with various supporting algorithms.") (define-public r-waldo (package (name "r-waldo") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "waldo" version)) (sha256 (base32 - "0inzdwna22axhjw0jdrk800g7zbkpcs7g1cmdi83r7j4zxn0ggs5")))) + "019fvypq36kwvr2znlr0fd9f2ihb08rgigf6ypdybry5n8daxkc2")))) (properties `((upstream-name . "waldo"))) (build-system r-build-system) (propagated-inputs @@ -1425,6 +1593,26 @@ Singularity containers. You can execute a command inside a container, mount a volume or copy a file.") (license license:expat))) +(define-public r-bench + (package + (name "r-bench") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "bench" version)) + (sha256 + (base32 "05zky7l6103gabv9y0g3qlx8sgkq1sn9yl9jd3x8834cmlh67bmz")))) + (properties `((upstream-name . "bench"))) + (build-system r-build-system) + (propagated-inputs (list r-glue r-pillar r-profmem r-rlang r-tibble)) + (home-page "https://bench.r-lib.org/") + (synopsis "High precision timing of R expressions") + (description + "This package provides tools to accurately benchmark and analyze execution +times for R expressions.") + (license license:expat))) + (define-public r-benchmarkmedata (package (name "r-benchmarkmedata") @@ -1561,13 +1749,13 @@ larger than memory.") (define-public r-bwstest (package (name "r-bwstest") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "BWStest" version)) (sha256 - (base32 "02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs")))) + (base32 "1chlszmshda84000jj4q5j2swflj512vfj3h97361aphzhkwri2b")))) (properties `((upstream-name . "BWStest"))) (build-system r-build-system) (propagated-inputs (list r-memoise r-rcpp)) @@ -1584,14 +1772,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser (define-public r-v8 (package (name "r-v8") - (version "4.3.3") + (version "4.4.0") (source (origin (method url-fetch) (uri (cran-uri "V8" version)) (sha256 (base32 - "04x2dph917dwq6ja69yiizw808zwmm17v78j17mlksdnl6wcmm0c")))) + "0ilg9ihx1mp9zj8023rh3lj875vqy253v9gbn1bw61h2p47w4nv3")))) (properties `((upstream-name . "V8") (updater-extra-inputs . ("libnode")))) @@ -2013,14 +2201,14 @@ variables.") (define-public r-ggpp (package (name "r-ggpp") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "ggpp" version)) (sha256 (base32 - "05w74003jp7kprxxbni0plr7ydzyc5hzw8g39kn0qd4p7dksjpwr")))) + "0nysan87vgy0pbcks3bychm84zcwx9pf4p250b45ghimhvxh5cvm")))) (properties `((upstream-name . "ggpp"))) (build-system r-build-system) (propagated-inputs @@ -2844,13 +3032,13 @@ excellent candidate for labeling of a polygon.") (define-public r-poorman (package (name "r-poorman") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (cran-uri "poorman" version)) (sha256 (base32 - "0x1pk00ca7wjxnqfh1jphgsxcrq37s0c1nawv52yh5qgc4z0m3ij")))) + "1amlcbgfnm6yh7lmlzhs7aalv4mdm2ir3s2kpx33ppnz7hlii508")))) (properties `((upstream-name . "poorman"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -2990,6 +3178,27 @@ functions, including @code{sort}, @code{order}, and @code{match}. The functions are simplified but can be faster or have other advantages.") (license license:gpl3))) +(define-public r-matrixtests + (package + (name "r-matrixtests") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "matrixTests" version)) + (sha256 + (base32 "0d7i00cxzszfdnjm8q5b72ildic8nig6fbw7rba6acdnllpp7sza")))) + (properties `((upstream-name . "matrixTests"))) + (build-system r-build-system) + (propagated-inputs (list r-matrixstats)) + (home-page "https://github.com/karoliskoncevicius/matrixTests") + (synopsis "Statistical hypothesis tests on rows and columns of matrices") + (description + "This package offers quick statistical hypothesis testing for matrix +rows/columns. The main goals are speed through vectorization, detailed and +user-friendly output, and compatibility with tests implemented in R.") + (license license:gpl2))) + (define-public r-matrix-utils (package (name "r-matrix-utils") @@ -3014,6 +3223,27 @@ functions are simplified but can be faster or have other advantages.") objects.") (license license:gpl3))) +(define-public r-mblm + (package + (name "r-mblm") + (version "0.12.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "mblm" version)) + (sha256 + (base32 "1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b")))) + (properties `((upstream-name . "mblm"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/mblm/index.html") + (synopsis "Median-based linear models") + (description + "This package provides linear models based on Theil-Sen single median and +Siegel repeated medians. They are very robust (29 or 50 percent breakdown +point, respectively), and if no outliers are present, the estimators are very +similar to OLS.") + (license license:gpl2+))) + (define-public r-mboost (package (name "r-mboost") @@ -3257,6 +3487,29 @@ design tools, including ALM, ALC, and expected improvement for optimizing noisy black-box functions.") (license license:lgpl2.0+))) +(define-public r-tgstat + (package + (name "r-tgstat") + (version "2.3.24") + (source + (origin + (method url-fetch) + (uri (cran-uri "tgstat" version)) + (sha256 + (base32 "0czd3j7z30jgb03813s0jc0701ypnwpkkq7var6n6f6cj7sdvc0l")))) + (properties `((upstream-name . "tgstat"))) + (build-system r-build-system) + (native-inputs (list r-knitr)) + (home-page "https://cran.r-project.org/package=tgstat") + (synopsis "Amos Tanay's Group High Performance Statistical Utilities") + (description + "This package provides a collection of high-performance utilities. +It can be used to compute distances, correlations, autocorrelations, +clustering, and other tasks. It also contains a graph clustering +algorithm described in MetaCell analysis of single-cell RNA-seq +data using K-nn graph partitions.") + (license license:gpl2))) + (define-public r-tidyft (package (name "r-tidyft") @@ -3409,6 +3662,27 @@ convenience functions useful for using CSS selectors on XML nodes. This package is a port of the Python package @code{cssselect}.") (license license:bsd-3))) +(define-public r-relations + (package + (name "r-relations") + (version "0.6-13") + (source + (origin + (method url-fetch) + (uri (cran-uri "relations" version)) + (sha256 + (base32 "1nnr0kcr3whbwzi36sg7wn46jp7r0hfkvcwlybvjsjhczcvc6ngq")))) + (properties `((upstream-name . "relations"))) + (build-system r-build-system) + (propagated-inputs (list r-cluster r-sets r-slam)) + (home-page "https://cran.r-project.org/package=relations") + (synopsis "Data structures and algorithms for relations") + (description + "This package provides data structures and algorithms for k-ary relations +with arbitrary domains, featuring relational algebra, predicate functions, and +fitters for consensus relations.") + (license license:gpl2))) + (define-public r-repmis (package (name "r-repmis") @@ -3523,6 +3797,27 @@ without affecting the current R process at all. This package does exactly that.") (license license:expat))) +(define-public r-deming + (package + (name "r-deming") + (version "1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "deming" version)) + (sha256 + (base32 "1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421")))) + (properties `((upstream-name . "deming"))) + (build-system r-build-system) + (propagated-inputs (list r-boot)) + (home-page "https://cran.r-project.org/package=deming") + (synopsis + "Deming, Theil-Sen, Passing-Bablock and Total Least Squares regression") + (description + "This package implements generalized Deming regression, Theil-Sen +regression and Passing-Bablock regression functions.") + (license license:lgpl2.0+))) + (define-public r-depmixs4 (package (name "r-depmixs4") @@ -3752,40 +4047,24 @@ Zucchini.") (define-public r-httpuv (package (name "r-httpuv") - (version "1.6.11") + (version "1.6.12") (source (origin (method url-fetch) (uri (cran-uri "httpuv" version)) (sha256 (base32 - "1xgf7q8ah9sbgbbjm9nwvry154g8i0gwfrn55npls9sihc59x9wb")) + "0x2y5yjj1ha99dv5c8j6pxm8fqhdcx010jl4rcw2qw20qaqp5ndi")) (modules '((guix build utils))) ;; Cannot unbundle http-parser, because it contains local ;; modifications. (snippet '(delete-file-recursively "src/libuv")))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unbundle-libuv - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/Makevars" - (("PKG_LIBS = ./libuv/.libs/libuv.a") - "PKG_LIBS = -luv") - (("\\$\\(SHLIB\\): libuv/.libs/libuv.a") - "$(SHLIB): ")) - (substitute* (find-files "src" "\\.cpp$|\\.h$") - (("\"libuv/include/uv\\.h\"") - "<uv.h>")) - ;; Fix https://github.com/rstudio/httpuv/issues/282 - (substitute* "src/http.cpp" - (("uv_pipe_init\\(pLoop, &pSocket->handle\\.pipe, true\\);") - "uv_pipe_init(pLoop, &pSocket->handle.pipe, 0);"))))))) (inputs (list libuv-for-r-httpuv zlib)) (propagated-inputs (list r-later r-promises r-r6 r-rcpp)) + (native-inputs (list pkg-config)) (home-page "https://github.com/rstudio/httpuv") (synopsis "HTTP and WebSocket server library for R") (description @@ -3801,24 +4080,26 @@ particularly easy to create complete web applications using httpuv alone.") (define-public r-httr2 (package (name "r-httr2") - (version "0.2.3") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "httr2" version)) (sha256 (base32 - "0gabjyv2699p7fb4225jsr2kkbarx1w01kha8ipqzwhjjl13481m")))) + "0jaajfr1hr6bzb1vz2nw2csl2l09kbq619vsq5yrlchcarpjv1fb")))) (properties `((upstream-name . "httr2"))) (build-system r-build-system) (propagated-inputs (list r-cli r-curl r-glue + r-lifecycle r-magrittr r-openssl r-r6 r-rappdirs r-rlang + r-vctrs r-withr)) (native-inputs (list r-knitr)) (home-page "https://httr2.r-lib.org") @@ -3948,13 +4229,13 @@ a list of p-values.") (define-public r-htmltools (package (name "r-htmltools") - (version "0.5.6") + (version "0.5.7") (source (origin (method url-fetch) (uri (cran-uri "htmltools" version)) (sha256 (base32 - "0rx0nmal1dca5xqj1pd17a85whsislhkyxxa4scmxgn38lkqxsqm")))) + "11mkk26pjck6r2w2nv6niy90c6l13g64zi01s3j4jgq634kdic7c")))) (build-system r-build-system) (propagated-inputs (list r-base64enc r-digest r-ellipsis r-fastmap r-rlang)) @@ -3992,15 +4273,31 @@ applications.") (define-public r-htmltable (package (name "r-htmltable") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (cran-uri "htmlTable" version)) (sha256 - (base32 "14qg65nw0bpikqs1hb1x7apzdzrnnl3ykjnks67kkp46v1skwzrs")))) + (base32 "039nnxnvw5l284n7w8q0hnplm0b58nwhsrpjfi5asg61f9hxv0va")))) (properties `((upstream-name . "htmlTable"))) (build-system r-build-system) + (arguments + (list + #:modules + '((guix build r-build-system) + (guix build minify-build-system) + (guix build utils)) + #:imported-modules + `(,@%r-build-system-modules + (guix build minify-build-system)) + #:phases + #~(modify-phases (@ (guix build r-build-system) %standard-phases) + (add-after 'unpack 'replace-bundled-minified-JavaScript + (lambda* (#:key inputs #:allow-other-keys) + (minify (assoc-ref inputs "js-jquery") + #:target + "inst/htmlwidgets/lib/jquery/jquery.min.js")))))) (propagated-inputs (list r-checkmate r-htmltools @@ -4010,7 +4307,15 @@ applications.") r-rstudioapi r-stringr)) (native-inputs - (list r-knitr)) + `(("esbuild" ,esbuild) + ("js-jquery" + ,(origin + (method url-fetch) + (uri "https://code.jquery.com/jquery-3.7.1.js") + (sha256 + (base32 + "1zicjv44sx6n83vrkd2lwnlbf7qakzh3gcfjw0lhq48b5z55ma3q")))) + ("r-knitr" ,r-knitr))) (home-page "http://gforge.se/packages/") (synopsis "Advanced tables for Markdown/HTML") (description @@ -4273,13 +4578,13 @@ jQuery.") (define-public r-jqr (package (name "r-jqr") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "jqr" version)) (sha256 (base32 - "0gys1b2fiafmm49mkj9iazziwql87s52rjx093ahn8g3v79amirh")))) + "0dlz9wwkgz06mnnmwaq4pr68x7zywp2iczfw0bjpzrgpbzkn2972")))) (properties `((upstream-name . "jqr"))) (build-system r-build-system) (inputs (list jq)) @@ -4591,7 +4896,7 @@ previewing themes in real time.") (inputs (list js-datatables js-selectize js-strftime js-highlight)) (native-inputs - `(("uglifyjs" ,node-uglify-js) + `(("esbuild" ,esbuild) ("gfortran" ,gfortran) ("js-bootstrap-accessibility" ,(origin @@ -4920,14 +5225,14 @@ in R and Shiny via the D3 visualization library.") (define-public r-wesanderson (package (name "r-wesanderson") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "wesanderson" version)) (sha256 (base32 - "09mr6p2jmqdjq27cz974w5hyxgn929zp9z3inhxqmmh1582fmdi2")))) + "0kjyz5mrkrirg2glf57b0rhxj2fdp1m6q8zx947y0jg1w425cbn9")))) (properties `((upstream-name . "wesanderson"))) (build-system r-build-system) (home-page "https://github.com/karthik/wesanderson") @@ -4962,13 +5267,13 @@ in a ggplot2 plot.") (define-public r-mbess (package (name "r-mbess") - (version "4.9.2") + (version "4.9.3") (source (origin (method url-fetch) (uri (cran-uri "MBESS" version)) (sha256 - (base32 "0cq4z7nx361rcw42jflrrdjbqs2q5973dlvhcr7i2wbkj3gzkwla")))) + (base32 "05ph8dwigwn0c4qg8smqhsjijvsvfawbzvm74mqpasi8qifz8nd3")))) (properties `((upstream-name . "MBESS"))) (build-system r-build-system) (propagated-inputs @@ -5259,14 +5564,14 @@ and/or higher-resolution databases.") (define-public r-maps (package (name "r-maps") - (version "3.4.1") + (version "3.4.1.1") (source (origin (method url-fetch) (uri (cran-uri "maps" version)) (sha256 (base32 - "0034114pdakxcx480b45qy9j4vq1v5ss961ssy92w4nqiqhsb4z6")))) + "06l58919kgks9adwzgfir44q6gnx46j3c7ah9c6d4dn36xsld7fk")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/maps") (synopsis "Draw geographical maps") @@ -5298,18 +5603,18 @@ coordinates.") (define-public r-rgooglemaps (package (name "r-rgooglemaps") - (version "1.4.5.3") + (version "1.5.1") (source (origin (method url-fetch) (uri (cran-uri "RgoogleMaps" version)) (sha256 (base32 - "02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi")))) + "197q5i2sky824dwq0x4hhrpkrsd1b6f9qg06mjlwb89mv4vnrzhl")))) (properties `((upstream-name . "RgoogleMaps"))) (build-system r-build-system) (propagated-inputs - (list r-png r-sp)) + (list r-png)) (home-page "https://cran.r-project.org/web/packages/RgoogleMaps") (synopsis "Use Google Maps in R") (description "This package serves two purposes: @@ -5903,6 +6208,30 @@ and Francois (2011, JSS), and the book by Eddelbuettel (2013, Springer); see performs global optimization by differential evolution.") (license license:gpl2+))) +(define-public r-rcppdist + (package + (name "r-rcppdist") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "RcppDist" version)) + (sha256 + (base32 "02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x")))) + (properties `((upstream-name . "RcppDist"))) + (build-system r-build-system) + (propagated-inputs (list r-rcpp r-rcpparmadillo)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/duckmayr/RcppDist") + (synopsis "Integration of additional probability distributions") + (description + "RcppDist provides a header-only C++ library with functions for +additional statistical distributions that can be called from C++ when writing +code using Rcpp or RcppArmadillo. Functions are available that return a +@code{NumericVector} as well as doubles, and for multivariate or matrix +distributions, Armadillo vectors and matrices.") + (license license:gpl2+))) + (define-public r-rcppml (package (name "r-rcppml") @@ -5951,14 +6280,14 @@ functions and compiled functions callable by other packages.") (define-public r-rcppthread (package (name "r-rcppthread") - (version "2.1.5") + (version "2.1.6") (source (origin (method url-fetch) (uri (cran-uri "RcppThread" version)) (sha256 (base32 - "0rra7qqbq2y4bj54x76559p5ghpj3r03c4vlpg96phwafwnc2y8m")))) + "1997ka0dd36d79fb4crqq0ar3bgzdv4mw5hd6v2pmq7555g0qiz9")))) (properties `((upstream-name . "RcppThread"))) (build-system r-build-system) (native-inputs (list r-r-rsp)) @@ -6013,6 +6342,27 @@ with Rcpp and retrieve an @code{XPtr} that can be passed to other C++ components.") (license license:expat))) +(define-public r-bb + (package + (name "r-bb") + (version "2019.10-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "BB" version)) + (sha256 + (base32 "0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04")))) + (properties `((upstream-name . "BB"))) + (build-system r-build-system) + (propagated-inputs (list r-quadprog)) + (home-page "https://publichealth.jhu.edu/") + (synopsis "Solving and optimizing large-scale nonlinear systems") + (description + "This package implements Barzilai-Borwein spectral methods for solving +nonlinear system of equations, and for optimizing nonlinear objective +functions subject to simple constraints.") + (license license:gpl3))) + (define-public r-bindr (package (name "r-bindr") @@ -6690,13 +7040,13 @@ most popular ones.") (define-public r-sp (package (name "r-sp") - (version "2.1-0") + (version "2.1-1") (source (origin (method url-fetch) (uri (cran-uri "sp" version)) (sha256 - (base32 "03041jp74z7l5vs1yzp145w331940kj9gf52jaxdninknikhc0vk")))) + (base32 "0ns0n4929db2g8wjmg8nscq286df4hxrv7gr4mj8giymm3icsd1d")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -6715,13 +7065,13 @@ print, summary, etc.") (define-public r-lambertw (package (name "r-lambertw") - (version "0.6.8") + (version "0.6.9") (source (origin (method url-fetch) (uri (cran-uri "LambertW" version)) (sha256 (base32 - "10lqsz44ndm8pl8z75j35fzd1s313q09rs9bs3lkym8d43k50pha")))) + "0260sa4w5i4vwxg13g3q0dmairsrbyaijr2gxlppy09nxriccwbr")))) (properties `((upstream-name . "LambertW"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 @@ -6840,13 +7190,13 @@ provides an interactive R manager and worker environment.") (define-public r-rmumps (package (name "r-rmumps") - (version "5.2.1-23") + (version "5.2.1-25") (source (origin (method url-fetch) (uri (cran-uri "rmumps" version)) (sha256 - (base32 "1mypmf9j9fzaldpv56bqng5yhyxfc55hvzd98d1dk6w1m1sncn09")))) + (base32 "15yn5i6v3xz90gimvaqgvp805cfpvr439y9wpckyvwn1iwp2745y")))) (properties `((upstream-name . "rmumps"))) (build-system r-build-system) (inputs (list zlib)) @@ -6928,6 +7278,57 @@ T distribution. There is only one exported function, @code{e_trunct}, which should be seen for details.") (license license:expat))) +(define-public r-evd + (package + (name "r-evd") + (version "2.3-6.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "evd" version)) + (sha256 + (base32 "0wc95hfj0gwkyghipdrhwd3s6q2agh9x2wy6y7dr6mjw7wnmjb36")))) + (properties `((upstream-name . "evd"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=evd") + (synopsis "Functions for extreme value distributions") + (description + "This package extends simulation, distribution, quantile and density +functions to univariate and multivariate parametric extreme value distributions, +and provides fitting functions which calculate maximum likelihood estimates for +univariate and bivariate maxima models, and for univariate and bivariate +threshold models.") + (license license:gpl3))) + +(define-public r-evmix + (package + (name "r-evmix") + (version "2.12") + (source + (origin + (method url-fetch) + (uri (cran-uri "evmix" version)) + (sha256 + (base32 "02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf")))) + (properties `((upstream-name . "evmix"))) + (build-system r-build-system) + (propagated-inputs + (list r-gsl + r-mass + r-sparsem)) + (home-page "http://www.math.canterbury.ac.nz/~c.scarrott/evmix.shtml") + (synopsis + "Extreme value threshold estimation and uncertainty quantification") + (description + "This package provides the usual distribution functions, maximum likelihood +inference and model diagnostics for univariate stationary extreme value mixture +models. Also, there are provided kernel density estimation including various +boundary corrected kernel density estimation methods and a wide choice of kernels, +with cross-validation likelihood based bandwidth estimator. Reasonable +consistency with the base functions in the evd package is provided, so that users +can safely interchange most code.") + (license license:gpl3))) + (define-public r-excelr (package (name "r-excelr") @@ -7400,14 +7801,14 @@ median test.") (define-public r-ksamples (package (name "r-ksamples") - (version "1.2-9") + (version "1.2-10") (source (origin (method url-fetch) (uri (cran-uri "kSamples" version)) (sha256 (base32 - "1zs22p68d6320kcylisnk0b5wmpapxkyz15py09czxzw7npw8gms")))) + "13ap5ggid3w3s3k5mzz1ir31j96hjg6msa2s1hcy66zv242wqrid")))) (properties `((upstream-name . "kSamples"))) (build-system r-build-system) (propagated-inputs @@ -7543,14 +7944,14 @@ these progress updates.") (define-public r-lava (package (name "r-lava") - (version "1.7.2.1") + (version "1.7.3") (source (origin (method url-fetch) (uri (cran-uri "lava" version)) (sha256 (base32 - "0bpg75w0ri1mkf7cw9gbw1fjpy4mh9h48k019y772xjfgrf1yayl")))) + "023av1mz4hr1lqv8cpbx0j1y3c7ljyns35rm838c618b6pqps22f")))) (build-system r-build-system) (propagated-inputs (list r-future-apply r-numderiv r-progressr r-squarem r-survival)) @@ -7566,13 +7967,13 @@ variable models.") (define-public r-drat (package (name "r-drat") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "drat" version)) (sha256 - (base32 "191yxlj9jccakmz27g7n9izfcy19kj3fgnw4w6zl9iq66787qpm6")))) + (base32 "13v7dj2688ix6j9nzhvf8q9ynfihwzkppfdjkis6q1r5m4nikya3")))) (properties `((upstream-name . "drat"))) (build-system r-build-system) (native-inputs (list r-simplermarkdown)) @@ -7730,6 +8131,33 @@ a variety of functions for the manipulation and analysis of arbitrarily dimensioned arrays.") (license license:gpl2))) +(define-public r-magicaxis + (package + (name "r-magicaxis") + (version "2.2.14") + (source + (origin + (method url-fetch) + (uri (cran-uri "magicaxis" version)) + (sha256 + (base32 "1gqnivn6qjmf7axdi0pff6a40clklbipcr6qvm6ivzqbqhpbcb7v")))) + (properties `((upstream-name . "magicaxis"))) + (build-system r-build-system) + (propagated-inputs + (list r-celestial + r-mapproj + r-mass + r-plotrix + r-rann + r-sm)) + (home-page "https://cran.r-project.org/package=magicaxis") + (synopsis "Scientific plotting with minor-tick and log minor-tick support") + (description + "This package provides functions to make useful (and pretty) plots for +scientific plotting. Additional plotting features are added for base plotting, +with particular emphasis on making attractive log axis plots.") + (license license:gpl3))) + (define-public r-rmysql (package (name "r-rmysql") @@ -7807,25 +8235,25 @@ to access PostgreSQL database systems.") (define-public r-rpostgres (package (name "r-rpostgres") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) (uri (cran-uri "RPostgres" version)) (sha256 (base32 - "15y732ylnq1h1hw16nh1ichnygh3l76h23m2893avpaipa689zvh")))) + "1ld03r9rzfxx6gzy3yn8jhzp9sp2qd9wydpxz955ggjxwdklpvnr")))) (properties `((upstream-name . "RPostgres"))) (build-system r-build-system) (inputs (list postgresql)) (propagated-inputs (list r-bit64 r-blob + r-cpp11 r-dbi r-hms r-lubridate r-plogr - r-rcpp r-withr)) (native-inputs (list pkg-config r-knitr)) @@ -8158,14 +8586,14 @@ for certain use cases.") (define-public r-ggrepel (package (name "r-ggrepel") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (cran-uri "ggrepel" version)) (sha256 (base32 - "0p00kb1x3q0krk5g8mmwqknnjlsznqs4i7mlfq1dp17fxpia1sxr")))) + "0gngsx87rcqijdr684bgpnazdlz3vj4brzw0fic0jdsrf1rb9aw1")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-rcpp r-rlang r-scales r-withr)) @@ -8440,13 +8868,13 @@ distances.") (define-public r-useful (package (name "r-useful") - (version "1.2.6") + (version "1.2.6.1") (source (origin (method url-fetch) (uri (cran-uri "useful" version)) (sha256 (base32 - "0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1")))) + "1gb9hqvbm6pr56dfqlsgz26lan7xargfsm8jpdja18mpgli2gyvc")))) (properties `((upstream-name . "useful"))) (build-system r-build-system) (propagated-inputs @@ -8623,6 +9051,30 @@ distribution with mean equal to @code{mean} and standard deviation equal to functions, as well as a random generation function.") (license license:gpl2))) +(define-public r-truncdist + (package + (name "r-truncdist") + (version "1.0-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "truncdist" version)) + (sha256 + (base32 "02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q")))) + (properties `((upstream-name . "truncdist"))) + (build-system r-build-system) + (propagated-inputs (list r-evd)) + (home-page "https://cran.r-project.org/package=truncdist") + (synopsis "Truncated random variables") + (description + "This package provides a collection of tools to evaluate probability density +functions, cumulative distribution functions, quantile functions and random +numbers for truncated random variables. These functions are provided to also +compute the expected value and variance. @acronym{Q-Q, quantile–quantile} plots +can be produced. All the probability functions in the stats, stats4 and evd +packages are automatically available for truncation.") + (license license:gpl2+))) + (define-public r-rsolnp (package (name "r-rsolnp") @@ -9206,13 +9658,13 @@ script.") (define-public r-aricode (package (name "r-aricode") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) (uri (cran-uri "aricode" version)) (sha256 (base32 - "1w5jnql49f0wd5h4b89l69s7qldp7qm90p4jm0j4kz9w0vvm2kjz")))) + "02nrw66jfpzf6dy0zy21sbdjxjc8c11iv9fkjqj5akzb7wskk9qh")))) (properties `((upstream-name . "aricode"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-rcpp)) @@ -9381,6 +9833,40 @@ of merit, ordering functions, and enhanced versions of @code{pairs} and @code{parcoord} which color panels according to their merit level.") (license license:gpl2+))) +(define-public r-webchem + (package + (name "r-webchem") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "webchem" version)) + (sha256 + (base32 "06b9i9jipg564zyw4gkgiidz7501rlp40hxm4z3k5mzy148lr5vq")))) + (properties `((upstream-name . "webchem"))) + (build-system r-build-system) + (propagated-inputs (list r-base64enc + r-data-tree + r-dplyr + r-httr + r-jsonlite + r-purrr + r-rlang + r-rvest + r-stringr + r-tibble + r-xml2)) + (native-inputs (list r-knitr)) + (home-page "https://docs.ropensci.org/webchem/") + (synopsis "Chemical information from the web") + (description + "This package interacts with a suite of web services for chemical +information. Sources include: Alan Wood's Compendium of Pesticide Common +Names, Chemical Identifier Resolver, ChEBI, Chemical Translation Service, +ChemSpider, ETOX, Flavornet, NIST Chemistry WebBook, OPSIN, PubChem, SRS, +Wikidata.") + (license license:expat))) + (define-public r-webshot (package (name "r-webshot") @@ -9442,13 +9928,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.40") + (version "0.41") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "1xvngh0kbd87cl39bzmjx5i57pmxik9gw50li8dh42j438cnma8y")))) + (base32 "00ivgr557ja8l33lvawrivfhgj1xbjmdi4dj07zybwa1y6wc6x13")))) (build-system r-build-system) (properties ;; knitr itself depends on xfun @@ -9463,14 +9949,14 @@ packages maintained by Yihui Xie.") (define-public r-utf8 (package (name "r-utf8") - (version "1.2.3") + (version "1.2.4") (source (origin (method url-fetch) (uri (cran-uri "utf8" version)) (sha256 (base32 - "0iv3ppy7sddzl4sm3qlghpc64k6zx5j0jzcia8xx8jhzb638da60")))) + "0zbv2s5dkzxim3ydyk12479m28f68mak9m50v396in4wpm5q53s1")))) (build-system r-build-system) (native-inputs (list r-knitr r-rmarkdown)) ; for vignettes @@ -9528,14 +10014,14 @@ estimated from a given sample.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "1hm5rw85ln0mk1mfmhgygnhjgs2lyc74cq12ddc41d78rl6j5p4k")))) + "1j01s27ybzn60p17y7k5n5dzsmjqhgjy634sv0dx4977aqiik04a")))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-lifecycle r-rlang)) @@ -9656,14 +10142,14 @@ their own grammars and easily expose them in R packages.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.47") + (version "0.48") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "1py5i4h2vpicl79ypxw061p9byxvj703z1rh8l2shfpq7wqwhxbr")))) + "15bnb4fxdzapgj9ws3rfbcxwdzwbq8h5yy4d1db0m9c1lygrh2qx")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) @@ -9738,6 +10224,43 @@ implementation of an approximate nearest neighbor search using hierarchical @acronym{NSW, Navigable Small World} graphs.") (license license:asl2.0))) +(define-public r-nestedcv + (package + (name "r-nestedcv") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "nestedcv" version)) + (sha256 + (base32 "0jpg4il1niyizfq8kkk391x7anhp2s38mrfypa86skr08ca46zss")))) + (properties `((upstream-name . "nestedcv"))) + (build-system r-build-system) + (propagated-inputs (list r-caret + r-data-table + r-doparallel + r-foreach + r-ggplot2 + r-glmnet + r-matrixstats + r-matrixtests + r-proc + r-rfast + r-rlang)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/myles-lewis/nestedcv") + (synopsis "Nested cross-validation with glmnet and caret") + (description + "This package implements nested cross-validation applied to the +@code{glmnet} and @code{caret} packages. With glmnet this includes +cross-validation of elastic net alpha parameter. A number of feature +selection filter functions (t-test, Wilcoxon test, ANOVA, Pearson/Spearman +correlation, random forest, ReliefF) for feature selection are provided and +can be embedded within the outer loop of the nested CV. Nested CV can be also +be performed with the @code{caret} package giving access to the large number +of prediction methods available in @code{caret}.") + (license license:expat))) + (define-public r-network (package (name "r-network") @@ -9760,6 +10283,27 @@ implementation of an approximate nearest neighbor search using hierarchical supports arbitrary vertex/edge/graph attributes.") (license license:gpl2+))) +(define-public r-nistunits + (package + (name "r-nistunits") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "NISTunits" version)) + (sha256 + (base32 "0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a")))) + (properties `((upstream-name . "NISTunits"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=NISTunits") + (synopsis "Fundamental physical constants and unit conversions") + (description + "This package provides fundamental physical constants (quantity, value, +uncertainty, unit) for @acronym{SI, International System of Units} and non-SI +units, plus unit conversions based on the data from @acronym{NIST, National +Institute of Standards and Technology}, USA.") + (license license:gpl3+))) + (define-public r-stabs (package (name "r-stabs") @@ -9926,15 +10470,16 @@ rules with R.") (define-public r-leaflet-providers (package (name "r-leaflet-providers") - (version "1.13.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "leaflet.providers" version)) (sha256 - (base32 "1jrfhqmr735maa0mr3ia7441vzd3q95msgicclzdpglmk4aqhhhh")))) + (base32 "0rl69bfx2l10x80rl8cppqch3fnd05sk9w29h8589jc8h3ffmkn5")))) (properties `((upstream-name . "leaflet.providers"))) (build-system r-build-system) + (propagated-inputs (list r-htmltools)) (home-page "https://github.com/rstudio/leaflet.providers") (synopsis "Leaflet map tile providers") (description @@ -9951,13 +10496,13 @@ information between package updates.") (define-public r-leaflet (package (name "r-leaflet") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (cran-uri "leaflet" version)) (sha256 - (base32 "0k0zplbhmvld6q1id17s827z1230kvnz16c4hlvp6jn9g26yy0dq")) + (base32 "1gfsf7bsmp418zv4gpk5i1xg5vvgqwpdkznnvj5x0mk4rcqk1i81")) (snippet '(for-each delete-file @@ -10348,13 +10893,13 @@ multivariate distributions.") (define-public r-fbasics (package (name "r-fbasics") - (version "4022.94") + (version "4032.96") (source (origin (method url-fetch) (uri (cran-uri "fBasics" version)) (sha256 (base32 - "1mka9avcdkq4sj40xa15hrjm1f8ppzbvw3yzxbhkbaw9c130qfy8")))) + "14461d6ac8hcn1x3srh45a4s5imafqb0xy8bn5l6d0qwhw4njmg1")))) (properties `((upstream-name . "fBasics"))) (build-system r-build-system) (propagated-inputs @@ -10475,14 +11020,14 @@ interface.") (define-public r-trend (package (name "r-trend") - (version "1.1.5") + (version "1.1.6") (source (origin (method url-fetch) (uri (cran-uri "trend" version)) (sha256 (base32 - "12xswr925jjbkdccjiigkr6a44jmgvzwvnizciv6rr3mnklv6n66")))) + "0991fp6kjk704rfg0l1m7kwbck9fj1rg27zy4llm5ikczd55w05h")))) (build-system r-build-system) (propagated-inputs (list r-extradistr)) @@ -10568,6 +11113,29 @@ the Singular Value Decomposition in R (Beaton et al 2014) the matrix exponential and logarithm, and the determinant.") (license license:gpl2))) +(define-public r-complexupset + (package + (name "r-complexupset") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "ComplexUpset" version)) + (sha256 + (base32 "1sk4v5kc2wkgfaws0hjlp30mngm907r5gz1iglf68j46lfs9jbsv")))) + (properties `((upstream-name . "ComplexUpset"))) + (build-system r-build-system) + (propagated-inputs (list r-colorspace r-ggplot2 r-patchwork r-scales)) + (native-inputs (list r-knitr)) + (home-page "https://github.com/krassowski/complex-upset") + (synopsis "Create complex UpSet plots using ggplot2 components") + (description + "@code{UpSet} plots are an improvement over Venn Diagram for set overlap +visualizations. Striving to bring the best of the @code{UpSetR} and ggplot2, +this package offers a way to create complex overlap visualisations, using +simple and familiar tools.") + (license license:expat))) + (define-public r-phontools (package (name "r-phontools") @@ -10685,14 +11253,14 @@ powerful and convenient features.") (define-public r-heatmaply (package (name "r-heatmaply") - (version "1.4.2") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "heatmaply" version)) (sha256 (base32 - "0zgaqmbc1nha38c8kx5xdjdjbwmykrf2acq8ydki8dqixv6b34la")))) + "1crdm7avxv3zx59byz2fqbcw95728crwf9cckjb9gal1065xv95c")))) (build-system r-build-system) (propagated-inputs (list r-assertthat @@ -10968,14 +11536,14 @@ local smoothers and many more.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.6.1") + (version "1.6.2") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "00bjq3zpxhd6yjq3jwizgiyzp2qf557ms6mhlz74d0wcm0l3vd72")) + "0227ry366v9kmksa4vyjmhix0jbl894gdc6gckg209wna35fn20p")) (modules '((guix build utils))) (snippet '(begin @@ -12062,20 +12630,20 @@ JavaScript library) and interact with the igraph package.") (define-public r-data-tree (package (name "r-data-tree") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "data.tree" version)) (sha256 (base32 - "0pizmx2312zsym4m42b97q2184bg3hibvbdrblcga05xln84qrs0")))) + "0qxd1g159phc6f18iddjljdg96sh09w63xqawjwbwyhg4blm9ddh")))) (properties `((upstream-name . "data.tree"))) (build-system r-build-system) (propagated-inputs (list r-r6 r-stringi)) (native-inputs - (list r-knitr)) + (list r-knitr r-rmarkdown)) (home-page "https://github.com/gluc/data.tree") (synopsis "General purpose hierarchical data structure") (description @@ -12122,14 +12690,14 @@ automatically translated to the equivalent, but usually much faster, (define-public r-collapsibletree (package (name "r-collapsibletree") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "collapsibleTree" version)) (sha256 (base32 - "0b65pbp1wnpsrayqi630ds4r98jvcvynnlp6wxdqrnnr9nzw5343")) + "1i5nmw5w7m8xdgxzim8z8n4w321f42isxbvvajl8ii59pg7drilq")) (snippet '(begin ;; Delete minified JavaScript file @@ -12215,14 +12783,14 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (define-public r-rastervis (package (name "r-rastervis") - (version "0.51.5") + (version "0.51.6") (source (origin (method url-fetch) (uri (cran-uri "rasterVis" version)) (sha256 (base32 - "18bsrw629p4pkyhrpjmiyhq73w882bhgpwmkih0gjnw3ywwgx7rs")))) + "12cl201gwah0bn14ji4nbygayd77w5fck9zkcikhrda5s0chvgb1")))) (properties `((upstream-name . "rasterVis"))) (build-system r-build-system) (propagated-inputs @@ -12395,14 +12963,14 @@ always locate the files relative to your project root.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "0r9rycwin4yv5k2n1lzybwblb8529yhw5xnl46if6yvxm3bcra9s")))) + "01j2dr93r5a18irwbm6hlh2v0s2rc5bl6dcmds1m64c1rli8j3cd")))) (build-system r-build-system) (arguments (list @@ -12710,14 +13278,14 @@ clustering.") (define-public r-factominer (package (name "r-factominer") - (version "2.8") + (version "2.9") (source (origin (method url-fetch) (uri (cran-uri "FactoMineR" version)) (sha256 (base32 - "0lgqbw7534wadkdv7zh1y5nanl72jys070qydznmaj2cmvvqd460")))) + "0c2j3xid85qffsdjwndqiwihclzw6k1nkbpzcc7whhd6k79rh9l8")))) (properties `((upstream-name . "FactoMineR"))) (build-system r-build-system) (propagated-inputs @@ -12783,17 +13351,41 @@ packages. It contains also functions for simplifying some clustering analysis steps and provides ggplot2-based elegant data visualization.") (license license:gpl2))) +(define-public r-fancova + (package + (name "r-fancova") + (version "0.6-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "fANCOVA" version)) + (sha256 + (base32 "04mw0blgpwdk6wdg8llrig43psgc0vb42cbimvzbnym8v503dsn3")))) + (properties `((upstream-name . "fANCOVA"))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/package=fANCOVA") + (synopsis "Nonparametric analysis of covariance") + (description + "This package provides a collection of R functions to perform +nonparametric analysis of covariance for regression curves or surfaces. +Testing the equality or parallelism of nonparametric curves or surfaces is +equivalent to analysis of variance (ANOVA) or analysis of covariance (ANCOVA) +for one-sample functional data. Three different testing methods are available +in the package, including one based on L-2 distance, one based on an ANOVA +statistic, and one based on variance estimators.") + (license license:gpl3))) + (define-public r-fansi (package (name "r-fansi") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "fansi" version)) (sha256 (base32 - "17y4m4yy8d6j6rlql2bpigcyn6yfv2g2aaaj96xjp4j0di722qri")))) + "1xi35schbz42kjwjzhjqj12nd053962mgnk6qd9k5m5zgwsww5n6")))) (build-system r-build-system) (native-inputs (list r-knitr)) ; for vignettes @@ -13006,14 +13598,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") (define-public r-rbibutils (package (name "r-rbibutils") - (version "2.2.15") + (version "2.2.16") (source (origin (method url-fetch) (uri (cran-uri "rbibutils" version)) (sha256 (base32 - "1kjk953xqakbxb2z8rcfcni8b9vi1m27n0ksdddil6x7q03flxb5")))) + "1brab8vzzf44d9rpp9k3r2ajvrs09cbwf4ak014iffzn8yx0yz4w")))) (properties `((upstream-name . "rbibutils"))) (build-system r-build-system) (home-page "https://geobosh.github.io/rbibutils/") @@ -13028,14 +13620,14 @@ implemented in bibutils.") (define-public r-rdpack (package (name "r-rdpack") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "0xy8w3law1dn53f1gv4jd637pwssr928pvgchpbrpsqz8ghv4kad")))) + "02i21i85pb5aim529byjwhmyyz9jd82mi4j26a3kay0pcn6djxba")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs @@ -13054,14 +13646,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "0dfk1didy5lfh07chqfwlrdlrib7a5na65rb71ipnxlhbiwbaj09")))) + "0z3phawwxj4h1pwzw8lsl6pnypr77b329mg6r2qnzmj0j81585z5")))) (build-system r-build-system) (propagated-inputs (list r-openssl r-r6 r-ragg r-uuid r-xml2 r-zip)) @@ -13291,14 +13883,14 @@ Decomposition in R (Beaton et al 2014) <doi:10.1016/j.csda.2013.11.006>.") (define-public r-insight (package (name "r-insight") - (version "0.19.5") + (version "0.19.6") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0794p9dbclj1d7fcka6sqm8jzqsc58hxmmsksd3hmzv0qz49yhkg")))) + "1gnxhszwccmvjarq47p7s09jrkhvd8zkz632ysxz6dgxfpqn9zqh")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -13450,14 +14042,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1jdikfiswxi63vj9xr9a24p8fv50h91pvhv3xllgwwfbs1wqyq4x")))) + "1dlsag1y3s7d5lp1dh2kxf1qax4r9xvxycpmxl64gkr50dk13bam")))) (build-system r-build-system) (propagated-inputs (list r-data-table @@ -13528,16 +14120,16 @@ contains or can be specified by the user.") (define-public r-wrs2 (package (name "r-wrs2") - (version "1.1-4") + (version "1.1-5") (source (origin (method url-fetch) (uri (cran-uri "WRS2" version)) (sha256 (base32 - "1838wy59cqd65s0bw6c24xcvx7zflypqcbgs35l9s2fj87vw2hdc")))) + "028xs424m879siaf3rrhzl1dacp9j7wcl5fpikyx2n0cc7anq4vq")))) (properties `((upstream-name . "WRS2"))) (build-system r-build-system) - (propagated-inputs (list r-mass r-mc2d r-plyr r-reshape)) + (propagated-inputs (list r-mass r-plyr r-reshape)) (native-inputs (list r-knitr)) (home-page "https://r-forge.r-project.org/projects/psychor/") (synopsis "Collection of robust statistical methods") @@ -13770,14 +14362,14 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.19") + (version "4.6.20") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "14hvbhf9zamqkjhr9jd8zjpm9xlc8hwqj04gy6ln32n2hzqqqr6v")))) + "08nsl9xzyi2k7xkwa9mn91fn77ji0z9z5lm388pfdmydbfmpy2ks")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs @@ -13879,14 +14471,14 @@ containing one or more SNPs that evolved under directional selection.") (define-public r-proc (package (name "r-proc") - (version "1.18.4") + (version "1.18.5") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "0lqar1lbm461in4jb9rkdnpccl8lshrhig2qxr892m91mdxym46m")))) + "129cnh3kh9sr42nc7n9f14kr9svi3501834x40njynnzlr0wi4sm")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs @@ -14081,14 +14673,14 @@ from the @code{stats} package (plus some extra parameters).") (define-public r-cmplot (package (name "r-cmplot") - (version "4.4.1") + (version "4.4.3") (source (origin (method url-fetch) (uri (cran-uri "CMplot" version)) (sha256 (base32 - "1y6fs3b7jps4ah0lpniq0ip3x426acql1aibx95pvfykgc2b2hvm")))) + "0mkjpmwpd0izczp8jgfcfxw9i4qv82aj1xyhzsxgdxnjdd7ark66")))) (properties `((upstream-name . "CMplot"))) (build-system r-build-system) (home-page "https://github.com/YinLiLin/CMplot") @@ -14106,14 +14698,14 @@ visualization and candidate genes around SNPs.") (define-public r-precrec (package (name "r-precrec") - (version "0.14.2") + (version "0.14.4") (source (origin (method url-fetch) (uri (cran-uri "precrec" version)) (sha256 (base32 - "159vxdnp7vi6na3cji1rbsr1311ciqn1aldg0nwnd6sb3hgb14w2")))) + "03hvp5h7fz4v2aswxim0mqgj9rdrhnk5xqz212161kpcrw6m67z8")))) (properties `((upstream-name . "precrec"))) (build-system r-build-system) (propagated-inputs @@ -14553,13 +15145,13 @@ subsequence} (LCS) using a dynamic programming algorithm.") (define-public r-mosaiccore (package (name "r-mosaiccore") - (version "0.9.2.1") + (version "0.9.4.0") (source (origin (method url-fetch) (uri (cran-uri "mosaicCore" version)) (sha256 - (base32 "1yns15yxr6215xf9qsxfvl24a9zvh1chw49n31dql7fy1zr1dkmp")))) + (base32 "0v3xhv6yfk1hc6a40jjgp6vvq102qa1l4n787pfywx6jhzbhamp2")))) (properties `((upstream-name . "mosaicCore"))) (build-system r-build-system) (propagated-inputs @@ -14604,21 +15196,18 @@ haven package.") (define-public r-ggformula (package (name "r-ggformula") - (version "0.10.4") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "ggformula" version)) (sha256 - (base32 "07d9sq0dqi0g5x9h58icfk1f4hgg1xz4mhbp2z2rxg9qgs74fvdj")))) + (base32 "0vbpivyxms46px3wqkbl1wq199mqdxq94gsiplv4i7lz0lzghsfm")))) (build-system r-build-system) (propagated-inputs - (list r-ggforce - r-ggplot2 + (list r-ggplot2 r-ggridges - r-ggstance r-labelled - r-magrittr r-mosaiccore r-rlang r-scales @@ -14638,13 +15227,13 @@ while providing the intuitive capabilities of @code{r-ggplot2}.") (define-public r-mosaicdata (package (name "r-mosaicdata") - (version "0.20.3") + (version "0.20.4") (source (origin (method url-fetch) (uri (cran-uri "mosaicData" version)) (sha256 - (base32 "1s97yq24z7yhzmx0dpspfadpd8hndyhn7aiw0nslwrhvilhwa409")))) + (base32 "0y6ii234paknak0p8cm5wcjia4s4wh7iixjbbvdgp0w17c05dckh")))) (properties `((upstream-name . "mosaicData"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/mosaicData/") @@ -14657,14 +15246,14 @@ used to teach mathematics, statistics, computation and modeling.") (define-public r-raster (package (name "r-raster") - (version "3.6-23") + (version "3.6-26") (source (origin (method url-fetch) (uri (cran-uri "raster" version)) (sha256 (base32 - "0ng18sfw9kmhi48j8b5bzgh2ylvf5wi2zidn66k4vqaxl5s6hidz")))) + "14jmpm6rlhya192ckyjlwhais6fgc16gb600wycsdba6b8i7fmy6")))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-sp r-terra)) @@ -14679,13 +15268,13 @@ Processing of very large files is supported.") (define-public r-mosaic (package (name "r-mosaic") - (version "1.8.4.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (cran-uri "mosaic" version)) (sha256 - (base32 "12kpkb7vm54na9hjjkvzw6gm5plx0m6i0l9kihz2r30zanfx5jca")))) + (base32 "1dydqawljv5l9lmhdrhmr7wh3q1c2mnc61gc99jr0jbb1bmls327")))) (build-system r-build-system) (propagated-inputs (list r-dplyr @@ -14698,6 +15287,7 @@ Processing of very large files is supported.") r-mosaicdata r-purrr r-rlang + r-tibble r-tidyr)) (native-inputs (list r-knitr)) @@ -15293,14 +15883,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "1al1apw9vgdl6ccm4nnpqpnya0pi2cfp62xii7dwnv7pd47m8fp8")))) + "13j55dwvcqbyqgx0c6vj9knqrz25pc2xz19f22b2gm0p307d3z6q")))) (properties '((updater-extra-inputs . ("imagemagick")))) (build-system r-build-system) @@ -15441,13 +16031,13 @@ were influenced by the drake R package by Will Landau (2018) (define-public r-targets (package (name "r-targets") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "targets" version)) (sha256 (base32 - "146ylh76sc5vzfgh2xp5mfpgdxvm3j9b2hzh0wqgih6d9d11n8pk")))) + "0zlbq658zxflz2fk9pksbjx3r5dmay4411byl33gkp3rnynvchgh")))) (properties `((upstream-name . "targets"))) (build-system r-build-system) (propagated-inputs (list r-base64url @@ -15617,13 +16207,13 @@ estimation problem.") (define-public r-quickjsr (package (name "r-quickjsr") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (cran-uri "QuickJSR" version)) (sha256 (base32 - "1n09jivw1qvsniyap0ki5ablvkwgggh981hcs7k5wx3lp3qxxlnk")))) + "14wq7qymzrdbg3mhm4gk3vx1dr4yx8di8i2b10as4knnzr1w4q9i")))) (properties `((upstream-name . "QuickJSR"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-r6 r-rcpp)) @@ -15884,14 +16474,14 @@ the differences were not significantly different.") (define-public r-emmeans (package (name "r-emmeans") - (version "1.8.8") + (version "1.8.9") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "1v5svzcvkssf3ch10cbi0pdw2xkgdhn8i1d1cqjawwgzmq61c62j")))) + "1ipzs88inyif52rbifqwrfv8vwxw8fwq2hb489vgws8xznhz034a")))) (build-system r-build-system) (propagated-inputs (list r-estimability r-mvtnorm r-numderiv)) @@ -16092,19 +16682,20 @@ models.") (define-public r-glmmtmb (package (name "r-glmmtmb") - (version "1.1.7") + (version "1.1.8") (source (origin (method url-fetch) (uri (cran-uri "glmmTMB" version)) (sha256 (base32 - "1wf1fn2gf500y2r4d84p5gj3b1fj2cmyw2lp366r4nm6p3iyd2x3")))) + "055xi424cd1glhbv8a8v9cm79zq9skb7230nq0xm90iggb1zcj22")))) (properties `((upstream-name . "glmmTMB"))) (build-system r-build-system) (propagated-inputs (list r-lme4 r-matrix + r-mgcv r-nlme r-numderiv r-rcppeigen @@ -16152,14 +16743,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.10.5") + (version "0.10.8") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "1bwcdz2iah6ya1p9ykbj5ybvzwlq9spv6mq3fn68cckymg0hs76r")))) + "0zvj0bzbqcy35jcg1s6b1wqbz7rbajzvjm74aks4j6iq4grh4d2j")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) @@ -16178,14 +16769,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "0cw9j08qqck1gbfqsfyl3nb4rgi5cwsydxazqw8ppfnjqzw3nwmp")))) + "1wp9q2zqygxg2ibmrwdh614sdxqhj80rx0ixbz8kxld99b37ixl7")))) (build-system r-build-system) (propagated-inputs (list r-insight)) @@ -17068,14 +17659,14 @@ parallel calculations across cluster nodes.") (define-public r-chk (package (name "r-chk") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) (uri (cran-uri "chk" version)) (sha256 (base32 - "1fj9rqvxv0s2j5sikmkn18280w4194kx5hlkah9z0hr4vnzgkrh7")))) + "19q5ylkgrkdmnzg2df1lnrp2arbfzwfz4rbrr16j9ih2237kvd7r")))) (properties `((upstream-name . "chk"))) (build-system r-build-system) (propagated-inputs @@ -18031,13 +18622,13 @@ pairs (Selesnick 2001, 2002).") (define-public r-word2vec (package (name "r-word2vec") - (version "0.3.4") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "word2vec" version)) (sha256 (base32 - "0qj39vms6zgwb8lpmfkppayizdmhakic3pkacglary3ain61vnsk")))) + "14ba0cj430d02bd6fay3nl4ldwqyj77iwjm4gzgdc0f6sx597iiq")))) (properties `((upstream-name . "word2vec"))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-rcppprogress)) @@ -18795,13 +19386,13 @@ handling.") (define-public r-gridpattern (package (name "r-gridpattern") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "gridpattern" version)) (sha256 - (base32 "19g8mnc5y68w9pybckmcvr56qkwbs5z9z6zhj0bxmlprwanq4f8x")))) + (base32 "1v7xfgbnrr4v3arr7nm0663aywn47xb89sd0rn9s9dcz7r50aa2i")))) (properties `((upstream-name . "gridpattern"))) (build-system r-build-system) (propagated-inputs @@ -18873,14 +19464,14 @@ PostScript pictures in R plots.") (define-public r-grimport2 (package (name "r-grimport2") - (version "0.2-0") + (version "0.3-1") (source (origin (method url-fetch) (uri (cran-uri "grImport2" version)) (sha256 (base32 - "19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1")))) + "1lj58z6yc2p6ns27fkgh11ac90bcihi65hf62gxpsylcn5dilsi1")))) (properties `((upstream-name . "grImport2"))) (build-system r-build-system) (propagated-inputs @@ -19699,14 +20290,14 @@ to throw errors if they aren't in the right form.") (define-public r-dotcall64 (package (name "r-dotcall64") - (version "1.0-2") + (version "1.1-0") (source (origin (method url-fetch) (uri (cran-uri "dotCall64" version)) (sha256 (base32 - "1b546z9r26q4xpr17gy2wzfych52q17sxvzydpqfp9dyxf575iz0")))) + "1ibh2f2vcv30k1c919diw6qdmhxmvkl83k3396vy3xigbcny711l")))) (properties `((upstream-name . "dotCall64"))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -19723,18 +20314,18 @@ This makes it a convenient and fast interface to C/C++ and Fortran code.") (define-public r-spam (package (name "r-spam") - (version "2.9-1") + (version "2.10-0") (source (origin (method url-fetch) (uri (cran-uri "spam" version)) (sha256 - (base32 "1nvx965vxzs697k9m2l40a15bykflksn9bwa4py1p2wqg6922bn3")))) + (base32 "0ydc513jg7phzdqg8jp7210ayrrmxq91jafqzx8z1v0172i8d73i")))) (build-system r-build-system) (propagated-inputs - (list r-dotcall64)) + (list r-dotcall64 r-rcpp)) (native-inputs - (list gfortran r-knitr)) + (list gfortran r-knitr r-r-rsp)) (home-page "https://www.math.uzh.ch/pages/spam/") (synopsis "Sparse matrix algebra") (description @@ -21388,14 +21979,14 @@ numbers from ZIP and ZINB distributions.") (define-public r-nor1mix (package (name "r-nor1mix") - (version "1.3-0") + (version "1.3-2") (source (origin (method url-fetch) (uri (cran-uri "nor1mix" version)) (sha256 (base32 - "1817wcvlmxs70vs4db0jkxd7i037744zz8ay3c2a9949z29fxr4w")))) + "0252kqhdsp374isc59pm1c6dmsb16jibpnsp1bpyh4k5mg73cdj6")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/nor1mix/") (synopsis "Normal (1-d) mixture models") @@ -21699,14 +22290,14 @@ can be used with function approximation, eligibility traces (Singh & Sutton, (define-public r-lemon (package (name "r-lemon") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (cran-uri "lemon" version)) (sha256 (base32 - "0v1kbyk64yzsk92h6yq03kp9alc9632qprznsws61r8firiskim5")))) + "1r33n7bkfhjpyi23j7gsi387qvyazcy9b912dsd3vg2yqir8s26p")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 @@ -22153,14 +22744,14 @@ tessellation.") (define-public r-wk (package (name "r-wk") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "wk" version)) (sha256 (base32 - "1300x3rfb4fk11mrxzs0vy6aj4nbsvd7zisvdxxhrdibmz38l1xa")))) + "1nmrgdp3swl34kr51hypm3azf8yhcalg5nngp70l56afsbaskyqh")))) (properties `((upstream-name . "wk"))) (build-system r-build-system) (home-page "https://paleolimbot.github.io/wk/") @@ -22462,13 +23053,13 @@ either PDF/EPS files.") (define-public r-polspline (package (name "r-polspline") - (version "1.1.23") + (version "1.1.24") (source (origin (method url-fetch) (uri (cran-uri "polspline" version)) (sha256 - (base32 "1qa9j7s09yzi65fav27zxc1w1wxwsmgjz8a8ghy7hhi5f3gvsqw3")))) + (base32 "0mal78f79jl6cj02xabv9vqf88m4iiadmgiv3qliv117cxkc6hb6")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/polspline/") @@ -22729,13 +23320,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.35") + (version "0.36") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1fzzppwp2ri4jhl1j2122rhiniay34cccvxr559bypv5b38yjywd")) + "0c4pj5sg4cnz2b2kpxgr0wk1n1pf7wkn1npm76aghy4yxj29cj4y")) ;; TODO: there is one more file to replace: ;; inst/resources/gitbook/js/app.min.js (snippet @@ -22851,13 +23442,13 @@ that accept short and long options.") (define-public r-osqp (package (name "r-osqp") - (version "0.6.3.1") + (version "0.6.3.2") (source (origin (method url-fetch) (uri (cran-uri "osqp" version)) (sha256 (base32 - "178vvv0yajjy02ww4brrjb4197dp7c0n8zmk1zwh44h9msnnacj3")))) + "0i1jh3fr8d45b7inq9s6iyqszhh18hps8jpzkm0hzgj2k8r3nm0q")))) (properties `((upstream-name . "osqp"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-r6 r-rcpp)) @@ -22942,14 +23533,14 @@ handle missing genotypes at some SNPs.") (define-public r-sampling (package (name "r-sampling") - (version "2.9") + (version "2.10") (source (origin (method url-fetch) (uri (cran-uri "sampling" version)) (sha256 (base32 - "11xis4vzn2ga8ml9xrgfgqzccvwbnabq35aidzdvpnvciybsanvz")))) + "0x976wblv663aidqmcif1rjv72nbxf4nzms901lmryxbq1p9gv7x")))) (build-system r-build-system) (propagated-inputs (list r-lpsolve r-mass)) @@ -22999,29 +23590,24 @@ the corresponding outputs (tables and graphs).") (properties `((upstream-name . "rJava"))) (build-system r-build-system) (arguments - `(#:modules ((guix build utils) - (guix build r-build-system) - (ice-9 match)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-JAVA_HOME - (lambda* (#:key inputs #:allow-other-keys) - (let ((jdk (assoc-ref inputs "jdk"))) - (setenv "JAVA_HOME" jdk) - (setenv "JAVA" (which "java")) - (setenv "JAR" (which "jar")) - (setenv "JAVAC" (which "javac")) - (setenv "JAVAH" (which "javah")) - (setenv "JAVA_CPPFLAGS" - (string-append "-I" jdk "/include " - "-I" jdk "/include/linux")) - (match (find-files (string-append jdk "/jre/lib/") "libjvm.so") - ((lib) (setenv "JAVA_LIBS" lib)) - (_ (error "Could not find libjvm.so")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-JAVA_HOME + (lambda* (#:key inputs #:allow-other-keys) + (let ((jdk (assoc-ref inputs "jdk"))) + (setenv "JAVA_HOME" jdk) + (setenv "JAVA" (which "java")) + (setenv "JAR" (which "jar")) + (setenv "JAVAC" (which "javac")) + (setenv "JAVAH" (which "javah")) + (setenv "JAVA_CPPFLAGS" + (string-append "-I" jdk "/include " + "-I" jdk "/include/linux")) + (setenv "JAVA_LIBS" (search-input-file inputs "/lib/libjvm.so")))))))) (inputs `(("icu4c" ,icu4c) - ("jdk" ,icedtea-8 "jdk") + ("jdk" ,openjdk11 "jdk") ("zlib" ,zlib))) (home-page "https://www.rforge.net/rJava/") (synopsis "Low-Level R to Java interface") @@ -24304,14 +24890,14 @@ external dependencies. This package has is implemented purely in R.") (define-public r-aplot (package (name "r-aplot") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "aplot" version)) (sha256 (base32 - "0k7j4p3hsxqak422vjdm9p8bpcs2n73y373lcmjd67ksi3ivgrc9")))) + "094bzrcjybs2dk2plmxf80mbx9dz1hi5m7gp8bbs5qqh03xn7wf7")))) (properties `((upstream-name . "aplot"))) (build-system r-build-system) (propagated-inputs @@ -24523,14 +25109,14 @@ Row} (CSR) format.") (define-public r-text2vec (package (name "r-text2vec") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (cran-uri "text2vec" version)) (sha256 (base32 - "1hi7ydb7xkgbff4lwnnz1biyl8m90w16hn3x5rrzvscvm53sj4y7")))) + "0sjlvp4zhzwc0ai7626fpw3ws8xv0xhl8gv8mrk24lrpk5nhin2h")))) (properties `((upstream-name . "text2vec"))) (build-system r-build-system) (propagated-inputs @@ -24632,14 +25218,14 @@ provides tools to compute this metric.") (define-public r-lintr (package (name "r-lintr") - (version "3.1.0") + (version "3.1.1") (source (origin (method url-fetch) (uri (cran-uri "lintr" version)) (sha256 (base32 - "1kb3jrzh1vn1fpj6phm2ni542yjgbbjmzgkn8w7khmh1sd9mj7pp")))) + "07c7h30nh1529wba8xkyg2sapj6r7jjckrxyzhrg2ssfwzs4dwdw")))) (properties `((upstream-name . "lintr"))) (build-system r-build-system) (propagated-inputs @@ -24730,14 +25316,14 @@ from SuiteSparse.") (define-public r-sctransform (package (name "r-sctransform") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "sctransform" version)) (sha256 (base32 - "1cxlqscjn33rszigk7bxjj2hdsr8rxalq94fg86qwmx9jv0i1vws")))) + "0wgimf7qqgnnmyspn2rpb4a8hl570fv0fwh0r0r4qgjlpvwffssz")))) (build-system r-build-system) (propagated-inputs (list r-dplyr @@ -25163,13 +25749,13 @@ includes data sets from oceanography.") (define-public r-plotroc (package (name "r-plotroc") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "plotROC" version)) (sha256 (base32 - "0kaz9hrimi9gi7cf7flag9kc9yrg5fdyylqa5hn53x4dy8vhj37g")) + "15jvn1dlx8qh5ghnkhqyc49frw6rp58ikpjs3ga8mjxrqyz7wb1g")) (snippet '(delete-file "inst/d3.v3.min.js")))) (properties `((upstream-name . "plotROC"))) @@ -25903,14 +26489,15 @@ function and interfaces to external frameworks.") (define-public r-covr (package (name "r-covr") - (version "3.6.2") + (version "3.6.4") (source (origin (method url-fetch) (uri (cran-uri "covr" version)) (sha256 - (base32 "0ns8xbq1l21mg8p2aiqv5h306a3vpn64j6jrgzbv8iv1a7kqrrmc")) + (base32 "0al6n4gnnvgxk968skqnajpqpqyl6kpam3fmn782kihhcl1h8qib")) (modules '((guix build utils))) + ;; TODO: still need to replace highlight.js/highlight.pack.js (snippet '(with-directory-excursion "inst/www/shared" (for-each delete-file @@ -26000,14 +26587,14 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "1h44bal845jp7ya8i7ff1kz1n3wklkb00jk6hb9lgwa2p5snqxpg")))) + "08sqw5izpwhawcjkcyscvslz914skwfi0s68rdwrqwwkh8fzn3w4")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (propagated-inputs @@ -26029,14 +26616,14 @@ be used further by e.g. graphic devices.") (define-public r-graphlayouts (package (name "r-graphlayouts") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "graphlayouts" version)) (sha256 (base32 - "0x777ixw2vvj1z3dams0zmyk25v7cdm4sx8v6knlb2mfkkg2gcyk")))) + "1mg0j9kcjp8dbpd8fy9vr5f35pz41v18vxc7q4pyl986pj859jam")))) (properties `((upstream-name . "graphlayouts"))) (build-system r-build-system) (propagated-inputs @@ -26055,14 +26642,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.7-46") + (version "1.7-55") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "0jpni25g9rhsqh71pgr2d3221r9xacsw3kz5qqnifj0jz5g3wyh1")))) + "1v1if9ypmra02ngg4r8qg1hldmxan8lyyhgq3j969glihpyvs03h")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs @@ -26180,14 +26767,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.21.2") + (version "0.21.3") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "05ryyyibnm69hq1xa84r9n2gr1s1ifds70z4awmib2ch62098m43")))) + "091zpyq37v7xjicj4h4r4fqhrrc7d3hicgbdznsjn85sw4d7q595")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -26265,14 +26852,14 @@ atmospheric physics.") (define-public r-lifecycle (package (name "r-lifecycle") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "lifecycle" version)) (sha256 (base32 - "1hk9mblhap429fk77qpgc4hv0j91q5wpahi0y76w118m471zsnb4")))) + "1k4ibf2x90xgmzaq47vf9wrsh6a2fp2lg1l8bq89632bx33x795d")))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-rlang)) @@ -26374,13 +26961,13 @@ to ODEs by numerical differencing.") (define-public r-pmcmrplus (package (name "r-pmcmrplus") - (version "1.9.7") + (version "1.9.8") (source (origin (method url-fetch) (uri (cran-uri "PMCMRplus" version)) (sha256 - (base32 "06i5vsf8hpzv0c8v156072xbqpxk1wf2iami7mnsjfp9xjjjzbhx")))) + (base32 "1wqx5nikhpjsqnn7lgb2zy949sxmq7n3phlaix70as0zky534scg")))) (properties `((upstream-name . "PMCMRplus"))) (build-system r-build-system) (inputs (list gmp)) @@ -26403,12 +26990,12 @@ to ODEs by numerical differencing.") (define-public r-pracma (package (name "r-pracma") - (version "2.4.2") + (version "2.4.4") (source (origin (method url-fetch) (uri (cran-uri "pracma" version)) (sha256 - (base32 "05lwx2yx7f45cr5amzbjv3b2p6ibspjxl0aglq2dga6rvxzk6l0x")))) + (base32 "0zxsqr7f4pcr1nmbbzliihyldv091ykzajv1mbdrkycp46pz6khs")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/pracma/") (synopsis "Practical numerical math functions") @@ -26791,14 +27378,14 @@ cell free DNA} (cfDNA).") (define-public r-rintrojs (package (name "r-rintrojs") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "rintrojs" version)) (sha256 (base32 - "19lpq421hrs1wc9bnimbwxx35p8bbzil3x1h9l28gjayn4djmjsh")) + "1fy5lz9d9njs4yrnwrrn0n1fn0chccgi1gzn4qz4g6adr3v35rgw")) (snippet '(delete-file "inst/javascript/introjs/intro.min.js")))) (properties `((upstream-name . "rintrojs"))) @@ -27913,14 +28500,14 @@ transcription, ...") (define-public r-seewave (package (name "r-seewave") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (cran-uri "seewave" version)) (sha256 (base32 - "12r09cirqzpg0lki304kfrdvxhdjpvsficba8inmnr4qzpfw7s5a")))) + "13c48sn453yp4j0ap8slnnr2gfhlxasz926p2pazkrg817w7m28z")))) (properties `((upstream-name . "seewave"))) (build-system r-build-system) (inputs @@ -28410,14 +28997,14 @@ be conducted. A graphical user interface is also provided.") (define-public r-actcd (package (name "r-actcd") - (version "1.2-0") + (version "1.3-0") (source (origin (method url-fetch) (uri (cran-uri "ACTCD" version)) (sha256 (base32 - "0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p")))) + "1a0gsznca5fv7i29xpcns4rkas5q88wv01rxvd4j66n64gw0ri4j")))) (properties `((upstream-name . "ACTCD"))) (build-system r-build-system) (propagated-inputs @@ -28816,14 +29403,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "3.3-2") + (version "3.3-4") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0ys7kqqbx9g2mhsn243z9vj7qkdd69d3jy1vin9v8bknwimgdxvb")))) + "06693w4cwcchi0z64vgg7khc4k4209nw6m2x441nwix4x6rk1zjs")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs (list r-expint)) @@ -29044,14 +29631,14 @@ done.") (define-public r-adagio (package (name "r-adagio") - (version "0.8.5") + (version "0.9.2") (source (origin (method url-fetch) (uri (cran-uri "adagio" version)) (sha256 (base32 - "0icwr3cark67jyg9zzqwyv9q4fs0j0xgb5i7nkwv9s7y5dlldl0b")))) + "100mqwlzqml154d0hk7spi4sbwx9y3gh06vkls49kca2q1kf99qz")))) (properties `((upstream-name . "adagio"))) (build-system r-build-system) (propagated-inputs @@ -29776,14 +30363,14 @@ automatically show a loader when the output is (re)calculating.") (define-public r-rsvg (package (name "r-rsvg") - (version "2.5.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (cran-uri "rsvg" version)) (sha256 (base32 - "1gi31hhs488a90lcql9c1hhsbymskj5brp05ag5z9f0azspazpdm")))) + "0w29isj7n33vwacvk5h6ghgm9j3phghnz7a98b1xi60cyk08qi2b")))) (properties `((upstream-name . "rsvg"))) (build-system r-build-system) (inputs @@ -30225,14 +30812,14 @@ programming} (OOP) using R Reference Class.") (define-public r-proxyc (package (name "r-proxyc") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (cran-uri "proxyC" version)) (sha256 (base32 - "00p3604ny6qax5rr1865c27hfp90v2vga0xcrp3bb81xcfadl99y")))) + "1skq5cxd0kh2pccfg4h9bis4wbqb6zm04q4iwfa6dqml6hyiv7gk")))) (properties `((upstream-name . "proxyC"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -30745,14 +31332,14 @@ Complete access to optimized C functions is made available with (define-public r-openmx (package (name "r-openmx") - (version "2.21.8") + (version "2.21.10") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "1vvlb9q3w6i6g7kf0r5jnrlmdxskh3rbfss90icand046rl37qdz")))) + "1kll5iim5l71dxkjd8y9ma1494818j369gp92qdsy3x6lxy244ym")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs @@ -30945,14 +31532,14 @@ network, tree, dendrogram, and Sankey graphs from R using data frames.") (define-public r-qgraph (package (name "r-qgraph") - (version "1.9.5") + (version "1.9.8") (source (origin (method url-fetch) (uri (cran-uri "qgraph" version)) (sha256 (base32 - "1mi19bjx83zb42wmgb716a3l4gvwch3rmybdqmm8k3dl8xr2qnjc")))) + "1m019j5nxc0184p0r2zgdn457g555nxsp2s08maa053nydj1va0l")))) (properties `((upstream-name . "qgraph"))) (build-system r-build-system) (propagated-inputs @@ -31437,14 +32024,14 @@ techniques to average Bayesian predictive distributions.") (define-public r-rstan (package (name "r-rstan") - (version "2.26.23") + (version "2.32.3") (source (origin (method url-fetch) (uri (cran-uri "rstan" version)) (sha256 (base32 - "08hdwrpxbxp2wdnfk2jj2xsdgl7q9nbalz5wgwmy0m878swxxzci")))) + "17alp92kj9mnlkzplk7zd83sv2zi2h7yc44fx5f7nz3dpwd9x7d2")))) (properties `((upstream-name . "rstan"))) (build-system r-build-system) (arguments @@ -32393,18 +32980,18 @@ estimation.") (define-public r-optimx (package (name "r-optimx") - (version "2023-8.13") + (version "2023-10.21") (source (origin (method url-fetch) (uri (cran-uri "optimx" version)) (sha256 (base32 - "00w8h450gs8vf0raghjg2818xzj4gz5jr3hwk9m9zc5k3rwmcf8n")))) + "1da4daxgk4kbq1n2mn72482c3j96wba0xf4mzffgasn20ib2swqd")))) (properties `((upstream-name . "optimx"))) (build-system r-build-system) (propagated-inputs (list r-nloptr r-numderiv r-pracma)) - (native-inputs (list r-knitr)) + (native-inputs (list r-r-rsp)) (home-page "https://cran.r-project.org/web/packages/optimx/") (synopsis "Expanded replacement and extension of the optim function") (description @@ -32498,14 +33085,14 @@ including means, variances, intervals, and highest density regions.") (define-public r-posterior (package (name "r-posterior") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "posterior" version)) (sha256 (base32 - "1lsqpczf8ll8m1a99kwmxdjm8wpavlqw88qha82s3438ipx5729b")))) + "1pp233ddrs116w1rmp3khhmibjf6l021b1x79k6z48g3r9zk042a")))) (properties `((upstream-name . "posterior"))) (build-system r-build-system) (propagated-inputs @@ -33275,13 +33862,13 @@ diagonals. This package allows you to compute the tensor product of arrays.") (define-public r-spatstat-explore (package (name "r-spatstat-explore") - (version "3.2-3") + (version "3.2-5") (source (origin (method url-fetch) (uri (cran-uri "spatstat.explore" version)) (sha256 (base32 - "18zhpspq07rcnpmnkc82hzjvjp39fsb06g73gin4x5bwzbi22kgr")))) + "053wl87whmkkqp058lwzlwv0wydddizsni9m94f6kxgl5ahia1sc")))) (properties `((upstream-name . "spatstat.explore"))) (build-system r-build-system) (propagated-inputs @@ -33315,13 +33902,13 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-model (package (name "r-spatstat-model") - (version "3.2-6") + (version "3.2-8") (source (origin (method url-fetch) (uri (cran-uri "spatstat.model" version)) (sha256 (base32 - "1lvs6ns4hna7w6b0nvzsx2rw699ampdm8jmxdzlfpk4hla2lf7wq")))) + "1x03fy921rq8dyr6jkpwnx7pf7fc5593mvnl8r1gz3sypnmp6p4d")))) (properties `((upstream-name . "spatstat.model"))) (build-system r-build-system) (propagated-inputs @@ -33359,14 +33946,14 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "3.0-3") + (version "3.0-4") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "0j6w9b479qqah2vzbq31v1xa6rjql8a85hdlahqhwqd9j1scd03s")))) + "1i1w1ys29s22jfjvliqnbw3zi6zar8bxxz3r8za182p2w0wqwhax")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) @@ -33380,14 +33967,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-sparse (package (name "r-spatstat-sparse") - (version "3.0-2") + (version "3.0-3") (source (origin (method url-fetch) (uri (cran-uri "spatstat.sparse" version)) (sha256 (base32 - "1gnlgz11dv66b41kdyyzm8nhkhhi4yajlcr2g52h2lfxlryb5g2h")))) + "0scdk3ns4nl1v1avbggnsinfpvl4i8391qy3x1iwxvkimr14xg3b")))) (properties `((upstream-name . "spatstat.sparse"))) (build-system r-build-system) @@ -33404,14 +33991,14 @@ matrix calculations that are common in statistics, such as quadratic forms.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "3.0-1") + (version "3.0-3") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "002kvli3n9cppaar7q062dm4fapdgkyf1daq5zscxsanwcflpswf")))) + "0fxd266rza07s73fj1n4rd4i7x1bv1ll36iikxzjhnlh3vjc0hkn")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs @@ -33426,14 +34013,14 @@ package.") (define-public r-spatstat-geom (package (name "r-spatstat-geom") - (version "3.2-5") + (version "3.2-7") (source (origin (method url-fetch) (uri (cran-uri "spatstat.geom" version)) (sha256 (base32 - "13xlp88yfp61kl0c3vaqs7lrckkc4ixpp0mpf89h5ggmjyf57nxx")))) + "13k85918zd2n64mxjwlgzd986zvs3is8vg06k9i195yymfrik65y")))) (properties `((upstream-name . "spatstat.geom"))) (build-system r-build-system) (propagated-inputs @@ -33482,14 +34069,14 @@ user-level code from spatstat, except for the code for linear networks.") (define-public r-spatstat-linnet (package (name "r-spatstat-linnet") - (version "3.1-1") + (version "3.1-3") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "0adha3bi1a250p8wm7agqdmwzznd6blsfg0km11n25ad8y2r5q0c")))) + "1ybjl5ccp9r5ilbihwzk93zcm46pbpldn3nfbfpdw458xh894r3q")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) @@ -33512,13 +34099,13 @@ for spatial data on a linear network.") (define-public r-spatstat-random (package (name "r-spatstat-random") - (version "3.1-6") + (version "3.2-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.random" version)) (sha256 - (base32 "0vrx0mxzcd6yr6rzn9jk2wj5d2l7yn0ij1n58yb3hw2g7nasad06")))) + (base32 "1p1imyqrpvdhsc24pq3mvdg9n29h6q8zlawdyahqiymynyp22m4j")))) (properties `((upstream-name . "spatstat.random"))) (build-system r-build-system) (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-utils)) @@ -33540,14 +34127,14 @@ sampler).") (define-public r-spatstat (package (name "r-spatstat") - (version "3.0-6") + (version "3.0-7") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "0vlpa5a1b5s27lgxkq65iixrsbbj0x4zahg0sfsak0ackj8ks577")))) + "1h6fnri3ma5kgzkwv4lr2i2jvsx8sg4am3rgzb29h7l89x59yxrk")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs @@ -33669,18 +34256,18 @@ aggregation for comparing different implementations in order to provide a (define-public r-rfast (package (name "r-rfast") - (version "2.0.8") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "Rfast" version)) (sha256 (base32 - "1c64j8hg6id4ri3m32aa1r0qyn09kl3dvl865dzf43qdb3qcichv")))) + "1zqq4k85i0nbzndkh0iiq3k83ly0mpl3pn4wkka6qxfvk6n6rr7r")))) (properties `((upstream-name . "Rfast"))) (build-system r-build-system) (propagated-inputs - (list r-rcpp r-rcpparmadillo r-rcppziggurat)) + (list r-rcpp r-rcpparmadillo r-rcppparallel r-rcppziggurat)) (home-page "https://github.com/RfastOfficial/Rfast") (synopsis "Collection of efficient and fast R functions") (description @@ -34560,14 +35147,14 @@ and regression metrics (e.g., RMSE).") (define-public r-warp (package (name "r-warp") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "warp" version)) (sha256 (base32 - "0s0acddc5h14245hi1faycxp0fyvw6nlgaz2df7da4fpyd2f638f")))) + "1gj65kgs7x63f6y2vnv13k293b52k4afbmdlcam635h9vs8da2h2")))) (properties `((upstream-name . "warp"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -34609,14 +35196,14 @@ different palettes and includes both diverging and sequential types.") (define-public r-slider (package (name "r-slider") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "slider" version)) (sha256 (base32 - "18gw0bxpbb00qcafmyv2avyj83s710hrj10x998ch9qbbyx1fsmw")))) + "1c19lk0ddh5qh0jzx7178l314zyygmlpmbvn7670bcmdbxwjc2i0")))) (properties `((upstream-name . "slider"))) (build-system r-build-system) (propagated-inputs @@ -34857,14 +35444,14 @@ results.") (define-public r-tidyposterior (package (name "r-tidyposterior") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "tidyposterior" version)) (sha256 (base32 - "19cyyhh417i5xcchb8kq3iycaf4y7aznr7y9r004h2k2vk3svc86")))) + "1yi0pihglp683dmfg0bn9lnb0qsl2xprj3al65v642rcfzrr7h4h")))) (properties `((upstream-name . "tidyposterior"))) (build-system r-build-system) (propagated-inputs @@ -35022,14 +35609,14 @@ consistent interface, and the package is built on the @code{stringi} and (define-public r-hunspell (package (name "r-hunspell") - (version "3.0.2") + (version "3.0.3") (source (origin (method url-fetch) (uri (cran-uri "hunspell" version)) (sha256 (base32 - "0kij39rhsx7s4lfddy6745f1zjyi003srj14ckjpbhkcyxamk8jy")))) + "1ws2hhrn3iw89vs17q9claf0cip5hy6rbgdr4dcjmzrdlrri9apx")))) (properties `((upstream-name . "hunspell"))) (build-system r-build-system) (propagated-inputs @@ -35555,25 +36142,28 @@ data to rasters. It speeds up plotting of data with millions of points.") (define-public r-seuratobject (package (name "r-seuratobject") - (version "4.1.4") + (version "5.0.0") (source (origin (method url-fetch) (uri (cran-uri "SeuratObject" version)) (sha256 (base32 - "1vqhad76hnr0l47klg56fniah4cvpzbkkl0j1cn9cp3rv6d69rvl")))) + "0wlr53cswq7a7zzzzkif82iy4xrrd2afz093b265kjlq4qxmzn9d")))) (properties `((upstream-name . "SeuratObject"))) (build-system r-build-system) (propagated-inputs (list r-future r-future-apply + r-generics + r-lifecycle r-matrix r-progressr r-rcpp r-rcppeigen r-rlang - r-sp)) + r-sp + r-spam)) (home-page "https://satijalab.org/seurat") (synopsis "Data structures for single cell data") (description @@ -35618,21 +36208,23 @@ other R users.") (define-public r-seurat (package (name "r-seurat") - (version "4.4.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1pdlvjh5xs1fyj2zic98sfz9zazbb45qywfqnhfzqb34jyaxy5qg")))) + "1hvqxfskwpw06dxc9hc9zvxqb73wr7qjxgrqgyjklxaq1xhr335v")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) (propagated-inputs (list r-cluster r-cowplot + r-fastdummies r-fitdistrplus r-future r-future-apply + r-generics r-ggplot2 r-ggrepel r-ggridges @@ -35643,6 +36235,7 @@ other R users.") r-jsonlite r-kernsmooth r-leiden + r-lifecycle r-lmtest r-mass r-matrix @@ -35659,10 +36252,12 @@ other R users.") r-rcpp r-rcppannoy r-rcppeigen + r-rcpphnsw r-rcppprogress r-reticulate r-rlang r-rocr + r-rspectra r-rtsne r-scales r-scattermore @@ -36418,14 +37013,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "1gw0rkbiv93ifl9110r9sr0p9g4vg7qc11mznmmjq0a5vzmqgpm9")))) + "1ddr5w7n68d3imcrm0ipgk1waml8zj4szi566dmmiqvlpzpgdr3p")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs @@ -36679,14 +37274,14 @@ chunks.") (define-public r-clustree (package (name "r-clustree") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "clustree" version)) (sha256 (base32 - "1haam13aifak8fladyxwa0gz56anj1zfczfjgs07gbw90kf6azx8")))) + "05yizn8hcf4nsibypxahp2mz64sy10vli776mi0d2gvfb5p4kwmm")))) (properties `((upstream-name . "clustree"))) (build-system r-build-system) (propagated-inputs @@ -36714,14 +37309,14 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "1niaj1dh09rqrg9hrh98ddnc0f2nkyq9iizv24lcwm9gjs3w1ql0")))) + "0hpcjz66ykji89g2lzpp6hfkz10388py8vn2ss08n4xl3yz4v4ps")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs @@ -36742,14 +37337,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "1yd89p4f2b7r2n1kl6lybbgd04kqvlf14zgmp7pxw770w1slsvwk")))) + "1izpw02b8kq6pm37kvxp9pbd9srvfp5bzfjg27j9hbmm794xq50h")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs @@ -36932,14 +37527,14 @@ visualized at any level of the experiment's design.") (define-public r-qdapregex (package (name "r-qdapregex") - (version "0.7.5") + (version "0.7.8") (source (origin (method url-fetch) (uri (cran-uri "qdapRegex" version)) (sha256 (base32 - "1hdilycwrvi0q6cx7k8vg87bamm2xsafjkya5x4smxysm5k1r4qb")))) + "1pf1cz03i6sn83d1aaj4cv4jfavs6k81nn5sy7b0aw4i1hpkyiwz")))) (properties `((upstream-name . "qdapRegex"))) (build-system r-build-system) (propagated-inputs (list r-stringi)) @@ -37211,13 +37806,13 @@ user streams, and to parse the output into data frames.") (define-public r-strex (package (name "r-strex") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "strex" version)) (sha256 (base32 - "1fxg07n8cjvvgpbzqhyx5ma5bv6vax1yw0rbfdqfzr79v6k5x3n7")))) + "1vz5zrvf052bg2y48yvkci4hciknvyw5gpbvnklgyny5lzlqvyiq")))) (properties `((upstream-name . "strex"))) (build-system r-build-system) (propagated-inputs @@ -37545,18 +38140,18 @@ supply the workflow to create thematic maps. This package also facilitates (define-public r-rworldmap (package (name "r-rworldmap") - (version "1.3-6") + (version "1.3-8") (source (origin (method url-fetch) (uri (cran-uri "rworldmap" version)) (sha256 (base32 - "1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk")))) + "007avjl7jhllybp82illrn8v38a85j6xbzk5pvykfx8ayx4wc3m6")))) (properties `((upstream-name . "rworldmap"))) (build-system r-build-system) (propagated-inputs - (list r-fields r-maptools r-sp)) + (list r-fields r-raster r-sp r-terra)) (home-page "https://github.com/AndySouth/rworldmap/") (synopsis "Mapping Global Data") @@ -37567,14 +38162,14 @@ supply the workflow to create thematic maps. This package also facilitates (define-public r-rtweet (package (name "r-rtweet") - (version "1.1.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "rtweet" version)) (sha256 (base32 - "0dq6ckf2mp6wm6y8xzjby21s356760fmck1m8nsnv5gz8lhy6dhg")))) + "18ynravc5vz7ywm1n7ww48gx06dndcishl6lq8nqajxsjwiphq3r")))) (properties `((upstream-name . "rtweet"))) (build-system r-build-system) (propagated-inputs @@ -38068,17 +38663,18 @@ utility operations.") (define-public r-rsq (package (name "r-rsq") - (version "2.5") + (version "2.6") (source (origin (method url-fetch) (uri (cran-uri "rsq" version)) (sha256 (base32 - "1r628srxhhf7b51lnj4qrzgbqajkm0ls47a9rzjkvmfq4ax5i73f")))) + "01b9rl2ng1sq0ibpfsf50agkwh01pfpw354vvgdjd0lzh9dxmsgp")))) (properties `((upstream-name . "rsq"))) (build-system r-build-system) (propagated-inputs - (list r-deriv + (list r-deming + r-deriv r-lme4 r-mass r-matrix @@ -38755,14 +39351,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.6.1") + (version "0.6.4") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "0haw72885xmzl6rmb8vlkqwnxh7iq5cr89d852j2vk56sxjxv1y5")))) + "1pzgwljrk3maxcbmiy3yiccijm6c2ach8f9kzpqr7w5k5vkyhpvx")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs @@ -39819,17 +40415,17 @@ formatting and delivering log messages with low overhead.") (define-public r-fasterize (package (name "r-fasterize") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "fasterize" version)) (sha256 - (base32 "1ckxi2iyxdahhgbliblcrkzziblfagzr54srjk27yp1lcgivvvs4")))) + (base32 "1d63q77hfbn2ly8cwsik4gaavdhidpi7idf7qj2y5bi9xhd10kyl")))) (properties `((upstream-name . "fasterize"))) (build-system r-build-system) (propagated-inputs - (list r-raster r-rcpp r-rcpparmadillo r-sp)) + (list r-raster r-rcpp r-rcpparmadillo r-wk)) (native-inputs (list r-knitr)) (home-page "https://github.com/ecohealthalliance/fasterize") (synopsis "Fast Polygon to Raster Conversion") @@ -40187,13 +40783,13 @@ calculate a dimension's unknown value from other dimensions' measurements.") (define-public r-sungeo (package (name "r-sungeo") - (version "0.2.292") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "SUNGEO" version)) (sha256 (base32 - "1xav5by7sl21cwfg9m1ij1lz1kvdlqkkp2ah67rnj9vp4vk7nkfg")) + "1sy9kw3nr69jf33034kcnv418lqyz6sfrd01646i7dfsm64aydp2")) (modules '((guix build utils))) (snippet '(begin ;; Fortunately, the package does not actually use @@ -40212,7 +40808,6 @@ calculate a dimension's unknown value from other dimensions' measurements.") r-cartogram r-data-table r-dplyr - r-fasterize r-httr r-jsonlite r-measurements @@ -40225,7 +40820,9 @@ calculate a dimension's unknown value from other dimensions' measurements.") r-rlang r-sf r-sp - r-spdep)) + r-spdep + r-stringr + r-terra)) (home-page "https://github.com/zhukovyuri/SUNGEO/") (synopsis "Sub-National Geospatial Data Archive: Geoprocessing Toolkit") (description diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index ba502982ad..22b77121e9 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1217,20 +1217,18 @@ EUI-64, also known as MAC-48 media access control addresses.") (package (inherit rust-glutin-egl-sys-0.4) (name "rust-glutin-egl-sys") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "glutin-egl-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "04f2ci9kb8q4dv4kviigvgfy54lr4jmbnmjsvi50qj13anjnmfra")))) + (base32 "0g81bz7ppvaksvwcw1jg553g8b2shvmnfm9ms6hixwvinj20z438")))) (arguments `(#:cargo-inputs (("rust-winapi" ,rust-winapi-0.3) - ("rust-gl-generator" ,rust-gl-generator-0.13)))))) + ("rust-gl-generator" ,rust-gl-generator-0.14)))))) (define-public rust-glutin-emscripten-sys-0.1 (package @@ -1742,13 +1740,13 @@ graphics and video games.") (define-public rust-mp4parse-0.12 (package (name "rust-mp4parse") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (crate-uri "mp4parse" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ppqv60qiyrnbb996gb1sik08c0j2i317llv3rrcwb1cjg3bdlk7")))) + (base32 "1scynvlmiy6xv2rrzzpijd812amh6a863na8i0xrcw5d9d08kl8h")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. @@ -2186,21 +2184,22 @@ AVIF format (powers the `cavif` tool).") (package (inherit rust-ravif-0.8) (name "rust-ravif") - (version "0.6.4") + (version "0.6.6") (source (origin (method url-fetch) (uri (crate-uri "ravif" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gyc7w1fz3qdk95cdpkj185dm6lskxfp329xm69waxc565fcz9rx")))) + (base32 "0rfm63bv0q2rjyivmzlk4wma8xff6jralh7dr1bjz2aw4knm7cw1")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Not packaging older versions of rav1e. + #:cargo-inputs (("rust-avif-serialize" ,rust-avif-serialize-0.6) ("rust-imgref" ,rust-imgref-1) ("rust-loop9" ,rust-loop9-0.1) ("rust-num-cpus" ,rust-num-cpus-1) - ("rav1e" ,rav1e) + ("rav1e" ,rav1e) ; 0.5 ("rust-rayon" ,rust-rayon-1) ("rust-rgb" ,rust-rgb-0.8)) #:cargo-development-inputs @@ -2262,6 +2261,25 @@ AVIF format (powers the `cavif` tool).") (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-resize-0.4 + (package + (name "rust-resize") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "resize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bamrw2m37l8q46mcy6snp6106d93dq7x67hbbj32w88pjdhxn84")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-png" ,rust-png-0.16)))) + (home-page "https://github.com/PistonDevelopers/resize") + (synopsis "Image resampling library in pure Rust") + (description "This package provides an image resampling library in pure Rust.") + (license license:expat))) + (define-public rust-rgb-0.8 (package (name "rust-rgb") @@ -2628,8 +2646,76 @@ applications.") ("rust-num-derive" ,rust-num-derive-0.2) ("rust-num-traits" ,rust-num-traits-0.2)))))) +(define-public rust-wayland-backend-0.1 + (package + (name "rust-wayland-backend") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n1yi6vna23wfkrpk1j46sx5qbsijh50viha4sra73by8lkqxd21")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Use of undeclared dependencies + #:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-io-lifetimes" ,rust-io-lifetimes-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.26) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.5) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-wayland-sys" ,rust-wayland-sys-0.30)) + #:cargo-development-inputs + (("rust-concat-idents" ,rust-concat-idents-1) + ("rust-env-logger" ,rust-env-logger-0.10)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Backend API for wayland crates") + (description "This package provides low-level bindings to the Wayland +protocol.") + (license license:expat))) + +(define-public rust-wayland-client-0.30 + (package + (name "rust-wayland-client") + (version "0.30.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-client" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j3as2g1znrs2lpkksqcvx8pag85yiwwbcv6wb3lyrqgfxa9d728")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `wayland_protocols` + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-calloop" ,rust-calloop-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.26) + ("rust-wayland-backend" ,rust-wayland-backend-0.1) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.30)) + #:cargo-development-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Rust bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, client side.") + (license license:expat))) + (define-public rust-wayland-client-0.29 (package + (inherit rust-wayland-client-0.30) (name "rust-wayland-client") (version "0.29.5") (source @@ -2639,7 +2725,6 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "05b7qikqj22rjy17kqw5ar7j2chpy18dr0gqapvwjfd00n60cfrz")))) - (build-system cargo-build-system) (arguments `(#:tests? #false ;circular dependency on wayland-protocols #:cargo-inputs @@ -2661,14 +2746,7 @@ applications.") rust-scoped-tls-1 rust-wayland-commons-0.29 rust-wayland-scanner-0.29 - rust-wayland-sys-0.29)) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Rust bindings to the standard C implementation of the wayland protocol") - (description - "This package provides Rust bindings to the standard C implementation of -the wayland protocol, client side.") - (license license:expat))) + rust-wayland-sys-0.29)))) (define-public rust-wayland-client-0.28 (package @@ -2947,8 +3025,36 @@ initializing an OpenGL or Vulkan context.") (native-inputs (list pkg-config)))) +(define-public rust-wayland-protocols-0.30 + (package + (name "rust-wayland-protocols") + (version "0.30.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kcvvli38gdjb9c7dpa2s0ix4nnqfq7n2bbc39370kx9bhg10a1v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-backend" ,rust-wayland-backend-0.1) + ("rust-wayland-client" ,rust-wayland-client-0.30) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.30) + ("rust-wayland-server" ,rust-wayland-server-0.30)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Generated API for the officials Wayland protocol extensions") + (description + "This package provides a generated API for the officials Wayland protocol +extensions.") + (license license:expat))) + (define-public rust-wayland-protocols-0.29 (package + (inherit rust-wayland-protocols-0.30) (name "rust-wayland-protocols") (version "0.29.5") (source @@ -2958,7 +3064,6 @@ initializing an OpenGL or Vulkan context.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1ihbjyd0w460gd7w22g9qabbwd4v8x74f8vsh7p25csljcgn4l5r")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -2969,13 +3074,7 @@ initializing an OpenGL or Vulkan context.") (inputs (list rust-bitflags-1 rust-wayland-client-0.29 rust-wayland-commons-0.29 rust-wayland-scanner-0.29 - rust-wayland-server-0.29)) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis "Generated API for the officials Wayland protocol extensions") - (description - "This package provides a generated API for the officials Wayland protocol -extensions.") - (license license:expat))) + rust-wayland-server-0.29)))) (define-public rust-wayland-protocols-0.28 (package @@ -3045,25 +3144,54 @@ extensions.") ("rust-wayland-sys" ,rust-wayland-sys-0.21) ("rust-wayland-scanner" ,rust-wayland-scanner-0.21)))))) -(define-public rust-wayland-scanner-0.29 +(define-public rust-wayland-protocols-wlr-0.1 + (package + (name "rust-wayland-protocols-wlr") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-protocols-wlr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12jqi7n77l8a13hc5w5fkdgs4kdjk9i6nvl74njsdr106c4r3sgw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-backend" ,rust-wayland-backend-0.1) + ("rust-wayland-client" ,rust-wayland-client-0.30) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.30) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.30) + ("rust-wayland-server" ,rust-wayland-server-0.30)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis "Generated API for the WLR wayland protocol extensions") + (description "This package provides generated API for the WLR wayland +protocol extensions") + (license license:expat))) + +(define-public rust-wayland-scanner-0.30 (package (name "rust-wayland-scanner") - (version "0.29.5") + (version "0.30.1") (source (origin (method url-fetch) (uri (crate-uri "wayland-scanner" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lxx3i2kxnmsk421qx87lqqc9kd2y1ksjxcyg0pqbar2zbc06hwg")))) + (base32 + "03ikmfwacsgbym2y4raf05knl1qjlgg81sy0174jxhzvayr77f5r")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; Tests expect running wayland instance. + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-xml-rs" ,rust-xml-rs-0.8)))) - (inputs - (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)) + ("rust-quick-xml" ,rust-quick-xml-0.28) + ("rust-quote" ,rust-quote-1)) + #:cargo-development-inputs + (("rust-similar" ,rust-similar-2)))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generate Rust APIs from XML Wayland protocol files") (description @@ -3073,6 +3201,26 @@ you are working on custom Wayland protocol extensions. Look at the wayland-client crate for usable bindings.") (license license:expat))) +(define-public rust-wayland-scanner-0.29 + (package + (inherit rust-wayland-scanner-0.30) + (name "rust-wayland-scanner") + (version "0.29.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-scanner" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lxx3i2kxnmsk421qx87lqqc9kd2y1ksjxcyg0pqbar2zbc06hwg")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (inputs + (list rust-proc-macro2-1 rust-quote-1 rust-xml-rs-0.8)))) + (define-public rust-wayland-scanner-0.28 (package (inherit rust-wayland-scanner-0.29) @@ -3124,8 +3272,39 @@ wayland-client crate for usable bindings.") (base32 "17mp49v7w0p0x5ry628lj2llljnwkr9aj9g4bqqhfibid32jhf5z")))))) +(define-public rust-wayland-server-0.30 + (package + (name "rust-wayland-server") + (version "0.30.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wayland-server" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fnjhhcbnwgyplawc02v3b6nkxnhzl2981yiyzzlj7gyjs0c4hww")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-io-lifetimes" ,rust-io-lifetimes-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.26) + ("rust-wayland-backend" ,rust-wayland-backend-0.1) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.30)))) + (home-page "https://github.com/smithay/wayland-rs") + (synopsis + "Bindings to the standard C implementation of the wayland protocol") + (description + "This package provides Rust bindings to the standard C implementation of +the wayland protocol, server side.") + (license license:expat))) + (define-public rust-wayland-server-0.29 (package + (inherit rust-wayland-server-0.30) (name "rust-wayland-server") (version "0.29.5") (source @@ -3135,7 +3314,6 @@ wayland-client crate for usable bindings.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "11ickjbqpfs19wakf56l3j9asjcfw00d7wj48s3i99yvv1nq8q2k")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -3158,14 +3336,7 @@ wayland-client crate for usable bindings.") rust-scoped-tls-1 rust-wayland-commons-0.29 rust-wayland-scanner-0.29 - rust-wayland-sys-0.29)) - (home-page "https://github.com/smithay/wayland-rs") - (synopsis - "Bindings to the standard C implementation of the wayland protocol") - (description - "This package provides Rust bindings to the standard C implementation of -the wayland protocol, server side.") - (license license:expat))) + rust-wayland-sys-0.29)))) (define-public rust-wayland-server-0.28 (package @@ -3823,25 +3994,40 @@ the platform-specific getters provided by winit, or another library.") (description "This package provides X11 library bindings for Rust.") (license license:expat))) -(define-public rust-y4m-0.7 +(define-public rust-y4m-0.8 (package (name "rust-y4m") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (crate-uri "y4m" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bhdgb7hgx7j92nm6ij5n8wisp50j8ff66ks14jzwdw2mwhrjam7")))) + (base32 "0j24y2zf60lpxwd7kyg737hqfyqx16y32s0fjyi6fax6w4hlnnks")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-development-inputs (("rust-resize" ,rust-resize-0.4)))) (home-page "https://github.com/image-rs/y4m") (synopsis "YUV4MPEG2 (@file{.y4m}) encoder and decoder") (description "This package provides a YUV4MPEG2 (@file{.y4m}) encoder and decoder.") (license license:expat))) +(define-public rust-y4m-0.7 + (package + (inherit rust-y4m-0.8) + (name "rust-y4m") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "y4m" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bhdgb7hgx7j92nm6ij5n8wisp50j8ff66ks14jzwdw2mwhrjam7")))) + (arguments `(#:skip-build? #t)))) + ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 1bd61d7f19..266a513dc2 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org> +;;; Copyright © 2023 Steve George <steve@futurile.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (gnu packages crates-graphics) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) #:use-module (gnu packages webkit)) @@ -168,28 +170,30 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-cairo-rs-0.15 +(define-public rust-cairo-rs-0.17 (package (name "rust-cairo-rs") - (version "0.15.12") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "cairo-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (base32 "02lz7kvml4m6fx02hy1pgk6ysils9di8n75m166kcpla0b206dmb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) - ("rust-freetype" ,rust-freetype-0.7) - ("rust-glib" ,rust-glib-0.15) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17) + ("rust-freetype-rs" ,rust-freetype-rs-0.32) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) + (("rust-float-eq" ,rust-float-eq-1) + ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) (inputs @@ -199,6 +203,29 @@ (description "Rust bindings for the Cairo library") (license license:expat))) +(define-public rust-cairo-rs-0.15 + (package + (inherit rust-cairo-rs-0.17) + (name "rust-cairo-rs") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g396fdz8crf74dmmjarcsdbsm8qgxy3a5x9kw6m2d9xn28y6vn7")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) + ("rust-freetype" ,rust-freetype-0.7) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-cairo-rs-0.14 (package (inherit rust-cairo-rs-0.15) @@ -277,21 +304,21 @@ (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-cairo-sys-rs-0.15 +(define-public rust-cairo-sys-rs-0.17 (package (name "rust-cairo-sys-rs") - (version "0.15.1") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "cairo-sys-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (base32 "1ccw4z59dx60khngx79g64c75abfwy7wnq57h2z82j7vn5k0q7b9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.15) + (("rust-glib-sys" ,rust-glib-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6) ("rust-winapi" ,rust-winapi-0.3) @@ -305,6 +332,26 @@ (description "This package provides FFI bindings to libcairo.") (license license:expat))) +(define-public rust-cairo-sys-rs-0.15 + (package + (inherit rust-cairo-sys-rs-0.17) + (name "rust-cairo-sys-rs") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j6k4pps3dv6g0vlpmxc2xyk0s40vj2wpzi55lbwjspmpqlx8m9w")))) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2)))))) + (define-public rust-cairo-sys-rs-0.14 (package (inherit rust-cairo-sys-rs-0.15) @@ -463,27 +510,27 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-gdk-pixbuf-0.15 +(define-public rust-gdk-pixbuf-0.17 (package (name "rust-gdk-pixbuf") - (version "0.15.11") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gdk-pixbuf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (base32 "05q7ajsp2z8xi355h26k7lvq7n3lj9xm61vhn045g3238v46npb9")))) (build-system cargo-build-system) (arguments - `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` - #:tests? #f + `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display` #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) - ("rust-gio" ,rust-gio-0.15) - ("rust-glib" ,rust-glib-0.15) - ("rust-libc" ,rust-libc-0.2)) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.17) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs @@ -492,9 +539,33 @@ (list gdk-pixbuf)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GdkPixbuf library") - (description "Rust bindings for the GdkPixbuf library") + (description "Rust bindings for the @code{GdkPixbuf} library") (license license:expat))) +(define-public rust-gdk-pixbuf-0.15 + (package + (inherit rust-gdk-pixbuf-0.17) + (name "rust-gdk-pixbuf") + (version "0.15.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16k1z21r76m620z61kfmgid1n6s8dnxpa4zlrppcr6dhr2fdsf5d")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.15) + ("rust-gio" ,rust-gio-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-gdk-pixbuf-0.14 (package (inherit rust-gdk-pixbuf-0.15) @@ -570,25 +641,23 @@ #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-gdk-pixbuf-sys-0.15 +(define-public rust-gdk-pixbuf-sys-0.17 (package (name "rust-gdk-pixbuf-sys") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gdk-pixbuf-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (base32 "1jvh91lzanr1a8c5h6ya8i4jzx7ifs8mjxjnmg8dfriw24yfr1cj")))) (build-system cargo-build-system) (arguments - `(;#:skip-build? - ;#t - #:cargo-inputs - (("rust-gio-sys" ,rust-gio-sys-0.15) - ("rust-glib-sys" ,rust-glib-sys-0.15) - ("rust-gobject-sys" ,rust-gobject-sys-0.15) + `(#:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.17) + ("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-gobject-sys" ,rust-gobject-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs @@ -603,6 +672,29 @@ (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") (license license:expat))) +(define-public rust-gdk-pixbuf-sys-0.15 + (package + (inherit rust-gdk-pixbuf-sys-0.17) + (name "rust-gdk-pixbuf-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19q2qjrzmmgc7bbs59sk6k0sv3xhpmnk9a2h0cajfr95g19jy2ql")))) + (arguments + `(#:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gdk-pixbuf-sys-0.14 (package (inherit rust-gdk-pixbuf-sys-0.15) @@ -768,36 +860,38 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gio-0.15 +(define-public rust-gio-0.17 (package (name "rust-gio") - (version "0.15.12") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "gio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (base32 "02nkqpq1a6ikzhv5x4nyfvzx8zk5dkjsjm50ns4qdybwjf93x5x6")))) (build-system cargo-build-system) (arguments - `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` - #:tests? #f + `(#:tests? #f ; `Errors` doesn't implement `std::fmt::Display` #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-futures-channel" ,rust-futures-channel-0.3) ("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-io" ,rust-futures-io-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-gio-sys" ,rust-gio-sys-0.15) - ("rust-glib" ,rust-glib-0.15) + ("rust-gio-sys" ,rust-gio-sys-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs - (("rust-futures-util" ,rust-futures-util-0.3) + (("rust-futures" ,rust-futures-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) ("rust-gir-format-check" ,rust-gir-format-check-0.1) - ("rust-serial-test" ,rust-serial-test-0.6)))) + ("rust-serial-test" ,rust-serial-test-1)))) (native-inputs (list pkg-config)) (inputs @@ -807,6 +901,37 @@ (description "Rust bindings for the Gio library") (license license:expat))) +(define-public rust-gio-0.15 + (package + (inherit rust-gio-0.17) + (name "rust-gio") + (version "0.15.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fr8qiqjf9yzl8867kgqdsxpkcx2jrns3xwmlf0jfiid668brzb8")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.15) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-serial-test" ,rust-serial-test-0.6)))))) + (define-public rust-gio-0.14 (package (inherit rust-gio-0.15) @@ -1272,14 +1397,14 @@ (package (inherit rust-glib-macros-0.17) (name "rust-glib-macros") - (version "0.15.11") + (version "0.15.13") (source (origin (method url-fetch) (uri (crate-uri "glib-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0r3cr0c79rs91z0sps089nsf8ppnm8agp48qwwqlkc32lqqq39i5")))) + (base32 "0jiwvywmkqhih6glipj1c7aylwfr738jid8nmjr4yvx2dygsxihh")))) (arguments `(;; XXX: Circular dependency on rust-glib?? #:tests? #f @@ -1586,6 +1711,255 @@ (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-gstreamer-0.18 + (package + (name "rust-gstreamer") + (version "0.18.8") + (source (origin + (method url-fetch) + (uri (crate-uri "gstreamer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mjlnw9917j3wwij8225bjp54k7408lxqjjnh6r6wksyryx66qyn")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f ; https://github.com/gtk-rs/gtk3-rs/issues/768 + #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-glib" ,rust-glib-0.15) + ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-muldiv" ,rust-muldiv-1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-rational" ,rust-num-rational-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-option-operations" ,rust-option-operations-0.4) + ("rust-paste" ,rust-paste-1) + ("rust-pretty-hex" ,rust-pretty-hex-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + `(("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-ron" ,rust-ron-0.7) + ("rust-serde-json" ,rust-serde-json-1)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "Rust bindings for GStreamer") + (description "Rust bindings for GStreamer.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gstreamer-app-0.18 + (package + (name "rust-gstreamer-app") + (version "0.18.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-app" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "115nykpdvfccyzvfi73qkhn061f6rdyhcaj9ajnw2ik5pimdyjk6")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; https://github.com/gtk-rs/gtk3-rs/issues/768 + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-glib" ,rust-glib-0.15) + ("rust-gstreamer" ,rust-gstreamer-0.18) + ("rust-gstreamer-app-sys" ,rust-gstreamer-app-sys-0.18) + ("rust-gstreamer-base" ,rust-gstreamer-base-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1)) + #:cargo-development-inputs (("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer gst-plugins-base)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "Rust bindings for GStreamer App library") + (description "Rust bindings for the GStreamer App library.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gstreamer-app-sys-0.18 + (package + (name "rust-gstreamer-app-sys") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-app-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fsgdb3b23s45xc7s06xw96x7avza0jpyj02x1fkw6vk3pr03d63")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18) + ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer gst-plugins-base)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "FFI bindings to libgstapp-1.0") + (description "FFI bindings to libgstapp-1.0, part of Gstreamer.") + (license license:expat))) + +(define-public rust-gstreamer-audio-0.18 + (package + (name "rust-gstreamer-audio") + (version "0.18.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-audio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zl0bj03rz19qlrm50w7i5sagh0i0p5d8gr7ig1k6k5yd7k47sww")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; https://github.com/gtk-rs/gtk3-rs/issues/768 + #:cargo-inputs (("rust-array-init" ,rust-array-init-2) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-glib" ,rust-glib-0.15) + ("rust-gstreamer" ,rust-gstreamer-0.18) + ("rust-gstreamer-audio-sys" ,rust-gstreamer-audio-sys-0.18) + ("rust-gstreamer-base" ,rust-gstreamer-base-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1)) + #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1) + ("rust-itertools" ,rust-itertools-0.10)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer gst-plugins-base)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "Rust bindings for the GStreamer Audio library") + (description "Rust bindings for the GStreamer Audio library.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gstreamer-audio-sys-0.18 + (package + (name "rust-gstreamer-audio-sys") + (version "0.18.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-audio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z3xryblh75xp08xyw3m6jfz9azarcvl06dd3psc0n65agxmhhm3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=cross_validate_constants_with_c") + #:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18) + ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer gst-plugins-base)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "FFI bindings to libgstaudio-1.0") + (description "FFI bindings to libgstaudio, part of Gstreamer.") + (license license:expat))) + +(define-public rust-gstreamer-base-0.18 + (package + (name "rust-gstreamer-base") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-base" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gw6sr75h01y3j6lpxhc7p1frvkba9a4imyyb2ppqh42cprkakr2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; https://github.com/gtk-rs/gtk3-rs/issues/768 + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-glib" ,rust-glib-0.15) + ("rust-gstreamer" ,rust-gstreamer-0.18) + ("rust-gstreamer-base-sys" ,rust-gstreamer-base-sys-0.18) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "Rust bindings for GStreamer Base library") + (description "Rust bindings for GStreamer Base library.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gstreamer-base-sys-0.18 + (package + (name "rust-gstreamer-base-sys") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gstreamer-base-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13h79fcn3b9bkg7h8j0vxc1zryp92shbvvk6gkx723il7hy4k0x0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-gstreamer-sys" ,rust-gstreamer-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "FFI bindings to libgstbase-1.0") + (description "FFI bindings to libgstbase-1.0, part of GStreamer.") + (license license:expat))) + +(define-public rust-gstreamer-sys-0.18 + (package + (name "rust-gstreamer-sys") + (version "0.18.0") + (source (origin + (method url-fetch) + (uri (crate-uri "gstreamer-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qikgp5m3xj41fbfyfl6ckb5i8dxadfvlvj5bf8girn2sdjpllg3")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs `(("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list glib gstreamer)) + (home-page "https://gstreamer.freedesktop.org") + (synopsis "FFI bindings to libgstreamer-1.0") + (description + "Foreign Function Interface (FFI) bindings to libgstreamer-1.0.") + (license license:expat))) + (define-public rust-gtk-0.14 (package (name "rust-gtk") @@ -1813,27 +2187,28 @@ library.") (license license:expat))) -(define-public rust-pango-0.15 +(define-public rust-pango-0.17 (package (name "rust-pango") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "pango" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) + (base32 "0j0xj9yw81qivqb0y34j9c5azjsdspxp1zzpvxi1zri0qrplbgim")))) (build-system cargo-build-system) (arguments `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` #:tests? #f #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-glib" ,rust-glib-0.15) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango-sys" ,rust-pango-sys-0.15)) + ("rust-pango-sys" ,rust-pango-sys-0.17)) #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (native-inputs @@ -1842,9 +2217,33 @@ library.") (list pango)) (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the Pango library") - (description "Rust bindings for the Pango library") + (description "This package provides Rust bindings for the Pango library.") (license license:expat))) +(define-public rust-pango-0.15 + (package + (inherit rust-pango-0.17) + (name "rust-pango") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ksf85fqkw4y5pf21p84g5xn4fnqn21cbrmx2d9yx6k591ah9r12")))) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pango-sys" ,rust-pango-sys-0.15)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + (define-public rust-pango-0.14 (package (inherit rust-pango-0.15) @@ -1923,22 +2322,22 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) -(define-public rust-pango-sys-0.15 +(define-public rust-pango-sys-0.17 (package (name "rust-pango-sys") - (version "0.15.10") + (version "0.17.10") (source (origin (method url-fetch) (uri (crate-uri "pango-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (base32 "15aindwdxsydzvqcvhc9ysamx5v1jmq8qbs61ncxic2h72grz9ix")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-glib-sys" ,rust-glib-sys-0.15) - ("rust-gobject-sys" ,rust-gobject-sys-0.15) + (("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-gobject-sys" ,rust-gobject-sys-0.17) ("rust-libc" ,rust-libc-0.2) ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs @@ -1953,6 +2352,28 @@ library.") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pango-sys-0.15 + (package + (inherit rust-pango-sys-0.17) + (name "rust-pango-sys") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1an3c931kbkr08n9d9d1dapsq3n26zs0xn4ixn11jrp4rn0h186j")))) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.15) + ("rust-gobject-sys" ,rust-gobject-sys-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-pango-sys-0.14 (package (inherit rust-pango-sys-0.15) @@ -2017,8 +2438,43 @@ library.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.17 + (package + (name "rust-pangocairo") + (version "0.17.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kr2b31034b8zif4r3lf4rniqphk2bxi2q7n8iwq2wrf3k5jkgw6")))) + (build-system cargo-build-system) + (arguments + `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` + #:tests? #f + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) + ("rust-glib" ,rust-glib-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.17)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs + (list pkg-config)) + (inputs + (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "This package provides Rust bindings for the @code{PangoCairo} library.") + (license license:expat))) + (define-public rust-pangocairo-0.15 (package + (inherit rust-pangocairo-0.17) (name "rust-pangocairo") (version "0.15.1") (source @@ -2029,7 +2485,6 @@ library.") (sha256 (base32 "0rjk0clrjxah4kc0kybn7l7bxa5m5kpxkihxc2i7a6hx3xfa8xkq")))) - (build-system cargo-build-system) (arguments `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` #:tests? #f @@ -2041,19 +2496,43 @@ library.") ("rust-pango" ,rust-pango-0.15) ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.15)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) + +(define-public rust-pangocairo-sys-0.17 + (package + (name "rust-pangocairo-sys") + (version "0.17.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ymr4aqrdpysz0rh383s4h6hj8nbkyj7n4723f45zzzqkf6x7pwl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17) + ("rust-glib-sys" ,rust-glib-sys-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.17) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) (inputs - (list pango)) + ;; XXX: Should these be propagated from their respective crates? + (list cairo glib pango)) (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "Rust bindings for the PangoCairo library.") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to @code{PangoCairo}.") (license license:expat))) (define-public rust-pangocairo-sys-0.15 (package + (inherit rust-pangocairo-sys-0.17) (name "rust-pangocairo-sys") (version "0.15.1") (source @@ -2065,7 +2544,6 @@ library.") (sha256 (base32 "154llaawy60zh8fkw2yq0r31ynpmqlsr7brryzaq2v4ijijp9kvq")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.15) @@ -2075,16 +2553,7 @@ library.") ("rust-system-deps" ,rust-system-deps-6)) #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) - ("rust-tempfile" ,rust-tempfile-3)))) - (native-inputs - (list pkg-config)) - (inputs - ;; XXX: Should these be propagated from their respective crates? - (list cairo glib pango)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgtk-3") - (description "This package provides FFI bindings to libgtk-3.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-soup-sys-0.10 (package diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1165f8b8a6..d42ff60a20 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> ;;; Copyright © 2022 Paul Alesius <paul@unnservice.com> ;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com> +;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,9 +59,11 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages bash) + #:use-module (gnu packages c) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -79,6 +82,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages mail) + #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages nettle) #:use-module (gnu packages pcre) @@ -152,6 +156,109 @@ rasterizing OpenType font glyphs.") cubic beziers.") (license license:asl2.0))) +(define-public rust-abi-stable-0.10 + (package + (name "rust-abi-stable") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03vg0cl0727whv7nxyvm8g9xfwxnfcdn8p872jqw1z6n84yjix7s")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)," + " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") + _ version _) + (string-append ">=" version))))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-abi-stable-derive" ,rust-abi-stable-derive-0.10) + ("rust-abi-stable-shared" ,rust-abi-stable-shared-0.10) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-generational-arena" ,rust-generational-arena-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-lock-api" ,rust-lock-api-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-paste" ,rust-paste-1) + ("rust-repr-offset" ,rust-repr-offset-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-fnv" ,rust-fnv-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Rust-to-Rust ffi,writing libraries loaded at program startup") + (description + "This package contains code for doing Rust-to-Rust ffi,writing libraries +loaded at program startup.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-abi-stable-derive-0.10 + (package + (name "rust-abi-stable-derive") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w503n9rxja3h8ls6p5xsly8aclbp30dm4hd0525bvpbippi161v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=sabi_trait::tests::sabi_trait_test_cases" + "--skip=stable_abi::tests::test_cases") + #:cargo-inputs + (("rust-abi-stable-shared" ,rust-abi-stable-shared-0.10) + ("rust-as-derive-utils" ,rust-as-derive-utils-0.10) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-syn" ,rust-syn-1) + ("rust-typed-arena" ,rust-typed-arena-2)) + #:cargo-development-inputs + (("rust-as-derive-utils" ,rust-as-derive-utils-0.10)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Implementation detail of abi_stable.") + (description "This package contains an implementation detail of abi_stable.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-abi-stable-shared-0.10 + (package + (name "rust-abi-stable-shared") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi-stable-shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0psaz0vghdz84vrb311g4b74d2nhrlbmwxa8if88s0bf0s4xmsgc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-core-extensions" ,rust-core-extensions-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Implementation detail of abi_stable") + (description "This package contains an implementation detail of abi_stable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-abomonation-0.7 (package (name "rust-abomonation") @@ -1551,7 +1658,7 @@ Rust.") ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-1) - ("rust-actix-web" ,rust-actix-web-2)))))) + ("rust-actix-web" ,rust-actix-web-3)))))) (define-public rust-actix-web-codegen-0.1 (package @@ -1764,9 +1871,17 @@ Rust, using gimli.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sw16zqy6w0ar633z69m7lw6gb0k1y7xj3387a8wly43ij5div5r")))) + "0sw16zqy6w0ar633z69m7lw6gb0k1y7xj3387a8wly43ij5div5r")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml.orig" + (("(cpp_demangle =.*)default-features = false,(.*)" _ first last) + (string-append first last)) + ((".*auxiliary.*") "")) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (arguments - `(#:tests? #false ;use of undeclared crate or module `auxiliary` + `(#:tests? #false ; Not all files included. #:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-cpp-demangle" ,rust-cpp-demangle-0.3) @@ -2106,6 +2221,32 @@ ciphers implementations.") ("rust-aesni" ,rust-aesni-0.6) ("rust-block-cipher-trait" ,rust-block-cipher-trait-0.6)))))) +(define-public rust-aes-ctr-0.6 + (package + (name "rust-aes-ctr") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "aes-ctr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qspjxzrclnb83501595y01dhc0km1ssrbjnwlxhcrsdwp6w6abp")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-aesni" ,rust-aesni-0.10) + ("rust-aes-soft" ,rust-aes-soft-0.6) + ("rust-cipher" ,rust-cipher-0.2) + ("rust-ctr" ,rust-ctr-0.6)) + #:cargo-development-inputs `(("rust-cipher" ,rust-cipher-0.2)))) + (home-page "https://github.com/RustCrypto/block-ciphers/tree/master/aes") + (synopsis "Pure Rust implementation of AES") + (description + "A pure Rust implementation of the @acronym{AES, Advanced Encryption +Standard}. Use the AES crate if possible, as the aes-ctr has been into it.") + (license (list license:expat license:asl2.0)))) + (define-public rust-aes-gcm-0.10 (package (name "rust-aes-gcm") @@ -2318,7 +2459,8 @@ This package is deprecated and was replaced by the @code{aes} crate.") (base32 "0r6j0mjkyqnwvgib01cvrwfw8rlx1biw75234niv723n1fdx6l6h")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-block-cipher" ,rust-block-cipher-0.7) ("rust-opaque-debug" ,rust-opaque-debug-0.2) ("rust-stream-cipher" ,rust-stream-cipher-0.4)) @@ -2371,7 +2513,10 @@ This package is deprecated and was replaced by the @code{aes} crate.") #:cargo-development-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-tempfile" ,rust-tempfile-3)))) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + ;; Custom archive file for test suite. + (delete 'check-for-pregenerated-files)))) (home-page "https://github.com/rust-fuzz/afl.rs") (synopsis "Fuzzing Rust code with american-fuzzy-lop") @@ -2394,7 +2539,7 @@ This package is deprecated and was replaced by the @code{aes} crate.") (base32 "1rw11hycfjhqbc7z1smn75m0sczq519msjwimxh7b8s6n4pzk5r7")))) (arguments - `(#:skip-build? #t + `(#:skip-build? #t ; Build wants AFL #:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-clap" ,rust-clap-2) @@ -2404,7 +2549,10 @@ This package is deprecated and was replaced by the @code{aes} crate.") ("rust-xdg" ,rust-xdg-2)) #:cargo-development-inputs (("rust-rustc-version" ,rust-rustc-version-0.2) - ("rust-xdg" ,rust-xdg-2)))))) + ("rust-xdg" ,rust-xdg-2)) + #:phases (modify-phases %standard-phases + ;; Custom archive file for test suite. + (delete 'check-for-pregenerated-files)))))) (define-public rust-ahash-0.8 (package @@ -2448,24 +2596,31 @@ high performance.") (define-public rust-ahash-0.7 (package (name "rust-ahash") - (version "0.7.4") + (version "0.7.6") (source (origin (method url-fetch) (uri (crate-uri "ahash" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "163vy6jcd7r3jczsv4zyhlc5x9dqsfgg1yrqbm3xhygr1czq7fs3")))) + (base32 "0isw672fiwx8cjl040jrck6pi85xcszkz6q0xsqkiy6qjl31mdgw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-const-random" ,rust-const-random-0.1) ("rust-getrandom" ,rust-getrandom-0.2) ("rust-once-cell" ,rust-once-cell-1) ("rust-serde" ,rust-serde-1) - ("rust-version-check" ,rust-version-check-0.9)))) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-no-panic" ,rust-no-panic-0.1) + ("rust-rand" ,rust-rand-0.7) + ("rust-seahash" ,rust-seahash-4) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/tkaitchuck/ahash") (synopsis "Non-cryptographic hash function using AES-NI") (description "This package provides a non-cryptographic hash function @@ -2635,6 +2790,28 @@ using AES-NI for high performance.") ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-al-sys-0.6 + (package + (name "rust-al-sys") + (version "0.6.1") + (source (origin + (method url-fetch) + (uri (crate-uri "al-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08whlcfrhn4gqi4nbglkdqv5ysdpnvnlsqg51q34q9hh9l7rp3gz")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-cmake" ,rust-cmake-0.1) + ("rust-libloading" ,rust-libloading-0.5) + ("rust-rental" ,rust-rental-0.5)))) + (home-page "https://github.com/jpernst/alto") + (synopsis "Raw bindings for OpenAL 1.1") + (description "Rust bindings for OpenAL, this crate contains FFI elements.") + (license (list license:expat license:asl2.0)))) + (define-public rust-alacritty-config-0.1 (package (name "rust-alacritty-config") @@ -2917,6 +3094,125 @@ be used with the stdlib.") (description "Mirror of Rust's allocator API.") (license (list license:expat license:asl2.0)))) +(define-public rust-alsa-0.7 + (package + (name "rust-alsa") + (version "0.7.1") + (source (origin + (method url-fetch) + (uri (crate-uri "alsa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0iwbdgb6lr81iji9sr4f91mys24pia5avnkgbkv8kxzhvkc2lmp2")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-test-flags `(list "--release" + ;; Not the doc tests. + "--lib" "--bins" "--tests" + "--" + ;; These try to use the audio interface + "--skip=pcm::drop" + "--skip=pcm::info_from_default" + "--skip=pcm::playback_to_default" + "--skip=pcm::record_from_default" + "--skip=seq::print_seqs" + "--skip=seq::seq_loopback" + "--skip=seq::seq_portsubscribeiter" + "--skip=seq::seq_subscribe") + #:cargo-inputs `(("rust-alsa-sys" ,rust-alsa-sys-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.24)))) + (native-inputs (list pkg-config alsa-lib)) + (home-page "https://github.com/diwic/alsa-rs") + (synopsis "Thin and safe wrapper around ALSA") + (description + "A thin and safe wrapper around ALSA. Provides APIs for +many parts of ALSA including audio playback, audio recording, HCtl API, raw +MIDI and MIDI sequencer.") + (license license:expat))) + +(define-public rust-alsa-0.6 + (package + (inherit rust-alsa-0.7) + (name "rust-alsa") + (version "0.6.0") + (source (origin + (method url-fetch) + (uri (crate-uri "alsa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0szx8finhqbffh08fp3bgh4ywz0b572vcdyh4hwyhrfgw8pza5ar")))) + (arguments + (list #:cargo-test-flags `(list "--release" + ;; Not the doc tests. + "--lib" "--bins" "--tests" + "--" + ;; These try to use the audio interface + "--skip=pcm::drop" + "--skip=pcm::info_from_default" + "--skip=pcm::playback_to_default" + "--skip=pcm::record_from_default" + "--skip=seq::print_seqs" + "--skip=seq::seq_loopback" + "--skip=seq::seq_portsubscribeiter" + "--skip=seq::seq_subscribe") + #:cargo-inputs `(("rust-alsa-sys" ,rust-alsa-sys-0.3) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.23)))))) + +(define-public rust-alsa-sys-0.3 + (package + (name "rust-alsa-sys") + (version "0.3.1") + (source (origin + (method url-fetch) + (uri (crate-uri "alsa-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09qmmnpmlcj23zcgx2xsi4phcgm5i02g9xaf801y7i067mkfx3yv")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f ; doc tests fail + #:cargo-inputs `(("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config alsa-lib)) + (home-page "https://github.com/diwic/alsa-sys") + (synopsis "FFI bindings for the ALSA sound API") + (description + "FFI bindings for the ALSA sound API. This package contains +the code to interact with the underlying operating system ALSA interface.") + (license license:expat))) + +(define-public rust-alto-3 + (package + (name "rust-alto") + (version "3.0.4") + (source (origin + (method url-fetch) + (uri (crate-uri "alto" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rgsdmh346s3rwhzqacjc6nz7jap4dd72c1gfmkaq9sgzh9fhnyp")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f ; Not all files included. + #:cargo-inputs + `(("rust-al-sys" ,rust-al-sys-0.6) + ("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-parking-lot" ,rust-parking-lot-0.4)))) + (home-page "https://github.com/jpernst/alto") + (synopsis + "Idiomatic Rust bindings for OpenAL 1.1 and extensions (including EFX)") + (description + "Rust bindings for OpenAL 1.1 and extensions (including EFX).") + (license (list license:expat license:asl2.0)))) + (define-public rust-always-assert-0.1 (package (name "rust-always-assert") @@ -3793,6 +4089,26 @@ initializing large arrays (greater than 32 elements), or arrays of types which do not implement the copy or default traits.") (license (list license:expat license:asl2.0)))) +(define-public rust-array-init-2 + (package + (name "rust-array-init") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "array-init" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z0bh6grrkxlbknq3xyipp42rasngi806y92fiddyb2n99lvfqix")))) + (build-system cargo-build-system) + (home-page "https://github.com/Manishearth/array-init/") + (synopsis "Safe wrapper for initializing fixed-size arrays") + (description + "A crate that removes the need to fill an array before running +initialisers. Provides an init closure that's called for each element of the +array.") + (license (list license:expat license:asl2.0)))) + (define-public rust-array-macro-1 (package (name "rust-array-macro") @@ -3863,21 +4179,19 @@ structures.") (define-public rust-arrayvec-0.7 (package (name "rust-arrayvec") - (version "0.7.2") + (version "0.7.4") (source (origin (method url-fetch) (uri (crate-uri "arrayvec" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1mjl8jjqxpl0x7sm9cij61cppi7yi38cdrd1l8zjw7h7qxk2v9cd")))) + (base32 "04b7n722jij0v3fnm3qk072d5ysc2q30rl9fz33zpfhzah30mlwn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1)) + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) ("rust-matches" ,rust-matches-0.1) @@ -4097,6 +4411,101 @@ the web.") ;; No copyright headers in the source code. LICENSE indicates gpl3. (license license:gpl3))) +(define-public rust-as-derive-utils-0.10 + (package + (name "rust-as-derive-utils") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "as-derive-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16qxh5q7gn6vnzk20g7vaj76f4dd74zkn66fv638ryyfjnj6z8p0")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)," + " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") + _ version _) + (string-append ">=" version))))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Only doc tests, which fail. + #:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-ron" ,rust-ron-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Private derive utilities used by abi_stable and structural") + (description "This package contains private derive utilities used by +the abi_stable and structural crates.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-as-derive-utils-0.8 + (package + (inherit rust-as-derive-utils-0.10) + (name "rust-as-derive-utils") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "as-derive-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rjmbasb2spxdmm47kzw2zmr8icbdrcr0wa9kyn7lim5c0idh69b")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (arguments + `(#:cargo-inputs + (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-core-extensions" ,rust-core-extensions-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-ron" ,rust-ron-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-asio-sys-0.2 + (package + (name "rust-asio-sys") + (version "0.2.1") + (source (origin + (method url-fetch) + (uri (crate-uri "asio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16lbavksj2aasadyxbdnbrll6a1m8cwl4skbxgbvr1ma2wpwv82c")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #t + #:cargo-inputs `(("rust-bindgen" ,rust-bindgen-0.56) + ("rust-cc" ,rust-cc-1) + ("rust-num-derive" ,rust-num-derive-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/RustAudio/cpal/") + (synopsis + "Low-level interface and binding generation for the Steinberg ASIO SDK") + (description + "Low-level interface and binding generation for the Steinberg ASIO SDK.") + (license license:asl2.0))) + (define-public rust-askama-escape-0.10 (package (name "rust-askama-escape") @@ -4203,8 +4612,32 @@ Askama.") library for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-asn1-derive-0.15 + (package + (name "rust-asn1-derive") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "asn1-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1771kfjycjs4g2acqvxpjy3igfcgg8hychczl1lsqq64za4gj6l6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/alex/rust-asn1") + (synopsis "#[derive] support for asn1") + (description + "This package provides #[derive] support for @code{asn1}.") + (license license:bsd-3))) + (define-public rust-asn1-derive-0.13 (package + (inherit rust-asn1-derive-0.15) (name "rust-asn1-derive") (version "0.13.0") (source (origin @@ -4214,21 +4647,39 @@ library for Rust.") (sha256 (base32 "1bvqriazb23gysygpzng1dhzjgnlv274q2yj5gpmlpl7jp0pkaxz")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-asn1-0.15 + (package + (name "rust-asn1") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "asn1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nzg1gjiyfvpvrf3i7i8j21165snf5livqg6x2sjf9m2i77cngmf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-asn1-derive" ,rust-asn1-derive-0.15)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2)))) (home-page "https://github.com/alex/rust-asn1") - (synopsis "#[derive] support for asn1") + (synopsis "ASN.1 (DER) parser and writer") (description - "This package provides #[derive] support for @code{asn1}.") + "This is a Rust library for parsing and generating ASN.1 data (DER only).") (license license:bsd-3))) (define-public rust-asn1-0.13 (package + (inherit rust-asn1-0.15) (name "rust-asn1") (version "0.13.0") (source (origin @@ -4238,18 +4689,12 @@ library for Rust.") (sha256 (base32 "1idxxw14h3dvrj72k4g0hx1aqigd986a00cg0yxfw2gfc9gbmzra")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-asn1-derive" ,rust-asn1-derive-0.13) ("rust-chrono" ,rust-chrono-0.4)) #:cargo-development-inputs - (("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/alex/rust-asn1") - (synopsis "ASN.1 (DER) parser and writer") - (description - "This is a Rust library for parsing and generating ASN.1 data (DER only).") - (license license:bsd-3))) + (("rust-libc" ,rust-libc-0.2)))))) (define-public rust-asn1-rs-0.5 (package @@ -4334,6 +4779,24 @@ library for Rust.") "This package provides implementation details for the @code{asn1-rs} crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-as-raw-xcb-connection-1 + (package + (name "rust-as-raw-xcb-connection") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "as-raw-xcb-connection" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1am99fbsp5f5vnbvr0qnjma36q49c9zvdbn0czwwvian18mk2prd")))) + (build-system cargo-build-system) + (home-page "https://github.com/psychon/as-raw-xcb-connection") + (synopsis "Trait to facilitate interoperatibility with libxcb C API") + (description "This package provides trait to facilitate interoperatibility +with @code{libxcb} C API.") + (license (list license:expat license:asl2.0)))) + (define-public rust-as-slice-0.2 (package (name "rust-as-slice") @@ -4528,26 +4991,27 @@ approximately equal.") (define-public rust-assert-cmd-2 (package (name "rust-assert-cmd") - (version "2.0.4") + (version "2.0.12") (source (origin (method url-fetch) (uri (crate-uri "assert_cmd" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gpqwasl690zimy13rn614mpzgykpa09v5xivs4pdmpg77fivblk")))) + (base32 "1rnzd84nqijp147nld05j5j92xpj2j57zfrm6c0d9r138yqkr448")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bstr" ,rust-bstr-0.2) - ("rust-concolor" ,rust-concolor-0.0.8) + `(#:cargo-inputs + (("rust-anstream" ,rust-anstream-0.3) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-bstr" ,rust-bstr-1) ("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-predicates" ,rust-predicates-2) + ("rust-predicates" ,rust-predicates-3) ("rust-predicates-core" ,rust-predicates-core-1) ("rust-predicates-tree" ,rust-predicates-tree-1) - ("rust-wait-timeout" ,rust-wait-timeout-0.2) - ("rust-yansi" ,rust-yansi-0.5)))) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)) + #:cargo-development-inputs + (("rust-escargot" ,rust-escargot-0.5)))) (home-page "https://github.com/assert-rs/assert_cmd") (synopsis "Test CLI Applications") (description "@code{assert_cmd} aims to simplify the process for doing @@ -5781,6 +6245,60 @@ they're not available.") ("rust-termion" ,rust-termion-1) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-auto-impl-0.5 + (package + (name "rust-auto-impl") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "auto-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "195d6s9bfcchwizf3km1g69l74f6xvm5gl9505js2r9xi4ff4qkq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=ui_compile_fail") + #:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/auto-impl-rs/auto_impl/") + (synopsis + "Automatically implement traits for common smart pointers and closures") + (description + "Automatically implement traits for common smart pointers and closures.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-auto-impl-0.4 + (package + (inherit rust-auto-impl-0.5) + (name "rust-auto-impl") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "auto-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0f0aildq7rl7imgl6x6xw8jg4m08xz9q1bpcrmf5xnhar23gbjs2")))) + (arguments + `(#:cargo-test-flags + (list "--release" "--" "--skip=ui") + #:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))))) + (define-public rust-autocompress-0.2 (package (name "rust-autocompress") @@ -5796,15 +6314,7 @@ they're not available.") (arguments (list #:tests? #false ;The crate does not include test files - #:phases - '(modify-phases %standard-phases - (add-before 'patch-cargo-checksums 'do-not-build-xz - (lambda _ - ;; Detection of liblzma (in rust-lzma-sys, pulled in by - ;; rust-hts-sys) doesn't seem to work, or perhaps it really does - ;; request a static build somewhere. - (substitute* "guix-vendor/rust-lzma-sys-0.1.17.tar.xz/build.rs" - (("if .want_static && .msvc && pkg_config::probe_library\\(\"liblzma\"\\).is_ok\\(\\)") ""))))) + #:skip-build? #t ; could not find `block` in `zstd` #:cargo-inputs `(("rust-brotli" ,rust-brotli-3) ("rust-bzip2" ,rust-bzip2-0.4) @@ -5821,6 +6331,7 @@ they're not available.") ("rust-rand" ,rust-rand-0.8) ("rust-temp-testdir" ,rust-temp-testdir-0.2)))) (inputs (list xz)) + (native-inputs (list pkg-config)) (home-page "https://github.com/informationsea/autocompress-rs") (synopsis "Select decoder from magic bytes or encoder from file extension") (description @@ -6356,6 +6867,10 @@ embedded-friendly no_std support.") (base32 "1ykwx8jhksqxghfgyw2pzikzjf4n9wqm1x2ww5wqyn68ssf6dki3")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.7) + ("rust-rand" ,rust-rand-0.5)))) (home-page "https://github.com/andreasots/base32") (synopsis "Base32 encoder/decoder for Rust") (description "This library lets you encode and decode in either @@ -7003,6 +7518,41 @@ bindings to C and C++ libraries.") (inputs (list clang)))) +(define-public rust-bindgen-0.56 + (package + (inherit rust-bindgen-0.57) + (name "rust-bindgen") + (version "0.56.0") + (source (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fajmgk2064ca1z9iq1jjkji63qwwz38z3d67kv6xdy0xgdpk8rd")))) + (arguments + (list #:cargo-test-flags ``("--release" "--" + "--skip=test::commandline_multiple_headers") + #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.4) + ("rust-clang-sys" ,rust-clang-sys-1) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-3)) + #:cargo-development-inputs `(("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-shlex" ,rust-shlex-0.1)))) + (inputs (list clang)))) + (define-public rust-bindgen-0.55 (package (inherit rust-bindgen-0.57) @@ -7736,14 +8286,14 @@ types.") (define-public rust-bitflags-2 (package (name "rust-bitflags") - (version "2.3.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (crate-uri "bitflags" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hifjw3191g3w5cwqqvbx8knrr3zchdwfc3rs6mn11p5si9yf2v3")))) + (base32 "0dc6xa7flfl59makmhixjcrslwlvdxxwrgxbr8p7bkvz53k2ls5l")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. @@ -8095,8 +8645,32 @@ streams in big-endian and little-endian formats.") ("rust-serde-test" ,rust-serde-test-1) ("rust-static-assertions" ,rust-static-assertions-1)))))) +(define-public rust-blake2-0.10 + (package + (name "rust-blake2") + (version "0.10.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "blake2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zlf7w7gql12v61d9jcbbswa3dw8qxsjglylsiljp9f9b3a2ll26")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-digest" ,rust-digest-0.10)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.10) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "BLAKE2 hash functions") + (description "This package provides BLAKE2 hash functions in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-blake2-0.9 (package + (inherit rust-blake2-0.10) (name "rust-blake2") (version "0.9.2") (source @@ -8106,7 +8680,6 @@ streams in big-endian and little-endian formats.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0x7i67c0hn3bzcwny08rgjrrnarqnqw10qpmh2blbx9hd78kfkha")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-crypto-mac" ,rust-crypto-mac-0.8) @@ -8115,14 +8688,11 @@ streams in big-endian and little-endian formats.") #:cargo-development-inputs (("rust-crypto-mac" ,rust-crypto-mac-0.8) ("rust-digest" ,rust-digest-0.9) - ("rust-hex-literal" ,rust-hex-literal-0.2)))) - (home-page "https://github.com/RustCrypto/hashes") - (synopsis "BLAKE2 hash functions") - (description "This package provides BLAKE2 hash functions in Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-hex-literal" ,rust-hex-literal-0.2)))))) (define-public rust-blake2-0.8 (package + (inherit rust-blake2-0.10) (name "rust-blake2") (version "0.8.1") (source @@ -8134,7 +8704,6 @@ streams in big-endian and little-endian formats.") (sha256 (base32 "0c4k11j04kqhkci6i9b7lz6p13kpcv228pdqixgrawvavaq0gjwl")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-byte-tools" ,rust-byte-tools-0.3) @@ -8144,11 +8713,7 @@ streams in big-endian and little-endian formats.") #:cargo-development-inputs (("rust-crypto-mac" ,rust-crypto-mac-0.7) ("rust-digest" ,rust-digest-0.8) - ("rust-hex-literal" ,rust-hex-literal-0.1)))) - (home-page "https://github.com/RustCrypto/hashes") - (synopsis "BLAKE2 hash functions") - (description "This package provides BLAKE2 hash functions in Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-hex-literal" ,rust-hex-literal-0.1)))))) (define-public rust-blake2b-simd-1 (package @@ -8999,6 +9564,50 @@ and kernels.") decompression and compression to Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-browserslist-rs-0.6 + (package + (name "rust-browserslist-rs") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "browserslist-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19l0prgnbx0cyqvjsf30ni7d87nkn8j0fj56fg259yvfh50if1ri")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.7) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-either" ,rust-either-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-napi" ,rust-napi-2) + ("rust-napi-build" ,rust-napi-build-1) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-nom" ,rust-nom-7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-wasm-bindgen" ,rust-serde-wasm-bindgen-0.3) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-test-case" ,rust-test-case-1)))) + (home-page "https://github.com/browserslist/browserslist-rs") + (synopsis "Rust-ported Browserslist") + (description "Rust-ported Browserslist.") + (license license:expat))) + (define-public rust-bs58-0.2 (package (name "rust-bs58") @@ -10977,9 +11586,22 @@ supported by Cargo.") (sha256 (base32 "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755")))) - (arguments '()) - (inputs '()) - (native-inputs '()))) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-crypto-hash" ,rust-crypto-hash-0.3) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-jobserver" ,rust-jobserver-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-miow" ,rust-miow-0.3) + ("rust-same-file" ,rust-same-file-1) + ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-cassowary-0.3 (package @@ -11424,6 +12046,26 @@ chain, the first matching branch is the item that gets emitted.") (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) +(define-public rust-chan-0.1 + (package + (name "rust-chan") + (version "0.1.23") + (source (origin + (method url-fetch) + (uri (crate-uri "chan" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1n0y992mqfk5zpxzvrv14g9qivacmd4fiv4j1nmgyrg0vaimcjfi")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/BurntSushi/chan") + (synopsis "DEPRECATED. Use crossbeam-channel instead") + (description "DEPRECATED. Use crossbeam-channel instead.") + (license (list license:unlicense license:expat)))) + (define-public rust-chacha20-0.8 (package (name "rust-chacha20") @@ -11944,24 +12586,24 @@ usage.") (define-public rust-clang-ast-0.1 (package (name "rust-clang-ast") - (version "0.1.6") + (version "0.1.20") (source (origin (method url-fetch) (uri (crate-uri "clang-ast" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sfqyxszas78s78nga88fl0i5qlr87qsj22vlxarhvx96q86impf")))) + (base32 "04qf9kpc2r3ca7c5x8bjp1daj42k69q12q8mz7bhajbm9rpafb8m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ; Uses unstable features. + `(#:tests? #f ; Fails to build clang-ast-test-suite. #:cargo-inputs - (("rust-serde" ,rust-serde-1)) + (("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-clang-ast-test-suite" ,rust-clang-ast-test-suite-0.0.0) - ("rust-serde" ,rust-serde-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/dtolnay/clang-ast") (synopsis "Data structures for processing Clang's ast format") @@ -12016,6 +12658,25 @@ usage.") (description "This package provides Rust bindings for libclang.") (license license:asl2.0))) +(define-public rust-claxon-0.4 + (package + (name "rust-claxon") + (version "0.4.3") + (source (origin + (method url-fetch) + (uri (crate-uri "claxon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1206mxvw833ysg10029apcsjjwly8zmsvksgza5cm7ma4ikzbysb")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #t)) ; Cut the dependency graph. + (home-page "https://github.com/ruuda/claxon#readme") + (synopsis "FLAC decoding library") + (description "This package provides a FLAC decoding library.") + (license license:asl2.0))) + (define-public rust-cipher-0.4 (package (name "rust-cipher") @@ -12638,6 +13299,26 @@ stream of tokens.") (description "This package provides a manpage generator for clap.") (license (list license:expat license:asl2.0)))) +(define-public rust-clap-mangen-0.1 + (package + (inherit rust-clap-mangen-0.2) + (name "rust-clap-mangen") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap-mangen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zrpsp2lfrm1cgwsi7vlv9xlk4nbxrwnqksfbrgqsf3jbb080l8h")))) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-roff" ,rust-roff-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-3) + ("rust-snapbox" ,rust-snapbox-0.2)))))) + (define-public rust-clearscreen-1 (package (name "rust-clearscreen") @@ -13609,14 +14290,18 @@ idiomatic wrappers for Mac OS X's CommonCrypto library.") (define-public rust-compact-str-0.7 (package (name "rust-compact-str") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "compact_str" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lbk5vkn6vriwx98pybfsgy093ga6ilpm5gkcd8v7cgcg5gq1w5z")))) + "0gvvfc2c6pg1rwr2w36ra4674w3lzwg97vq2v6k791w30169qszq")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("1\\.0\\.\\*") "1.0.0")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -13639,6 +14324,7 @@ idiomatic wrappers for Mac OS X's CommonCrypto library.") ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) ("rust-rayon" ,rust-rayon-1) + ("rust-rkyv" ,rust-rkyv-0.7) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-test-case" ,rust-test-case-2) @@ -14484,8 +15170,33 @@ generation.") "This package provides a sha1 implementation for use in const contexts.") (license (list license:asl2.0 license:expat)))) +(define-public rust-constant-time-eq-0.3 + (package + (name "rust-constant-time-eq") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "constant-time-eq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hl0y8frzlhpr58rh8rlg4bm53ax09ikj2i5fk7gpyphvhq4s57p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-count-instructions" ,rust-count-instructions-0.1) + ("rust-criterion" ,rust-criterion-0.5)))) + (home-page "https://github.com/cesarb/constant_time_eq") + (synopsis + "Compares two equal-sized byte strings in constant time") + (description + "This package compares two equal-sized byte strings in constant time. +It is inspired by the Linux kernel's @code{crypto_memneq}.") + (license (list license:cc0 license:expat-0 license:asl2.0)))) + (define-public rust-constant-time-eq-0.2 (package + (inherit rust-constant-time-eq-0.3) (name "rust-constant-time-eq") (version "0.2.5") (source (origin @@ -14495,16 +15206,8 @@ generation.") (sha256 (base32 "0sy7bs12dfa2d5hw7759b0mvjqcs85giajg4qyg39xq8a1s8wh8k")))) - (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)))) - (home-page "https://github.com/cesarb/constant_time_eq") - (synopsis - "Compares two equal-sized byte strings in constant time") - (description - "This package compares two equal-sized byte strings in constant time. -It is inspired by the Linux kernel's @code{crypto_memneq}.") - (license (list license:cc0 license:expat-0 license:asl2.0)))) + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4)))))) (define-public rust-constant-time-eq-0.1 (package @@ -14576,27 +15279,57 @@ to guess the type of content.") semantics than those provided by @code{as} or @code{From}/@code{Into}.") (license license:expat))) -(define-public rust-convert-case-0.4 +(define-public rust-convert-case-0.6 (package (name "rust-convert-case") - (version "0.4.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "convert-case" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03jaf1wrsyqzcaah9jf8l1iznvdw5mlsca2qghhzr9w27sddaib2")))) + (base32 "1jn1pq6fp3rri88zyw6jlhwwgf6qiyc08d6gjv0qypgkl862n67c")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + (list "--release" "--" + "--skip=case::Case::PseudoRandom" + "--skip=case::Case::Random" + "--skip=pattern::Pattern::PseudoRandom") #:cargo-inputs - (("rust-rand" ,rust-rand-0.7)))) + (("rust-rand" ,rust-rand-0.7) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)) + #:cargo-development-inputs + (("rust-strum" ,rust-strum-0.18) + ("rust-strum-macros" ,rust-strum-macros-0.18)))) (home-page "https://github.com/rutrum/convert-case") (synopsis "Convert strings into any case") (description "Convert strings into any case.") (license license:expat))) +(define-public rust-convert-case-0.4 + (package + (inherit rust-convert-case-0.6) + (name "rust-convert-case") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "convert-case" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03jaf1wrsyqzcaah9jf8l1iznvdw5mlsca2qghhzr9w27sddaib2")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rand" ,rust-rand-0.7)))))) + (define-public rust-cookie-0.17 (package (name "rust-cookie") @@ -14680,6 +15413,31 @@ It supports signed and private (encrypted + signed) jars.") ("rust-time" ,rust-time-0.2) ("rust-version-check" ,rust-version-check-0.9)))))) +(define-public rust-cookie-0.14 + (package + (inherit rust-cookie-0.15) + (name "rust-cookie") + (version "0.14.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "cookie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ldryjb41r8n0ar2pya0bajlxr8s4j59fjkmyi5ppg1932rdg983")))) + (arguments + `(#:cargo-inputs + (("rust-aes-gcm" ,rust-aes-gcm-0.8) + ("rust-base64" ,rust-base64-0.13) + ("rust-hkdf" ,rust-hkdf-0.10) + ("rust-hmac" ,rust-hmac-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-time" ,rust-time-0.2) + ("rust-version-check" ,rust-version-check-0.9)))))) + (define-public rust-cookie-0.12 (package (inherit rust-cookie-0.15) @@ -14863,51 +15621,156 @@ contents of the OS-level clipboard.") numbers using the CORDIC method.") (license license:bsd-3))) -(define-public rust-core2-0.3 +(define-public rust-coreaudio-rs-0.10 (package - (name "rust-core2") - (version "0.3.3") + (name "rust-coreaudio-rs") + (version "0.10.0") + (source (origin + (method url-fetch) + (uri (crate-uri "coreaudio-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "125d4zr3n363ybga4629p41ym7iqjfb2alnwrc1zj7zyxch4p28i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Only builds for macos or ios. + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-coreaudio-sys" ,rust-coreaudio-sys-0.2)))) + (home-page "https://github.com/RustAudio/coreaudio-rs") + (synopsis "Rust interface for Apple's CoreAudio API") + (description + "This package provides a rust interface for Apple's CoreAudio API.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-coreaudio-sys-0.2 + (package + (name "rust-coreaudio-sys") + (version "0.2.12") + (source (origin + (method url-fetch) + (uri (crate-uri "coreaudio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "091b4sq3kl8n4dy86l4mxq9vjzsn8w8b51xzfcpxwjkciqjv4d7h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Only builds for macos or ios. + #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.64)))) + (home-page "https://github.com/RustAudio/coreaudio-sys") + (synopsis + "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen") + (description + "Bindings for Apple's CoreAudio frameworks generated via rust-bindgen.") + (license license:expat))) + +(define-public rust-core-extensions-1 + (package + (name "rust-core-extensions") + (version "1.5.3") (source - (origin - (method url-fetch) - (uri (crate-uri "core2" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1wzzy5iazdk5caadxvjfwrd312rbg7a55a1zpmsdrhk3kfpa77r3")))) + (origin + (method url-fetch) + (uri (crate-uri "core-extensions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vn0jsn8nbi76i2jjadim31piscf0hv8640ng9z608cpgk01viwj")))) (build-system cargo-build-system) - (arguments `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))) - (home-page "https://github.com/bbqsrc/core2") - (synopsis "Bare essentials of @code{std::io} for use in @code{no_std}") + (arguments + `(#:tests? #f ; tests must be run with the "__test" feature + #:cargo-inputs + (("rust-core-extensions-proc-macros" ,rust-core-extensions-proc-macros-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/rodrimati1992/core_extensions") + (synopsis + "Extensions for core/std library types, and other miscelaneous features") (description - "This package provides the bare essentials of @code{std::io} for use -in @code{no_std}. Alloc support is optional.") - (license (list license:asl2.0 license:expat)))) + "Extensions for core/std library types, and other miscelaneous features.") + (license (list license:expat license:asl2.0)))) -(define-public rust-cookie-0.14 +(define-public rust-core-extensions-0.1 (package - (inherit rust-cookie-0.15) - (name "rust-cookie") - (version "0.14.2") + (inherit rust-core-extensions-1) + (name "rust-core-extensions") + (version "0.1.20") (source (origin (method url-fetch) - (uri (crate-uri "cookie" version)) + (uri (crate-uri "core-extensions" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1q56fl2cqrci9ksa80d7g220phq02nf1yfbvxkpk9g1p95ma2wqk")))) + (base32 "1nhgd5rlgp679qm4g3x806ywwhm6qr1y2j3y90wzjgyqllf7w49s")))) + (arguments + `(#:skip-build? #t ; failed to resolve: could not find `export` in `_serde` + #:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + +(define-public rust-core-extensions-proc-macros-1 + (package + (name "rust-core-extensions-proc-macros") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-extensions-proc-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19k11haw8s00zxxignjmw0ian0q85r9grhbvr153nvlbs8cv5wv9")))) + (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-aes-gcm" ,rust-aes-gcm-0.6) - ("rust-base64" ,rust-base64-0.12) - ("rust-hkdf" ,rust-hkdf-0.9) - ("rust-hmac" ,rust-hmac-0.8) - ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-rand" ,rust-rand-0.7) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-time" ,rust-time-0.2)) + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-version-check" ,rust-version-check-0.9)))))) + (("rust-proc-macro2" ,rust-proc-macro2-1)))) + (home-page "https://github.com/rodrimati1992/core_extensions") + (synopsis "Implementation detail of the @code{core_extensions} crate") + (description "Implementation detail of the @code{core_extensions} crate.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-core2-0.4 + (package + (name "rust-core2") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "core2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01f5xv0kf3ds3xm7byg78hycbanb8zlpvsfv4j47y46n3bpsg6xl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))) + (home-page "https://github.com/bbqsrc/core2") + (synopsis "Bare essentials of @code{std::io} for use in @code{no_std}") + (description + "This package provides the bare essentials of @code{std::io} for use +in @code{no_std}. Alloc support is optional.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-core2-0.3 + (package + (inherit rust-core2-0.4) + (name "rust-core2") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "core2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wzzy5iazdk5caadxvjfwrd312rbg7a55a1zpmsdrhk3kfpa77r3")))) + (arguments `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2)))))) (define-public rust-cookie-store-0.19 (package @@ -15172,14 +16035,14 @@ intrinsics.") (package (inherit rust-core-foundation-sys-0.8) (name "rust-core-foundation-sys") - (version "0.7.2") + (version "0.7.0") (source (origin (method url-fetch) (uri (crate-uri "core-foundation-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ghrg46h4ci306agr2vwm28w6gb5l455nzp61y2zkhwfs49p4nis")))))) + (base32 "1b5qfnnmg49sawwfsb0c0wbj81bqi7h7lh68pmhbidf0jjs1m9xk")))))) (define-public rust-core-foundation-sys-0.6 (package @@ -15257,6 +16120,27 @@ intrinsics.") (description "This package provides a Manual coverage marks.") (license (list license:expat license:asl2.0)))) +(define-public rust-count-instructions-0.1 + (package + (name "rust-count-instructions") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "count-instructions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ps0254pvx3nmnxs2v60kv7fqayh82r3jqypb4l3ql3i7s3rzr1n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rustix" ,rust-rustix-0.38)))) + (home-page "https://github.com/cesarb/count_instructions") + (synopsis "Counts the instructions executed within a single function") + (description "Counts the instructions executed within a single function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-countme-3 (package (name "rust-countme") @@ -15283,6 +16167,63 @@ intrinsics.") "This package provides a counts the number of live instances of types.") (license (list license:expat license:asl2.0)))) +(define-public rust-cpal-0.13 + (package + (name "rust-cpal") + (version "0.13.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05j11vz8rw19gqqvpd48i7wvm6j77v8fwx5lwhlkckqjllv7h4bl")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; Force cpal-0.13.5 to accept any version of jack, so + ;; that other packages like librespot-playback can use + ;; the one they want. + (substitute* "Cargo.toml.orig" + (("(jack = \\{ version = \").*(\", optional.*)" _ jack optional) + (string-append jack "*" optional)) + ;; Remove path for asio-sys, use packaged crate. + ((", path =.*,") ",")) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-alsa" ,rust-alsa-0.6) + ("rust-asio-sys" ,rust-asio-sys-0.2) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-coreaudio-rs" ,rust-coreaudio-rs-0.10) + ("rust-jack" ,rust-jack-0.8) + ("rust-jni" ,rust-jni-0.19) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mach" ,rust-mach-0.3) + ("rust-ndk" ,rust-ndk-0.6) + ("rust-ndk-glue" ,rust-ndk-glue-0.6) + ("rust-nix" ,rust-nix-0.23) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-oboe" ,rust-oboe-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-stdweb" ,rust-stdweb-0.1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-3) + ("rust-hound" ,rust-hound-3) + ("rust-ringbuf" ,rust-ringbuf-0.2)))) + (native-inputs (list pkg-config)) + (inputs (list alsa-lib)) + (home-page "https://github.com/rustaudio/cpal") + (synopsis "Low-level cross-platform audio I/O library in pure Rust") + (description "Low-level cross-platform audio I/O library in pure Rust. +Supports Linux through either JACK or ALSA.") + (license license:asl2.0))) + (define-public rust-cpp-demangle-0.4 (package (name "rust-cpp-demangle") @@ -15724,8 +16665,64 @@ Rust.") http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") (license (list license:expat license:asl2.0)))) +(define-public rust-criterion-0.5 + (package + (name "rust-criterion") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "criterion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bv9ipygam3z8kk6k771gh9zi0j0lb9ir0xi1pc075ljg80jvcgj")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anes" ,rust-anes-0.1) + ("rust-async-std" ,rust-async-std-1) + ("rust-cast" ,rust-cast-0.3) + ("rust-ciborium" ,rust-ciborium-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-criterion-plot" ,rust-criterion-plot-0.5) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-oorandom" ,rust-oorandom-11) + ("rust-plotters" ,rust-plotters-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smol" ,rust-smol-1) + ("rust-tinytemplate" ,rust-tinytemplate-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-futures" ,rust-futures-0.3) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://bheisler.github.io/criterion.rs/book/index.html") + (synopsis "Statistics-driven micro-benchmarking library") + (description + "This package provides a statistics-driven micro-benchmarking library.") + ;; The user can choose either license. + (license (list license:asl2.0 license:expat)))) + (define-public rust-criterion-0.4 (package + (inherit rust-criterion-0.5) (name "rust-criterion") (version "0.4.0") (source (origin @@ -15735,7 +16732,6 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") (sha256 (base32 "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anes" ,rust-anes-0.1) @@ -15750,7 +16746,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-plotters" ,rust-plotters-0.3) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -15766,13 +16762,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-futures" ,rust-futures-0.3) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://bheisler.github.io/criterion.rs/book/index.html") - (synopsis "Statistics-driven micro-benchmarking library") - (description - "This package provides a statistics-driven micro-benchmarking library.") - ;; The user can choose either license. - (license (list license:asl2.0 license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-criterion-0.3 (package @@ -15799,7 +16789,7 @@ http://reveng.sourceforge.net/crc-catalogue) expressed as simple Rust structs.") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-plotters" ,rust-plotters-0.3) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) @@ -16615,6 +17605,34 @@ abstractions around common WinAPI calls.") number ``crunching``.") (license license:expat))) +(define-public rust-rodio-0.15 + (package + (name "rust-rodio") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rodio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07kkrx0hxfcqgkpg0lrh9355bj1rl0k65nwsk3qwdri6yvlkj2gc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-claxon" ,rust-claxon-0.4) + ("rust-cpal" ,rust-cpal-0.13) + ("rust-hound" ,rust-hound-3) + ("rust-lewton" ,rust-lewton-0.10) + ("rust-minimp3" ,rust-minimp3-0.5) + ("rust-symphonia" ,rust-symphonia-0.4)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))) + (native-inputs (list pkg-config)) + (inputs (list alsa-lib)) + (home-page "https://github.com/RustAudio/rodio") + (synopsis "Pure Rust audio playback library") + (description "Audio playback library written in pure Rust that supports +many formats including AAC, FLAC, MP3, MP4 and WAV.") + (license (list license:expat license:asl2.0)))) + (define-public rust-roxmltree-0.14 (package (name "rust-roxmltree") @@ -16995,37 +18013,67 @@ algorithms.") hash functions.") (license license:expat))) -(define-public rust-cssparser-0.28 +(define-public rust-cssparser-0.29 (package (name "rust-cssparser") - (version "0.28.1") + (version "0.29.6") (source (origin (method url-fetch) (uri (crate-uri "cssparser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1h924c5g2rwlmgk8hllciyky3ih3z9vf04xz3xsp3cv1jyd5kf0x")))) + (base32 "1yp0zl5cmw9x95np9a51153fdb1ng8fgzwyssg7hr5dmki0h6ggr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Not all files included in the tarball. #:cargo-inputs (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) ("rust-dtoa-short" ,rust-dtoa-short-0.3) - ("rust-itoa" ,rust-itoa-0.4) + ("rust-itoa" ,rust-itoa-1) ("rust-matches" ,rust-matches-0.1) - ("rust-phf" ,rust-phf-0.8) + ("rust-phf" ,rust-phf-0.10) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/servo/rust-cssparser") (synopsis "Rust implementation of CSS Syntax Level 3") (description "This package contains a Rust implementation of CSS Syntax Level 3.") (license license:mpl2.0))) +(define-public rust-cssparser-0.28 + (package + (inherit rust-cssparser-0.29) + (name "rust-cssparser") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h924c5g2rwlmgk8hllciyky3ih3z9vf04xz3xsp3cv1jyd5kf0x")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-cssparser-0.27 (package (inherit rust-cssparser-0.28) @@ -17139,6 +18187,27 @@ hash functions.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-csv-index-0.1 + (package + (name "rust-csv-index") + (version "0.1.6") + (source (origin + (method url-fetch) + (uri (crate-uri "csv-index" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "01048y84y0bakqm0x4y1svjv6lzc753b9q598xp7xgcqrdgi6x7j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-csv" ,rust-csv-1)))) + (home-page "https://github.com/BurntSushi/rust-csv") + (synopsis "On disk CSV indexing data structures") + (description "On disk CSV indexing data structures.") + (license (list license:unlicense license:expat)))) + (define-public rust-csv-1 (package (name "rust-csv") @@ -17192,21 +18261,25 @@ hash functions.") (define-public rust-cortex-m-0.7 (package (name "rust-cortex-m") - (version "0.7.3") + (version "0.7.7") (source (origin (method url-fetch) (uri (crate-uri "cortex-m" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cw3nyip3s81r6qaa3azrb0654jxw465j5fm126fqja48bpikj9a")))) + (base32 "1fbca698v4gv57mv5fc48jrz8wcy6sv675n6fsrsah4qykc11ilf")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "bin"))))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bare-metal" ,rust-bare-metal-0.2) ("rust-bitfield" ,rust-bitfield-0.13) + ("rust-critical-section" ,rust-critical-section-1) ("rust-embedded-hal" ,rust-embedded-hal-0.2) + ("rust-serde" ,rust-serde-1) ("rust-volatile-register" ,rust-volatile-register-0.2)))) (home-page "https://github.com/rust-embedded/cortex-m") (synopsis "Low level access to Cortex-M processors") @@ -17473,6 +18546,53 @@ re-exported cipher crate.") use with bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-cuda-std-0.2 + (package + (name "rust-cuda-std") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cuda-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "174237dj152dvndvykcn17nz2d0kdzsyyxnb6fsdz3i7xa8lfcgn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Test suite can't find attribute 'kernel'. + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cuda-std-macros" ,rust-cuda-std-macros-0.2) + ("rust-half" ,rust-half-1) + ("rust-paste" ,rust-paste-1) + ("rust-vek" ,rust-vek-0.15)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Standard library for CUDA with rustc_codegen_nvvm") + (description "Standard library for CUDA with rustc_codegen_nvvm.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-cuda-std-macros-0.2 + (package + (name "rust-cuda-std-macros") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cuda-std-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hlakxn9pz8233pwsh44j8gzqzf078a3lnnq3v2cadmb4c4l1mlz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Macros for cuda_std") + (description "This package provides macros for cuda_std.") + (license (list license:expat license:asl2.0)))) + (define-public rust-curl-0.4 (package (name "rust-curl") @@ -17513,7 +18633,7 @@ requests.") (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") - (version "0.4.63+curl-8.1.2") + (version "0.4.66+curl-8.3.0") (source (origin (method url-fetch) @@ -17521,7 +18641,7 @@ requests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1p3inybj3yb8wwnccg8jwfwsqg0fiybh9837mpia28k00kvzxc5f")) + "1fdmdny7zqz5l9c9lnbnjz9i8qzdnrm8mnhdv45f9w1hx1r4mi3h")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "curl"))))) @@ -17536,7 +18656,7 @@ requests.") ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-rustls-ffi" ,rust-rustls-ffi-0.8) ("rust-vcpkg" ,rust-vcpkg-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (native-inputs (list pkg-config)) (inputs @@ -17615,6 +18735,55 @@ ristretto255 and Curve25519.") ristretto255 and Curve25519.") (license license:bsd-3))) +(define-public rust-cust-core-0.1 + (package + (name "rust-cust-core") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cust-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01jzjwywsngqm8d1vxk3zr9klvidab6iis1myg5r1y5q5ik7k7q3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `cust` + #:cargo-inputs + (("rust-cust-derive" ,rust-cust-derive-0.2) + ("rust-glam" ,rust-glam-0.20) + ("rust-half" ,rust-half-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-vek" ,rust-vek-0.15)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Core library for cust that can be shared across CPU and GPU") + (description "This package provices the core library for cust that can be +shared across CPU and GPU.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-cust-derive-0.2 + (package + (name "rust-cust-derive") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cust-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rigqx5d1941cbpbd76i455ifh4yzz6fcga2na9fv6k2zsavr8z8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Rust-GPU/Rust-CUDA") + (synopsis "Macros for cust") + (description "This package provices macros for cust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-custom-derive-0.1 (package (name "rust-custom-derive") @@ -17662,7 +18831,7 @@ attributes.") (define-public rust-cxx-1 (package (name "rust-cxx") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17671,7 +18840,7 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0yc5gz723hiwqk7waygj63655fh5vzq3551p1j2wyzc06xf0glai")))) + "1gpz9si4nn236rqbmrsxd0dl4ksdfwrf1rdyncyznmlxg2hqpsdv")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Cannot compile cxx-test-suite. @@ -17722,7 +18891,7 @@ attributes.") (define-public rust-cxx-build-1 (package (name "rust-cxx-build") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17731,17 +18900,17 @@ attributes.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w5a2wdkdh44gmi0psynaazx4j7d1947sr7nyaccayxjc4gjhi2h")))) + "18sy8llakggzyahmr7c25l16i63hd2agpb8x3f2a8ga3p3v21kn4")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) - ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-once-cell" ,rust-once-cell-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-scratch" ,rust-scratch-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-cxx" ,rust-cxx-1) ("rust-cxx-gen" ,rust-cxx-gen-0.7) @@ -17783,7 +18952,7 @@ crate into a Cargo build.") (define-public rust-cxx-gen-0.7 (package (name "rust-cxx-gen") - (version "0.7.86") + (version "0.7.107") (source (origin (method url-fetch) @@ -17792,14 +18961,14 @@ crate into a Cargo build.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z08a3c4xpnz91a4nc2b4f2kbmadjrrimr8awx1k4g0rmjdmq5mr")))) + "1lv2fs3s51lqipbpzrv2dmhm0mwcw5205sq7x3cmcb3skia64l6b")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://cxx.rs") (synopsis "C++ code generator") (description @@ -17852,7 +19021,7 @@ crate into higher level tools.") (define-public rust-cxxbridge-flags-1 (package (name "rust-cxxbridge-flags") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17861,7 +19030,7 @@ crate into higher level tools.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "073qx3gnf8df9xzfy9xfcz9b79m0638x4a0isfq2fb527g4hpdb1")))) + "18hxm7dp8k58zsxniaspg11nw0ymwzpk1viw8zzy56123ng8v210")))) (build-system cargo-build-system) (home-page "https://github.com/dtolnay/cxx") (synopsis "Compiler configuration of the `cxx` crate") @@ -17887,7 +19056,7 @@ crate (implementation detail).") (define-public rust-cxxbridge-macro-1 (package (name "rust-cxxbridge-macro") - (version "1.0.86") + (version "1.0.107") (source (origin (method url-fetch) @@ -17896,7 +19065,7 @@ crate (implementation detail).") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "19c7pjvjll72yb9wyrmpdylwqglizn8kayww8qcm24b2gvd1zrir")))) + "116d3i750nknl6jw9vmvyxrndrmwn5gm7zzxzx6rw4jqvmq6m89g")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -17906,8 +19075,9 @@ crate (implementation detail).") ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-cxx" ,rust-cxx-1)))) (home-page "https://cxx.rs") @@ -17962,19 +19132,43 @@ crate (implementation detail).") (description "Daemonize is a Rust library for writing system deaemons.") (license (list license:expat license:asl2.0)))) +(define-public rust-darling-0.20 + (package + (name "rust-darling") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "darling" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pjwwadwgnvvgn5qm3glpv7hjl7siaqqpw6cvh2mdar7lr6xj282")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-darling-core" ,rust-darling-core-0.20) + ("rust-darling-macro" ,rust-darling-macro-0.20)))) + (home-page "https://github.com/TedDriggs/darling") + (synopsis "Proc-macro library for reading attributes in custom derives") + (description + "This package provides a proc-macro library for reading attributes +into structs when implementing custom derives.") + (license license:expat))) + (define-public rust-darling-0.14 (package + (inherit rust-darling-0.20) (name "rust-darling") (version "0.14.1") (source (origin (method url-fetch) (uri (crate-uri "darling" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "00mc7svmwphywkwndzkjxsqaxhygrm8f4jv1p1lngzd7vn5naaa5")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -17983,13 +19177,7 @@ crate (implementation detail).") #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://github.com/TedDriggs/darling") - (synopsis "Proc-macro library for reading attributes in custom derives") - (description - "This package provides a proc-macro library for reading attributes -into structs when implementing custom derives.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-darling-0.13 (package @@ -18085,17 +19273,18 @@ into structs when implementing custom derives.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) -(define-public rust-darling-core-0.14 +(define-public rust-darling-core-0.20 (package (name "rust-darling-core") - (version "0.14.1") + (version "0.20.3") (source (origin (method url-fetch) - (uri (crate-uri "darling_core" version)) + (uri (crate-uri "darling-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vyvkx7qkz6ap5dwgsz8dg588xjigny8s7mrkz0fmcg806y93734")))) + (base32 + "08g6afi3z9jgcqx7g41s1mzr6q3dj2z56vz7v1bv6941h51k8zhp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -18105,7 +19294,7 @@ into structs when implementing custom derives.") ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-strsim" ,rust-strsim-0.10) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/TedDriggs/darling") (synopsis "Helper crate for @code{rust-darling}") (description @@ -18113,6 +19302,28 @@ into structs when implementing custom derives.") reading attributes into structs when implementing custom derives.") (license license:expat))) +(define-public rust-darling-core-0.14 + (package + (inherit rust-darling-core-0.20) + (name "rust-darling-core") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "darling_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vyvkx7qkz6ap5dwgsz8dg588xjigny8s7mrkz0fmcg806y93734")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-fnv" ,rust-fnv-1) + ("rust-ident-case" ,rust-ident-case-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-darling-core-0.13 (package (inherit rust-darling-core-0.14) @@ -18195,24 +19406,25 @@ reading attributes into structs when implementing custom derives.") ("rust-strsim" ,rust-strsim-0.7) ("rust-syn" ,rust-syn-0.15)))))) -(define-public rust-darling-macro-0.14 +(define-public rust-darling-macro-0.20 (package (name "rust-darling-macro") - (version "0.14.1") + (version "0.20.3") (source - (origin - (method url-fetch) - (uri (crate-uri "darling_macro" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1dag2f4bq38vdn886slqczip5qzhvb95317kl04zrlnbpz2nkz6x")))) + (origin + (method url-fetch) + (uri (crate-uri "darling-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1mg2k1f0v33s271lpn4m5mxcfjqnmg61bf77svb44cyngay9nsl3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-darling-core" ,rust-darling-core-0.14) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-darling-core" ,rust-darling-core-0.20) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/TedDriggs/darling") (synopsis "Helper crate for @code{rust-darling}") (description @@ -18221,6 +19433,25 @@ a proc-macro library for reading attributes into structs when implementing custom derives.") (license license:expat))) +(define-public rust-darling-macro-0.14 + (package + (inherit rust-darling-macro-0.20) + (name "rust-darling-macro") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "darling_macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dag2f4bq38vdn886slqczip5qzhvb95317kl04zrlnbpz2nkz6x")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-darling-core" ,rust-darling-core-0.14) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-darling-macro-0.13 (package (inherit rust-darling-macro-0.14) @@ -18300,8 +19531,37 @@ custom derives.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-dashmap-5 + (package + (name "rust-dashmap") + (version "5.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "dashmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0miqnlxi501vfbv6mw5jbmzgnj0wjrch3p4abvpd59s9v30lg1wp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-lock-api" ,rust-lock-api-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.9) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/xacrimon/dashmap") + (synopsis "Blazing fast concurrent HashMap for Rust") + (description "This package implements a blazing fast concurrent HashMap +for Rust.") + (license license:expat))) + (define-public rust-dashmap-4 (package + (inherit rust-dashmap-5) (name "rust-dashmap") (version "4.0.2") (source @@ -18312,19 +19572,13 @@ custom derives.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "1773x18k5m2zw1iyibs8l3wl1p1aijdbrc0w844xys06inr46yp7")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-rayon" ,rust-rayon-1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://github.com/xacrimon/dashmap") - (synopsis "Blazing fast concurrent HashMap for Rust") - (description "This package implements a blazing fast concurrent HashMap -for Rust.") - (license license:expat))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-dashmap-3 (package @@ -18381,8 +19635,32 @@ for Rust.") hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-data-url-0.2 + (package + (name "rust-data-url") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-url" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19828d6jby17ghi7vr0zia9sy3hlvvjbngrcsllmfh2zfg1kjx4d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tester" ,rust-tester-0.9)))) + (home-page "https://github.com/servo/rust-url") + (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") + (description + "Processing of data: URL according to WHATWG's Fetch Standard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-data-url-0.1 (package + (inherit rust-data-url-0.2) (name "rust-data-url") (version "0.1.1") (source @@ -18394,19 +19672,13 @@ hexadecimal, base32, and base64.") (sha256 (base32 "14z15yiyklp5dv0k0q6pd83irrn0y8hj9y3fj17akkrbf37byc1s")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-matches" ,rust-matches-0.1)) #:cargo-development-inputs (("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/servo/rust-url") - (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") - (description - "Processing of data: URL according to WHATWG's Fetch Standard.") - (license (list license:expat license:asl2.0)))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-datetime-0.5 (package @@ -18568,6 +19840,27 @@ type.") the Debug trait manually.") (license license:expat))) +(define-public rust-debug-unreachable-0.1 + (package + (name "rust-debug-unreachable") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "debug-unreachable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cx4vh1d0bxdpb8l9lyiv03az4527lykxy39s4a958swf2n2w0ws")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unreachable" ,rust-unreachable-0.1)))) + (home-page "https://github.com/reem/rust-debug-unreachable.git") + (synopsis + "unreachable!() in debug, std::intrinsics::unreachable() in release") + (description + "unreachable!() in debug, std::intrinsics::unreachable() in release.") + (license license:expat))) + (define-public rust-debugger-test-0.1 (package (name "rust-debugger-test") @@ -18621,6 +19914,30 @@ debugger and run commands while verifying the output.") verifying the contents.") (license (list license:expat license:asl2.0)))) +(define-public rust-debugid-0.8 + (package + (name "rust-debugid") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "debugid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13f15dfvn07fa7087pmacixqqv0lmj4hv93biw4ldr48ypk55xdy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://sentry.io/") + (synopsis "Common reusable types for implementing the sentry.io protocol") + (description + "Common reusable types for implementing the sentry.io protocol.") + (license license:asl2.0))) + (define-public rust-decimal-2 (package (name "rust-decimal") @@ -19512,7 +20829,7 @@ pattern for arbitrary structs.") (arguments `(#:cargo-inputs (("rust-quote" ,rust-quote-0.3) - ("rust-syn" ,rust-syn-0.14)))) + ("rust-syn" ,rust-syn-0.11)))) (home-page "https://github.com/Arnavion/derive-error-chain") (synopsis "Macros 1.1 implementation of error-chain") (description "This package provides a Macros 1.1 implementation of @@ -19620,6 +20937,34 @@ traits for both structs and enums.") structs and enums.") (license license:expat))) +(define-public rust-derive-where-1 + (package + (name "rust-derive-where") + (version "1.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive-where" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1jqck0b2vsyh85p6v5jlhcrmgphdvxzg2256919g782247b9hqql")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-zeroize" ,rust-zeroize-1)))) + (home-page "https://github.com/ModProg/derive-where") + (synopsis "Deriving with custom trait bounds") + (description "Deriving with custom trait bounds.") + (license (list license:expat license:asl2.0)))) + (define-public rust-des-0.8 (package (name "rust-des") @@ -22227,7 +23572,7 @@ encodings.") (define-public rust-encoding-rs-0.8 (package (name "rust-encoding-rs") - (version "0.8.31") + (version "0.8.33") (source (origin (method url-fetch) @@ -22236,12 +23581,12 @@ encodings.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0azc6rblf75vd862ymjahdfch27j1sshb7zynshrx7ywi5an6llq")))) + "1qa5k4a0ipdrxq4xg9amms9r9pnnfn7nfh2i9m3mw0ka563b6s3j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-packed-simd" ,rust-packed-simd-2-0.3) + ("rust-packed-simd" ,rust-packed-simd-0.3) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) @@ -22309,6 +23654,8 @@ order.") (base32 "0clrjghlfkkb7sndabs5wch0fz2nif6nj4b117s8kqxx3nqnrhq6")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/reujab/enquote") (synopsis "Rust library that quotes, unquotes, and unescapes strings") (description "This package provides a Rust library quotes, unquotes, and @@ -22624,6 +23971,25 @@ convert enum to u8 slice ref.") (description "This package provides enum-based bit flags.") (license (list license:expat license:asl2.0)))) +(define-public rust-enumflags2-0.6 + (package + (inherit rust-enumflags2-0.7) + (name "rust-enumflags2") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "enumflags2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "182xd6cxxmadx1axnz6x73d12pzgwkc712zq2lxd4z1k48lxij43")))) + (arguments + `(#:cargo-inputs + (("rust-enumflags2-derive" ,rust-enumflags2-derive-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3)))))) + (define-public rust-enumflags2-derive-0.7 (package (name "rust-enumflags2-derive") @@ -22647,6 +24013,24 @@ convert enum to u8 slice ref.") "This package provides internal implementations for enumflags2.") (license (list license:expat license:asl2.0)))) +(define-public rust-enumflags2-derive-0.6 + (package + (inherit rust-enumflags2-derive-0.7) + (name "rust-enumflags2-derive") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "enumflags2-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kkcwi4n76bi1c16ms00dyk4d393gdf29kpr4k9zsn5z7m7fjvll")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-enumset-1 (package (name "rust-enumset") @@ -23282,6 +24666,38 @@ ecosystem.") (description "This package is a Rust library of Ethereum types.") (license license:expat))) +(define-public rust-evdev-0.12 + (package + (name "rust-evdev") + (version "0.12.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "evdev" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ww35bkqf060nl6x2vfg0frd6ql470c90l2ah68b3mngr3y5kv9b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitvec" ,rust-bitvec-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.23) + ("rust-paste" ,rust-paste-1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/cmr/evdev") + (synopsis "Rust interface to Linux event devices") + (description "This package provides evdev interface for Linux.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-event-listener-2 (package (name "rust-event-listener") @@ -23437,27 +24853,21 @@ by @file{sysexits.h}.") (define-public rust-expect-test-1 (package (name "rust-expect-test") - (version "1.2.2") + (version "1.4.1") (source (origin (method url-fetch) (uri (crate-uri "expect-test" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "05nv365xd5fqydmzbsvzqz0148a1vbxp2p0r8a3ivafdvhl6ngky")))) + (base32 "1lzqx5hqh1g4llzqby4z1d18xmrjjx63c5l0na7ycf6mmpzfmn9h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? - #t - #:cargo-inputs + `(#:cargo-inputs (("rust-dissimilar" ,rust-dissimilar-1) ("rust-once-cell" ,rust-once-cell-1)))) - (home-page - "https://github.com/rust-analyzer/expect-test") - (synopsis - "Minimalistic snapshot testing library") + (home-page "https://github.com/rust-analyzer/expect-test") + (synopsis "Minimalistic snapshot testing library") (description "This package provides a minimalistic snapshot testing library.") (license (list license:expat license:asl2.0)))) @@ -23827,33 +25237,54 @@ floats.") (description "This package provides a parser for fastq files.") (license license:expat))) -(define-public rust-fastrand-1 +(define-public rust-fastrand-2 (package (name "rust-fastrand") - (version "1.9.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (crate-uri "fastrand" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gh12m56265ihdbzh46bhh0jf74i197wm51jg1cw75q7ggi96475")))) + (base32 "19flpv5zbzpf0rk4x77z4zf25in0brg8l7m304d3yrf47qvwxjr5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-instant" ,rust-instant-0.1)) + (("rust-getrandom" ,rust-getrandom-0.2)) #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2) - ("rust-instant" ,rust-instant-0.1) ("rust-rand" ,rust-rand-0.8) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) ("rust-wyhash" ,rust-wyhash-0.5)))) - (home-page "https://github.com/stjepang/fastrand") + (home-page "https://github.com/smol-rs/fastrand") (synopsis "Simple and fast random number generator") (description "This package provides a simple and fast random number generator.") (license (list license:asl2.0 license:expat)))) +(define-public rust-fastrand-1 + (package + (inherit rust-fastrand-2) + (name "rust-fastrand") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fastrand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gh12m56265ihdbzh46bhh0jf74i197wm51jg1cw75q7ggi96475")))) + (arguments + `(#:cargo-inputs + (("rust-instant" ,rust-instant-0.1)) + #:cargo-development-inputs + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-instant" ,rust-instant-0.1) + ("rust-rand" ,rust-rand-0.8) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-wyhash" ,rust-wyhash-0.5)))))) + (define-public rust-fat-macho-0.4 (package (name "rust-fat-macho") @@ -23864,7 +25295,10 @@ floats.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3")))) + "0ywr3xqi884i12d5mfidbma1hrd4rxj9f8jw7p4bignagmy13yk3")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "tests/fixtures"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -23878,21 +25312,22 @@ floats.") (define-public rust-fd-lock-3 (package (name "rust-fd-lock") - (version "3.0.0") + (version "3.0.12") (source (origin (method url-fetch) (uri (crate-uri "fd-lock" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dif8wk9xrqkjyfgqqy3zfg4ckmkpyzzk5p5m01s99q63bcnv05q")))) + (base32 "0hlnn1302p37qlc9xl2k5y0vw8q8id5kg59an6riy89hjlynpbir")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-rustix" ,rust-rustix-0.37) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/yoshuawuyts/fd-lock") (synopsis "Advisory lock on a file") (description @@ -24202,6 +25637,31 @@ Atom, RSS 2.0, RSS 1.0, RSS 0.x and JSON Feed") "This package provides a simple, efficient logging system for Rust.") (license license:expat))) +(define-public rust-fetch-unroll-0.3 + (package + (name "rust-fetch-unroll") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (crate-uri "fetch_unroll" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l3cf8fhcrw354hdmjf03f5v4bxgn2wkjna8n0fn8bgplh8b3666")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f ; Tries to connect to github.com + #:cargo-inputs `(("rust-libflate" ,rust-libflate-1) + ("rust-tar" ,rust-tar-0.4) + ("rust-ureq" ,rust-ureq-2)))) + ; perl required for building rust-ring + (inputs (list perl)) + (home-page "https://github.com/katyo/fetch_unroll") + (synopsis "Simple utilities for fetching and unrolling .tar.gz archives") + (description + "Simple utilities for fetching and unrolling .tar.gz archives.") + (license license:asl2.0))) + (define-public rust-fever-api-0.2 (package (name "rust-fever-api") @@ -24389,6 +25849,26 @@ representation.") (license (list license:asl2.0 license:expat)))) +(define-public rust-filetime-0.1 + (package + (inherit rust-filetime-0.2) + (name "rust-filetime") + (version "0.1.15") + (source (origin + (method url-fetch) + (uri (crate-uri "filetime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03xishfxzpr4nfz4g3r218d6b6g94rxsqw9pw96m6wa8wgrm6iki")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1)))))) + (define-public rust-field-offset-0.3 (package (name "rust-field-offset") @@ -24713,16 +26193,14 @@ test multiple times.") (define-public rust-flate2-1 (package (name "rust-flate2") - (version "1.0.25") + (version "1.0.27") (source (origin (method url-fetch) (uri (crate-uri "flate2" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0hg8ih51lx5xkz2zlzpsy1j1xka8gs8vhk2964ppgj5ighwxp8m8")))) + (base32 "045hvzdv3159qqjlgr5i3p4d346briddkipwyb5iv7ay17l8xjf6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -24730,7 +26208,7 @@ test multiple times.") ("rust-crc32fast" ,rust-crc32fast-1) ("rust-libz-ng-sys" ,rust-libz-ng-sys-1) ("rust-libz-sys" ,rust-libz-sys-1) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.6)) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.7)) #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8)))) @@ -24827,6 +26305,52 @@ traits.") (base32 "0036jb8ry4h83n319jb20b5yvyfyq8mx8dkxnyjm22nq8fl8yjhk")))))) +(define-public rust-float-eq-1 + (package + (name "rust-float-eq") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-eq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lxqxkvdy5zh3qsksavpcazg57cbyjy9p54m16x13bfq8lqhxa18")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-float-eq-derive" ,rust-float-eq-derive-1) + ("rust-num-complex" ,rust-num-complex-0.4)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://jtempest.github.io/float_eq-rs/") + (synopsis "Compare IEEE floating point primitives, structs and collections") + (description "Compare IEEE floating point primitives, structs and +collections for equality.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-float-eq-derive-1 + (package + (name "rust-float-eq-derive") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-eq-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mkg635lmr0nwjlxz6f5k8g60hrd800i061hrlmpvhdkl96d74j2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://jtempest.github.io/float_eq-rs/") + (synopsis "Derive macro support for float_eq") + (description "This package provides the derive macro support for float_eq.") + (license (list license:expat license:asl2.0)))) + (define-public rust-float-ord-0.3 (package (name "rust-float-ord") @@ -25162,6 +26686,29 @@ implementation that is more efficient for smaller hash keys.") (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-fork-0.1 + (package + (name "rust-fork") + (version "0.1.22") + (source + (origin + (method url-fetch) + (uri (crate-uri "fork" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "124fbfwqka5xh2jndmlpgbl2ya7a9yf7q6adxvkja510b5xajb5z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://docs.rs/fork/latest/fork/") + (synopsis + "Library for creating a new process detached from the controlling terminal") + (description + "This package provides library for creating a new process detached from +the controling terminal (daemon) using the fork and setsid syscalls.") + (license license:bsd-3))) + (define-public rust-form-urlencoded-1 (package (name "rust-form-urlencoded") @@ -25225,8 +26772,35 @@ values to other threads.") (description "This package provides bindings for Freetype used by Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-freetype-rs-0.32 + (package + (name "rust-freetype-rs") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q54jimjgzwdb3xsp7rsvdmp6w54cak7bvc379mdabc2ciz3776m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-freetype-sys" ,rust-freetype-sys-0.17) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) + (inputs + (list freetype)) + (home-page "https://github.com/PistonDevelopers/freetype-rs") + (synopsis "Bindings for FreeType font library") + (description "This package provides bindings for FreeType font library.") + (license license:expat))) + (define-public rust-freetype-rs-0.26 (package + (inherit rust-freetype-rs-0.32) (name "rust-freetype-rs") (version "0.26.0") (source @@ -25236,49 +26810,75 @@ values to other threads.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1yzmbd73hlblbns0dqkcwfj54l97hx3yb0lqpda8rhm5s34xxskl")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-freetype-sys" ,rust-freetype-sys-0.13) - ("rust-libc" ,rust-libc-0.2)))) - (home-page "https://github.com/PistonDevelopers/freetype-rs") - (synopsis "Bindings for FreeType font library") - (description "This package provides bindings for FreeType font library.") - (license license:expat))) + ("rust-libc" ,rust-libc-0.2)))))) -(define-public rust-freetype-sys-0.13 +(define-public rust-freetype-sys-0.17 (package (name "rust-freetype-sys") - (version "0.13.1") + (version "0.17.0") (source (origin (method url-fetch) (uri (crate-uri "freetype-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06kkds31s6b1i39dyanwmzbnic7laia1kk3gfvx8sqncq08l0zd3")) + (base32 "127z6hbsfhsw0fg110zy9s65fzald0cvwbxmhk1vxmmsdk54hcb4")) (snippet #~(begin (use-modules (guix build utils)) - (delete-file-recursively "freetype2"))))) + (delete-file-recursively "freetype2") + ;; Inspired by Debian's patch for bzip2-sys. + (substitute* "Cargo.toml.orig" + (("cc = .*") "pkg-config = \"0.3\"\n")) + (copy-file "Cargo.toml.orig" "Cargo.toml") + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=freetype\");~@ + }~%"))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cmake" ,rust-cmake-0.1) - ("rust-libc" ,rust-libc-0.2) + (("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3)))) (inputs (list freetype)) - (native-inputs - (list pkg-config)) (home-page "https://github.com/PistonDevelopers/freetype-sys") (synopsis "Low level binding for FreeType font library") (description "This package provides low level binding for FreeType font library.") (license license:expat))) +(define-public rust-freetype-sys-0.13 + (package + (inherit rust-freetype-sys-0.17) + (name "rust-freetype-sys") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "freetype-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06kkds31s6b1i39dyanwmzbnic7laia1kk3gfvx8sqncq08l0zd3")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "freetype2"))))) + (arguments + `(#:cargo-inputs + (("rust-cmake" ,rust-cmake-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs + (list pkg-config)))) + (define-public rust-fs2-0.4 (package (name "rust-fs2") @@ -26687,6 +28287,39 @@ archive to be linked into Rustcode.") API library @code{gdi32}.") (license license:expat))) +(define-public rust-generational-arena-0.2 + (package + (name "rust-generational-arena") + (version "0.2.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "generational-arena" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rwnfyprjwqafkwdz2irkds5a41jcjb3bsma3djknx4fy2pr8zl7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=cargo_readme_up_to_date") + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8)))) + (home-page "https://github.com/fitzgen/generational-arena") + (synopsis "Arena allocator that supports deletion") + (description + "This package provides a safe arena allocator that supports deletion without +suffering from the ABA problem by using generational indices.") + (license license:mpl2.0))) + (define-public rust-generator-0.7 (package (name "rust-generator") @@ -27001,8 +28634,35 @@ Rust.") interfaces on the system.") (license (list license:expat license:bsd-3)))) +(define-public rust-gethostname-0.3 + (package + (name "rust-gethostname") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gethostname" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xy1wbx5k2bzi4cbaqj9wqgqsbn4f8pm6nsm1d86mibk66xd8rdv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included + "--skip=gethostname_matches_system_hostname") + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/swsnr/gethostname.rs") + (synopsis "Gethostname for all platforms") + (description "This library provides @code{gethostname()} for all +platforms.") + (license license:asl2.0))) + (define-public rust-gethostname-0.2 (package + (inherit rust-gethostname-0.3) (name "rust-gethostname") (version "0.2.1") (source @@ -27012,19 +28672,13 @@ interfaces on the system.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0a609j9dhk816il2f2a01avvi5sqzxh0p38nxwrja7dcpybf54p6")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; test panics #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) - (home-page "https://github.com/lunaryorn/gethostname.rs") - (synopsis "Gethostname for all platforms") - (description "This library provides @code{gethostname()} for all -platforms.") - (license license:asl2.0))) + (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) (define-public rust-getopts-0.2 (package @@ -27055,14 +28709,14 @@ platforms.") (define-public rust-getrandom-0.2 (package (name "rust-getrandom") - (version "0.2.8") + (version "0.2.10") (source (origin (method url-fetch) (uri (crate-uri "getrandom" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cbb766pcyi7sws0fnp1pxkz0nhiya0ckallq502bxmq49mfnnn0")))) + (base32 "09zlimhhskzf7cmgcszix05wyz2i6fcpvh711cv1klsxl6r3chdy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -27071,7 +28725,6 @@ platforms.") ("rust-js-sys" ,rust-js-sys-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) - ("rust-stdweb" ,rust-stdweb-0.4) ("rust-wasi" ,rust-wasi-0.11) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs @@ -27249,6 +28902,24 @@ getters and setters on fields.") @acronym{GFA, Graphical Fragment Assembly} format.") (license license:expat))) +(define-public rust-gg-alloc-1 + (package + (name "rust-gg-alloc") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gg-alloc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fi2z9p5klgqbhgqxqxwz03j4axz4vf0s58mlndrxddy397i7r8y")))) + (build-system cargo-build-system) + (home-page "https://github.com/Badel2/gg-alloc") + (synopsis "Custom allocator that only returns pointers above 2G") + (description "This package provides a custom allocator that only returns +pointers above 2G.") + (license license:gpl3))) + (define-public rust-ghash-0.5 (package (name "rust-ghash") @@ -27781,27 +29452,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) -(define-public rust-glam-0.17 +(define-public rust-glam-0.24 (package (name "rust-glam") - (version "0.17.3") + (version "0.24.2") (source (origin (method url-fetch) (uri (crate-uri "glam" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xm7jdygbxchdvk6k1l1pdag843nkwdm8fikwgp0i1gxgawk45z0")))) + (base32 "0ibrq68ldg1gyynb5ss5hx0gr6p3397cfclh1xrl5prba4bqqhdm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-libm" ,rust-libm-0.2) ("rust-mint" ,rust-mint-0.5) - ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) - ("rust-serde" ,rust-serde-1)))) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/bitshifter/glam-rs") (synopsis "3D math library for games and graphics") (description @@ -27809,6 +29487,136 @@ libcurl, which is intended to be used with the @code{git2} crate.") graphics.") (license (list license:expat license:asl2.0)))) +(define-public rust-glam-0.23 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "076mdgmy38lhlvgng74iy2sr3iih58gx5qcz20g0hmamv6dgsjlf")))) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) + +(define-public rust-glam-0.22 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x57gyrxyfs409b3f5i64yy2pbcgkr2qkq8v3a0mmm8vdkargx8j")))) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytecheck" ,rust-bytecheck-0.6) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) + +(define-public rust-glam-0.21 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.21.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05c8r639hz3ydlhbhv6d9z6193iivi8276zz2fq3hqw6ci8am3si")))))) + +(define-public rust-glam-0.20 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.20.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pv7n634vw2hn9fmi915pzgangyljgsp4m5505c3zq2bfiz9agpl")))))) + +(define-public rust-glam-0.19 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jjia0nva5p7ca3dma8jhzxd4dmczgbhn3b338ffh5hmg7k0k19b")))))) + +(define-public rust-glam-0.18 + (package + (inherit rust-glam-0.22) + (name "rust-glam") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0d7f7f7cdbahxk677k6l8h7r4bxxni24nzdndwr8wyx71d4kwnjj")))))) + +(define-public rust-glam-0.17 + (package + (inherit rust-glam-0.24) + (name "rust-glam") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xm7jdygbxchdvk6k1l1pdag843nkwdm8fikwgp0i1gxgawk45z0")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-glam-0.16 (package (name "rust-glam") @@ -27982,6 +29790,7 @@ OpenGL's old and error-prone API.") `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) ("rust-fnv" ,rust-fnv-1) + ("rust-gl-generator" ,rust-gl-generator-0.11) ("rust-glutin" ,rust-glutin-0.21) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-smallvec" ,rust-smallvec-0.6) @@ -27989,7 +29798,6 @@ OpenGL's old and error-prone API.") #:cargo-development-inputs (("rust-cgmath" ,rust-cgmath-0.17) ("rust-genmesh" ,rust-genmesh-0.6) - ("rust-gl-generator" ,rust-gl-generator-0.11) ("rust-image" ,rust-image-0.21) ("rust-obj" ,rust-obj-0.9) ("rust-rand" ,rust-rand-0.6)))))) @@ -28228,8 +30036,35 @@ and loading crate.") ("rust-plain" ,rust-plain-0.2) ("rust-log" ,rust-log-0.4)))))) +(define-public rust-greetd-ipc-0.9 + (package + (name "rust-greetd-ipc") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "greetd-ipc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xl2cix3jv4sgigl5ijayab7rchr6v02za2qd87fv1z8dl1r14w3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://kl.wtf/projects/greetd") + (synopsis "@command{greetd} IPC protocol library for Rust") + (description + "This package provides library that helps you use the +@command{greetd} JSON-based IPC protocol from Rust.") + (license license:gpl3))) + (define-public rust-greetd-ipc-0.8 (package + (inherit rust-greetd-ipc-0.9) (name "rust-greetd-ipc") (version "0.8.0") (source (origin @@ -28239,20 +30074,13 @@ and loading crate.") (sha256 (base32 "1dscriv3adjyaxfaax3cmqrzx6q2vwwchbh86dhll783wjc4ivw0")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-async-trait" ,rust-async-trait-0.1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://kl.wtf/projects/greetd") - (synopsis "@command{greetd} IPC protocol library for Rust") - (description - "This package provides library that helps you use the -@command{greetd} JSON-based IPC protocol from Rust.") - (license license:gpl3))) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-grep-0.2 (package @@ -28742,23 +30570,25 @@ IEEE 754-2008 binary16 type.") (package (inherit rust-half-2) (name "rust-half") - (version "1.7.1") + (version "1.8.2") (source (origin (method url-fetch) (uri (crate-uri "half" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wzavaaaa2jwkm4i1dbglmwjfsdhn4n73wrkbdzllaynlams5b32")))) + (base32 "1mqbmx2m9qd4lslkb42fzgldsklhv9c4bxsc8j82r80d8m24mfza")))) (arguments `(#:cargo-inputs - (("rust-serde" ,rust-serde-1)) + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-zerocopy" ,rust-zerocopy-0.6)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9) - ("rust-rand" ,rust-rand-0.7) - ("rust-version-sync" ,rust-version-sync-0.8)))))) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rand" ,rust-rand-0.8)))))) (define-public rust-home-0.5 (package @@ -29247,8 +31077,39 @@ their key-value pairs in a user controllable order.") #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) +(define-public rust-hdrhistogram-7 + (package + (name "rust-hdrhistogram") + (version "7.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "hdrhistogram" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a1al1rfxcqmx0n9h100ggvg036f4rv69fq12kimazvw9zsvj6bz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-flate2" ,rust-flate2-1) + ("rust-nom" ,rust-nom-7) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-3) + ("rust-ieee754" ,rust-ieee754-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rug" ,rust-rug-1)))) + (home-page "https://github.com/HdrHistogram/HdrHistogram_rust") + (synopsis "Port of HdrHistogram to Rust") + (description "This package provides a port of @code{HdrHistogram} to Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hdrhistogram-6 (package + (inherit rust-hdrhistogram-7) (name "rust-hdrhistogram") (version "6.3.4") (source @@ -29258,7 +31119,6 @@ their key-value pairs in a user controllable order.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "17dqk0rp8kimcd8wr542i8cny91fkclw7a2xzszar95wrpmk3lq8")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -29267,11 +31127,7 @@ their key-value pairs in a user controllable order.") ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.3) ("rust-flate2" ,rust-flate2-1) ("rust-nom" ,rust-nom-4) - ("rust-num-traits" ,rust-num-traits-0.2)))) - (home-page "https://github.com/HdrHistogram/HdrHistogram_rust") - (synopsis "Port of HdrHistogram to Rust") - (description "This package provides a port of HdrHistogram to Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-num-traits" ,rust-num-traits-0.2)))))) (define-public rust-headers-0.3 (package @@ -30096,6 +31952,25 @@ Hash-based Message Authentication Code algorithm} for SHA1.") (("rust-libc" ,rust-libc-0.2) ("rust-winutil" ,rust-winutil-0.1)))))) +(define-public rust-hound-3 + (package + (name "rust-hound") + (version "3.5.1") + (source (origin + (method url-fetch) + (uri (crate-uri "hound" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kw5yybfc7hdwxwm6d3m3h4ms52fkw0n0zch35drb52ci2xsmbb2")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #t)) ; Cut the dependency graph. + (home-page "https://github.com/ruuda/hound") + (synopsis "Wav encoding and decoding library") + (description "This package provides a wav encoding and decoding library.") + (license license:asl2.0))) + (define-public rust-html5ever-0.26 (package (name "rust-html5ever") @@ -30899,6 +32774,48 @@ SystemTime}}.") (description "This package provides native-tls support for Hyper 0.10.") (license (list license:expat license:asl2.0)))) +(define-public rust-hyper-proxy-0.9 + (package + (name "rust-hyper-proxy") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (crate-uri "hyper-proxy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k3mpq6d4rhz58dam1757sav14j32n39q8x37wjgpz943f4mm0fa")))) + (build-system cargo-build-system) + (arguments + (list + #:cargo-inputs + `(("rust-bytes" ,rust-bytes-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-headers" ,rust-headers-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-hyper-rustls" ,rust-hyper-rustls-0.22) + ("rust-hyper-tls" ,rust-hyper-tls-0.5) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-webpki" ,rust-webpki-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.21)) + #:cargo-development-inputs + `(("rust-hyper" ,rust-hyper-0.14) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/tafia/hyper-proxy") + (synopsis "Proxy connector for Hyper-based applications") + (description "Proxy connector for the Hyper HTTP library.") + (license license:expat))) + (define-public rust-hyper-rustls-0.23 (package (name "rust-hyper-rustls") @@ -30928,6 +32845,7 @@ SystemTime}}.") ("rust-rustls" ,rust-rustls-0.20) ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list perl)) (home-page "https://github.com/ctz/hyper-rustls") (synopsis "Rustls+Hyper integration for pure Rust HTTPS") (description @@ -31149,6 +33067,75 @@ with hyper.") "This package provides a Knuth-Liang hyphenation for a variety of languages.") (license (list license:asl2.0 license:expat)))) +(define-public rust-hyprland-0.3 + (package + (name "rust-hyprland") + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyprland" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a6ay1cnpmj3v16hs6k65yxdg53wv438i2va5rpgjz9bk8aijhm8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; Some tests expect hyprland to be running. + "--skip=dispatch::Dispatch::call" + "--skip=event_listener::mutable::EventListener::new" + "--skip=data" + "--skip=dispatch") + #:cargo-inputs + (("rust-async-net" ,rust-async-net-1) + ("rust-async-std" ,rust-async-std-1) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures-lite" ,rust-futures-lite-1) + ("rust-hex" ,rust-hex-0.4) + ("rust-hyprland-macros" ,rust-hyprland-macros-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-paste" ,rust-paste-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-strum" ,rust-strum-0.24) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/hyprland-community/hyprland-rs") + (synopsis "An unofficial rust wrapper for Hyprland's IPC") + (description + "This package provides a unoffical rust wrapper for hyprland's IPC.") + (license license:gpl3+))) + +(define-public rust-hyprland-macros-0.3 + (package + (name "rust-hyprland-macros") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyprland-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sz4yhwi7d1s2wfpk9ql43dgmiq0j3j8skmrijpi55lp5vax6hf9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page + "https://github.com/hyprland-community/hyprland-rs/tree/master/hyprland-macros") + (synopsis "Macros used in hyprland-rs") + (description "This package provides async closure macro for hyprland-rs.") + (license license:gpl3+))) + (define-public rust-iana-time-zone-haiku-0.1 (package (name "rust-iana-time-zone-haiku") @@ -31352,22 +33339,22 @@ with hyper.") floating-point numbers.") (license (list license:expat license:asl2.0)))) -(define-public rust-if-addrs-0.6 +(define-public rust-if-addrs-0.7 (package (name "rust-if-addrs") - (version "0.6.7") - (source (origin - (method url-fetch) - (uri (crate-uri "if-addrs" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1pkkkwm9znn07xq9s6glf8lxzn2rdxvy8kwkw6czrw64ywhy8wr2")))) + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "if-addrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a81w57p0hx6ql2ds2ayps38n0ndfaqcs618qzdyjln7zw0zmh6b")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-if-addrs-sys" ,rust-if-addrs-sys-0.3) - ("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + (list #:cargo-inputs + `(("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (native-inputs (list iproute)) (home-page "https://github.com/messense/if-addrs") (synopsis "Return interface IP addresses on POSIX and Windows systems") @@ -31375,6 +33362,23 @@ floating-point numbers.") on both POSIX and Microsoft Windows hosts.") (license (list license:expat license:bsd-3)))) +(define-public rust-if-addrs-0.6 + (package + (inherit rust-if-addrs-0.7) + (name "rust-if-addrs") + (version "0.6.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "if-addrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pkkkwm9znn07xq9s6glf8lxzn2rdxvy8kwkw6czrw64ywhy8wr2")))) + (arguments + (list #:cargo-inputs `(("rust-if-addrs-sys" ,rust-if-addrs-sys-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-if-addrs-sys-0.3 (package (name "rust-if-addrs-sys") @@ -32724,15 +34728,14 @@ or not without much fuss.") (define-public rust-is-macro-0.1 (package (name "rust-is-macro") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "is-macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1vjh4sdpvx1kdf1znyk3b54gkyk7f8lsasc47ypkksp3r4ypz004")))) + (base32 "0pq1x1r8pk6fv0qf9vpxw60jw2jg3961nm1gv71j5qv0v4bds8m3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -32988,23 +34991,23 @@ stream runs in a TTY.") (description "Parsing ISO8601 dates using nom.") (license license:expat))) -(define-public rust-itertools-0.10 +(define-public rust-itertools-0.11 (package (name "rust-itertools") - (version "0.10.5") + (version "0.11.0") (source (origin (method url-fetch) (uri (crate-uri "itertools" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh")))) + (base32 "0mzyqcc59azx9g5cg6fs8k529gvh4463smmka6jvzs3cd2jp7hdi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) + (("rust-criterion" ,rust-criterion-0.4) ("rust-paste" ,rust-paste-1) ("rust-permutohedron" ,rust-permutohedron-0.2) ("rust-quickcheck" ,rust-quickcheck-0.9) @@ -33016,6 +35019,28 @@ stream runs in a TTY.") functions, and macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-itertools-0.10 + (package + (inherit rust-itertools-0.11) + (name "rust-itertools") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "itertools" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh")))) + (arguments + `(#:cargo-inputs + (("rust-either" ,rust-either-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-permutohedron" ,rust-permutohedron-0.2) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-rand" ,rust-rand-0.7)))))) + (define-public rust-itertools-0.9 (package (inherit rust-itertools-0.10) @@ -33261,6 +35286,101 @@ format.") (description "This package provides a simple ivf muxer.") (license license:bsd-2))) +(define-public rust-jack-0.10 + (package + (name "rust-jack") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "jack" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0djs3j0icxbzbivhj73vgjrvjw6ncpfak2vyxjcbn4wvl9ajcwnf")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f + #:cargo-inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-jack-sys" ,rust-jack-sys-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4)) + #:cargo-development-inputs + `(("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)))) + (native-inputs (list pkg-config)) + (inputs (list jack-2)) + (home-page "https://github.com/RustAudio/rust-jack") + (synopsis "Real time audio and midi with JACK") + (description "Real time audio and midi with JACK.") + (license license:expat))) + +(define-public rust-jack-0.8 + (package + (inherit rust-jack-0.10) + (name "rust-jack") + (version "0.8.4") + (source (origin + (method url-fetch) + (uri (crate-uri "jack" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lz10s0n2gy128m65pf96is9ip00vfgvnkfja0y9ydmv24pw2ajx")))) + (arguments + (list #:tests? #f + #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) + ("rust-jack-sys" ,rust-jack-sys-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)))))) + +(define-public rust-jack-sys-0.4 + (package + (name "rust-jack-sys") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "jack-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17vaq4i8q5nx39rjqx9sixqn1xraf1vxs3bmrf618v8nzxchbmz9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cannot find value `library` in this scope + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list jack-2)) + (home-page "https://github.com/RustAudio/rust-jack/tree/main/jack-sys") + (synopsis "Low-level binding to the JACK audio API") + (description "Low-level binding to the JACK audio API.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-jack-sys-0.2 + (package + (inherit rust-jack-sys-0.4) + (name "rust-jack-sys") + (version "0.2.3") + (source (origin + (method url-fetch) + (uri (crate-uri "jack-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h9c9za19nyr1prx77gkia18ia93f73lpyjdiyrvmhhbs79g54bv")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.6) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + (define-public rust-javascriptcore-rs-sys-0.2 (package (name "rust-javascriptcore-rs-sys") @@ -33719,7 +35839,7 @@ JSON-RPC 2.0 specification.") (define-public rust-js-sys-0.3 (package (name "rust-js-sys") - (version "0.3.61") + (version "0.3.64") (source (origin (method url-fetch) @@ -33727,12 +35847,12 @@ JSON-RPC 2.0 specification.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0c075apyc5fxp2sbgr87qcvq53pcjxmp05l47lzlhpn5a0hxwpa4")) + (base32 "0nlkiwpm8dyqcf1xyc6qmrankcgdd3fpzc0qyfq2sw3z97z9bwf5")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -34485,6 +36605,34 @@ requires non-const function calls to be computed.") sending emails from Rust applications.") (license license:expat))) +(define-public rust-lewton-0.10 + (package + (name "rust-lewton") + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (crate-uri "lewton" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0c60fn004awg5c3cvx82d6na2pirf0qdz9w3b93mbcdakbglhyvp")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-byteorder" ,rust-byteorder-1) + ("rust-futures" ,rust-futures-0.1) + ("rust-ogg" ,rust-ogg-0.8) + ("rust-tinyvec" ,rust-tinyvec-1) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + `(("rust-alto" ,rust-alto-3) + ("rust-ogg" ,rust-ogg-0.8)))) + (home-page "https://github.com/RustAudio/lewton") + (synopsis "Pure Rust Vorbis decoder") + (description "A pure Rust Vorbis decoder. Vorbis is a free and open +source audio format.") + (license (list license:expat license:asl2.0)))) + (define-public rust-lexical-core-0.8 (package (name "rust-lexical-core") @@ -34532,12 +36680,12 @@ sending emails from Rust applications.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-dtoa" ,rust-dtoa-0.4) ("rust-libm" ,rust-libm-0.2) + ("rust-proptest" ,rust-proptest-0.10) + ("rust-quickcheck" ,rust-quickcheck-1) ("rust-ryu" ,rust-ryu-1) ("rust-static-assertions" ,rust-static-assertions-1)) #:cargo-development-inputs - (("rust-approx" ,rust-approx-0.4) - ("rust-proptest" ,rust-proptest-0.10) - ("rust-quickcheck" ,rust-quickcheck-1)))))) + (("rust-approx" ,rust-approx-0.4)))))) (define-public rust-lexical-parse-float-0.8 (package @@ -34678,6 +36826,34 @@ a no_std environment. This does not depend on any standard library features, nor a system allocator.") (license (list license:expat license:asl2.0)))) +(define-public rust-lexical-5 + (package + (inherit rust-lexical-6) + (name "rust-lexical") + (version "5.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "lexical" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r8lsi523h53kbb99xgv31jabwhcp4rzqd4hfazfhcjffh5aj17l")))) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-lexical-core" ,rust-lexical-core-0.7) + ("rust-rand" ,rust-rand-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-dtoa" ,rust-dtoa-0.4) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-ryu" ,rust-ryu-1)))))) + (define-public rust-lexiclean-0.0.1 (package (name "rust-lexiclean") @@ -34716,14 +36892,14 @@ parser in Rust.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.144") + (version "0.2.148") (source (origin (method url-fetch) (uri (crate-uri "libc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qfzrwhncsradwvdzd8vsj4mc31fh0rb5rvny3884rwa48fcq01b")))) + (base32 "16rn9l8s5sj9n2jb2pw13ghqwa5nvjggkh9q3lp6vs1jfghp3p4w")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs @@ -34899,20 +37075,22 @@ algorithm and related formats (ZLIB, GZIP).") (define-public rust-libflate-lz77-1 (package (name "rust-libflate-lz77") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "libflate_lz77" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nig3z2wjwk27ia066knp633akm00v017vny976sy29l970399rr")))) + (base32 "1gxc75fb2sk0xgrh3qxvxcx1l93yhmyxn9241r251wl5zj5klbd5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-rle-decode-fast" ,rust-rle-decode-fast-1)) + (("rust-core2" ,rust-core2-0.4) + ("rust-hashbrown" ,rust-hashbrown-0.13) + ("rust-rle-decode-fast" ,rust-rle-decode-fast-1)) #:cargo-development-inputs - (("rust-libflate" ,rust-libflate-0.1)))) + (("rust-libflate" ,rust-libflate-1)))) (home-page "https://github.com/sile/libflate") (synopsis "LZ77 encoder for libflate crate") (description "This package provides a LZ77 encoder for libflate crate.") @@ -35258,7 +37436,7 @@ functions and static variables these libraries contain.") (define-public rust-libmimalloc-sys-0.1 (package (name "rust-libmimalloc-sys") - (version "0.1.18") + (version "0.1.35") (source (origin (method url-fetch) @@ -35266,48 +37444,61 @@ functions and static variables these libraries contain.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0bbm03687j9fspvk6nqspmjlvchlvbxydl0mrc1x9i1k6kqiy5c2")) + "0r4nrd9xbmhmipw4bvh4xlbzbc7xf74frrsibqglysffgv1vay9r")) (modules '((guix build utils))) (snippet - '(begin (delete-file-recursively "c_src/mimalloc/bin"))))) + '(begin (substitute* "Cargo.toml" + (("\\[build-dependencies\\.cc\\]" all) + (string-append "[build-dependencies.pkg-config]\n" + "version = \"0.3\"\n\n" + all))) + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=mimalloc\");~@ + }~%"))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cty" ,rust-cty-0.2) - ("rust-cmake" ,rust-cmake-0.1)))) - (native-inputs - `(("cmake" ,cmake-minimal))) + (("rust-cc" ,rust-cc-1) + ("rust-cty" ,rust-cty-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs (list mimalloc)) (home-page "https://github.com/purpleprotocol/mimalloc_rust") (synopsis "Sys crate wrapping the mimalloc allocator") (description "This package provides a sys crate wrapping the mimalloc allocator.") (license license:expat))) -(define-public rust-libmdns-0.6 +(define-public rust-libmdns-0.7 (package (name "rust-libmdns") - (version "0.6.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "libmdns" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n1ymkv5246c5yj2m70ql07z38hrz6b2l16lg3wpb98vz7mbqd59")))) + (base32 "0470r44w3wkwg785wv1j9x8i65qa6v0ygrzh4vg9mcdkarmsw10b")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-byteorder" ,rust-byteorder-1) - ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-hostname" ,rust-hostname-0.3) - ("rust-if-addrs" ,rust-if-addrs-0.6) - ("rust-log" ,rust-log-0.4) - ("rust-multimap" ,rust-multimap-0.8) - ("rust-rand" ,rust-rand-0.8) - ("rust-socket2" ,rust-socket2-0.4) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)) - #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.8)))) + (list #:cargo-inputs + `(("rust-byteorder" ,rust-byteorder-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hostname" ,rust-hostname-0.3) + ("rust-if-addrs" ,rust-if-addrs-0.7) + ("rust-log" ,rust-log-0.4) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-nix" ,rust-nix-0.23) + ("rust-rand" ,rust-rand-0.8) + ("rust-socket2" ,rust-socket2-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + `(("rust-env-logger" ,rust-env-logger-0.8)))) (home-page "https://github.com/librespot-org/libmdns") (synopsis "DNS-SD and mDNS library for building discoverable LAN services") (description "A Multi-Cast DNS (RFC 6762) and DNS Service Discovery @@ -35316,6 +37507,32 @@ networks that do not have a local name server. Network services can be advertised and discovered using this mechanism.") (license license:expat))) +(define-public rust-libmdns-0.6 + (package + (inherit rust-libmdns-0.7) + (name "rust-libmdns") + (version "0.6.3") + (source (origin + (method url-fetch) + (uri (crate-uri "libmdns" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0n1ymkv5246c5yj2m70ql07z38hrz6b2l16lg3wpb98vz7mbqd59")))) + (arguments + (list #:cargo-inputs + `(("rust-byteorder" ,rust-byteorder-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hostname" ,rust-hostname-0.3) + ("rust-if-addrs" ,rust-if-addrs-0.6) + ("rust-log" ,rust-log-0.4) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-rand" ,rust-rand-0.8) + ("rust-socket2" ,rust-socket2-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs + `(("rust-env-logger" ,rust-env-logger-0.8)))))) + (define-public rust-libnghttp2-sys-0.1 (package (name "rust-libnghttp2-sys") @@ -35373,7 +37590,8 @@ advertised and discovered using this mechanism.") "18d9n8xaq5ncq3375f0xrr96l8si1frczgzdlrz3fl1jby8vbl6f")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; backend::file_header::test_fileheader_alignment fails + `(#:skip-build? #t ; TODO: Fix build + #:tests? #f ; backend::file_header::test_fileheader_alignment fails #:cargo-inputs (("rust-base64" ,rust-base64-0.10) ("rust-bincode" ,rust-bincode-1) @@ -35419,21 +37637,17 @@ file. @end itemize") (license license:gpl2+))) -;; https://github.com/jnqnfe/pulse-binding-rust/blob/c788a8069f455f864d2ba5f0aa5f62e6648dfd26/pulse-sys/build.rs -;; fix location of pulseaudio (define-public rust-libpulse-binding-2 (package (name "rust-libpulse-binding") - (version "2.23.1") + (version "2.28.1") (source (origin (method url-fetch) (uri (crate-uri "libpulse-binding" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1qx85j489mmad9cvw5k71271l3qy4s8a5qq8a9wac6cfi4viz5fv")))) + (base32 "1zza12f22wf1qs6h71lq1i73aj3kmv3036hqc7qci063vyi5fdgd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -35446,7 +37660,7 @@ file. #:phases (modify-phases %standard-phases (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t))))) + (lambda _ (setenv "HOME" "/tmp")))))) (native-inputs (list pkg-config)) (inputs @@ -35458,19 +37672,67 @@ file. library.") (license (list license:expat license:asl2.0)))) +(define-public rust-libpulse-simple-binding-2 + (package + (name "rust-libpulse-simple-binding") + (version "2.28.1") + (source (origin + (method url-fetch) + (uri (crate-uri "libpulse-simple-binding" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "139hiksmxrmj8zcdqvswgjnwl1rivh915vg6cl92asizydl6pz85")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libpulse-binding" ,rust-libpulse-binding-2) + ("rust-libpulse-simple-sys" ,rust-libpulse-simple-sys-1) + ("rust-libpulse-sys" ,rust-libpulse-sys-1)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ (setenv "HOME" "/tmp")))))) + (native-inputs (list pkg-config)) + (inputs (list pulseaudio)) + (home-page "https://github.com/jnqnfe/pulse-binding-rust") + (synopsis "Rust language bindings for PulseAudio's libpulse-simple library") + (description + "A Rust language binding for the PulseAudio libpulse-simple library.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-libpulse-simple-sys-1 + (package + (name "rust-libpulse-simple-sys") + (version "1.21.1") + (source (origin + (method url-fetch) + (uri (crate-uri "libpulse-simple-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lj13ibdwf69ghy1zlldxq5vsyxi1h13wqpvvh79z2wx36s16rpa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libpulse-sys" ,rust-libpulse-sys-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list pulseaudio)) + (home-page "https://github.com/jnqnfe/pulse-binding-rust") + (synopsis "FFI indings for PulseAudio's libpulse-simple system library") + (description + "FFI bindings for the PulseAudio libpulse-simple system library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-libpulse-sys-1 (package (name "rust-libpulse-sys") - (version "1.18.0") + (version "1.21.0") (source (origin (method url-fetch) (uri (crate-uri "libpulse-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "10msfr8f951v86ag0fl2bsm4a3siq2r7hz9bqhhg7i234s1yj5yg")))) + (base32 "16vs0qk6xadckb5qxlrhg0f4jn2zakfd7xih1lk1fb7lzc8f26dw")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -35547,6 +37809,236 @@ suite of tools for the rapid, accurate and memory-frugal processing single-cell and single-nucleus sequencing data.") (license license:bsd-3))) +(define-public rust-librespot-audio-0.4 + (package + (name "rust-librespot-audio") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "librespot-audio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "178djijj7fkg5ca5rhk10rvy9gs797gikvackh5qxsp1al9s6xn1")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-aes-ctr" ,rust-aes-ctr-0.6) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-librespot-core" ,rust-librespot-core-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "The audio fetching logic for Librespot") + (description + "Part of Librespot, an open source client library for Spotify. This +package contains the audio fetching logic.") + (license license:expat))) + +(define-public rust-librespot-core-0.4 + (package + (name "rust-librespot-core") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "librespot-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vaxnnlnsx8bmphiikm4kb99795jch0xxifr0azl9rl8b3r4jqq4")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-test-flags + ``("--release" "--" + "--skip=test_connection" + "--skip=test_apresolve" + "--skip=test_apresolve_port_443") + #:cargo-inputs + `(("rust-aes" ,rust-aes-0.6) + ("rust-base64" ,rust-base64-0.13) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-form-urlencoded" ,rust-form-urlencoded-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-http" ,rust-http-0.2) + ("rust-httparse" ,rust-httparse-1) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-proxy" ,rust-hyper-proxy-0.9) + ("rust-librespot-protocol" ,rust-librespot-protocol-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pbkdf2" ,rust-pbkdf2-0.8) + ("rust-priority-queue" ,rust-priority-queue-1) + ("rust-protobuf" ,rust-protobuf-2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha-1" ,rust-sha-1-0.10) + ("rust-shannon" ,rust-shannon-0.2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-1) + ("rust-vergen" ,rust-vergen-3)) + #:cargo-development-inputs + `(("rust-env-logger" ,rust-env-logger-0.9) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "The core functionality provided by librespot") + (description + "Part of Librespot, an open source client library for +Spotify. This package contains core functionality, such as authentication, +channel and session.") + (license license:expat))) + +(define-public rust-librespot-discovery-0.4 + (package + (name "rust-librespot-discovery") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "librespot-discovery" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01igbv0xf3vj046jvblbr09cgmv25mlfajyb2903cl31iz8pga1a")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-aes-ctr" ,rust-aes-ctr-0.6) + ("rust-base64" ,rust-base64-0.13) + ("rust-form-urlencoded" ,rust-form-urlencoded-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-libmdns" ,rust-libmdns-0.7) + ("rust-librespot-core" ,rust-librespot-core-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-dns-sd" ,rust-dns-sd-0.1)) + #:cargo-development-inputs + `(("rust-futures" ,rust-futures-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-simple-logger" ,rust-simple-logger-2) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "The discovery logic of Librespot") + (description "Part of Librespot, an open source client library for +Spotify. This package contains the discovery logic.") + (license license:expat))) + +(define-public rust-librespot-metadata-0.4 + (package + (name "rust-librespot-metadata") + (version "0.4.2") + (source (origin + (method url-fetch) + (uri (crate-uri "librespot-metadata" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "07626b84cghd3jabdvyqhn1v0lax9p1hhz6ldw2r4l6brcgkd03b")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-async-trait" ,rust-async-trait-0.1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-librespot-core" ,rust-librespot-core-0.4) + ("rust-librespot-protocol" ,rust-librespot-protocol-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-protobuf" ,rust-protobuf-2)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "The metadata elements of Librespot") + (description "Part of Librespot, an open source client library for +Spotify. This package contains the metadata logic.") + (license license:expat))) + +(define-public rust-librespot-playback-0.4 + (package + (name "rust-librespot-playback") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "librespot-playback" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dygnzldvkv1qpagr9nl62hmqh0xfcf4lsva37j0xxy7pjws142i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-alsa" ,rust-alsa-0.6) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cpal" ,rust-cpal-0.13) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-glib" ,rust-glib-0.15) + ("rust-gstreamer" ,rust-gstreamer-0.18) + ("rust-gstreamer-app" ,rust-gstreamer-app-0.18) + ("rust-gstreamer-audio" ,rust-gstreamer-audio-0.18) + ("rust-jack" ,rust-jack-0.10) + ("rust-lewton" ,rust-lewton-0.10) + ("rust-libpulse-binding" ,rust-libpulse-binding-2) + ("rust-libpulse-simple-binding" ,rust-libpulse-simple-binding-2) + ("rust-librespot-audio" ,rust-librespot-audio-0.4) + ("rust-librespot-core" ,rust-librespot-core-0.4) + ("rust-librespot-metadata" ,rust-librespot-metadata-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-ogg" ,rust-ogg-0.8) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-portaudio-rs" ,rust-portaudio-rs-0.3) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rodio" ,rust-rodio-0.15) + ("rust-sdl2" ,rust-sdl2-0.35) + ("rust-shell-words" ,rust-shell-words-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-zerocopy" ,rust-zerocopy-0.6)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "Audio playback for Librespot") + (description "Audio playback for Librespot, an open source client +library for Spotify.") + (license license:expat))) + +(define-public rust-librespot-protocol-0.4 + (package + (name "rust-librespot-protocol") + (version "0.4.2") + (source (origin + (method url-fetch) + (uri (crate-uri "librespot-protocol" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17xkvhlxfkjh1z79pvq22nrxi99hcxnzafg0pdkymh3a3733lvax")))) + (build-system cargo-build-system) + (arguments + (list + #:cargo-inputs + `(("rust-protobuf" ,rust-protobuf-2) + ("rust-glob" ,rust-glob-0.3) + ("rust-protobuf-codegen-pure" ,rust-protobuf-codegen-pure-2)))) + (home-page "https://github.com/librespot-org/librespot") + (synopsis "The protobuf logic for communicating with Spotify servers") + (description "Part of Librespot, an open source, Spotify client library. +This package contains the protobuf logic.") + (license license:expat))) + (define-public rust-libsqlite3-sys-0.26 (package (name "rust-libsqlite3-sys") @@ -35851,16 +38343,14 @@ to count the number of lines in a file.") (define-public rust-link-cplusplus-1 (package (name "rust-link-cplusplus") - (version "1.0.8") + (version "1.0.9") (source - (origin - (method url-fetch) - (uri (crate-uri "link-cplusplus" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x84vvg7gn94x9zrvd67602h3ricmhlv19cpl2alzhqkqz4hglpc")))) + (origin + (method url-fetch) + (uri (crate-uri "link-cplusplus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jc56xf51f3fn5hvppsj9c2pa0fxm7k79xs90a5s58qvgrphq94x")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cc" ,rust-cc-1)))) @@ -35990,17 +38480,17 @@ facility. Provides a safe interface around the raw system calls allowing user-space programs to perform key manipulation.") (license (list license:asl2.0 license:expat)))) -(define-public rust-linux-raw-sys-0.3 +(define-public rust-linux-raw-sys-0.4 (package (name "rust-linux-raw-sys") - (version "0.3.7") - (source (origin - (method url-fetch) - (uri (crate-uri "linux-raw-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "17s7qr5h82blrxy29014zzhr30jcxcjc8r16v2p31rzcfal7xsgc")))) + (version "0.4.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "linux-raw-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nw8dqdhai0c7r701bicj3y6vrwc7dgbx9lbcw29ijnr7d562liq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -36018,6 +38508,26 @@ Linux userspace APIs.") ;; LLVM exception. See COPYRIGHT in the repository. (license (list license:asl2.0 license:expat)))) +(define-public rust-linux-raw-sys-0.3 + (package + (inherit rust-linux-raw-sys-0.4) + (name "rust-linux-raw-sys") + (version "0.3.7") + (source (origin + (method url-fetch) + (uri (crate-uri "linux-raw-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17s7qr5h82blrxy29014zzhr30jcxcjc8r16v2p31rzcfal7xsgc")))) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-static-assertions" ,rust-static-assertions-1)))))) + (define-public rust-linux-raw-sys-0.1 (package (inherit rust-linux-raw-sys-0.3) @@ -36255,7 +38765,7 @@ by inspecting the system for user preference.") (define-public rust-lock-api-0.4 (package (name "rust-lock-api") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) @@ -36263,7 +38773,7 @@ by inspecting the system for user preference.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1py41vk243hwk345nhkn5nw0bd4m03gzjmprdjqq6rg5dwv12l23")))) + "05nd9nzxqidg24d1k8y5vlc8lz9gscpskrikycib46qbl8brgk61")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -36375,17 +38885,17 @@ by inspecting the system for user preference.") `(#:cargo-inputs (("rust-log" ,rust-log-0.4)))))) -(define-public rust-loom-0.5 +(define-public rust-loom-0.7 (package (name "rust-loom") - (version "0.5.6") - (source (origin - (method url-fetch) - (uri (crate-uri "loom" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x9hmiv00ir79kypcg0jdw0j0fkd3ymq6rpv6pli6q5qifrfql7z")))) + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "loom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gqrw1d0kqdkjvb11ziniwhngd66awk40dr67s6wyfh7wmipk8c6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -36396,7 +38906,9 @@ by inspecting the system for user preference.") ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tracing" ,rust-tracing-0.1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3)))) (home-page "https://github.com/tokio-rs/loom") (synopsis "Permutation testing for concurrent code") (description @@ -36406,6 +38918,29 @@ memory model. It uses state reduction techniques to avoid combinatorial explosion.") (license license:expat))) +(define-public rust-loom-0.5 + (package + (inherit rust-loom-0.7) + (name "rust-loom") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (crate-uri "loom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1x9hmiv00ir79kypcg0jdw0j0fkd3ymq6rpv6pli6q5qifrfql7z")))) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-generator" ,rust-generator-0.7) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))))) + (define-public rust-loom-0.4 (package (name "rust-loom") @@ -36529,8 +39064,44 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) +(define-public rust-lopdf-0.29 + (package + (name "rust-lopdf") + (version "0.29.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lopdf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p59fkn9rkas0jywm7z24970k3lpv71sxxabmkmnig3d1p26j3yy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-encoding" ,rust-encoding-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-image" ,rust-image-0.24) + ("rust-itoa" ,rust-itoa-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-nom" ,rust-nom-6) + ("rust-pom" ,rust-pom-3) + ("rust-rayon" ,rust-rayon-1) + ("rust-time" ,rust-time-0.2) + ("rust-weezl" ,rust-weezl-0.1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/J-F-Liu/lopdf") + (synopsis "Rust library for PDF document manipulation") + (description + "This package provides a Rust library for PDF document manipulation.") + (license license:expat))) + (define-public rust-lopdf-0.26 (package + (inherit rust-lopdf-0.29) (name "rust-lopdf") (version "0.26.0") (source @@ -36541,7 +39112,6 @@ image together with its neighboring pixels.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "1wqnmibs8qzi6pr3ig4h3sg6bfkkgyv4ngdng81x069725r056ml")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -36556,12 +39126,7 @@ image together with its neighboring pixels.") ("rust-nom" ,rust-nom-6) ("rust-pom" ,rust-pom-3) ("rust-rayon" ,rust-rayon-1) - ("rust-time" ,rust-time-0.2)))) - (home-page "https://github.com/J-F-Liu/lopdf") - (synopsis "Rust library for PDF document manipulation") - (description - "This package provides a Rust library for PDF document manipulation.") - (license license:expat))) + ("rust-time" ,rust-time-0.2)))))) (define-public rust-lru-0.7 (package @@ -37063,6 +39628,33 @@ algorithms. It supports CBC block cipher mode, PKCS5 padding and 64, 128, 192 or 256-bits key length.") (license license:asl2.0))) +(define-public rust-magic-string-0.3 + (package + (name "rust-magic-string") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "magic-string" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "062fjfvq17qm8ymqzq4y6wk7a3fmxqq9ysg40yrcrxs3ik73703c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-napi" ,rust-napi-2) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-vlq" ,rust-vlq-0.5)))) + (home-page "https://github.com/h-a-n-a/magic-string-rs") + (synopsis "MagicString port driven by Rust and N-API") + (description + "This package provides a MagicString port driven by Rust and N-API.") + (license license:expat))) + (define-public rust-maildir-0.5 (package (name "rust-maildir") @@ -37545,22 +40137,25 @@ testing of matrixcompare.") (define-public rust-matrixmultiply-0.3 (package (name "rust-matrixmultiply") - (version "0.3.1") + (version "0.3.8") (source (origin (method url-fetch) (uri (crate-uri "matrixmultiply" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hdpsvw28in1m9c5h8a7abzxv70rq8l5hg5h8k6sxpyrfsvib2js")))) + (base32 "1whgrp8ph7904aslqx87h9qm0ks4pxdj2nysffmrhiys6v7w2x3m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-num-cpus" ,rust-num-cpus-1) + `(#:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-num-cpus" ,rust-num-cpus-1) ("rust-once-cell" ,rust-once-cell-1) ("rust-rawpointer" ,rust-rawpointer-0.2) - ("rust-thread-tree" ,rust-thread-tree-0.3)))) + ("rust-thread-tree" ,rust-thread-tree-0.3)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-itertools" ,rust-itertools-0.8)))) (home-page "https://github.com/bluss/matrixmultiply/") (synopsis "General matrix multiplication for f32 and f64 matrices") (description "General matrix multiplication for f32 and f64 matrices. @@ -37992,17 +40587,17 @@ file IO.") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) -(define-public rust-memmap2-0.5 +(define-public rust-memmap2-0.7 (package (name "rust-memmap2") - (version "0.5.10") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "memmap2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09xk415fxyl4a9pgby4im1v2gqlb5lixpm99dczkk30718na9yl3")))) + (base32 "1il82b0mw304jlwvl0m89aa8bj5dgmm3vbb0jg8lqlrk0p98i4zl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -38017,6 +40612,26 @@ file IO.") "This package provides a Rust API for memory-mapped file IO.") (license (list license:expat license:asl2.0)))) +(define-public rust-memmap2-0.5 + (package + (inherit rust-memmap2-0.7) + (name "rust-memmap2") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "memmap2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09xk415fxyl4a9pgby4im1v2gqlb5lixpm99dczkk30718na9yl3")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)) + #:cargo-development-inputs + (("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-memmap2-0.3 (package (inherit rust-memmap2-0.5) @@ -38251,6 +40866,12 @@ for Rust structs.") (sha256 (base32 "01wxhi7mqmp34l540wcfb24hb13vcbps4wlynas66bnsfra0g790")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://sr.ht/~ireas/merge-rs") (synopsis "Derive macro for the merge crate") (description "This crate provides a derive macro for the @@ -38273,7 +40894,13 @@ for Rust structs.") (arguments `(#:cargo-inputs (("rust-merge-derive" ,rust-merge-derive-0.1) - ("rust-num-traits" ,rust-num-traits-0.2)))) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-envy" ,rust-envy-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-toml" ,rust-toml-0.5) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://sr.ht/~ireas/merge-rs") (synopsis "Rust trait for objects that can be merged") (description "This package provides a merge trait that can be used @@ -38605,7 +41232,7 @@ embedded migrations.") (define-public rust-mimalloc-0.1 (package (name "rust-mimalloc") - (version "0.1.20") + (version "0.1.39") (source (origin (method url-fetch) @@ -38613,7 +41240,7 @@ embedded migrations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x74b6jv6pxfl6bh44bnch6ajm3l5z3zq8w8mqlscbq8d77rnx80")))) + "176w9gf5qxs07kd2q39f0k25rzmp4kyx5r13wc8sk052bqmr40gs")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -38624,6 +41251,74 @@ embedded migrations.") drop-in allocator.") (license license:expat))) +(define-public rust-mimalloc-rust-0.1 + (package + (name "rust-mimalloc-rust") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "mimalloc-rust" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wj4hkspsmlgm6lh5bf2blzalgjcc356bpkh4k5vcnyvvzwhvhxw")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("1\\.7\\.3-source") "1.7.2")))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Test suite is flakey. + #:cargo-inputs + (("rust-cty" ,rust-cty-0.2) + ("rust-mimalloc-rust-sys" ,rust-mimalloc-rust-sys-1)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1)))) + (inputs + (list mimalloc)) + (home-page "https://github.com/lemonhx/mimalloc-rust") + (synopsis "Binding for mimalloc in rust") + (description "This package provides a binding for mimalloc in rust.") + (license license:expat))) + +(define-public rust-mimalloc-rust-sys-1 + (package + (name "rust-mimalloc-rust-sys") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "mimalloc-rust-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "144m1va3dmbr6c5nj1aqnnfrp0fc4yyqn10n25w7ksvsrhnz7xwn")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "c_src") + ;; Inspired by Debian's patch for bzip2-sys. + (substitute* "Cargo.toml.orig" + (("cc = .*") "pkg-config = \"0.3\"\n")) + (copy-file "Cargo.toml.orig" "Cargo.toml") + (delete-file "build.rs") + (with-output-to-file "build.rs" + (lambda _ + (format #t "fn main() {~@ + println!(\"cargo:rustc-link-lib=mimalloc\");~@ + }~%"))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cty" ,rust-cty-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs + (list mimalloc)) + (home-page "https://docs.rs/mimalloc-rust-sys/1.7.2") + (synopsis "@code{mimalloc_rust} hand written sys binding") + (description + "This package provides @code{mimalloc_rust} hand written sys bindings.") + (license license:expat))) + (define-public rust-mime-0.3 (package (name "rust-mime") @@ -38819,16 +41514,64 @@ efficient round-trip float parsing. Minimal-lexical implements a correct, fast float parser.") (license (list license:expat license:asl2.0)))) -(define-public rust-miniz-oxide-0.6 +(define-public rust-minimp3-0.5 (package - (name "rust-miniz-oxide") - (version "0.6.4") + (name "rust-minimp3") + (version "0.5.1") (source (origin (method url-fetch) - (uri (crate-uri "miniz-oxide" version)) + (uri (crate-uri "minimp3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0wj3nzj1swnvwsk3a4a3hkfj1d21jsi7babi40wlrxzbbzvkhm4q")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; no method named `next_frame_future` found for struct `Decoder` + #:cargo-inputs (("rust-minimp3-sys" ,rust-minimp3-sys-0.3) + ("rust-slice-deque" ,rust-slice-deque-0.3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/germangb/minimp3-rs") + (synopsis "Rust bindings for the minimp3 library") + (description "Rust bindings for the minimp3 library.") + (license license:expat))) + +(define-public rust-minimp3-sys-0.3 + (package + (name "rust-minimp3-sys") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (crate-uri "minimp3-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08j82769wkgbzfpg0k2qa744w3sg79vx1vsmjw88p1yy5rc15qpj")))) + (base32 + "144vmf3s89kad0smjprzigcp2c9r5dm95n4ydilrbp399irp6772")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs (("rust-cc" ,rust-cc-1)))) + (native-inputs (list pkg-config)) + (inputs (list minimp3)) + (home-page "https://github.com/germangb/minimp3-rs") + (synopsis "Rust bindings for the minimp3 library") + (description "Rust bindings for the minimp3 library.") + (license license:expat))) + +(define-public rust-miniz-oxide-0.7 + (package + (name "rust-miniz-oxide") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "miniz-oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ivl3rbbdm53bzscrd01g60l46lz5krl270487d8lhjvwl5hx0g7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -38845,18 +41588,37 @@ float parser.") streaming API for miniz_oxide.") (license (list license:expat license:zlib license:asl2.0)))) +(define-public rust-miniz-oxide-0.6 + (package + (inherit rust-miniz-oxide-0.7) + (name "rust-miniz-oxide") + (version "0.6.2") + (source (origin + (method url-fetch) + (uri (crate-uri "miniz-oxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yp8z6yll5ypz1ldmgnv7zi0r78kbvmqmn2mii77jzmk5069axdj")))) + (arguments + `(#:cargo-inputs + (("rust-adler" ,rust-adler-1) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-simd-adler32" ,rust-simd-adler32-0.3)))))) + (define-public rust-miniz-oxide-0.5 (package (inherit rust-miniz-oxide-0.6) (name "rust-miniz-oxide") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1k1wfxb35v129mhqy14yqhrj3wvknafrwygiq7zvi0m5iml7ap3g")))) + (base32 "0d2xcypr8s0skd81dhlrylas1j794qyz74snm11jc8kmy6l0nncn")))) (arguments `(#:cargo-inputs (("rust-adler" ,rust-adler-1) @@ -38869,17 +41631,17 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.5) (name "rust-miniz-oxide") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "miniz_oxide" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17d1xp29v5xgh4vahxld14w1c1hgh38qmxpv7i18wy096gn2cb8g")))) + (base32 "0jsfv00hl5rmx1nijn59sr9jmjd4rjnjhh4kdjy8d187iklih9d9")))) (arguments `(#:cargo-inputs - (("rust-adler" ,rust-adler-0.2) + (("rust-adler" ,rust-adler-1) ("rust-autocfg" ,rust-autocfg-1) ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) @@ -38889,7 +41651,7 @@ streaming API for miniz_oxide.") (package (inherit rust-miniz-oxide-0.4) (name "rust-miniz-oxide") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) @@ -38897,7 +41659,7 @@ streaming API for miniz_oxide.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "198n4hfpq0qcxf275l6fpzh7b9cl7ck2xs6pjgpds74bazv9yrxa")))) + "0dblrhgbm0wa8jjl8cjp81akaj36yna92df4z1h9b26n3spal7br")))) (arguments `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1)))))) @@ -38927,23 +41689,23 @@ streaming API for miniz_oxide.") (define-public rust-mio-0.8 (package (name "rust-mio") - (version "0.8.6") + (version "0.8.8") (source (origin (method url-fetch) (uri (crate-uri "mio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ygx5chq81k3vk2bx722xwcwf2qydmm337jsnijgzd7mxx39m7av")))) + (base32 "1lhrdgcmcy8f0qy1n7357q0aprfkm5gld5mjcrp209pwsdf7cylj")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-wasi" ,rust-wasi-0.11) - ("rust-windows-sys" ,rust-windows-sys-0.45)) + ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs - `(("rust-env-logger" ,rust-env-logger-0.8) + `(("rust-env-logger" ,rust-env-logger-0.9) ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/tokio-rs/mio") (synopsis "Lightweight non-blocking IO") @@ -39007,6 +41769,35 @@ possible over the OS abstractions.") ("rust-env-logger" ,rust-env-logger-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-mio-aio-0.7 + (package + (name "rust-mio-aio") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-aio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07y7wnkd4xvj48fyxgnfm9jqjldgqfd39k3ydfmaqc76mw36pagq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; no variant named `SigevKevent` found for enum `SigevNotify` + #:cargo-inputs + (("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.24)) + #:cargo-development-inputs + (("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-log" ,rust-log-0.3) + ("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.24) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/asomers/mio-aio") + (synopsis "POSIX AIO bindings for mio") + (description "This package provides POSIX AIO bindings for mio.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-anonymous-pipes-0.2 (package (name "rust-mio-anonymous-pipes") @@ -39356,6 +42147,27 @@ select the mock struct at compile time. Used with the Mockall crate.") (description "mp4 is a Rust library to read and write ISO-MP4 files.") (license license:expat))) +(define-public rust-muldiv-1 + (package + (name "rust-muldiv") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (crate-uri "muldiv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c6ljsp41n8ijsx7zicwfm135drgyhcms12668ivvsbm1r98frwm")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-quickcheck" ,rust-quickcheck-1)))) + (home-page "https://github.com/sdroege/rust-muldiv") + (synopsis "Trait for numeric types to combine multiplication and division") + (description + "This package provides a trait for numeric types to perform combined +multiplication and division with overflow protection.") + (license license:expat))) + (define-public rust-multimap-0.8 (package (name "rust-multimap") @@ -39643,8 +42455,74 @@ quick compile time, and minimal dependencies.") (description "Run NASM during your Cargo build.") (license (list license:expat license:asl2.0)))) +(define-public rust-nalgebra-0.32 + (package + (name "rust-nalgebra") + (version "0.32.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ahwmg15v2qschc1y64hg5r2hdp7m0izv11zx0lkyhn2ijqxjzih")))) + (build-system cargo-build-system) + (arguments + `(;#:features '("debug" "compare" "rand" "macros") + #:cargo-test-flags + ;; Feature list as requested by the test suite. + '("--release" "--features" "debug,compare,rand,macros") + #:cargo-inputs + (("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-cust-core" ,rust-cust-core-0.1) + ("rust-glam" ,rust-glam-0.24) + ("rust-glam" ,rust-glam-0.23) + ("rust-glam" ,rust-glam-0.22) + ("rust-glam" ,rust-glam-0.21) + ("rust-glam" ,rust-glam-0.20) + ("rust-glam" ,rust-glam-0.19) + ("rust-glam" ,rust-glam-0.18) + ("rust-glam" ,rust-glam-0.17) + ("rust-glam" ,rust-glam-0.16) + ("rust-glam" ,rust-glam-0.15) + ("rust-glam" ,rust-glam-0.14) + ("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.3) + ("rust-mint" ,rust-mint-0.5) + ("rust-nalgebra-macros" ,rust-nalgebra-macros-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-rational" ,rust-num-rational-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-proptest" ,rust-proptest-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-simba" ,rust-simba-0.8) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-matrixcompare" ,rust-matrixcompare-0.3) + ("rust-rand-isaac" ,rust-rand-isaac-0.3) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a general-purpose linear algebra library with +transformations and statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-nalgebra-0.29 (package + (inherit rust-nalgebra-0.32) (name "rust-nalgebra") (version "0.29.0") (source @@ -39655,7 +42533,6 @@ quick compile time, and minimal dependencies.") (sha256 (base32 "1zri11vkrbk3ayvy8xqcdvvyjvfcbl5a18x8z82racnn11zfn1nm")) (modules '((guix build utils))))) - (build-system cargo-build-system) (arguments `(#:tests? #f ;TODO: how to enable required features? #:cargo-inputs @@ -39691,13 +42568,7 @@ quick compile time, and minimal dependencies.") ("rust-matrixcompare" ,rust-matrixcompare-0.3) ("rust-rand-isaac" ,rust-rand-isaac-0.3) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://nalgebra.org") - (synopsis "Linear algebra library") - (description - "This package provides a general-purpose linear algebra library with -transformations and statically-sized or dynamically-sized matrices.") - (license license:bsd-3))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-nalgebra-0.27 (package @@ -39881,8 +42752,35 @@ statically-sized or dynamically-sized matrices.") (("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-nalgebra-macros-0.2 + (package + (name "rust-nalgebra-macros") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "166rzbzi1hcyjfvwxmrdimrcmflvxxifjfkqxxkdjfnhcznilxli")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-nalgebra" ,rust-nalgebra-0.32) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://nalgebra.org") + (synopsis "Procedural macros for nalgebra") + (description "This package provides procedural macros for the nalgebra +linear algebra library.") + (license license:asl2.0))) + (define-public rust-nalgebra-macros-0.1 (package + (inherit rust-nalgebra-macros-0.2) (name "rust-nalgebra-macros") (version "0.1.0") (source @@ -39898,7 +42796,6 @@ statically-sized or dynamically-sized matrices.") (substitute* "Cargo.toml" ;; The resolver feature is not supported by our versions of Cargo. (("resolver = \"2\".*") "")))))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -39906,15 +42803,41 @@ statically-sized or dynamically-sized matrices.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-nalgebra" ,rust-nalgebra-0.26)))) - (home-page "https://nalgebra.org") - (synopsis "Procedural macros for nalgebra") - (description "This package provides procedural macros for the nalgebra -linear algebra library.") - (license license:asl2.0))) + (("rust-nalgebra" ,rust-nalgebra-0.26)))))) + +(define-public rust-napi-2 + (package + (name "rust-napi") + (version "2.13.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h1sbblg638h1pnhvf2yxy0lzk8hy9dwx5mswc296500p69kq1px")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-napi-derive" ,rust-napi-derive-2) + ("rust-napi-sys" ,rust-napi-sys-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/napi-rs/napi-rs") + (synopsis "N-API bindings") + (description "This package provides N-API bindings.") + (license license:expat))) (define-public rust-napi-0.5 (package + (inherit rust-napi-2) (name "rust-napi") (version "0.5.1") (source @@ -39925,9 +42848,9 @@ linear algebra library.") (sha256 (base32 "0mp0di7zv1r9gn3r3pmqnyy6q94akd9d6bl1p7m76nm9hgj9rw56")))) - (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants node for napi-build-0.2 and napi-sys-0.4 + #:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futures" ,rust-futures-0.3) ("rust-napi-sys" ,rust-napi-sys-0.4) @@ -39936,14 +42859,35 @@ linear algebra library.") ("rust-serde-json" ,rust-serde-json-1) ("rust-tokio" ,rust-tokio-0.2)) #:cargo-development-inputs - (("rust-napi-build" ,rust-napi-build-0.2)))) + (("rust-napi-build" ,rust-napi-build-0.2)))))) + +(define-public rust-napi-build-1 + (package + (name "rust-napi-build") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-build" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0asjspv0gkg6lgdz3d6gl9ab7hbc9z2hc51m637j6x3jfa8l3m7b")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "src/libs") + ;; Don't try to read the removed files. + (substitute* "src/windows.rs" + (("include_bytes.*") + "unreachable!(),\n")))))) + (build-system cargo-build-system) (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "N-API bindings") - (description "This package provides N-API bindings.") + (synopsis "N-API build support") + (description "This package provides N-API build support.") (license license:expat))) (define-public rust-napi-build-0.2 (package + (inherit rust-napi-build-1) (name "rust-napi-build") (version "0.2.1") (source @@ -39952,20 +42896,40 @@ linear algebra library.") (uri (crate-uri "napi-build" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1z02mlw1wa01fjpjnqns3f3vxacbg1jnk98hcg3pgwp5xy3zdyqq")))) - (build-system cargo-build-system) + (base32 "1z02mlw1wa01fjpjnqns3f3vxacbg1jnk98hcg3pgwp5xy3zdyqq")))) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-reqwest" ,rust-reqwest-0.10)))) + ("rust-reqwest" ,rust-reqwest-0.10)))))) + +(define-public rust-napi-derive-2 + (package + (name "rust-napi-derive") + (version "2.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rz3plhps1i1p5m02ffy97lcd3mzf8ihdkcgf2l9lm2dm27nl76s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-convert-case" ,rust-convert-case-0.6) + ("rust-napi-derive-backend" ,rust-napi-derive-backend-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "N-API build support") - (description "This package provides N-API build support.") + (synopsis "N-API procedural macros") + (description "This package provides N-API procedural macros.") (license license:expat))) (define-public rust-napi-derive-0.5 (package + (inherit rust-napi-derive-2) (name "rust-napi-derive") (version "0.5.1") (source @@ -39976,19 +42940,60 @@ linear algebra library.") (sha256 (base32 "0kkgpzw4i6f0zkg80v9vhr7y5rg25q3kv67029i1gcgsrxlqx4zi")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-napi-derive-backend-1 + (package + (name "rust-napi-derive-backend") + (version "1.0.52") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-derive-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05wy00faa3bz2lqcrwnlr3l9hzwrw3qcapljiy26ml38j73cgfr0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-convert-case" ,rust-convert-case-0.6) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-semver" ,rust-semver-1) ("rust-syn" ,rust-syn-1)))) + (home-page "https://napi.rs") + (synopsis "Codegen backend for napi procedural macro") + (description "Codegen backend for napi procedural macro.") + (license license:expat))) + +(define-public rust-napi-sys-2 + (package + (name "rust-napi-sys") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "napi-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qxs0wxlax3nj3b1q1vgr5ihzp8c0d58vzm98x85gd9s5bsmwsqn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libloading" ,rust-libloading-0.7)))) (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "N-API procedural macros") - (description "This package provides N-API procedural macros.") + (synopsis "NodeJS N-API raw binding") + (description "This package provides a NodeJS N-API raw binding.") (license license:expat))) (define-public rust-napi-sys-0.4 (package + (inherit rust-napi-sys-2) (name "rust-napi-sys") (version "0.4.7") (source @@ -39999,13 +43004,13 @@ linear algebra library.") (sha256 (base32 "0cjirf6n4i2lw65iaww8d4hahv3cbfm5ka9hlansvnbfgzwadzq9")))) - (build-system cargo-build-system) (inputs (list openssl)) (native-inputs (list pkg-config)) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants node. + #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.55) ("rust-semver" ,rust-semver-0.10) ("rust-tar" ,rust-tar-0.4)) @@ -40013,11 +43018,7 @@ linear algebra library.") (("rust-flate2" ,rust-flate2-1) ("rust-glob" ,rust-glob-0.3) ("rust-regex" ,rust-regex-1) - ("rust-reqwest" ,rust-reqwest-0.10)))) - (home-page "https://github.com/napi-rs/napi-rs") - (synopsis "NodeJS N-API raw binding") - (description "This package provides a NodeJS N-API raw binding.") - (license license:expat))) + ("rust-reqwest" ,rust-reqwest-0.10)))))) (define-public rust-native-tls-0.2 (package @@ -40345,6 +43346,28 @@ general elements and for numerics.") "This package provides safe Rust bindings to the Android NDK.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-0.6 + (package + (inherit rust-ndk-0.7) + (name "rust-ndk") + (version "0.6.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ndk" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m1dfjw35qpys1hr4qib6mm3zacd01k439l7cx5f7phd0dzcfci0")))) + (arguments + `(#:skip-build? #t ; Android only + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-jni" ,rust-jni-0.18) + ("rust-jni-glue" ,rust-jni-glue-0.0) + ("rust-jni-sys" ,rust-jni-sys-0.3) + ("rust-ndk-sys" ,rust-ndk-sys-0.3) + ("rust-num-enum" ,rust-num-enum-0.5) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-ndk-0.5 (package (inherit rust-ndk-0.7) @@ -40410,35 +43433,56 @@ general elements and for numerics.") "This package provides handles for accessing Android APIs.") (license (list license:expat license:asl2.0)))) -(define-public rust-ndk-glue-0.5 +(define-public rust-ndk-glue-0.6 (package (name "rust-ndk-glue") - (version "0.5.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "ndk-glue" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1m44jh4f9sirs757ikc8sracg6dzw77h9l4bw9vm8s1dly7fw6y7")))) + (version "0.6.2") + (source (origin + (method url-fetch) + (uri (crate-uri "ndk-glue" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pz6cdmmlzsb2jhrfvkma5d5vw2i331dlghqnkk2c0l6hdxll30d")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #true ;XXX: Android only - #:cargo-inputs - (("rust-android-logger" ,rust-android-logger-0.10) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-log" ,rust-log-0.4) - ("rust-ndk" ,rust-ndk-0.5) - ("rust-ndk-context" ,rust-ndk-context-0.1) - ("rust-ndk-macro" ,rust-ndk-macro-0.3) - ("rust-ndk-sys" ,rust-ndk-sys-0.2)))) - (home-page "https://github.com/rust-windowing/android-ndk-rs") + (list #:skip-build? #t ;XXX: Android only + #:cargo-inputs `(("rust-android-logger" ,rust-android-logger-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-ndk" ,rust-ndk-0.6) + ("rust-ndk-context" ,rust-ndk-context-0.1) + ("rust-ndk-macro" ,rust-ndk-macro-0.3) + ("rust-ndk-sys" ,rust-ndk-sys-0.3)))) + (home-page "https://github.com/rust-mobile/ndk") (synopsis "Startup code for Android binaries") - (description - "This package provides startup code for Android binaries.") + (description "This package provides startup code for Android binaries.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-glue-0.5 + (package + (inherit rust-ndk-glue-0.6) + (name "rust-ndk-glue") + (version "0.5.2") + (source (origin + (method url-fetch) + (uri (crate-uri "ndk-glue" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1m44jh4f9sirs757ikc8sracg6dzw77h9l4bw9vm8s1dly7fw6y7")))) + (arguments + (list #:skip-build? #t ;XXX: Android only + #:cargo-inputs `(("rust-android-logger" ,rust-android-logger-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-ndk" ,rust-ndk-0.5) + ("rust-ndk-context" ,rust-ndk-context-0.1) + ("rust-ndk-macro" ,rust-ndk-macro-0.3) + ("rust-ndk-sys" ,rust-ndk-sys-0.2)))))) + (define-public rust-ndk-glue-0.2 (package (inherit rust-ndk-glue-0.5) @@ -40526,6 +43570,19 @@ general elements and for numerics.") (description "This package provides FFI bindings for the Android NDK.") (license (list license:expat license:asl2.0)))) +(define-public rust-ndk-sys-0.3 + (package + (inherit rust-ndk-sys-0.4) + (name "rust-ndk-sys") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ndk-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15zsq4p6k5asf4mc0rknd8cz9wxrwvi50qdspgf87qcfgkknlnkf")))))) + (define-public rust-ndk-sys-0.2 (package (inherit rust-ndk-sys-0.4) @@ -40970,7 +44027,10 @@ applications written in Rust. Its API is inspired by the popular (("rust-lazy_static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-nitrokey-sys" ,rust-nitrokey-sys-3) - ("rust-rand_core" ,rust-rand-core-0.5)))) + ("rust-rand_core" ,rust-rand-core-0.5)) + #:cargo-development-inputs + (("rust-nitrokey-test" ,rust-nitrokey-test-0.3) + ("rust-nitrokey-test-state" ,rust-nitrokey-test-state-0.1)))) (home-page "https://git.sr.ht/~ireas/nitrokey-rs") (synopsis "Rust bindings to libnitrokey") (description @@ -40981,7 +44041,7 @@ with Nitrokey devices.") (define-public rust-nitrokey-sys-3 (package (name "rust-nitrokey-sys") - (version "3.6.0") + (version "3.7.0") (source (origin (method url-fetch) @@ -40989,8 +44049,12 @@ with Nitrokey devices.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08c3lnb8iqx000jd5rzvrdvv4ihjyw3x3s8q11dw56is0nmjyvws")))) + "0hcns32sclzf8xbdjg5iqndbn1b66l3j61zbgbl8ds8n6nind16q")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.55) + ("rust-cc" ,rust-cc-1)))) (home-page "https://git.sr.ht/~ireas/nitrokey-sys-rs") (synopsis "Low-level Rust bindings for libnitrokey") (description @@ -41012,7 +44076,8 @@ communication with Nitrokey devices.") "197j9r2s4ydzbqfydza6v31mgcsgd29jpidz4psqawjdm49f8lg6")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Wants an older version of rust-nitrokey. + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("quote" ,rust-quote-1) ("syn" ,rust-syn-1)))) @@ -41023,6 +44088,27 @@ communication with Nitrokey devices.") nitrokey crate and others using it.") (license license:gpl3+))) +(define-public rust-nitrokey-test-0.3 + (package + (inherit rust-nitrokey-test-0.5) + (name "rust-nitrokey-test") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "nitrokey-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dzy0lfz2zwn7f1d126avig6risj78a4bvf3zdwjyldaxln0rnpk")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-nitrokey" ,rust-nitrokey-0.9) + ("rust-nitrokey-test-state" ,rust-nitrokey-test-state-0.1)))))) + (define-public rust-nitrokey-test-state-0.1 (package (name "rust-nitrokey-test-state") @@ -41097,21 +44183,30 @@ while still providing platform specific APIs.") (package (inherit rust-nix-0.26) (name "rust-nix") - (version "0.24.2") + (version "0.24.3") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z35n1bhzslr7zawy2c0fl90jjy9l5b3lnsidls3908vfk0xnp0r")))) + (base32 "0sc0yzdl51b49bqd9l9cmimp1sw1hxb8iyv4d35ww6d7m5rfjlps")))) (arguments - (list #:skip-build? #t + (list #:tests? #f ; Test suite hangs. #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))))) + ("rust-memoffset" ,rust-memoffset-0.6)) + #:cargo-development-inputs + `(("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.23 (package @@ -41895,6 +44990,26 @@ with all line endings.") ("rust-rustversion" ,rust-rustversion-1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-normpath-0.2 + (package + (inherit rust-normpath-1) + (name "rust-normpath") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "normpath" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y354v327vbcxap7ag88j81y4zifzhnjgxvn7l1s2d9cjb4si79a")))) + (arguments + `(#:cargo-inputs + (("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-notify-5 (package (name "rust-notify") @@ -42093,6 +45208,25 @@ enhances the built-in library with some useful features.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))))) +(define-public rust-ntest-0.7 + (package + (inherit rust-ntest-0.8) + (name "rust-ntest") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i4xsvx52hmcnga2xbjl74hdylz4jy8bc2swcichlvw1di4lwm2w")))) + (arguments + `(#:cargo-inputs + (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.7) + ("rust-ntest-test-cases" ,rust-ntest-test-cases-0.7) + ("rust-ntest-timeout" ,rust-ntest-timeout-0.7)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-ntest-test-cases-0.9 (package (name "rust-ntest-test-cases") @@ -42133,6 +45267,19 @@ enhances the built-in library with some useful features.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-ntest-test-cases-0.7 + (package + (inherit rust-ntest-test-cases-0.8) + (name "rust-ntest-test-cases") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-test-cases" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ghal2rb03cnj7ciqgdq0dvifdf8qp2hnmi9z1ip1j5b02s1xa4r")))))) + (define-public rust-ntest-timeout-0.9 (package (name "rust-ntest-timeout") @@ -42177,6 +45324,26 @@ framework.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-ntest-timeout-0.7 + (package + (inherit rust-ntest-timeout-0.8) + (name "rust-ntest-timeout") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-timeout" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08v3r6hggh43qabl887pkz88k6lg6hrc62mppxyabb0pw44v03di")))) + (arguments + `(#:cargo-inputs + (("rust-ntest-proc-macro-helper" ,rust-ntest-proc-macro-helper-0.7) + ("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-ntest-proc-macro-helper-0.8 (package (name "rust-ntest-proc-macro-helper") @@ -42194,6 +45361,19 @@ framework.") macros used in ntest.") (license license:expat))) +(define-public rust-ntest-proc-macro-helper-0.7 + (package + (inherit rust-ntest-proc-macro-helper-0.8) + (name "rust-ntest-proc-macro-helper") + (version "0.7.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "ntest-proc-macro-helper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lkyfx97aynbm7cnhzyc9cr0rpq1xzng1hwmzizbf1a6855y6llg")))))) + (define-public rust-ntex-bytes-0.1 (package (name "rust-ntex-bytes") @@ -43503,6 +46683,57 @@ file formats.") ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-wasmparser" ,rust-wasmparser-0.57)))))) +(define-public rust-oboe-0.4 + (package + (name "rust-oboe") + (version "0.4.6") + (source (origin + (method url-fetch) + (uri (crate-uri "oboe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hd5626s8qkpgrl2alwz73i8rh1rzifbxj6pxz7zp82gicskrxi7")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #t ; requires Android libs + #:cargo-inputs `(("rust-jni" ,rust-jni-0.19) + ("rust-ndk" ,rust-ndk-0.6) + ("rust-ndk-context" ,rust-ndk-context-0.1) + ("rust-num-derive" ,rust-num-derive-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-oboe-sys" ,rust-oboe-sys-0.4)))) + (home-page "https://github.com/katyo/oboe-rs") + (synopsis + "Safe interface for oboe an android library for low latency audio IO") + (description + "Safe interface for oboe an android library for low latency audio IO.") + (license license:asl2.0))) + +(define-public rust-oboe-sys-0.4 + (package + (name "rust-oboe-sys") + (version "0.4.5") + (source (origin + (method url-fetch) + (uri (crate-uri "oboe-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gcl494yy880h2gfgsbdd32g2h0s1n94v58j5hil9mrf6yvsnw1k")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #t ; requires Android libs + #:cargo-inputs `(("rust-bindgen" ,rust-bindgen-0.59) + ("rust-cc" ,rust-cc-1) + ("rust-fetch-unroll" ,rust-fetch-unroll-0.3)))) + (home-page "https://github.com/katyo/oboe-rs") + (synopsis + "Unsafe bindings for oboe an android library for low latency audio IO") + (description + "Unsafe bindings for oboe an android library for low latency audio IO.") + (license license:asl2.0))) + (define-public rust-odds-0.3 (package (name "rust-odds") @@ -43561,6 +46792,32 @@ Things in odds may move to more appropriate crates if we find them.") ("rust-memchr" ,rust-memchr-2) ("rust-quickcheck" ,rust-quickcheck-0.4)))))) +(define-public rust-ogg-0.8 + (package + (name "rust-ogg") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (crate-uri "ogg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vjxmqcv9252aj8byy70iy2krqfjknfcxg11lcyikj11pzlb8lb9")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-byteorder" ,rust-byteorder-1) + ("rust-bytes" ,rust-bytes-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1)) + #:cargo-development-inputs + `(("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/RustAudio/ogg") + (synopsis "Ogg container decoder and encoder written in pure Rust") + (description "An Ogg decoder and encoder. Implements the xiph.org Ogg +spec in pure Rust.") + (license license:expat))) + (define-public rust-oid-registry-0.6 (package (name "rust-oid-registry") @@ -43681,7 +46938,7 @@ be assigned to at most once and provide direct access to the stored contents.") (license (list license:expat license:asl2.0)))) -(define-public rust-oorandom-11.1 +(define-public rust-oorandom-11 (package (name "rust-oorandom") (version "11.1.3") @@ -43782,20 +47039,21 @@ the system.") (define-public rust-opener-0.5 (package (name "rust-opener") - (version "0.5.0") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "opener" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf")))) + (base32 "01ghahdn64lw4whj0p70vmzivrdlmca2629gplalq99pirkiag19")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3)))) + (("rust-bstr" ,rust-bstr-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-version-sync" ,rust-version-sync-0.9)))) (home-page "https://github.com/Seeker14491/opener") (synopsis "Open a file or link using the system default program") (description "This crate provides the ability to open a file or link with @@ -43858,18 +47116,22 @@ crate.") (define-public rust-openssl-0.10 (package (name "rust-openssl") - (version "0.10.52") + (version "0.10.57") (source (origin (method url-fetch) (uri (crate-uri "openssl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mldyz9w6d5bf3004m7kyjry7944m0pkkifzbywgg06z0935gf01")))) + "0z0f8g84y0lvnbc60586ibjpf8r1q1dv672vfqan5d5bk7imxhms")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ((".*boringssl.*") "")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-2) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2) @@ -43968,22 +47230,29 @@ system for OpenSSL.") (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.87") + (version "0.9.93") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0znc0q7a2gi2pmkscv0d6wzpfd64mgmy3w4lmrvrv05jcj9ga5wf")) - (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) + (base32 "078vnn4s18kj8m5sd7b684frhjnxjcjc9z7s7h4871s7q2j5ckfv")) + (snippet + #~(begin + (use-modules (guix build utils)) + ;; Remove dependency on boringssl and vendor openssl source. + (substitute* "Cargo.toml.orig" + (("vendored = .*") "vendored = []\n") + ((".*bssl.*") "") + ((".*openssl-src.*") "")) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ;; Build dependencies: - ("rust-bindgen" ,rust-bindgen-0.64) + (("rust-bindgen" ,rust-bindgen-0.64) ("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-vcpkg" ,rust-vcpkg-0.2)))) (native-inputs @@ -44100,8 +47369,56 @@ system for OpenSSL.") (description "Extends `Option` with additional operations") (license license:mpl2.0))) +(define-public rust-option-operations-0.4 + (package + (name "rust-option-operations") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (crate-uri "option-operations" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18jhy5sc56gwdvqc3asr6az685zc9zkgv8p8n69s94bcj6bibc22")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-paste" ,rust-paste-1)))) + (home-page "https://github.com/fengalin/option-operations") + (synopsis "Improved arithmetic operations when dealing with Rust Options") + (description + "Traits and auto-implementations to improve arithmetic operations +usability when dealing with Rust Options.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-option-set-0.2 + (package + (name "rust-option-set") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "option-set" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i6s3bmnrw44nffqbbcaiq7fyhz7j881lcgspb57jxsi752m11k0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-heck" ,rust-heck-0.4) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9)))) + (home-page "https://github.com/H2CO3/option_set.git") + (synopsis "Bitflags on steroids") + (description "This package provides an extended version of rust bitflags.") + (license license:expat))) + (define-public rust-option-set-0.1 (package + (inherit rust-option-set-0.2) (name "rust-option-set") (version "0.1.4") (source (origin @@ -44110,7 +47427,6 @@ system for OpenSSL.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "16wsxh2qmjb2bf7mcq7dhlpzwkslzgjpg3nwzx97ia6gpnb2sfy8")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-heck" ,rust-heck-0.3) @@ -44119,11 +47435,7 @@ system for OpenSSL.") (("rust-bitflags" ,rust-bitflags-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8)))) - (home-page "https://github.com/H2CO3/option_set.git") - (synopsis "Bitflags on steroids") - (description "This package provides an extended version of rust bitflags.") - (license license:expat))) + ("rust-serde-yaml" ,rust-serde-yaml-0.8)))))) (define-public rust-orbclient-0.3 (package @@ -44424,6 +47736,9 @@ easy and usable crypto while trying to minimize the use of unsafe code.") (sha256 (base32 "04yjs1hf88jjm17g8a2lr7ibxyyg460rzbgcw9f1yzihq833y8zv")))) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (native-inputs (list)))) (define-public rust-os-pipe-0.8 @@ -44735,6 +48050,22 @@ owner with them. This can sometimes be useful because Rust borrowing rules normally prevent moving a type that has been borrowed from.") (license license:expat))) +(define-public rust-owning-ref-0.3 + (package + (inherit rust-owning-ref-0.4) + (name "rust-owning-ref") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "owning-ref" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dqgf5hwbmvkf2ffbik5xmhvaqvqi6iklhwk9x47n0wycd0lzy6d")))) + (arguments + (list #:cargo-inputs + `(("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))))) + (define-public rust-p256-0.13 (package (name "rust-p256") @@ -44811,7 +48142,7 @@ signing/verification, and general purpose curve arithmetic support.") (define-public rust-packed-simd-0.3 (package (name "rust-packed-simd") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) @@ -44820,7 +48151,7 @@ signing/verification, and general purpose curve arithmetic support.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17xih19yr6izg1d065d2ax29axs7bmywnxa3qps0l6d3bd4nbybc")) + "0bck71ngyhx9icy7q3xzgmjxkylysxm6hgif5rqp2xc71jphi7qz")) (modules '((guix build utils))) (snippet '(begin (substitute* "Cargo.toml" @@ -44828,11 +48159,12 @@ signing/verification, and general purpose curve arithmetic support.") (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments + ;; `#![feature]` may not be used on the stable release channel `(#:skip-build? #t #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-core-arch" ,rust-core-arch-0.1) - ("rust-libm" ,rust-libm-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) ("rust-sleef-sys" ,rust-sleef-sys-0.1)) #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) @@ -44946,22 +48278,22 @@ formatters with per-field documentation generated for each structure. "This package provides a library for padding strings at runtime.") (license license:expat))) -(define-public rust-page-size-0.4 +(define-public rust-page-size-0.6 (package (name "rust-page-size") - (version "0.4.2") + (version "0.6.0") (source (origin (method url-fetch) - (uri (crate-uri "page_size" version)) + (uri (crate-uri "page-size" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kgdv7f626jy4i2pq8czp4ppady4g4kqfa5ik4dah7mzzd4fbggf")))) + (base32 "1nj0rrwpvagagssljbm29ww1iyrrg15p1q4sk70r2cfi9qcv5m9h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-spin" ,rust-spin-0.5) + ("rust-spin" ,rust-spin-0.9) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Elzair/page_size_rs") (synopsis "Retrieve the memory page size") @@ -44970,6 +48302,24 @@ formatters with per-field documentation generated for each structure. memory page size.") (license (list license:expat license:asl2.0)))) +(define-public rust-page-size-0.4 + (package + (inherit rust-page-size-0.6) + (name "rust-page-size") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "page_size" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kgdv7f626jy4i2pq8czp4ppady4g4kqfa5ik4dah7mzzd4fbggf")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-spin" ,rust-spin-0.5) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-pager-0.16 (package (name "rust-pager") @@ -45393,17 +48743,37 @@ synchronization primitives.") ("rust-rand" ,rust-rand-0.4) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) +(define-public rust-parking-lot-0.4 + (package + (inherit rust-parking-lot-0.9) + (name "rust-parking-lot") + (version "0.4.8") + (source (origin + (method url-fetch) + (uri (crate-uri "parking-lot" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ph0kv3dfcxpjbi83wkzammqb7lm95j8in7w7hz17hgkjxdqz78l")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-parking-lot-core" ,rust-parking-lot-core-0.2) + ("rust-owning-ref" ,rust-owning-ref-0.3)) + #:cargo-development-inputs + `(("rust-rand" ,rust-rand-0.3)))))) + (define-public rust-parking-lot-core-0.9 (package (name "rust-parking-lot-core") - (version "0.9.7") + (version "0.9.8") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08cm5gg3a4jmr683x9dgih8vj66yn772kjvc8y1m0flyz6wwnsch")))) + "0ixlak319bpzldq20yvyfqk0y1vi736zxbw101jvzjp7by30rw4k")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -45411,10 +48781,10 @@ synchronization primitives.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) ("rust-petgraph" ,rust-petgraph-0.6) - ("rust-redox-syscall" ,rust-redox-syscall-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.3) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-windows-sys" ,rust-windows-sys-0.45)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom @@ -45567,6 +48937,28 @@ synchronization primitives.") ("rust-winapi" ,rust-winapi-0.3) ("rust-rustc-version" ,rust-rustc-version-0.2)))))) +(define-public rust-parking-lot-core-0.2 + (package + (inherit rust-parking-lot-core-0.6) + (name "rust-parking-lot-core") + (version "0.2.14") + (source (origin + (method url-fetch) + (uri (crate-uri "parking-lot-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yip8m6npxb87ilnn0q774psp1zd0vgv66fcjkkvr9rlyz6aicad")))) + (arguments + (list #:cargo-inputs + `(("rust-backtrace" ,rust-backtrace-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-petgraph" ,rust-petgraph-0.4) + ("rust-rand" ,rust-rand-0.4) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-thread-id" ,rust-thread-id-3) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-parquet-5 (package (name "rust-parquet") @@ -45911,19 +49303,41 @@ Format (MCF).") ("rust-rand-core" ,rust-rand-core-0.6) ("rust-subtle" ,rust-subtle-2)))))) +(define-public rust-password-hash-0.2 + (package + (inherit rust-password-hash-0.5) + (name "rust-password-hash") + (version "0.2.3") + (source (origin + (method url-fetch) + (uri (crate-uri "password-hash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rr4kd52ld978a2xhcvlc54p1d92yhxl9kvbajba7ia6rs5b5q3p")))) + (arguments + (list #:cargo-inputs `(("rust-base64ct" ,rust-base64ct-1) + ("rust-subtle" ,rust-subtle-2) + ("rust-rand-core" ,rust-rand-core-0.6)))))) + (define-public rust-paste-1 (package (name "rust-paste") - (version "1.0.4") + (version "1.0.14") (source (origin (method url-fetch) (uri (crate-uri "paste" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hfikh0bds8hqn371l2wf039mp6b5wrmwrwg96jcs6lkjm6mrmn5")))) + (base32 "0k7d54zz8zrz0623l3xhvws61z5q2wd3hkwim6gylk8212placfy")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:tests? #f ; Can't compile rust-paste-test-suite + #:cargo-development-inputs + (("rust-paste-test-suite" ,rust-paste-test-suite-0.0.0) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/paste") (synopsis "Macros for all your token pasting needs") (description @@ -45978,6 +49392,24 @@ Format (MCF).") "Implementation detail of the paste crate.") (license (list license:asl2.0 license:expat)))) +(define-public rust-paste-test-suite-0.0.0 + (package + (name "rust-paste-test-suite") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "paste-test-suite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mllghv41sz978ymxym8nm6yh1qljshsbjk6iaycbk6zlw7gqagh")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) ; Not meant to be used individually. + (home-page "https://github.com/dtolnay/paste") + (synopsis "Test suite of the paste crate") + (description "Test suite of the paste crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-path-abs-0.5 (package (name "rust-path-abs") @@ -46191,6 +49623,34 @@ in pure Rust.") ("rust-sha2" ,rust-sha2-0.9) ("rust-streebog" ,rust-streebog-0.9)))))) +(define-public rust-pbkdf2-0.8 + (package + (inherit rust-pbkdf2-0.10) + (name "rust-pbkdf2") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (crate-uri "pbkdf2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ykgicvyjm41701mzqhrfmiz5sm5y0zwfg6csaapaqaf49a54pyr")))) + (arguments + (list #:cargo-inputs + `(("rust-crypto-mac" ,rust-crypto-mac-0.11) + ("rust-base64ct" ,rust-base64ct-1) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-password-hash" ,rust-password-hash-0.2) + ("rust-rayon" ,rust-rayon-1) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-sha2" ,rust-sha2-0.9)) + #:cargo-development-inputs + `(("rust-hex-literal" ,rust-hex-literal-0.3) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-sha2" ,rust-sha2-0.9)))))) + (define-public rust-pbkdf2-0.6 (package (inherit rust-pbkdf2-0.10) @@ -46255,11 +49715,12 @@ in pure Rust.") (origin (method url-fetch) (uri (crate-uri "pcap-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18w9c8i5zjnazay86219w4789482ya617z35cw433h12wbgjaiqi")))) + (base32 "18w9c8i5zjnazay86219w4789482ya617z35cw433h12wbgjaiqi")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "Lib"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -47755,28 +51216,30 @@ crate.") (define-public rust-pin-project-lite-0.2 (package (name "rust-pin-project-lite") - (version "0.2.9") + (version "0.2.13") (source (origin (method url-fetch) (uri (crate-uri "pin-project-lite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05n1z851l356hpgqadw4ar64mjanaxq1qlwqsf2k05ziq8xax9z0")) + (base32 "0n0bwr5qxlf0mhn2xkl36sy55118s9qmvx2yl5f3ixkb007lbywa")) (modules '((guix build utils))) (snippet - '(substitute* "Cargo.toml" - (("\\[dev-dependencies.rustversion\\]" m) - (string-append " -[dev-dependencies.macrotest] -version = \"1\" -" m)))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs (("rust-macrotest" ,rust-macrotest-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-toml" ,rust-toml-0.5) ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/taiki-e/pin-project-lite") (synopsis "Lightweight version of pin-project") @@ -48082,7 +51545,7 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") - (version "0.3.26") + (version "0.3.27") (source (origin (method url-fetch) @@ -48090,20 +51553,19 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q2i61dhqvawc51zfzl3jich57w0cjgfa894hn6ings7ffgsbjba")))) + "0r39ryh1magcq4cz5g9x88jllsnxnhcqr753islvyk4jp9h2h1r6")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'hardcode-pkg-config-loation + (add-after 'unpack 'hardcode-pkg-config-location (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/lib.rs" (("\"pkg-config\"") (string-append "\"" (assoc-ref inputs "pkg-config") - "/bin/pkg-config\""))) - #t))))) + "/bin/pkg-config\"")))))))) (native-inputs (list pkg-config)) (home-page "https://github.com/rust-lang/pkg-config-rs") @@ -48589,7 +52051,11 @@ library.") (uri (crate-uri "poly1305" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pkf4jlriskq9rvz8y5fjj9dw42q6yg5djijlin4n6p1dd3yp2h4")))) + (base32 "1pkf4jlriskq9rvz8y5fjj9dw42q6yg5djijlin4n6p1dd3yp2h4")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("version = \">=1, <1\\.4\"") "version = \"^1\"")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -48729,6 +52195,53 @@ overloading without macros in Rust.") 128-bit atomics, atomic float, etc.") (license (list license:asl2.0 license:expat)))) +(define-public rust-portaudio-rs-0.3 + (package + (name "rust-portaudio-rs") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (crate-uri "portaudio-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qnmc7amk0fzbcs985ixv0k4955f0fmpkhrl9ps9pk3cz7pvbdnd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-portaudio-sys" ,rust-portaudio-sys-0.1)))) + (native-inputs (list pkg-config)) + (inputs (list portaudio alsa-lib)) + (home-page "https://github.com/RustAudio/rust-portaudio") + (synopsis "Rust bindings for PortAudio a cross-platfomr audio library") + (description "Rusting bindings for PortAudio an open source, cross-platform +audio I/O library.") + (license license:expat))) + +(define-public rust-portaudio-sys-0.1 + (package + (name "rust-portaudio-sys") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (crate-uri "portaudio-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xdpywirpr1kqkbak7hnny62gmsc93qgc3ij3j2zskrvjpxa952i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list portaudio alsa-lib)) + (home-page "https://github.com/RustAudio/rust-portaudio") + (synopsis "Bindings for PortAudio a cross-platform audio library") + (description "Bindings for PortAudio an open source, cross-platform audio +I/O library.") + (license license:expat))) + (define-public rust-postgres-0.19 (package (name "rust-postgres") @@ -48921,29 +52434,30 @@ libpq.") dependency to expose a precomputed hash.") (license license:expat))) -(define-public rust-predicates-2 +(define-public rust-predicates-3 (package (name "rust-predicates") - (version "2.1.0") + (version "3.0.4") (source (origin (method url-fetch) (uri (crate-uri "predicates" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05d749i3z8cbsr0899fzr2ksn8drbci4harcq82vjsj5krlagrcm")))) + (base32 "182q0wiabllvbg0nzfkf8a6qkbk0ckrkmfbk7k5ijgrfbibjiz3d")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=path::fc::PredicateFileContentExt::from_file_path") #:cargo-inputs - (("rust-concolor-control" ,rust-concolor-control-0.0.7) + (("rust-anstyle" ,rust-anstyle-1) ("rust-difflib" ,rust-difflib-0.4) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-itertools" ,rust-itertools-0.10) + ("rust-itertools" ,rust-itertools-0.11) ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) ("rust-predicates-core" ,rust-predicates-core-1) - ("rust-regex" ,rust-regex-1) - ("rust-yansi" ,rust-yansi-0.5)) + ("rust-regex" ,rust-regex-1)) #:cargo-development-inputs (("rust-predicates-tree" ,rust-predicates-tree-1)))) (home-page "https://github.com/assert-rs/predicates-rs") @@ -48953,6 +52467,34 @@ dependency to expose a precomputed hash.") functions.") (license (list license:expat license:asl2.0)))) +(define-public rust-predicates-2 + (package + (inherit rust-predicates-3) + (name "rust-predicates") + (version "2.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "predicates" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pdd8zgw8351bvk882zadyqghnxzkjlf946vkdb1hgkzqdihl8sr")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=path::fc::PredicateFileContentExt::from_file_path") + #:cargo-inputs + (("rust-concolor" ,rust-concolor-0.0.11) + ("rust-difflib" ,rust-difflib-0.4) + ("rust-float-cmp" ,rust-float-cmp-0.9) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-regex" ,rust-regex-1) + ("rust-yansi" ,rust-yansi-0.5)) + #:cargo-development-inputs + (("rust-predicates-tree" ,rust-predicates-tree-1)))))) + (define-public rust-predicates-1 (package (inherit rust-predicates-2) @@ -49002,16 +52544,14 @@ functions.") (define-public rust-predicates-core-1 (package (name "rust-predicates-core") - (version "1.0.0") + (version "1.0.6") (source (origin (method url-fetch) (uri (crate-uri "predicates-core" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0y3ingf2i4xx7r61f1a8wizs57j8hh32hylyjbw9ymcj7qx5q1q6")))) + (base32 "0x7ij95n63mhgkyrb7hly5ngm41mwfsassfvnjz7lbk10wk0755p")))) (build-system cargo-build-system) (home-page "https://github.com/assert-rs/predicates-rs/tree/master/predicates-core") @@ -49038,21 +52578,21 @@ functions.") (define-public rust-predicates-tree-1 (package (name "rust-predicates-tree") - (version "1.0.0") + (version "1.0.9") (source (origin (method url-fetch) (uri (crate-uri "predicates-tree" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "090148qjilm2c722l873z7g31fhzj5j4qhd2xiv8mcqkj22w8qwf")))) + (base32 "1kyfq3r0s2vg94a9r59n7ar5gv66zvpa0s1fd6mm4l4czcas72rn")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-predicates-core" ,rust-predicates-core-1) - ("rust-treeline" ,rust-treeline-0.1)))) + ("rust-termtree" ,rust-termtree-0.4)) + #:cargo-development-inputs + (("rust-predicates" ,rust-predicates-3)))) (home-page "https://github.com/assert-rs/predicates-rs/tree/master/predicates-tree") (synopsis @@ -49291,6 +52831,25 @@ replacements, adding colorful diffs.") "This package provides a minimal `syn` syntax tree pretty-printer.") (license (list license:expat license:asl2.0)))) +(define-public rust-pretty-hex-0.3 + (package + (name "rust-pretty-hex") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pretty-hex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mf8xvlfri4impj2paj4azx7hxh7l0i38cjyib1hiikwvlqhiyn6")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-development-inputs `(("rust-heapless" ,rust-heapless-0.5)))) + (home-page "https://github.com/wolandr/pretty-hex") + (synopsis "Prettified output of hexadecimal byte slices") + (description "Pretty hex dump of byte slices in the common style.") + (license license:expat))) + (define-public rust-prettytable-rs-0.8 (package (name "rust-prettytable-rs") @@ -49403,6 +52962,34 @@ losslessly as possible.") #:cargo-development-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-2)))))) +(define-public rust-priority-queue-1 + (package + (name "rust-priority-queue") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (crate-uri "priority-queue" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1id9vzrypiilraw4wd5lh577prkjgyhd5vv77rdcgb7kkbcq4l41")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs + `(("rust-indexmap" ,rust-indexmap-1) + ("rust-serde" ,rust-serde-1) + ("rust-autocfg" ,rust-autocfg-1)) + #:cargo-development-inputs + `(("rust-hashbrown" ,rust-hashbrown-0.9) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-uuid" ,rust-uuid-0.8)))) + (home-page "https://github.com/garro95/priority-queue") + (synopsis "Efficient priority queue implemented as a heap") + (description "An efficient priority queue with a function to change the +priority of an object.") + (license license:expat))) + (define-public rust-proc-macro-crate-1 (package (name "rust-proc-macro-crate") @@ -49604,7 +53191,7 @@ in your code.") (define-public rust-proc-macro2-1 (package (name "rust-proc-macro2") - (version "1.0.64") + (version "1.0.67") (source (origin (method url-fetch) @@ -49612,7 +53199,7 @@ in your code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nm7qw54jn9n0g1ygkw4f63vj90m241yih6ph3g6zx7irdi3p03q")))) + "0a0k7adv0yswsgzsqkd7r6ng8rpcdyqrhra5v5ii531y3agkshrx")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--lib") @@ -49646,10 +53233,9 @@ in terms of the upstream unstable API.") (arguments `(#:cargo-test-flags '("--lib") #:cargo-inputs - (("rust-unicode-ident" ,rust-unicode-ident-1)) + (("rust-unicode-xid" ,rust-unicode-xid-0.2)) #:cargo-development-inputs - (("rust-quote" ,rust-quote-1.0.10) - ("rust-rustversion" ,rust-rustversion-1)))))) + (("rust-quote" ,rust-quote-1)))))) (define-public rust-proc-macro2-0.4 (package @@ -49815,27 +53401,26 @@ property-based testing and fuzzing.") (define-public rust-proptest-1 (package (name "rust-proptest") - (version "1.1.0") + (version "1.3.1") (source (origin (method url-fetch) (uri (crate-uri "proptest" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0w5s3wwchd3i6m15lsbsk3r3y25d1gwn13m6a185ks8w06cbiw99")))) + (base32 "03n213yppl8lpw94cms2bb6rns3ahg78n6az9yvppc3wqz43l03w")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-byteorder" ,rust-byteorder-1) + ("rust-bit-vec" ,rust-bit-vec-0.6) + ("rust-bitflags" ,rust-bitflags-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-quick-error" ,rust-quick-error-2) ("rust-rand" ,rust-rand-0.8) ("rust-rand-chacha" ,rust-rand-chacha-0.3) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) - ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-regex-syntax" ,rust-regex-syntax-0.7) ("rust-rusty-fork" ,rust-rusty-fork-0.3) ("rust-tempfile" ,rust-tempfile-3) ("rust-unarray" ,rust-unarray-0.1) @@ -50041,19 +53626,19 @@ language.") (define-public rust-protobuf-2 (package (name "rust-protobuf") - (version "2.14.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (crate-uri "protobuf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "11bl8hf522s9mbkckivnn9n8s3ss4g41w6jmfdsswmr5adqd71lf")))) + "154dfzjvxlpx37ha3cmp7fkhcsnyzbnfv7aisvz34x23k2gdjv8h")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; missing files in the release tarball. #:cargo-inputs - (("rust-bytes" ,rust-bytes-0.5) + (("rust-bytes" ,rust-bytes-1) ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/stepancheg/rust-protobuf/") @@ -50067,14 +53652,14 @@ language.") (define-public rust-protobuf-codegen-2 (package (name "rust-protobuf-codegen") - (version "2.14.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (crate-uri "protobuf-codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "031bx325lsgcx7wc76vc2cqph6q0b34jgc8nz0g2rkwcfnx3n4fy")))) + "1mhpl2cs1d2sqddf097ala180il61g9axpqnzky5bxswnypn0d03")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-protobuf" ,rust-protobuf-2)))) @@ -50091,17 +53676,18 @@ library to invoke programmatically (e.g. from @code{build.rs}) and (define-public rust-protobuf-codegen-pure-2 (package (name "rust-protobuf-codegen-pure") - (version "2.14.0") + (version "2.28.0") (source (origin (method url-fetch) (uri (crate-uri "protobuf-codegen-pure" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0h34gfqlb7bqmgqv1mfgy5wk35z5r2h5ki3p3pdcmw1vqzmly6id")))) + "0rfqvpbbqh4pa406nda54jdl0sgagdgp274mmbpd7g4lzjcr78lm")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f + #:cargo-inputs (("rust-protobuf" ,rust-protobuf-2) ("rust-protobuf-codegen" ,rust-protobuf-codegen-2)))) (home-page "https://github.com/stepancheg/rust-protobuf/") @@ -50555,14 +54141,14 @@ they were parsed from") (define-public rust-pyo3-build-config-0.19 (package (name "rust-pyo3-build-config") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-build-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c4n6dvv79p5mb558nz1cb0ifgxbhw9gjs0j1ff0l61w1d7v4kam")))) + "19bb7aqyvr4kmh8b2lnrmcv9251j8yxw7l7xyr77m3s3pk876v07")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -50639,14 +54225,14 @@ ecosystem.") (define-public rust-pyo3-ffi-0.19 (package (name "rust-pyo3-ffi") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-ffi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "193hg837vk0c9b4fxxx4bp2vjm4n4m0sx59ivba0lq78b63xwblj")))) + "1nc4696k03ydyiy1f69l3ywknavjzxzag2mscrh2bgkywx1fwg75")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -50724,14 +54310,14 @@ extension to python.") (define-public rust-pyo3-macros-backend-0.19 (package (name "rust-pyo3-macros-backend") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12zs1vx0h4hainb0lpnw8knd9i9l0g2rdzdnrmb1bnv0n75qrdz0")))) + "0dlm4pg29hjmlqx15gcy9cmnabvc8ycy60hcvjg8hm62flhw2zcl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -50805,14 +54391,14 @@ extension to python.") (define-public rust-pyo3-macros-0.19 (package (name "rust-pyo3-macros") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "18n57jpi3292jhzmg5bjr1343zl93gmvxz21m1j5jdfxl73awp4a")))) + "1lggr5pnpmdj0cznlhw7ykm1qka3wlymwzfxqql6a4vyb6clrsyz")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -50905,14 +54491,14 @@ extension to python.") (define-public rust-pyo3-0.19 (package (name "rust-pyo3") - (version "0.19.1") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nca4p22jxwcg5dvg907j9m9618bvi8lmb20vvy4nsrhbzh8mf7z")))) + "0f1aqx947mzsrk05zdm9w2702lj5k9s97y9w9lxwkp2avk7sd0g6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -50920,8 +54506,8 @@ extension to python.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-eyre" ,rust-eyre-0.6) - ("rust-hashbrown" ,rust-hashbrown-0.12) - ("rust-indexmap" ,rust-indexmap-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) ("rust-indoc" ,rust-indoc-1) ("rust-inventory" ,rust-inventory-0.3) ("rust-libc" ,rust-libc-0.2) @@ -50938,7 +54524,6 @@ extension to python.") #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) ("rust-chrono" ,rust-chrono-0.4) - ("rust-criterion" ,rust-criterion-0.3) ("rust-proptest" ,rust-proptest-0.10) ("rust-rayon" ,rust-rayon-1) ("rust-rust-decimal" ,rust-rust-decimal-1) @@ -51313,8 +54898,44 @@ to write.") (base32 "1q6za3v78hsspisc197bg3g7rpc989qycy8ypr8ap8igv10ikl51")))))) +(define-public rust-quick-xml-0.28 + (package + (name "rust-quick-xml") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "quick-xml" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lfr3512x0s0i9kbyglyzn0rq0i1bvd2mqqfi8gs685808rfgr8c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-memchr" ,rust-memchr-2) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde-value" ,rust-serde-value-0.7) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4)))) + (home-page "https://github.com/tafia/quick-xml") + (synopsis "High performance xml reader and writer") + (description + "This package provides a high performance XML reader and writer.") + (license license:expat))) + (define-public rust-quick-xml-0.27 (package + (inherit rust-quick-xml-0.28) (name "rust-quick-xml") (version "0.27.1") (source (origin @@ -51324,7 +54945,6 @@ to write.") (sha256 (base32 "0hacs71afvppq6d7x6b8d4liv0rcqhsf9mrcyrb8lxnxazq57h7z")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) @@ -51339,12 +54959,7 @@ to write.") ("rust-serde" ,rust-serde-1) ("rust-serde-value" ,rust-serde-value-0.7) ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-test" ,rust-tokio-test-0.4)))) - (home-page "https://github.com/tafia/quick-xml") - (synopsis "High performance xml reader and writer") - (description - "This package provides a high performance XML reader and writer.") - (license license:expat))) + ("rust-tokio-test" ,rust-tokio-test-0.4)))))) (define-public rust-quick-xml-0.22 (package @@ -51760,6 +55375,7 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions ("rust-tracing-futures" ,rust-tracing-futures-0.2) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-url" ,rust-url-2)))) + (native-inputs (list perl)) (home-page "https://github.com/quinn-rs/quinn") (synopsis "Versatile QUIC transport protocol implementation") (description "Versatile QUIC transport protocol implementation") @@ -51797,6 +55413,8 @@ and Petrick's method, an algorithm to automatically minimize boolean expressions ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rcgen" ,rust-rcgen-0.8) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (native-inputs + (list perl)) (home-page "https://github.com/quinn-rs/quinn") (synopsis "State machine for the QUIC transport protocol") (description "State machine for the QUIC transport protocol") @@ -51831,14 +55449,14 @@ transport protocol in Rust.") (define-public rust-quote-1 (package (name "rust-quote") - (version "1.0.29") + (version "1.0.33") (source (origin (method url-fetch) (uri (crate-uri "quote" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "019ij5fwp56ydww6zr46dhmzsf078qkdq9vz6mw1cri7mgl1ac2p")))) + "1biw54hbbr12wdwjac55z1m2x2rylciw83qnjn564a3096jgqrsj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -53101,22 +56719,21 @@ accessors.") (define-public rust-rayon-1 (package (name "rust-rayon") - (version "1.6.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (crate-uri "rayon" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dsr0yyfgdsg8ggh37kq678mfa5j3js6p16ksb7knazhml9s5cvd")))) + (base32 "1cfdnvchf7j4cpha5jkcrrsr61li9i9lp5ak7xdq6d3pvc1xn9ww")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1) ("rust-rayon-core" ,rust-rayon-core-1)) #:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-rand" ,rust-rand-0.8) + (("rust-rand" ,rust-rand-0.8) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)))) (home-page "https://github.com/rayon-rs/rayon") (synopsis "Simple work-stealing parallelism for Rust") @@ -53176,24 +56793,20 @@ Rust.") (define-public rust-rayon-core-1 (package (name "rust-rayon-core") - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (crate-uri "rayon-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lvavqk42lmll47q008j8y6nw54f3sfvcjlbaa26iaq0bnpi1i6a")))) + (base32 "1vaq0q71yfvcwlmia0iqf6ixj2fibjcf2xjy92n1m1izv1mgpqsw")))) (build-system cargo-build-system) (arguments - ;; One of the tests attempts to overflow the stack, but the compiler has - ;; since gotten smarter and the test became defective. - `(#:tests? #f + `(#:tests? #f ; `Sender<usize>` cannot be shared between threads safely #:cargo-inputs - (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) - ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-num-cpus" ,rust-num-cpus-1)) + (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.8) @@ -53279,8 +56892,27 @@ Rust.") ("rust-webpki" ,rust-webpki-0.22) ("rust-x509-parser" ,rust-x509-parser-0.12)))))) +(define-public rust-rctree-0.5 + (package + (name "rust-rctree") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rctree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kvzahkwriawhjjb08ai7rfi77px7rpx5h83hjcx6dccyxzf4hiv")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/rctree") + (synopsis "DOM-like tree implemented using reference counting") + (description "This package provides a @code{DOM-like} tree implemented using +reference counting.") + (license license:expat))) + (define-public rust-rctree-0.4 (package + (inherit rust-rctree-0.5) (name "rust-rctree") (version "0.4.0") (source @@ -53290,13 +56922,7 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s92472lniqn2c0b5ln8ssl014x0raiyzkk0hagrvsd6far2iq4s")))) - (build-system cargo-build-system) - (home-page "https://github.com/RazrFalcon/rctree") - (synopsis "DOM-like tree implemented using reference counting") - (description "This package provides a @code{DOM-like} tree implemented using -reference counting.") - (license license:expat))) + "1s92472lniqn2c0b5ln8ssl014x0raiyzkk0hagrvsd6far2iq4s")))))) (define-public rust-rdrand-0.4 (package @@ -53602,7 +57228,12 @@ initial value.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck")))))) + "0av43xxjlinfqklb67rpj217cmaxfjsf8151gs0hbs4hnr5664ck")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-ref-cast-test-suite-0.0.0 (package @@ -54075,6 +57706,55 @@ crate unless you're working on a regex implementation.") Rust.") (license license:expat))) +(define-public rust-rental-0.5 + (package + (name "rust-rental") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (crate-uri "rental" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bhzz2pfbg0yaw8p1l31bggq4jn077wslf6ifhj22vf3r8mgx2fc")))) + (build-system cargo-build-system) + (arguments + (list #:tests? #f ; cannot move out of `foo` because it is borrowed + #:cargo-inputs + `(("rust-rental-impl" ,rust-rental-impl-0.5) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) + (home-page "https://github.com/jpernst/rental") + (synopsis "Macro to generate safe self-referential structs") + (description + "A macro to generate safe self-referential structs, plus +premade types for common use-cases. This crate is frozen and should be +avoided if possible.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-rental-impl-0.5 + (package + (name "rust-rental-impl") + (version "0.5.5") + (source (origin + (method url-fetch) + (uri (crate-uri "rental-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pj0qgmvwwsfwyjqyjxzikkwbwc3vj7hm3hdykr47dy5inbnhpj7")))) + (build-system cargo-build-system) + (arguments + (list #:skip-build? #f + #:cargo-inputs + `(("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/jpernst/rental") + (synopsis "Implementation details of the rust-rental crate") + (description "Implementation details for the rust-rental crate. +Should not be used directly.") + (license (list license:expat license:asl2.0)))) + (define-public rust-reopen-0.3 (package (name "rust-reopen") @@ -54099,6 +57779,57 @@ Rust.") (description "File reopening utility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-repr-offset-0.2 + (package + (name "rust-repr-offset") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "repr-offset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1skj3cy77j7vwslnjjzgladq61z6jjvwlw89kp0zz7fjbdsp047v")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-repr-offset-derive" ,rust-repr-offset-derive-0.2) + ("rust-tstr" ,rust-tstr-0.2)) + #:cargo-development-inputs + (("rust-repr-offset-derive" ,rust-repr-offset-derive-0.2)))) + (home-page "https://github.com/rodrimati1992/repr_offset_crates/") + (synopsis "Offsets of fields for types with a stable layout") + (description "Offsets of fields for types with a stable layout.") + (license license:zlib))) + +(define-public rust-repr-offset-derive-0.2 + (package + (name "rust-repr-offset-derive") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "repr-offset-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rwkbf12vmgi5v1llmgiirn0yaaiyw821rd7fc9fhpbkdxz95yh9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests must be run with the "testing" feature + #:cargo-inputs + (("rust-as-derive-utils" ,rust-as-derive-utils-0.8) + ("rust-core-extensions" ,rust-core-extensions-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/repr_offset_crates/") + (synopsis + "For deriving the offsets of fields for types with a stable layout") + (description + "For deriving the offsets of fields for types with a stable layout.") + (license license:zlib))) + (define-public rust-reqwest-0.11 (package (name "rust-reqwest") @@ -54323,15 +58054,14 @@ Rust.") (define-public rust-retain-mut-0.1 (package (name "rust-retain-mut") - (version "0.1.1") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "retain_mut" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0cgmm1q7sr31r9wk7syh53ipgqpl37jzsvahdhmwrsi6mmcdc1g0")))) + (base32 "1c0jfxzba0mcw8q4z7dnc4ypwzxgqkdggngb55hazvwvg3az32a3")))) (build-system cargo-build-system) (home-page "https://github.com/upsuper/retain_mut") (synopsis "Mutable borrow for the retain predicate") @@ -54480,7 +58210,8 @@ Digital Signature Algorithm} (ECDSA).") (lambda _ (format #t ""))))))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix build + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-spin" ,rust-spin-0.5) @@ -54525,7 +58256,8 @@ Digital Signature Algorithm} (ECDSA).") (lambda _ (format #t ""))))))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix build + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-untrusted" ,rust-untrusted-0.6) @@ -54540,6 +58272,28 @@ Digital Signature Algorithm} (ECDSA).") (lambda _ (invoke "python" "make_curve25519_tables.py"))))))))))) +(define-public rust-ringbuf-0.2 + (package + (name "rust-ringbuf") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri (crate-uri "ringbuf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wxd2sb5b0kjwc5mcv8qrmzl0spfs0agznrxain3xhrr769g6q3c")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-cache-padded" ,rust-cache-padded-1)))) + (home-page "https://github.com/agerasev/ringbuf") + (synopsis + "Lock-free SPSC FIFO ring buffer with direct access to inner data") + (description + "Lock-free @acronym{SPSC, Single Producer Single Consumer} @acronym{FIFO, +First In First Out} ring buffer with direct access to inner data.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ripemd-0.1 (package (name "rust-ripemd") @@ -54573,7 +58327,10 @@ Digital Signature Algorithm} (ECDSA).") (uri (crate-uri "riscv" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fla10m2qkcf7zqw91rrribpdaavkv6qbbzjz9q2n09igbfwq1v9")))) + (base32 "1fla10m2qkcf7zqw91rrribpdaavkv6qbbzjz9q2n09igbfwq1v9")) + (snippet + #~(begin (use-modules (guix build utils)) + (delete-file-recursively "bin"))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -54661,20 +58418,22 @@ decoding, and compression.") (define-public rust-rmp-0.8 (package (name "rust-rmp") - (version "0.8.9") + (version "0.8.12") (source (origin (method url-fetch) (uri (crate-uri "rmp" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kqqq0m4bg1p1rsahbxqlhi0cb65qbxx595sqwdfxwacy5nv840g")))) + (base32 "083bbqw8ibqp63v6scmaxmy5x8yznj4j0i2n6jjivv9qrjk6163z")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) - ("rust-num-traits" ,rust-num-traits-0.2)))) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-paste" ,rust-paste-1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-1)))) (home-page "https://github.com/3Hren/msgpack-rust") (synopsis "Pure Rust MessagePack serialization implementation") (description @@ -54684,29 +58443,51 @@ writers and readers for primitive values with direct mapping between binary MessagePack format.") (license license:expat))) -(define-public rust-rmp-serde-0.15 +(define-public rust-rmp-serde-1 (package (name "rust-rmp-serde") - (version "0.15.5") + (version "1.1.2") (source (origin (method url-fetch) (uri (crate-uri "rmp-serde" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "178f4qlicldm9iy74q4wdqldk5i11p1ad30wzs9avx04mpwwygkj")))) + (base32 "12i5aglyni58hlq19pi58z1z6a1hv6l04p9y8ms8l3cqx9gaizmz")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; use of undeclared crate or module `rmpv` #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) ("rust-rmp" ,rust-rmp-0.8) - ("rust-serde" ,rust-serde-1)))) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/3Hren/msgpack-rust") (synopsis "Serde bindings for RMP") (description "This crate provides Serde bindings for RMP.") (license license:expat))) +(define-public rust-rmp-serde-0.15 + (package + (inherit rust-rmp-serde-1) + (name "rust-rmp-serde") + (version "0.15.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "rmp-serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "178f4qlicldm9iy74q4wdqldk5i11p1ad30wzs9avx04mpwwygkj")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-rmp" ,rust-rmp-0.8) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-rmp-serde-0.13 (package (name "rust-rmp-serde") @@ -54907,8 +58688,38 @@ responses, and headers for the Rocket web framework.") network services using futures.") (license license:expat))) +(define-public rust-ron-0.8 + (package + (name "rust-ron") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ron" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "154w53s895yxdfg7rn87c6f6x4yncc535x1x31zpcj7p0pzpw7xr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs + (("rust-option-set" ,rust-option-set-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/ron-rs/ron") + (synopsis "Rusty Object Notation") + (description "This package provides Rusty Object Notation (RON).") + (license (list license:expat license:asl2.0)))) + (define-public rust-ron-0.7 (package + (inherit rust-ron-0.8) (name "rust-ron") (version "0.7.1") (source (origin @@ -54917,7 +58728,6 @@ network services using futures.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "06iz51r6pyi197jjpfddq8h8884y85myaswfan07cnqylqwkj1w8")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Cannot find bitflags_serial. #:cargo-inputs @@ -54928,11 +58738,7 @@ network services using futures.") #:cargo-development-inputs (("rust-option-set" ,rust-option-set-0.1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/ron-rs/ron") - (synopsis "Rusty Object Notation") - (description "This package provides Rusty Object Notation (RON).") - (license (list license:expat license:asl2.0)))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-ron-0.6 (package @@ -56732,17 +60538,22 @@ rustc compiler.") (define-public rust-rustfix-0.6 (package (name "rust-rustfix") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "rustfix" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg")))) + (base32 "10b4qlvfwljp7yss8afj0lnn8vqj78n93n9vfmkq9616kqyqblpc")))) (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency chain here + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/rust-lang/rustfix") (synopsis "Automatically apply the suggestions made by rustc") (description "Automatically apply the suggestions made by rustc.") @@ -56797,8 +60608,67 @@ rustc compiler.") `(("rust-failure" ,rust-failure-0.1) ,@(alist-delete "rust-anyhow" cargo-inputs))))))) +(define-public rust-rustix-0.38 + (package + (name "rust-rustix") + (version "0.38.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cg5jsfx8lf5npjf2v5ac8fca5443hq8iqqlg2gg1yc8pl6dmyfj")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file (find-files "." "\\.a$")) + (delete-file "Cargo.toml") + (substitute* "Cargo.toml.orig" + ;; Depend unconditionally on the cc crate + (("(cc = .*), optional = true.*" _ cc) + (string-append cc " }\n")) + ;; Disable using the linux_raw backend + (("not\\(rustic_use_libc\\)") "miri")) + (substitute* "build.rs" + ;; Always use the 'feature = "cc"' path + (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"") + (("#\\[cfg\\(feature = \"cc\"\\)\\]" all) + (string-append "//" all))) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-errno" ,rust-errno-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-errno" ,rust-errno-0.3) + ("rust-flate2" ,rust-flate2-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.9) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/bytecodealliance/rustix") + (synopsis "Safe Rust bindings to POSIX syscalls") + (description + "This package provides safe Rust bindings to POSIX syscalls.") + ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. + (license (list license:asl2.0 license:expat)))) + (define-public rust-rustix-0.37 (package + (inherit rust-rustix-0.38) (name "rust-rustix") (version "0.37.19") (source (origin @@ -56807,8 +60677,24 @@ rustc compiler.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c")))) - (build-system cargo-build-system) + "0gb12rp992bh2h5msqcbpdsx6h1gslsb0zpp5hdnyxj2hnfp5y5c")) + (snippet + #~(begin + (use-modules (guix build utils)) + (for-each delete-file (find-files "." "\\.a$")) + (delete-file "Cargo.toml") + (substitute* "Cargo.toml.orig" + ;; Depend unconditionally on the cc crate + (("(cc = .*), optional = true.*" _ cc) + (string-append cc " }\n")) + ;; Disable using the linux_raw backend + (("not\\(rustic_use_libc\\)") "miri")) + (substitute* "build.rs" + ;; Always use the 'feature = "cc"' path + (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"") + (("#\\[cfg\\(feature = \"cc\"\\)\\]" all) + (string-append "//" all))) + (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -56832,13 +60718,7 @@ rustc compiler.") ("rust-libc" ,rust-libc-0.2) ("rust-memoffset" ,rust-memoffset-0.8) ("rust-serial-test" ,rust-serial-test-0.6) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/bytecodealliance/rustix") - (synopsis "Safe Rust bindings to POSIX syscalls") - (description - "This package provides safe Rust bindings to POSIX syscalls.") - ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat. - (license (list license:asl2.0 license:expat)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-rustix-0.36 (package @@ -56846,6 +60726,7 @@ rustc compiler.") (name "rust-rustix") (version "0.36.13") (source (origin + (inherit (package-source rust-rustix-0.37)) (method url-fetch) (uri (crate-uri "rustix" version)) (file-name (string-append name "-" version ".tar.gz")) @@ -56883,6 +60764,7 @@ rustc compiler.") (name "rust-rustix") (version "0.35.13") (source (origin + (inherit (package-source rust-rustix-0.36)) (method url-fetch) (uri (crate-uri "rustix" version)) (file-name (string-append name "-" version ".tar.gz")) @@ -57097,7 +60979,8 @@ rustc compiler.") (base32 "0vh93fhqfbn4ysw4xzkpkpqdz36xixz4mhs1qllgldfq5iay6wgj")))) (arguments - `(#:tests? #f ;; 1/111 tests fail (test file not found) + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #f ;; 1/111 tests fail (test file not found) #:cargo-inputs (("rust-base64" ,rust-base64-0.10) ("rust-log" ,rust-log-0.4) @@ -57242,7 +61125,8 @@ native certificate store.") (("rust-ring" ,rust-ring-0.16) ("rust-untrusted" ,rust-untrusted-0.7) ("rust-webpki" ,rust-webpki-0.21) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) + (native-inputs (list perl)))) (define-public rust-rustls-pemfile-1 (package @@ -57935,7 +61819,7 @@ in pure Rust.") ("rust-indexmap" ,rust-indexmap-1.7) ("rust-lock-api" ,rust-lock-api-0.4) ("rust-log" ,rust-log-0.4) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-salsa-macros" ,rust-salsa-macros-0.17) @@ -58487,16 +62371,14 @@ for browser-grade parsing and querying.") (define-public rust-scratch-1 (package (name "rust-scratch") - (version "1.0.0") + (version "1.0.7") (source (origin (method url-fetch) (uri (crate-uri "scratch" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0sff4rvfalp0ip98pl3xa32n7lhzcr4zqn8fgamaalbb64v4a4by")))) + (base32 "0lk160986gamss2rxi746nj747xx7gg8r2hfskrr9fccqc8prkx3")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -58792,6 +62674,7 @@ Pwrite traits from the scroll crate.") `(#:cargo-inputs (("rust-ring" ,rust-ring-0.16) ("rust-untrusted" ,rust-untrusted-0.7)))) + (native-inputs (list perl)) (home-page "https://github.com/ctz/sct.rs") (synopsis "Certificate transparency SCT verification library") (description "Certificate transparency SCT verification library.") @@ -58831,7 +62714,8 @@ Pwrite traits from the scroll crate.") (base32 "1fb9ym5bwswx01yyggn7v2vfryih4vnqpp4r4ssv3qaqpn7xynig")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-ring" ,rust-ring-0.14) ("rust-untrusted" ,rust-untrusted-0.6)) #:phases @@ -59306,7 +63190,8 @@ macOS and iOS.") (base32 "07zv0szz2kfy1hn251h0qsq0q9i1zia768d8vzril1g6xarj7mcj")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; MacOS specific + #:cargo-inputs (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.6) ("rust-libc" ,rust-libc-0.2)))))) @@ -59329,8 +63214,40 @@ macOS and iOS.") (("rust-core-foundation-sys" ,rust-core-foundation-sys-0.2) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-selectors-0.24 + (package + (name "rust-selectors") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "selectors" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05il06smqbhf7p18fawm5fd0pmdkysvmyih455lh17cnh20mfdqc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.8) + ("rust-phf-codegen" ,rust-phf-codegen-0.8) + ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) + ("rust-servo-arc" ,rust-servo-arc-0.2) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-to-shmem" ,rust-to-shmem-0.0.0) + ("rust-to-shmem-derive" ,rust-to-shmem-derive-0.0.0)))) + (home-page "https://github.com/servo/servo") + (synopsis "CSS Selectors matching for Rust") + (description "This package provides CSS Selectors matching for Rust.") + (license license:mpl2.0))) + (define-public rust-selectors-0.23 (package + (inherit rust-selectors-0.24) (name "rust-selectors") (version "0.23.0") (source @@ -59341,7 +63258,6 @@ macOS and iOS.") (sha256 (base32 "17w7slv2bkksvbq6pggx3db23vh1g022hxv06smilwmyhv38gspx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -59353,11 +63269,7 @@ macOS and iOS.") ("rust-phf-codegen" ,rust-phf-codegen-0.8) ("rust-precomputed-hash" ,rust-precomputed-hash-0.1) ("rust-servo-arc" ,rust-servo-arc-0.1) - ("rust-smallvec" ,rust-smallvec-1)))) - (home-page "https://github.com/servo/servo") - (synopsis "CSS Selectors matching for Rust") - (description "This package provides CSS Selectors matching for Rust.") - (license license:mpl2.0))) + ("rust-smallvec" ,rust-smallvec-1)))))) (define-public rust-selectors-0.22 (package @@ -59728,7 +63640,7 @@ fragment of code.") (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.171") + (version "1.0.188") (source (origin (method url-fetch) @@ -59736,13 +63648,12 @@ fragment of code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a9lvibgi42mhmgafp747mvshsq6ybx6rzcjqh398rfp9wg7vqih")))) + "17jlqzfhimsk8w37ifjwnm86nwjzawlbgwmwc7nhwdwslv5hz7ng")))) (build-system cargo-build-system) (arguments - ;; XXX: three test failures, e.g.: - ;; error: cannot find derive macro `Deserialize` in this scope - `(#:tests? #false - #:cargo-inputs + `(#:cargo-inputs + (("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://serde.rs") (synopsis "Generic serialization/deserialization framework") @@ -60102,7 +64013,7 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.171") + (version "1.0.188") (source (origin (method url-fetch) @@ -60110,7 +64021,7 @@ TOML/JSON/MessagePack strings and serializable values.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10j6s97fk7fgjiqhhrx6a44rqxr7v3w985i3avx4d36i7dh9961q")))) + "1wjaclvsfxgqnnnykllvb5gffsxynk66x6h4c1ds6anq8b37mjjf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -60207,14 +64118,14 @@ data. This crate provides a wrapper that works with any existing Serde (define-public rust-serde-json-1 (package (name "rust-serde-json") - (version "1.0.102") + (version "1.0.107") (source (origin (method url-fetch) (uri (crate-uri "serde-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vfzj76zdn8yh5l08yzr6lf95whic3vrlkh6nq4266s8bncjl1mm")))) + (base32 "0r8cyb8nh3afb15yfscp1h8sdjfv6pnnwg14kcp8igfqwgk0qhkb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -60376,28 +64287,53 @@ using nested parameters, similar to those used by @code{qs} for Node, and commonly used by Ruby on Rails via Rack.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-regex-1 + (package + (name "rust-serde-regex") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pxsnxb8c198szghk1hvzvhva36w2q5zs70hqkmdf5d89qd6y4x8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/tailhook/serde-regex") + (synopsis "Serde wrapper that (de)serializes regex as strings") + (description + "This package provides a serde wrapper that (de)serializes regex as strings.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-repr-0.1 (package (name "rust-serde-repr") - (version "0.1.10") + (version "0.1.16") (source (origin (method url-fetch) (uri (crate-uri "serde_repr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0knbzc87nlrfnm1jh3zmx77hxflnzk0xl8xcv7jvn3m2fkxcjpls")))) + (base32 "005x2q9x6cdqp312mjhggbzd6vkg8r0abcg0biz0z9dkmpgy29c7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1.0.34) - ("rust-quote" ,rust-quote-1.0.10) - ("rust-syn" ,rust-syn-1)) + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1.0.73) - ("rust-trybuild" ,rust-trybuild-1.0.19)))) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/dtolnay/serde-repr") (synopsis "Serialize and deserialize C-like enum as underlying repr") (description @@ -60602,8 +64538,119 @@ the application/x-www-form-urlencoded format.") for later processing.") (license license:expat))) +(define-public rust-serde-with-3 + (package + (name "rust-serde-with") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-with" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04w5v0siychbb7l3anx57crvv9m3w866ckwjhkq5nf1wdsmdh0lz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; could not find `Deserializer` in `serde_test` + #:cargo-inputs + (("rust-base64" ,rust-base64-0.21) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with-macros" ,rust-serde-with-macros-3) + ("rust-time" ,rust-time-0.3)) + #:cargo-development-inputs + (("rust-expect-test" ,rust-expect-test-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-glob" ,rust-glob-0.3) + ("rust-mime" ,rust-mime-0.3) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-regex" ,rust-regex-1) + ("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-ron" ,rust-ron-0.8) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-xml-rs" ,rust-serde-xml-rs-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-version-sync" ,rust-version-sync-0.9)))) + (home-page "https://github.com/jonasbb/serde_with/") + (synopsis "Custom de/serialization functions for Rust's serde") + (description "This package provides custom de/serialization functions for +Rust's serde.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-serde-with-macros-3 + (package + (name "rust-serde-with-macros") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-with-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0w5hp31ji9vc5x00qzsn6yxfy16573fn8ppf4bkjrc9gjg9xbizd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=test_serde_with_dependency") + #:cargo-inputs + (("rust-darling" ,rust-darling-0.20) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-expect-test" ,rust-expect-test-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-version-sync" ,rust-version-sync-0.9)))) + (home-page "https://github.com/jonasbb/serde_with/") + (synopsis "Proc-macro library for serde_with") + (description "This package provides proc-macro library for +@code{serde_with}.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-serde-xml-rs-0.6 + (package + (name "rust-serde-xml-rs") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-xml-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10i7dvd0c1clj4jbljd08qs8466nlymx7ma7k3ncksx1rn7affpv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:cargo-development-inputs + (("rust-docmatic" ,rust-docmatic-0.1) + ("rust-rstest" ,rust-rstest-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-simple-logger" ,rust-simple-logger-2)))) + (home-page "https://github.com/RReverser/serde-xml-rs") + (synopsis "xml-rs based deserializer for Serde") + (description "This package provies a xml-rs based deserializer for Serde +(compatible with 0.9+).") + (license license:expat))) + (define-public rust-serde-xml-rs-0.5 (package + (inherit rust-serde-xml-rs-0.6) (name "rust-serde-xml-rs") (version "0.5.1") (source (origin @@ -60613,18 +64660,12 @@ for later processing.") (sha256 (base32 "1ypdy4cry8y6jbia0l0cqvkxkdvl7vplzfzb44s6lbxyb682w5k5")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-xml-rs" ,rust-xml-rs-0.8)))) - (home-page "https://github.com/RReverser/serde-xml-rs") - (synopsis "xml-rs based deserializer for Serde") - (description "This package provies a xml-rs based deserializer for Serde -(compatible with 0.9+)") - (license license:expat))) + ("rust-xml-rs" ,rust-xml-rs-0.8)))))) (define-public rust-serde-xml-rs-0.4 (package @@ -60702,6 +64743,35 @@ for later processing.") ("rust-indoc" ,rust-indoc-1) ("rust-serde-derive" ,rust-serde-derive-1)))))) +(define-public rust-serde-wasm-bindgen-0.3 + (package + (name "rust-serde-wasm-bindgen") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-wasm-bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xzh1a3rhapirlca4rbvh6bycphxg5yjmdwjsqij3hl6wpl6b0v1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fnv" ,rust-fnv-1) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-maplit" ,rust-maplit-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (home-page "https://github.com/cloudflare/serde-wasm-bindgen") + (synopsis "Native Serde adapter for wasm-bindgen") + (description "Native Serde adapter for wasm-bindgen.") + (license license:expat))) + (define-public rust-serdect-0.2 (package (name "rust-serdect") @@ -60736,8 +64806,66 @@ for later processing.") for data that potentially contains secrets (e.g. cryptographic keys).") (license (list license:asl2.0 license:expat)))) +(define-public rust-serial-test-2 + (package + (name "rust-serial-test") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b9v0csv9wxl1gcjq99plwimxbmhgr6kzbwqyb457qh3d22xsmhf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serial-test-derive" ,rust-serial-test-derive-2)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Allows for the creation of serialised Rust tests") + (description + "This package allows for the creation of serialised Rust tests.") + (license license:expat))) + +(define-public rust-serial-test-1 + (package + (inherit rust-serial-test-2) + (name "rust-serial-test") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04864v5ain4nan2k5l32sr3bxpg0sfxxs2iki3xxcq78g9s3132k")))) + (arguments + `(#:cargo-inputs + (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serial-test-derive" ,rust-serial-test-derive-1)) + #:cargo-development-inputs + (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-serial-test-0.6 (package + (inherit rust-serial-test-1) (name "rust-serial-test") (version "0.6.0") (source @@ -60748,19 +64876,13 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (string-append name "-" version ".tar.gz")) (sha256 (base32 "05gcah6s133r44y4z5qskx7prs1vjlzgv06h4l2xb8gp30fw9g75")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) ("rust-fslock" ,rust-fslock-0.2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-serial-test-derive" ,rust-serial-test-derive-0.6)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Allows for the creation of serialised Rust tests") - (description - "This package allows for the creation of serialised Rust tests.") - (license license:expat))) + ("rust-serial-test-derive" ,rust-serial-test-derive-0.6)))))) (define-public rust-serial-test-0.5 (package @@ -60799,8 +64921,54 @@ for data that potentially contains secrets (e.g. cryptographic keys).") `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) +(define-public rust-serial-test-derive-2 + (package + (name "rust-serial-test-derive") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13zvd5ds76hhjn3z0axc05n15lzpxpz77jcykic8q5knhlbjklci")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.10)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Helper crate for serial_test") + (description + "This package is an helper crate for @code{rust-serial-test}.") + (license license:expat))) + +(define-public rust-serial-test-derive-1 + (package + (inherit rust-serial-test-derive-2) + (name "rust-serial-test-derive") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial-test-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0scscldvlz3an9v0spcizaqp5wa2y4w15bk4ink8jpgq2pgq76h7")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9)))))) + (define-public rust-serial-test-derive-0.6 (package + (inherit rust-serial-test-derive-1) (name "rust-serial-test-derive") (version "0.6.0") (source @@ -60810,7 +64978,6 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1s6aj2bs0rr8hnralx16bvbqlbrihmii7cyplggk5yv0gp6vr098")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro-error" ,rust-proc-macro-error-1) @@ -60820,12 +64987,7 @@ for data that potentially contains secrets (e.g. cryptographic keys).") ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-trybuild" ,rust-trybuild-1)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Helper crate for serial_test") - (description - "This package is an helper crate for @code{rust-serial-test}.") - (license license:expat))) + ("rust-trybuild" ,rust-trybuild-1)))))) (define-public rust-serial-test-derive-0.5 (package @@ -60866,8 +65028,33 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-servo-arc-0.2 + (package + (name "rust-servo-arc") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "servo-arc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hgp453zvrj7ry501jhxlcph0hc42gc26zyfwn8ys3yziwps8anm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nodrop" ,rust-nodrop-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) + (home-page "https://github.com/servo/servo") + (synopsis "Fork of std::sync::Arc with some extra functionality") + (description + "This package provides a fork of @code{std::sync::Arc} with some extra +functionality and without weak references.") + (license (list license:expat license:asl2.0)))) + (define-public rust-servo-arc-0.1 (package + (inherit rust-servo-arc-0.2) (name "rust-servo-arc") (version "0.1.1") (source @@ -60879,18 +65066,11 @@ for data that potentially contains secrets (e.g. cryptographic keys).") (sha256 (base32 "0cjljr9znwahry6p95xvd3p4pmy24wlf6gbfidnmglg002w3i0nr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-nodrop" ,rust-nodrop-0.1) ("rust-serde" ,rust-serde-1) - ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) - (home-page "https://github.com/servo/servo") - (synopsis "Fork of std::sync::Arc with some extra functionality") - (description - "This package provides a fork of @code{std::sync::Arc} with some extra -functionality and without weak references.") - (license (list license:expat license:asl2.0)))) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))))) (define-public rust-serial-test-derive-0.4 (package @@ -61448,6 +65628,27 @@ and environment at run time. You can use this tool to check in production exactly where a binary came from and how it was built.") (license (list license:expat license:asl2.0)))) +(define-public rust-shannon-0.2 + (package + (name "rust-shannon") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "shannon" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qa52zs4y1i87ysr11g9p6shpdagl14bb340gfm6rd97jhfb99by")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-byteorder" ,rust-byteorder-1)))) + (home-page "https://docs.rs/shannon/0.2.0/shannon/") + (synopsis "Shannon cipher implementation") + (description + "A Shannon cipher implementation, that encrypts a message using a +shared secret key.") + (license license:expat))) + (define-public rust-sharded-slab-0.1 (package (name "rust-sharded-slab") @@ -61875,8 +66076,45 @@ for additional details.") ("rust-syn" ,rust-syn-1) ("rust-synstructure" ,rust-synstructure-0.12)))))) +(define-public rust-simba-0.8 + (package + (name "rust-simba") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simba" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bnf7ainywmaz2z67ss1q0bjwccf80c50c50r6hlpay69z4hf586")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-cordic" ,rust-cordic-0.1) + ("rust-cuda-std" ,rust-cuda-std-0.2) + ("rust-cust-core" ,rust-cust-core-0.1) + ("rust-decimal" ,rust-decimal-2) + ("rust-fixed" ,rust-fixed-1) + ("rust-libm" ,rust-libm-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-wide" ,rust-wide-0.7)))) + (home-page "https://github.com/dimforge/simba") + (synopsis "SIMD algebra for Rust") + (description "This package provides a set of mathematical traits to +facilitate the use of SIMD-based @dfn{Array of Struct of Array} (AoSoA) storage +pattern in Rust.") + (license license:asl2.0))) + (define-public rust-simba-0.6 (package + (inherit rust-simba-0.8) (name "rust-simba") (version "0.6.0") (source @@ -61887,7 +66125,6 @@ for additional details.") (sha256 (base32 "0px0nncs3ki86pjcldz40mhvraywh7y9jypfcqqdcihs287q9dzh")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-approx" ,rust-approx-0.5) @@ -61901,13 +66138,7 @@ for additional details.") ("rust-paste" ,rust-paste-1) ("rust-rand" ,rust-rand-0.8) ("rust-serde" ,rust-serde-1) - ("rust-wide" ,rust-wide-0.7)))) - (home-page "https://github.com/dimforge/simba") - (synopsis "SIMD algebra for Rust") - (description "This package provides a set of mathematical traits to -facilitate the use of SIMD-based @dfn{Array of Struct of Array} (AoSoA) storage -pattern in Rust.") - (license license:bsd-3))) + ("rust-wide" ,rust-wide-0.7)))))) (define-public rust-simba-0.5 (package @@ -62078,16 +66309,16 @@ implementation in Rust.") (define-public rust-simdutf8-0.1 (package (name "rust-simdutf8") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "simdutf8" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nama0xqzbl8x72fqd8nhgvwjhg2vqj0gkv1la8gm0n6wwbdlw69")))) + (base32 "0fi6zvnldaw7g726wnm9vvpv4s89s5jsk7fgp3rg2l99amw64zzj")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments `(#:tests? #f)) (home-page "https://github.com/rusticstuff/simdutf8") (synopsis "SIMD-accelerated UTF-8 validation") (description @@ -62586,23 +66817,22 @@ implementations.") "Rust FFI bindings to the SLEEF Vectorized Math Library.") (license (list license:asl2.0 license:expat)))) -(define-public rust-slice-deque-0.2 +(define-public rust-slice-deque-0.3 (package (name "rust-slice-deque") - (version "0.2.4") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "slice-deque" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1mq78l0vfwabnyanb85amgzakfhdaxx455yq6cszd5zmynagbpgz")))) + (base32 "098gvqjw52qw4gac567c9hx3y6hw9al7hjqb5mnvmvydh3i6xvri")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-mach" ,rust-mach-0.2) + ("rust-mach" ,rust-mach-0.3) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/gnzlbg/slice_deque") (synopsis "Double-ended queue that Deref's into a slice") @@ -62610,6 +66840,25 @@ implementations.") "This package provides a double-ended queue that Deref's into a slice.") (license (list license:expat license:asl2.0)))) +(define-public rust-slice-deque-0.2 + (package + (inherit rust-slice-deque-0.3) + (name "rust-slice-deque") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "slice-deque" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mq78l0vfwabnyanb85amgzakfhdaxx455yq6cszd5zmynagbpgz")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-mach" ,rust-mach-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-slog-2 (package (name "rust-slog") @@ -62915,16 +67164,14 @@ inline storage.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.10.0") + (version "1.11.1") (source (origin (method url-fetch) (uri (crate-uri "smallvec" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1q2k15fzxgwjpcdv3f323w24rbbfyv711ayz85ila12lg7zbw1x5")))) + (base32 "0nmx8aw3v4jglqdcjv4hhn10d6g52c4bhjlzwf952885is04lawl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -63454,8 +67701,32 @@ It is also flexible enough to build your own test harness like @code{trycmd}.") benchmarking.") (license license:bsd-3))) +(define-public rust-socket2-0.5 + (package + (name "rust-socket2") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "socket2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17lqx8w2b3nysrkdbdz8y7fkikz5v77c052q57lxwajmxchfhca0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) + (home-page "https://github.com/rust-lang/socket2") + (synopsis "Networking sockets in Rust") + (description + "This package provides utilities for handling networking sockets with a +maximal amount of configuration possible intended.") + (license (list license:expat license:asl2.0)))) + (define-public rust-socket2-0.4 (package + (inherit rust-socket2-0.5) (name "rust-socket2") (version "0.4.7") (source @@ -63465,18 +67736,10 @@ benchmarking.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gaf57dc16s1lfyv388w9vdl9qay15xds78jcwakml9kj3dx5qh2")))) - (build-system cargo-build-system) (arguments (list #:cargo-inputs `(("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/rust-lang/socket2") - (synopsis "Networking sockets in Rust") - (description - "This package provides utilities for handling networking sockets with a -maximal amount of configuration possible intended.") - (license (list license:asl2.0 - license:expat)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-socket2-0.3 (package @@ -63529,42 +67792,32 @@ maximal amount of configuration possible intended.") (define-public rust-sourcemap-6 (package (name "rust-sourcemap") - (version "6.0.1") + (version "6.4.1") (source (origin (method url-fetch) (uri (crate-uri "sourcemap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sv1rxc6d2rfvd5xrqzqq0i2y0z1q7sqj3wm9krxbggcccj1y0vf")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Enable unstable features - (substitute* "src/lib.rs" - (("//! This library" all) - (string-append "#![feature(inner_deref)]" "\n" all))) - #t)))) + (base32 "145xyp6qaai2gd5p92bkg7yzrm4n5mqx1y111vsnqmywlxfgdjz4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-base64" ,rust-base64-0.11) + `(#:cargo-test-flags + (list "--release" "--" + "--skip=types::tests::test_adjust_mappings_injection") + #:cargo-inputs + (("rust-data-encoding" ,rust-data-encoding-2) + ("rust-debugid" ,rust-debugid-0.8) ("rust-if-chain" ,rust-if-chain-1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-regex" ,rust-regex-1) + ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-scroll" ,rust-scroll-0.10) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-unicode-id" ,rust-unicode-id-0.3) ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) + (("rust-magic-string" ,rust-magic-string-0.3) + ("rust-proptest" ,rust-proptest-1)))) (home-page "https://github.com/getsentry/rust-sourcemap") (synopsis "Basic sourcemap handling for Rust") (description "This package provides basic sourcemap handling for Rust.") @@ -63674,18 +67927,21 @@ maximal amount of configuration possible intended.") (define-public rust-spin-0.9 (package (name "rust-spin") - (version "0.9.2") + (version "0.9.8") (source (origin (method url-fetch) (uri (crate-uri "spin" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rch0my17z66fam7hbynvrcs6jk63b08jv4s04mhdksv1jz584ji")))) + (base32 "0rvam5r0p3a6qhc18scqpvpgb3ckzyqxpgdfyjnghh8ja7byi039")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-lock-api" ,rust-lock-api-0.4)))) + (("rust-lock-api" ,rust-lock-api-0.4) + ("rust-portable-atomic" ,rust-portable-atomic-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4)))) (home-page "https://github.com/mvdnes/spin-rs") (synopsis "Synchronization primitives based on spinning") (description "This crate provides synchronization primitives based on @@ -64181,7 +68437,7 @@ deeply recursive algorithms that may accidentally blow the stack.") "1zr8zy3kzryaggz3k0j4135m3zbd31pyqmja8cyj8yp07mpzn4z1")))) (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.9)))) (home-page "https://github.com/jhpratt/standback") (synopsis "New standard library, old compiler") @@ -64535,6 +68791,24 @@ on verbosity specified") Web.") (license (list license:expat license:asl2.0)))) +(define-public rust-stdweb-0.1 + (package + (inherit rust-stdweb-0.4) + (name "rust-stdweb") + (version "0.1.3") + (source (origin + (method url-fetch) + (uri (crate-uri "stdweb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0gjk7ch31a3kgdc39kj4zqinf10yqaf717wanh9kwwbbwg430m7g")))) + (arguments + (list #:skip-build? #t + #:cargo-inputs `(("rust-clippy" ,rust-clippy-0.0) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-stdweb-derive-0.5 (package (name "rust-stdweb-derive") @@ -65333,7 +69607,11 @@ struct.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")))) + "1mvfv1l8vp3y402fkl2wcl34hi7gmr4bqha13dfz2xf3kjzwvhhn")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ((".*lints.*") "")))))) (build-system cargo-build-system) (arguments `(#:tests? #f @@ -66138,17 +70416,316 @@ executed by swayipc.") interface") (license license:expat))) +(define-public rust-symphonia-0.4 + (package + (name "rust-symphonia") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dx4v5libbksi4rd6b9290nci3h8xqyakymhxd72yybyl25g7rd7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-symphonia-bundle-flac" ,rust-symphonia-bundle-flac-0.4) + ("rust-symphonia-bundle-mp3" ,rust-symphonia-bundle-mp3-0.4) + ("rust-symphonia-codec-aac" ,rust-symphonia-codec-aac-0.4) + ("rust-symphonia-codec-pcm" ,rust-symphonia-codec-pcm-0.4) + ("rust-symphonia-codec-vorbis" ,rust-symphonia-codec-vorbis-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-format-isomp4" ,rust-symphonia-format-isomp4-0.4) + ("rust-symphonia-format-ogg" ,rust-symphonia-format-ogg-0.4) + ("rust-symphonia-format-wav" ,rust-symphonia-format-wav-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis + "Symphonia is a pure Rust media container and audio decoding library") + (description + "Symphonia is a pure Rust media container and audio decoding library +that supports a wide range of audio formats.") + (license license:mpl2.0))) + +(define-public rust-symphonia-bundle-flac-0.4 + (package + (name "rust-symphonia-bundle-flac") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-bundle-flac" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00jxn9izfg1g07srhgglpqgadmzwsr88sqnnxw3mskpvyl958vhi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4) + ("rust-symphonia-utils-xiph" ,rust-symphonia-utils-xiph-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "FLAC demuxer and decoder for the Symphonia library") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +supporting a wide range of audio formats. This package contains a FLAC demuxer +and decoder.") + (license license:mpl2.0))) + +(define-public rust-symphonia-core-0.4 + (package + (name "rust-symphonia-core") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j84q4a9p9qa23976spxap9s6ns3fm6fzrfz65n6cjhgpsbmw4zs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Shared elements for Symphonia a Rust audio library") + (description + "Symphonia is a pure Rust audio decoding and media demuxing +library supporting a wide range of audio formats. This package contains +shared structs, traits, and features.") + (license license:mpl2.0))) + +(define-public rust-symphonia-metadata-0.4 + (package + (name "rust-symphonia-metadata") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (crate-uri "symphonia-metadata" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06lvwy24kirc84r6d23ncad544525fsb6gna0plqz3d1mffmjq2j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Multimedia tag and metadata readers for the Symphonia library") + (description "Symphonia is a pure Rust audio decoding and media demuxing +library supporting a wide range of audio formats. This package contains +multimedia tag and metadata readers.") + (license license:mpl2.0))) + +(define-public rust-symphonia-bundle-mp3-0.4 + (package + (name "rust-symphonia-bundle-mp3") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-bundle-mp3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14074njhgrcgh2p5iryrd68mgdzcxf9v7p8xfm8ldkhylv29fkgc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "MP1, MP2, and MP3 demuxers and decoders written in pure Rust") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +supporting a wide range of aduio formats. This package contains support for +MP1, MP2 and MP3.") + (license license:mpl2.0))) + +(define-public rust-symphonia-codec-aac-0.4 + (package + (name "rust-symphonia-codec-aac") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-codec-aac" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13smaxgb1jadl4jyay7hixqgwaiqrjvsvmzdvlbdzdxrgsrplgdx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Pure Rust AAC decoder from Symphonia") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +that supports a wide range of audio formats. This package contains an AAC +decoder.") + (license license:mpl2.0))) + +(define-public rust-symphonia-codec-pcm-0.4 + (package + (name "rust-symphonia-codec-pcm") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-codec-pcm" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1is49qjnfy541zpgzz498hnpz0nsq7i4nfky2133b6aqhxrm87ds")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Pure Rust PCM audio decoder, part of Symphonia") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +that supports a wide range of audio formats. This package contains a +@acronym{PCM, Pulse-Code Modulation} audio decoder.") + (license license:mpl2.0))) + +(define-public rust-symphonia-codec-vorbis-0.4 + (package + (name "rust-symphonia-codec-vorbis") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-codec-vorbis" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yj1si92fnnzdfkw27cq324h6y1s958s8r2hl0szpvvqh1sdd7m2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-utils-xiph" ,rust-symphonia-utils-xiph-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Pure Rust Vorbis decoder, part of the Symphonia project") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +that supports a wide range of audio formats. This package is a Vorbis +decoder.") + (license license:mpl2.0))) + +(define-public rust-symphonia-format-isomp4-0.4 + (package + (name "rust-symphonia-format-isomp4") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-format-isomp4" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dap5yh286j74sybjsam378v1jxkpdl3hvvm81sipv7725vkmvpy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Rust ISO/MP4 demuxer from the Symphonia project") + (description + "Symphonia is a pure Rust audio decoding and media demuxing library +that supports a wide range of audio formats. This package contains an +ISO/MP4 demuxer.") + (license license:mpl2.0))) + +(define-public rust-symphonia-format-ogg-0.4 + (package + (name "rust-symphonia-format-ogg") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-format-ogg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06d5327m4yk8a6yq7zzyiv2sbkwnjq28dz9cagndz6m7i1r3bcnp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4) + ("rust-symphonia-utils-xiph" ,rust-symphonia-utils-xiph-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Pure Rust OGG demuxer, part of Symphonia") + (description + "Symphonia is a pure Rust decoding and media demuxing library that +supports a wide range of audio formats. This package is an OGG demuxer.") + (license license:mpl2.0))) + +(define-public rust-symphonia-format-wav-0.4 + (package + (name "rust-symphonia-format-wav") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-format-wav" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b8x213s44xis4pb1ibnqr1a20hsxf3phm527dvadpi0nkjsb7vd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Rust WAV demuxer from the Symphonia project") + (description + "Symphonia is a pure Rust decoding and media demuxing library that +supports a wide range of audio formats. This package is a WAV demuxer.") + (license license:mpl2.0))) + +(define-public rust-symphonia-utils-xiph-0.4 + (package + (name "rust-symphonia-utils-xiph") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symphonia-utils-xiph" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sg1y7s607rk1akrrzyhdsqimiwwaw440jzr1cp89zs8d5n04dva")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-symphonia-core" ,rust-symphonia-core-0.4) + ("rust-symphonia-metadata" ,rust-symphonia-metadata-0.4)))) + (home-page "https://github.com/pdeljanov/Symphonia") + (synopsis "Xiph codecs and formats for Rust's Symphonia") + (description + "Symphonia is a pure Rust audio decoding and media demuxing +library that supports a wide range of audio formats. This package contains Xiph +codecs and formats.") + (license license:mpl2.0))) + (define-public rust-syn-2 (package (name "rust-syn") - (version "2.0.25") + (version "2.0.37") (source (origin (method url-fetch) (uri (crate-uri "syn" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1qjswb3cifay6x9l0qjpm9c42ikacpxybr9ny4npw9kl1j6grqqm")))) + "1s42ypidkj410dfc4ir7bni0r114k822j395rf342rfd0lnfy0vk")))) (build-system cargo-build-system) (arguments ;; Tests fail to compile @@ -66879,7 +71456,9 @@ processors, disks, components and networks.") (uri (crate-uri "system-deps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951")))) + (base32 "02g750rlhh7ynqa3p4a3qm7jrkjp3d0jlzrl29z225ch9hf5m951")) + (snippet + #~(begin (delete-file "src/tests/lib/libteststatic.a"))))) (build-system cargo-build-system) (arguments `(#:tests? #f ;source is missing some test files @@ -67910,22 +72489,22 @@ deleting all contents when it's dropped.") (define-public rust-tempfile-3 (package (name "rust-tempfile") - (version "3.5.0") + (version "3.8.0") (source (origin (method url-fetch) (uri (crate-uri "tempfile" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "163rp254r3x7i5hisagrpxid2166pq94jvk511dpkmc1yf2fryxr")))) + (base32 "1vsl2193w3gpx3mwj36fwx3v6q2qyvmzrdn6m8fgfsjkrkrx556b")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-fastrand" ,rust-fastrand-1) + ("rust-fastrand" ,rust-fastrand-2) ("rust-redox-syscall" ,rust-redox-syscall-0.3) - ("rust-rustix" ,rust-rustix-0.37) - ("rust-windows-sys" ,rust-windows-sys-0.45)) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (home-page "https://stebalien.com/projects/tempfile-rs") @@ -68454,6 +73033,23 @@ bindings are a small wrapper around the raw C functions, which converts integer return values to @code{std::io::Result} to indicate success or failure.") (license license:expat))) +(define-public rust-termtree-0.4 + (package + (name "rust-termtree") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "termtree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xkal5l2r3r9p9j90x35qy4npbdwxz4gskvbijs6msymaangas9k")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-cli/termtree") + (synopsis "Visualize tree-like data on the command-line") + (description "Visualize tree-like data on the command-line.") + (license license:expat))) + (define-public rust-test-assembler-0.1 (package (name "rust-test-assembler") @@ -68544,23 +73140,32 @@ into mod, giving clear and readable test results.") (package (inherit rust-test-case-2) (name "rust-test-case") - (version "1.0.0") + (version "1.2.3") (source (origin (method url-fetch) (uri (crate-uri "test-case" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1j33njgyr4cjhil14va909sg8s6ahzpgcmiaigdg7g22ica6950r")))) + (base32 "0siwpm8g40g5gcvwcn6g4iq0bdhm6lb3dq6wcspfhhsb814g1rg9")))) (arguments - `(#:tests? #false ;XXX: a single test fails, cannot skip it + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=acceptance::async_tests" + "--skip=acceptance::hamcrest_assertions" + "--skip=acceptance::basic" + "--skip=acceptance::allow_result_check" + "--skip=acceptance::return_check") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1) ("rust-version-check" ,rust-version-check-0.9)) #:cargo-development-inputs - (("rust-insta" ,rust-insta-0.12) + (("rust-indexmap" ,rust-indexmap-1.7) + ("rust-insta" ,rust-insta-0.16) + ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1)))))) (define-public rust-test-case-core-3 @@ -69932,6 +74537,44 @@ to a style defined by John Gruber for post titles on his website ``Daring Fireball''.") (license license:expat))) +(define-public rust-to-shmem-0.0.0 + (package + (name "rust-to-shmem") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "to-shmem" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12k69c7zknzmza1mkqpmd86cialbsvazz7zr4hscm0dnfzy2bvmi")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/servo") + (synopsis + "Trait for cloning data into a shared memory buffer (dummy package)") + (description + "Trait for cloning data into a shared memory buffer (dummy package).") + (license license:mpl2.0))) + +(define-public rust-to-shmem-derive-0.0.0 + (package + (name "rust-to-shmem-derive") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "to-shmem-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z4zc81p0i5fpkil2v2jq54nmilasvr0v25q7jbv6w0nrpl5qw2b")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/servo") + (synopsis + "Trait for cloning data into a shared memory buffer (dummy package)") + (description + "Trait for cloning data into a shared memory buffer (dummy package).") + (license license:mpl2.0))) + (define-public rust-tobj-3 (package (name "rust-tobj") @@ -69976,31 +74619,45 @@ tinyobjloader.") (define-public rust-tokio-1 (package (name "rust-tokio") - (version "1.26.0") + (version "1.32.0") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0r3gnz0zh669q9jm7xh8dz7irbnxjddbbrfflp42jyn2qc0is803")))) + (base32 "1yck1349q23l22bgxcbqd3wkaffw2vmkf7z26m3wgmkcxmvn1v8p")))) (build-system cargo-build-system) (arguments - (list #:skip-build? #t + (list #:tests? #f ; unresolved imports `crate::runtime::task` #:cargo-inputs - `(("rust-autocfg" ,rust-autocfg-1) + `(("rust-backtrace" ,rust-backtrace-0.3) ("rust-bytes" ,rust-bytes-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memchr" ,rust-memchr-2) ("rust-mio" ,rust-mio-0.8) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-parking-lot" ,rust-parking-lot-0.12) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) - ("rust-socket2" ,rust-socket2-0.4) - ("rust-tokio-macros" ,rust-tokio-macros-1) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tokio-macros" ,rust-tokio-macros-2) ("rust-tracing" ,rust-tracing-0.1) - ("rust-windows-sys" ,rust-windows-sys-0.45)))) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs + `(("rust-async-stream" ,rust-async-stream-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-loom" ,rust-loom-0.7) + ("rust-mio-aio" ,rust-mio-aio-0.7) + ("rust-mockall" ,rust-mockall-0.11) + ("rust-nix" ,rust-nix-0.26) + ("rust-rand" ,rust-rand-0.8) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) (home-page "https://tokio.rs") (synopsis "Event-driven, non-blocking I/O platform") (description @@ -70095,7 +74752,11 @@ writing asynchronous I/O backed applications.") (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as")))) + (base32 "1xhaadfmm6m37f79xv5020gc3np9wqza3bq95ymp522qpfsw02as")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("features = \\[\"tokio\"\\]") "")))))) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) @@ -70194,7 +74855,11 @@ writing asynchronous I/O backed applications.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf")))) + "0wbgg59mxfvrhzv97y56nh3gmnmw3jj9dhgkmvz27410jjxzpvxf")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("features = \\[\"tokio\"\\]") "")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -70427,30 +75092,51 @@ futures efficiently") operations.") (license (list license:expat license:asl2.0)))) -(define-public rust-tokio-macros-1 +(define-public rust-tokio-macros-2 (package (name "rust-tokio-macros") - (version "1.7.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1ds34qsfvgf63cjgdx3gr4pl7i76fifyar15ksbillcc8hpzfmxm")))) + (base32 "0pk7y9dfanab886iaqwcbri39jkw33kgl7y07v0kg1pp8prdq2v3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--release" "--lib") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-1)))) (home-page "https://tokio.rs") (synopsis "Tokio's proc macros") (description "This package provides Tokio's proc macros.") (license license:expat))) +(define-public rust-tokio-macros-1 + (package + (inherit rust-tokio-macros-2) + (name "rust-tokio-macros") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ds34qsfvgf63cjgdx3gr4pl7i76fifyar15ksbillcc8hpzfmxm")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-tokio-macros-0.3 (package (inherit rust-tokio-macros-1) @@ -70942,7 +75628,8 @@ Rustls.") "1jd63sl177sxacnksaxhazzmamwds98xk3niprh2qib75a1rk8cm")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-futures" ,rust-futures-0.1) ("rust-iovec" ,rust-iovec-0.1) @@ -72081,21 +76768,20 @@ One-Time Password library.") (define-public rust-tower-0.4 (package (name "rust-tower") - (version "0.4.10") + (version "0.4.13") (source (origin (method url-fetch) (uri (crate-uri "tower" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "001wx4iiyhmiih9f93szjsfdm5mzlr0n093bhqf178azzw7m03n0")))) + (base32 "073wncyqav4sak1p755hf6vl66njgfc1z1g1di9rxx3cvvh9pymq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-hdrhistogram" ,rust-hdrhistogram-6) + ("rust-hdrhistogram" ,rust-hdrhistogram-7) ("rust-indexmap" ,rust-indexmap-1) ("rust-pin-project" ,rust-pin-project-1) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) @@ -72103,10 +76789,21 @@ One-Time Password library.") ("rust-slab" ,rust-slab-0.4) ("rust-tokio" ,rust-tokio-1) ("rust-tokio-stream" ,rust-tokio-stream-0.1) - ("rust-tokio-util" ,rust-tokio-util-0.6) + ("rust-tokio-util" ,rust-tokio-util-0.7) ("rust-tower-layer" ,rust-tower-layer-0.3) ("rust-tower-service" ,rust-tower-service-0.3) - ("rust-tracing" ,rust-tracing-0.1)))) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-hdrhistogram" ,rust-hdrhistogram-7) + ("rust-http" ,rust-http-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-tower-test" ,rust-tower-test-0.4) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Library for building clients and servers") (description @@ -72117,18 +76814,19 @@ robust clients and servers.") (define-public rust-tower-layer-0.3 (package (name "rust-tower-layer") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (crate-uri "tower-layer" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qiskpgz6zzy3a894vyr9yzq0i7q142rciggc3wv1rizdm3cjfrl")))) + (base32 "1l7i17k9vlssrdg4s3b0ia5jjkmmxsvv8s9y9ih0jfi8ssz8s362")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-tower-service" ,rust-tower-service-0.3)))) + (("rust-tower" ,rust-tower-0.4) + ("rust-tower-service" ,rust-tower-service-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Easy composition between @code{Service}s") (description "This package decorates a @code{Service} to allow easy @@ -72138,7 +76836,7 @@ composition between @code{Service}s.") (define-public rust-tower-service-0.3 (package (name "rust-tower-service") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) @@ -72146,19 +76844,51 @@ composition between @code{Service}s.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0q4q53w82w1wd71x7vbspg2l3jicb6al2w1qdwxmnjrz8jzvd1z9")))) + "0lmfzmmvid2yp2l36mbavhmqgsvzqf7r2wiwz73ml4xmwaf1rg5n")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-http" ,rust-http-0.1)))) + (("rust-futures" ,rust-futures-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower-layer" ,rust-tower-layer-0.3)))) (home-page "https://github.com/tower-rs/tower") (synopsis "Asynchronous, request / response based, client or server") (description "This package provides a trait representing an asynchronous, request/response based, client or server.") (license license:expat))) +(define-public rust-tower-test-0.4 + (package + (name "rust-tower-test") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tower-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19zgjwzr9216yg1ayrnsly06lqdv96m2z1xq0bmf9fgazxrnfm54")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/tower-rs/tower") + (synopsis "Utilities for writing client and server @code{Service} tests") + (description "This package provides utilities for writing client and +server @code{Service} tests.") + (license license:expat))) + (define-public rust-tower-test-0.3 (package + (inherit rust-tower-test-0.4) (name "rust-tower-test") (version "0.3.0") (source @@ -72169,7 +76899,6 @@ request/response based, client or server.") (sha256 (base32 "1j2k07g3z8ascq7r30bmw3b75v8lhd63mhfl60y59a74q71bp94v")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) @@ -72179,12 +76908,7 @@ request/response based, client or server.") ("rust-tower-layer" ,rust-tower-layer-0.3) ("rust-tower-service" ,rust-tower-service-0.3)) #:cargo-development-inputs - (("rust-tokio" ,rust-tokio-0.2)))) - (home-page "https://github.com/tower-rs/tower") - (synopsis "Utilities for writing client and server @code{Service} tests") - (description "This package provides utilities for writing client and -server @code{Service} tests.") - (license license:expat))) + (("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-tower-util-0.3 (package @@ -72849,7 +77573,8 @@ the Trust-DNS client to use DNS over HTTPS.") ("rust-webpki-roots" ,rust-webpki-roots-0.19)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-futures" ,rust-futures-0.3)))))) + ("rust-futures" ,rust-futures-0.3)))) + (native-inputs (list perl)))) (define-public rust-trust-dns-https-0.18 (package @@ -72899,7 +77624,8 @@ the Trust-DNS client to use DNS over HTTPS.") (base32 "14ps1fxngm8d3ynp9jf86zrqbyzjzh62v5grwrqb1q0xhbz98vv1")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;network unreachable + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #false ;network unreachable #:cargo-inputs (("rust-bytes" ,rust-bytes-0.4) ("rust-data-encoding" ,rust-data-encoding-2) @@ -73638,7 +78364,8 @@ the Trust-DNS client to use rustls for TLS.") (inputs (list openssl)) (arguments - `(#:cargo-test-flags + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-test-flags '("--release" "--" "--skip=tests::test_tls_client_stream_ipv4") #:cargo-inputs (("rust-futures" ,rust-futures-0.1) @@ -73711,7 +78438,7 @@ the Trust-DNS client to use rustls for TLS.") (uri (crate-uri "trybuild" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ab7ahdx563n6kbm14pm3qnxq4fp06pz42nh5ii4acvlzycnwdh4")))) + (base32 "17xpybcdx76dm54dk7jvr5aickc4ia66qf57bazg7myx8pf6yzcq")))) (arguments `(#:cargo-inputs (("rust-toml" ,rust-toml-0.5) @@ -73811,6 +78538,51 @@ and run them to verify the results, taking inspiration from @code{trybuild} and ("rust-snapbox" ,rust-snapbox-0.4) ("rust-toml-edit" ,rust-toml-edit-0.14)))))) +(define-public rust-tstr-0.2 + (package + (name "rust-tstr") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tstr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zidpsrn9b4i55cz832myxi2gw3qq6imbd7kxq7yq389f54jd8yc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=macros::ts" + "--skip=macros::alias") + #:cargo-inputs + (("rust-tstr-proc-macros" ,rust-tstr-proc-macros-0.2)))) + (home-page "https://github.com/rodrimati1992/tstr_crates/") + (synopsis "Type-level strings") + (description "Type-level strings") + (license license:zlib))) + +(define-public rust-tstr-proc-macros-0.2 + (package + (name "rust-tstr-proc-macros") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tstr-proc-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yklq0k0s3c4y0k5f0qm13lw7nvz5z97x3yhmyw1if0cdc3250g7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/tstr_crates/") + (synopsis "Implementation detail of tstr") + (description "Implementation detail of tstr.") + (license license:zlib))) + (define-public rust-ttf-parser-0.19 (package (name "rust-ttf-parser") @@ -74836,17 +79608,39 @@ Unicode and Internationalization Crates (UNIC) project.") membership for characters in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-id-0.3 + (package + (name "rust-unicode-id") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-id" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gq8mvi7cf4a13r9djb6xcf16jm58kic30kv36856s99cgwdxdmi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)))) + (home-page "https://github.com/Boshen/unicode-id") + (synopsis + "Determine whether characters have the ID_Start or ID_Continue properties") + (description + "Determine whether characters have the ID_Start or ID_Continue properties +according to Unicode Standard Annex #31.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-ident-1 (package (name "rust-unicode-ident") - (version "1.0.8") + (version "1.0.12") (source (origin (method url-fetch) (uri (crate-uri "unicode-ident" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1x4v4v95fv9gn5zbpm23sa9awjvmclap1wh1lmikmw9rna3llip5")))) + "0jzf1znfpb2gx8nr8mvmyqs1crnv79l57nxnbiszc7xf7ynbjm1k")))) (build-system cargo-build-system) ;; Most development inputs are competing implementations ;; for benchmarks. @@ -74915,15 +79709,14 @@ described in Unicode Standard Annex #15.") (define-public rust-unicode-segmentation-1 (package (name "rust-unicode-segmentation") - (version "1.8.0") + (version "1.10.1") (source (origin (method url-fetch) (uri (crate-uri "unicode-segmentation" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nrqfgxkh00wb5dhl0874z20789i2yjimp6ndgh4ay4yjjd895c8")))) + (base32 "0dky2hm5k51xy11hc3nk85p533rvghd462b6i0c532b7hl4j9mhx")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -74939,7 +79732,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") - (version "0.1.10") + (version "0.1.11") (source (origin (method url-fetch) @@ -74947,7 +79740,7 @@ boundaries according to Unicode Standard Annex #29 rules.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12vc3wv0qwg8rzcgb9bhaf5119dlmd6lmkhbfy1zfls6n7jx3vf0")))) + "11ds4ydhg8g7l06rlmh712q41qsrd0j0h00n1jm74kww3kqk65z5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -75168,6 +79961,21 @@ clear display in the output.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unreachable-0.1 + (package + (inherit rust-unreachable-1) + (name "rust-unreachable") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "unreachable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14gzpm329nrfgjvxf6zh77sp7plxakcnsq8p8xk9474fn7fyaahz")))) + (arguments + `(#:cargo-inputs (("rust-void" ,rust-void-1)))))) + (define-public rust-unsafe-any-0.4 (package (name "rust-unsafe-any") @@ -75344,7 +80152,7 @@ comparable to calling @code{unwrap_err()}.") (define-public rust-url-2 (package (name "rust-url") - (version "2.4.0") + (version "2.4.1") (source (origin (method url-fetch) @@ -75353,7 +80161,7 @@ comparable to calling @code{unwrap_err()}.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jw89ack5ldvajpzsvhq9sy12y2xqa2x0cbin62hl80r3s1zggsh")))) + "1rbsx1nvz5ardf0x815639z1bxbbgjjjhj0mmnfaqzr5327m6fql")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -75363,8 +80171,7 @@ comparable to calling @code{unwrap_err()}.") ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-debugger-test" ,rust-debugger-test-0.1) - ("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1) + ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/servo/rust-url") (synopsis "URL library for Rust, based on the WHATWG URL Standard") @@ -75547,15 +80354,17 @@ Unix users and groups.") (define-public rust-utf8-width-0.1 (package (name "rust-utf8-width") - (version "0.1.4") + (version "0.1.6") (source (origin (method url-fetch) (uri (crate-uri "utf8-width" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ylf5mvzck81iszchxyqmhwimkcdqv7jhazvd454g911cchsqwch")))) + (base32 "18fbr6bbkfprs0hb2pdz3ckfb6i1gm0j0x7ka3fhvbyd5m2ck42i")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) (home-page "https://magiclen.org/utf8-width") (synopsis "Determine the width of a UTF-8 character") (description @@ -75923,7 +80732,16 @@ write operations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc")))) + "09i4nf5y8lig6xgj3f7fyrvzd3nlaw4znrihw8psidvv5yk4xkdc")) + (snippet + #~(begin (use-modules (guix build utils)) + (for-each delete-file-recursively + '("test-data/normalized/installed/arm64-ios" + "test-data/normalized/installed/x64-osx" + "test-data/normalized/installed/x64-windows" + "test-data/normalized/installed/x64-windows-static" + "test-data/normalized/installed/x86-windows" + "test-data/no-status/installed/x64-windows")))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Tests want mysql, harfbuzz, graphite2. @@ -76003,6 +80821,36 @@ write operations.") has at least 1 element.") (license (list license:expat license:asl2.0)))) +(define-public rust-vek-0.15 + (package + (name "rust-vek") + (version "0.15.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "vek" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05xxxv4mmm587l4bj0hcclpmk3yz35ggmnhcigy4gg7rc8k8i1c0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-az" ,rust-az-1) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-image" ,rust-image-0.23) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/yoanlcq/vek") + (synopsis "Generic 2D-3D math swiss army knife for game engines") + (description + "This package provides a generic 2D-3D math swiss army knife for game +engines, with SIMD support and focus on convenience.") + (license (list license:expat license:asl2.0)))) + (define-public rust-vergen-3 (package (name "rust-vergen") @@ -76187,6 +81035,25 @@ updated when the crate version changes.") ("rust-toml" ,rust-toml-0.4) ("rust-url" ,rust-url-1)))))) +(define-public rust-vlq-0.5 + (package + (name "rust-vlq") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "vlq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zygijgl47gasi0zx34ak1jq2n4qmk0cx2zpn13shba157npxpb5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.5)))) + (home-page "https://github.com/tromey/vlq") + (synopsis "Sourcemap-style VLQ encoder and decoder") + (description "Sourcemap-style VLQ encoder and decoder.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-void-1 (package (name "rust-void") @@ -76633,7 +81500,7 @@ result.") (define-public rust-wasm-bindgen-0.2 (package (name "rust-wasm-bindgen") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -76641,12 +81508,12 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fx5gh0b4n6znfa3blz92wn1k4bbiysyq9m95s7rn3gk46ydry1i")) + (base32 "0hm3k42gcnrps2jh339h186scx1radqy1w7v1zwb333dncmaf1kp")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76672,7 +81539,7 @@ result.") (define-public rust-wasm-bindgen-backend-0.2 (package (name "rust-wasm-bindgen-backend") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -76680,7 +81547,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ffc0wb293ha56i66f830x7f8aa2xql69a21lrasy1ncbgyr1klm")))) + (base32 "1gcsh3bjxhw3cirmin45107pcsnn0ymhkxg6bxg65s8hqp9vdwjy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76700,7 +81567,7 @@ result.") (define-public rust-wasm-bindgen-futures-0.4 (package (name "rust-wasm-bindgen-futures") - (version "0.4.34") + (version "0.4.37") (source (origin (method url-fetch) @@ -76708,7 +81575,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0m0lnnnhs9ni4dn9vz74prsjz8bdcf8dvnznd5ljch5s279f06gj")))) + (base32 "00zagjk39g4jjjnvfh35s7w6s0p6sy88i5c7y421z7vga4hvqbf0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76757,7 +81624,7 @@ result.") (define-public rust-wasm-bindgen-macro-0.2 (package (name "rust-wasm-bindgen-macro") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -76765,7 +81632,7 @@ result.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1idlq28awqhq8rclb22rn5xix82w9a4rgy11vkapzhzd1dygf8ac")))) + (base32 "07cg0b6zkcxa1yg1n10h62paid59s9zr8yss214bv8w2b7jrbr6y")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; 'Async blocks are unstable' @@ -76788,7 +81655,7 @@ dependency.") (define-public rust-wasm-bindgen-macro-support-0.2 (package (name "rust-wasm-bindgen-macro-support") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) @@ -76796,7 +81663,7 @@ dependency.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xm56lpi0rihh8ny7x085dgs3jdm47spgqflb98wghyadwq83zra")))) + (base32 "0yqc46pr6mlgb9bsnfdnd50qvsqnrz8g5243fnaz0rb7lhc1ns2l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76815,14 +81682,14 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-shared-0.2 (package (name "rust-wasm-bindgen-shared") - (version "0.2.84") + (version "0.2.87") (source (origin (method url-fetch) (uri (crate-uri "wasm-bindgen-shared" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0pcvk1c97r1pprzfaxxn359r0wqg5bm33ylbwgjh8f4cwbvzwih0")))) + (base32 "18bmjwvfyhvlq49nzw6mgiyx4ys350vps4cmx5gvzckh91dd0sna")))) (build-system cargo-build-system) (home-page "https://rustwasm.github.io/wasm-bindgen/") (synopsis "Shared support between wasm-bindgen and wasm-bindgen cli") @@ -76834,7 +81701,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-0.3 (package (name "rust-wasm-bindgen-test") - (version "0.3.34") + (version "0.3.37") (source (origin (method url-fetch) @@ -76842,16 +81709,17 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02x3agz7jn517fbbvnhncajvanr0w055jhinzf49w87vz706zcvd")) + (base32 "0w86d3ykwxfh495c4a98pj3b39wwgpfffy4ys2k86kx9gqm30vkf")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "Cargo.toml" - (("=0\\.3\\.34") "^0.3.34")))))) + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-gg-alloc" ,rust-gg-alloc-1) ("rust-js-sys" ,rust-js-sys-0.3) ("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) @@ -76939,7 +81807,7 @@ attribute that is not in the shared backend crate.") (define-public rust-wasm-bindgen-test-macro-0.3 (package (name "rust-wasm-bindgen-test-macro") - (version "0.3.34") + (version "0.3.37") (source (origin (method url-fetch) @@ -76947,12 +81815,15 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1s9vnkrmmq5fiv0j0ifvbs7q5ffgxwbg1r0zcryp3cdkwsd7ad07")))) + (base32 "0xd5245xixdhj33nf6xbzg85vrmjv5vhw0hf2gnk0sc3ikfr7fgc")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; could not find `wasm_bindgen_test` + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1)))) + ("rust-quote" ,rust-quote-1)) + #:cargo-development-inputs + (("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/rustwasm/wasm-bindgen") (synopsis "Internal testing macro for wasm-bindgen") (description @@ -77142,7 +82013,7 @@ applications.") (define-public rust-web-sys-0.3 (package (name "rust-web-sys") - (version "0.3.61") + (version "0.3.64") (source (origin (method url-fetch) @@ -77150,7 +82021,7 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15qbbdbhyz02srvm01p0cvlh0pvmbbin9hislp0yx8rvnbs9jfz3")))) + (base32 "16r4fww3l99kxhb66hka3kxkmhhgzhnqkzdf0ay6l2i2ikpwp1cv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -77276,7 +82147,8 @@ Verification.") (base32 "10nhyxlqsa4caxlxrijm5h79rdg6ld8hqy78ldjnnfhaj3biqzjg")))) (arguments - `(#:tests? #f ; tests fail to build "missing file tests/ed25519/ee.der" + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:tests? #f ; tests fail to build "missing file tests/ed25519/ee.der" #:cargo-inputs (("rust-ring" ,rust-ring-0.14) ("rust-untrusted" ,rust-untrusted-0.6)) @@ -77308,7 +82180,8 @@ Verification.") (base32 "0zx1v8afa4ig97dyqfrnlj5i7pib6dnfw88qn2iiqhfq2rrrdmqp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.13 + #:cargo-inputs (("rust-ring" ,rust-ring-0.13) ("rust-untrusted" ,rust-untrusted-0.6)) #:cargo-development-inputs @@ -77478,7 +82351,8 @@ with webpki.") (base32 "03ny02mwqdgd2ff23k03kbwr2rrcaymxhp7jcjjikfh340hs83y1")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; TODO: Fix building rust-ring-0.14 + #:cargo-inputs (("rust-untrusted" ,rust-untrusted-0.6) ("rust-webpki" ,rust-webpki-0.19)))))) @@ -79303,6 +84177,64 @@ non-cryptographic hashing algorithm and random number generator.") "This package provides a collection of utility functions.") (license license:expat))) +(define-public rust-x11rb-0.12 + (package + (name "rust-x11rb") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11rb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "02h492k920mb1733cdmly138zfiwkspil6ssqcvi7inyshk1nr5i")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Needs a newer version of rust-polling-2. + #:cargo-inputs + (("rust-as-raw-xcb-connection" ,rust-as-raw-xcb-connection-1) + ("rust-gethostname" ,rust-gethostname-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-nix" ,rust-nix-0.26) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winapi-wsapoll" ,rust-winapi-wsapoll-0.1) + ("rust-x11rb-protocol" ,rust-x11rb-protocol-0.12)) + #:cargo-development-inputs + (("rust-polling" ,rust-polling-2) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://github.com/psychon/x11rb") + (synopsis "Rust bindings to X11") + (description "This package provides Rust bindings to X11.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-x11rb-protocol-0.12 + (package + (name "rust-x11rb-protocol") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "x11rb-protocol" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g24qdvq0mbyl2npz7zqy5v6hpdxq2qakkpnp3x02rzvl3ww7ml2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nix" ,rust-nix-0.26) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4)))) + (home-page "https://github.com/psychon/x11rb") + (synopsis "Rust bindings to X11") + (description "This package provides Rust bindings to X11.") + (license (list license:expat license:asl2.0)))) + (define-public rust-x25519-dalek-1 (package (name "rust-x25519-dalek") @@ -79593,19 +84525,18 @@ extended attributes.") (define-public rust-xdg-2 (package (name "rust-xdg") - (version "2.5.0") + (version "2.5.2") (source (origin (method url-fetch) (uri (crate-uri "xdg" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vkzfsy3n85qnn1076h9111jg3h7k9r99jqi8nnrq3kmbbdrg1b8")))) + (base32 "0im5nzmywxjgm2pmb48k0cc9hkalarz57f1d9d0x4lvb6cj76fr1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-home" ,rust-home-0.5) - ("rust-serde" ,rust-serde-1)) + (("rust-serde" ,rust-serde-1)) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check @@ -80021,16 +84952,17 @@ Read/Write streams as well as low-level in-memory encoding and decoding.") (define-public rust-yansi-0.5 (package (name "rust-yansi") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (crate-uri "yansi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wdx8syhc61lphmgw5cw1vq73isi4szjqriz1k07z19r3r59ziwz")))) + (base32 "1v4qljgzh73knr7291cgwrf56zrvhmpn837n5n5pypzq1kciq109")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.6)))) (home-page "https://github.com/SergioBenitez/yansi") (synopsis "Simple ANSI terminal color painting library") (description @@ -80080,17 +85012,17 @@ library.") #:cargo-development-inputs (("rust-num-traits" ,rust-num-traits-0.2)))))) -(define-public rust-yeslogic-fontconfig-sys-3 +(define-public rust-yeslogic-fontconfig-sys-4 (package (name "rust-yeslogic-fontconfig-sys") - (version "3.2.0") - (source (origin - (method url-fetch) - (uri (crate-uri "yeslogic-fontconfig-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "11n3126s717rjqxhf5js3hc0qq8qv7jbicbiyszyp5yk6s8ddfzj")))) + (version "4.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "yeslogic-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wsgzlvgknvkjw3m02nvp3x47ccmvfri13mwqzssxgmw5g9pyrgc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -80109,6 +85041,25 @@ library.") for locating fonts.") (license license:expat))) +(define-public rust-yeslogic-fontconfig-sys-3 + (package + (inherit rust-yeslogic-fontconfig-sys-4) + (name "rust-yeslogic-fontconfig-sys") + (version "3.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "yeslogic-fontconfig-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11n3126s717rjqxhf5js3hc0qq8qv7jbicbiyszyp5yk6s8ddfzj")))) + (arguments + `(#:cargo-inputs + (("rust-const-cstr" ,rust-const-cstr-0.3) + ("rust-dlib" ,rust-dlib-0.5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))))) + (define-public rust-yeslogic-fontconfig-sys-2 (package (inherit rust-yeslogic-fontconfig-sys-3) @@ -80214,6 +85165,42 @@ for locating fonts.") (description "This package provides an API for D-Bus communication.") (license license:expat))) +(define-public rust-zbus-1 + (package + (inherit rust-zbus-3) + (name "rust-zbus") + (version "1.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "zbus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jgwydwjgk16dyrzdbc1k0dnqj9kv9p3fwcv92a7l9np3hlv5glw")))) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-async-io" ,rust-async-io-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-derivative" ,rust-derivative-2) + ("rust-enumflags2" ,rust-enumflags2-0.6) + ("rust-fastrand" ,rust-fastrand-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-nb-connect" ,rust-nb-connect-1) + ("rust-nix" ,rust-nix-0.22) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-polling" ,rust-polling-2) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-xml-rs" ,rust-serde-xml-rs-0.4) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-zbus-macros" ,rust-zbus-macros-1) + ("rust-zvariant" ,rust-zvariant-2)) + #:cargo-development-inputs + (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-ntest" ,rust-ntest-0.7) + ("rust-zbus-polkit" ,rust-zbus-polkit-1)))))) + (define-public rust-zbus-macros-3 (package (name "rust-zbus-macros") @@ -80246,6 +85233,32 @@ for locating fonts.") (description "This package provides proc-macros for zbus.") (license license:expat))) +(define-public rust-zbus-macros-1 + (package + (inherit rust-zbus-macros-3) + (name "rust-zbus-macros") + (version "1.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "zbus-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19p0pdwdf52zkaknav0pj5qvgcf52xk8a4p3a4ymxybwhjkmjfgs")))) + (arguments + `(#:tests? #f ; Tests need a running dbus instance. + #:cargo-inputs + (("rust-proc-macro-crate" ,rust-proc-macro-crate-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-zbus" ,rust-zbus-1) + ("rust-zvariant" ,rust-zvariant-2)))))) + (define-public rust-zbus-names-2 (package (name "rust-zbus-names") @@ -80268,6 +85281,30 @@ for locating fonts.") (description "This package provides a collection of D-Bus bus names types.") (license license:expat))) +(define-public rust-zbus-polkit-1 + (package + (name "rust-zbus-polkit") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zbus-polkit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yzbs8sga4s3h97vb6n5nvdvlnmhws2vj46bn44hbncfm25f51mc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-enumflags2" ,rust-enumflags2-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-zbus" ,rust-zbus-1) + ("rust-zvariant" ,rust-zvariant-2)))) + (home-page "https://github.com/dbus2/zbus/") + (synopsis "PolicyKit binding") + (description "@code{PolicyKit} binding.") + (license license:expat))) + (define-public rust-zerocopy-0.6 (package (name "rust-zerocopy") @@ -80538,7 +85575,7 @@ implementation that works everywhere, even WASM!") (package (inherit rust-zstd-0.11) (name "rust-zstd") - (version "0.9.3+zstd.1.5.2") + (version "0.9.2+zstd.1.5.1") (source (origin (method url-fetch) @@ -80547,7 +85584,7 @@ implementation that works everywhere, even WASM!") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "15dsisk3g9ncbxzb6miwav35p2v98az6clh5qdab5jxn05l9qzrp")) + "0m5aik2jy2w1g68i4isa0c3gq9a7avq9abgjfjbc6f60yqdym413")) (modules '((guix build utils))) (snippet '(begin (substitute* "Cargo.toml" @@ -80723,6 +85760,35 @@ in Pure Rust.") (description "D-Bus & GVariant encoding & decoding") (license license:expat))) +(define-public rust-zvariant-2 + (package + (inherit rust-zvariant-3) + (name "rust-zvariant") + (version "2.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zvariant" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0995d59vl8409mk3qrbshqrz5d76dq52szg0x2vqji07y9app356")))) + (arguments + `(#:tests? #f ; unresolved import `glib` + #:cargo-inputs + (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-enumflags2" ,rust-enumflags2-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-zvariant-derive" ,rust-zvariant-derive-2)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-repr" ,rust-serde-repr-0.1)))))) + (define-public rust-zvariant-derive-3 (package (name "rust-zvariant-derive") @@ -80753,6 +85819,31 @@ in Pure Rust.") (description "D-Bus & GVariant encoding & decoding") (license license:expat))) +(define-public rust-zvariant-derive-2 + (package + (inherit rust-zvariant-derive-3) + (name "rust-zvariant-derive") + (version "2.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "zvariant-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1s9xk9c4p9vl0j2vr1abqc12mgv500sjc3fnh8ij3d1yb4i5xjp4")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-enumflags2" ,rust-enumflags2-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-zvariant" ,rust-zvariant-2)))))) + (define-public rust-zvariant-utils-1 (package (name "rust-zvariant-utils") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index cefdfbea89..50be431195 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> -;;; Copyright © 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2020, 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2020 Nicolò Balzarotti <nicolo@nixo.xyz> @@ -26,6 +26,7 @@ ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net> +;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -258,22 +259,20 @@ OpenBSD tool of the same name.") (define-public rust-minisign (package (name "rust-minisign") - (version "0.5.20") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "minisign" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0xmcvh2snravghaar8igc6b9r3s1snnmf9qam9l3zyhm4987767y")))) + (base32 "1lmp83bxdg53c4n35fbwr3rkh6178y75fwsn25hf1kn62f2gbdnj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-getrandom" ,rust-getrandom-0.1) - ("rust-rpassword" ,rust-rpassword-4) - ("rust-scrypt" ,rust-scrypt-0.3)))) + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-rpassword" ,rust-rpassword-7) + ("rust-scrypt" ,rust-scrypt-0.11)))) (home-page "https://github.com/jedisct1/rust-minisign") (synopsis "Crate to sign files and verify signatures") (description @@ -744,7 +743,7 @@ data on your platform, so the seed itself will be as random as possible. (define-public crypto++ (package (name "crypto++") - (version "8.6.0") + (version "8.8.0") (source (origin (method git-fetch) (uri @@ -756,62 +755,35 @@ data on your platform, so the seed itself will be as random as possible. (file-name (git-file-name name version)) (sha256 (base32 - "1vm821wpx59ccz6gr4xplqpxj3f1qq3jijyybj2g4npqmmldhx3b")))) + "11gfnsqbb531zwgzpm0x9hsgshzcj1j049vg0zqsaqf8lvky03l6")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - ;; Override "/sbin/ldconfig" with simply "echo" since - ;; we don't need ldconfig(8). - "LDCONF=echo") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-native-optimisation - ;; This package installs more than just headers. Ensure that the - ;; cryptest.exe binary & static library aren't CPU model specific. - (lambda _ - (substitute* "GNUmakefile" - ((" -march=native") "")) - #t)) - (delete 'configure) - (replace 'build - ;; By default, only the static library is built. - (lambda* (#:key (make-flags '()) #:allow-other-keys) - (apply invoke "make" "shared" - "-j" (number->string (parallel-job-count)) - make-flags))) - (add-after 'install 'install-shared-library-links - ;; By default, only .so and .so.x.y.z are installed. - ;; Create all the ‘intermediates’ expected by dependent packages. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (prefix "libcryptopp.so.") - (target (string-append prefix ,version))) - (with-directory-excursion lib - (symlink target - (string-append prefix ,(version-major+minor version))) - (symlink target - (string-append prefix ,(version-major version))) - #t)))) - (add-after 'install 'install-pkg-config - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (pkg-dir (string-append out "/lib/pkgconfig"))) - (mkdir-p pkg-dir) - (with-output-to-file (string-append pkg-dir "/libcrypto++.pc") - (lambda _ - (display - (string-append - "prefix=" out "\n" - "libdir=" out "/lib\n" - "includedir=" out "/include\n\n" - "Name: libcrypto++-" ,version "\n" - "Description: Class library of cryptographic schemes\n" - "Version: " ,version "\n" - "Libs: -L${libdir} -lcryptopp\n" - "Cflags: -I${includedir}\n")) - #t)))))))) + (list #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append "CC=" #$(cc-for-target)) + (string-append "CXX=" #$(cxx-for-target)) + (string-append "AR=" #$(ar-for-target)) + ;; Override "/sbin/ldconfig" with simply "echo" since + ;; we don't need ldconfig(8). + "LDCONF=echo") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + ;; By default, only the static library is built. + (lambda* (#:key make-flags parallel-build? + #:allow-other-keys) + (let* ((job-count (if parallel-build? + (number->string (parallel-job-count)) + 1)) + (jobs (string-append "-j" job-count)) + (target #$(if (target-mingw?) + "static" + "shared"))) + (apply invoke "make" target jobs make-flags) + (apply invoke "make" "libcryptopp.pc" jobs + make-flags))))))) + (properties '((tunable? . #t))) (native-inputs (list unzip)) (home-page "https://cryptopp.com/") @@ -1582,36 +1554,37 @@ SHA-3, and BLAKE2.") (define-public rust-blake3-1 (package (name "rust-blake3") - (version "1.0.0") - ;; The crate does not include the reference_impl directory. + (version "1.5.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/BLAKE3-team/BLAKE3") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (crate-uri "blake3" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "09xi7rjyi5hgxyfpias485x5argwqygvfl9sggiw221qjdfxpbdn")))) + (base32 "11ysh12zcqq6xkjxh5cbrmnwzalprm3z552i5ff7wm5za9hz0c82")))) (build-system cargo-build-system) (arguments (list + #:tests? #f ; use of undeclared crate or module `reference_impl` #:cargo-inputs `(("rust-arrayref" ,rust-arrayref-0.3) ("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-constant-time-eq" ,rust-constant-time-eq-0.1) - ("rust-crypto-mac" ,rust-crypto-mac-0.11) - ("rust-digest" ,rust-digest-0.9) - ("rust-rayon" ,rust-rayon-1)) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.3) + ("rust-digest" ,rust-digest-0.10) + ("rust-memmap2" ,rust-memmap2-0.7) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs - `(("rust-cc" ,rust-cc-1) - ("rust-hex" ,rust-hex-0.4) - ("rust-page-size" ,rust-page-size-0.4) + `(("rust-hex" ,rust-hex-0.4) + ("rust-hmac" ,rust-hmac-0.12) + ("rust-page-size" ,rust-page-size-0.6) ("rust-rand" ,rust-rand-0.8) - ("rust-rand-chacha" ,rust-rand-chacha-0.3)))) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/BLAKE3-team/BLAKE3") (synopsis "BLAKE3 hash function Rust implementation") (description "This crate provides the official Rust implementation of the @@ -1624,16 +1597,14 @@ SHA-3, and BLAKE2.") (define-public b3sum (package (name "b3sum") - ;; Version 1 requires Rust >= 1.51. - ;; <https://github.com/BLAKE3-team/BLAKE3/releases/tag/1.0.0> - (version "0.3.8") + (version "1.5.0") (source (origin (method url-fetch) (uri (crate-uri "b3sum" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0h3fz16q5lk6mg7r8kjkjrq5hd4injngn5m7pswjbf2pyzjmg4b4")))) + (base32 "05k0vn7gpbvjr925vjc5yzvhiyrmkw9pqmch5fr4ir7s8wiaq2fm")))) (build-system cargo-build-system) (arguments `(;; Install the source so that Cargo.toml is installed, because that is @@ -1653,10 +1624,10 @@ SHA-3, and BLAKE2.") (install-file "README.md" doc))))) #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-blake3" ,rust-blake3-0.3) - ("rust-clap" ,rust-clap-2) + ("rust-blake3" ,rust-blake3-1) + ("rust-clap" ,rust-clap-4) ("rust-hex" ,rust-hex-0.4) - ("rust-memmap" ,rust-memmap-0.7) + ("rust-memmap2" ,rust-memmap2-0.7) ("rust-rayon" ,rust-rayon-1) ("rust-wild" ,rust-wild-2)) #:cargo-development-inputs diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index a2bf9b70bb..d5eacd2442 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -207,8 +208,11 @@ driver is known to work with these printers: (find-files (string-append #$output "/lib/cups/filter")))))))) (native-inputs - (list `(,glib "bin") ;for gdbus-codegen - pkg-config)) + (append (if (%current-target-system) + (list cups-minimal) + '()) + (list `(,glib "bin") ; for gdbus-codegen + pkg-config))) (inputs (list avahi bash-minimal @@ -321,7 +325,10 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.") ;; to a missing font. Substitute the last observed count. (("(\\$count != )33" _ prefix) (string-append prefix "39")))))))) - (native-inputs (list config pkg-config)) + (native-inputs (cons* config pkg-config + (if (%current-target-system) + (list this-package) + '()))) (inputs (list zlib gnutls)) (home-page "https://openprinting.github.io/cups") (synopsis "The Common Unix Printing System") @@ -342,7 +349,7 @@ applications''. These must be installed separately.") (define cups-minimal/fixed (package (inherit cups-minimal) - (version "2.4.6") + (version "2.4.7") (source (origin (method git-fetch) @@ -351,7 +358,7 @@ applications''. These must be installed separately.") (commit (string-append "v" version)))) (file-name (git-file-name "cups" version)) (sha256 - (base32 "0z70rhfd96qmdx82gdhh2nqjiia0lnvfdwpngjkag2sidw4cm3c1")))))) + (base32 "0cj3gs7ki9v0drj19l326s8f1kxrpq7jkzrdfdk7ykrlk7sj645f")))))) (define-public cups (package/inherit cups-minimal @@ -520,14 +527,15 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.23.8") + (version "3.23.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "0ihv9ddjrjx5bdf8pwc2fvljkpfzq4qi9r2awm8dgky053v0bk7p")) + "1vb9irqsm3d4c2qdr4h6ia940x65bb99h4x31mgxn7dkvv42lv57")) + (patches (search-patches "hplip-usb-timeout.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 59bebe29db..adc39b1157 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,15 +65,14 @@ (define-public curl (package (name "curl") - (version "7.85.0") - (replacement curl/fixed) + (version "8.4.0") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1rjbn0h5rddclhvxb8p5gddxszcrpbf5cw1whx6wnj4s9dnlmdc8")) + "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -118,15 +118,28 @@ (rename-file (string-append #$output "/share/man/man3") (string-append #$output:doc "/share/man/man3")))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? make-flags #:allow-other-keys) (substitute* "tests/runtests.pl" (("/bin/sh") (which "sh"))) - (when tests? - ;; The top-level "make check" does "make -C tests quiet-test", which - ;; is too quiet. Use the "test" target instead, which is more - ;; verbose. - (invoke "make" "-C" "tests" "test")))) + (let* ((job-count (string-append + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (arguments `("-C" "tests" "test" + ,@make-flags + ,(if #$(or (system-hurd?) + (target-arm32?) + (target-aarch64?)) + ;; protocol FAIL + (string-append "TFLAGS=\"~1474 " + job-count "\"") + (string-append "TFLAGS=" job-count))))) + ;; The top-level "make check" does "make -C tests quiet-test", which + ;; is too quiet. Use the "test" target instead, which is more + ;; verbose. + (apply invoke "make" arguments))))) #$@(if (system-hurd?) #~((add-after 'unpack 'skip-tests (lambda _ @@ -137,6 +150,7 @@ (display "533\n" port) (display "537\n" port) (display "546\n" port) + (display "564\n" port) (display "575\n" port) (display "1021\n" port) (display "1501\n" port) @@ -155,20 +169,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define curl/fixed - (let ((%version "8.3.0")) - (package - (inherit curl) - (version "8.3.0a") ; add lowercase 'a' for grafting - (source (origin - (method url-fetch) - (uri (string-append "https://curl.se/download/curl-" - %version ".tar.xz")) - (sha256 - (base32 - "0qza6yf20y2l4aaxkn8dfw8p3fls1mxljvdb0m8z1i6ncxvn4v9p")) - (patches (search-patches "curl-use-ssl-cert-env.patch"))))))) - (define-public curl-ssh (package/inherit curl (arguments @@ -386,7 +386,7 @@ asynchronously via cURL in C++.") (define-public curlie (package (name "curlie") - (version "1.6.9") + (version "1.7.2") (source (origin (method git-fetch) @@ -396,7 +396,7 @@ asynchronously via cURL in C++.") (file-name (git-file-name name version)) (sha256 (base32 - "1b94wfliivfq06i5sf664nhmp3v1k0lpz33cv9lyk6s59awb2hnw")))) + "04gwd9sqpykappnzyw9icgn5253cx1vwpr2h1fg7sgkyq3fjmsv0")))) (build-system go-build-system) (arguments `(#:import-path "github.com/rs/curlie")) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3269d4a2aa..4fa8670cad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> ;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne ;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com> +;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -106,6 +107,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -2968,14 +2970,16 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (define-public python-pypika-tortoise (package (name "python-pypika-tortoise") - (version "0.1.5") + (version "0.1.6") (source (origin (method url-fetch) (uri (pypi-uri "pypika-tortoise" version)) (sha256 - (base32 "0j20574s2yrq8d7fav3816vj1nfpihkm2mj8jzh2ank4zixp8brf")))) - (build-system python-build-system) + (base32 "0dmzpsnlqjjz0vm0r9xjk69xfsm235bpnk3jccr8ww4s8y7qc0nq")))) + (build-system pyproject-build-system) + (native-inputs + (list poetry)) (home-page "https://github.com/tortoise/pypika-tortoise") (synopsis "Pypika fork for tortoise-orm") (description "Pypika-tortoise is a fork of pypika which has been @@ -3070,20 +3074,25 @@ of PyMySQL. @code{aiomysql} tries to preserve the same API as the (define-public python-tortoise-orm (package (name "python-tortoise-orm") - (version "0.19.1") + (version "0.20.0") (source (origin - (method url-fetch) - (uri (pypi-uri "tortoise-orm" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tortoise/tortoise-orm") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "17yk71dlx5ai98i6ivqgsplkwivdxackz9jfn6z42bpcdgbpiwhg")))) - (build-system python-build-system) + (base32 "19rgyvs2y9gn27x71y7djdz6rb6bszgvprv55q1hr4266wy6g999")))) + (build-system pyproject-build-system) ;; The test suite relies on asynctest, which is abandoned and doesn't ;; support Python >= 3.8. (arguments '(#:tests? #f)) + (native-inputs + (list poetry)) (propagated-inputs (list python-aiomysql - python-aiosqlite + python-aiosqlite-0.17 python-asyncmy python-asyncpg python-ciso8601 @@ -3101,6 +3110,48 @@ engraved in its design that you are working not with just tables, you work with relational data.") (license license:asl2.0))) +(define-public aerich + (package + (name "aerich") + (version "0.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tortoise/aerich") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pcy945bg890p12s7cyw0mg7hxwsxyy570j600sbf7kwj2d3lilg")))) + (build-system pyproject-build-system) + (native-inputs + (list poetry + python-bandit + python-cryptography + python-isort + python-pydantic + python-pytest + python-pytest-asyncio + python-pytest-mock + python-pytest-xdist)) + (propagated-inputs + (list python-asyncmy + python-asyncpg + python-click + python-ddlparse + python-dictdiffer + python-tomlkit + python-tortoise-orm)) + (home-page "https://github.com/tortoise/aerich") + (synopsis "Database migrations tool for Tortoise @acronym{ORM, Object Relational +Mapper}") + (description + "This package provides @code{aerich}, a Python database migrations tool +for Tortoise @acronym{ORM, Object Relational Mapper}. It can be used both +programmatically or as a standalone CLI application.") + (license license:asl2.0))) + (define-public sqlcipher (package (name "sqlcipher") @@ -3541,7 +3592,11 @@ You might also want to install the following optional dependencies: (uri (pypi-uri "alchemy-mock" version)) (sha256 (base32 - "0ylxygl3bcdapzz529n8wgk7vx9gjwb3ism564ypkpd7dbsw653r")))) + "0ylxygl3bcdapzz529n8wgk7vx9gjwb3ism564ypkpd7dbsw653r")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "alchemy_mock/comparison.py" + (("collections\\.Mapping") "collections.abc.Mapping")))))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -3773,6 +3828,33 @@ async versions of all the standard connection and cursor methods, and context managers for automatically closing connections.") (license license:expat))) +(define-public python-aiosqlite-0.17 + (package + (inherit python-aiosqlite) + (version "0.17.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/omnilib/aiosqlite") + (commit (string-append "v" version)))) + (file-name (git-file-name (package-name python-aiosqlite) + version)) + (sha256 + (base32 + "1agh7b9g7rgryvb8flph85i8m80ai1rinpljxzlsrs0s0y616qgg")))) + (build-system pyproject-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python" "-m" "unittest" "aiosqlite.tests") + (format #t "test suite not run~%"))))))) + (propagated-inputs + (list python-typing-extensions)) + (native-inputs + (list python-flit-core python-aiounittest)))) + (define-public python-databases (package (name "python-databases") @@ -4919,7 +5001,9 @@ The drivers officially supported by @code{libdbi} are: `(#:configure-flags ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs it. (list "-DCMAKE_CXX_STANDARD=17" - "-DSOCI_LIBDIR=lib") + "-DSOCI_LIBDIR=lib" + ;; This is for relocation when linking statically + "-DCMAKE_CXX_FLAGS=-fPIE") #:tests? #f)) ; may require running database management systems (synopsis "C++ Database Access Library") (description diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 0689ef4259..c6b2396537 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -444,28 +445,26 @@ better with a poor hash function.") (license license:expat))) (define-public zix - (let ((commit "a13ae5ad9dc70075740f11139f1db96cc79faa59") - (revision "0")) - (package - (name "zix") - (version (git-version "0.3.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/drobilla/zix.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1njyb8lz1d5qzf0k14pb3rq13xkxnddwbz090dj69138ymz1xgyl")))) - (build-system meson-build-system) - (arguments - (list #:configure-flags #~(list "-Ddocs=disabled"))) ;needs "sphinxygen" - (native-inputs (list pkg-config)) - (home-page "https://gitlab.com/drobilla/zix") - (synopsis "C library of portability wrappers and data structures") - (description - "Zix is a C library of portability wrappers and data structures. It + (package + (name "zix") + (version "0.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/drobilla/zix.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07pbq4bi64iv39swldfbcp7131b5n4hs64pgd417gqlwv8qvgjcw")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~(list "-Ddocs=disabled"))) ;needs "sphinxygen" + (native-inputs (list pkg-config)) + (home-page "https://gitlab.com/drobilla/zix") + (synopsis "C library of portability wrappers and data structures") + (description + "Zix is a C library of portability wrappers and data structures. It provides the following components: @table @code @item ZixAllocator A customizable allocator. @@ -480,4 +479,4 @@ provides the following components: zix/filesystem.h Functions for working with filesystems. @item zix/path.h Functions for working with filesystem paths lexically. @end table") - (license license:isc)))) + (license license:isc))) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index e0306b8a97..ae03442374 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -43,23 +43,17 @@ (define-public radicale (package (name "radicale") - (version "3.1.7") + (version "3.1.8") (source (origin - ;; There are no tests in the PyPI tarball. (method git-fetch) (uri (git-reference (url "https://github.com/Kozea/Radicale") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mv1w9qazbis9ir5shr1ybsfn4cxd3rmxa3ns6kbk23yramlzwhg")))) + (base32 "1qy2azn02bw772yhzgqvyf1pyl0ijj9ccvl1078w9icl261yljap")))) (build-system python-build-system) - (arguments - (list - ;; TODO: enable again when https://github.com/Kozea/Radicale/issues/1184 - ;; is fixed - #:tests? #f)) (native-inputs (list python-pytest python-pytest-cov diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 3c7d3304f0..927b97dd84 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -341,7 +341,7 @@ distributions such as Debian and Trisquel.") (define-public dpkg (package (name "dpkg") - (version "1.22.0") + (version "1.22.1") (source (origin (method git-fetch) @@ -350,7 +350,7 @@ distributions such as Debian and Trisquel.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1p7f2mgrn2iy0xfysxfq4pjbbhbhb2rp649bsik0x25jrck4if83")))) + (base32 "1s6dzcczmpkr9pla25idymfdjz10gck0kphpp0vqbp92vmfskipg")))) (build-system gnu-build-system) (arguments (list #:modules diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index 5e33f3d9b1..a1dcb05213 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -32,14 +32,14 @@ (define-public dezyne (package (name "dezyne") - (version "2.17.6") + (version "2.17.8") (source (origin (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) (sha256 - (base32 "0z019yyvf1ac1l95j29wlayi2gmwa9sjqg31a4r89za1bijmk19k")))) + (base32 "0m5cnymcyg7k1jhp4xjpvpay7ia72xdzyjnjg0spsr4p7fy7yql4")))) (inputs (list bash-minimal guile-3.0-latest guile-json-4 diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 1b8b77d7a4..1ac5aff719 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "250") + (version "252") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "12cdsgxlva1gcry16w9x44ji9asar1n8p9q6rv2jd1gr9fi6l0sz")))) + (base32 "1hnsnqpr0v9siqja1wxm64wv0vjacg6j9ph9n4xsiaarpndj1b4r")))) (build-system python-build-system) (arguments (list diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 7d01aa4821..763db515a4 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Disseminate Dissent <disseminatedissent@protonmail.com> ;;; Copyright © 2023 Timotej Lazar <timotej.lazar@araneo.si> +;;; Copyright © 2023 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -61,6 +62,7 @@ #:use-module (gnu packages file-systems) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -71,6 +73,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages hurd) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nss) @@ -102,6 +105,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix build-system scons) @@ -343,6 +347,61 @@ fdisk. fdisk is used for the creation and manipulation of disk partition tables, and it understands a variety of different formats.") (license license:gpl3+))) +(define-public findimagedupes + (package + (name "findimagedupes") + (version "2.20.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jhnc/findimagedupes") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zfxmc6c1z4hzsq3k85xxida1v291frq4wbmxv9cg4jmw0ddk5ic")))) + (build-system perl-build-system) + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + ;; There's no ‘make install’ target. + (lambda* (#:key outputs #:allow-other-keys) + (install-file "findimagedupes" + (string-append #$output "/bin")))) + (add-after 'unpack 'use-image-magick + ;; TODO: package perl-graphics-magick and switch this out + (lambda _ + (substitute* "findimagedupes" + (("Graphics::Magick") + "Image::Magick")))) + (add-after 'unpack 'set-inline-dir + (lambda _ + (substitute* "findimagedupes" + (("/usr/local") + #$output)))) + (add-after 'install 'inline-generation + (lambda _ + (mkdir-p (string-append #$output "/lib/findimagedupes")) + (invoke (string-append #$output "/bin/findimagedupes")))) + (add-after 'install 'wrap-findimagedupes + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append #$output + "/bin/findimagedupes") + `("PERL5LIB" ":" prefix + (,(getenv "PERL5LIB") ,(string-append #$output + "/lib/perl5/site_perl"))))))))) + (inputs (list bash-minimal perl-db-file perl-file-mimeinfo + perl-image-magick perl-inline-c)) + (home-page "https://github.com/jhnc/findimagedupes") + (synopsis "Find visually similar or duplicate images") + (description "findimagedupes compares a list of files for visual +similarity.") + (license license:gpl3+))) + (define-public gpart ;; The latest (0.3) release is from 2015 and is missing a crash fix. (let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9") @@ -1591,7 +1650,7 @@ gone and to help you to clean it up.") (define-public nwipe (package (name "nwipe") - (version "0.34") + (version "0.35") (source (origin (method git-fetch) @@ -1600,7 +1659,7 @@ gone and to help you to clean it up.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1frwjgz4mpzwr9sigr693crmxsjl08wcikh6ik7dm0x40l1kqqpd")))) + (base32 "1bj20y52qzz2ja56yf1pxqjg3lsda35c2k5hcj3lqm69jpsla2wq")))) (build-system gnu-build-system) (arguments (list #:phases @@ -1614,7 +1673,13 @@ gone and to help you to clean it up.") "sbin/hdparm" "sbin/smartctl"))))))))) (inputs - (list bash-minimal dmidecode hdparm ncurses parted smartmontools)) + (list bash-minimal + dmidecode + hdparm + libconfig + ncurses + parted + smartmontools)) (native-inputs (list autoconf automake libtool pkg-config)) (home-page "https://github.com/martijnvanbrummelen/nwipe") diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index d3711ee6eb..9ff77dd18f 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -35,6 +35,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system qt) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) @@ -142,6 +143,57 @@ create smooth, animated user interfaces.") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) +(define-public abstractdark-sddm-theme + (let ((commit "e817d4b27981080cd3b398fe928619ffa16c52e7") + (revision "0")) + (package + (name "abstractdark-sddm-theme") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3ximus/abstractdark-sddm-theme") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1si141hnp4lr43q36mbl3anlx0a81r8nqlahz3n3l7zmrxb56s2y")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("." "/share/sddm/themes/abstractdark")))) + (home-page "https://github.com/3ximus/abstractdark-sddm-theme") + (synopsis "Abstract Dark theme for SDDM") + (description + "This package provides a minimalistic dark theme for SDDM, black +background with abstract shapes. Inspired by solarized-sddm-theme.") + (license license:gpl3+)))) + +(define-public dexy-color-sddm-theme + (let ((commit "7929384dbb9305e6da53a8942bca3d75593fd99f") + (revision "0")) + (package + (name "dexy-color-sddm-theme") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/L4ki/Dexy-Plasma-Themes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dcp3pvs6x63740sz852yr19fjrdnh81dbrq7rssgm6ssi1rqjig")))) + (build-system copy-build-system) + (arguments + `(#:install-plan '(("Dexy-Color-SDDM" + "/share/sddm/themes/dexy-color-sddm")))) + (home-page "https://github.com/L4ki/Dexy-Plasma-Themes") + (synopsis "Dexy Color theme for SDDM") + (description + "This package provides a minimalistic and modern SDDM theme with blured +background.") + (license license:gpl3+)))) + (define-public guix-simplyblack-sddm-theme (package (name "guix-simplyblack-sddm-theme") diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 2b5b1235e4..61823714f6 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -57,7 +57,7 @@ (define-public d-tools (package (name "d-tools") - (version "2.100.0") + (version "2.105.3") (source (origin (method git-fetch) @@ -66,7 +66,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jbn0hyskv4ykcckw0iganpyrm0bq2lggswspw21r4hgnxkmjbyw")))) + (base32 "0hvz786k0pi8697x1vk9x5bx52jiy7pvi13wmfkx15ddvv0x5j33")))) (build-system gnu-build-system) (arguments (list #:phases @@ -149,21 +149,23 @@ to a minimal test case.") (define ldc-bootstrap (package (name "ldc") - (version "1.32.2") + (version "1.35.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/ldc-developers/ldc/releases" "/download/v" version "/ldc-" version "-src.tar.gz")) (sha256 - (base32 "15fdl7fy1ssjxpyb9g54ac4xzcirycly521whil142ijfkpam95z")))) + (base32 "186z4r1d8y4dfpv5cdqgz9al6w7qnfh9l4q9ws9w0xkcf29njabf")))) (build-system cmake-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) #:tests? #f ;skip in the bootstrap #:build-type "Release" #:configure-flags - (list "-GNinja") + (list "-GNinja" + ;; see .github/actions/2-build-bootstrap/action.yml + "-DBUILD_SHARED_LIBS=OFF") #:make-flags ;used as build targets (list "all") #:phases @@ -224,10 +226,9 @@ bootstrapping more recent compilers written in D.") '(list "all" ;; Also build the test runner binaries. "ldc2-unittest" "all-test-runners")) - ((#:configure-flags flags) - `(,@flags "-DBUILD_SHARED_LIBS=ON" - "-DLDC_LINK_MANUALLY=OFF" - "-DLDC_DYNAMIC_COMPILE=OFF")) + ((#:configure-flags _ #~'()) + `(list "-GNinja" + "-DBUILD_SHARED_LIBS=ON")) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-compiler-rt-library-discovery @@ -236,19 +237,12 @@ bootstrapping more recent compilers written in D.") (system ,(or (%current-target-system) (%current-system)))) (define (gnu-triplet->clang-arch system) - (letrec-syntax - ((matches (syntax-rules (=>) - ((_ (system-prefix => target) rest ...) - (if (string-prefix? system-prefix system) - target - (matches rest ...))) - ((_) - (error "Clang target for system is unknown" - system))))) - (matches ("x86_64" => "x86_64") - ("i686" => "i386") - ("armhf" => "armhf") - ("aarch64" => "aarch64")))) + (let ((system-prefix + (car (string-tokenize + system (char-set-complement (char-set #\-)))))) + (cond + ((equal? system-prefix "i686") "i386") + (#t system-prefix)))) ;; Coax LLVM into agreeing with Clang about system target ;; naming. (substitute* "driver/linker-gcc.cpp" @@ -264,7 +258,8 @@ bootstrapping more recent compilers written in D.") "/lib/linux\",\n")))))) (add-after 'unpack 'patch-paths-in-tests (lambda _ - (substitute* "tests/dmd/Makefile" + (substitute* '("tests/dmd/Makefile" + "runtime/druntime/test/profile/Makefile") (("/bin/bash") (which "bash"))) (substitute* "tests/linking/linker_switches.d" (("echo") (which "echo"))) @@ -299,6 +294,8 @@ bootstrapping more recent compilers written in D.") (substitute* "runtime/druntime/test/exceptions/Makefile" ((".*TESTS\\+=rt_trap_exceptions_drt_gdb.*") "")) + ;; Unsupported with glibc-2.35. + (delete-file "tests/dmd/compilable/stdcheaders.c") ;; Drop gdb_dflags from the test suite. (substitute* "tests/dmd/CMakeLists.txt" (("\\$\\{gdb_dflags\\}") "")) @@ -365,7 +362,7 @@ integration tests...\n") (define-public dub (package (name "dub") - (version "1.23.0") + (version "1.33.0") (source (origin (method git-fetch) @@ -374,7 +371,7 @@ integration tests...\n") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "06a4whsl1m600k096nwif83n7za3vr7pj1xwapncy5fcad1gmady")))) + (base32 "09p3rvsv11f8lgqgxgz2zj0szsw5lzrsc7y7471hswksc7nmmj70")))) (build-system gnu-build-system) (arguments (list #:tests? #f ; tests try to install packages diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index a8b13f5f34..9c824dddd2 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -844,7 +844,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.3.1") + (version "3.3.2") (source (origin (method git-fetch) @@ -853,7 +853,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l29809wcpx4q1d87539799c4mai0vvfkzkbmrba186mn47p3lsd")) + (base32 "17zdpk6wf0cf90dp4cls35si8ywjsqjrmgssw2gmb1y0zfyp19vq")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 08e85f7739..40668f69bb 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Thompson <davet@gnu.org> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> @@ -299,7 +299,10 @@ the required network abstractions for applications.") (inherit docker-libnetwork) (name "docker-libnetwork-cmd-proxy") (arguments - `(#:import-path "github.com/docker/libnetwork/cmd/proxy" + ;; The tests are unsupported on all architectures except x86_64-linux. + `(#:tests? ,(and (not (%current-target-system)) + (target-x86-64?)) + #:import-path "github.com/docker/libnetwork/cmd/proxy" #:unpack-path "github.com/docker/libnetwork" #:install-source? #f)) (native-inputs diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm deleted file mode 100644 index 4a8ff59ec9..0000000000 --- a/gnu/packages/dunst.scm +++ /dev/null @@ -1,89 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018 Alex Kost <alezost@gmail.com> -;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2019, 2023 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> -;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> -;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> -;;; -;;; 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 <http://www.gnu.org/licenses/>. - -(define-module (gnu packages dunst) - #:use-module (guix packages) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix utils) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages) - #:use-module (gnu packages base) - #:use-module (gnu packages freedesktop) - #:use-module (gnu packages glib) - #:use-module (gnu packages gnome) - #:use-module (gnu packages gtk) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages xorg)) - -(define-public dunst - (package - (name "dunst") - (version "1.9.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dunst-project/dunst") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nfxf2rahngxpy606yrizrz16d0pswl5sa9jfzpv7h19x6xy24vx")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no check target - #:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output) - (string-append "SYSCONFDIR=" %output "/etc") - ;; Otherwise it tries to install service file - ;; to "dbus" store directory. - (string-append "SERVICEDIR_DBUS=" %output - "/share/dbus-1/services") - "dunstify") - #:phases (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - (list pkg-config perl ; for pod2man - which)) - (inputs - (list dbus - (librsvg-for-system) ; for svg support - glib - cairo - pango - libnotify ; for dunstify - libx11 - libxscrnsaver - libxinerama - libxrandr - libxdg-basedir - wayland)) ; for wayland support - (home-page "https://dunst-project.org/") - (synopsis "Customizable and lightweight notification daemon") - (description - "Dunst is a highly configurable and minimalistic notification daemon. -It provides @code{org.freedesktop.Notifications} D-Bus service, so it is -started automatically on the first call via D-Bus.") - (license license:bsd-3))) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 61fc9945fa..2fd1d4a632 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gtk) #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 02a2dd1101..141a68bacd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -70,7 +70,7 @@ ;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr> ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2020, 2022 pinoaffe <pinoaffe@gmail.com> +;;; Copyright © 2020, 2022, 2023 pinoaffe <pinoaffe@gmail.com> ;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com> ;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl> @@ -95,7 +95,7 @@ ;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021, 2022 Stefan Reichör <stefan@xsteve.at> -;;; Copyright © 2021, 2022 Simon Tournier <zimon.toutoune@gmail.com> +;;; Copyright © 2021, 2022, 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org> ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 David Dashyan <mail@davie.li> @@ -135,6 +135,7 @@ ;;; Copyright © 2023 Sergiu Ivanov <sivanov@colimite.fr> ;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net> ;;; Copyright © 2023 Thanos Apollo <public@thanosapollo.com> +;;; Copyright © 2023 Ian Eure <ian@retrospec.tv> ;;; ;;; This file is part of GNU Guix. ;;; @@ -212,6 +213,7 @@ #:use-module (gnu packages lesstif) #:use-module (gnu packages llvm) #:use-module (gnu packages image) + #:use-module (gnu packages image-viewers) #:use-module (gnu packages linux) #:use-module (gnu packages libevent) #:use-module (gnu packages lisp) @@ -409,6 +411,27 @@ reading the extensive documentation about BookmarkPlus on the Emacs Wiki.") input via a small child-frame spawned at the position of the cursor.") (license license:gpl3+))) +(define-public emacs-arei + (package + (name "emacs-arei") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~abcdw/emacs-arei") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12vfv7l8krsfv7m03p41jakh4xrfm21w85kvghz0q5hq63w9l3f7")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-eros emacs-sesman emacs-queue)) + (home-page "https://git.sr.ht/~abcdw/emacs-arei") + (synopsis "Asyncronous Reliable Extensible IDE") + (description "Sleek Guile IDE for Emacs.") + (license license:gpl3+))) + (define-public emacs-geiser (package (name "emacs-geiser") @@ -504,6 +527,7 @@ API key.") (uri (git-reference (url "https://github.com/xenodium/chatgpt-shell") (commit "1de7bfa6a34f20cca813006282d9a8f2ef291f95"))) + (file-name (git-file-name name version)) (sha256 (base32 "1rabpp70qlmc47lmp2v7ckvfjhy6wkk881fxpbv2dchzhn77qk5r")))) @@ -793,6 +817,35 @@ configuration language which makes it trivial to write your own themes.") Common Lisp or Smalltalk, but for Emacs Lisp.") (license license:gpl3+)))) +(define-public emacs-treebundel + (package + (name "emacs-treebundel") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purplg/treebundel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hk2xnjsr85in48h02xbzi8lsccp36li2bp9v9j0r8qn1bis2vv9")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-compat)) + (home-page "https://github.com/purplg/treebundel") + (synopsis "Bundle related git-worktrees together") + (description + "This package is used for bundling related git-worktrees from multiple +repositories together. This helps switch quickly between repositories and +ensure you're on the correct branch. When you're done with your changes, you +can use the repositories in the workspace and know which ones were modified to +simplify the process of getting the changes merged in together. Additionally, +git metadata is shared between all projects. You can stash, pop, and pull +changes in from the same repository in other workspaces thanks to the power of +git-worktrees.") + (license license:expat))) + (define-public emacs-tree-inspector (let ((commit "bbb8d2dfe84fbf857fcc1579de5a1324b09a877e")) (package @@ -1324,7 +1377,7 @@ its mode line.") (define-public emacs-git-modes (package (name "emacs-git-modes") - (version "1.4.1") + (version "1.4.2") (source (origin (method git-fetch) @@ -1333,7 +1386,7 @@ its mode line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b9fywqwccdvyg1cfnlzl61gq1gryjvzp32cw91l4igv7ppmq684")))) + (base32 "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -1480,8 +1533,8 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (define-public emacs-magit ;; Use this unreleased commit to benefit from a recent improvements with ;; regard to adding git trailers such as "Reviewed-by". - (let ((commit "7a1d50347086678217cf90a32dda277b76ea3081") - (revision "6")) + (let ((commit "dda332b2a41569f5fd8c0c2c3c2dab902d48ceb4") + (revision "7")) (package (name "emacs-magit") (version (git-version "3.3.0" revision commit)) @@ -1493,7 +1546,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1yn3v24w0sx6r8jqw8blfvyjdjfz5xa7c3x8p6xw1lj7b81l8i0l")))) + (base32 "14vqfykfzddpfka7s3pmlh3yvbfd1rpjhab4g9dinz9hn48dwb06")))) (build-system emacs-build-system) (arguments (list @@ -1728,6 +1781,27 @@ leveraging built-in functionality.") purpose finder.") (license license:gpl3+)))) +(define-public emacs-pacfiles-mode + (package + (name "emacs-pacfiles-mode") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/UndeadKernel/pacfiles-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1d61s846r9ncmyx97f44r8i3p1ikgi4bab8k7xk868lja96y2ij7")))) + (build-system emacs-build-system) + (home-page "https://github.com/UndeadKernel/pacfiles-mode") + (synopsis "ArchLinux's pacnew and pacsave merging tool") + (description + "This Emacs major mode helps manage @file{.pacnew} and @file{.pacsave} +files left by ArchLinux's pacman.") + (license license:expat))) + (define-public emacs-minions (package (name "emacs-minions") @@ -1924,7 +1998,7 @@ Apprentice and Sourcerer.") (define-public emacs-suneater-theme (package (name "emacs-suneater-theme") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -1933,7 +2007,7 @@ Apprentice and Sourcerer.") (commit version))) (sha256 (base32 - "19432hb4lkfvip72wrc9nqq5bc10nv0g4547x2sif5iqak43dw72")) + "1j216w9c2psynlsl8gdmnya5a60cyx100ibm15zyyaav75wccn5j")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~plattfot/suneater-theme") @@ -2902,13 +2976,13 @@ and ease-of-key score. Most frequently used commands have most easy keys.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214")))) + (base32 "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") @@ -3065,14 +3139,14 @@ project root.") (define-public emacs-relint (package (name "emacs-relint") - (version "1.23") + (version "1.24") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "relint-" version ".tar")) (sha256 - (base32 "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9")))) + (base32 "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xr)) (home-page "https://github.com/mattiase/relint") @@ -3242,6 +3316,29 @@ immediately activated. Also filtering can be applied so selection can be incrementally confined in Isearch manner.") (license license:gpl3+))) +(define-public emacs-dnt + (let ((commit "d28d232d682094ab79cfa78c97668c6ebd327c8c") + (revision "1")) + (package + (name "emacs-dnt") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/dnt.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bls9j1ibw0npjapslbrh6nmlbn3d4ajhjygsqlf6h9qg12sxm3r")))) + (inputs (list emacs-s)) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/dnt") + (synopsis "Strip trackers from URLs") + (description "This package provides a series of rules and helper functions +to prevent advertisers from tracking you when you open URLs (or listen to +podcasts) in Emacs.") + (license (list license:gpl3+))))) ;;; @@ -3622,20 +3719,21 @@ the @code{Dracula} theme for Emacs and the @code{Gloom} theme for Atom.") (define-public emacs-bbdb (package (name "emacs-bbdb") - (version "3.2.2.2") + (version "3.2.2.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "bbdb-" version ".tar")) (sha256 - (base32 "0bf20r5xhxln6z4qp8zrlln0303dkci2ydsr74pxcj08aqgk5xxf")))) + (base32 "13i8ggknc29sny16rq126q0ssz26m3fam0zpdhlsm05pa8dydd7p")))) (build-system emacs-build-system) (arguments ;; XXX: The following file cannot be byte-compiled, because et requires ;; `vm-autoloads', from the VM package, with is neither in Emacs nor ;; packaged in Guix. So, don't bother for now. `(#:exclude '("bbdb-vm\\.el"))) + (inputs (list emacs-notmuch)) (home-page "https://elpa.gnu.org/packages/bbdb.html") (synopsis "Contact management utility for Emacs") (description @@ -4118,14 +4216,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.2.1") + (version "13.2.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm")))) + (base32 "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -4545,6 +4643,30 @@ popup for completion candidates when using @code{emacs-corfu}. It can be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (license license:gpl3+))) +(define-public emacs-corfu-candidate-overlay + (package + (name "emacs-corfu-candidate-overlay") + (version "1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://code.bsdgeek.org/adam/corfu-candidate-overlay") + (commit "265438b16155e899d82a869aebca16105665c998"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i36g2i7435pby32vcapv4ydmp6rqn0r51qm91wqyzan1f3n3qck")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-corfu)) + (license license:gpl3) + (home-page "https://code.bsdgeek.org/adam/corfu-candidate-overlay") + (synopsis "Show first Corfu's completion candidate in an overlay while + typing") + (description + "Simple corfu as-you-type auto-suggestion candidate overlay with a visual + indication of whether there are many or exactly one candidate available."))) + (define-public emacs-cape (package (name "emacs-cape") @@ -4945,6 +5067,76 @@ written in the Go programming language.") directly inside Emacs. It requires a Google Map Static API key to function.") (license license:gpl3+)))) +(define-public emacs-geoclue + (let ((commit "f409b544be4d2cfd848f4658618374b0bc76cb3c") + (revision "1")) + (package + (name "emacs-geoclue") + (version (git-version "0.8.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/geoclue.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ggyn9rvc6si3xy1rrw2f2hyw6cys4bgb9v0ah0qq65y3dnziq6m")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Determine your current location using GeoClue2 over D-Bus") + (description "This package provides an Emacs library which lets you +determine your current location using GeoClue2 over D-Bus.") + (license (list license:gpl3+))))) + +(define-public emacs-nominatim + (let ((revision "0") + (commit "f814e16f8f4e2cfd633f52b29699a009ab704fbf")) + (package + (name "emacs-nominatim") + (version (git-version "0.9.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/nominatim") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19nw2iy8fxy6mfd4nwrdfa23a74a1b644400xx0900fwn6ihjhpl")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/nominatim") + (synopsis "Forward and reverse geocode using Nominatim inside Emacs") + (description "This is an Emacs library which lets you forward and +reverse geocode using Nominatim, a component of OpenStreetMap.") + (license license:gpl3+)))) + +(define-public emacs-org-street + (let ((revision "0") + (commit "17913afe01504ee0cbcf83abaca18c5c618f9b33")) + (package + (name "emacs-org-street") + (version (git-version "0.7.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/org-street") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a5mnnvs4yxrw4s71z9ap65xi0fc1ki1qprif5jxn8apswjlmiw1")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-nominatim)) + (home-page "https://codeberg.org/emacs-weirdware/org-street") + (synopsis "(Reverse) Geocoding for Emacs Org files") + (description "Org Street is an extension for Org Mode for turning the +names of places into a LOCATION property containing their address. Given some +freeform text approximately describing a location, it geocodes it with +OpenStreetMap’s Nominatim API to determine a canonical location. If Nominatim +returns multiple locations, a list is displayed to choose from.") + (license license:gpl3+)))) + (define-public emacs-graphviz-dot-mode (package (name "emacs-graphviz-dot-mode") @@ -5018,6 +5210,30 @@ This buffer is typically shown as a sidebar (Emacs vertically splits the window).") (license license:gpl3+)))) +(define-public emacs-imenu-anywhere + (package + (name "emacs-imenu-anywhere") + (version "1.1.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vspinu/imenu-anywhere") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lbwfhcl40ayxskvmsvdrg8p63qp086xpzw61bqk4b3fxndxl04h")))) + (build-system emacs-build-system) + (home-page "https://github.com/vspinu/imenu-anywhere") + (synopsis + "Imenu tag selection across buffers with the same mode/project") + (description + "This Emacs package provides navigation for imenu tags across all buffers +that satisfy a filtering criteria. Available criteria are all buffers with +the same major mode, same project buffers, and user-defined list of friendly +mode buffers.") + (license license:gpl3+))) + (define-public emacs-mmm-mode (package (name "emacs-mmm-mode") @@ -5395,8 +5611,8 @@ type, for example: packages, buffers, files, etc.") (license license:gpl3+))) (define-public emacs-guix - (let ((commit "cf5b7a402ea503c3dcda85a86b9a6c6dd01896e0") - (revision "6")) + (let ((commit "455272c5cc72ed4ba5bad13c669f024f51479a58") + (revision "7")) (package (name "emacs-guix") (version (git-version "0.5.2" revision commit)) @@ -5408,7 +5624,7 @@ type, for example: packages, buffers, files, etc.") (file-name (git-file-name name version)) (sha256 (base32 - "0wxiipgv91rlk9bhspx370rykywi52rxg5m1f7680vzs3ckc7nyd")))) + "1ihrd7f92p9xidh1mbjk1piykzg46xypnzf1rlxxsymmddlq4jpn")))) (build-system gnu-build-system) (arguments (list @@ -5732,7 +5948,7 @@ or if you want to ensure that some modes have no ligatures at all.") (define-public emacs-olivetti (package (name "emacs-olivetti") - (version "2.0.4") + (version "2.0.5") (source (origin (method git-fetch) @@ -5741,7 +5957,7 @@ or if you want to ensure that some modes have no ligatures at all.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wc0rki4zvzdxs126g5c8d92h1vfn9slfkdx831rr9d0jx93wc7s")))) + (base32 "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") @@ -6110,7 +6326,7 @@ files and directories.") (define-public emacs-fountain-mode (package (name "emacs-fountain-mode") - (version "3.6.3") + (version "3.7.1") (source (origin (method git-fetch) @@ -6119,7 +6335,7 @@ files and directories.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18s1dp2n9q6f3py3f1yc3918yqpncdkwkgi3b3bc2868n6sw0n84")))) + (base32 "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298")))) (arguments (list #:phases #~(modify-phases %standard-phases @@ -6436,7 +6652,7 @@ intended to be.") (define-public emacs-ef-themes (package (name "emacs-ef-themes") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) @@ -6446,7 +6662,7 @@ intended to be.") (file-name (git-file-name name version)) (sha256 (base32 - "0a52zm9h7nsif5b6ig428d9i0gh8c0qcfyarvsmpv8cwk59iba0z")))) + "029pcca3ppbs22isym2hi3zzynmvk5dg7jcimpm7nd8m4qk46f49")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~protesilaos/ef-themes") (synopsis "Colorful and legible themes") @@ -6555,20 +6771,18 @@ mode, which displays information about Elasticsearch clusters.") (license license:gpl3+))) (define-public emacs-expand-region - (let ((commit "c5c4362741deebb0985a8a29f9b8b0e25160764a") - (revision "1")) - (package + (package (name "emacs-expand-region") - (version (git-version "0.11.0" revision commit)) + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/magnars/expand-region.el") - (commit commit))) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17h58v5mnggbrwrp61cwkqx8hzazkdqyz9p6s1hl9g2hys7zkb00")))) + (base32 "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6")))) (build-system emacs-build-system) (home-page "https://github.com/magnars/expand-region.el") (synopsis "Increase selected region by semantic units") @@ -6576,7 +6790,7 @@ mode, which displays information about Elasticsearch clusters.") "Expand region increases the selected region by semantic units. Just keep pressing the key until it selects what you want. There's also @code{er/contract-region} if you expand too far.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-explain-pause-mode (let ((commit "2356c8c3639cbeeb9751744dbe737267849b4b51") @@ -8201,7 +8415,7 @@ for Flow files.") (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "2.0") + (version "2.4") (source (origin (method git-fetch) @@ -8210,43 +8424,43 @@ for Flow files.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "040mb9djj4cxpjsjch9i30pi36a2z7grkhnsnfdi5qyh341p4pq0")))) + (base32 "0vsf0zsqqfaarwq1k34kg5sqgywzr6dklqv093imm9q6ys18p8c4")))) (build-system emacs-build-system) (arguments - `(#:include (cons "\\.py$" %default-include) - #:exclude '("^test-profile.el$") - #:emacs ,emacs ;need libxml support - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'specify-python-location - ;; Hard-code python3 executable location in the library. - (lambda* (#:key inputs #:allow-other-keys) - (let ((python3 (search-input-file inputs "/bin/python3"))) - (substitute* '("flycheck-grammalecte.el" "grammalecte.el") - (("\"python3") (string-append "\"" python3))) - (substitute* '("conjugueur.py" "flycheck_grammalecte.py") - (("/usr/bin/env python3?") python3))))) - (add-after 'unpack 'specify-grammalecte-location - ;; Use our own Grammalecte. - (lambda* (#:key inputs #:allow-other-keys) - (make-file-writable "grammalecte.el") - (emacs-substitute-variables "grammalecte.el" - ("grammalecte-python-package-directory" - (search-input-directory - inputs - (string-append "lib/python" - ,(version-major+minor (package-version python)) - "/site-packages/grammalecte")))))) - (add-after 'unpack 'do-not-phone-home - ;; Do not check for Grammalecte updates, ever. - (lambda _ - (make-file-writable "grammalecte.el") - (emacs-substitute-variables "grammalecte.el" - ("grammalecte-check-upstream-version-delay" 0))))))) + (list + #:include #~(cons "\\.py$" %default-include) + #:emacs emacs-no-x ;need libxml support + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'specify-python-location + ;; Hard-code python3 executable location in the library. + (lambda* (#:key inputs #:allow-other-keys) + (let ((python3 (search-input-file inputs "/bin/python3"))) + (substitute* '("flycheck-grammalecte.el" "grammalecte.el") + (("\"python3") (string-append "\"" python3))) + (substitute* '("conjugueur.py" "flycheck_grammalecte.py") + (("/usr/bin/env python3?") python3))))) + (add-after 'unpack 'specify-grammalecte-location + ;; Use our own Grammalecte. + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "grammalecte.el") + (emacs-substitute-variables "grammalecte.el" + ("grammalecte-python-package-directory" + (search-input-directory + inputs + (string-append "lib/python" + #$(version-major+minor (package-version python)) + "/site-packages/grammalecte")))))) + (add-after 'unpack 'do-not-phone-home + ;; Do not check for Grammalecte updates, ever. + (lambda _ + (make-file-writable "grammalecte.el") + (emacs-substitute-variables "grammalecte.el" + ("grammalecte-check-upstream-version-delay" 0))))))) (inputs (list grammalecte python)) (propagated-inputs - (list emacs-flycheck)) + (list emacs-flycheck emacs-pkg-info)) (home-page "https://git.umaneti.net/flycheck-grammalecte/") (synopsis "Integrate Grammalecte with Flycheck") (description @@ -8535,14 +8749,14 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.4") + (version "1.2.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "05pnjdrf9gq32bayvbd0yvp1lxpwj2xsarcy3s2jjb6zcgm6djyb")))) + "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib")))) (arguments (list #:tests? #t @@ -8654,15 +8868,14 @@ by a query, so both a link can refer to several mails.") (define-public emacs-debbugs (package (name "emacs-debbugs") - (version "0.36") + (version "0.37") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/debbugs-" version ".tar")) (sha256 - (base32 "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2")) - (patches (search-patches "emacs-debbugs-keep-patch-subject.patch")))) + (base32 "0xj0sv5d3y88fsbm7yhm0v59mzj1srxayng1hr418v89ky43rxpr")))) (build-system emacs-build-system) (arguments '(#:include '("\\.el$" "\\.wsdl$" "\\.info$"))) (propagated-inputs @@ -8871,14 +9084,14 @@ variables, and so on. The mode also allows you to execute Tup commands.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.4.2") + (version "29.1.4.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "compat-" version ".tar")) (sha256 (base32 - "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g")))) + "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr")))) (build-system emacs-build-system) (home-page "https://git.sr.ht/~pkal/compat") (synopsis "Emacs Lisp Compatibility Library") @@ -8899,14 +9112,14 @@ commands and user options are usually not implemented here.") (define-public emacs-company (package (name "emacs-company") - (version "0.9.13") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "company-" version ".tar")) (sha256 - (base32 "1c9x9wlzzsn7vrsm57l2l44nqx455saa6wrm853szzg09qn8dlnw")))) + (base32 "0j2qrnx2w2al4f2n37b89q0pkabh5ccv00gsknvgaylhy0za5gq9")))) (build-system emacs-build-system) (home-page "https://company-mode.github.io/") (synopsis "Modular text completion framework") @@ -9048,7 +9261,7 @@ languages.") (define-public emacs-irony-mode (package (name "emacs-irony-mode") - (version "1.6.0") + (version "1.6.1") (home-page "https://github.com/Sarcasm/irony-mode") (source (origin @@ -9058,7 +9271,7 @@ languages.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zwmarjy9lzi57m82dw67aj69cn4nscdgp4fm8glx1krk9xh35hp")))) + (base32 "1w0rd74kjgda7mjbf853yavppkgzdfyw1a2hgskbqbbjii3mr1zy")))) (build-system emacs-build-system) (arguments (list @@ -9625,6 +9838,52 @@ interacting with the sbt shell and Scala console, compiling code and navigation to errors.") (license license:gpl3+))) +(define-public emacs-9lc-mode + (let ((commit "7871476488fc7b66e05714797a9a5b8275988662") + (revision "1")) + (package + (name "emacs-9lc-mode") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/9lc-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kmx0c413yvvaq33v7lf3gzdjpxkr5faa1wj2j0m25lyyz8dsdm7")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Major mode for editing Fluke 9000 scripts") + (description + "This package provides a major mode for editing Fluke 9010a \"9LC\" files.") + (license (list license:gpl3+))))) + +(define-public emacs-tl1-mode + (let ((commit "48d12893cc81d7f92dc7b603d3751d8512ed0eb0") + (revision "1")) + (package + (name "emacs-tl1-mode") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/tl1-mode.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mf0wqbn9h0353hkhcykzrm2dk1jvyijqs4hsvgj3kwp1whws7br")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/geoclue") + (synopsis "Major mode for editing Fluke 9100 TL/1 source code") + (description + "This package provides a major mode for editing Fluke TL/1 source code. +TL/1 is a language used to control Fluke’s 9100 series of testing and +troubleshooting mainframes.") + (license (list license:gpl3+))))) + (define-public emacs-scheme-complete ;; Upstream does not provide tags. The commit below corresponds to the ;; exact version update. Version is extracted from main file. @@ -9845,68 +10104,71 @@ in @code{html-mode}.") (license license:gpl3+))) (define-public emacs-slime - (package - (name "emacs-slime") - (version "2.28") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/slime/slime") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll")))) - (build-system emacs-build-system) - (arguments - (list - #:include #~(cons* "\\.lisp$" "\\.asd$" - "contrib" - "lib/hyperspec.el" - %default-include) - #:exclude #~(list "^slime-tests.el" "^contrib/test/" - "^contrib/Makefile$" "^contrib/README.md$") - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'configure - (lambda* _ - (emacs-substitute-variables "slime.el" - ("inferior-lisp-program" "sbcl")))) - (add-before 'install 'install-doc - (lambda _ - (let ((info-dir (string-append #$output "/share/info")) - (doc-dir (string-append #$output "/share/doc/" - #$name "-" #$version)) - (doc-files '("doc/slime-refcard.pdf" - "README.md" "NEWS" "PROBLEMS" - "CONTRIBUTING.md"))) - (with-directory-excursion "doc" - (substitute* "Makefile" - (("infodir=/usr/local/info") - (string-append "infodir=" info-dir))) - (invoke "make" "html/index.html") - (invoke "make" "slime.info") - (install-file "slime.info" info-dir) - (copy-recursively "html" (string-append doc-dir "/html"))) - (for-each (lambda (f) - (install-file f doc-dir) - (delete-file f)) - doc-files) - (delete-file-recursively "doc"))))))) - (propagated-inputs - (list emacs-macrostep)) - (native-inputs - (list texinfo)) - (home-page "https://github.com/slime/slime") - (synopsis "Superior Lisp Interaction Mode for Emacs") - (description - "SLIME extends Emacs with support for interactive programming in + ;; Update together with sbcl-slime-swank. + (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d") + (revision "1")) + (package + (name "emacs-slime") + (version (git-version "2.28" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7")))) + (build-system emacs-build-system) + (arguments + (list + #:include #~(cons* "\\.lisp$" "\\.asd$" + "contrib" + "lib/hyperspec.el" + %default-include) + #:exclude #~(list "^slime-tests.el" "^contrib/test/" + "^contrib/Makefile$" "^contrib/README.md$") + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'configure + (lambda* _ + (emacs-substitute-variables "slime.el" + ("inferior-lisp-program" "sbcl")))) + (add-before 'install 'install-doc + (lambda _ + (let ((info-dir (string-append #$output "/share/info")) + (doc-dir (string-append #$output "/share/doc/" + #$name "-" #$version)) + (doc-files '("doc/slime-refcard.pdf" + "README.md" "NEWS" "PROBLEMS" + "CONTRIBUTING.md"))) + (with-directory-excursion "doc" + (substitute* "Makefile" + (("infodir=/usr/local/info") + (string-append "infodir=" info-dir))) + (invoke "make" "html/index.html") + (invoke "make" "slime.info") + (install-file "slime.info" info-dir) + (copy-recursively "html" (string-append doc-dir "/html"))) + (for-each (lambda (f) + (install-file f doc-dir) + (delete-file f)) + doc-files) + (delete-file-recursively "doc"))))))) + (propagated-inputs + (list emacs-macrostep)) + (native-inputs + (list texinfo)) + (home-page "https://github.com/slime/slime") + (synopsis "Superior Lisp Interaction Mode for Emacs") + (description + "SLIME extends Emacs with support for interactive programming in Common Lisp. The features are centered around @command{slime-mode}, an Emacs minor mode that complements the standard @command{lisp-mode}. While lisp-mode supports editing Lisp source files, @command{slime-mode} adds support for interacting with a running Common Lisp process for compilation, debugging, documentation lookup, and so on.") - (license (list license:gpl2+ license:public-domain)))) + (license (list license:gpl2+ license:public-domain))))) (define-public emacs-popup (package @@ -11366,7 +11628,7 @@ answers.") (define-public emacs-base16-theme (package (name "emacs-base16-theme") - (version "3.1") + (version "3.2") (source (origin (method git-fetch) @@ -11375,7 +11637,7 @@ answers.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1yq9afvybrgkmn17h22ha9231am7hlh3wccxw7g2ks3g0k5vvds0")))) + (base32 "0mdnm6xam1md9yiy6y14yp59j2864brazqszm7vklgb40xpxaxsq")))) (build-system emacs-build-system) (arguments (list #:include #~(cons "^build\\/.*\\.el$" %default-include) @@ -12415,16 +12677,16 @@ hydras with one column per group of heads."))) (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar")) (sha256 - (base32 "1fzl7xcmxjg005g4676ac3jcshgmcmdr81ywmxvjcs8wj71v56jv")))) + (base32 "1zjksh0jvxyqhzgwmh9i26gaip6c04q400xckh730r2gjs287pjj")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-hydra)) + (list)) (home-page "https://github.com/abo-abo/swiper") (synopsis "Incremental vertical completion for Emacs") (description @@ -12439,17 +12701,17 @@ expression.") (define-public emacs-counsel (package (name "emacs-counsel") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "counsel-" version ".tar")) (sha256 - (base32 "03n1qk66dcbh9xlnlzpwkb441c2xdpfc7bzx4i2szw0xh4a6g5sj")))) + (base32 "13119alyzr2xipk3jra3iawplqkqgvv0gdcm4yd527z592b0s7f0")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-swiper)) + (list emacs-ivy emacs-swiper)) (home-page "https://github.com/abo-abo/swiper") (synopsis "Various completion functions using Ivy") (description @@ -12517,13 +12779,13 @@ the same name.") (define-public emacs-swiper (package (name "emacs-swiper") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar")) (sha256 - (base32 "1p2qil6gj4y8y3ydqs8pbxn8j16q9r42nnc2f61c30hws504pkms")))) + (base32 "1x6jnc0nrk68kww12gq6w8nss6ny76xz0fgxf57550bbipx9pa8m")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy)) @@ -12966,7 +13228,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (define-public emacs-clojure-mode (package (name "emacs-clojure-mode") - (version "5.17.0") + (version "5.18.0") (source (origin (method git-fetch) @@ -12975,7 +13237,7 @@ allowing unprefixed keys to insert their respective characters as expected.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0knx3y53z0dn49xisa78bac55vhhkwxs2iw3jvalx41wfwvkirxc")))) + (base32 "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa")))) (build-system emacs-build-system) (native-inputs (list emacs-buttercup emacs-dash emacs-paredit emacs-s)) @@ -13018,7 +13280,7 @@ Clojure projects from templates.") (define-public emacs-clj-refactor (package (name "emacs-clj-refactor") - (version "3.9.4") + (version "3.10.0") (source (origin (method git-fetch) @@ -13027,7 +13289,7 @@ Clojure projects from templates.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j9pkkpnbvyl9p45dycngdiq2kyj6bmyb709pdxj3nar2d8ryl1h")))) + (base32 "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411")))) (build-system emacs-build-system) (propagated-inputs (list emacs-cider @@ -13434,30 +13696,44 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.") (license license:gpl3+)))) (define-public emacs-julia-mode + ;; Last release was in March 2020. + (let ((commit "7a8c868e0d3e51ba4a2c621ee22ca9599e0e4bbb") + (revision "0")) (package (name "emacs-julia-mode") - (version "0.4") + (version (git-version "0.4" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/JuliaEditorSupport/julia-emacs") - (commit version))) + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1w131jb9mhvyjxa0p93iwfhzidgbcs6b8i6jg79yisqb9wchik99")))) + "0xwd4kq69ray6bk8hwjxnqf7myc3mn36chc2l9jn7a0x1f8x6k10")))) (build-system emacs-build-system) (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "julia-mode-tests.el" - "-f" "ert-run-tests-batch-and-exit"))) + (list + #:tests? #t + #:test-command #~(list "emacs" "--batch" + "-l" "julia-mode-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-test + (lambda _ + (substitute* "julia-mode-tests.el" + ;; The test started failing with Emacs 29; see + ;; <https://github.com/JuliaEditorSupport/julia-emacs/issues/199> + ;; and discrepancy reported <https://issues.guix.gnu.org/66763>. + (("julia--test-end-of-defun-nested-2.*" all) + (string-append all " :expected-result :failed\n")))))))) (home-page "https://github.com/JuliaEditorSupport/julia-emacs") (synopsis "Major mode for Julia") (description "This Emacs package provides a mode for the Julia programming language.") - (license license:expat))) + (license license:expat)))) (define-public emacs-julia-repl (package @@ -13775,7 +14051,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.7.0") + (version "2.8.0") (source (origin (method git-fetch) @@ -13785,7 +14061,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (file-name (git-file-name name version)) (sha256 (base32 - "0ybd41iss8vd56qv6czpxqq7a99s4h7i3a2r4khy4rf5blj5zdqi")))) + "022ca1185ywmw8pjpkrxkd6d2wp4vbq67x2w724iiw2asy69j7wb")))) (build-system emacs-build-system) (arguments (list @@ -13982,7 +14258,7 @@ much easier.") (define-public emacs-elfeed-protocol (package (name "emacs-elfeed-protocol") - (version "0.9.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -13991,7 +14267,7 @@ much easier.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0cgq280gxw40vxn2pvax9k5k22gd1kwsjw4yl35206d3mb9wb0fa")))) + (base32 "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp")))) (build-system emacs-build-system) (propagated-inputs (list emacs-elfeed)) @@ -15169,7 +15445,7 @@ implementation.") (define-public emacs-cider (package (name "emacs-cider") - (version "1.7.0") + (version "1.9.0") (source (origin (method git-fetch) @@ -15178,10 +15454,11 @@ implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0jqjgygdvny1vhjbx7k0l492fhamwndsjcbb2mccwp9j47k4qar9")))) + (base32 "0sjscbi3qgwn3wcpq5lz7k4gam69h0svh8wbhxcbskr9ys1rmysp")))) (build-system emacs-build-system) (arguments - '(#:exclude ;don't exclude 'cider-test.el' + '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include) + #:exclude ;don't exclude 'cider-test.el' '("^\\.dir-locals\\.el$" "^test/") #:phases ;; XXX: file "test/cider-tests.el" contains a bogus "/bin/command" @@ -15238,9 +15515,9 @@ e.g., the expression you've just evaluated would briefly flash and so on.") (license license:gpl3+)))) (define-public emacs-sly - ;; Update together with sbcl-slynk . - (let ((commit "df62abae73bd511885c9c7ec0ea7ea1469a00923") - (revision "8")) + ;; Update together with sbcl-slynk. + (let ((commit "9c43bf65b967e12cef1996f1af5f0671d8aecbf4") + (revision "9")) ;; Versions are not always tagged. Besides, latest master contains ;; important fixes. (package @@ -15255,7 +15532,7 @@ e.g., the expression you've just evaluated would briefly flash and so on.") (file-name (git-file-name name version)) (sha256 (base32 - "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv")))) + "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2")))) (build-system emacs-build-system) (native-inputs (list texinfo)) @@ -15564,7 +15841,7 @@ Lua programming language}.") (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.67") + (version "1.69") (source (origin (method url-fetch) @@ -15573,7 +15850,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "0hbx3vrv2h2vfi45q4mj6z9kqsma530gxjsr5hyd4bj1xnk4gb76")))) + (base32 "1sqyjz4qy07q6wkh89gg4f4s1fk96mv2f99y4rm0sp7gf6bkdj38")))) (build-system emacs-build-system) (arguments (list @@ -16252,7 +16529,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.6.9") + (version "9.6.12") (source (origin (method git-fetch) @@ -16261,7 +16538,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j1bv6pz8s15ymr1mzrsb465vv39qmd6sb5cjq3sb9c0nzm1mzif")))) + (base32 "1anzvsa7kj2rp419qc5rv8jz50h7np391lcgbxcin727njyc7wpr")))) (build-system emacs-build-system) (arguments (list @@ -16348,8 +16625,6 @@ programming and reproducible research.") (add-after 'unpack 'enter-source-directory (lambda _ (chdir "lisp")))))) - (native-inputs - (list emacs-cider)) (propagated-inputs (list emacs-org)) (home-page "https://git.sr.ht/~bzg/org-contrib") @@ -16594,11 +16869,10 @@ basic syntax highlighting and indentation.") (license license:gpl3+))) (define-public emacs-danneskjold-theme - (let* ((commit "e4d1f2c76245fe9d0d07133a841e789d139df28d") - (revision "2")) + (let ((commit "b3335e44f468c019c95a8210ce1ed9fe23c65735")) ;version bump (package (name "emacs-danneskjold-theme") - (version (git-version "0.0.0" revision commit)) + (version "20231110.0") (source (origin (method git-fetch) @@ -16607,14 +16881,15 @@ basic syntax highlighting and indentation.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1ii3cgf4hlclwaraisxksv98mmhajx517i60p1cgd7vapznn2b6v")))) + (base32 "19lncwxzxyi73cn7439rk8cvgcj6l4x1kj6fykmw3b18s7rj555f")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-screenshots - (lambda _ - (delete-file-recursively "screenshots")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-screenshots + (lambda _ + (delete-file-recursively "screenshots")))))) (home-page "https://github.com/rails-to-cosmos/danneskjold-theme") (synopsis "High-contrast Emacs theme") (description @@ -16622,11 +16897,10 @@ basic syntax highlighting and indentation.") (license license:gpl3+)))) (define-public emacs-dream-theme - (let* ((commit "107a11d74365046f28a1802a2bdb5e69e4a7488b") - (revision "1")) + (let ((commit "62caa37d5f1ddb1187ee0b9e7dd9833679cc5eb5")) ;version bump (package (name "emacs-dream-theme") - (version (string-append "0.0.0-" revision "." (string-take commit 7))) + (version "1.0") (source (origin (method git-fetch) @@ -16636,7 +16910,7 @@ basic syntax highlighting and indentation.") (file-name (git-file-name name version)) (sha256 (base32 - "0za18nfkq4xqm35k6006vsixcbmvmxqgma4iw5sw37h8vmcsdylk")))) + "13ziwd6cw8s8gyzbklxlvpvbx5dbchvvhlxq9pi8vn3zlzpprd6h")))) (build-system emacs-build-system) (home-page "https://github.com/djcb/dream-theme") (synopsis "High-contrast Emacs theme") @@ -16648,7 +16922,7 @@ by zenburn, sinburn and similar themes, but slowly diverging from them.") (define-public emacs-dracula-theme (package (name "emacs-dracula-theme") - (version "1.8.1") + (version "1.8.2") (source (origin (method git-fetch) @@ -16657,7 +16931,7 @@ by zenburn, sinburn and similar themes, but slowly diverging from them.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mb7pix1wbmg4laba06fvcb8q822584iq0cw8mwf0nzaf1yh12l8")))) + (base32 "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38")))) (build-system emacs-build-system) (home-page "https://draculatheme.com/") (synopsis "Dark theme for Emacs") @@ -16861,7 +17135,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -16870,7 +17144,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nwqghh73lbw6v6yhkalcwwqjs1fyhxqi53d9y2dcfhfq58g1rb9")))) + (base32 "1gfjckqh170z8slhm0wdqf0570ywgni7b1wdnifxf5cb69h3izpr")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") @@ -17171,14 +17445,14 @@ customizable by the user.") (define-public emacs-zones (package (name "emacs-zones") - (version "2019.7.13") + (version "2023.6.11") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "zones-" version ".el")) + "zones-" version ".tar")) (sha256 - (base32 "0qp1ba2pkqx9d35g7z8hf8qs2k455krf2a92l4rka3ipsbnmq5k1")))) + (base32 "1znz720s9pchc7r9g1mpz9jcnz122bppimmh09g1rn94fh3m6vm3")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/Zones") (synopsis "Define and act on multiple zones of buffer text") @@ -17586,6 +17860,29 @@ in Org buffers and displays matching entries.") information inside the Dired buffer.") (license license:gpl3+)))) +(define-public emacs-diss + (let ((commit "8a99a1b34de4575087da49fe1e19bcf33ac49f46") + (revision "1")) + (package + (name "emacs-diss") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/diss.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06xvl85dkp3c2cw41f2gy7db2d7fy5pv5w1wr7vd7ccdlg3fq4gc")))) + + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/diss") + (synopsis "Dired Image Slideshow") + (description "Diss is a full-featured image slideshow for Emacs, based +on Dired and image-mode.") + (license (list license:gpl3+))))) + (define-public emacs-dired-toggle-sudo (let ((commit "13bbe52c54893f5aa3e56228450ffdd0c9e1d169") (revision "0")) @@ -18808,7 +19105,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.27") + (version "0.28") (synopsis "Emacs X window manager") (source (origin @@ -18816,7 +19113,7 @@ It should enable you to implement low-level X11 applications.") (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "094k33clmxhnab0wniyrs48sdz28kna2g6fmkhsd7n20nmhhc4sn")))) + (base32 "00h5awqazk807zxvb02a9dp8gd5ifi3y1kcwmr1czk6kdmkjx32l")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xelb)) @@ -19285,7 +19582,7 @@ more information.") (define-public emacs-jarchive (package (name "emacs-jarchive") - (version "0.10.0") + (version "0.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -19294,7 +19591,7 @@ more information.") (file-name (git-file-name name version)) (sha256 (base32 - "1hddjs4yj03cqppip1gsgmkhp3fmq9ggyf5wxx5k3m78cg7k1bl7")))) + "1v8a2bbjgkn95pxq8x9251znj03m5n0f6bngbf4a63pxa2il3r8n")))) (build-system emacs-build-system) (home-page "https://sr.ht/~dannyfreeman/jarchive") (synopsis "Jarchive teaches Emacs how to navigate to files inside JARs") @@ -22120,26 +22417,29 @@ protocol for PureScript programming language. It features: (license license:gpl3+)))) (define-public emacs-evil-anzu - (package - (name "emacs-evil-anzu") - (version "0.03") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/syohex/emacs-evil-anzu") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-evil emacs-anzu)) - (home-page "https://github.com/syohex/emacs-evil-anzu") - (synopsis "Anzu for evil-mode") - (description "@code{anzu} provides a minor mode that displays the current + ;; No release since January 2015 + (let ((commit "d1e98ee6976437164627542909a25c6946497899") + (revision "0")) + (package + (name "emacs-evil-anzu") + (version (git-version "0.03" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/evil-anzu") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i8f360lq5a32knkzbwdw10ql9cxsmgfd4iiwnr7vcwacm34zq88")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-evil emacs-anzu)) + (home-page "https://github.com/emacsorphanage/evil-anzu") + (synopsis "Anzu for evil-mode") + (description + "@code{anzu} provides a minor mode that displays the current match and total match information in the mode-line in various search modes.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-pg (package @@ -22757,7 +23057,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) @@ -22766,7 +23066,7 @@ according to a parsing expression grammar.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m2d607hprkl1pdapxsfjwag7plf822ig59qb6jjzy9m7gwg21k5")))) + (base32 "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5")))) (build-system emacs-build-system) (arguments (list @@ -22779,12 +23079,9 @@ according to a parsing expression grammar.") (setenv "ELDEV_LOCAL" (getcwd)) (make-file-writable "test/project-i/project-i-autoloads.el"))) (add-after 'unpack 'skip-failing-tests - ;; FIXME: 3 tests are failing. Skip them for now. + ;; FIXME: 2 tests are failing. Skip them for now. (lambda _ - (delete-file "test/upgrade-self.el") - (substitute* "test/doctor.el" - (("\\(ert-deftest eldev-doctor-up-to-date-copyright-2 .*" all) - (string-append all "(skip-unless nil)\n"))))) + (delete-file "test/upgrade-self.el"))) (add-after 'install 'install-eldev-executable ;; This constructs the eldev executable from templates and ;; installs it in the specified directory. @@ -22849,15 +23146,15 @@ interactive commands and functions, such as @code{completing-read}.") (define-public emacs-org-ql (package (name "emacs-org-ql") - (version "0.7.2") + (version "0.7.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/alphapapa/org-ql") - (commit version))) + (commit (string-append "v" version)))) (sha256 (base32 - "1nxjhk0yd0njlscnxvsxnlf1wy6027spcaks64qgvnrzzq9vnzrj")) + "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -22974,7 +23271,7 @@ files to be expanded upon opening them.") (define-public emacs-ebib (package (name "emacs-ebib") - (version "2.39.3") + (version "2.39.4") (source (origin (method git-fetch) @@ -22983,7 +23280,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1azgsjf5j8k6llq74brykidcb2mnq6fghk8jyq7qad5afh7n0mrc")))) + (base32 "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay")))) (build-system emacs-build-system) (propagated-inputs (list emacs-biblio emacs-ivy emacs-parsebib)) @@ -23030,7 +23327,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (define-public emacs-citar (package (name "emacs-citar") - (version "1.3.1") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -23039,7 +23336,7 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") (file-name (git-file-name name version)) (sha256 (base32 - "12chdrmkggnpci1kdkkrz4a2bnsbzc8pra318zbnn3qxinlpngyy")))) + "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv")))) (build-system emacs-build-system) (arguments (list @@ -23052,7 +23349,10 @@ automatically fetched from well-curated sources, and formatted as BibTeX.") #:phases #~(modify-phases %standard-phases (add-before 'build 'set-home (lambda _ - (setenv "HOME" "/tmp")))))) + (setenv "HOME" "/tmp"))) + ;; XXX: The following phase reports bogus errors. Suppress + ;; it for now. + (delete 'validate-compiled-autoloads)))) (propagated-inputs (list emacs-auctex emacs-citeproc-el emacs-embark @@ -26011,11 +26311,10 @@ be changed by customizing the appropriate variables.") (license license:gpl3+))) (define-public emacs-org-caldav - (let ((commit "8569941a0a5a9393ba51afc8923fd7b77b73fa7a") - (revision "2")) + (let ((commit "754989ae500b3f576bdb94fe2ef3059f12eaf7d7")) ;version bump (package (name "emacs-org-caldav") - (version (git-version "0.0.0" revision commit)) + (version "3.0") (source (origin (method git-fetch) @@ -26024,7 +26323,7 @@ be changed by customizing the appropriate variables.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "05lgxqaffnqaqnzl24frafdkskran88hl2ml05qvyjhs4jjbgw9g")))) + (base32 "0vx465di6imfxmxxkhd8lsdgywyz3gnindg0fyvb2zshg3zz80bg")))) (build-system emacs-build-system) (arguments ;; Tests require to have two specific calendars on a test server. @@ -26403,7 +26702,7 @@ tracking.") (define-public emacs-helm-company (package (name "emacs-helm-company") - (version "0.2.5") + (version "0.2.7") (source (origin (method git-fetch) @@ -26413,20 +26712,19 @@ tracking.") (file-name (git-file-name name version)) (sha256 (base32 - "1ci37w6ahnqrfpb284gjvxmimlf61sdxb9k192yy9q983cksv2hx")))) + "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338")))) (build-system emacs-build-system) (propagated-inputs (list emacs-helm emacs-company)) (native-inputs (list emacs-ert-runner)) (arguments - `(#:tests? #t - #:test-command '("ert-runner"))) + (list #:tests? #t + #:test-command #~(list "ert-runner"))) (home-page "https://github.com/Sodel-the-Vociferous/helm-company") - (synopsis "Helm interface for company-mode") + (synopsis "Helm interface for Company mode") (description - "This is a Helm interface to company-mode, a text completion -framework.") + "This is a Helm interface to Company mode, a text completion framework.") (license license:gpl3+))) (define-public emacs-helm-descbinds @@ -26668,7 +26966,7 @@ image, rotate it, save modified images, and more.") (define-public emacs-package-lint (package (name "emacs-package-lint") - (version "0.19") + (version "0.21") (source (origin (method git-fetch) @@ -26678,10 +26976,11 @@ image, rotate it, save modified images, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "0afqvsqz5rx39k7k84ffcnf97px8ckmdgq23w19gdxxnzh7vv87z")))) + "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36")))) (arguments - '(#:include (cons "^data/" %default-include))) + (list #:include #~(cons "^data/" %default-include))) (build-system emacs-build-system) + (propagated-inputs (list emacs-compat)) (home-page "https://github.com/purcell/package-lint") (synopsis "Linting library for Elisp package authors") (description @@ -26782,6 +27081,39 @@ feeding them to package.el library.") @end itemize") (license license:gpl3+)))) +(define-public emacs-sxiv + (package + (name "emacs-sxiv") + (version "0.4.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://tildegit.org/contrapunctus/sxiv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gimq172pp143jckfhhyw319n3vpjvlkadm0vhypycas9i89mcg0")))) + (inputs (list sxiv)) + (propagated-inputs (list emacs-dash)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-sxiv-path + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-sexps "sxiv.el" + (":command + (append" + `(list ,(string-append (assoc-ref inputs "sxiv") + "/bin/sxiv"))))))))) + (build-system emacs-build-system) + (home-page "https://tildegit.org/contrapunctus/sxiv") + (synopsis "Launch sxiv from Emacs with Dired integration") + (description "This package integrates sxiv into Dired. It adds a command +to start sxiv from a Dired buffer, allowing you to mark or unmark image files +in said buffer using sxiv.") + (license license:unlicense))) + (define-public emacs-mu4e-conversation (let ((commit "98110bb9c300fc9866dee8e0023355f9f79c9b96") (revision "5")) @@ -26920,7 +27252,7 @@ them in your web browser.") (define-public emacs-srht (package (name "emacs-srht") - (version "0.2") + (version "0.4") (source (origin (method git-fetch) (uri (git-reference @@ -26929,7 +27261,7 @@ them in your web browser.") (file-name (git-file-name name version)) (sha256 (base32 - "10271yp9w9z27gjjpb7bnsqcrhqyvggrbmic6x1nlrn06vin1qkz")))) + "1kwc792r0kmnb7xhmggjgs8ii14c2rng9ci2k2zwy2zxqm0bynns")))) (build-system emacs-build-system) (arguments (list @@ -27929,16 +28261,16 @@ and comments.") (define-public emacs-yeetube (package (name "emacs-yeetube") - (version "2.0.5") + (version "2.0.7") (source (origin (method git-fetch) (uri (git-reference - (url "https://git.thanosapollo.com/yeetube") + (url "https://git.thanosapollo.org/yeetube") (commit version))) (sha256 (base32 - "1pb6pb624icnjp7210vqrxj4sb38kydfaxc88bj1xmk1dh332h1k")) + "05w33431dfr1ldcg3yq01qvz0alpv8q88r0dsb278qbwszw9cfz6")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -27967,40 +28299,41 @@ This package also includes a @code{yt-dlp} front-end.") (define-public emacs-org-web-tools (package (name "emacs-org-web-tools") - (version "1.1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/alphapapa/org-web-tools") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0v4qad54r0z7dr7kg5lpfdsazi44qvrbybx9aciyl4w9grfajphb")))) + "1w24d1cxzgjqycqz894kg3707n3ckwpv5cmbywfaffsz1v5i2p3a")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-dash emacs-esxml emacs-request emacs-s)) + (list emacs-compat emacs-dash emacs-esxml emacs-request emacs-s)) (inputs (list pandoc)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((pandoc (assoc-ref inputs "pandoc"))) - (substitute* "org-web-tools.el" - (("\"pandoc\"") (string-append "\"" pandoc "/bin/pandoc\""))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((pandoc (search-input-file inputs "/bin/pandoc"))) + (substitute* "org-web-tools.el" + (("\"pandoc\"") (string-append "\"" pandoc "\""))))))))) (home-page "https://github.com/alphapapa/org-web-tools") - (synopsis "Display/Process web page as Org-mode content") - (description "This package contains library functions and commands useful -for retrieving web page content and processing it into Org-mode content. - -For example, you can copy a URL to the clipboard or kill-ring, then run a -command that downloads the page, isolates the “readable” content with -@command{eww-readable}, converts it to Org-mode content with Pandoc, and -displays it in an Org-mode buffer. Another command does all of that but + (synopsis "Display/Process web page as Org mode content") + (description + "This package contains library functions and commands useful +for retrieving web page content and processing it into Org mode content. + +For example, you can copy a URL to the clipboard or kill-ring, then run +a command that downloads the page, isolates the ``readable'' content with +@command{eww-readable}, converts it to Org mode content with Pandoc, and +displays it in an Org mode buffer. Another command does all of that but inserts it as an Org entry instead of displaying it in a new buffer.") (license license:gpl3+))) @@ -28090,6 +28423,27 @@ editors to read the file format and adhere to defined styles. EditorConfig files are easily readable and they work nicely with version control systems.") (license license:gpl3+))) +(define-public emacs-nerd-icons + (package + (name "emacs-nerd-icons") + (version "0.1.0") + (home-page "https://github.com/rainstormstudio/nerd-icons.el") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ggj6lm02m7nb5gxnqs2v2lkxsclml6kq176vam9qyg1fsm7yvdw")))) + (build-system emacs-build-system) + (arguments + (list #:include #~(cons "^data\\/" %default-include))) + (synopsis "Library for easily using nerd font icons inside Emacs") + (description "Nerd-icons an alternative to all-the-icons. It works on both +GUI and terminal, and requires a nerd font installed on your system.") + (license license:gpl3+))) + (define-public emacs-all-the-icons (package (name "emacs-all-the-icons") @@ -29192,7 +29546,7 @@ tabulated-lists).") (define-public emacs-eat (package (name "emacs-eat") - (version "0.8") + (version "0.9.2") (source (origin (method git-fetch) @@ -29202,7 +29556,7 @@ tabulated-lists).") (file-name (git-file-name name version)) (sha256 (base32 - "1fb66g7jjc7dhw61323d94mx7gqfp6ylf9a7v5qym1n92mv48bdr")) + "1mw3iwid2iky0kwpn90bbswx8m4kkni5zdjc75clzhzzygh340sd")) (modules '((guix build utils))) (snippet #~(begin @@ -29235,12 +29589,14 @@ tabulated-lists).") (list texinfo)) (inputs (list ncurses)) + (propagated-inputs + (list emacs-compat)) (home-page "https://codeberg.org/akib/emacs-eat") (synopsis "Terminal emulator in Emacs") (description "Eat (Emulate A Terminal) is a terminal emulator in Emacs, written in -pure Elisp. It has features like complete mouse support and shell -integration.") +pure Elisp. It has features like Sixel support, complete mouse support and +shell integration.") (license license:gpl3+))) (define-public emacs-vterm @@ -29604,26 +29960,30 @@ opposed to character-based).") (license license:gpl1+)))) (define-public emacs-disk-usage - (package - (name "emacs-disk-usage") - (version "1.3.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/Ambrevar/emacs-disk-usage") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0hv2gsd8k5fbjgckgiyisq4rn1i7y4rchbjy8kmixjv6mx563bll")))) - (build-system emacs-build-system) - (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage") - (synopsis "Sort and browse disk usage listings with Emacs") - (description "Disk Usage is a file system analyzer: it offers a tabulated + ;; Use a recent commit as the last release is missing changes from 2020 + ;; onwards + (let ((commit "b0d803f2cec3afc2937840f9ba66e3f903d6c415") + (revision "0")) + (package + (name "emacs-disk-usage") + (version (git-version "1.3.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/Ambrevar/emacs-disk-usage") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vl79knb2snp2gzmcdasncgcc44rq99kmfnvwhfpm0wk21nxhc1m")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage") + (synopsis "Sort and browse disk usage listings with Emacs") + (description "Disk Usage is a file system analyzer: it offers a tabulated view of file listings sorted by size. Directory sizes are computed recursively. The results are cached for speed.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-orgit (package @@ -30321,7 +30681,7 @@ real search.") (define-public emacs-notmuch-indicator (package (name "emacs-notmuch-indicator") - (version "1.0.1") + (version "1.1.0") (home-page "https://git.sr.ht/~protesilaos/notmuch-indicator") (source (origin (method url-fetch) @@ -30330,7 +30690,7 @@ real search.") ".tar")) (sha256 (base32 - "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x")))) + "0k5csfrs8y1r6g7hs2y0961jpx0ih090kb6rkijljny2qhfj0573")))) (build-system emacs-build-system) (synopsis "Display a mode line indicator with @code{notmuch-count} output") (description "This package renders an indicator with an email count of the @@ -30958,6 +31318,29 @@ generating a temp buffer in which any useful Emacs utilities and modes can be invoked.") (license license:gpl3+)))) +(define-public emacs-exwm-mff + (let ((commit "89206f2e3189f589c27c56bd2b6203e906ee7100") + (revision "1")) + (package + (name "emacs-exwm-mff") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-mff.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ipmapyd4jmpnk34wk9kfbvqnl04x74yg2pmj298wqa61ylw1n9j")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/exwm-mff") + (synopsis "Mouse follows focus for EXWM") + (description "This package provides a minor mode to automatically warp +the mouse pointer to the center of a focused window, as well as a command to +warp it to the currently selected window.") + (license (list license:gpl3+))))) + (define-public emacs-exwm-modeline (package (name "emacs-exwm-modeline") @@ -30979,6 +31362,78 @@ invoked.") workspaces.") (license license:gpl3+))) +(define-public emacs-exwm-firefox-core + (let ((commit "e2fe2a895e8f973307ef52f8c9976b26e701cbd0") + (revision "1")) + (package + (name "emacs-exwm-firefox-core") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/walseb/exwm-firefox-core.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k5jkjzx6f8nfmbkc61raj585p9pymycgzv7rr3fhv2drgkaa4yi")))) + (inputs (list emacs-exwm)) + (build-system emacs-build-system) + (home-page "https://github.com/walseb/exwm-firefox-core") + (synopsis "Control Firefox with EXWM") + (description + "This package contains functions that execute exwm +keypresses mapped in firefox to the action described in the function name.") + (license (list license:gpl3+))))) + +(define-public emacs-exwm-firefox + (let ((commit "7390c3bc425894aeda3c12c23f61a234bb71a2d9") + (revision "1")) + (package + (name "emacs-exwm-firefox") + (version (git-version "0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-firefox.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xmgij04h4cbcgqafyyf9qajf0wp6mxpfpwjm6gi1jgisrql882d")))) + (build-system emacs-build-system) + (inputs (list emacs-exwm-firefox-core emacs-s emacs-exwm)) + (home-page "https://codeberg.org/emacs-weirdware/exwm-firefox") + (synopsis "Enhanced support for Firefox under EXWM") + (description + "This package adds enhanced support for Firefox (and forks +based on Firefox) under EXWM. Keybindings intentionally mirror other Emacs +navigation controls.") + (license (list license:gpl3+))))) + +(define-public emacs-exwm-ss + (let ((commit "b11d3df7a50c39b4e1b92ef8a6685cf80b53912c") + (revision "1")) + (package + (name "emacs-exwm-ss") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/exwm-ss.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "045b0cjycf7nf52ap89w5dz16l1qyh940qxwvdi76v6al78amrap")))) + (build-system emacs-build-system) + (inputs (list emacs-exwm)) + (home-page "https://codeberg.org/emacs-weirdware/exwm-ss") + (synopsis "Automatically inhibit screensaver activation in EXWM") + (description "This package provides a global minor mode to inhibit +screensaver activation in EXWM.") + (license (list license:gpl3+))))) + (define-public emacs-ert-async (package (name "emacs-ert-async") @@ -31361,13 +31816,13 @@ current tree.") "This package dynamically generates org-agenda-files.") (license license:gpl3+))) -(define-public emacs-org-ql-dynamic-agenda +(define-public emacs-org-dynamic-agenda-ql (package (inherit emacs-org-dynamic-agenda) - (name "emacs-org-ql-dynamic-agenda") + (name "emacs-org-dynamic-agenda-ql") (arguments (list #:include - #~(list "org-ql-dynamic-agenda\\.el" "README\\.org"))) + #~(list "org-dynamic-agenda-ql\\.el" "README\\.org"))) (propagated-inputs (list emacs-org-ql)) (description "This package dynamically generates org-agenda-files, and take advantage @@ -31821,14 +32276,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.1.3") + (version "2.6.1.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "0z7q55yilwicgzl2m69r275pq6bzpyksxcjaf8fb3bcr3zvzil0y")))) + (base32 "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi")))) (build-system emacs-build-system) (arguments (list @@ -32192,14 +32647,14 @@ advice system without dropping support for Emacs<24.4.") (define-public emacs-url-http-ntlm (package (name "emacs-url-http-ntlm") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "url-http-ntlm-" version ".el")) + "url-http-ntlm-" version ".tar")) (sha256 - (base32 "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98")))) + (base32 "0bpjif0c4yzz75v59wsv7hilkpj2gv4kyc0rdk8h3d9hvmlq7791")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ntlm)) (home-page "https://elpa.gnu.org/packages/url-http-ntlm.html") @@ -32765,7 +33220,7 @@ simple but powerful Org contents.") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/nsavage/ox-rss") + (url "https://github.com/BenedictHW/ox-rss") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -32827,40 +33282,37 @@ time.") (license license:gpl3+))) (define-public emacs-mastodon - ;; No release in ~1 year, hence this snapshot. - (let ((commit "20dec8871c9bb5f5e418bfc197e7533b5e3065e3") - (revision "1")) - (package - (name "emacs-mastodon") - (version (git-version "1.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://codeberg.org/martianh/mastodon.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15cfjny99yw5frdp8nlyazlwgscvfvbinsj0fbdfprxf50k2zjs6")))) - (build-system emacs-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Move the source files to the top level, which is included in - ;; the EMACSLOADPATH. - (add-after 'unpack 'move-source-files - (lambda _ - (let ((el-files (find-files "./lisp" ".*\\.el$"))) - (for-each (lambda (f) - (rename-file f (basename f))) - el-files))))))) - (propagated-inputs - (list emacs-request emacs-ts emacs-persist)) - (home-page "https://codeberg.org/martianh/mastodon.el") - (synopsis "Emacs client for Mastodon") - (description "@code{mastodon.el} is an Emacs client for Mastodon, the + (package + (name "emacs-mastodon") + (version "1.0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/martianh/mastodon.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2")))) + (build-system emacs-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + ;; Move the source files to the top level, which is + ;; included in the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f + (basename f))) + el-files))))))) + (propagated-inputs (list emacs-request emacs-ts emacs-persist)) + (home-page "https://codeberg.org/martianh/mastodon.el") + (synopsis "Emacs client for Mastodon") + (description "@code{mastodon.el} is an Emacs client for Mastodon, the federated microblogging social network.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-ebdb (package @@ -33771,11 +34223,11 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "17bfa50c8f2e70daeb8866f3bf195f15623ab520") - (revision "1")) + (let ((commit "4f08c835c08e762137ca04e12055cf9dc0b2b8cf") + (revision "0")) (package (name "emacs-telega-server") - (version (git-version "0.8.03" revision commit)) + (version (git-version "0.8.203" revision commit)) (source (origin (method git-fetch) @@ -33783,7 +34235,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "1057zr4g8llxmzy47l5klyi89x66q8qx5vrd50pmpsp4c6772jz9")) + (base32 "02iv2cxwsmfpx2b6wvp7l22izvqw21f1b98jm0yihmfh39idxwn8")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" @@ -33894,7 +34346,7 @@ contributed packages to Telega."))) (define-public emacs-doom-modeline (package (name "emacs-doom-modeline") - (version "3.4.0") + (version "4.0.1") (source (origin (method git-fetch) @@ -33902,14 +34354,14 @@ contributed packages to Telega."))) (url "https://github.com/seagle0128/doom-modeline") (commit (string-append "v" version)))) (sha256 - (base32 "1z5cqn33v7sjihs05ycz1yzi5wcg90yn3cy09qj9g5g8pjs8qdki")) + (base32 "0pwfmj01cqij84dig5qj86n7f4cva5mdjqahr0061byrlv9xrpzb")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments `(#:test-command '("ert-runner"))) (native-inputs (list emacs-ert-runner)) (propagated-inputs - (list emacs-all-the-icons emacs-compat emacs-dash emacs-shrink-path)) + (list emacs-nerd-icons emacs-compat emacs-shrink-path)) (synopsis "Fancy and fast mode-line inspired by minimalism design") (description "Doom modeline is a complete modeline for GNU Emacs inspired by the Doom theme collection. This modeline features support for mode-specific @@ -34459,6 +34911,52 @@ on removable volumes in Linux.") (home-page "https://github.com/Akirak/helm-linux-disks") (license license:gpl3+)))) +(define-public emacs-debase + (let ((commit "0b6fc2af3440d68798e3a85d4c889341aae07936") + (revision "1")) + (package + (name "emacs-debase") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/debase.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "112vk1svnc6516vhs47sx5jw6bg8lwrc15l99dxj0sc313lxjy3k")))) + (build-system emacs-build-system) + (inputs (list)) + (home-page "https://codeberg.org/emacs-weirdware/debase") + (synopsis "D-Bus convenience layer for Emacs") + (description + "Debase provides a higher-level API for using and implementing D-Bus +services inside Emacs.") + (license (list license:gpl3+))))) + +(define-public emacs-discomfort + (let ((commit "873eea833bbae7196b92bb1102494b8bf5dc5df6") + (revision "1")) + (package + (name "emacs-discomfort") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/discomfort.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01p4bfiasqxfmp9x1bxdc7763bh712d3vlp2014y8pzrwb1jqdaq")))) + (build-system emacs-build-system) + (inputs (list emacs-debase)) + (home-page "https://codeberg.org/emacs-weirdware/discomfort") + (synopsis "User interface to mount & unmount disks in Emacs.") + (description "Discomfort is an interface to mount and unmount disks in Emacs, using UDisks2.") + (license (list license:gpl3+))))) + (define-public emacs-psession (let ((commit "3e97267c92b164584e06a6c70ee7491714c7c12c") (revision "1")) @@ -34806,14 +35304,14 @@ example code.") (define-public emacs-buffer-env (package (name "emacs-buffer-env") - (version "0.4") + (version "0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/buffer-env-" version ".tar")) (sha256 (base32 - "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z")))) + "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) (home-page "https://github.com/astoff/buffer-env") @@ -35546,10 +36044,11 @@ conventions.") #:phases #~(modify-phases %standard-phases (add-after 'install 'install-snippets - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (let ((snippets (string-append - #$output "/share/emacs/site-lisp/snippets/haskell-mode"))) + (elpa-directory (assoc-ref outputs "out")) + "/snippets/haskell-mode"))) (mkdir-p snippets) (copy-recursively "snippets/haskell-mode" snippets))))))) (propagated-inputs @@ -35812,6 +36311,26 @@ should replace it. However, if you call them again immediately after, they restore that occurrence of the placeholder and move to the next.") (license license:gpl3+)))) +(define-public emacs-pddl-mode + (package + (name "emacs-pddl-mode") + (version "0.100") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsmirror/pddl-mode") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zq5a0sv8am1c1gxky80dsi39gqsgnwbasv3nw4993r3ccz180r8")))) + (build-system emacs-build-system) + (home-page "https://github.com/emacsmirror/pddl-mode") + (synopsis "Emacs mode for PDDL files") + (description "This package provides a major mode for browsing and editing +PDDL files with syntax highlighting, templates, auto-completion, and more.") + (license license:gpl2+))) + (define-public emacs-plantuml-mode (package (name "emacs-plantuml-mode") @@ -35967,6 +36486,80 @@ easily. Four pre-set options are: @samp{shell}, @samp{terminal}, you use some other configuration.") (license license:gpl3+)))) +(define-public emacs-shell-here + (let ((commit "eeb437ff26d62a5009046b1b3b4503b768e3131a") + (revision "1")) + (package + (name "emacs-shell-here") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/shell-here.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x8lnybxj7k6wj941lgqmm57f3qqnmb0gc7573l1fxwfhf39fl20")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/shell-here") + (synopsis "Launch a shell relative to default-directory") + (description + "This package provides commands to open a shell buffer in (or relative +to) the default-directory or – using projectile or find-file-in-project – a +project root.") + (license (list license:gpl3+))))) + +(define-public emacs-hyperspace + (let ((commit "f574d07fd8715e806ba4f0487b73c699963baed3") + (revision "1")) + (package + (name "emacs-hyperspace") + (version (git-version "0.8.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/hyperspace.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19h3d12a99i7a92k3iw4zmjmw3dazsgnkc6j4965h033r1s40amx")))) + (build-system emacs-build-system) + (inputs (list emacs-s)) + (home-page "https://codeberg.org/emacs-weirdware/hyperspace") + (synopsis "Get there from here") + (description + "Hyperspace is a way to get nearly anywhere from wherever +you are, whether that's within Emacs or on the web. It's somewhere in between +Quicksilver and keyword URLs, giving you a single, consistent interface to get +directly where you want to go. It’s for things that you use often, but not +often enough to justify a dedicated binding.") + (license (list license:gpl3+))))) + +(define-public emacs-nssh + (let ((commit "74d43738565749af680e4d1388e0c2f88e93498d") + (revision "1")) + (package + (name "emacs-nssh") + (version (git-version "0.9.12" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/emacs-weirdware/nssh.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i2nnrg7xv7b2bbby6idszs9byk2jd83q7vqj6lxgn80w94i56nn")))) + (build-system emacs-build-system) + (home-page "https://codeberg.org/emacs-weirdware/nssh") + (synopsis "SSH mode for Emacs") + (description "This package provides an SSH mode for Emacs, built on +top of Tramp and shell mode. It keeps a history of previously connected +hosts and supports auto-completion of known hosts.") + (license (list license:gpl3+))))) + (define-public emacs-tshell ;; XXX: Upstream has no tagged release. Version is extracted from keyword ;; in main file. @@ -36824,7 +37417,7 @@ and preferred services can easily be configured.") (define-public emacs-ivy-avy (package (name "emacs-ivy-avy") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) @@ -36832,7 +37425,7 @@ and preferred services can easily be configured.") "https://elpa.gnu.org/packages/" "ivy-avy-" version ".tar")) (sha256 - (base32 "0gjpvjahhkxsakqrcni78v71fsrh3f0jrs55a4kqc5hv6qyn8hk9")))) + (base32 "0vdrfn2i078567lklhxfhzq2cjplfpawyq2rzpdpww0fzz6fi426")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-avy)) @@ -36916,7 +37509,7 @@ files, providing syntax highlighting and indentation rules.") (define-public emacs-ivy-hydra (package (name "emacs-ivy-hydra") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) @@ -36924,7 +37517,7 @@ files, providing syntax highlighting and indentation rules.") "https://elpa.gnu.org/packages/" "ivy-hydra-" version ".tar")) (sha256 - (base32 "1gsjr2yny9qcj56cb4xy47la11z0lszq0f2qws0yzyh02ng30k1n")))) + (base32 "10qav0rvgc5bnlazjiwnv9dlk6hivl4acif0zq2f0qqgld9nh528")))) (build-system emacs-build-system) (propagated-inputs (list emacs-ivy emacs-hydra)) @@ -37000,6 +37593,40 @@ dict.org) from within Emacs.") to the @url{https://multitran.com} online dictionary.") (license license:gpl3+))) +(define-public emacs-lexic + (let ((commit "f9b3de4d9c2dd1ce5022383e1a504b87bf7d1b09") + (revision "0")) + (package + (name "emacs-lexic") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.tecosaur.net/tec/lexic") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02iz8dh18gb1q97v8ghcd3lavkf28sqbrk0bx6jzzryp69ickk4h")))) + (build-system emacs-build-system) + (inputs (list sdcv)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-sdcv-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (emacs-substitute-variables "lexic.el" + ("lexic-program-path" + (string-append (assoc-ref inputs "sdcv") + "/bin/sdcv")))))))) + (home-page "https://git.tecosaur.net/tec/lexic") + (synopsis "Find out more about words using Stardict dictionaries") + (description "This provides a major mode to view the output of +dictionary tools, and utilities that perform searches and nicely format the +results. Currently tied to sdcv, but this is intended to be changed in the +future.") + (license license:gpl3+)))) + (define-public emacs-blacken (package (name "emacs-blacken") @@ -37059,10 +37686,10 @@ execute code split into cells according to certain magic comments.") (define-public emacs-ein ;; XXX: Upstream doesn't make any release, and didn't set any version. - (let ((commit "b2410dc96f61aa806a7934099d8f1e40c8f6ca18")) + (let ((commit "998ba22660be2035cd23bed1555e47748c4da8a2")) (package (name "emacs-ein") - (version "20220911") + (version "20230826") (source (origin (method git-fetch) @@ -37073,7 +37700,7 @@ execute code split into cells according to certain magic comments.") (file-name (git-file-name name version)) (sha256 (base32 - "02392bxl0msda58cls0i79mzqjs73x39czx0mlb0sg2vxp84gy15")))) + "09qbswzz6kbxc74dmdgagrk5wgbm89sabf0bfy76j4qlcg6550mx")))) (build-system emacs-build-system) (arguments (list @@ -37633,7 +38260,7 @@ hacker.") (define-public emacs-osm (package (name "emacs-osm") - (version "0.13") + (version "0.14") (source (origin (method git-fetch) (uri (git-reference @@ -37642,7 +38269,7 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "0i1lks8724i2nz9jk5csl4nfkyi49fc928a117sn7438z82r9gyr")))) + "1y0zkfc27pnhz5hqpapsqin2kc6al1zjgd6cd4nhzqmh49h81bsb")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -38073,8 +38700,8 @@ Emacs.") (define-public emacs-semi-epg ;; No release since Dec 24, 2003. - (let ((commit "9370961ddcee78e389e44b36d38c3d93f8351619") - (revision "246")) + (let ((commit "d15603b8eb791f2057b48071c262996ad7767505") + (revision "247")) (package (name "emacs-semi-epg") (version (git-version "1.14.6" revision commit)) @@ -38086,7 +38713,7 @@ Emacs.") (file-name (git-file-name name version)) (sha256 (base32 - "13f267j0mrji9cvjhq129nslrj2gwvq7ibsz384a4qilxf5rhccc")))) + "0cxrzgxflwgz9wsim84vrliwvkf53v242di4dvn2dfh65gccwqjx")))) (build-system emacs-build-system) (propagated-inputs (list emacs-flim-lb)) (inputs (list emacs-bbdb-vcard)) @@ -38100,15 +38727,11 @@ EasyPG and latest Emacs.") (define-public emacs-wanderlust ;; No release since Jan 15, 2010. - ;; FIXME: Building with emacs-next-pgtk would yield a void variable related - ;; macro-expansion failure at runtime, so don't rewrite emacs input of this - ;; package. - (let ((version "2.15.9") - (revision "791") - (commit "8369b2d5170a174652294835dd9a18ed21a38cb2")) + (let ((commit "3e8cf26abd9c5c8e4fc611032e259ca930665641") + (revision "803")) (package (name "emacs-wanderlust") - (version (git-version version revision commit)) + (version (git-version "2.15.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -38126,7 +38749,7 @@ EasyPG and latest Emacs.") (("package-user-dir") "NONE")))) (sha256 (base32 - "0nqa9z61r308j61rgglacjsfddncbm185gp3rnzqkrpb5qsjzngk")))) + "0k9r3j7pcnvnnj0km8ggjdrf2nfgn1mfq7r7267bk3r3x92cvqh9")))) (build-system emacs-build-system) (arguments (list #:phases @@ -38262,6 +38885,24 @@ In particular, it saves and restores project files and window configurations across sessions.") (license license:gpl3+)))) +(define-public emacs-poke-mode + (package + (name "emacs-poke-mode") + (version "3.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/poke-mode-" version + ".tar")) + (sha256 + (base32 "1lirhws5d8l16qs5ddrvvz0f9xfl004q9yp333pdgsmcpk3ww7sr")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/poke-mode.html") + (synopsis "Major mode for editing GNU poke programs") + (description + "This package provides a major mode for editing GNU poke programs.") + (license license:gpl3+))) + (define-public emacs-vcard-mode ;; Use the latest commit, as there are no tagged releases. (let ((commit "ab1a2885a5720d7fb02d9b6583ee908ba2260b78") diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 72b2c7795e..b9d9e2b891 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -498,7 +498,12 @@ editor (with wide ints)" ) (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))))))) + (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9")) + (patches + (search-patches "emacs-next-exec-path.patch" + "emacs-fix-scheme-indent-function.patch" + "emacs-next-native-comp-driver-options.patch" + "emacs-pgtk-super-key-fix.patch"))))))) (define* (emacs->emacs-next emacs #:optional name #:key (version (package-version emacs-next-minimal)) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index e991f52a66..313675814a 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -46,7 +46,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) - #:use-module ((gnu packages base) #:prefix base:) + #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -672,7 +672,7 @@ language.") (list autoconf automake libtool - base:which + which pkg-config texinfo)) (inputs @@ -1152,7 +1152,7 @@ simulator.") ("flex" ,flex) ("bison" ,bison) ("guile-1.8" ,guile-1.8) - ("which" ,base:which))) + ("which" ,which))) (synopsis "Binutils for VC4") (description "This package provides @code{binutils} for VideoCore IV, the Raspberry Pi chip.") @@ -1241,7 +1241,7 @@ hardware. The utility support USB and UART as serial link.") (inputs (list libftdi python)) (native-inputs - (list pkg-config swig base:which)) + (list pkg-config swig which)) (arguments `(#:tests? #f ; No tests exist. #:parallel-build? #f ; Would be buggy. @@ -1592,7 +1592,7 @@ handling communication with eBUS devices connected to a 2-wire bus system (define-public ucsim (package (name "ucsim") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append @@ -1601,7 +1601,7 @@ handling communication with eBUS devices connected to a 2-wire bus system "ucsim_" version "_orig.tar.gz")) (sha256 (base32 - "0qyrrna2ssvwla15al183r9zqnqdxxlqawyhx9c86a10m8q8qqlz")))) + "1zdvzfhdsbydyyjy5rf2934bn06skdlnky6l9ngbp2k645g0ynlh")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 3fba4d6fcc..e2036ca5cc 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 c4droid <c4droid@foxmail.com> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 Hendursaga <hendursaga@aol.com> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -111,7 +112,8 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #: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 vice (package @@ -1432,7 +1434,7 @@ as RetroArch.") (define-public retroarch (package (name "retroarch") - (version "1.15.0") + (version "1.16.0.3") (source (origin (method git-fetch) @@ -1441,7 +1443,7 @@ as RetroArch.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ii31mc7wfd386rzyxqk8nmx5a13f9iqz47991z4zx0d8gqcchzg")))) + (base32 "1nvvd78hx1s73nif7g02pqms29b9v072mxnld0vmsh78236qngq5")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1472,26 +1474,36 @@ as RetroArch.") ;; Non-free software are available through the core updater, ;; disable it. See <https://issues.guix.gnu.org/38360>. "--disable-update_cores" - "--disable-builtinzlib"))))))) + "--disable-builtinmbedtls" + "--disable-builtinbearssl" + "--disable-builtinzlib" + "--disable-builtinflac" + "--disable-builtinglslang"))))))) (inputs - `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg-4) - ("freetype" ,freetype) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxv" ,libxv) - ("mesa" ,mesa) - ("openal" ,openal) - ("pulseaudio" ,pulseaudio) - ("python" ,python) - ("qtbase" ,qtbase-5) - ("sdl" ,sdl2) - ("udev" ,eudev) - ("vulkan-loader" ,vulkan-loader) - ("wayland" ,wayland) - ("zlib" ,zlib))) + (list alsa-lib + eudev + ffmpeg + flac + freetype + glslang + libxinerama + libxkbcommon + libxml2 + libxrandr + libxv + mbedtls-apache + mesa + openal + openssl + pulseaudio + python + qtbase-5 + sdl2 + spirv-headers + spirv-tools + vulkan-loader + wayland + zlib)) (native-inputs (list pkg-config wayland-protocols which)) (native-search-paths @@ -2436,16 +2448,16 @@ system.") (define-public exomizer (package (name "exomizer") - (version "3.1.1") + (version "3.1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://bitbucket.org/magli143/exomizer.git") - (commit "6a152b5605648f7a41eadd4b011a93ec92f74dd8"))) + (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1ynhkb5p2dypkikipc3krzif264l9rmx1wnjzzgw8n88i4zkymzg")))) + "04795l75nlbz0g5gp1xx8kiwbrm5pv5pj24ja02cnan6mglj7j0w")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No target exists @@ -2483,6 +2495,29 @@ on a Commodore C64, C128 etc.") ;; zlib license with an (non-)advertising clause. (license license:zlib))) +(define-public qtrvsim + (package + (name "qtrvsim") + (version "0.9.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cvut/qtrvsim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zi39q8ajkzl8d47sacj0dk1a2n5jmfgr29x9iby59v792g7p8ac")) + (modules '((guix build utils))) + (snippet #~(begin (delete-file-recursively "external/libelf"))))) + (build-system qt-build-system) + (inputs (list libelf qtbase-5)) + (home-page "https://github.com/cvut/qtrvsim") + (synopsis "RISC-V CPU simulator for education purposes") + (description "RISC-V CPU simulator for education purposes with pipeline and +cache visualization. Developed at FEE CTU for computer architecture classes.") + (license license:gpl3+))) + (define-public cc65 (package (name "cc65") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f2953068ca..e4e302e2a4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2022, 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Theofilos Pechlivanis <theofilos.pechlivanis@gmail.com> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,7 +124,9 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages m4) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages maths) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) @@ -854,25 +857,30 @@ and others.") (define-public gerbv (package (name "gerbv") - (version "2.7.0") + (version "2.10.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/gerbv/gerbv/gerbv-" - version "/gerbv-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gerbv/gerbv") + (commit (string-append "v" version)))) (sha256 (base32 - "1d2k43k7i4yvbpi4sw1263a8d0q98z2n7aqhmpinpkih8a681vn5")))) + "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("CFLAGS=-fcommon"))) - (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. - ("desktop-file-utils" ,desktop-file-utils) - ("pkg-config" ,pkg-config))) - (inputs - `(("cairo" ,cairo) - ("gtk" ,gtk+-2))) - (home-page "http://gerbv.geda-project.org/") + (native-inputs (list autoconf + automake + desktop-file-utils + gettext-minimal + `(,glib "bin") + libtool + pkg-config)) + (inputs (list cairo + ;; As of 2.10.0 gerbv is still GTK+2 only. GTK 3/4 porting + ;; issue: https://github.com/gerbv/gerbv/issues/71. + gtk+-2)) + (home-page "https://gerbv.github.io/") (synopsis "Gerber file viewer") (description "Gerbv is a viewer for files in the Gerber format (RS-274X only), which @@ -1086,7 +1094,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "7.0.8") + (version "7.0.9") (source (origin (method git-fetch) (uri (git-reference @@ -1094,7 +1102,7 @@ Emacs).") (commit version))) (sha256 (base32 - "1gaj833hm3avyb7gyjnl4jk9cckcmj8084y6q45ysjvh283rxsy4")) + "1hq9rba1gcks14zwbr8nbicpsil4imslgfch6ll33fhizbks3fq4")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1194,7 +1202,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "1ya9kwcbsh8cqbinjr1hr14sd0g6rls1awmvw8hwd7715f97x8fg")))) + "14dg99fvl6av9sn6gig6d6k1sdcf2svxy4fipqcz994z2khhz1sj")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1228,7 +1236,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "176zb7df25vz3wbhs94plmpabcgzxsnzbqmpdyssqr7m2wb2424a")))) + "0ynsnjq3z126cjkgm1fjbjvdvpc0walnr42ya9dv46l27kxy2j77")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1257,7 +1265,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1560m5mwwq0jrjhr8zdh2xrm1w7pgr250p81xzhdc4wj7zsb0rrp")))) + "16a4c2xs4i8wbm01a901yxabxk0qdsjkzlccfawddv82bkh4b87h")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1274,7 +1282,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "1ypy2nzs1x8i98jr5kmlxfd6y592qs22aq73yl8nq0s6640fc4kk")))) + "1cly28vc07i54v487zbb8d1h70nrd3naxvq146b0xnbrjwnd2q28")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) @@ -1351,42 +1359,47 @@ the 'showing the effect of'-style of operation.") (license license:gpl2+))) (define-public valeronoi -(package - (name "valeronoi") - (version "0.1.6") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/ccoors/Valeronoi") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1hpyh4mmjnxgkij7a6rynk2ril5413nkdvf8syn0lqvrmibdg7wv")))) - (build-system cmake-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "./valeronoi-tests"))))))) - (inputs - (list boost - cgal - gmp - libxkbcommon - mpfr - openssl - qtbase-5 - qtsvg-5)) - (home-page "https://github.com/ccoors/Valeronoi") - (synopsis "WiFi mapping companion application for Valetudo") - (description - "Valeronoi (Valetudo + Voronoi) is a companion for Valetudo for generating + (package + (name "valeronoi") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccoors/Valeronoi") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qkhrqkjsmm0h1bxf2ihkqfhdr18xx5x1i2ds1mla13zm0bw2570")) + (snippet #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "3rdparty") + (substitute* '("tests/test_colormap.cpp" + "tests/test_main.cpp") + (("catch\\.hpp") + "catch2/catch.hpp")))))) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./valeronoi-tests"))))))) + (inputs (list boost + cgal + gmp + libxkbcommon + mpfr + openssl + qtbase + qtsvg)) + (native-inputs (list catch2)) + (home-page "https://github.com/ccoors/Valeronoi") + (synopsis "WiFi mapping companion application for Valetudo") + (description + "Valeronoi (Valetudo + Voronoi) is a companion for Valetudo for generating WiFi signal strength maps. It visualizes them using a Voronoi diagram.") - (license license:gpl3+))) + (license license:gpl3+))) (define-public volk (package @@ -2318,33 +2331,101 @@ parallel computing platforms. It also supports serial execution.") (define-public librepcb (package (name "librepcb") - (version "0.1.5") + (version "1.0.0") (source (origin (method url-fetch) (uri (string-append "https://download.librepcb.org/releases/" version "/librepcb-" version "-source.zip")) + (modules `((guix build utils))) + (snippet + ;; Delete libraries that we already have or don't need. + ;; TODO: try to unbundle more (see lib/). + `(begin + (let ((third-parties '("fontobene-qt5" + "googletest" + "hoedown" + "muparser" + "polyclipping" + "quazip"))) + (with-directory-excursion "libs" + (map (lambda (third-party) + (delete-file-recursively third-party)) + third-parties))))) (sha256 - (base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr")))) - (build-system gnu-build-system) + (base32 "02qfwyhdq1pklb5gkwn3rbsdhwvcgiksd21swaphz3kw6s4p9i8v")))) + (build-system cmake-build-system) (inputs - (list qtbase-5 qtsvg-5 zlib)) + (list clipper + fontconfig + fontobene-qt5 + glu + hoedown + muparser + opencascade-occt + qtbase-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + quazip + zlib)) (native-inputs - (list qttools-5 ; for lrelease + (list googletest + pkg-config + qttools-5 unzip)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (mkdir-p "build") - (chdir "build") - (let ((lrelease (search-input-file inputs "/bin/lrelease")) - (out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "QMAKE_LRELEASE=" lrelease) - (string-append "PREFIX=" out) - "../librepcb.pro"))))))) + `(#:configure-flags (list + "-DUNBUNDLE_FONTOBENE_QT5=ON" + "-DUNBUNDLE_GTEST=ON" + "-DUNBUNDLE_HOEDOWN=ON" + "-DUNBUNDLE_MUPARSER=ON" + "-DUNBUNDLE_POLYCLIPPING=ON" + "-DUNBUNDLE_QUAZIP=ON") + #:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (let ((test-include (list "*")) + (test-exclude + (list + ;; These tests all fail when run by the build + ;; process even though they pass when manually + ;; run as a normal user. + + ;; TODO: verify that the failing tests don't + ;; point to any actual underlying issues + "SystemInfoTest.testGetUsername" + "OrderPcbDialogTest.testAutoOpenBrowser" + "DxfImportDialogTest.testLayerName" + "DxfImportDialogTest.testCirclesAsDrills" + "DxfImportDialogTest.testJoinTangentPolylines" + "DxfImportDialogTest.testLineWidth" + "DxfImportDialogTest.testScaleFactor" + "DxfImportDialogTest.testPlacementPosition" + "GraphicsExportDialogTest.testPageSize" + "GraphicsExportDialogTest.testOrientation" + "GraphicsExportDialogTest.testMargins" + "GraphicsExportDialogTest.testShowPinNumbers" + "GraphicsExportDialogTest.testRotate" + "GraphicsExportDialogTest.testMirror" + "GraphicsExportDialogTest.testScale" + "GraphicsExportDialogTest.testPixmapDpi" + "GraphicsExportDialogTest.testBlackWhite" + "GraphicsExportDialogTest.testBackgroundColor" + "GraphicsExportDialogTest.testMinLineWidth" + "GraphicsExportDialogTest.testLayerColors" + "GraphicsExportDialogTest.testOpenExportedFiles" + "AddComponentDialogTest.testAddMore"))) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QT_QUICK_BACKEND" "software") + (display "Running unittests...\n") + (invoke "./tests/unittests/librepcb-unittests" + (string-append + "--gtest_filter=" + (string-join test-include ":") + "-" + (string-join test-exclude ":")))))))))) (home-page "https://librepcb.org/") (synopsis "Electronic Design Automation tool") (description "LibrePCB is @dfn{Electronic Design Automation} (EDA) @@ -2352,17 +2433,12 @@ software to develop printed circuit boards. It features human readable file formats and complete project management with library, schematic and board editors.") (license (list license:gpl3+ - license:boost1.0 ; libs/clipper, - ; libs/optional/tests/catch.hpp, - ; libs/sexpresso/tests/catch.hpp + license:boost1.0 ; libs/optional/tests/catch.hpp, license:expat ; libs/delaunay-triangulation, ; libs/parseagle, libs/type_safe - license:asl2.0 ; libs/fontobene, libs/googletest, - ; libs/parseagle - license:isc ; libs/hoedown - license:cc0 ; libs/optional, libs/sexpresso - license:bsd-2 ; libs/optional/tests/catch.hpp - license:lgpl2.1+)))) ; libs/quazip + license:asl2.0 ; libs/parseagle + license:cc0 ; libs/optional + license:bsd-2)))) ; libs/optional/tests/catch.hpp (define-public gpx (package @@ -2600,7 +2676,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (define-public python-scikit-rf (package (name "python-scikit-rf") - (version "0.29.1") + (version "0.30.0") (source (origin (method git-fetch) ;PyPI misses some files required for tests (uri (git-reference @@ -2608,7 +2684,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (commit (string-append "v" version)))) (sha256 (base32 - "11pbcgbq34xyjv5gjwi3a8cpgqqwmd73ps1fwyjajl26q2nkmcdh")) + "1fbws80glrakd08xzhifna831yk0bd8b0cizhfcjkg4km2nyx65c")) (file-name (git-file-name name version)))) (build-system pyproject-build-system) (propagated-inputs (list python-matplotlib @@ -2745,7 +2821,7 @@ comments."))) (define-public freecad (package (name "freecad") - (version "0.21.1") + (version "0.21.2") (source (origin (method git-fetch) @@ -2754,7 +2830,7 @@ comments."))) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qwh6b1s432j5piwgfkphvz0slmxf0m8m8pdr3ny9zna9mghz42k")))) + (base32 "0s720q6vxlh78jzahqp69nl8wagb42l05dym5aqhfnr31dx666hc")))) (build-system qt-build-system) (native-inputs (list doxygen @@ -3179,18 +3255,21 @@ program that can perform mesh processing tasks in batch mode, without a GUI.") (delete-file "libpoke/pvm-vm1.c") (delete-file "libpoke/pvm-vm2.c"))))) (build-system gnu-build-system) - ;; The GUI, which we elide, requires tcl and tk. (native-inputs (list bison dejagnu flex libtool pkg-config)) ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). - (inputs (list json-c libgc readline libtextstyle)) + (inputs (list libgc readline libtextstyle)) (arguments - ;; To build the GUI, add the `--enable-gui' configure flag. - ;; To enable the "hyperlink server", add the `--enable-hserver' flag. - `(#:configure-flags - '("--enable-mi" - "--disable-static" - ;; The emacs files are provided in emacs-poke. - "--with-lispdir=/tmp/share/emacs"))) + (list + #:imported-modules `((guix build emacs-build-system) + (guix build emacs-utils) + ,@%default-gnu-imported-modules) + #:modules '((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) + #:configure-flags + #~(list "--disable-static" + (string-append "--with-lispdir=" + (emacs:elpa-directory #$output))))) (home-page "https://www.gnu.org/software/poke/#documentation") (synopsis "Editing of arbitrary binary data") (description "GNU poke is an interactive, extensible editor for binary data. @@ -3200,22 +3279,9 @@ data structures and to operate on them.") (license license:gpl3+))) (define-public emacs-poke - (package - (inherit poke) - (name "emacs-poke") - (build-system emacs-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'expand-load-path 'change-working-directory - (lambda _ (chdir "etc")))))) - (inputs '()) - (native-inputs '()) - (synopsis "GNU Poke major modes for Emacs") - (description - "This package provides two Emacs major modes for working with GNU Poke: -@code{Poke Ras mode} and @code{Poke Map mode}."))) + ;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is + ;; a different beast. + (deprecated-package "emacs-poke" poke)) (define-public pcb2gcode (package diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 64d8945f8e..7860c43fef 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -585,7 +585,7 @@ directories. (native-inputs (list intltool python-distutils-extra)) (inputs - (list libtorrent-rasterbar python-dbus python-efl python-pyxdg)) + (list libtorrent-rasterbar-1.2 python-dbus python-efl python-pyxdg)) (home-page "https://www.enlightenment.org") (synopsis "EFL Bittorrent client") (description "Epour is a BitTorrent client based on the @dfn{Enlightenment diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index b6b2e5176c..f41b4e99ed 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -46,7 +46,7 @@ (define-public opensm (package (name "opensm") - (version "3.3.22") + (version "3.3.24") (source (origin (method url-fetch) @@ -54,7 +54,7 @@ (string-append "https://github.com/linux-rdma/opensm/releases/download/" version "/opensm-" version ".tar.gz")) (sha256 - (base32 "19scwwpwqhqsyq4hbr5cflcmypss828lalxxd36yby7mbimca38y")))) + (base32 "0q74sx8y23h7picdzb4g5r84wcvc9hr9vzsdawkl812b38vmwcx3")))) (build-system gnu-build-system) (native-inputs (list bison @@ -66,18 +66,20 @@ (inputs (list rdma-core)) (arguments - `(#:configure-flags '("--disable-static") - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((base (assoc-ref outputs "out")) - (doc (string-append base "/share/doc/" - ,name "-" ,version))) - (for-each (lambda (file) - (install-file file doc)) - (find-files "doc")) - #t)))))) + (list + #:configure-flags #~'("--disable-static") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((base (assoc-ref outputs "out")) + (doc (string-append base "/share/doc/" + #$(package-name this-package) + "-" + #$(package-version this-package)))) + (for-each (lambda (file) + (install-file file doc)) + (find-files "doc")))))))) (home-page "https://www.openfabrics.org/") (synopsis "OpenIB InfiniBand Subnet Manager and management utilities") (description "\ @@ -183,7 +185,7 @@ testing InfiniBand networks.") (define-public ucx (package (name "ucx") - (version "1.14.0") + (version "1.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -193,7 +195,7 @@ testing InfiniBand networks.") (patches (search-patches "ucx-tcp-iface-ioctl.patch")) (sha256 (base32 - "0ki2r768wqm92qv06wxrh3kv2nl2yj4ds9fz0s0b5rr2ycjiw9ir")))) + "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index dcf2695118..043eeffbc4 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -29,6 +29,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages anthy) #:use-module (gnu packages boost) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages datastructures) #:use-module (gnu packages enchant) @@ -87,7 +88,7 @@ client.") (define-public fcitx5 (package (name "fcitx5") - (version "5.1.0") + (version "5.1.5") (source (origin (method url-fetch) @@ -95,7 +96,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" version "_dict.tar.xz")) (sha256 - (base32 "1a1d3bcxddv3hsmffgf608arhamia17bq82q932sy5zl9j8s423y")))) + (base32 "108a8561wh01vl5gqp2rnmnrh9qq3v8md3410dw46lx705a1wy4r")))) (arguments (list #:configure-flags #~(list "-DUSE_SYSTEMD=OFF"))) (build-system cmake-build-system) @@ -138,7 +139,7 @@ client.") (define-public fcitx5-lua (package (name "fcitx5-lua") - (version "5.0.10") + (version "5.0.11") (source (origin (method url-fetch) @@ -146,7 +147,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-" version ".tar.xz")) (sha256 - (base32 "13vh6i7pap3h9jrjri3cfi7pcjwhlkw9g24ibfh0aykdhd8d7p99")))) + (base32 "1hc1vhaycfp9bjvch7qrvza5gdimr30rvwavbwqd27lrh36910yc")))) (build-system cmake-build-system) (arguments (list @@ -164,19 +165,19 @@ client.") (define-public libime (package (name "libime") - (version "1.1.0") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "0jqr9riwygr3c9qzs8hx46smhgys68bf6m70fmam819903a9gpf0")))) + (base32 "0c1zn4bi71a84jh7x0fly3xqrsjm08ja3sglxrkfm9snk0x6ybhf")))) (build-system cmake-build-system) (inputs - (list fcitx5 boost)) + (list fcitx5 boost (list zstd "lib"))) (native-inputs - (list extra-cmake-modules python)) ;needed to run test + (list extra-cmake-modules pkg-config)) (home-page "https://github.com/fcitx/libime") (synopsis "Library for implementing generic input methods") (description "Libime is a library for implementing various input method @@ -304,7 +305,7 @@ IM module for GTK+3 applications. (define-public fcitx5-qt (package (name "fcitx5-qt") - (version "5.1.0") + (version "5.1.3") (source (origin (method url-fetch) @@ -312,7 +313,7 @@ IM module for GTK+3 applications. "/fcitx5-qt/fcitx5-qt-" version ".tar.xz")) (sha256 - (base32 "02gnzwf0mlshmh1hw8c1866643qmdqazwjz339jq0c3ll61f8m7h")))) + (base32 "0wyzq91fcqhv655fjhzfjmlj0xr365sl5cjgck75xaj08gj3mw61")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -339,7 +340,7 @@ for Qt based application.") (define-public fcitx5-anthy (package (name "fcitx5-anthy") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -347,7 +348,7 @@ for Qt based application.") "/fcitx5-anthy/fcitx5-anthy-" version ".tar.xz")) (sha256 - (base32 "0hzk3v36ph6f2nnlqqyw08w3qakbcb71y572ff09cy5b20vb29dp")))) + (base32 "0a1x1b7y5n1a9clb9j9mryhx2fnd5l5rwb74f38c0s93rxx8fhpf")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;; no tests @@ -363,7 +364,7 @@ the Anthy input method.") (define-public fcitx5-chinese-addons (package (name "fcitx5-chinese-addons") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -371,7 +372,7 @@ the Anthy input method.") "/fcitx5-chinese-addons/fcitx5-chinese-addons-" version "_dict.tar.xz")) (sha256 - (base32 "1akf4qqvck7m93i0183ffb7jfsz0rq4f3bkf89vfxlqp4i7lfw5l")))) + (base32 "13na8qvz0vh43gmxa81jn96xpp6maz71ga039z6lqr069hzsx1vc")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -427,7 +428,7 @@ including input methods previous bundled inside Fcitx 4: (define-public fcitx5-configtool (package (name "fcitx5-configtool") - (version "5.1.0") + (version "5.1.2") (source (origin (method url-fetch) @@ -435,7 +436,7 @@ including input methods previous bundled inside Fcitx 4: "https://download.fcitx-im.org/fcitx5" "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) (sha256 - (base32 "0xv5kckm6bsbavw0s2iqg128fv7j8sh49lpwc0acqrdmwj49x1pz")))) + (base32 "1k6101wjl5j9qb174j75g5nbvz7hvh0cj01w6b9n65pqcv4hsf6c")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -537,7 +538,7 @@ for Fcitx 5 with following color variants: (define-public fcitx5-rime (package (name "fcitx5-rime") - (version "5.1.1") + (version "5.1.3") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5" @@ -545,7 +546,7 @@ for Fcitx 5 with following color variants: ".tar.xz")) (sha256 (base32 - "1h6vh5pkak8l528l2d2nw5gy6zqa2sy3ris3xzkakb8kmgyjd3da")))) + "0cs3zq69fpasch6sq9yar2qw8403rxr2g4hjxn7mmshi1h1j6nm8")))) (build-system cmake-build-system) (arguments '(#:tests? #f ;no tests diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 11baa979c4..642f5c7305 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages guile) #:use-module (gnu packages jemalloc) #:use-module (gnu packages kerberos) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0e1c008ac7..9ac629b89f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2023 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2018, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au> @@ -143,7 +143,7 @@ ;; <https://bitcoincore.org/en/lifecycle/#schedule>. (package (name "bitcoin-core") - (version "25.0") + (version "25.1") (source (origin (method url-fetch) (uri @@ -151,7 +151,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "1hpbw6diyla75a6jrwsis9c5pnhpnnxwbznsik1s1fd35ks7rxjx")))) + "1jcq2686x6f1g8xk91h3qfw89v1klw931wbpbcvc5a6zv2cabhmy")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -684,7 +684,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.2.2") + (version "0.18.3.1") (source (origin (method git-fetch) @@ -702,7 +702,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "0hi6grf2xnnra60g3dzspahi0rwyiad6hc07n3pq3aknmz5xx8d4")))) + (base32 "1k6mrgsvmqsfk95w8kjmp9v2fghjmmpj40667zndrw9jx1h85mwx")))) (build-system cmake-build-system) (native-inputs (list doxygen @@ -789,7 +789,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.2.2") + (version "0.18.3.1") (source (origin (method git-fetch) @@ -805,7 +805,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "07gfvrxm3n0844ximm4rd3f3n0m125shpawdzg8blfjjbfr1k1ij")))) + (base32 "1fjx8gdzc1pmfsi14r09gfmkglvh560pnxk70p0k82a4gbs1vyz2")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) @@ -954,7 +954,9 @@ Bech32 and segwit addresses.") (when tests? (invoke "pytest" "-v"))))))) (propagated-inputs - (list python-configargparse + (list python-bech32 + python-configargparse + python-cryptography python-daemon python-docutils python-ecdsa @@ -967,8 +969,6 @@ Bech32 and segwit addresses.") python-wheel)) (native-inputs ; Only needed for running the tests (list gnupg - python-bech32 - python-cryptography python-mock python-pytest)) (home-page "https://github.com/romanz/trezor-agent") @@ -1959,13 +1959,13 @@ that allows you to run services and through them access the Bitcoin Cash network (define-public beancount (package (name "beancount") - (version "2.3.5") + (version "2.3.6") (source (origin (method url-fetch) (uri (pypi-uri "beancount" version)) (sha256 - (base32 "0sn3x6c5vwvdfak1qm0y4vv284izrc4dly31mqyd9jz9l8jmdqql")) + (base32 "0nj7sdh7wxc0hv8wxwqhw9v1zgx1sn4w92368ci2wzdmssz967w0")) (patches (search-patches "beancount-disable-googleapis-fonts.patch")))) (build-system python-build-system) (arguments @@ -2301,7 +2301,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "3.6.2") + (version "3.7") (source (origin (method git-fetch) @@ -2310,7 +2310,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "0lki6yrzmmpd5hj55m6s71y1cr81lbk1f3h9h70gmm4p4qjrv5f2")) + (sha256 (base32 "1sghdk8yq8si0bq0z83fji48q8yrq0ymvsxbbh5mscw6223syrjq")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index d853cd32cc..1d49df74e3 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,11 +29,13 @@ (define-module (gnu packages firmware) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) @@ -40,6 +43,9 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages avr) + #:use-module (gnu packages avr-xyz) #:use-module (gnu packages assembly) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -52,7 +58,9 @@ #:use-module (gnu packages curl) #:use-module (gnu packages efi) #:use-module (gnu packages elf) + #:use-module (gnu packages flashing-tools) #:use-module (gnu packages flex) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -76,7 +84,11 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xml) - #:use-module (ice-9 match)) + #:use-module (ice-9 format) + #:use-module (ice-9 match) + + #:export (make-ergodox-firmware + make-qmk-firmware)) (define-public ath9k-htc-firmware (package @@ -95,7 +107,8 @@ "ath9k-htc-firmware-gcc-compat.patch")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:target #f ; Package produces firmware. + #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda* (#:key inputs native-inputs #:allow-other-keys) @@ -163,6 +176,8 @@ Linux-libre.") (guix build gnu-build-system) (guix build utils)) #:tests? #f ; no tests + #:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out")) + ,(string-append "CC=" ,(cc-for-target))) #:phases (let ((subdirs '("assembler" "disassembler"))) (modify-phases %standard-phases @@ -170,24 +185,19 @@ Linux-libre.") (add-before 'build 'patch-/bin/true (lambda _ (substitute* (find-files "." "Makefile") - (("/bin/true") ":")) - #t)) + (("/bin/true") ":")))) (replace 'build - (lambda _ + (lambda* (#:key (make-flags '()) #:allow-other-keys) (for-each (lambda (dir) - (invoke "make" "-C" dir "CC=gcc")) - subdirs) - #t)) + (apply invoke "make" "-C" dir make-flags)) + subdirs))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (mkdir-p (string-append out "/bin")) (for-each (lambda (dir) - (invoke "make" "-C" dir - (string-append "PREFIX=" out) - "install")) - subdirs) - #t))))))) + (apply invoke "make" "-C" dir "install" make-flags)) + subdirs)))))))) (home-page "https://bues.ch/cms/hacking/misc.html#linux_b43_driver_firmware_tools") (synopsis "Collection of tools for the b43 wireless driver") @@ -323,6 +333,7 @@ automatic, safe and reliable. It is used by tools such as GNOME Software.") `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out") "/lib/firmware/b43-open")) + #:target #f ; Package produces firmware. #:tests? #f ;no tests #:phases (modify-phases %standard-phases (delete 'configure)))) @@ -385,6 +396,7 @@ broadband modem as found, for example, on PinePhone.") #:test-target "tests" #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "STRIP=" #$(strip-for-target)) (string-append "DESTDIR=" #$output)) #:phases #~(modify-phases %standard-phases @@ -511,6 +523,7 @@ provide OpenFirmware functionality on top of an already running system.") (list python))) (arguments `(#:tests? #f ; no check target + #:target #f ; Package produces firmware. #:make-flags (list (string-append "PLATFORM=" ,platform) ,@(if (and (not (string-prefix? "riscv64" (%current-system))) @@ -1213,6 +1226,97 @@ AR100.") (define-public crust-pine64-plus (make-crust-package "pine64_plus")) + +;;; +;;; ErgoDox firmware. +;;; + +(define* (make-ergodox-firmware/implementation layout #:key override.c + override.h) + "Return an ergodox-firmware package for LAYOUT, optionally using OVERRIDE.C, +a C source file-like object to override LAYOUT which may be accompanied by +OVERRIDE.H, to also override the corresponding layout include file." + (let ((revision "0") + (commit "89b7e2bfdafb2a87e0248846d5c95cc5e9a27858")) + (package + (name (string-append "ergodox-firmware-" layout)) + (version (git-version "1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/benblazak/ergodox-firmware") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z28frxyb21nz90frycrpsbxjp09374wawayvjphnwc8njlvkkpy")) + (patches + (search-patches "ergodox-firmware-fix-json-target.patch" + "ergodox-firmware-fix-numpad.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "LAYOUT=" #$layout) + ;; Simplify the output directory name. + "ROOT=output") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-override-files + (lambda _ + (when #$override.c + (copy-file #$override.c + (format #f "src/keyboard/ergodox/layout/~a.c" + #$layout))) + (when #$override.h + (copy-file #$override.h + (format #f "src/keyboard/ergodox/layout/~a.h" + #$layout))))) + ;; The Makefile-based build system lacks configure + ;; and install targets. + (delete 'configure) + (replace 'install + (lambda _ + (with-directory-excursion "output" + (install-file "firmware.hex" #$output) + (install-file "firmware.eep" #$output) + (install-file "firmware--layout.html" #$output))))))) + (native-inputs (list (make-avr-toolchain) python)) + (home-page "https://www.ergodox.io") + (synopsis "Firmware for the ErgoDox keyboard") + (description (format #f "This package contains the original firmware for +the ErgoDox keyboard, built using the ~a layout (as defined in the +@file{src/keyboard/ergodox/layout/~@*~a.c} source file). It contains the +@file{firmware.hex} and the @file{firmware.eep} files, which can be loaded to +a target using the @code{teensy-loader-cli} package as well as a +@file{firmware--layout.html} file, useful to easily visualize the +corresponding layout." layout)) + (license license:expat)))) + +(define make-ergodox-firmware + (memoize make-ergodox-firmware/implementation)) + +(define-public ergodox-firmware-colemak-jc-mod + (make-ergodox-firmware "colemak-jc-mod")) + +(define-public ergodox-firmware-colemak-symbol-mod + (make-ergodox-firmware "colemak-symbol-mod")) + +(define-public ergodox-firmware-dvorak-kinesis-mod + (make-ergodox-firmware "dvorak-kinesis-mod")) + +(define-public ergodox-firmware-qwerty-kinesis-mod + (make-ergodox-firmware "qwerty-kinesis-mod")) + +(define-public ergodox-firmware-workman-p-kinesis-mod + (make-ergodox-firmware "workman-p-kinesis-mod")) + + +;;; +;;; QMK Firmware. +;;; + (define-public qmk (package (name "qmk") @@ -1224,12 +1328,278 @@ AR100.") (base32 "1619q9v90740dbg8xpzqlhwcasz42xj737803aiip8qc3a7zhwgq")))) (build-system pyproject-build-system) - (arguments (list #:tests? #f)) ;; No tests. - (propagated-inputs (list python-dotty-dict python-hid python-hjson - python-jsonschema python-milc python-pillow - python-pygments python-pyserial python-pyusb)) + (arguments + (list + #:tests? #f ;no tests + #:modules '((guix build pyproject-build-system) + (guix build utils) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-after 'wrap 'wrap-path + ;; Wrap all the tools needed for the 'setup' and 'compile' actions + ;; (tested with the 'ergodox_ez' keyboard). + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/qmk") + `("PATH" prefix + ,(map (compose dirname + (cut search-input-file inputs <>)) + '("bin/avr-ar" + "bin/avr-gcc" + "bin/avrdude" + "bin/awk" + "bin/cmp" + "bin/dfu-programmer" + "bin/dfu-util" + "bin/git" + "bin/grep" + "bin/make" + "bin/python3" + "bin/sh" + ;; TODO: Remove after git is wrapped with these. + "bin/basename" + "bin/sed" + "bin/uname"))) + `("CROSS_C_INCLUDE_PATH" = (,(getenv "CROSS_C_INCLUDE_PATH"))) + `("CROSS_LIBRARY_PATH" = (,(getenv "CROSS_LIBRARY_PATH"))))))))) + ;; The inputs are not propagated since qmk is to be used strictly as a + ;; command. + (inputs + ;; The 'qmk setup' command advises to use GCC at version 8, and there are + ;; compilation errors in some firmware otherwise. + (list (make-avr-toolchain #:xgcc gcc-8) + avrdude + bash-minimal + dfu-programmer + dfu-util + diffutils + git-minimal ;for the clone action + gawk + gnu-make + grep + python + python-dotty-dict + python-hid + python-hjson + python-jsonschema + python-milc + python-pillow + python-pygments + python-pyserial + python-pyusb + ;; These are added to workaround faults in our git package (see + ;; bug#65924). + coreutils-minimal + sed + util-linux)) (home-page "https://qmk.fm") (synopsis "Command line utility to manage QMK keyboard firmwares") - (description "This package provides a program to help users work with -@acronym{QMK, Quantum Mechanical Keyboard} firmwares.") + (description "The QMK CLI provides a @acronym{CLI, command line interface} +based program to help users work with the QMK firmware, which can be used for +multiple custom keyboards such as Planck, ErgoDox, Corne and others. + +This @acronym{CLI} program is mainly used for building the QMK firmware, but +also has some other convenience utilities. It is highly recommended to +install the udev rules provided by the @code{qmk-udev-rules} package to avoid +having to run @command{qmk} as root when flashing the firmware.") (license license:expat))) + +(define* (make-qmk-firmware/implementation keyboard keymap + #:key (description "") + keymap-json + keymap-source-directory) + "Return a package to build the QMK firmware for KEYBOARD with KEYMAP. +Keyboard should be the name of a sub-directory under the @file{keyboards} +directory. For custom keymaps, KEYMAP-JSON, a file-like object of a JSON +representation of KEYMAP as generated by the @url{https://config.qmk.fm/, QMK +Configurator} tool or KEYMAP-SOURCE-DIRECTORY, a file-like object directory +containing the keymap source files files such as @file{keymap.c}, can be +provided." + (package + (name (string-append "qmk-firmware-" + (string-replace-substring keyboard "_" "-") "-" + (string-replace-substring keymap "_" "-"))) + ;; Note: When updating this package, make sure to also update the commit + ;; used for the LUFA submodule in the 'copy-lufa-source' phase below. + (version "0.22.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/qmk/qmk_firmware") + (commit version))) + (file-name (git-file-name "qmk-firmware" version)) + (sha256 + (base32 + "0s1lcnv7cddpn768p7mrc5bkxhx0ba5p77ya007dnkbk36c33d0w")) + (patches + (search-patches "qmk-firmware-fix-hacker-dvorak.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:modules '((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match) + (srfi srfi-26)) + ;; XXX: Running a test target like "test:$keyboard" doesn't seem to run + ;; anything and causes the .hex file to be regenerated; leave the tests + ;; out for now. + #:tests? #f + #:make-flags + #~(list #$(format #f "~a:~a" keyboard keymap) + (string-append "SHELL=" (search-input-file + %build-inputs "bin/sh"))) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + ;; Do not attempt to retrieve information from git during the + ;; build. + (setenv "SKIP_GIT" "1"))) + (add-after 'unpack 'copy-lufa-source + ;; QMK carries a custom fork of LUFA as a git submodule; make sure + ;; the same commit is used (see: + ;; https://github.com/qmk/qmk_firmware/tree/master/lib). + (lambda _ + (copy-recursively + #$(let ((commit "549b97320d515bfca2f95c145a67bd13be968faa")) + (origin + (inherit (package-source lufa)) + (uri (git-reference + (url "https://github.com/qmk/lufa") + (commit commit))) + (file-name (git-file-name "lufa" commit)) + (sha256 + (base32 + "1rmhm4rxvq8skxqn6vc4n4ly1ak6whj7c386zbsci4pxx548n9h4")))) + "lib/lufa"))) + #$@(if keymap-source-directory + #~((add-after 'unpack 'copy-keymap-source-directory + (lambda _ + (let ((keymap-dir #$(string-append "keyboards/" keyboard + "/keymaps/" keymap))) + (false-if-exception (delete-file-recursively + keymap-dir)) + (copy-recursively #$keymap-source-directory + keymap-dir))))) + #~()) + #$@(if keymap-json + #~((replace 'build + (lambda _ + (invoke "qmk" "compile" #$keymap-json)))) + #~()) + (replace 'install + (lambda _ + (match (scandir "." (lambda (f) + (false-if-exception + (member (string-take-right f 4) + '(".bin" ".hex" ".uf2"))))) + (() + (error "no built binary file found")) + ((hex ..1) + (for-each (cut install-file <> #$output) hex)))))))) + ;; Some of the build tools are required to be on the PATH, as the make + ;; files do not always operate through 'qmk'; all of qmk's inputs must + ;; thus be made available. + (native-inputs (modify-inputs (package-inputs qmk) + (append qmk))) + (home-page "https://qmk.fm/") + (synopsis "Keyboard firmware for Atmel AVR and Arm USB families") + (description + (format #f "QMK (Quantum Mechanical Keyboard Firmware) is a keyboard +firmware based on the @url{https://github.com/tmk/tmk_keyboard, tmk_keyboard +firmware} with some useful features for Atmel AVR and ARM controllers, and +more specifically, the @url{https://olkb.com/, OLKB product line}, the +@url{https://ergodox-ez.com/, ErgoDox EZ keyboard}, and the +@url{https://clueboard.co/, Clueboard product line}.~@[~%~%~a~]" description)) + (license license:gpl2+))) + +(define make-qmk-firmware (memoize make-qmk-firmware/implementation)) + +(define-public qmk-firmware-ergodox-ez-default + (make-qmk-firmware + "ergodox_ez" "default" #:description + "This is the default keymap used on the ErgoDox EZ keyboard. It includes +the novel MEH and Hyper keys pioneered by the ErgoDox EZ, easy to reach +Control/Shift modifiers keys, and two-functions hold keys to access layer 1. +Layer 1 contains function keys, symbols, a numpad as well as brightness keys. +Layer 2 contains multimedia and mouse keys. See the +@file{keyboards/ergodox_ez/keymaps/default/keymap.c} source file for the +keymap definition, or the +@url{https://configure.ergodox-ez.com/ergodox-ez/layouts/JwwW/latest/0, +ErgoDox EZ Configurator} page.")) + +(define-public qmk-firmware-ergodox-ez-dvorak-42-key + (make-qmk-firmware "ergodox_ez" "dvorak_42_key" #:description "\ +This is a Dvorak-based layout for the ErgoDox EZ. Its basic key layout is +similar to the Atreus @samp{dvorak_42_key} layout; in fact this layout was +created for seamless switching between the ErgoDox EZ and Atreus keyboards. +On the base layer, the keys that don't exist on the Atreus are mapped to MEH +shortcuts and can be interpreted by your window managher. This layout only +makes use of the 42 keys that the Atreus also has for the main functionality. +See the @file{keyboards/atreus/keymaps/dvorak_42_key/keymap.c} source file for +the keymap definition.")) + +(define-public qmk-firmware-ergodox-ez-hacker-dvorak + (make-qmk-firmware "ergodox_ez" "hacker_dvorak" #:description "\ +This is a Dvorak layout for the ErgoDox EZ. It is inspired by the +@url{https://www.kaufmann.no/roland/dvorak, Programmer Dvorak}. The operating +system keyboard layout should be set to US for this keymap to function +normally. It defines 10 layers: +@enumerate +@item Dvorak +@item Querty +@item Gaming +@item Arrows +@item Mouse +@item Numpad +@item Hyper Fn +@item Media Fn +@item Meh Fn +@item Meh Fn + +@end enumerate +The complete keymap can be inspected at the ErgoDox EZ Configurator web site: +@url{https://configure.ergodox-ez.com/ergodox-ez/layouts/Wadz/latest/0}.")) + +(define-public qmk-firmware-ergodox-ez-dvorak + (make-qmk-firmware + "ergodox_ez" "dvorak" #:description + "This is a rather plain Dvorak layout for the ErgoDox EZ, containing +function and symbols on layer 1 and media and and mouse keys on layer 2. See +the @file{layouts/community/ergodox/dvorak/keymap.c} source file for the +keymap definition.")) + +(define-public qmk-firmware-ergodox-ez-dvorak-emacs + (make-qmk-firmware + "ergodox_ez" "dvorak_emacs" #:description + "This is a Dvorak-based keymap optimized for Emacs usage, with the +frequently used Control and Meta (Alt) keys mapped to the thumb buttons. It +contains a single extra layer that includes function and multimedia keys. A +graphical representation of the keymap is available in the +@file{layouts/community/ergodox/dvorak_emacs/readme.md} source file.")) + +(define-public qmk-firmware-ergodox-ez-dvorak-emacs-software + (make-qmk-firmware + "ergodox_ez" "dvorak_emacs_software" #:description + "This is the same layout as that of the +@code{qmk-firmware-ergodox-ez-dvorak-emacs}, but designed to be used with a +Dvorak-configured operating system (instead of a US QWERTY one, which is the +default assumption for QMK firmware keymaps).")) + +(define-public qmk-udev-rules + (package + (inherit qmk-firmware-ergodox-ez-default) + (name "qmk-udev-rules") + (build-system copy-build-system) + (arguments + '(#:install-plan '(("./util/udev" "lib/udev/rules.d" + #:include-regexp ("rules$"))))) + (native-inputs '()) + (inputs '()) + (propagated-inputs '()) + (synopsis "Udev rules for QMK Firmware") + (description + "This package provides a set of udev rules to specify the proper +privileges for flashing QMK compatible devices without needing root. The +rules require the group @code{plugdev} to be added to each user that needs +this."))) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 82e709cf26..6165845261 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io> ;;; Copyright © 2023 B. Wilson <x@wilsonb.com> +;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module (guix utils) #: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 meson) #:use-module (guix build-system python) @@ -64,7 +66,8 @@ #:use-module (gnu packages pciutils) #:use-module (gnu packages qt) #:use-module (gnu packages tls) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (srfi srfi-26)) (define-public flashrom (package @@ -237,16 +240,15 @@ firmware from it.") (patches (search-patches "teensy-loader-cli-help.patch")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;; Makefile has no test target - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "teensy_loader_cli" bin))))))) + (list + #:tests? #f ;; Makefile has no test target + #:make-flags #~(list "CC=gcc" (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda _ + (install-file "teensy_loader_cli" + (string-append #$output "/bin"))))))) (inputs (list libusb-compat)) ;only compatible with libusb 0.1 (synopsis "Command line firmware uploader for Teensy development boards") (description @@ -256,7 +258,45 @@ HalfKay bootloader is running, so you can upload new programs and run them. You need to add the udev rules to make the Teensy update available for non-root users.") (home-page "https://www.pjrc.com/teensy/loader_cli.html") - (license license:gpl3))) + (license license:gpl3+))) + +(define-public teensy-udev-rules + (package + (name "teensy-udev-rules") + (version "20230913") ;no version whatsoever -- use the current date + (source (origin + (method url-fetch) + (uri "https://www.pjrc.com/teensy/00-teensy.rules") + (sha256 + (base32 + "1yxczxvwi0s31g7lfa4v13yvvpv6gcsfs7r9mv6y4w9jc1inpx8p")))) + (build-system copy-build-system) + (arguments + (let ((rules-file "lib/udev/rules.d/70-teensy.rules")) + (list + #:install-plan + #~(list `(,#$source #$rules-file)) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (string-append #$output "/" #$rules-file) + (("/bin/stty") + (search-input-file inputs "bin/stty"))))))))) + (inputs (list coreutils-minimal)) + (home-page "https://www.pjrc.com/teensy/loader_cli.html") + (synopsis "udev rules for the Teensy family of micro-controllers") + (description "This package provides a udev rules file that allows +unprivileged users communication with the Teensy family of micro-controllers. +ModemManager (part of NetworkManager) can interfere with USB Serial devices, +which includes the Teensy. In case of problems, see the @file{.rules} file +for possible workarounds.") + ;; FIXME: The file lacks an explicit license, so the license of + ;; teensy-cli-loader is *assumed* to hold (see: + ;; https://github.com/PaulStoffregen/teensy_loader_cli/issues/84). + (license license:gpl3+) + (supported-systems (filter (cut string-suffix? "-linux" <>) + %supported-systems)))) (define-public rkflashtool (let ((commit "8966c4e277de8148290554aaaa4146a3a84a3c53") @@ -540,7 +580,7 @@ formats, and can perform many different manipulations.") (define-public uuu (package (name "uuu") - (version "1.4.165") + (version "1.5.125") (source (origin (method git-fetch) @@ -550,7 +590,7 @@ formats, and can perform many different manipulations.") (file-name (git-file-name name version)) (sha256 (base32 - "0k309lp27d4k6x4qq0badbk8i47xsc6f3fffz73650iyfs4hcniw")))) + "02nyax1z2qkcxs764lj5cpazv8n957hv9ipd9b5rqpgi9pgnvlvz")))) (arguments `(#:tests? #f ; no tests #:modules ((guix build utils) @@ -578,7 +618,8 @@ formats, and can perform many different manipulations.") (native-inputs (list pkg-config)) (inputs - (list libusb bzip2 zlib libzip openssl)) + (list libusb bzip2 zlib libzip openssl + `(,zstd "lib"))) (home-page "https://github.com/NXPmicro/mfgtools") (synopsis "Freescale/NXP I.MX chip image deploy tools") (description "@code{uuu} is a command line tool, evolved out of MFGTools. diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1f5ac5b727..a858ec570d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2023 chris <chris@bumblehead.com> +;;; Copyright © 2023 Luis Felipe López Acevedo <sirgazil@zoho.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -579,6 +580,10 @@ The unified Libertinus family consists of: (outputs (list "out" "pcf-8bit" "otb")) (arguments `(#:tests? #f ; no test target in tarball + #:modules + ((guix build gnu-build-system) + (guix build utils) + (ice-9 match)) #:phases (modify-phases %standard-phases (add-after 'build 'build-more-bits @@ -600,7 +605,16 @@ The unified Libertinus family consists of: (lambda* (#:key make-flags outputs #:allow-other-keys) (let ((otb (assoc-ref outputs "otb"))) (apply invoke "make" "install-otb" (string-append "prefix=" otb) - make-flags))))))) + make-flags)))) + (add-after 'install 'install-documentation + ;; There's no way to decypher the cryptic file names without this. + (lambda* (#:key outputs #:allow-other-keys) + (for-each (match-lambda + ((name . directory) + (install-file "README" + (string-append directory "/share/doc/" + ,name "-" ,version)))) + outputs)))))) (native-inputs (list bdftopcf font-util mkfontdir pkg-config python)) (home-page "https://terminus-font.sourceforge.net/") @@ -1001,15 +1015,16 @@ utilities to ease adding new glyphs to the font.") (define-public font-google-noto (package (name "font-google-noto") - (version "20171025") + (version "23.11.1") (source (origin - (method url-fetch/zipbomb) - (uri (string-append "https://noto-website-2.storage.googleapis.com/" - "pkgs/Noto-hinted.zip")) - (file-name (string-append name "-" version ".zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/notofonts/notofonts.github.io") + (commit (string-append "noto-monthly-release-" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1bp42whyin7xcgmrbnfvz3rvd98xmxaz3ywqybbjmqzwaa9llyw3")))) + (base32 "0vvxhky35l4i0ha60yw0gj26f3v33hpf2zax17yyj16mww4cn4d8")))) (build-system font-build-system) (home-page "https://www.google.com/get/noto/") (synopsis "Fonts to cover all languages") @@ -1937,7 +1952,7 @@ weights and five widths in both Roman and Italic, plus variable fonts.") (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") - (version "0.42.1") + (version "0.42.6") (source (origin (method url-fetch) @@ -1945,7 +1960,7 @@ weights and five widths in both Roman and Italic, plus variable fonts.") "/releases/download/v" version "/sarasa-gothic-ttc-" version ".7z")) (sha256 - (base32 "0lrhipis21cafpsf8wsrdavlblfgzz424r23rj78ik8npbws1a3v")))) + (base32 "0czx10yph2lxg2k4w6qjnil73zb2pgg3g400apm9gay41m04990v")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -3144,7 +3159,7 @@ and readability. This package bundles those icons into a font.") (define-public font-lxgw-wenkai (package (name "font-lxgw-wenkai") - (version "1.310") + (version "1.311") (source (origin (method url-fetch) (uri (string-append @@ -3152,7 +3167,7 @@ and readability. This package bundles those icons into a font.") version "/lxgw-wenkai-v" version ".tar.gz")) (sha256 (base32 - "10z8ilcpfxmll6j6ck4yj90x48vh3c7ck0lm61qjangpw9fcgfb1")))) + "0f5fnqcwp8kicrbkncn5j1w06cil771jfdcjf2w48vl62m4gmf27")))) (build-system font-build-system) (home-page "https://lxgw.github.io/2021/01/28/Klee-Simpchin/") (synopsis "Simplified Chinese Imitation Song typeface") @@ -3166,7 +3181,7 @@ within GB 2312, standard glyphs for Mainland China is used.") (package (inherit font-lxgw-wenkai) (name "font-lxgw-wenkai-tc") - (version "1.010") + (version "1.011") (source (origin (method url-fetch) (uri (string-append @@ -3174,7 +3189,7 @@ within GB 2312, standard glyphs for Mainland China is used.") version "/lxgw-wenkai-tc-v" version ".tar.gz")) (sha256 (base32 - "1yppqrfmynai1canlq0hksl3yaj8kflbnj41ljl4lxwaz6q9i1ly")))) + "0x83a7zg1w82bpilk84ajlisccf90kl01gz89fipgqji9nii71bv")))) (home-page "https://github.com/lxgw/LxgwWenKaitc") (synopsis "Traditional Chinese Imitation Song typeface") (description @@ -3457,3 +3472,29 @@ interfaces.") is to provide fonts that conform to existing standards and recommendations, so that it can be a reference implementation.") (license license:gpl2+))) + +(define-public font-orbitron + (let ((version "0") + (commit "13e6a5222aa6818d81c9acd27edd701a2d744152") + (revision "0")) + (package + (name "font-orbitron") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/theleagueof/orbitron") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf")))) + (build-system font-build-system) + (home-page "https://github.com/theleagueof/orbitron") + (synopsis "Futuristic geometric sans-serif") + (description "Orbitron is a geometric sans-serif typeface intended +for display purposes. It features four weights (light, medium, bold, +and black), a stylistic alternative, small caps, and many alternate +glyphs.") + (license license:silofl1.1)))) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index d933382ede..1f4204fb94 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,6 +67,7 @@ #: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 sqlite) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) @@ -370,6 +372,37 @@ but also provides many useful font conversion and analysis facilities. python-ufonormalizer python-ufoprocessor)))) +(define-public python-beziers + (package + (name "python-beziers") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simoncozens/beziers.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dyr45m15sclbgaz1mrcnw8kny50h09gd45dlpfkgv9qpfxphkg3")))) + (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"))))))) + (native-inputs (list python-pytest python-dotmap python-matplotlib)) + (propagated-inputs (list python-pyclipper)) + (home-page "https://simoncozens.github.io/beziers.py/index.html") + (synopsis "Python bezier manipulation library") + (description + "Beziers provides a variety of classes for constructing, +manipulating and drawing Bezier curves and paths. Principally designed for +font design software, it allows you to join, split, offset, and perform many +other operations on paths.") + (license license:expat))) + (define-public python-cffsubr (package (name "python-cffsubr") @@ -961,6 +994,35 @@ value (e.g. @samp{x=\"95.0\"} becomes @samp{x=\"95\"}) @end itemize") (license license:bsd-3))) +(define-public fontobene-qt5 + (package + (name "fontobene-qt5") + (version "0.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fontobene/fontobene-qt5") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gy3sfraf23k7dm4ha8nqpd6madzk0zmxkcb204micyn5b5l8ljg")))) + (inputs (list qtbase-5)) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./tests/fontobene-qt5-tests"))))))) + (home-page "https://github.com/fontobene/fontobene-qt5") + (synopsis "Parser for FontoBene stroke fonts") + (description "FontoBene-Qt5 is a header-only library to parse FontoBene +stroke fonts with C++11/Qt5.") + ;; Dual-licensed, either license applies. + (license (list license:asl2.0 license:expat)))) + (define-public ttfautohint (package (name "ttfautohint") @@ -1438,6 +1500,37 @@ resolution.") (license license:gpl2+) (home-page "https://potrace.sourceforge.net/"))) +(define-public psftools + (package + (name "psftools") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.seasip.info/Unix/PSF/" + "psftools-" version ".tar.gz")) + (sha256 + (base32 "1lv6kvrcbspyh7a0hlji84wbmw6xh87r3iaafq3khp88kgh1irri")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list "--disable-static"))) + (home-page "https://www.seasip.info/Unix/PSF/") + (synopsis + "Convert PSF fixed-width bitmap (console) fonts from/to other formats") + (description + "@acronym{PSF, PC Screen Font} is the simple monospaced bitmap font format +used by the Linux kernel for console fonts. The PSF Tools convert between PSF +and many other font formats, similar to what the NetPBM package does for images. + +It includes converters for a good number of common bitmap font formats such as +@file{.BDF}, @file{.FNT}, and @file{.FON} files, Berkeley vfonts, classic +Amstrad/Sinclair/Hercules/BBC Micro soft fonts, and raw (DOS-style) fonts. + +It also supports less traditional formats such as PBM/XBM images, plain text +(for rudimentary editing), and C header files.") + (license license:gpl2+))) + (define-public libotf (package (name "libotf") diff --git a/gnu/packages/forth.scm b/gnu/packages/forth.scm index 8cb6ac8391..6e8d8cdc4c 100644 --- a/gnu/packages/forth.scm +++ b/gnu/packages/forth.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Nikita <nikita@n0.is> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> +;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -18,11 +19,14 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages forth) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) + #:use-module (guix download) + #:use-module (guix gexp) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu) - #:use-module (gnu packages m4)) + #:use-module (gnu packages m4) + #:use-module (gnu packages vim)) (define-public gforth (package @@ -58,3 +62,53 @@ and history. A generic virtual machine environment, vmgen, is also included.") (home-page "https://www.gnu.org/software/gforth/") (license license:gpl3+))) + +(define-public smithforth + (package + (name "smithforth") + (version "220711") + (source + (origin + (method url-fetch) + (uri (string-append "https://dacvs.neocities.org/SF/SForth" + version "dmp.txt")) + (sha256 + (base32 "0a39pv7529llsa3f48fmvwvlcp3f9v8qkn5ziw2l6kxf0qvli3lm")))) + (build-system trivial-build-system) + (native-inputs (list xxd)) + (arguments + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils) + (ice-9 textual-ports)) + (let* ((sforth.dmp #$(package-source this-package)) + (system.fs #$(origin + (method url-fetch) + (uri (string-append + "https://dacvs.neocities.org/SF/system" + version "fs.txt")) + (sha256 + (base32 + "17v1pp64s6n8q8w3kg48nd7zdcx2208y4svr5fpfms5lkyzg7z1m")))) + (xxd (string-append (assoc-ref %build-inputs "xxd") + "/bin/xxd")) + (bin (string-append (assoc-ref %outputs "out") "/bin"))) + (copy-file sforth.dmp "sforth.dmp") + (substitute* "sforth.dmp" (("#.*$") "\n")) + (with-output-to-file "sforth" + (lambda _ + (invoke xxd "-p" "-r" "sforth.dmp") + (call-with-input-file system.fs + (lambda (port) (display (get-string-all port))))) + #:binary #t) + (chmod "sforth" #o755) + (install-file "sforth" bin))))) + (home-page "https://dacvs.neocities.org/SF/") + (synopsis "Forth programming language for x86-64 desktop computers") + (description "SmithForth is an implementation of the Forth programming +language for x86-64 desktop computers. SmithForth is a text interpreter that +runs in a Linux text console.") + (supported-systems '("x86_64-linux")) + (license license:expat-0))) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0edbca3bdf..66561d11c1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -406,6 +406,20 @@ inappropriate content.") (base32 "1dkjxvfxg56hfy70j6ibfklfyv57jiha4vgc3ggl60r5kjx65s5b")))) (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; The Ft_MIMPluginManager::testPluginDescriptions test fails + ;; with a QFATAL error: received signal 11, while + ;; ut_mimpluginmanager fails at least on powerpc64le with a + ;; subprocess aborted error (see: + ;; https://github.com/maliit/framework/issues/120). + (invoke "ctest" "-E" + "(ft_mimpluginmanager|ut_mimpluginmanager)"))))))) (native-inputs (list extra-cmake-modules wayland-protocols pkg-config diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 6e7e5a0985..a511edddba 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2056,7 +2056,7 @@ scripted in a Python-like language.") (define-public godot (package (name "godot") - (version "4.1.1") + (version "4.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2065,7 +2065,7 @@ scripted in a Python-like language.") (file-name (git-file-name name version)) (sha256 (base32 - "1byy4zdsj8nq54rhmij7kl0mdh4zv3c056y6c7rjy17bqjq2n8fh")) + "1mwwzf77ixkalciqakn6q42g9sl2570didfll406sfs42wz534ng")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 97131610f1..fb1224529c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1071,10 +1071,10 @@ want what you have.") (license license:cc-by-sa3.0))) (define-public cockatrice - (let ((release-date "2021-01-26")) + (let ((release-date "2023-09-14")) (package (name "cockatrice") - (version "2.8.0") + (version "2.9.0") (source (origin (method git-fetch) @@ -1084,7 +1084,7 @@ want what you have.") (file-name (git-file-name name version)) (sha256 (base32 - "0q8ffcklb2b7hcqhy3d2f9kz9aw22pp04pc9y4sslyqmf17pwnz9")) + "1jhn6pprd3j8m312mm8nlb9hwcchg3qkks5rw0x7d22alk922dlv")) (modules '((guix build utils))) (snippet ;; Strip image URLs as they point towards non-free web services @@ -6925,7 +6925,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (define-public crawl (package (name "crawl") - (version "0.29.1") + (version "0.30.1") (source (origin (method git-fetch) @@ -6934,7 +6934,7 @@ fish. The whole game is accompanied by quiet, comforting music.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17bl8hdv2z3mpdfmd5gnwg3r1p9dqjbisiql24pxs1d33qcw0h7x")) + (base32 "1rlp8z1n7ziv7aaa3fb4h4nnq24pfz1m23a99c1ra582fh0yx1pl")) (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs @@ -7323,7 +7323,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (define-public tome4 (package (name "tome4") - (version "1.7.4") + (version "1.7.6") (synopsis "Single-player, RPG roguelike game set in the world of Eyal") (source (origin @@ -7331,104 +7331,104 @@ Crowther & Woods, its original authors, in 1995. It has been known as (uri (string-append "https://te4.org/dl/t-engine/t-engine4-src-" version ".tar.bz2")) (sha256 - (base32 "197jmd99l3w3sig32pvdlq9fcgdjjx7g9csy08kz174cyhrlyly3")) + (base32 "0338lirc4jbmq29449bw8c6src8b91yn9x14w2nxr31zh00fm7cq")) (modules '((guix build utils))))) (build-system gnu-build-system) (native-inputs (list unzip)) (inputs - `(("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))) - ("glu" ,glu) - ("premake4" ,premake4) - ("openal" ,openal) - ("vorbis" ,libvorbis) - ("luajit" ,luajit))) + (list glu + libvorbis + luajit + openal + premake4 + (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) (arguments - `(#:make-flags - (list (string-append "CC=" ,(cc-for-target)) - "config=release") - ;; XXX: Building in parallel occasionally causes this build failure: - ;; ../src/luajit2/src/host/buildvm.c:73:10: fatal error: buildvm_arch.h: - ;; No such file or directory - #:parallel-build? #f - #:phases (modify-phases %standard-phases - (delete 'bootstrap) - (replace 'configure - (lambda _ - (invoke "premake4" "gmake"))) - (add-after 'set-paths 'set-sdl-paths - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" - (string-append - (search-input-directory inputs "/include/SDL2") - ":" (or (getenv "CPATH") ""))))) - (delete 'check) - ;; premake doesn't provide install target - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (usr (string-append out "/usr")) - (bin (string-append out "/bin")) - (licenses (string-append out "/share/licenses")) - (documents (string-append out "/share/doc")) - (pixmaps (string-append out "/share/pixmaps")) - (icon "te4-icon.png") - (data (string-append out "/share/" ,name)) - (applications (string-append - out "/share/applications")) - (unzip (string-append - (assoc-ref inputs "unzip") "/bin/unzip")) - (wrapper (string-append bin "/" ,name))) - ;; icon - (mkdir-p pixmaps) - (invoke unzip "-j" - (string-append - "game/engines/te4-" ,version ".teae") - (string-append - "data/gfx/" icon) "-d" pixmaps) - ;; game executable - (install-file "t-engine" data) - (mkdir-p bin) - (with-output-to-file wrapper - (lambda () - (display - (string-append - "#!/bin/sh\n" - ;; No bootstrap code found, - ;; defaulting to working directory - ;; for engine code! - "cd " data "\n" - "exec -a tome4 ./t-engine \"$@\"\n")))) - (chmod wrapper #o555) - ;; licenses - (for-each (lambda (file) - (install-file file licenses)) - '("COPYING" "COPYING-MEDIA")) - ;; documents - (for-each (lambda (file) - (install-file file documents)) - '("CONTRIBUTING" "CREDITS")) - ;; data - (copy-recursively "bootstrap" (string-append - data "/bootstrap")) - (copy-recursively "game" (string-append data "/game")) - ;; launcher - (mkdir-p applications) - (make-desktop-entry-file - (string-append applications "/" ,name ".desktop") - #:name "ToME4" - #:comment ,synopsis - #:exec ,name - #:icon icon - #:categories '("Game" "RolePlaying")))))))) + (list + #:tests? #false ;no test + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + "config=release") + ;; XXX: Building in parallel occasionally causes this build failure: + ;; ../src/luajit2/src/host/buildvm.c:73:10: fatal error: buildvm_arch.h: + ;; No such file or directory + #:parallel-build? #f + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (replace 'configure + (lambda _ + (invoke "premake4" "gmake"))) + (add-after 'set-paths 'set-sdl-paths + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append + (search-input-directory inputs "/include/SDL2") + ":" (or (getenv "CPATH") ""))))) + ;; premake doesn't provide install target + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (usr (string-append out "/usr")) + (bin (string-append out "/bin")) + (licenses (string-append out "/share/licenses")) + (documents (string-append out "/share/doc")) + (pixmaps (string-append out "/share/pixmaps")) + (icon "te4-icon.png") + (data (string-append out "/share/" #$name)) + (applications (string-append + out "/share/applications")) + (unzip (string-append + (assoc-ref inputs "unzip") "/bin/unzip")) + (wrapper (string-append bin "/" #$name))) + ;; icon + (mkdir-p pixmaps) + (invoke unzip "-j" + (string-append + "game/engines/te4-" #$version ".teae") + (string-append + "data/gfx/" icon) "-d" pixmaps) + ;; game executable + (install-file "t-engine" data) + (mkdir-p bin) + (with-output-to-file wrapper + (lambda () + (display + (string-append + "#!/bin/sh\n" + ;; No bootstrap code found, + ;; defaulting to working directory + ;; for engine code! + "cd " data "\n" + "exec -a tome4 ./t-engine \"$@\"\n")))) + (chmod wrapper #o555) + ;; licenses + (for-each (lambda (file) + (install-file file licenses)) + '("COPYING" "COPYING-MEDIA")) + ;; documents + (for-each (lambda (file) + (install-file file documents)) + '("CONTRIBUTING" "CREDITS")) + ;; data + (copy-recursively "bootstrap" (string-append + data "/bootstrap")) + (copy-recursively "game" (string-append data "/game")) + ;; launcher + (mkdir-p applications) + (make-desktop-entry-file + (string-append applications "/" #$name ".desktop") + #:name "ToME4" + #:comment #$synopsis + #:exec #$name + #:icon icon + #:categories '("Game" "RolePlaying")))))))) (home-page "https://te4.org") (description "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based combat and advanced character building. Play as one of many unique races and classes in the lore-filled world of Eyal, exploring random dungeons, facing challenging battles, and developing characters with your own tailored mix of -abilities and powers. With a modern graphical and customisable interface, -intuitive mouse control, streamlined mechanics and deep, challenging combat, -Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century.") +abilities and powers.") (license license:gpl3+))) (define-public quakespasm @@ -7754,7 +7754,7 @@ Github or Gitlab.") (define-public colobot (package (name "colobot") - (version "0.2.0-alpha") + (version "0.2.1-alpha") (source (origin (method git-fetch) @@ -7764,59 +7764,66 @@ Github or Gitlab.") (recursive? #t))) ;for "data/" subdir (file-name (git-file-name name version)) (sha256 - (base32 "02z21pw47j2afjsikn5b162gacwgiahdrlhmfxhq4xqlzsvz58z6")))) + (base32 "0bpy5nzkvq5nfr0w8jf7bl7zs8yz2cpzp87pnkdlgwl3adcn9nsw")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;no test - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (add-after 'unpack 'fix-directories - (lambda _ - (substitute* "CMakeLists.txt" - (("(\\$\\{CMAKE_INSTALL_PREFIX\\})/games" _ prefix) - (string-append prefix "/bin")) - (("(\\$\\{CMAKE_INSTALL_PREFIX\\}/share)/games/colobot" _ prefix) - (string-append prefix "/colobot"))) - #t)) - (add-after 'fix-directories 'install-music - ;; Retrieve and install music files. - (lambda* (#:key inputs #:allow-other-keys) - ;; Installation process tries to download music files using - ;; "wget" if not already present. Since we are going another - ;; route, skip "wget" command check. - (substitute* "data/music/CMakeLists.txt" - (("find_program\\(WGET wget\\)") "")) - ;; Populate "music/" directory. - (let ((data (assoc-ref inputs "colobot-music"))) - (invoke "tar" "-xvf" data "-Cdata/music")) - #t))))) + (list + #:tests? #f ;no test + #:modules '((guix build cmake-build-system) + (guix build utils) + (srfi srfi-1) + (ice-9 match) + (ice-9 regex)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'unpack 'fix-directories + (lambda _ + (substitute* "CMakeLists.txt" + (("(\\$\\{CMAKE_INSTALL_PREFIX\\})/games" _ prefix) + (string-append prefix "/bin")) + (("(\\$\\{CMAKE_INSTALL_PREFIX\\}/share)/games/colobot" _ prefix) + (string-append prefix "/colobot"))))) + (add-after 'fix-directories 'install-music + ;; Retrieve and install music files. + (lambda* (#:key inputs #:allow-other-keys) + ;; Installation process tries to download music files using + ;; "wget" if not already present. Since we are going another + ;; route, skip "wget" command check. + (substitute* "data/music/CMakeLists.txt" + (("find_program\\(WGET wget\\)") "")) + ;; Populate "music/" directory. + (let ((data + (any + (match-lambda ((_ . input) + (and (string-match "colobot-music" input) + input))) + inputs))) + (invoke "tar" "-xvf" data "-Cdata/music"))))))) (native-inputs - `(("colobot-music" - ,(origin - (method url-fetch) - (uri (string-append "https://colobot.info/files/music/" - "colobot-music_ogg_" version ".tar.gz")) - (sha256 - (base32 - "1s86cd36rwkff329mb1ay1wi5qqyi35564ppgr3f4qqz9wj9vs2m")))) - ("gettext" ,gettext-minimal) - ("librsvg" ,(librsvg-for-system)) - ("po4a" ,po4a) - ("python" ,python-wrapper))) + (list (origin + (method url-fetch) + (uri (string-append "https://colobot.info/files/music/" + "colobot-music_ogg_" version ".tar.gz")) + (sha256 + (base32 + "1s86cd36rwkff329mb1ay1wi5qqyi35564ppgr3f4qqz9wj9vs2m"))) + gettext-minimal + (librsvg-for-system) + po4a + python-wrapper)) (inputs - `(("boost" ,boost) - ("glew" ,glew) - ("libogg" ,libogg) - ("libpng" ,libpng) - ("libsndfile" ,libsndfile) - ("libvorbis" ,libvorbis) - ("openal" ,openal) - ("physfs" ,physfs) - ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-ttf))))) + (list boost + glew + libogg + libpng + libsndfile + libvorbis + openal + physfs + (sdl-union (list sdl2 sdl2-image sdl2-ttf)))) (synopsis "Educational programming strategy game") (description "Colobot: Gold Edition is a real-time strategy game, where you can program your units (bots) in a language called CBOT, which is similar @@ -10357,6 +10364,55 @@ ChessX.") (home-page "https://stockfishchess.org/") (license license:gpl3+)))) +(define-public moonfish + (let ((commit "4f8829009e8c26e6a878261e0bc4c7e7617ef6b6") + (revision "1")) + (package + (name "moonfish") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~zamfofex/moonfish") + (commit commit))) + (sha256 + (base32 + "1ksg42x9cyn3pbfryy9raqb355k47cqcisascpy157c3cgdr2z60")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + (list + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target))) + #:tests? #f ;no check target + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install ;no 'install' target + (lambda _ + (let* ((out-bin (string-append #$output "/bin")) + (tools-bin (string-append #$output:tools "/bin")) + (tool (string-append tools-bin "/moonfish-"))) + (mkdir-p out-bin) + (mkdir-p tools-bin) + (copy-file "moonfish" + (string-append out-bin "/moonfish")) + (copy-file "play" + (string-append tool "play")) + (copy-file "lichess" + (string-append tool "lichess")) + (copy-file "analyse" + (string-append tool "analyse")))))))) + (inputs (list bearssl cjson)) + (outputs '("out" "tools")) + (home-page "https://git.sr.ht/~zamfofex/moonfish") + (synopsis "Simple chess engine written in C") + (description + "moonfish is a toy UCI chess engine made for fun. It is inspired by +sunfish, but is written in C rather than Python. It also has TUI tools for +using any UCI engine and also to connect UCI engines to Lichess.") + (license license:agpl3+)))) + (define-public barrage (package (name "barrage") diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 313a92d8aa..96e0d81d98 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -696,17 +696,16 @@ It also includes runtime support libraries for these languages.") (define-public gcc-10 (package (inherit gcc-8) - (version "10.4.0") + (version "10.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9")) + "1h87lcfaga0ydsf4pkhwlnjr8mky5ix8npbv6iy3jvzlzm1ra415")) (patches (search-patches "gcc-9-strmov-store-file-names.patch" - "gcc-5.0-libvtv-runpath.patch" - "gcc-10-tree-sra-union-handling.patch")) + "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (properties @@ -1044,7 +1043,6 @@ as the 'native-search-paths' field." (package-outputs gcc) (delete "lib" (package-outputs gcc)))) (native-search-paths search-paths) - (properties (alist-delete 'hidden? (package-properties gcc))) (arguments (substitute-keyword-arguments (package-arguments gcc) ((#:modules modules %default-gnu-modules) @@ -1064,7 +1062,9 @@ as the 'native-search-paths' field." (for-each delete-file (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))))) + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|lto)(-.*)?$")))))))) + (properties `((upstream-name . "gcc") + ,@(alist-delete 'hidden? (package-properties gcc)))))) (define %generic-search-paths ;; This is the language-neutral search path for GCC. Entries in $CPATH are @@ -1210,15 +1210,22 @@ provides the GNU compiler for the Go programming language.")) ;; a cyclic dependency. <http://debbugs.gnu.org/18101> #:separate-lib-output? #f)) +;; Provides go-1.14.6 (define-public gccgo-10 (make-gccgo gcc-10)) +;; Provides go-1.16.5 (define-public gccgo-11 (make-gccgo gcc-11)) +;; Provides go-1.18 (define-public gccgo-12 (make-gccgo gcc-12)) +;; Provides go-1.18 +(define-public gccgo-13 + (make-gccgo gcc-13)) + (define %objc-search-paths (list (search-path-specification (variable "OBJC_INCLUDE_PATH") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index e552d469bb..09298fba11 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1485,13 +1485,13 @@ to create databases that are optimized for rendering/tile/map-services.") (define-public python-metpy (package (name "python-metpy") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (pypi-uri "MetPy" version)) (sha256 (base32 - "0g9m8qb920mvi0kqw7vbagj08xvv96zj6gjyc7dawlvh15vb55qq")))) + "1is6rradl97k04hf27dhzla4y4j98hibran3rbz6xh226q1r9vmb")))) (build-system pyproject-build-system) (arguments ;; Too many of the tests in the files below require online data. @@ -1940,7 +1940,7 @@ to the OSM opening hours specification.") (define-public josm (package (name "josm") - (version "18646") + (version "18822") (source (origin (method svn-fetch) (uri (svn-reference @@ -1949,7 +1949,7 @@ to the OSM opening hours specification.") (recursive? #f))) (sha256 (base32 - "0zr3p1i39wi0f29lgb3xrnv6lijrq5ia8jxn4wnq1yz0xdlbg98i")) + "0b4q6n3jbqrh7dsfmcf2g0xdd1wjj62sjq8lwvggvrpqlk1fyn1b")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -1963,17 +1963,19 @@ to the OSM opening hours specification.") (list java-commons-jcs java-commons-compress java-jmapviewer - java-jsonp-api - java-jsonp-impl ; runtime dependency + java-jakarta-json java-jsr305 java-metadata-extractor java-opening-hours-parser java-openjfx-media + java-parsson ; runtime dependency java-signpost-core - java-svg-salamander)) + java-svg-salamander + openjdk11)) (arguments `(#:tests? #f #:jar-name "josm.jar" + #:jdk ,openjdk11 #:phases (modify-phases %standard-phases (add-after 'unpack 'rm-build.xml @@ -2069,9 +2071,16 @@ to the OSM opening hours specification.") (lambda _ (display (string-append "#!/bin/sh\n" - (assoc-ref inputs "jdk") "/bin/java" + (assoc-ref inputs "openjdk") "/bin/java" " -cp " out "/share/java/josm.jar:" - (getenv "CLASSPATH") + ;; CLASSPATH, but remove native inputs + (string-join + (filter + (lambda (jar) + (and (not (string-contains jar "-jdk/")) + (not (string-contains jar "-javacc-")))) + (string-split (getenv "CLASSPATH") #\:)) + ":") " org.openstreetmap.josm.gui.MainApplication")))) (chmod (string-append bin "/josm") #o755)) #t))))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6472158abc..c02a6f0a84 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.1.4") + (version "23.2.1") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "0n89l7lvawh85hq2a7g5pp5v017s03qs3n4hbbff6rs8p5zs2qbj")))) + "1k61pgw0vcjrlb4299q98cy7iqmk2r7jmb5ika91z01dzhb0dpk4")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -754,10 +754,14 @@ OpenGL graphics API.") #~(modify-phases %standard-phases (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((mesa (dirname (search-input-file inputs "lib/libGL.so")))) + (let ((mesa-lib + (lambda (file) + (search-input-file inputs (string-append "lib/" file))))) (substitute* (find-files "." "\\.[ch]$") - (("libGL.so.1") (string-append mesa "/libGL.so.1")) - (("libEGL.so.1") (string-append mesa "/libEGL.so.1"))))))))) + (("libGL.so.1") (mesa-lib "libGL.so.1")) + (("libEGL.so.1") (mesa-lib "libEGL.so.1")) + (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1")) + (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2"))))))))) (build-system meson-build-system) (native-inputs (list pkg-config python)) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index e693459a3f..d8b0f652cf 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1051,6 +1051,29 @@ scrollable tiling of windows and per monitor workspaces. It's inspired by paper notebooks and tiling window managers.") (license license:gpl3))) +(define-public gnome-shell-extension-night-theme-switcher + (package + (name "gnome-shell-extension-night-theme-switcher") + (version "65") + (source + (origin + (method git-fetch) + (uri (git-reference + (url + "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension") + (commit version))) + (sha256 + (base32 "0qhi2g2lh6m8vhrmmfi60977f0i4k9x1zj68lrvpzzlqndz8cgh9")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) + (native-inputs (list pkg-config (list glib "bin"))) + (synopsis "Automatic theme switcher for GNOME Shell") + (description + "Automatically toggle your GNOME desktop's color scheme between light and +dark, switch backgrounds and run custom commands at sunset and sunrise.") + (home-page "https://nightthemeswitcher.romainvigier.fr") + (license license:gpl2+))) + (define-public gpaste (package (name "gpaste") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 69817b0c81..7859f01aae 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2017, 2020, 2021 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net> -;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com> +;;; Copyright © 2018, 2023 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2018, 2019 Timothy Sample <samplet@ngyro.com> ;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org> @@ -51,7 +51,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Naga Malleswari <nagamalli@riseup.net> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> -;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> @@ -1891,7 +1891,7 @@ either on a local, or remote machine via a number of methods.") (define-public gnome-commander (package (name "gnome-commander") - (version "1.14.3") + (version "1.16.1") (source (origin (method url-fetch) @@ -1899,8 +1899,10 @@ either on a local, or remote machine via a number of methods.") (version-major+minor version) "/" "gnome-commander-" version ".tar.xz")) (sha256 - (base32 "0yzx9slg632iflw9p96nlh9i50dhacq7hrzpkj8b48mr1zkxrn3q")))) - (build-system glib-or-gtk-build-system) + (base32 "1cyh20nz2f81rb6di99idvw4xjn969mjhj3n2q17kzjhlv20079z")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) (native-inputs (list desktop-file-utils flex @@ -1908,6 +1910,7 @@ either on a local, or remote machine via a number of methods.") `(,glib "bin") gobject-introspection googletest + `(,gtk+-2 "bin") intltool itstool libtool @@ -3492,7 +3495,7 @@ for dealing with different structured file formats.") (define-public librsvg (package (name "librsvg") - (version "2.54.5") + (version "2.56.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3500,10 +3503,7 @@ for dealing with different structured file formats.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "0vmfgihhf35bxn7giqiskgsflr0zxp6xyy9aynhiyk9j8l7ij0sg")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "vendor"))))) + "1xa0cxdvc6vis5ssh1i0vi2rwgcx3bll6k5i135qyd2ra77zv1za")))) (build-system cargo-build-system) (outputs '("out" "doc" "debug")) (arguments @@ -3514,55 +3514,61 @@ for dealing with different structured file formats.") (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) #:cargo-inputs - `(("rust-byteorder" ,rust-byteorder-1) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-cssparser" ,rust-cssparser-0.28) - ("rust-data-url" ,rust-data-url-0.1) - ("rust-encoding" ,rust-encoding-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-data-url" ,rust-data-url-0.2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.15) - ("rust-gio" ,rust-gio-0.15) - ("rust-glib" ,rust-glib-0.15) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.17) + ("rust-gio" ,rust-gio-0.17) + ("rust-glib" ,rust-glib-0.17) ("rust-itertools" ,rust-itertools-0.10) ("rust-language-tags" ,rust-language-tags-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-locale-config" ,rust-locale-config-0.3) - ("rust-markup5ever" ,rust-markup5ever-0.10) - ("rust-nalgebra" ,rust-nalgebra-0.29) + ("rust-markup5ever" ,rust-markup5ever-0.11) + ("rust-nalgebra" ,rust-nalgebra-0.32) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pango" ,rust-pango-0.15) - ("rust-pangocairo" ,rust-pangocairo-0.15) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-rayon" ,rust-rayon-1) - ("rust-rctree" ,rust-rctree-0.4) - ("rust-rgb" ,rust-rgb-0.8) + ("rust-rctree" ,rust-rctree-0.5) ("rust-regex" ,rust-regex-1) - ("rust-selectors" ,rust-selectors-0.23) + ("rust-rgb" ,rust-rgb-0.8) + ("rust-selectors" ,rust-selectors-0.24) ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-thiserror" ,rust-thiserror-1) ("rust-tinyvec" ,rust-tinyvec-1) ("rust-url" ,rust-url-2) - ("rust-xml5ever" ,rust-xml5ever-0.16)) + ("rust-xml5ever" ,rust-xml5ever-0.17)) #:cargo-development-inputs `(("rust-anyhow" ,rust-anyhow-1) ("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-cairo-rs" ,rust-cairo-rs-0.15) + ("rust-cairo-rs" ,rust-cairo-rs-0.17) + ("rust-cast" ,rust-cast-0.3) ("rust-chrono" ,rust-chrono-0.4) - ("rust-criterion" ,rust-criterion-0.3) - ("rust-glib" ,rust-glib-0.15) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-glib" ,rust-glib-0.17) ("rust-libc" ,rust-libc-0.2) - ("rust-lopdf" ,rust-lopdf-0.26) + ("rust-lopdf" ,rust-lopdf-0.29) ("rust-matches" ,rust-matches-0.1) + ("rust-pango" ,rust-pango-0.17) + ("rust-pangocairo" ,rust-pangocairo-0.17) ("rust-png" ,rust-png-0.17) ("rust-predicates" ,rust-predicates-2) ("rust-proptest" ,rust-proptest-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3) - ("rust-test-generator" ,rust-test-generator-0.3) - ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-2)) + ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-4)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-gdk-pixbuf-thumbnailer @@ -3586,12 +3592,9 @@ for dealing with different structured file formats.") ;; Increase reftest tolerance a bit to account for different ;; harfbuzz, pango, etc. (setenv "RSVG_TEST_TOLERANCE" "20") - ;; These two tests even fail after loosening the tolerance. - (for-each delete-file - '("tests/fixtures/reftests/bugs/730-font-scaling.svg" - "tests/fixtures/reftests/bugs/730-font-scaling-ref.png" - "tests/fixtures/reftests/svg1.1/text-text-03-b.svg" - "tests/fixtures/reftests/svg1.1/text-text-03-b-ref.png")))) + ;; This test fails even after loosening the tolerance. + (substitute* "tests/src/reference.rs" + ((".*svg1_1_text_align_03_b_svg.*") "")))) (add-before 'configure 'pre-configure (lambda* (#:key outputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" @@ -5905,7 +5908,7 @@ services for numerous locations.") gi-docgen `(,glib "bin") ;for glib-mkenums gobject-introspection - glibc-utf8-locales + (libc-utf8-locales-for-target) gsettings-desktop-schemas pkg-config python @@ -7818,10 +7821,7 @@ to display dialog boxes from the commandline and shell scripts.") (build-system meson-build-system) (arguments (list - #:imported-modules `(,@%meson-build-system-modules - (guix build syscalls)) #:modules '((guix build meson-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:glib-or-gtk? #t @@ -7915,22 +7915,22 @@ to display dialog boxes from the commandline and shell scripts.") "1")) (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "dbus-run-session" "--" + (apply execlp "dbus-run-session" "dbus-run-session" "xvfb-run" "-a" "-s" (getenv "XVFB_SERVER_ARGS") "meson" "test" "-t" "0" "--print-errorlogs" test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (dbus-pid + (let loop () + ;; Reap child processes; otherwise, python-dbusmock would + ;; waste time polling for the dbus processes it spawns to + ;; be reaped, in vain. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid dbus-pid) + (unless (zero? status) + (error "`meson test' exited with status" + status)) + (loop))))))))))))) (native-inputs (list desktop-file-utils ;for update-desktop-database `(,glib "bin") ;for glib-compile-schemas, etc. @@ -7951,8 +7951,7 @@ to display dialog boxes from the commandline and shell scripts.") pipewire python python-dbus - python-dbusmock - tini)) ;acting as init (zombie reaper) + python-dbusmock)) (propagated-inputs (list gsettings-desktop-schemas-next ;required by libmutter.pc gtk+ ;required by libmutter.pc @@ -8264,7 +8263,7 @@ users.") (name "network-manager") ;; Note: NetworkManager still follows the odd/even major version number ;; for development/stable releases scheme; be sure to use a stable one. - (version "1.42.6") + (version "1.44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -8274,7 +8273,7 @@ users.") "network-manager-meson.patch")) (sha256 (base32 - "0y82xl84dyhdkyl98y86wspiq9iy5jz23bjzc3mvrijsfz1qlf4c")))) + "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd")))) (build-system meson-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML @@ -8296,6 +8295,7 @@ users.") "-Ddhcpcanon=no" "-Dcrypto=gnutls" "-Diwd=true" + "-Dnm_cloud_setup=false" "-Dlibaudit=yes" "-Dqt=false" "-Ddocs=true" @@ -8305,19 +8305,12 @@ users.") #$output "/lib/udev") (string-append "-Ddbus_conf_dir=" #$output "/etc/dbus-1/system.d") - + (string-append "-Dmodprobe=" (search-input-file %build-inputs + "bin/modprobe")) (string-append "-Ddhclient=" (search-input-file %build-inputs - "/sbin/dhclient"))) + "sbin/dhclient"))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-modprobe-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/libnm-platform/nm-platform-utils.c" - ;; The modprobe command location is not configurable (see: - ;; https://gitlab.freedesktop.org/NetworkManager/ - ;; NetworkManager/-/issues/1257). - (("/sbin/modprobe") - (search-input-file inputs "bin/modprobe"))))) (add-after 'unpack 'patch-dlopen-call-to-libjansson.so (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/libnm-glib-aux/nm-json-aux.c" @@ -8633,7 +8626,10 @@ Cisco's AnyConnect SSL VPN.") libsecret network-manager openfortivpn - ppp)) + + ;; ppp < 2.5.0 is currently required: + ;; https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6 + ppp-2.4.9)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") (description @@ -8667,7 +8663,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.32.0") + (version "1.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -8675,7 +8671,7 @@ to virtual private networks (VPNs) via Fortinet SSLVPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "0f5sxxi9rywg8mhglcyk3sqmgv5wwl4vxzar56847b852pxazdd2")))) + "1a55mf4ww06lqacs6zndp29ayyby5f8rgg1lp341y5kb1x3qwdmb")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -9467,7 +9463,7 @@ easy, safe, and automatic.") (native-inputs (list gettext-minimal `(,glib "bin") - glibc-utf8-locales + (libc-utf8-locales-for-target) gobject-introspection docbook-xsl docbook-xml @@ -9524,7 +9520,7 @@ endpoint and it understands SPARQL.") (define-public tracker-miners (package (name "tracker-miners") - (version "3.3.1") + (version "3.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker-miners/" @@ -9532,7 +9528,7 @@ endpoint and it understands SPARQL.") "/tracker-miners-" version ".tar.xz")) (sha256 (base32 - "151w6ljq1gk9idqfq9qs3w16vms91jnxy59c9kx6jaf0fb9cdp9y")))) + "1izg2xhlr64gd9pw7apa9nkf0ffyz74f22ml1ng7q60bxf0dl0yl")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 499e101393..d38f2a80f2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> -;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> +;;; Copyright © 2017, 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Nikita <nikita@n0.is> ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net> @@ -392,7 +392,12 @@ from collections.abc import MutableSequence")))) "-src.tgz")) (sha256 (base32 - "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4"))))))) + "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) + (patches + (cons + (search-patch + "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") + (origin-patches (package-source icu4c))))))))) ;;; ;;; Localization helper procedures. @@ -541,9 +546,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.3.1") +(define %icecat-base-version "115.5.0") (define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20230928000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-build-id "20231121000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -563,12 +568,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0lqymabkhxpdhmgz81if8za1hdakh8nlm4cmsir4y1fa95p2bnkx")))) + "0a578r4kri7jdw8pkkzp7f1mm9idlk7sjxjghcb08k5p14172gyv")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.3.1") - (gnuzilla-commit "1b0f0ba84716023657dd7dff72cb408e35380a60") + (upstream-icecat-base-version "115.5.0") + (gnuzilla-commit "bd66797f3bb057c9d051d4276d63843b4d7ee854") (gnuzilla-source (origin (method git-fetch) @@ -580,7 +585,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "0kvdyg2kzjabldqa10any5ad8r06pcybamvfnkn7nwcvd86g8s0v")))) + "0v3ckm8yv566f2y9a2bfzakbsk529f1ykr7dj69kb9k93dgny3ja")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -881,16 +886,13 @@ variable defined below. It requires guile-json to be installed." #:phases #~(modify-phases %standard-phases (add-after 'unpack 'apply-guix-specific-patches - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((patch (search-input-file inputs "bin/patch"))) - (for-each (match-lambda - ((label . file) - (when (and (string-prefix? "icecat-" label) - (string-suffix? ".patch" label)) - (format #t "applying '~a'...~%" file) - (invoke patch "--force" "--no-backup-if-mismatch" - "-p1" "--input" file)))) - (or native-inputs inputs))))) + (lambda _ + (for-each + (lambda (file) (invoke "patch" "--force" "-p1" "-i" file)) + '(#$(local-file + (search-patch "icecat-compare-paths.patch")) + #$(local-file + (search-patch "icecat-use-system-wide-dir.patch")))))) (add-after 'apply-guix-specific-patches 'remove-bundled-libraries (lambda _ ;; Remove bundled libraries that we don't use, since they may @@ -1056,10 +1058,12 @@ variable defined below. It requires guile-json to be installed." (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) (apply invoke "./mach" "build" - ;; mach will use parallel build if possible by default - `(,@(if parallel-build? - '() - '("-j1")) + ;; mach will use a wide parallel build if possible by + ;; default, so reign it in if requested. + `(,(string-append + "-j" (number->string (if parallel-build? + (parallel-job-count) + 1))) ,@make-flags)))) (add-after 'build 'neutralise-store-references (lambda _ @@ -1134,6 +1138,11 @@ variable defined below. It requires guile-json to be installed." '("default16.png" "default22.png" "default24.png" "default32.png" "default48.png" "content/icon64.png" "mozicon128.png" "default256.png")))))))) + (native-search-paths + (list (search-path-specification + (variable "ICECAT_SYSTEM_DIR") + (separator #f) ;single entry + (files '("lib/icecat"))))) (home-page "https://www.gnu.org/software/gnuzilla/") (synopsis "Entirely free browser derived from Mozilla Firefox") (description diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm new file mode 100644 index 0000000000..42e501a6e3 --- /dev/null +++ b/gnu/packages/golang-check.scm @@ -0,0 +1,555 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> +;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> +;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> +;;; Copyright © 2019 Leo Famulari <leo@famulari.name> +;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> +;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz> +;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> +;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> +;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2022 ( <paren@disroot.org> +;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> +;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> +;;; Copyright © 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(define-module (gnu packages golang-check) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix build-system go) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (gnu packages) + #:use-module (gnu packages golang)) + +;;; Commentary: +;;; +;;; Golang packages to unit-test, mock, assert, lint processes for Golang itself. +;;; +;;; Please: Try to add new module packages in alphabetic order. +;;; +;;; Code: + +(define-public go-honnef-co-go-tools + (package + (name "go-honnef-co-go-tools") + (version "0.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominikh/go-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32")))) + (build-system go-build-system) + (arguments + `(#:import-path "honnef.co/go/tools" + #:tests? #f + ;; Source-only package + #:phases (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + (list go-github-com-burntsushi-toml + go-github-com-kisielk-gotool + go-golang-org-x-exp + go-golang-org-x-mod + go-golang-org-x-tools)) + (home-page "https://honnef.co/go/tools") + (synopsis "Staticcheck advanced Go linter") + (description + "Staticcheck is a state of the art linter for the Go programming language. +Using static analysis, it finds bugs and performance issues, offers +simplifications, and enforces style rules.") + (license license:expat))) + +(define-public go-github-com-alecthomas-assert + (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06") + (revision "1")) + (package + (name "go-github-com-alecthomas-assert") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/assert") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/alecthomas/assert")) + (native-inputs + (list go-github-com-alecthomas-colour + go-github-com-mattn-go-isatty + go-github-com-alecthomas-repr + go-github-com-sergi-go-diff)) + (home-page "https://github.com/alecthomas/assert/") + (synopsis "Go assertion library") + (description "Assertion library that: +@itemize +@item makes spotting differences in equality much easier +@item uses repr and diffmatchpatch to display structural differences in colour +@item aborts tests on first assertion failure +@end itemize\n") + (license license:expat)))) + +(define-public go-github-com-cheekybits-is + (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") + (revision "0")) + (package + (name "go-github-com-cheekybits-is") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cheekybits/is") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/cheekybits/is")) + (home-page "https://github.com/cheekybits/is") + (synopsis "Mini testing helper for Go") + (description "A mini testing helper for Go. + +@itemize +@item It has a simple interface (@command{is.OK} and @command{is.Equal}). +@item It plugs into existing Go toolchain (uses @command{testing.T}). +@item It's obvious for newcomers. +@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers +- because testing panics is ugly. +@end itemize\n") + (license license:expat)))) + +(define-public go-github-com-frankban-quicktest + (package + (name "go-github-com-frankban-quicktest") + (version "1.11.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frankban/quicktest") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/frankban/quicktest")) + (propagated-inputs + (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty)) + (home-page "https://github.com/frankban/quicktest") + (synopsis "Quick helpers for testing Go applications") + (description + "Package quicktest provides a collection of Go helpers for writing +tests.") + (license license:expat))) + +(define-public go-github-com-google-go-cmdtest + (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5") + (revision "0")) + (package + (name "go-github-com-google-go-cmdtest") + (version (git-version "0.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-cmdtest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/go-cmdtest")) + (propagated-inputs + (list go-github-com-google-renameio go-github-com-google-go-cmp-cmp)) + (home-page "https://github.com/google/go-cmdtest") + (synopsis "Testing for your CLI") + (description + "The cmdtest package simplifies testing of command-line interfaces. It +provides a simple, cross-platform, shell-like language to express command +execution. It can compare actual output with the expected output, and can +also update a file with new \"golden\" output that is deemed correct.") + (license license:asl2.0)))) + +(define-public go-github-com-google-gofuzz + (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") + (revision "0")) + (package + (name "go-github-com-google-gofuzz") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/gofuzz") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/google/gofuzz")) + (home-page "https://github.com/google/gofuzz") + (synopsis "Fuzz testing library for Go") + (description "Gofuzz is a library for populationg Go objects with random +values for the purpose of fuzz testing.") + (license license:asl2.0)))) + +(define-public go-github-com-golangplus-testing + (package + (name "go-github-com-golangplus-testing") + (version "1.0.0") + (home-page "https://github.com/golangplus/testing") + (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 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/golangplus/testing")) + (propagated-inputs + (list go-github-com-golangplus-fmt)) + (synopsis "Additions to Go's standard testing package") + (description "This package provides additions to Go's stdlib testing.") + (license license:bsd-3))) + +(define-public go-github-com-jacobsa-oglematchers + (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") + (revision "0")) + (package + (name "go-github-com-jacobsa-oglematchers") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/oglematchers") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jacobsa/oglematchers" + ;; break loop with with go-github-com-jacobsa-ogletest + #:tests? #f)) + (home-page "https://github.com/jacobsa/oglematchers") + (synopsis "Matchers for Go testing framework") + (description + "Package oglematchers provides a set of matchers useful in a testing or mocking +framework. These matchers are inspired by and mostly compatible with Google +Test for C++ and Google JS Test.") + (license license:asl2.0)))) + +(define-public go-github-com-jacobsa-oglemock + (let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf") + (revision "0")) + (package + (name "go-github-com-jacobsa-oglemock") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/oglemock") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14yxf8ykwdwkcccksl6741xgzcf8qykyi58kp4maxpgscqhdl8rq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/jacobsa/oglemock" + ;; break loop with with go-github-com-jacobsa-ogletest + #:tests? #f)) + (native-inputs + (list go-github-com-jacobsa-oglematchers)) + (home-page "https://github.com/jacobsa/oglemock") + (synopsis "Mocking framework for unit tests") + (description + "Package oglemock provides a mocking framework for unit tests.") + (license license:asl2.0)))) + +(define-public go-github-com-jacobsa-ogletest + (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") + (revision "0")) + (package + (name "go-github-com-jacobsa-ogletest") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jacobsa/ogletest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/jacobsa/ogletest" + ;; These tests should be made working + #:tests? #f)) + (native-inputs + (list go-github-com-jacobsa-oglematchers + go-github-com-jacobsa-oglemock + go-github-com-jacobsa-reqtrace + go-golang-org-x-net)) + (home-page "https://github.com/jacobsa/ogletest") + (synopsis "Expressive unit tests") + (description + "Package ogletest provides a framework for writing expressive unit tests. It +integrates with the builtin testing package, so it works with the gotest +command. Unlike the testing package which offers only basic capabilities for +signalling failures, it offers ways to express expectations and get nice failure +messages automatically.") + (license license:asl2.0)))) + +(define-public go-github-com-onsi-ginkgo + (package + (name "go-github-com-onsi-ginkgo") + (version "1.16.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/onsi/ginkgo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/onsi/ginkgo")) + (propagated-inputs + (list go-golang-org-x-sys + go-golang-org-x-tools + go-github-com-go-task-slim-sprig + go-github-com-nxadm-tail + go-github-com-onsi-gomega)) + (home-page "https://github.com/onsi/ginkgo") + (synopsis "BDD-style testing framework for Go") + (description + "Ginkgo is a Behaviour-Driven Development testing framework for Go. It +builds on top of Go's builtin @code{testing} library and is complemented by the +Gomega matcher library.") + (license license:expat))) + +(define-public go-github-com-stretchr-testify + (package + (name "go-github-com-stretchr-testify") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stretchr/testify") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/stretchr/testify")) + (propagated-inputs + (list go-github-com-davecgh-go-spew + go-github-com-pmezard-go-difflib + go-github-com-stretchr-objx + go-gopkg-in-yaml-v3)) + (home-page "https://github.com/stretchr/testify") + (synopsis "Go helper library for tests and invariant checking") + (description "This package provide many tools for testifying that your +code will behave as you intend. + +Features include: +@itemize +@item Easy assertions +@item Mocking +@item HTTP response trapping +@item Testing suite interfaces and functions. +@end itemize") + (license license:expat))) + +(define-public go-github-com-tdewolff-test + (package + (name "go-github-com-tdewolff-test") + (version "1.0.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdewolff/test") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/tdewolff/test")) + (home-page "https://github.com/tdewolff/test") + (synopsis "Go test helper functions") + (description + "This package implements a few functions that are useful for io testing, +such as readers and writers that fail after N consecutive reads/writes.") + (license license:expat))) + +(define-public go-gopkg-in-check-v1 + (package + (name "go-gopkg-in-check-v1") + (version "1.0.0-20201130134442-10cb98267c6c") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-check/check") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) + (build-system go-build-system) + (arguments + (list + #:import-path "gopkg.in/check.v1" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) + (propagated-inputs + (list go-github-com-kr-pretty)) + (home-page "https://gopkg.in/check.v1") + (synopsis "Test framework for the Go language") + (description "This package provides a test library for the Go language.") + (license license:bsd-2))) + +(define-public go-gopkg-in-go-playground-assert-v1 + (package + (name "go-gopkg-in-go-playground-assert-v1") + (version "1.2.1") + (home-page "https://github.com/go-playground/assert") + (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 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm")))) + (build-system go-build-system) + (arguments + '(#:import-path "gopkg.in/go-playground/assert.v1")) + (synopsis "Basic assertion library used alongside native Go testing") + (description + "This package provides basic assertions along with building blocks for +custom assertions to be used alongside native Go testing.") + (license license:expat))) + +(define-public go-golang-org-sql-mock + (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") + (version "1.3.3") + (revision "1")) + (package + (name "go-golang-org-sql-mock") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DATA-DOG/go-sqlmock") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/DATA-DOG/go-sqlmock")) + (synopsis "Mock library implementing @code{sql/driver}") + (description "This library simulates SQL-driver behavior in tests +without requiring a real database connection.") + (home-page "https://github.com/DATA-DOG/go-sqlmock") + (license license:expat)))) + +(define-public go-golang-org-x-lint + (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") + (revision "0")) + (package + (name "go-golang-org-x-lint") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/lint") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/lint" + #:tests? #f)) ;; TODO: Fix tests + (propagated-inputs + (list go-golang-org-x-tools)) + (home-page "https://golang.org/x/lint") + (synopsis "Linter for Go source code") + (description + "This is a linter for Go source code. Unlike gofmt, it doesn't +reformat the source code, it only prints out style mistakes.") + (license license:bsd-3)))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3d19b48e9f..b5bf9d4b47 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2022 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net> +;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +79,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang-check) #:use-module (gnu packages lua) #:use-module (gnu packages mail) #:use-module (gnu packages mp3) @@ -1310,98 +1312,6 @@ networks where it would otherwise be blocked or heavily throttled.") not included in the Go standard library.") (license license:asl2.0)))) -(define-public go-github-com-jacobsa-oglematchers - (let ((commit "141901ea67cd4769c6800aa7bfdfc558fa22bda5") - (revision "0")) - (package - (name "go-github-com-jacobsa-oglematchers") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/oglematchers") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09ff5x6vbhd9zl1z4yzyk573ifh16rry38q1rx986kbz4hqkmniq")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jacobsa/oglematchers" - ;; break loop with with go-github-com-jacobsa-ogletest - #:tests? #f)) - (home-page "https://github.com/jacobsa/oglematchers") - (synopsis "Matchers for Go testing framework") - (description - "Package oglematchers provides a set of matchers useful in a testing or mocking -framework. These matchers are inspired by and mostly compatible with Google -Test for C++ and Google JS Test.") - (license license:asl2.0)))) - -(define-public go-github-com-jacobsa-oglemock - (let ((commit "e94d794d06ffc6de42cb19d0dab3c219efdd6dcf") - (revision "0")) - (package - (name "go-github-com-jacobsa-oglemock") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/oglemock") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14yxf8ykwdwkcccksl6741xgzcf8qykyi58kp4maxpgscqhdl8rq")))) - (build-system go-build-system) - (arguments - (list - #:import-path "github.com/jacobsa/oglemock" - ;; break loop with with go-github-com-jacobsa-ogletest - #:tests? #f)) - (native-inputs (list - go-github-com-jacobsa-oglematchers)) - (home-page "https://github.com/jacobsa/oglemock") - (synopsis "Mocking framework for unit tests") - (description - "Package oglemock provides a mocking framework for unit tests.") - (license license:asl2.0)))) - -(define-public go-github-com-jacobsa-ogletest - (let ((commit "80d50a735a1108a2aeb7abc4a988d183f20c5292") - (revision "0")) - (package - (name "go-github-com-jacobsa-ogletest") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jacobsa/ogletest") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lbwbxzr75g65q07ry5k4kglxqs3ym7xkvqznzm55rm3qk76v83r")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/jacobsa/ogletest" - ;; These tests should be made working - #:tests? #f)) - (native-inputs (list - go-github-com-jacobsa-oglematchers - go-github-com-jacobsa-oglemock - go-github-com-jacobsa-reqtrace - go-golang-org-x-net)) - (home-page "https://github.com/jacobsa/ogletest") - (synopsis "Expressive unit tests") - (description - "Package ogletest provides a framework for writing expressive unit tests. It -integrates with the builtin testing package, so it works with the gotest -command. Unlike the testing package which offers only basic capabilities for -signalling failures, it offers ways to express expectations and get nice failure -messages automatically.") - (license license:asl2.0)))) - (define-public go-github-com-jacobsa-reqtrace (let ((commit "245c9e0234cb2ad542483a336324e982f1a22934") (revision "0")) @@ -3062,28 +2972,6 @@ Under Windows, the console APIs are used. Otherwise, ANSI texts are output.") ;; dual-licensed (license (list license:bsd-3 license:expat)))) -(define-public go-github-com-golangplus-testing - (package - (name "go-github-com-golangplus-testing") - (version "1.0.0") - (home-page "https://github.com/golangplus/testing") - (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 "1a29m4zplf9m14k74lrb55dids2l17vx28sv0g3y3qcv1xygksiv")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/golangplus/testing")) - (propagated-inputs - (list go-github-com-golangplus-fmt)) - (synopsis "Additions to Go's standard testing package") - (description "This package provides additions to Go's stdlib testing.") - (license license:bsd-3))) - (define-public go-github-com-leodido-go-urn (package (name "go-github-com-leodido-go-urn") @@ -3142,29 +3030,6 @@ way of specifying command line options.") (home-page "https://github.com/jessevdk/go-flags") (license license:bsd-3))) -(define-public go-gopkg-in-go-playground-assert-v1 - (package - (name "go-gopkg-in-go-playground-assert-v1") - (version "1.2.1") - (home-page "https://github.com/go-playground/assert") - (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 "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm")))) - (build-system go-build-system) - (arguments - '(#:import-path "gopkg.in/go-playground/assert.v1")) - (synopsis "Basic assertion library used alongside native Go testing") - (description - "This package provides basic assertions along with building blocks for -custom assertions to be used alongside native Go testing.") - (license license:expat))) - (define-public go-github-com-go-playground-locales (package (name "go-github-com-go-playground-locales") @@ -3747,29 +3612,6 @@ an interface to implement any other minifier.") "This package contains several lexers and parsers written in Go.") (license license:expat))) -(define-public go-github-com-tdewolff-test - (package - (name "go-github-com-tdewolff-test") - (version "1.0.9") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdewolff/test") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10myz3zdkqmx37cvj507h7l2ncb0rq9shqvz9ggq1swijbsvazff")))) - (build-system go-build-system) - (arguments - (list #:import-path "github.com/tdewolff/test")) - (home-page "https://github.com/tdewolff/test") - (synopsis "Go test helper functions") - (description - "This package implements a few functions that are useful for io testing, -such as readers and writers that fail after N consecutive reads/writes.") - (license license:expat))) - (define-public go-github-com-tj-docopt (package (name "go-github-com-tj-docopt") @@ -4147,6 +3989,23 @@ the official package.") (home-page "https://go.googlesource.com/net") (license license:bsd-3)))) +(define-public go-golang-org-x-net-0.17 + (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") + (revision "0")) + (package + (inherit go-golang-org-x-net) + (name "go-golang-org-x-net") + (version (git-version "0.17.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) + (define-public go-golang-org-x-net-html (package (inherit go-golang-org-x-net) @@ -4250,6 +4109,24 @@ support for low-level interaction with the operating system.") (home-page "https://go.googlesource.com/sys") (license license:bsd-3)))) +;; XXX: This version is required for "go-github-com-quic-go-qtls-go1-20". +(define-public go-golang-org-x-sys-0.8 + (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") + (revision "0")) + (package + (inherit go-golang-org-x-sys) + (name "go-golang-org-x-sys") + (version (git-version "0.8.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/sys") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))))) + (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") @@ -4588,42 +4465,6 @@ Go.") slices, JSON and other data.") (license license:expat))) -(define-public go-github-com-stretchr-testify - (package - (name "go-github-com-stretchr-testify") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/stretchr/testify") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ixgjsvafr3513pz3r6pmgk074s2dxkll0dadvl25gkf30rkmh10")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/stretchr/testify")) - (propagated-inputs - `(("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew) - ("github.com/pmezard/go-difflib" ,go-github-com-pmezard-go-difflib) - ("github.com/stretchr/objx" ,go-github-com-stretchr-objx) - ("gopkg.in/yaml.v3" ,go-gopkg-in-yaml-v3))) - (home-page "https://github.com/stretchr/testify") - (synopsis "Go helper library for tests and invariant checking") - (description "This package provide many tools for testifying that your -code will behave as you intend. - -Features include: -@itemize -@item Easy assertions -@item Mocking -@item HTTP response trapping -@item Testing suite interfaces and functions. -@end itemize") - (license license:expat))) - (define go-github-com-stretchr-testify-bootstrap (package (inherit go-github-com-stretchr-testify) @@ -4850,31 +4691,6 @@ information about the resource usage and performance characteristics of running containers.") (license license:asl2.0)))) -(define-public go-github-com-google-gofuzz - (let ((commit "fd52762d25a41827db7ef64c43756fd4b9f7e382") - (revision "0")) - (package - (name "go-github-com-google-gofuzz") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/gofuzz") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/google/gofuzz")) - (home-page "https://github.com/google/gofuzz") - (synopsis "Fuzz testing library for Go") - (description "Gofuzz is a library for populationg Go objects with random -values for the purpose of fuzz testing.") - (license license:asl2.0)))) - (define-public go-github-com-gorilla-css (package (name "go-github-com-gorilla-css") @@ -5724,39 +5540,6 @@ which satisfies the cron expression.") (license (list license:gpl3+ license:asl2.0))))) -(define-public go-gopkg-in-check-v1 - (package - (name "go-gopkg-in-check-v1") - (version "1.0.0-20201130134442-10cb98267c6c") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-check/check") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jwxndf8rsyx0fgrp47d99rp55yzssmryb92jfj3yf7zd8rjjljn")))) - (build-system go-build-system) - (arguments - (list - #:import-path "gopkg.in/check.v1" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) - (propagated-inputs - (list go-github-com-kr-pretty)) - (home-page "https://gopkg.in/check.v1") - (synopsis "Test framework for the Go language") - (description "This package provides a test library for the Go language.") - (license license:bsd-2))) - (define-public go-gopkg-in-ini-v1 (package (name "go-gopkg-in-ini-v1") @@ -5830,10 +5613,12 @@ values.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01b0wjb7yzv8wzzz2iim8mjpkwjnykcanrwiq06pkl89lr6gv8hn")))) + (base32 "01b0wjb7yzv8wzzz2iim8mjpkwjnykcanrwiq06pkl89lr6gv8hn")) + (patches (search-patches "go-gopkg-in-yaml-v3-32bit.patch")))) (build-system go-build-system) (arguments - '(#:import-path "gopkg.in/yaml.v3")) + `(#:tests? ,(not (target-ppc32?)) ; Test killed with quit: ran too long (11m0s). + #:import-path "gopkg.in/yaml.v3")) (native-inputs (list go-gopkg-in-check-v1)) (home-page "https://gopkg.in/yaml.v3") @@ -7059,38 +6844,6 @@ as conversion to and from @command{net.Addr}.") (description "Tar utilities extracted from @command{go-ipfs} codebase.") (license license:expat)))) -(define-public go-github-com-cheekybits-is - (let ((commit "68e9c0620927fb5427fda3708222d0edee89eae9") - (revision "0")) - (package - (name "go-github-com-cheekybits-is") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cheekybits/is") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1mkbyzhwq3rby832ikq00nxv3jnckxsm3949wkxd8ya9js2jmg4d")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/cheekybits/is")) - (home-page "https://github.com/cheekybits/is") - (synopsis "Mini testing helper for Go") - (description "A mini testing helper for Go. - -@itemize -@item It has a simple interface (@command{is.OK} and @command{is.Equal}). -@item It plugs into existing Go toolchain (uses @command{testing.T}). -@item It's obvious for newcomers. -@item It also gives you @command{is.Panic} and @command{is.PanicWith} helpers -- because testing panics is ugly. -@end itemize\n") - (license license:expat)))) - (define-public go-github-com-sabhiram-go-gitignore (let ((commit "525f6e181f062064d83887ed2530e3b1ba0bc95a") (revision "1")) @@ -7513,31 +7266,6 @@ representation suitable for computing diffs.") (home-page "https://github.com/kr/text") (license license:expat))) -(define-public go-golang-org-sql-mock - (let ((commit "e98392b8111b45f8126e00af035a0dd95dc12e8b") - (version "1.3.3") - (revision "1")) - (package - (name "go-golang-org-sql-mock") - (version (git-version version revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DATA-DOG/go-sqlmock") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "033vv29g2wf6fd757ajfmha30bqin3b07377037zkl051mk6mghs")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/DATA-DOG/go-sqlmock")) - (synopsis "Mock library implementing @code{sql/driver}") - (description "This library simulates SQL-driver behavior in tests -without requiring a real database connection.") - (home-page "https://github.com/DATA-DOG/go-sqlmock") - (license license:expat)))) - (define-public go-github-com-go-sql-driver-mysql (package (name "go-github-com-go-sql-driver-mysql") @@ -8001,35 +7729,110 @@ implementation of generics.") (home-page "https://github.com/cheekybits/genny/") (license license:expat))) -(define-public go-github-com-lucas-clemente-quic-go +(define-public go-github-com-quic-go-qtls-go1-20 (package - (name "go-github-com-lucas-clemente-quic-go") - (version "0.14.4") + (name "go-github-com-quic-go-qtls-go1-20") + (version "0.3.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/quic-go/qtls-go1-20") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/quic-go/qtls-go1-20" + #:go go-1.20)) + (propagated-inputs (list go-golang-org-x-crypto + go-golang-org-x-sys-0.8)) + (synopsis "TLS 1.3 for QUIC") + (description + "Go standard library TLS 1.3 implementation, modified for QUIC. For +Go 1.20.") + (home-page "https://github.com/quic-go/qtls-go1-20") + (license license:expat))) + +(define-public go-github-com-quic-go-qpack + (package + (name "go-github-com-quic-go-qpack") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/quic-go/qpack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00mjz445hhx4yar5l8p21bpp4d06jyg2ajw0ax7bh64d37l4kx39")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/quic-go/qpack" + ;; Tests require ginkgo v2. + #:tests? #f + #:go go-1.20)) + (propagated-inputs (list go-github-com-onsi-gomega + go-github-com-onsi-ginkgo + go-golang-org-x-net)) + (synopsis "Minimal QPACK (RFC 9204) implementation for Go") + (description + "A minimal QPACK (RFC 9204) implementation in Go. It is minimal in the sense +that it doesn't use the dynamic table at all, but just the static table and (Huffman +encoded) string literals. Wherever possible, it reuses code from the +@url{https://github.com/golang/net/tree/master/http2/hpack, HPACK implementation in +the Go standard library}.") + (home-page "https://github.com/quic-go/qpack") + (license license:expat))) + +(define-public go-github-com-quic-go-quic-go + (package + (name "go-github-com-quic-go-quic-go") + (version "0.39.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/lucas-clemente/quic-go") + (url "https://github.com/quic-go/quic-go") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "04l3gqbc3gh079n8vgnrsf8ypgv8sl63xjf28jqfrb45v2l73vyz")))) + "0acabl3cz48nxpggc5s7fwxpmr5amyi09jygn5m5xxkkbhqs2cxq")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/lucas-clemente/quic-go" - ;; XXX More packages required... - #:tests? #f)) + (list #:import-path "github.com/quic-go/quic-go" + ;; XXX More packages required... + #:tests? #f + #:go go-1.20)) (propagated-inputs - (list go-golang-org-x-crypto go-github-com-cheekybits-genny - go-github-com-marten-seemann-chacha20 - go-github-com-marten-seemann-qtls - go-github-com-golang-protobuf-proto)) + (let ((p (package-input-rewriting + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) + #:deep? #true))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-github-com-quic-go-qtls-go1-20 + go-github-com-quic-go-qpack + go-golang-org-x-crypto + go-github-com-cheekybits-genny + go-github-com-marten-seemann-chacha20 + go-github-com-golang-protobuf-proto + go-golang-org-x-crypto + go-golang-org-x-exp + go-golang-org-x-net + go-golang-org-x-sync))))) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") - (home-page "https://github.com/lucas-clemente/quic-go") + (home-page "https://github.com/quic-go/quic-go") (license license:expat))) +(define-public go-github-com-lucas-clemente-quic-go + (deprecated-package "go-github-com-lucas-clemente-quic-go" go-github-com-quic-go-quic-go)) + (define-public go-github-com-lunixbochs-vtclean (package (name "go-github-com-lunixbochs-vtclean") @@ -8522,7 +8325,15 @@ colorized or SGR defined output to the standard output.") (build-system go-build-system) (arguments '(#:import-path "github.com/google/go-cmp/cmp" - #:unpack-path "github.com/google/go-cmp")) + #:unpack-path "github.com/google/go-cmp" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "Determine equality of values in Go") (description "This package is intended to be a more powerful and safer @@ -8757,6 +8568,17 @@ with gotest-tools."))) (define-public go-gotest-tools-internal-source (package (inherit (go-gotest-tools-package "internal/source")) + (arguments + (substitute-keyword-arguments + (package-arguments (go-gotest-tools-package "internal/source")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; failed to parse source file: : open : no such file or directory + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args)))))))) (native-inputs (list go-github-com-pkg-errors go-github-com-google-go-cmp-cmp)) (synopsis "Source code AST formatters for gotest-tools") @@ -8945,45 +8767,48 @@ directories. It is optimized for filewalking.") @code{database/sql}.") (license license:expat))) -(define-public go-github-com-willf-bitset +(define-public go-github-com-bits-and-blooms-bitset (package - (name "go-github-com-willf-bitset") - (version "1.1.10") + (name "go-github-com-bits-and-blooms-bitset") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/willf/bitset") - (commit (string-append "v" version)))) + (url "https://github.com/bits-and-blooms/bitset") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0wpaxg6va3qwd0hq0b8rpb1hswvzzbfm2h8sjmcsdpbkydjjx9zg")))) + "1ialciixmr98p10rh61rnnkxpqi1j9hycbkv9rnjl0vnmsnpy0cy")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/willf/bitset")) + '(#:import-path "github.com/bits-and-blooms/bitset")) (synopsis "Bitsets in Go") (description "This package provides a Go implementation of bitsets, which are a mapping between non-negative integers and boolean values focused on efficient space usage.") - (home-page "https://github.com/willf/bitset") + (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-3))) -(define-public go-github-com-willf-bloom +(define-public go-github-com-willf-bitset + (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset)) + +(define-public go-github-com-bits-and-blooms-bloom (package - (name "go-github-com-willf-bloom") - (version "2.0.3") + (name "go-github-com-bits-and-blooms-bloom") + (version "3.6.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/willf/bloom") - (commit (string-append "v" version)))) + (url "https://github.com/bits-and-blooms/bloom") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0ygan8pgcay7wx3cs3ja8rdqj7nly7v3and97ddcc66020jxchzg")))) + "02rpjlgl7k3755qnlsk519xazgqlk73b8wvkpqlvccywms5w77bq")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/willf/bloom" + '(#:import-path "github.com/bits-and-blooms/bloom" #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-import-path @@ -8991,17 +8816,20 @@ efficient space usage.") ;; See 'go.mod' in the source distribution of Syncthing 1.5.0 for ;; more information. ;; <https://github.com/spaolacci/murmur3/issues/29> - (substitute* "src/github.com/willf/bloom/bloom.go" + (substitute* "src/github.com/bits-and-blooms/bloom/bloom.go" (("spaolacci") "twmb")) #t))))) (propagated-inputs - (list go-github-com-twmb-murmur3 go-github-com-willf-bitset)) + (list go-github-com-twmb-murmur3 go-github-com-bits-and-blooms-bitset)) (synopsis "Bloom filters in Go") (description "This package provides a Go implementation of bloom filters, based on murmurhash.") - (home-page "https://github.com/willf/bloom") + (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-2))) +(define-public go-github-com-willf-bloom + (deprecated-package "go-github-com-willf-bloom" go-github-com-bits-and-blooms-bloom)) + (define-public go-golang-org-rainycape-unidecode (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c") (revision "1")) @@ -9529,37 +9357,6 @@ synchronizing plain text: @end itemize\n") (license license:expat))) -(define-public go-github-com-alecthomas-assert - (let ((commit "405dbfeb8e38effee6e723317226e93fff912d06") - (revision "1")) - (package - (name "go-github-com-alecthomas-assert") - (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/assert") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/assert")) - (native-inputs - (list go-github-com-mattn-go-isatty go-github-com-alecthomas-colour - go-github-com-alecthomas-repr go-github-com-sergi-go-diff)) - (home-page "https://github.com/alecthomas/assert/") - (synopsis "Go assertion library") - (description "Assertion library that: -@itemize -@item makes spotting differences in equality much easier -@item uses repr and diffmatchpatch to display structural differences in colour -@item aborts tests on first assertion failure -@end itemize\n") - (license license:expat)))) - (define-public go-github-com-alecthomas-chroma (package (name "go-github-com-alecthomas-chroma") @@ -10612,7 +10409,7 @@ RFC-5802 and RFC-7677.") (define-public go-github-com-godbus-dbus (package (name "go-github-com-godbus-dbus") - (version "5.0.3") + (version "5.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -10621,7 +10418,7 @@ RFC-5802 and RFC-7677.") (file-name (git-file-name name version)) (sha256 (base32 - "1bkc904073k807yxg6mvqaxrr6ammmhginr9p54jfb55mz3hfw3s")))) + "1kayd4x7idrhi06ahh5kqkgwzgh9icvv71mjar2d0jl486dfs8r5")))) (build-system go-build-system) (arguments `(#:tests? #f ;no /var/run/dbus/system_bus_socket @@ -10634,6 +10431,53 @@ RFC-5802 and RFC-7677.") bindings for the D-Bus message bus system.") (license license:bsd-2))) +(define-public go-github-com-delthas-go-libnp + (let ((commit "0e45ece1f878f202fee2c74801e287804668f677")) + (package + (name "go-github-com-delthas-go-libnp") + (version (git-version "0.0.0" "0" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/delthas/go-libnp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hylpvwz3kb8wr00knba6mggjacak2vmqafwysansj0ns038lp8w")))) + (build-system go-build-system) + (arguments `(#:import-path "github.com/delthas/go-libnp")) + (propagated-inputs (list go-github-com-godbus-dbus)) + (home-page "https://github.com/delthas/go-libnp") + (synopsis "Tiny library providing information about now-playing media") + (description "@code{go-libnp} is a tiny cross-platform library for +extracting information about the music/image/video that is Now Playing on the +system.") + (license license:expat)))) + +(define-public go-github-com-delthas-go-localeinfo + (let ((commit "686a1e18511819b2f1625f00437f6e1246c04a5d")) + (package + (name "go-github-com-delthas-go-localeinfo") + (version (git-version "0.0.0" "0" commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/delthas/go-localeinfo") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r0v42ggvyss8327nggwinxl42pj4l0dwz96g9wk1w8h8vmfrh0z")))) + (build-system go-build-system) + (arguments `(#:tests? #f ; FIXME: tests assume certain locale + #:import-path "github.com/delthas/go-localeinfo")) + (home-page "https://github.com/delthas/go-localeinfo") + (synopsis "Library for extracting locale information") + (description "@code{go-localeinfo} extracts monetary/numeric/time +formatting information, rather than the current locale name.") + (license license:expat)))) + (define-public go-github-com-prometheus-common (package (name "go-github-com-prometheus-common") @@ -11037,32 +10881,6 @@ is unchanged. This package contains a series of small enhancements and additions.") (license license:bsd-3)))) -(define-public go-github-com-frankban-quicktest - (package - (name "go-github-com-frankban-quicktest") - (version "1.11.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/frankban/quicktest") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b1b44b2hli2p969gqz30z8v9z6ahlklpqzi17nwk1lsjz9yv938")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/frankban/quicktest")) - (propagated-inputs - (list go-github-com-google-go-cmp-cmp go-github-com-kr-pretty)) - (home-page "https://github.com/frankban/quicktest") - (synopsis "Quick helpers for testing Go applications") - (description - "Package quicktest provides a collection of Go helpers for writing -tests.") - (license license:expat))) - (define-public go-github-com-bep-golibsass (package (name "go-github-com-bep-golibsass") @@ -11146,7 +10964,7 @@ tests.") (define-public go-github-com-hjson-hjson-go (package (name "go-github-com-hjson-hjson-go") - (version "3.1.0") + (version "4.3.1") (source (origin (method git-fetch) @@ -11156,7 +10974,7 @@ tests.") (file-name (git-file-name name version)) (sha256 (base32 - "1dfdiahimg6z9idg8jiqxwnlwjnmasbjccx8gnag49cz4yfqskaz")))) + "138vmbnrwzxf64cia27k407clrydvs2jx927dlv6ziydiqyvy7m3")))) (build-system go-build-system) (arguments '(#:import-path "github.com/hjson/hjson-go")) @@ -11741,34 +11559,6 @@ be used as both a binary and a library.") (native-inputs '()) (inputs '()))) -(define-public go-golang-org-x-lint - (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") - (revision "0")) - (package - (name "go-golang-org-x-lint") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/lint") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/lint" - #:tests? #f)) ;; TODO: Fix tests - (propagated-inputs - (list go-golang-org-x-tools)) - (home-page "https://golang.org/x/lint") - (synopsis "Linter for Go source code") - (description - "This is a linter for Go source code. Unlike gofmt, it doesn't -reformat the source code, it only prints out style mistakes.") - (license license:bsd-3)))) - (define-public go-github-com-kisielk-gotool (package (name "go-github-com-kisielk-gotool") @@ -11793,37 +11583,6 @@ reformat the source code, it only prints out style mistakes.") tools with similar semantics.") (license license:expat))) -(define-public go-honnef-co-go-tools - (package - (name "go-honnef-co-go-tools") - (version "0.3.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dominikh/go-tools") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32")))) - (build-system go-build-system) - (arguments - `(#:import-path "honnef.co/go/tools" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools - go-golang-org-x-mod go-github-com-kisielk-gotool - go-github-com-burntsushi-toml)) - (home-page "https://honnef.co/go/tools") - (synopsis "Staticcheck advanced Go linter") - (description - "Staticcheck is a state of the art linter for the Go programming language. -Using static analysis, it finds bugs and performance issues, offers -simplifications, and enforces style rules.") - (license license:expat))) - (define-public go-go-uber-org-zap (package (name "go-go-uber-org-zap") @@ -12338,7 +12097,7 @@ dependencies and a simple API.") (define-public go-github-com-arceliar-ironwood (package (name "go-github-com-arceliar-ironwood") - (version "0.0.0-20221115123222-ec61cea2f439") + (version "v0.0.0-20231028101932-ceac99571f43") (source (origin (method git-fetch) @@ -12348,7 +12107,7 @@ dependencies and a simple API.") (file-name (git-file-name name version)) (sha256 (base32 - "0jdfhsr1yci0a4fpf2pmh9n4d7iryjx12y3549gv9nfjf91rs225")))) + "1shxpmi847jf7rfa5mb0m4nflwmlg65hjgjm9v7ynjvcp0licsi4")))) (build-system go-build-system) (arguments '(#:import-path "github.com/Arceliar/ironwood" @@ -13077,7 +12836,7 @@ is undetermined, a customizable spinner is shown.") (define-public go-git-sr-ht-emersion-gqlclient (package (name "go-git-sr-ht-emersion-gqlclient") - (version "0.0.0-20220202181617-4e6e9c763dd2") + (version "0.0.0-20230820050442-8873fe0204b9") (source (origin (method git-fetch) @@ -13086,7 +12845,7 @@ is undetermined, a customizable spinner is shown.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1d9hmaz7yy02bk455gmaav818xi49sw69jyx6dxzymv6ln7r1cv1")))) + (base32 "0x64kcryawdr0daq1w6fada60zqrddw75yi397835b9ij7wb5gmh")))) (build-system go-build-system) (arguments (list #:import-path "git.sr.ht/~emersion/gqlclient")) (home-page "https://git.sr.ht/~emersion/gqlclient") @@ -13124,35 +12883,6 @@ production-ready implementation, compatible with the original Jsonnet C++ implementation.") (license license:asl2.0))) -(define-public go-github-com-google-go-cmdtest - (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5") - (revision "0")) - (package - (name "go-github-com-google-go-cmdtest") - (version (git-version "0.4.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-cmdtest") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/google/go-cmdtest")) - (propagated-inputs (list go-github-com-google-renameio - go-github-com-google-go-cmp-cmp)) - (home-page "https://github.com/google/go-cmdtest") - (synopsis "Testing for your CLI") - (description - "The cmdtest package simplifies testing of command-line interfaces. It -provides a simple, cross-platform, shell-like language to express command -execution. It can compare actual output with the expected output, and can -also update a file with new \"golden\" output that is deemed correct.") - (license license:asl2.0)))) - (define-public go-github-com-google-safehtml (package (name "go-github-com-google-safehtml") @@ -13908,34 +13638,6 @@ library bevacqua/fuzzysearch.") "Gomega is the preferred matcher library for the Ginkgo test framework.") (license license:expat))) -(define-public go-github-com-onsi-ginkgo - (package - (name "go-github-com-onsi-ginkgo") - (version "1.16.5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/onsi/ginkgo") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hh6n7q92y0ai8k6rj2yzw6wwxikhyiyk4j92zgvf1zad0gmqqmz")))) - (build-system go-build-system) - (arguments (list #:import-path "github.com/onsi/ginkgo")) - (propagated-inputs (list go-golang-org-x-sys - go-golang-org-x-tools - go-github-com-go-task-slim-sprig - go-github-com-nxadm-tail - go-github-com-onsi-gomega)) - (home-page "https://github.com/onsi/ginkgo") - (synopsis "BDD-style testing framework for Go") - (description - "Ginkgo is a Behaviour-Driven Development testing framework for Go. It -builds on top of Go's builtin @code{testing} library and is complemented by the -Gomega matcher library.") - (license license:expat))) - ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances ;;; of a merge conflict, place them above by existing packages with similar diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 46aacb3972..0f6c5b3bd6 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -140,7 +140,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) @@ -148,7 +148,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "1mn7ma8w4spqc0p4slp1s14q45z7hzyp49ikvd1spsz9jqz8ycpk")) + "0h9kwgzz9ijzx6jcpc37qhadc41k1jdcv0s2wcpsz6zjmx63p2wk")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 97ad8ed18c..c546df6aad 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo@member.fsf.org> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org> +;;; Copyright © 2023 David Elsing <david.elsing@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,13 +41,18 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bioconductor) #:use-module (gnu packages bioinformatics) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cran) #:use-module (gnu packages datastructures) + #:use-module (gnu packages docbook) + #:use-module (gnu packages flex) #:use-module (gnu packages gd) #:use-module (gnu packages graphics) #:use-module (gnu packages graphviz) @@ -55,6 +61,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-compression) @@ -93,49 +100,102 @@ distributions in empirical data. SIAM Review 51, 661-703 (2009)}).") (define-public igraph (package (name "igraph") - (version "0.10.4") + (version "0.10.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/igraph/igraph/releases/" - "download/" version "/igraph-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/igraph/igraph") + (commit version))) + (file-name (git-file-name name version)) + (patches (search-patches "igraph-fix-varargs-integer-size.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-26))) (snippet '(begin - ;; igraph insists on building its own copy of CxSparse - ;; (see: https://github.com/igraph/igraph/commit/\ - ;; 334318b7dfe46501236272ca336580f4748114b0) and the build - ;; has no support to use a system provided 'pcg'. - (define keep-libraries '("cs" "pcg")) - (define keep (append '("." ".." "CMakeLists.txt") - keep-libraries)) - (define keep? (cut member <> keep)) - (with-directory-excursion "vendor" - (for-each delete-file-recursively - (scandir "." (negate keep?)))) - (call-with-output-file "vendor/CMakeLists.txt" - (cut format <> "~{add_subdirectory(~a)~%~}" - keep-libraries)) + + (delete-file-recursively "vendor") + (delete-file-recursively "src/isomorphism/bliss") (substitute* '("src/CMakeLists.txt" "etc/cmake/benchmark_helpers.cmake") ;; Remove extraneous bundling related variables. - ((".*_IS_VENDORED.*") - "")))) + ((".*_IS_VENDORED.*") "") + ((".*add_sub.*isomorphism/bliss.*") "") + (("(.*TARGETS.*)bliss(.*)cxsparse_vendored(.*)pcg(.*)" + _ part1 part2 part3 part4) + (string-append part1 part2 part3 part4)) + (("cxsparse_vendored") "cxsparse") + ((" pcg ") " pcg_random ")) + (substitute* "CMakeLists.txt" + (("add_sub.*vendor.*") "")))) (sha256 - (base32 "1z1ay3l1h64jc2igbl2ibvi20sswy56v2yk3ykhis7jzijsh0mxa")))) + (base32 + "025f9c2jsawniqkig4l5z3v9aw3ipazmnlsf80b653mns5bvj1yn")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON") - #:test-target "check")) - (native-inputs (list pkg-config)) + (arguments + (list + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + ;; Use the same integer width as suitesparse-cxsparse, which + ;; uses int64_t in SuiteSparse v6.0.0 and later. + "-DIGRAPH_INTEGER_SIZE=64") + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'version-file + (lambda _ + (let ((port (open-file "IGRAPH_VERSION" "w"))) + (display #$version port) + (close port)))) + (add-after 'unpack 'patch-suitesparse + (lambda _ + (substitute* '("src/core/sparsemat.c" + "include/igraph_sparsemat.h") + (("<cs/cs\\.h>") "<cs.h>") + (("cs_igraph") "cs_dl") + (("__BEGIN_DECLS.*" all) + (string-append all "\n#define CS_LONG\n"))))) + (add-after 'unpack 'patch-pcg + (lambda _ + (substitute* '("src/random/rng_pcg32.c" + "src/random/rng_pcg64.c") + (("#include \"pcg/(.*)\"" _ name) + (string-append "#include <" name ">"))))) + (add-after 'unpack 'patch-bliss + (lambda _ + (substitute* "src/isomorphism/bliss.cc" + (("#include \"bliss.*") + (string-append + "#include <bliss/graph.hh>\n" + "#include <bliss/digraph.hh>\n"))))) + (add-after 'build 'build-doc + (lambda _ + (invoke "cmake" "--build" "." "--target" "html"))) + (add-after 'install 'install-doc + (lambda _ + (copy-recursively + "doc/html" + (string-append #$output "/share/doc/" + #$name "-" #$version "/html"))))))) + (native-inputs + (list bison + docbook-xml-4.3 + docbook-xsl + flex + pcg-c + pkg-config + ;; For the HTML documentation. + python + source-highlight + xmlto)) (inputs (list arpack-ng - gmp + bliss glpk - libxml2 lapack openblas - plfit)) + plfit + suitesparse-cxsparse)) ;; libxml2 is in the 'Requires.private' of igraph.pc. (propagated-inputs (list libxml2)) (home-page "https://igraph.org") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9362666274..9e2efaa7fb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name> -;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2017, 2019, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2018, 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> @@ -28,7 +28,7 @@ ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de> -;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> +;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Tobias Kortkamp <tobias.kortkamp@gmail.com> ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> @@ -121,6 +121,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages toolkits) #: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 xiph) @@ -1038,7 +1039,7 @@ distills complex, animated scenes into a set of baked geometric results.") (define-public mangohud (package (name "mangohud") - (version "0.6.8") + (version "0.7.0") (source (origin (method git-fetch) @@ -1047,21 +1048,18 @@ distills complex, animated scenes into a set of baked geometric results.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19dp8l5njzl9xah0bhwlkl39vc8w2rnpvpdrhgaz3hnhz8b0r5df")))) + (base32 "1m4a2dqzqdhk9w1gvzppid7k0fxvplh5hmivvj9sda529s1g24rc")))) (build-system meson-build-system) (arguments (list #:build-type "release" #:configure-flags - #~(list "-Duse_system_vulkan=enabled" - "-Duse_system_spdlog=enabled" + #~(list "-Duse_system_spdlog=enabled" "-Dwith_xnvctrl=disabled" - "-Dappend_libdir_mangohud=false" - (string-append "-Dvulkan_datadir=" - #$(this-package-input "vulkan-headers") "/share")) + "-Dappend_libdir_mangohud=false") #:phases #~(modify-phases %standard-phases - ;; Mangohud tries to build the imgui library as a meson submodule, + ;; MangoHud tries to build the imgui library as a meson submodule, ;; so we change the dependency to the imgui input instead. (add-after 'unpack 'unbundle-imgui (lambda _ @@ -1073,6 +1071,23 @@ distills complex, animated scenes into a set of baked geometric results.") "declare_dependency(dependencies: " "cpp.find_library('imgui'), include_directories: '" #$(this-package-input "imgui") "/include/imgui')"))))) + ;; Likewise, MangoHud bundles a Vulkan headers submodule to use a + ;; specific version, which we provide as an input and adjust the + ;; build accordingly. + (add-after 'unbundle-imgui 'unbundle-vulkan-headers + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("vkh_sp = .*") + "") + (("vkh_sp.get_variable\\('vulkan_api_xml'\\)") + (string-append "files('" + (search-input-file inputs "registry/vk.xml") + "')")) + (("dep_vulkan = .*") + "")) + (substitute* "src/meson.build" + (("dep_vulkan,") + "")))) (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/meson.build" @@ -1098,11 +1113,20 @@ distills complex, animated scenes into a set of baked geometric results.") libx11 mesa mesa-utils + nlohmann-json python-mako spdlog - vulkan-headers + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/Vulkan-Headers") + (commit "v1.2.158"))) + (file-name (git-file-name "vulkan" "v1.2.158")) + (sha256 + (base32 + "0jvaqj87792yccpr290djb18pqaisspq9dw6bqim6mrhfgda9v76"))) vulkan-loader)) - (native-inputs (list pkg-config python)) + (native-inputs (list git-minimal/pinned pkg-config python)) (home-page "https://github.com/flightlessmango/MangoHud/") (synopsis "Vulkan and OpenGL overlay for monitoring performance and hardware") (description "MangoHud is a Vulkan and OpenGL overlay for monitoring @@ -1505,7 +1529,7 @@ in Julia).") (define-public povray (package (name "povray") - (version "3.7.0.8") + (version "3.7.0.10") (source (origin (method git-fetch) (uri (git-reference @@ -1514,43 +1538,41 @@ in Julia).") (file-name (git-file-name name version)) (sha256 (base32 - "1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z")) + "19bv962clwc6sk53kq8bqf77fh0v46afm2knjbki8yj0m1mnyyd0")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete bundled libraries. - (delete-file-recursively "libraries") - #t)))) + ;; Delete bundled libraries. + '(delete-file-recursively "libraries")))) (build-system gnu-build-system) (native-inputs (list autoconf automake pkg-config)) (inputs - `(("boost" ,boost) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("openexr" ,openexr-2) - ("sdl" ,sdl) - ("zlib" ,zlib))) + (list boost + libjpeg-turbo + libpng + libtiff + openexr-2 + sdl + zlib)) (arguments - '(#:configure-flags - (list "COMPILED_BY=Guix" - (string-append "--with-boost-libdir=" - (assoc-ref %build-inputs "boost") "/lib") - "--disable-optimiz-arch") + (list + #:configure-flags + #~(list "COMPILED_BY=Guix" + (string-append "--with-boost-libdir=" + #$(this-package-input "boost") "/lib") + "--disable-optimiz-arch") #:phases - (modify-phases %standard-phases - (add-after 'unpack 'run-prebuild - (lambda _ - (setenv "HOME" (getcwd)) - (with-directory-excursion "unix" - (substitute* "prebuild.sh" - (("/bin/sh") (which "sh"))) - (invoke "sh" "prebuild.sh")) - #t)) - ;; The bootstrap script is run by the prebuild script in the - ;; "run-prebuild" phase. - (delete 'bootstrap)))) + '(modify-phases %standard-phases + (add-after 'unpack 'run-prebuild + (lambda _ + (setenv "HOME" (getcwd)) + (with-directory-excursion "unix" + (substitute* "prebuild.sh" + (("/bin/sh") (which "sh"))) + (invoke "sh" "prebuild.sh")))) + ;; The bootstrap script is run by the prebuild script in the + ;; "run-prebuild" phase. + (delete 'bootstrap)))) (synopsis "Tool for creating three-dimensional graphics") (description "@code{POV-Ray} is short for the Persistence of Vision Raytracer, a tool @@ -2182,6 +2204,10 @@ Cflags: -I${includedir}~%" #$output #$version))))) "_" "_" "_" "Codec_partialAnim" "_" "_" "_" "Codec_InvalidImages" "_" "_" "_" "Codec_GifInterlacedTruncated" + ;; This test started failing possibly after mesa + ;; being updated to 23.2.1 and possibly only on some + ;; hardware. + "_" "_" "_" "SkRuntimeBlender_GPU" "_" "_" "_" "SkText_UnicodeText_Flags" "_" "_" "_" "SkParagraph_FontStyle" "_" "_" "_" "flight_animated_image" @@ -2528,7 +2554,7 @@ generated discrete signed distance field using the cubic spline kernel. (define-public mmg (package (name "mmg") - (version "5.7.1") + (version "5.7.2") (source (origin (method git-fetch) @@ -2537,7 +2563,7 @@ generated discrete signed distance field using the cubic spline kernel. (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0skb7yzsw6y44zp9gb729i5xks7qd97nvn3z6jhz4jksqksx7lz0")))) + (base32 "007d0mvqhnxxj6dbcip9s615asrbpgrbkpm5xn6m8k3n9sljr153")))) (build-system cmake-build-system) (outputs '("out" "lib" "doc")) (arguments @@ -2738,7 +2764,7 @@ desired local properties.") (define-public f3d (package (name "f3d") - (version "2.0.0") + (version "2.2.1") (source (origin (method git-fetch) @@ -2747,22 +2773,12 @@ desired local properties.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gcwpdkz3ylaxi133zri1cxkvj6za5s1hbgqqc8fn10q2dkkdd44")) + (base32 "0f076754zsxb4gwk6bxj94iyjj0dfxmmc8w88f55xd6hbm3qdnwd")) (modules '((guix build utils))) (snippet #~(begin - (delete-file "external/cxxopts.hpp") - (delete-file "external/json.hpp") - (substitute* "application/F3DOptionsParser.cxx" - (("^#include \"cxxopts\\.hpp\"") - "#include <cxxopts.hpp>") - (("^#include \"json\\.hpp\"") - "#include <nlohmann/json.hpp>") - (("cxxopts::OptionException") - "cxxopts::exceptions::parsing")) - (substitute* "library/src/engine.cxx" - (("^#include <json\\.hpp>") - "#include <nlohmann/json.hpp>")))))) + (delete-file-recursively "external/cxxopts") + (delete-file-recursively "external/nlohmann_json"))))) (build-system cmake-build-system) ;; The package cannot easily be split into out and lib outputs because ;; VTK's vtkModule.cmake complains, and also the CMake files in @@ -2785,15 +2801,29 @@ desired local properties.") #~(list (string-append "-DCMAKE_INSTALL_DOCDIR=" #$output "/share/doc/" #$name "-" #$version) "-DBUILD_TESTING=OFF" - "-DF3D_GENERATE_MAN=ON" - "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE=ON" - "-DF3D_INSTALL_DEFAULT_CONFIGURATION_FILE_IN_PREFIX=ON" - "-DF3D_INSTALL_MIME_TYPES_FILES=ON" - "-DF3D_INSTALL_THUMBNAILER_FILES=ON" - "-DF3D_MODULE_ALEMBIC=ON" - "-DF3D_MODULE_ASSIMP=ON" + "-DF3D_LINUX_GENERATE_MAN=ON" + "-DF3D_USE_EXTERNAL_CXXOPTS=ON" + "-DF3D_USE_EXTERNAL_NLOHMANN_JSON=ON" "-DF3D_MODULE_EXTERNAL_RENDERING=ON" - "-DF3D_MODULE_OCCT=ON"))) + "-DF3D_MODULE_EXR=ON" + "-DF3D_PLUGIN_BUILD_ALEMBIC=ON" + "-DF3D_PLUGIN_BUILD_ASSIMP=ON" + "-DF3D_PLUGIN_BUILD_OCCT=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-rpath + (lambda _ + ;; Expand $ORIGIN, and add VTK to library RPATH, because it is + ;; not added automatically. + (substitute* "application/CMakeLists.txt" + (("(set_target_properties.*PROPERTIES.*INSTALL_RPATH ).*" + _ prefix) + (string-append prefix "\"" #$output "/lib\")\n"))) + (substitute* "library/CMakeLists.txt" + (("(set_target_properties.*PROPERTIES.*INSTALL_RPATH ).*" + _ prefix) + (string-append prefix "\"" #$output "/lib:" + #$(this-package-input "vtk") "/lib\")\n")))))))) (native-inputs (list cxxopts help2man @@ -2817,6 +2847,7 @@ desired local properties.") lz4 netcdf opencascade-occt + openexr vtk zlib)) (home-page "https://f3d-app.github.io/f3d/") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 936be5151a..4330216380 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -803,22 +803,29 @@ ever use this library.") #:phases #~(modify-phases %standard-phases (delete 'check) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ;xfconfd requires a writable HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service - (string-append #$output "/share:" (getenv "XDG_DATA_DIRS"))) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (with-directory-excursion (string-append "../at-spi2-core-" - #$version "") - (invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh") - (substitute* "ci/run-tests.sh" - (("ps auxwww") "") ;avoid a dependency on procps - (("meson test -C _build") - "meson test -C ../build")) ;adjust build directory - (invoke "dbus-run-session" "--" "ci/run-tests.sh"))))))) + ;; The CI test suite fails completely on powerpc-linux. + ;; The name org.gnome.SessionManager was not provided by any .service + ;; TODO: Wrap 'check phase with 'tests?'. + #$@(if (not (target-ppc32?)) + #~((add-after 'install 'check + (lambda _ + ;; xfconfd requires a writable HOME + (setenv "HOME" (getenv "TMPDIR")) + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service + (string-append #$output "/share:" + (getenv "XDG_DATA_DIRS"))) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (with-directory-excursion (string-append "../at-spi2-core-" + #$version "") + (invoke "dbus-run-session" "--" "ci/run-registryd-tests.sh") + (substitute* "ci/run-tests.sh" + (("ps auxwww") "") ;avoid a dependency on procps + (("meson test -C _build") + "meson test -C ../build")) ;adjust build directory + (invoke "dbus-run-session" "--" "ci/run-tests.sh"))))) + #~())))) (inputs (list bash-minimal libxml2)) (propagated-inputs diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 29da60fdbb..c4b64a9100 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Evgeny Pisemsky <evgeny@pisemsky.com> ;;; Copyright © 2022 jgart <jgart@dismail.de> +;;; Copyright © 2023 Andrew Tropin <andrew@trop.in> ;;; ;;; This file is part of GNU Guix. ;;; @@ -119,6 +120,7 @@ #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) + #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) @@ -728,7 +730,7 @@ you send to a FIFO file.") (define-public guile-dsv (package (name "guile-dsv") - (version "0.7.0") + (version "0.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -737,7 +739,7 @@ you send to a FIFO file.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0shrzmbh6x3n3xzpcijkxk3f73z6m1i50zgc2dnnccwf4j1c78p2")))) + "18v8snh45ibh13mvihhajs226yflxpl6v09wqndyfj1da8cdmkzk")))) (build-system gnu-build-system) (native-inputs (list autoconf automake @@ -757,6 +759,7 @@ you send to a FIFO file.") #:imported-modules ((guix build guile-build-system) ,@%default-gnu-imported-modules) #:phases (modify-phases %standard-phases + (delete 'strip) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -1100,6 +1103,35 @@ for calling methods on remote servers by exchanging JSON objects.") (home-page "https://codeberg.org/rgherdt/scheme-json-rpc/") (license license:expat))) +(define-public guile-ares-rs + (package + (name "guile-ares-rs") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~abcdw/guile-ares-rs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jl4k54ydi1qxdvif4di0ri5jznlfc2gg1qhs94bhk4y22k0gp8c")))) + (build-system guile-build-system) + (arguments + (list + #:source-directory "src")) + ;; Remove guile-next dependency, when guile package get custom text port + (inputs `(("guile" ,guile-next))) + (propagated-inputs (list guile-fibers)) + (home-page "https://git.sr.ht/~abcdw/guile-ares-rs") + (synopsis "Asyncronous Reliable Extensible Sleek RPC Server for Guile") + (description "Asynchronous Reliable Extensible Sleek RPC Server for + Guile. It's based on nREPL protocol and can be used for programmable + interactions with a running guile processes, for implementing REPLs, IDEs, + test runners or other tools.") + (license license:gpl3+))) + (define-public guile-squee (let ((commit "9f2609563fc53466e46d37c8d8d2fbcfce67b2ba") (revision "5")) @@ -1281,8 +1313,8 @@ works with Guile 1.4.x to 2.0.x.") (license license:gpl3+))) (define-public guile-prometheus - (let ((commit "35dc26c0ea44c3d70f1819f240d84e2cbb4b7b4c") - (revision "5")) + (let ((commit "4aaf902eb45b3a4c1003f854bda56c516fdf4f5b") + (revision "6")) (package (name "guile-prometheus") (version (git-version "0" revision commit)) @@ -1293,7 +1325,7 @@ works with Guile 1.4.x to 2.0.x.") (commit commit))) (sha256 (base32 - "07822jj4appw37lf444kc4xlgl7nm64mgldag56072l55kwashgb")) + "03sr7wgksi9ys6jyzsnwanl2qqa8csi8jzcgrc3wfzp17vcc16yi")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs @@ -1370,6 +1402,31 @@ non-mutating insert, delete, and search operations, with support for convenient nested tree operations.") (license license:gpl3+))) +(define-public guile-algorithms + (package + (name "guile-algorithms") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git@git.sr.ht/~filiplajszczak/guile-algorithms") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a4ffnnhw92gqphjji5ajy3xfaqzww7xv3h8p82gkawx0rqvj5ni")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) + (synopsis "Guile port of racket-algorithms") + (description + "Guile port of @url{https://docs.racket-lang.org/algorithms/index.html, +racket-algorithms}, a package containing useful algorithms borrowed from other +programming languages).") + (home-page "https://guile-algorithms.lajszczak.dev/") + (license license:gpl3+))) + (define-public guile-aws (let ((commit "f32bea12333e1054b97ab50e58a72636edabb5b7") (revision "1")) @@ -1401,8 +1458,8 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.") (license license:gpl3+)))) (define-public guile-simple-zmq - (let ((commit "ff0b39aec9312517fb48681564e261bd000aaf63") - (revision "10")) + (let ((commit "d25d1865e3378d93c44e2b4f5246a70b078a489d") + (revision "11")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -1414,7 +1471,7 @@ the Guile compiler tower to generate the DSL from AWS JSON specifications.") (commit commit))) (sha256 (base32 - "0qfnljap1cxkfsydadarvhcw4p6cgayxzbhqr6r1y0as0m8250q3")) + "1aq1s0f0z5g6qsv9jqr0663qv4rwxd9j1pmg1g8v6rl09xb8g8lp")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -3289,6 +3346,32 @@ serializing continuations or delimited continuations.") from @code{tree-il}.") (license license:lgpl2.0+))) +(define-public guile-hoot + (package + (name "guile-hoot") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://spritely.institute/files/releases" + "/guile-hoot/guile-hoot-" + version ".tar.gz")) + (sha256 + (base32 + "1byshh7092q2yzqwpi59j4xjsppvp1xqnqsv94yv541qfm0plnc2")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0" + "WASM_HOST=hoot"))) + (native-inputs + (list autoconf automake pkg-config texinfo)) + (inputs + (list guile-next)) + (synopsis "WebAssembly compiler backend for Guile") + (description "Guile Hoot is a WebAssembly compiler backend for GNU Guile +and standalone WASM toolchain.") + (home-page "https://spritely.institute/hoot") + (license (list license:asl2.0 license:lgpl3+)))) + (define-public guile-file-names (package (name "guile-file-names") @@ -4557,6 +4640,52 @@ models and also supports a rich set of boolean query operators.") according to Bitorrent BEP003.") (license license:gpl3+))) +(define-public guile-ts + (package + (name "guile-ts") + (version "0.2.0") + (source (origin (method git-fetch) + (uri (git-reference + (url + "https://github.com/Z572/guile-ts") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1iqbr9rcpmq2f1zxxvl36ajwm81rkp38rrp42ixr4q59154r5513")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list "GUILE_AUTO_COMPILE=0") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-extension-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* + (find-files "." ".*\\.scm") + (("\\(load-extension \"libguile_ts\" *\"(.*)\"\\)" _ o) + (string-append + (object->string + `(or (false-if-exception + (load-extension "libguile_ts" ,o)) + (load-extension + ,(string-append + #$output + "/lib/libguile_ts.so") + ,o))))))))))) + (native-inputs + (list autoconf automake libtool texinfo pkg-config guile-3.0)) + (inputs + (list guile-3.0 tree-sitter)) + (native-search-paths + (list (search-path-specification + (variable "TREE_SITTER_GRAMMAR_PATH") + (files '("lib/tree-sitter"))))) + (synopsis "Guile bindings to the Tree-sitter parsing library") + (description "This package provides Guile bindings to the Tree-sitter +parsing library.") + (home-page "https://github.com/Z572/guile-ts") + (license license:gpl3+))) + (define-public guile-irc (let ((commit "7d08ce6fdcb87ac668c5d3bfd5584247805507bb") (revision "1")) @@ -5262,7 +5391,7 @@ locations.") (define-public guile-netlink (package (name "guile-netlink") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) @@ -5272,7 +5401,7 @@ locations.") (file-name (git-file-name name version)) (sha256 (base32 - "06ls830nrshzi2j532di5vdf03fp8cy1275ll4ms93x1hv2g8dk0")))) + "181drjshcz7pi5zwydwd702h7v8p1nh50q6slsw9q372k2bzyl4a")))) (build-system gnu-build-system) (inputs (list guile-3.0)) @@ -5440,7 +5569,7 @@ with a FSM is being built (for example, from a Makefile.)") (define-public guile-ini (package (name "guile-ini") - (version "0.5.3") + (version "0.5.4") (source (origin (method git-fetch) (uri (git-reference @@ -5449,7 +5578,7 @@ with a FSM is being built (for example, from a Makefile.)") (file-name (string-append name "-" version)) (sha256 (base32 - "03pdbas7f6r2q3jbcn68xpm57hika3byb4rhsf0544kw6yk3bm8q")))) + "10glfdhyv8h58cmf0xl1g7jk05pd5hzdncc2c709b8pyncrdiakh")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings @@ -5464,7 +5593,7 @@ with a FSM is being built (for example, from a Makefile.)") guile-lib guile-smc)) (inputs (list bash-minimal guile-3.0 guile-lib)) - (propagated-inputs (list guile-smc)) + (propagated-inputs (list guile-lib guile-smc)) (home-page "https://github.com/artyom-poptsov/guile-ini") (synopsis "Guile library for INI format support") (description diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 78fc74bbce..9169c09648 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -457,7 +457,7 @@ without requiring the source code to be rewritten.") (define-public guile-next (let ((version "3.0.9") (revision "0") - (commit "c2cba86785a34351788f52ea4fccf9f10f3a1dee")) + (commit "d8df317bafcdd9fcfebb636433c4871f2fab28b2")) (package (inherit guile-3.0) (name "guile-next") @@ -471,7 +471,7 @@ without requiring the source code to be rewritten.") (file-name (git-file-name name version)) (sha256 (base32 - "1k0dkmyf9s4iynjj2qm0szqfpfd3b07cpj0fay14iwbidkrqndzf")))) + "0g294vnc5xkaq5vqh9hkh793mybkr17yqwh0fc46alnwxgpgjy5n")))) (arguments (substitute-keyword-arguments (package-arguments guile-3.0) ((#:phases phases '%standard-phases) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index e1514fb40b..59b95ab7c8 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -481,15 +481,23 @@ RGB animations.") (define-public ddcutil (package (name "ddcutil") - (version "1.4.2") + (version "1.4.5") (source (origin (method url-fetch) (uri (string-append "https://www.ddcutil.com/tarballs/" "ddcutil-" version ".tar.gz")) (sha256 - (base32 "015l13j7fp9fmlc5d7m6nfjbzjbp8vc0g5py35ljw7li2xk16v60")))) + (base32 "17zrqdz5mzwyccvc5m166yjlbbg9k2m9cwyg0y30h3184p1b2wlq")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-missing-pkgconfig-file + (lambda _ + (install-file "ddcutil.pc" + (string-append #$output "/lib/pkgconfig"))))))) (native-inputs (list pkg-config)) (inputs @@ -1089,11 +1097,17 @@ technology, such as head mounted displays with built in head tracking.") (("dependencies/json") (string-append #$(this-package-input "nlohmann-json") "/include/nlohmann"))))) + (add-after 'unpack 'patch-chmod + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/build-udev-rules.sh" + (("/bin/chmod") (string-append (assoc-ref inputs "coreutils") + "/bin/chmod"))))) ;; Call qmake instead of configure to create a Makefile. (replace 'configure (lambda _ (invoke "qmake" "PREFIX=/" "OpenRGB.pro")))))) (inputs - (list hidapi + (list coreutils + hidapi hueplusplus nlohmann-json libusb diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 57786ef5bf..62d39a94d9 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -295,13 +295,17 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "10.20230828") + (version "10.20230926") (source (origin - (method url-fetch) - (uri (hackage-uri "git-annex" version)) + ;; hackage release doesn't include everything needed for extra bits. + (method git-fetch) + (uri (git-reference + (url "https://git.joeyh.name/git/git-annex.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0pb6834dwjs9kdki977rfkdyg58dfzy8wfwvswrz3n7h6bcnjd0b")))) + (base32 "0zsq686b0q7mlkybm1xrc0kpl32ymvf0ybar01p68wx800031b2b")))) (build-system haskell-build-system) (properties '((upstream-name . "git-annex"))) (arguments @@ -349,16 +353,7 @@ to @code{cabal repl}).") (invoke "runhaskell" "PreConf.hs"))) (add-after 'build 'build-manpages (lambda _ - ;; The Setup.hs rewrite above removed custom code for building - ;; the man pages. In addition to that code, git-annex's source - ;; tree has a file that's not included in the tarball but is used - ;; by the Makefile to build man pages. Copy the core bits here. - (call-with-output-file "Build/MakeMans.hs" - (lambda (out) - (format out "module Main where~%") - (format out "import Build.Mans~%") - (format out "main = buildMansOrWarn~%"))) - (invoke "runhaskell" "Build/MakeMans.hs"))) + (invoke "make" "mans"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) ;; We need to set the path so that Git recognizes @@ -374,13 +369,27 @@ to @code{cabal repl}).") ;; Undo `patch-shell-for-tests'. (copy-file "/tmp/Shell.hs" "Utility/Shell.hs") (apply (assoc-ref %standard-phases 'build) args))) - (add-after 'install 'install-manpages + (add-after 'install 'install-more (lambda* (#:key outputs #:allow-other-keys) - (let ((man (string-append (assoc-ref outputs "out") - "/man/man1/"))) - (mkdir-p man) - (for-each (lambda (file) (install-file file man)) - (find-files "man"))))) + (let* ((out (assoc-ref outputs "out")) + (bash (string-append out "/etc/bash_completions.d")) + (fish (string-append out "/share/fish/vendor_completions.d")) + (zsh (string-append out "/share/zsh/site-functions"))) + (setenv "PREFIX" out) + (invoke "make" "install-mans") + (mkdir-p bash) + (copy-file "bash-completion.bash" + (string-append bash "/git-annex")) + (mkdir-p fish) + (with-output-to-file (string-append fish "/git-annex.fish") + (lambda _ + (invoke (string-append out "/bin/git-annex") + "--fish-completion-script" "git-annex"))) + (mkdir-p zsh) + (with-output-to-file (string-append zsh "/_git-annex") + (lambda _ + (invoke (string-append out "/bin/git-annex") + "--zsh-completion-script" "git-annex")))))) (add-after 'install 'install-symlinks (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -407,13 +416,16 @@ to @code{cabal repl}).") ghc-cryptonite ghc-data-default ghc-dav + ghc-dbus ghc-disk-free-space ghc-dlist ghc-edit-distance ghc-exceptions + ghc-fdo-notify ghc-feed ghc-filepath-bytestring ghc-free + ghc-git-lfs ghc-hinotify ghc-http-client ghc-http-client-tls diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c02fd007f9..5d9e5757a0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages haskell-check) #:use-module (gnu packages haskell-crypto) #:use-module (gnu packages haskell-web) + #:use-module (gnu packages icu4c) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -780,7 +781,8 @@ than @code{base-compat}, which has no dependencies.") (uri (hackage-uri "basement" version)) (sha256 (base32 - "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn")))) + "1d2xj5dmjps7nc7rwp5s0kyjcg9v8xfql6ik4yk1d3affnvazhjn")) + (patches (search-patches "ghc-basement-fix-32bit.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "basement"))) (home-page "https://github.com/haskell-foundation/foundation#readme") @@ -1061,31 +1063,26 @@ library for Haskell.") (define-public ghc-bloomfilter (package (name "ghc-bloomfilter") - (version "2.0.1.0") + (version "2.0.1.2") (source (origin (method url-fetch) (uri (hackage-uri "bloomfilter" version)) (sha256 (base32 - "03vrmncg1c10a2wcg5skq30m1yiknn7nwxz2gblyyfaxglshspkc")) - (patches (search-patches "ghc-bloomfilter-ghc9.2.patch")))) + "0klb26ldkw32axv3927w489j71r2rc9pangsvznqjbljib9970hp")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; https://github.com/bos/bloomfilter/issues/7 + (substitute* "Data/BloomFilter/Easy.hs" + ((" in if roundedBits <= 0 \\|\\| maxbitstoolarge roundedBits") + " in if roundedBits <= 0")))))) (build-system haskell-build-system) (properties '((upstream-name . "bloomfilter"))) (native-inputs (list ghc-quickcheck ghc-random ghc-test-framework ghc-test-framework-quickcheck2)) - (arguments - `(#:cabal-revision ("2" - "1hi6hwvhv7lxqv0l6hv2854g1rvc52zcmr3ldvnaan1l1b666867") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "bloomfilter.cabal" - (("\\b(base)\\s+[^,]+" all dep) - dep))))))) - (home-page "https://github.com/bos/bloomfilter") + (home-page "https://github.com/haskell-pkg-janitors/bloomfilter") (synopsis "Pure and impure Bloom filter implementations") (description "This package provides both mutable and immutable Bloom filter data types, along with a family of hash functions and an easy-to-use @@ -3916,6 +3913,27 @@ when used with GHC versions which already provide the (description "This library provides a fast logging system for Haskell.") (license license:bsd-3))) +(define-public ghc-fdo-notify + (package + (name "ghc-fdo-notify") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "fdo-notify" version)) + (sha256 + (base32 "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh")))) + (build-system haskell-build-system) + (properties '((upstream-name . "fdo-notify"))) + (inputs (list ghc-dbus)) + (home-page "http://bitbucket.org/taejo/fdo-notify/") + (synopsis "Desktop Notifications client") + (description + "This package provides a library for issuing notifications using +@code{FreeDesktop.org's} Desktop Notifications protcol. This protocol is +supported by services such as Ubuntu's @code{NotifyOSD}.") + (license license:bsd-3))) + (define-public ghc-feed (package (name "ghc-feed") @@ -7058,7 +7076,8 @@ speed, flexibility, and quality of parse errors.") (uri (hackage-uri "memory" version)) (sha256 (base32 - "0yl3ivvn7i9wbx910b7bzj9c3g0jjjk91j05wj74qb5zx2yyf9rk")))) + "0yl3ivvn7i9wbx910b7bzj9c3g0jjjk91j05wj74qb5zx2yyf9rk")) + (patches (search-patches "ghc-memory-fix-32bit.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "memory"))) (inputs (list ghc-basement)) @@ -8352,6 +8371,46 @@ require aeson (description "Safe conversions between textual types") (license license:isc))) +(define-public ghc-text-icu + (package + (name "ghc-text-icu") + (version "0.8.0.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "text-icu" version)) + (sha256 + (base32 "1yj0jdjrsx12sy6lj1gizb2ys5likp9rcv8ryc6sjf2dw74097rd")))) + (build-system haskell-build-system) + (properties '((upstream-name . "text-icu"))) + (inputs (list icu4c)) + (native-inputs (list ghc-hunit + ghc-quickcheck + ghc-random + ghc-test-framework + ghc-test-framework-hunit + ghc-test-framework-quickcheck2 + pkg-config)) + (home-page "https://github.com/haskell/text-icu") + (synopsis "Bindings to the ICU library") + (description + "Haskell bindings to the International Components for Unicode (ICU) libraries. +These libraries provide robust and full-featured Unicode services on a wide +variety of platforms. . Features include: . * Both pure and impure bindings, to +allow for fine control over efficiency and ease of use. . * Breaking of strings +on character, word, sentence, and line boundaries. . * Access to the Unicode +Character Database (UCD) of character metadata. . * String collation functions, +for locales where the conventions for lexicographic ordering differ from the +simple numeric ordering of character codes. . * Character set conversion +functions, allowing conversion between Unicode and over 220 character encodings. +. * Unicode normalization. (When implementations keep strings in a normalized +form, they can be assured that equivalent strings have a unique binary +representation.) . * Regular expression search and replace. . * Security checks +for visually confusable (spoofable) strings. . * Bidirectional Unicode algorithm +. * Calendar objects holding dates and times. . * Number and calendar +formatting.") + (license license:bsd-3))) + (define-public ghc-text-short (package (name "ghc-text-short") @@ -8450,7 +8509,12 @@ code. It was designed for use in @code{Pandoc}.") '(begin ;; Fix test case. (substitute* "test/writer.ms" - (("\\\\\\[u2212\\]") "-")))))) + (("\\\\\\[u2212\\]") "-")) + (substitute* "test/Tests/Old.hs" + ;; There is no indication why these tests are failing on + ;; i686-linux. + ((".*fb2WriterTest' \"images.*") "") + ((".*fb2WriterTest' \"testsuite.*") "")))))) (build-system haskell-build-system) (properties '((upstream-name . "pandoc"))) (inputs (list ghc-glob @@ -8546,6 +8610,17 @@ provided for those who need a drop-in replacement for Markdown.pl.") #:configure-flags #~(list "-fembed_data_files") #:phases #~(modify-phases %standard-phases + (add-after 'install 'install-more + (lambda _ + (let ((bash (string-append #$output "/etc/bash_completion.d/pandoc")) + (man1 (string-append #$output "/share/man/man1"))) + (mkdir-p (dirname bash)) + (with-output-to-file bash + (lambda _ + (invoke (string-append #$output "/bin/pandoc") + "--bash-completion"))) + (mkdir-p man1) + (install-file "man/pandoc.1" man1)))) (add-after 'register 'remove-libraries (lambda* (#:key outputs #:allow-other-keys) (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))) @@ -8857,7 +8932,8 @@ numbers") (uri (hackage-uri "persistent" version)) (sha256 (base32 - "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm")))) + "0z69yvk0rd29dp5qdhi4p587b891y90azrzzpa3g10cxp3gyywvm")) + (patches (search-patches "ghc-persistent-fix-32bit.patch")))) (build-system haskell-build-system) (properties '((upstream-name . "persistent"))) (inputs (list ghc-conduit @@ -15628,6 +15704,25 @@ purposes. See the <https://www.stackage.org/package/githash>") (license license:bsd-3))) +(define-public ghc-git-lfs + (package + (name "ghc-git-lfs") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "git-lfs" version)) + (sha256 + (base32 "1iv3s1c7gwmsima9z3rsphjligpnf7h3vc5c96zgq9b71cx81lba")))) + (build-system haskell-build-system) + (properties '((upstream-name . "git-lfs"))) + (inputs (list ghc-http-client ghc-http-types ghc-aeson ghc-network-uri + ghc-case-insensitive)) + (home-page "http://hackage.haskell.org/package/git-lfs") + (synopsis "git-lfs protocol") + (description "An implementation of the git-lfs protocol.") + (license license:agpl3))) + (define-public ghc-nothunks (package (name "ghc-nothunks") @@ -15925,10 +16020,12 @@ benchmarks](https://hackage.haskell.org/package/random-bytestring-0.1.3.2/src/be ghc-tasty-hunit ghc-tasty-quickcheck)) (arguments - `(#:cabal-revision ("2" - "0cz3zzz9k490w9nfn4hpgdw4zx4w70fwqrwsfx8svcwqssqibqw3"))) + `(#:cabal-revision ("4" + "1lc32d5nxk0ry1pfn3ss55hi4cv6qj5nkkdn3j4y3lrdwyv7kbw2") + #:tests? ,(not (or (%current-target-system) + (target-x86-32?))))) (home-page "https://github.com/emilypi/base64") - (synopsis "A modern RFC 4648-compliant Base64 library") + (synopsis "Modern RFC 4648-compliant Base64 library") (description "RFC 4648-compliant Base64 with an eye towards performance and modernity (additional support for RFC 7049 standards)") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 6ade46cbea..9ada9ce808 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1413,7 +1413,12 @@ combine the information contained in both.") (uri (string-append "mirror://sourceforge/itk/itk/4.12/" "InsightToolkit-" version ".tar.xz")) (sha256 - (base32 "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w")))))) + (base32 "1qw9mxbh083siljygahl4gdfv91xvfd8hfl7ghwii19f60xrvn2w")))) + (arguments + (substitute-keyword-arguments (package-arguments insight-toolkit-4) + ((#:configure-flags cf #~'()) + ;; error: ISO C++17 does not allow dynamic exception specifications + #~(cons* "-DCMAKE_CXX_FLAGS=-std=c++14" #$cf)))))) (define-public itk-snap (package @@ -1680,7 +1685,13 @@ purposes.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bm0wdv5p26i8nl4kx3145cz553v401sgbpgc96sddzjfmfiydcw")))) + (base32 "1bm0wdv5p26i8nl4kx3145cz553v401sgbpgc96sddzjfmfiydcw")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "imgviz/draw.py" + (("collections\\.Iterable") "collections.abc.Iterable")) + (substitute* "imgviz/tile.py" + (("collections\\.Sequence") "collections.abc.Sequence")))))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4f54b4cc5f..218c714021 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -122,7 +122,7 @@ (define-public converseen (package (name "converseen") - (version "0.9.11.1") + (version "0.11.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -131,7 +131,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0nxvac8df47gxg1klqlz0s3rxl0ykrikmciniwkb938bgilmaijm")) + "1imc0dbbrs96yv3mp6bs7whd14zvgdw7hmv87bz8lp7d739s74z4")) (patches (search-patches "converseen-hide-updates-checks.patch" ;; Remove links to sites relying on non-free @@ -1528,6 +1528,12 @@ channels.") "-DEXIV2_ENABLE_BMFF=ON") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-gcc-reference + (lambda _ + ;; _GLIBCXX_ASSERTIONS brings reference to GCC. + (substitute* "cmake/compilerFlags.cmake" + (("add_compile_options[(]-Wp,-D_GLIBCXX_ASSERTIONS[)]") + "")))) (add-after 'install 'delete-static-libraries (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 5404f7b714..2ed0b8a283 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -85,7 +85,9 @@ `(#:tests? #f ; FIXME - When Python's bindings are enabled, tests do not ; pass. #:make-flags - ,#~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) + ,#~(list + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + "DISTSETUPOPTS=--single-version-externally-managed") ;no .egg files #:configure-flags '("--enable-debug-info" "--enable-man-pages" @@ -95,11 +97,9 @@ (modify-phases %standard-phases ;; These are recommended in the project's README for a development ;; build configuration. - (add-before 'configure 'set-environment-variables + (add-after 'unpack 'reconfigure (lambda _ - (setenv "BABELTRACE_DEV_MODE" "1") - (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE") - (invoke "autoreconf" "-vfi")))))) + (delete-file "configure")))))) (inputs (list glib)) ;; NOTE - elfutils is used for the LTTng debug information filter @@ -141,6 +141,21 @@ LTTng and barectf. This package provides a library with a C API, Python 3 bindings, and the command-line tool @command{babeltrace2}.") (license license:expat))) +(define-public babeltrace/dev + (package/inherit babeltrace + ;; This dev variant of the package babeltrace is slower but allows better + ;; development of plugins as recommended by the authors. + (name "babeltrace-dev") + (synopsis "Trace manipulation toolkit (variant for plugin developers)") + (arguments + (substitute-keyword-arguments (package-arguments babeltrace) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'set-environment-variables + (lambda _ + (setenv "BABELTRACE_DEV_MODE" "1") + (setenv "BABELTRACE_MINIMAL_LOG_LEVEL" "TRACE"))))))))) + (define-public barectf (package (name "barectf") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 1e4a7cca3a..a4c0613e40 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix build-system go) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages python) #:use-module (gnu packages shells) #:use-module (gnu packages syncthing)) @@ -218,18 +219,18 @@ powerful and simple.") written in Go.") (license license:expat))) -(define-public go-ipfs +(define-public kubo (package - (name "go-ipfs") - (version "0.13.0") + (name "kubo") + (version "0.15.0") (source (origin (method url-fetch/tarbomb) (uri (string-append - "https://dist.ipfs.io/go-ipfs/v" version - "/go-ipfs-source.tar.gz")) + "https://dist.ipfs.io/kubo/v" version + "/kubo-source.tar.gz")) (sha256 - (base32 "1cx47ais2zn62c0r7lmrpfzia2gjyr61qi8my5wg3pj3dfr0fhkq")) + (base32 "0ss5k8xnzn9qk977dni5ja89yygcysdw7r3mdk67cac2dpa9hhqs")) (file-name (string-append name "-" version "-source")) (modules '((guix build utils))) (snippet '(for-each delete-file-recursively @@ -282,8 +283,8 @@ written in Go.") (build-system go-build-system) (arguments (list - #:unpack-path "github.com/ipfs/go-ipfs" - #:import-path "github.com/ipfs/go-ipfs/cmd/ipfs" + #:unpack-path "github.com/ipfs/kubo" + #:import-path "github.com/ipfs/kubo/cmd/ipfs" #:phases #~(modify-phases %standard-phases ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md @@ -367,3 +368,6 @@ like a single bittorrent swarm, exchanging git objects. IPFS provides an interface as simple as the HTTP web, but with permanence built in. You can also mount the world at @code{/ipfs}.") (license license:expat))) + +(define-public go-ipfs + (deprecated-package "go-ipfs" kubo)) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 9e6cb3d001..46961ccb7e 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) @@ -313,7 +314,7 @@ irssi, but graphical.") (define-public irssi (package (name "irssi") - (version "1.4.4") + (version "1.4.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/irssi/irssi/" @@ -321,7 +322,7 @@ irssi, but graphical.") version ".tar.xz")) (sha256 (base32 - "1bby23mn7318dmxf8aw9ahs6j4mbc0ilm4swji4m8ixiqz49xzpy")))) + "0qp05z2qfqhp5wawxqz7qwv2fh9sb801z032i5d7h8nn1b5m3abj")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 490492f68f..93f4fabecb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -518,6 +518,8 @@ "/lib/arm") ("aarch64-linux" "/lib/aarch64") + ("powerpc-linux" + "/lib/ppc") ;; We need a catch-all, dropping ;; '-linux' works in most cases. (_ @@ -878,7 +880,14 @@ new Date();")) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments - `(#:tests? #f; require jtreg + `(#:imported-modules + ((guix build ant-build-system) + ,@%default-gnu-imported-modules) + #:modules + ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen)) + #:tests? #f; require jtreg #:make-flags '("all") #:disallowed-references ,(list (gexp-input icedtea-8) (gexp-input icedtea-8 "jdk")) @@ -971,6 +980,80 @@ new Date();")) (find-files "." "\\.c$|\\.h$")) #t))) + ;; By default OpenJDK only generates an empty keystore. In order to + ;; be able to use certificates in Java programs we need to generate a + ;; keystore from a set of certificates. For convenience we use the + ;; certificates from the nss-certs package. + (add-after 'install 'install-keystore + (lambda* (#:key inputs outputs #:allow-other-keys) + (use-modules (ice-9 rdelim)) + (let* ((keystore "cacerts") + (certs-dir (search-input-directory inputs + "etc/ssl/certs")) + (keytool (string-append (assoc-ref outputs "jdk") + "/bin/keytool"))) + (define (extract-cert file target) + (call-with-input-file file + (lambda (in) + (call-with-output-file target + (lambda (out) + (let loop ((line (read-line in 'concat)) + (copying? #f)) + (cond + ((eof-object? line) #t) + ((string-prefix? "-----BEGIN" line) + (display line out) + (loop (read-line in 'concat) #t)) + ((string-prefix? "-----END" line) + (display line out) + #t) + (else + (when copying? (display line out)) + (loop (read-line in 'concat) copying?))))))))) + (define (import-cert cert) + (format #t "Importing certificate ~a\n" (basename cert)) + (let ((temp "tmpcert")) + (extract-cert cert temp) + (let ((port (open-pipe* OPEN_WRITE keytool + "-import" + "-alias" (basename cert) + "-keystore" keystore + "-storepass" "changeit" + "-file" temp))) + (display "yes\n" port) + (when (not (zero? (status:exit-val (close-pipe port)))) + (format #t "failed to import ~a\n" cert))) + (delete-file temp))) + + ;; This is necessary because the certificate directory contains + ;; files with non-ASCII characters in their names. + (setlocale LC_ALL "en_US.utf8") + (setenv "LC_ALL" "en_US.utf8") + + (copy-file (string-append (assoc-ref outputs "out") + "/lib/security/cacerts") + keystore) + (chmod keystore #o644) + (for-each import-cert (find-files certs-dir "\\.pem$")) + (mkdir-p (string-append (assoc-ref outputs "out") + "/lib/security")) + (mkdir-p (string-append (assoc-ref outputs "jdk") + "/lib/security")) + + ;; The cacerts files we are going to overwrite are chmod'ed as + ;; read-only (444) in icedtea-8 (which derives from this + ;; package). We have to change this so we can overwrite them. + (chmod (string-append (assoc-ref outputs "out") + "/lib/security/" keystore) #o644) + (chmod (string-append (assoc-ref outputs "jdk") + "/lib/security/" keystore) #o644) + + (install-file keystore + (string-append (assoc-ref outputs "out") + "/lib/security")) + (install-file keystore + (string-append (assoc-ref outputs "jdk") + "/lib/security"))))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1044,6 +1127,7 @@ new Date();")) ("icedtea-8:jdk" ,icedtea-8 "jdk") ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))) @@ -1126,6 +1210,7 @@ new Date();")) `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") ("make@4.2" ,gnu-make-4.2) + ("nss-certs" ,nss-certs) ("unzip" ,unzip) ("which" ,which) ("zip" ,zip))))) @@ -1152,6 +1237,7 @@ new Date();")) #:modules `((guix build gnu-build-system) (guix build utils) (ice-9 match) + (ice-9 popen) (srfi srfi-1) (srfi srfi-26)) #:disallowed-references (list (gexp-input openjdk10) @@ -1394,6 +1480,7 @@ new Date();")) openjdk10 `(,openjdk10 "jdk") gnu-make-4.2 + nss-certs pkg-config unzip which @@ -1463,6 +1550,18 @@ new Date();")) (substitute-keyword-arguments (package-arguments openjdk11) ((#:phases phases) #~(modify-phases #$phases + #$@(if (target-aarch64?) + #~((add-after 'unpack 'patch-for-aarch64 + (lambda _ + (substitute* "src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp" + ;; This line is duplicated, so remove both occurrences, + ;; then add back one occurrence by substituting a + ;; comment that occurs once. + (("using MacroAssembler::call_VM_leaf_base;") "") + (("Interpreter specific version of call_VM_base") + (string-append "Interpreter specific version of call_VM_base\n" + " using MacroAssembler::call_VM_leaf_base;")))))) + #~()) (replace 'fix-java-shebangs (lambda _ ;; 'blocked' was renamed to 'blacklisted' in this version for @@ -2212,7 +2311,9 @@ distribution."))) (string-append target new-name)))) (find-files "netbeans" "\\.so$")))))))) (propagated-inputs - (list java-openjfx-base java-swt)) + (list java-openjfx-base)) + (inputs + (list java-swt)) ;; XXX: for unknown reasons ;; modules/graphics/src/main/native-prism-sw/JNativeSurface.c is missing ;; in this revision. @@ -2366,8 +2467,7 @@ debugging, etc.") (modules '((guix build utils))) ;; Delete bundled jars. (snippet '(begin (for-each delete-file-recursively - '("bootstrap" "lib")) - #t)))) + '("bootstrap" "lib")))))) (arguments `(#:make-flags ; bootstrap from javacc-4 ,#~(list (string-append "-Dbootstrap-jar=" @@ -2388,17 +2488,16 @@ debugging, etc.") (lambda _ (display (string-append "#!/bin/sh\n" - (assoc-ref inputs "jdk") "/bin/java" + (assoc-ref inputs "icedtea") "/bin/java" " -cp " dir "/javacc.jar" " `basename $0`" " $*")))) (chmod javacc #o755) ;; symlink to different names to affect the first argument and ;; change the behavior of the jar file. (symlink javacc (string-append bin "/jjdoc")) - (symlink javacc (string-append bin "/jjtree")) - #t)))))) - + (symlink javacc (string-append bin "/jjtree")))))))) (native-inputs - (list javacc-4)))) + (list javacc-4)) + (inputs (list icedtea-8)))) (define-public java-ecj (package @@ -13438,7 +13537,7 @@ network protocols, and core version control algorithms.") (define-public abcl (package (name "abcl") - (version "1.9.0") + (version "1.9.2") (source (origin (method url-fetch) @@ -13446,7 +13545,7 @@ network protocols, and core version control algorithms.") version "/abcl-src-" version ".tar.gz")) (sha256 (base32 - "0scqq5c7201xhp0g6i4y3m2nrk6l5any1nisiscbsd48ya25qax1")) + "0f0xpi47pfgz36y15krggshk2qdd2zxdkg5xwnamvng2hn7lnbsf")) (patches (search-patches "abcl-fix-build-xml.patch")))) @@ -13556,6 +13655,70 @@ and allows building a Java object model for JSON text using API classes parse, generate, transform and query) JSON messages. This package contains a reference implementation of that API."))) +(define-public java-jakarta-json + (package + (name "java-jakarta-json") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jakartaee/jsonp-api") + (commit (string-append version "-RELEASE")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q600harqfhlf763l75j4fx7ai7ybp7ga06aiky2a2hg8mhz0s5f")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "jakarta-json.jar" + #:source-dir "api/src/main/java" + #:tests? #f; no tests + #:jdk ,openjdk11)) + (home-page "https://github.com/jakartaee/jsonp-api") + (synopsis "Portable API for JSON handling in Java") + (description "This project contains API and Compatible Implementation of +Jakarta JSON Processing specification. Jakarta JSON Processing provides +portable APIs to parse, generate, transform, and query JSON documents.") + ;; with classpath exception + (license license:epl2.0))) + +(define-public java-parsson + (package + (name "java-parsson") + (version "1.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eclipse-ee4j/parsson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06vvr6qv1ihnk212gdxg4x0sd61lgxk7wf062s7gym5k2h7fms0p")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "parsson.jar" + #:source-dir "impl/src/main/java" + #:test-dir "impl/src/test" + #:use-java-modules? #t + #:jdk ,openjdk11 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-resources + (lambda _ + (copy-recursively "impl/src/main/resources" + "build/classes")))))) + (inputs + (list java-jakarta-json)) + (native-inputs + (list java-junit)) + (home-page "https://github.com/eclipse-ee4j/parsson") + (synopsis "Implementation of Jakarta JSON API") + (description "Eclipse Parsson is an implementation of the Jakarta JSON +Processing specification.") + ;; with classpath exception + (license license:epl2.0))) + (define-public java-xmp (package (name "java-xmp") diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index e70aa7d7e1..2c7ff744ea 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -184,7 +184,7 @@ context menu in TypeScript.") #t)))) (native-inputs `(("font-mathjax" ,font-mathjax) - ("glibc-utf8-locales" ,glibc-utf8-locales) + ("glibc-utf8-locales" ,(libc-utf8-locales-for-target)) ("uglifyjs" ,node-uglify-js) ,@(package-native-inputs font-mathjax))) (synopsis "JavaScript display engine for LaTeX, MathML, and AsciiMath") diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 82df28d9b5..3974bbdd2a 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -265,6 +265,28 @@ appropriate BLAS or optimised Julia linear algebra routines. This supports a much wider class of matrix types than Julia's in-built @code{StridedArray}.") (license license:expat))) +(define-public julia-astrolib + (package + (name "julia-astrolib") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaAstro/AstroLib.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zbivs79cw7qazrl9c8rz2n2kifxw3adwjf22nn24dp5i34fkw5d")))) + (build-system julia-build-system) + (native-inputs (list julia-staticarrays)) + (home-page "https://github.com/JuliaAstro/AstroLib.jl") + (synopsis "Bundle of small astronomical and astrophysical routines") + (description "The aim of this package is to provide users with a set of small +generic routines useful above all in astronomical and astrophysical context, +written in Julia.") + (license license:expat))) + (define-public julia-astrotime (package (name "julia-astrotime") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 9337197cb2..87854afd72 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -410,6 +410,54 @@ endpoints—to Jupyter web applications.") are interactive HTML widgets for Jupyter notebooks and the IPython kernel.") (license license:bsd-3))) +(define-public python-jupyterlite-core + (package + (name "python-jupyterlite-core") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyterlite_core" version)) + (sha256 + (base32 "18ysrqlsh7a31sknfnng419r7wpx9nfj59lxxd6zl1kcj6wazh34")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-doit python-importlib-metadata + python-jupyter-core)) + (native-inputs (list python-ansi2html + python-hatchling + python-pytest-console-scripts + python-pytest-cov + python-pytest-xdist + python-tornado-6)) + (home-page "https://github.com/jupyterlite/jupyterlite") + (synopsis "Core functionality for building JupyterLite websites") + (description "The jupyterlite-core package provides the core functionality +for building JupyterLite websites, the jupyter-lite CLI, and extension points +for authoring custom addons.") + (license license:bsd-3))) + +(define-public python-jupyterlite-sphinx + (package + (name "python-jupyterlite-sphinx") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyterlite_sphinx" version)) + (sha256 + (base32 "05h7zrvsx0xzxlddsqfz1fxdgld66yhn6nxfp4jz20wbx6csrr4v")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #false)) ;there are none + (propagated-inputs (list python-docutils python-jupyter-server + python-jupyterlab-server python-jupyterlite-core + python-sphinx)) + (native-inputs (list python-hatchling)) + (home-page "https://github.com/jupyterlite/jupyterlite") + (synopsis "Sphinx extension for deploying JupyterLite") + (description "This package provides a Sphinx extension for deploying +@code{JupyterLite}.") + (license license:bsd-3))) + (define-public python-jupyter-server-mathjax (package (name "python-jupyter-server-mathjax") diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0384baae46..4572d55cb8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2028,6 +2028,9 @@ covers feedback and persistent events.") qtbase-5)) (arguments (list + ;; The `plasma-querytest' test is known to fail when tests are run in parallel: + ;; <https://sources.debian.org/src/kpackage/5.107.0-1/debian/changelog/#L92> + #:parallel-tests? #f #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a0ef77e5e5..42a2b007c6 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -284,7 +284,7 @@ annotating features.") (define-public kdenlive (package (name "kdenlive") - (version "23.04.2") + (version "23.08.3") (source (origin (method git-fetch) @@ -293,7 +293,7 @@ annotating features.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0dgrgnnq38nphfzbapr7dkb21lv4idqynxqmzv9x3maijmp1jjfr")))) + (base32 "0qwnz99wdlfkc08imf18wdvms9lzsph4nyjh2845145sl322yans")))) (build-system qt-build-system) (arguments ;; XXX: there is a single test that spawns other tests and diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 1366d5a31c..0dbc07ad26 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -854,7 +854,7 @@ noun phrases, verb phrases, etc.).") (define-public praat (package (name "praat") - (version "6.3.10") + (version "6.4") (source (origin (method git-fetch) (uri (git-reference @@ -863,7 +863,7 @@ noun phrases, verb phrases, etc.).") (file-name (git-file-name name version)) (sha256 (base32 - "0kwv0p2bn2x5h0c61rymm87icqqwnbj699awgc5afl4qp53azci8")))) + "1rabv4175r1kbgb6n5xbir4j9ldpfr3wr6xa8jakzgny3dwlmsbg")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "CC=" diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 71131ca1f3..79b30cecaf 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> +;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages cups) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) @@ -92,20 +94,19 @@ (define-public ixion (package (name "ixion") - (version "0.17.0") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/ixion/src/libixion-" - version ".tar.xz")) - (sha256 - (base32 - "07hhqkvns4da8xv990gr1smqz1zf40m531lg95nphfrz48wp3jak")))) + (version "0.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/ixion/ixion") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nycbs3765wkaw9ff7aflm56ayxkn15dlfl5pbbb9b5i2rcv3dq6")))) (build-system gnu-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list mdds python spdlog)) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list mdds python spdlog)) (home-page "https://gitlab.com/ixion/ixion") (synopsis "General purpose formula parser and interpreter") (description "Ixion is a library for calculating the results of formula @@ -117,22 +118,22 @@ their dependencies automatically upon calculation.") (define-public orcus (package (name "orcus") - (version "0.17.2") - (source - (origin - (method url-fetch) - (uri (string-append "http://kohei.us/files/orcus/src/lib" - "orcus-" version ".tar.xz")) - (sha256 - (base32 - "1as04qb74jnlnwy4wh5jwaw2nnzgn2s3230ymvh3kx1w9r0rsl1h")))) + (version "0.19.0") + (source (origin + ;; The test suite requires data files store with Git Large + ;; File Storage. + (method git-fetch/lfs) + (uri (git-reference + (url "https://gitlab.com/orcus/orcus") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02prj6kgph56fkr89k8wlqarrmx65cq92863i4rrny5sqr8c2llr")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--disable-static"))) - (native-inputs - (list pkg-config)) - (inputs - (list ixion mdds python zlib)) + (arguments (list #:configure-flags #~(list "--disable-static"))) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list ixion mdds python zlib)) (home-page "https://gitlab.com/orcus/orcus") (synopsis "File import filter library for spreadsheet documents") (description "Orcus is a library that provides a collection of standalone @@ -353,7 +354,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (name "libcmis") ;; Note: Use an unreleased version because libreoffice requires it and ;; is the only user (see <https://github.com/tdf/libcmis/pull/43>). - (version "0.5.2-46-gf264a61") + (version "0.6.0") (home-page "https://github.com/tdf/libcmis") (source (origin @@ -363,7 +364,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (file-name (git-file-name name version)) (sha256 (base32 - "06ff5vw0xrymvvna18wlaayyk20755sk2541i1gh7zpbmncs2ni6")))) + "17jx9fb7nmyp6jhz9nlmb3wcp8k03vhcv7sqql6a7jhsjnw3hq0k")))) (build-system gnu-build-system) (native-inputs (list autoconf automake libtool cppunit pkg-config)) @@ -897,7 +898,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (define-public libreoffice (package (name "libreoffice") - (version "7.5.4.2") + (version "7.6.3.1") (source (origin (method url-fetch) @@ -906,7 +907,7 @@ commonly called @code{ftoa} or @code{dtoa}.") "https://download.documentfoundation.org/libreoffice/src/" (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 - (base32 "1s3592ick745kl60yjlv7ki3p7nnwswj0mgjh3nk6k7skyvx3fv8")))) + (base32 "148084acq370483y0xwvcvck30kxhr78cnmibp5lks17xqp5f9q7")))) (build-system glib-or-gtk-build-system) (arguments (list @@ -1088,6 +1089,7 @@ commonly called @code{ftoa} or @code{dtoa}.") (list bison cppunit flex + frozen ;header-only library pkg-config python-wrapper which diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 692844c7da..430645e4ad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org> ;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2016, 2018-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> -;;; Copyright © 2016, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2016-2023 Marius Bakke <marius@gnu.org> @@ -76,6 +76,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 dan <i@dan.games> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -492,85 +493,85 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.5-version "6.5.5") +(define-public linux-libre-6.6-version "6.6.3") +(define-public linux-libre-6.6-gnu-revision "gnu") +(define deblob-scripts-6.6 + (linux-libre-deblob-scripts + linux-libre-6.6-version + linux-libre-6.6-gnu-revision + (base32 "0g8m0rb15b0231dv8ji456s75a67szsaim71may3yprplycz6pav") + (base32 "1hg3ck1j8288fhlhcvhgs1zzwh3i62nfvphw7x3vsaqr75kiwbjp"))) +(define-public linux-libre-6.6-pristine-source + (let ((version linux-libre-6.6-version) + (hash (base32 "19wmjkyyv5glv1w647qisrv829hhhpba5x905a7p7kch9wyzrv98"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-6.6))) + +(define-public linux-libre-6.5-version "6.5.13") (define-public linux-libre-6.5-gnu-revision "gnu") (define deblob-scripts-6.5 (linux-libre-deblob-scripts linux-libre-6.5-version linux-libre-6.5-gnu-revision (base32 "01mm6v67bcrhgm97axsw46x0iix9im7hmlb765f3bkjhwklpxdy7") - (base32 "132ps1jprxw6kqyscsar38fn7s12kg416mfhz7w702f4ajgq1ndi"))) + (base32 "066z5lw5vrfayhv23hpfcm6fh6b7zmn2v13kfv1g3z3jl1wblhfh"))) (define-public linux-libre-6.5-pristine-source (let ((version linux-libre-6.5-version) - (hash (base32 "15gg8sb6cfgk1afwj7fl7mj4nkj14w43vzwvw0qsg3nzyxwh7wcc"))) + (hash (base32 "1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.5))) -(define-public linux-libre-6.4-version "6.4.16") -(define-public linux-libre-6.4-gnu-revision "gnu") -(define deblob-scripts-6.4 - (linux-libre-deblob-scripts - linux-libre-6.4-version - linux-libre-6.4-gnu-revision - (base32 "012d16rjprxdv9frf7kcakpikvw7l0s3kvj4kkp9flzdg3j8wxpz") - (base32 "02zizxf0dp4291hbvjrif04m19h8rrc55c11qinlrm0p19s9srcx"))) -(define-public linux-libre-6.4-pristine-source - (let ((version linux-libre-6.4-version) - (hash (base32 "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln"))) - (make-linux-libre-source version - (%upstream-linux-source version hash) - deblob-scripts-6.4))) - ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.1-version "6.1.53") +(define-public linux-libre-6.1-version "6.1.64") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "1c73516nbhnz0cxjz38b5794dxygb8sznv9idiibw7ablmjbhd11"))) + (base32 "1hdibv43xbn1lv83i6qjgfmf1bvqxvq17fryfsq4r4sjgs9212js"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz"))) + (hash (base32 "1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.131") +(define-public linux-libre-5.15-version "5.15.140") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") - (base32 "1c3lm0j401lv2lk39dmr4mlf5ic173snm7cc0cckl6czyvxr5ysy"))) + (base32 "1idjrn2w8jrixj8ifkk1awxyyq5042nc4p2mld4rda96azlnp948"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r"))) + (hash (base32 "0isa9si9wjn10lw41431wdqsbp9y685ch5lzhwswng3g6j5ywaxy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.194") +(define-public linux-libre-5.10-version "5.10.202") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision (base32 "1b33rkn32b923025iiz4xzxiy8y5ii9j5qk4021mg575890rl4ch") - (base32 "0nnp46mn32yk436swd2qh34igmzinfgkwvbzp3lqyy45f06hbc2j"))) + (base32 "0xrrnmb5kcc5r21bdm24aq0fnkk1imn367c1cxlj78b6l6gigx4b"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394"))) + (hash (base32 "12zs2bz2plps6xp80sdg36zkyr00rf5l5c85jl4dd7b9klly04ij"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.256") +(define-public linux-libre-5.4-version "5.4.262") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -580,27 +581,27 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0sw67b2pk3lng4y67diqqnhxaggnp3nbkx8dxc5fs27rinfxr4m1"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0fim5q9xakwnjfg48bpsic9r2r8dvrjlalqqkm9vh1rml9mhi967"))) + (hash (base32 "1p34x33gkvpv26zcrpx1i6dr7dknyxj8gnp6caqb8sj58h3slgkx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.294") +(define-public linux-libre-4.19-version "4.19.300") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version linux-libre-4.19-gnu-revision - (base32 "0ghdizzs6969872rnjcv9p6sl9rcbs29v3ismk125yyvjaczd428") + (base32 "0pjal2cc2f99cvw8r4icb4l24j41k48jkj6bqk7pcahzcgx33ycb") (base32 "1425mhkfxn18vxn05bb4h3li7x1jl7l1hf1zi8xhnqv3wa31h9wl"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "03x0xsb8a369zdr81hg6xdl5n5v48k6iwnhj6r29725777lvvbfc"))) + (hash (base32 "0ilksl94gjpc4pzc90swfawsl8lvibpq14nkaxzl0831i219ahd8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.325") +(define-public linux-libre-4.14-version "4.14.331") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -610,7 +611,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1faagsj4i31z2bp83hflx3q9vrddjnn37a3ah2b47iaplva7z1nd"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "117p1mdha57f6d3kdwac9jrbmib7g77q4xhir8ghl6fmrs1f2sav"))) + (hash (base32 "03sk82dgvccv70i3hy8gf2hw0n4m305f7rxjw93p7jnjrbpdrp1r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) @@ -643,13 +644,13 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) -(define-public linux-libre-6.5-source - (source-with-patches linux-libre-6.5-pristine-source +(define-public linux-libre-6.6-source + (source-with-patches linux-libre-6.6-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) -(define-public linux-libre-6.4-source - (source-with-patches linux-libre-6.4-pristine-source +(define-public linux-libre-6.5-source + (source-with-patches linux-libre-6.5-pristine-source (list %boot-logo-patch %linux-libre-arm-export-__sync_icache_dcache-patch))) @@ -767,16 +768,16 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) +(define-public linux-libre-headers-6.6 + (make-linux-libre-headers* linux-libre-6.6-version + linux-libre-6.6-gnu-revision + linux-libre-6.6-source)) + (define-public linux-libre-headers-6.5 (make-linux-libre-headers* linux-libre-6.5-version linux-libre-6.5-gnu-revision linux-libre-6.5-source)) -(define-public linux-libre-headers-6.4 - (make-linux-libre-headers* linux-libre-6.4-version - linux-libre-6.4-gnu-revision - linux-libre-6.4-source)) - (define-public linux-libre-headers-6.1 (make-linux-libre-headers* linux-libre-6.1-version linux-libre-6.1-gnu-revision @@ -1116,28 +1117,28 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; -(define-public linux-libre-6.5 - (make-linux-libre* linux-libre-6.5-version - linux-libre-6.5-gnu-revision - linux-libre-6.5-source +(define-public linux-libre-6.6 + (make-linux-libre* linux-libre-6.6-version + linux-libre-6.6-gnu-revision + linux-libre-6.6-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-6.4 - (make-linux-libre* linux-libre-6.4-version - linux-libre-6.4-gnu-revision - linux-libre-6.4-source +(define-public linux-libre-version linux-libre-6.6-version) +(define-public linux-libre-gnu-revision linux-libre-6.6-gnu-revision) +(define-public linux-libre-pristine-source linux-libre-6.6-pristine-source) +(define-public linux-libre-source linux-libre-6.6-source) +(define-public linux-libre linux-libre-6.6) + +(define-public linux-libre-6.5 + (make-linux-libre* linux-libre-6.5-version + linux-libre-6.5-gnu-revision + linux-libre-6.5-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-6.4-version) -(define-public linux-libre-gnu-revision linux-libre-6.4-gnu-revision) -(define-public linux-libre-pristine-source linux-libre-6.4-pristine-source) -(define-public linux-libre-source linux-libre-6.4-source) -(define-public linux-libre linux-libre-6.4) - (define-public linux-libre-6.1 (make-linux-libre* linux-libre-6.1-version linux-libre-6.1-gnu-revision @@ -1369,9 +1370,9 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre* - linux-libre-6.4-version - linux-libre-6.4-gnu-revision - linux-libre-6.4-source + linux-libre-6.6-version + linux-libre-6.6-gnu-revision + linux-libre-6.6-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:extra-version "bpf" @@ -1861,6 +1862,36 @@ Linux kernel module, it also contains a modprobe configuration and udev rules, which need to be installed separately.") (license license:gpl3+))) +(define-public vendor-reset-linux-module + (let ((commit "4b466e92a2d9f76ce1082cde982c7be0be91e248") + (revision "0")) + (package + (name "vendor-reset-linux-module") + (version (git-version "0.1.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnif/vendor-reset") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gaf4j20grng689c9fylcqri3j9ycnhr2bsva2z6qcdqvzl6yxbi")))) + (build-system linux-module-build-system) + (arguments + (list #:tests? #f)) ;no test suite + (home-page "https://github.com/gnif/vendor-reset") + (synopsis + "Kernel module that resets GPUs that are affected by the reset bug") + (description + "This package provides a kernel module that is capable of +resetting hardware devices into a state where they can be +re-initialized or passed through into a virtual machine (VFIO). +While it would be great to have these in the kernel as PCI quirks, +some of the reset procedures are very complex and would never be +accepted as a quirk (ie AMD Vega 10).") + (license license:gpl2)))) + ;;; ;;; Pluggable authentication modules (PAM). @@ -3664,7 +3695,7 @@ processes currently causing I/O.") (define-public iotop (package (name "iotop") - (version "1.23") + (version "1.25") (source (origin (method git-fetch) @@ -3673,7 +3704,7 @@ processes currently causing I/O.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i5m2w0jzxzxn2xvragygidw35p87skjs6bfjakrz6bd96sxhd70")))) + (base32 "0h8fb7zzqszdrybk9zzzqqkiz78i8z2zr0f2nj84jja6visdd2v4")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -5173,46 +5204,46 @@ thanks to the use of namespaces.") ;; supported since Linux-libre 5.4.5. (substitute* "src/lib/image/squashfs/mount.c" (("\"errors=remount-ro\"") - "NULL")) - #t)))) + "NULL")))))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--localstatedir=/var") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-references - (lambda _ - (substitute* "libexec/cli/build.exec.in" - (("-mksquashfs") (string-append "-" (which "mksquashfs")))) - (substitute* (append + (list + #:configure-flags #~(list "--localstatedir=/var") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-references + (lambda _ + (substitute* "libexec/cli/build.exec.in" + (("-mksquashfs") (string-append "-" (which "mksquashfs")))) + (substitute* (append (find-files "libexec" "functions") (find-files "libexec/bootstrap-scripts" ".*sh$") (find-files "libexec/cli" ".*exec$")) - (("\\| grep ") - (string-append "| " (which "grep") " ")) - (("egrep ") - (string-append (which "egrep") " ")) - ((" sed ") - (string-append " " (which "sed") " "))) - #t)) - (add-after 'install 'set-PATH - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Have the 'singularity' and 'run-singularity' self-sufficient. - (let ((out (assoc-ref outputs "out")) - (coreutils (assoc-ref inputs "coreutils"))) - (wrap-program (string-append out "/bin/singularity") - `("PATH" ":" = (,(string-append coreutils "/bin")))) - (substitute* (string-append out "/bin/run-singularity") - (("/usr/bin/env singularity") - (string-append (which "env") " " - out "/bin/singularity"))) - #t)))))) + (("\\| grep ") + (string-append "| " (which "grep") " ")) + (("egrep ") + (string-append (which "egrep") " ")) + ((" sed ") + (string-append " " (which "sed") " "))))) + (add-after 'install 'set-PATH + (lambda _ + ;; Have the 'singularity' and 'run-singularity' self-sufficient. + ;; But don't override PATH, so that other tools like zcat and + ;; tar can still be found if they are available. + (let ((coreutils #$(this-package-input "coreutils"))) + (wrap-program (string-append #$output "/bin/singularity") + `("PATH" prefix (,(string-append coreutils "/bin")))) + (substitute* (string-append #$output "/bin/run-singularity") + (("/usr/bin/env singularity") + (string-append (which "env") " " + #$output "/bin/singularity"))))))))) (inputs - `(("bash" ,bash-minimal) ; for wrap-program - ("libarchive" ,libarchive) - ("python" ,python-wrapper) - ("zlib" ,zlib) - ("squashfs-tools" ,squashfs-tools))) + (list bash-minimal ;for 'wrap-program' + coreutils + libarchive + python-wrapper + squashfs-tools + zlib)) (home-page "https://singularity.lbl.gov/") (synopsis "Container platform") (description "Singularity is a container platform supporting a number of @@ -6577,17 +6608,17 @@ by hand is no trivial task: @command{tmon} aims to make it understandable.") (source (package-source linux-libre)) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no test suite - #:make-flags - (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enter-subdirectory - (lambda _ - (chdir "tools/power/x86/turbostat") - #t)) - (delete 'configure)))) ; no configure script + (list + #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "tools/power/x86/turbostat"))) + (delete 'configure)))) ;no configure script (inputs (list libcap)) (supported-systems '("i686-linux" "x86_64-linux")) @@ -6708,7 +6739,7 @@ from the ntfs-3g package. It is meant to be used in initrds.") (define-public rdma-core (package (name "rdma-core") - (version "44.0") + (version "48.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -6716,7 +6747,7 @@ from the ntfs-3g package. It is meant to be used in initrds.") version ".tar.gz")) (sha256 (base32 - "12w5v74wz1akac09frw7qk1yd06b00239zh7bvbvqyzjc0g61mi5")))) + "0h281dw2yph8pzfsr1wblqy6pb8nd9yj1pdf5c62zwc1l9b2fa3q")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no tests @@ -8531,7 +8562,7 @@ comparing system environments.") (define-public libfabric (package (name "libfabric") - (version "1.11.2") + (version "1.19.0") (source (origin (method url-fetch) @@ -8539,7 +8570,7 @@ comparing system environments.") (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "1nnpfkwxhim2nqjkb1vwrb4wj4j3l6w6yvvy69fqam2snlhshazz")))) + (base32 "17pg0fb4fa77r1bmp0xk535m8n8fadpfdg93cb280ghhx55pck7i")))) (build-system gnu-build-system) (inputs `(("rdma-core" ,rdma-core) ,@(match (%current-system) @@ -8820,16 +8851,17 @@ privileges.") (define-public psm2 (package (name "psm2") - (version "11.2.230") + (version "12.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/intel/opa-psm2") - (commit (string-append "PSM2_" version)))) + ;; tag 'psm-v12.0' = commit ad5dd1b + (commit (string-append "psm-v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1bm7ndhi8qzmd0plnggj2h52yb34bab4k38530nsnkmv9smwdivl")))) + "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -8948,7 +8980,8 @@ management tools in userspace.") "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/vishvananda/netlink")) + `(#:tests? #f ; Tests depend on specific kernel modules. + #:import-path "github.com/vishvananda/netlink")) (native-inputs (list go-golang-org-x-sys go-netns)) (home-page "https://github.com/vishvananda/netlink") @@ -9407,7 +9440,7 @@ tools for managing PipeWire.") (define-public ell (package (name "ell") - (version "0.57") + (version "0.59") (source (origin (method git-fetch) (uri (git-reference @@ -9416,7 +9449,7 @@ tools for managing PipeWire.") (file-name (git-file-name name version)) (sha256 (base32 - "1vpzz0z6q0d3h41aqajaw0dlpkdnmjcppmlwbb558hvj40q5dpzm")))) + "11xlkdvw7pyd9idq1zsnl946dry9aksnz29wbpzxqjc97xhhd5xq")))) (build-system gnu-build-system) (arguments ;; Tests launch dbus-daemon instances that all try to bind to @@ -9425,7 +9458,7 @@ tools for managing PipeWire.") (inputs (list dbus)) (native-inputs - (list autoconf automake libtool pkg-config)) + (list autoconf automake libtool pkg-config procps)) (home-page "https://01.org/ell") (synopsis "Embedded Linux Library") (description "The Embedded Linux* Library (ELL) provides core, low-level @@ -9799,7 +9832,7 @@ kernel side implementation.") (define-public erofs-utils (package (name "erofs-utils") - (version "1.7") + (version "1.7.1") (source (origin (method git-fetch) @@ -9808,7 +9841,7 @@ kernel side implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bi8n1kb263v1gvis21pa9dxsf3p96d1nasm21icmv3rd9g2xh6p")))) + (base32 "1mvybd06cswxj0nzk9ph1pkb9mrs8lvcbn6cgsp7z3wl6jai9d6d")))) (build-system gnu-build-system) (inputs (list lz4 @@ -10440,6 +10473,7 @@ against the several transient execution CVEs that were published since early (uri (git-reference (url "https://github.com/csmith-project/csmith") (commit (string-append "csmith-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0nhrsnv6cny14xz68qb1h30fbwc05adkisk51p3x63mydm60ddl3")))) @@ -10466,3 +10500,66 @@ against the several transient execution CVEs that were published since early (description "The primary purpose of Csmith is to find compiler bugs with random programs using differential testing.") (license license:bsd-4))) + +(define-public ipvsadm + (package + (name "ipvsadm") + (version "1.31") + (source + (origin + (method url-fetch) + (uri (string-append "https://kernel.org/pub/linux/utils/kernel" + "/ipvsadm/ipvsadm-" version ".tar.xz")) + (sha256 + (base32 "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs")))) + (build-system gnu-build-system) + (native-inputs (list linux-libre-headers pkg-config which)) + (inputs (list libnl popt)) + (arguments + (list #:tests? #f + #:parallel-build? #f ;build fails randomly with '-j' + #:make-flags + #~(list (string-join + (list "CFLAGS=" + (string-append "-I" + #$(this-package-input "libnl") + "/include/libnl3") + (string-append "-L" #$(this-package-input "libnl") + "/lib") + "-fPIC") + " ") + (string-append "CC=" #$(cc-for-target)) + (string-append "SBIN=" #$output "/sbin") + (string-append "INIT=" #$output "/etc/init.d") + (string-append "MANDIR=" #$output "/share/man")) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (home-page "http://www.linuxvirtualserver.org/software/ipvs.html") + (synopsis "IP virtual server administration utility") + (description "@code{ipvsadm(8)} is used to set up, maintain or inspect the +virtual server table in the Linux kernel. The Linux Virtual Server can be used +to build scalable network services based on a cluster of two or more nodes.") + (license license:gpl2+))) + +(define-public ryzen-smu + (package + (name "ryzen-smu") + (version "0.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/leogx9r/ryzen_smu.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "010la2a8zp7rljlg5ssc9ragzva4ca05gvzlicjagl508659d2wz")))) + (build-system linux-module-build-system) + (arguments + `(#:tests? #f)) ; no tests + (synopsis "System Management Unit driver for AMD Ryzen processors") + (description "This package provides a way to access the +System Management Unit for certain AMD Ryzen processors. +This includes access to the System Management Network.") + (home-page "https://gitlab.com/leogx9r/ryzen_smu") + (license license:gpl2))) diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index ee045d1387..5f5e39c193 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -356,11 +356,11 @@ experience.") (sbcl-package->ecl-package sbcl-clunit)) (define-public sbcl-clunit2 - (let ((commit "c3159275a6c5af166e60b592c3b7e22eaa69c048") + (let ((commit "b24c56851ee6ee6c4a9dc3725a634c06b604f207") (revision "2")) (package (name "sbcl-clunit2") - (version (git-version "0.5.2" revision commit)) + (version (git-version "0.6.1" revision commit)) (source (origin (method git-fetch) @@ -369,7 +369,7 @@ experience.") (commit commit))) (file-name (git-file-name "cl-clunit2" version)) (sha256 - (base32 "0n92z98dqfik3kfp25nz7yqycx4bpxlqbn69i5skcdnrj2ywmv01")))) + (base32 "03k4wc2zz31wcqcxy8fhq095i8xzcaxrzgrlrn2va10lcjs4v51b")))) (build-system asdf-build-system/sbcl) (synopsis "Unit testing framework for Common Lisp") (description @@ -625,8 +625,8 @@ to make test code more informative. (sbcl-package->cl-source-package sbcl-kaputt)) (define-public sbcl-lift - (let ((commit "2594160d6ca3a77d8750110dfa63214256aab852") - (revision "2")) + (let ((commit "a7941845a9de72be60e66ea941aa34cbee35bf23") + (revision "3")) (package (name "sbcl-lift") (version (git-version "1.7.1" revision commit)) @@ -634,10 +634,10 @@ to make test code more informative. (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/lift") + (url "https://github.com/hraban/lift") (commit commit))) (sha256 - (base32 "01xvz9sl5l5lai4h9dabmcjnm659wf5zllaxqbs55lffskp6jwq3")) + (base32 "1513n46fkqw8rnvz69s7xnwj476qm8ibdlwsr63qj9yh0mib0q6x")) (file-name (git-file-name "lift" version)) (modules '((guix build utils))) (snippet @@ -1149,3 +1149,32 @@ on the XPTest package by Craig Brozensky and the JUnit package by Kent Beck.") (define-public ecl-xlunit (sbcl-package->ecl-package sbcl-xlunit)) + +(define-public sbcl-lisp-critic + (let ((commit "ea19f82a168a6119ac1b10d0f457c01a7119602f") + (revision "1")) + (package + (name "sbcl-lisp-critic") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/g000001/lisp-critic") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15zg05pqfs2dhc5j7gfkwjmxawaizjpyb0p7386mpl4w93l9h84l")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp linter") + (description "The Lisp Critic scans your code for instances of bad + Lisp programming practice.") + (home-page + "https://courses.cs.northwestern.edu/325/exercises/critic.html#critic") + (license license:expat)))) + +(define-public cl-lisp-critic + (sbcl-package->cl-source-package sbcl-lisp-critic)) + +(define-public ecl-lisp-critic + (sbcl-package->ecl-package sbcl-lisp-critic)) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5ba5c7d519..5a1422e163 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -39,6 +39,8 @@ ;;; Copyright © 2022, 2023 Artyom Bologov <mail@aartaka.me> ;;; Copyright © 2023 Roman Scherer <roman@burningswell.com> ;;; Copyright © 2023 ykonai <mail@ykonai.net> +;;; Copyright © 2023 Gabriel Hondet <gabriel.hondet@cominety.net> +;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +74,7 @@ #:use-module (guix build-system asdf) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) + #:use-module (guix build-system emacs) #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages c) @@ -1244,8 +1247,8 @@ and Gopher website hosting.") (delete 'build-program)))))))) (define-public sbcl-trivial-timeout - (let ((commit "feb869357f40f5e109570fb40abad215fb370c6c") - (revision "1")) + (let ((commit "e70d9b4f7caeab83ea6ac50d724470fe49561e66") + (revision "2")) (package (name "sbcl-trivial-timeout") (version (git-version "0.1.5" revision commit)) @@ -1253,19 +1256,15 @@ and Gopher website hosting.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-timeout/") + (url "https://github.com/hraban/trivial-timeout") (commit commit))) (file-name (git-file-name "trivial-timeout" version)) (sha256 - (base32 "1kninxwvvih9nhh7a9y8lfgi7pdr76675y1clw4ss17vz8fbim5p")))) + (base32 "0s8z9aj6b3kv21yiyk13cjylzf5zlnw9v86vcff477m1gk9yddjs")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) - (arguments - ;; NOTE: (Sharlatan-20210202T231437+0000): Due to the age of this library - ;; tests use some deprecated functionality and keep failing. - `(#:tests? #f)) - (home-page "https://github.com/gwkkwg/trivial-timeout/") + (home-page "https://github.com/hraban/trivial-timeout") (synopsis "Timeout library for Common Lisp") (description "This library provides an OS and implementation independent access to @@ -2172,6 +2171,48 @@ from other CLXes around the net.") (define-public ecl-clx (sbcl-package->ecl-package sbcl-clx)) +(define-public sbcl-cl-wayland + (let ((commit "a92a5084b64102f538ab90212e99c7863e5338ae") + (revision "0")) + (package + (name "sbcl-cl-wayland") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sdilts/cl-wayland") + (commit commit))) + (file-name (git-file-name "cl-wayland" version)) + (sha256 + (base32 "1r4fn9dc0dz2b30k8z243yacx1y5z21qk4zh2ildj7ak51qx53zf")))) + (build-system asdf-build-system/sbcl) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "wayland-server-core.lisp" + (("libwayland-server.so") + (search-input-file inputs + "/lib/libwayland-server.so")))))))) + (inputs + (list sbcl-cffi + sbcl-closer-mop + wayland)) + (home-page "https://github.com/sdilts/cl-wayland") + (synopsis "Common Lisp FFI bindings for libwayland") + (description + "This package provides Common Lisp FFI bindings for libwayland, +primarily for the mahogany window manager.") + (license license:bsd-3)))) + +(define-public cl-wayland + (sbcl-package->cl-source-package sbcl-cl-wayland)) + +(define-public ecl-cl-wayland + (sbcl-package->ecl-package sbcl-cl-wayland)) + (define-public sbcl-clx-truetype (let ((commit "c6e10a918d46632324d5863a8ed067a83fc26de8") (revision "1")) @@ -2215,8 +2256,9 @@ antialiased TrueType font rendering using CLX and XRender extension.") (sbcl-package->ecl-package sbcl-clx-truetype)) (define-public sbcl-slynk - (let ((commit "df62abae73bd511885c9c7ec0ea7ea1469a00923") - (revision "8")) + ;; Update together with emacs-sly. + (let ((commit "9c43bf65b967e12cef1996f1af5f0671d8aecbf4") + (revision "9")) (package (name "sbcl-slynk") (version (git-version "1.0.43" revision commit)) @@ -2228,7 +2270,7 @@ antialiased TrueType font rendering using CLX and XRender extension.") (url "https://github.com/joaotavora/sly") (commit commit))) (sha256 - (base32 "1nxijv52bja6la2i3asq7kklpj5li25454n52sgsc6xnnfvakbsv")) + (base32 "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2")) (file-name (git-file-name "cl-slynk" version)))) (build-system asdf-build-system/sbcl) (outputs '("out" "image")) @@ -2663,8 +2705,8 @@ arbitrary Lisp data.") (sbcl-package->ecl-package sbcl-cl-dot)) (define-public sbcl-cl-graph - (let ((commit "3cb786797b24883d784b7350e7372e8b1e743508") - (revision "1")) + (let ((commit "c617de35390cb02db88bc5b5febffafdb8947ae8") + (revision "2")) (package (name "sbcl-cl-graph") (version (git-version "0.10.2" revision commit)) @@ -2672,11 +2714,11 @@ arbitrary Lisp data.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-graph") + (url "https://github.com/hraban/cl-graph") (commit commit))) (file-name (git-file-name "cl-graph" version)) (sha256 - (base32 "1748rj52f2jmd5jvsy9jwhn0zf73sjzjhwhnljvq6yi2kdqr30kl")))) + (base32 "0g1abkph9zb0m9zz6q2471ml9q9acdhwyapk8ra3bisqpwlxvpyf")))) (build-system asdf-build-system/sbcl) (arguments ;; TODO: (Sharlatan-20221118T215839+0000): Tests failed @@ -2929,7 +2971,16 @@ pure Common Lisp.") (license license:expat)))) (define-public ecl-cl-pcg - (sbcl-package->ecl-package sbcl-cl-pcg)) + (let ((pkg (sbcl-package->ecl-package sbcl-cl-pcg))) + (package + (inherit pkg) + (arguments + (substitute-keyword-arguments (package-arguments pkg) + ;; Tests are failing on ECL with: + ;; PCG.TEST::TEST-REWINDAn error occurred during initialization: + ;; 40502229875678917802724098623316930025 is not of type + ;; (INTEGER 0 2305843009213693951) + ((#:tests? _ #f) #f)))))) (define-public cl-pcg (sbcl-package->cl-source-package sbcl-cl-pcg)) @@ -3565,76 +3616,51 @@ writing code that contains string literals that contain code themselves.") (sbcl-package->ecl-package sbcl-pythonic-string-reader)) (define-public sbcl-slime-swank - (package - (name "sbcl-slime-swank") - (version "2.28") - (source - (origin - (file-name (git-file-name "cl-slime-swank" version)) - (method git-fetch) - (uri (git-reference - (url "https://github.com/slime/slime/") - (commit (string-append "v" version)))) - (sha256 - (base32 "1acmm4w1mv1qzpnkgc4wyiilbx8l0dk16sx8wv815ri5ks289rll")) - (modules '((guix build utils))) + (let ((commit "735258a26bb97e85d25f39e4bef83c1f80c12f5d") + (revision "1")) + (package + (name "sbcl-slime-swank") + (version (git-version "2.28" revision commit)) + (source + (origin + (file-name (git-file-name "cl-slime-swank" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/slime/slime/") + (commit commit))) + (sha256 + (base32 "0prskgzfqjmn8sc7p9nklnd0n1plwcvh40slgh23km31raplmzk7")) + (modules '((guix build utils))) (snippet ;; The doc folder drags `gawk' into the closure. Doc is already ;; provided by emacs-slime. `(begin (delete-file-recursively "doc") #t)))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:asd-systems '("swank") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-fasl-directory - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib-dir (string-append out "/lib/common-lisp/" - (%lisp-type) - "/slime-swank/"))) - ;; Use the ASDF registry instead of Swank's default that places - ;; the .fasl files in ~/.slime. - (substitute* "swank.asd" - (("\\(load \\(asdf::component-pathname f\\)\\)" all) - (string-append - all "\n" - "(setf (symbol-value" - "(read-from-string \"swank-loader::*fasl-directory*\"))" - "\"" lib-dir "\")"))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-systems '("swank" "swank/exts") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-fasl-directory + (lambda* (#:key outputs #:allow-other-keys) (substitute* "swank-loader.lisp" (("\\(probe-file fasl\\)" all) ;; Do not try to delete Guix store files. (string-append all "\n" " (not (equal (subseq (pathname-directory fasl) 1 3)" - " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH"))))))))) - (home-page "https://github.com/slime/slime") - (synopsis "Common Lisp Swank server") - (description - "This is only useful if you want to start a Swank server in a Lisp + " '(\"gnu\" \"store\"))) ; XXX: GUIX PATCH")))))))) + (home-page "https://github.com/slime/slime") + (synopsis "Common Lisp Swank server") + (description + "This is only useful if you want to start a Swank server in a Lisp processes that doesn't run under Emacs. Lisp processes created by @command{M-x slime} automatically start the server.") - (license (list license:gpl2+ license:public-domain)))) + (license (list license:gpl2+ license:public-domain))))) (define-public cl-slime-swank - (let ((pkg (sbcl-package->cl-source-package sbcl-slime-swank))) - (package - (inherit pkg) - (arguments - (substitute-keyword-arguments (package-arguments pkg) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'revert-asd-patch - ;; We do not want to include the Guix patch in the cl- package - ;; since it would include the sbcl- package in the closure. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (source-path (string-append out "/share/common-lisp/source/"))) - (substitute* (string-append source-path "/cl-slime-swank/swank.asd") - ((".*fasl-directory.*") "")))))))))))) + (sbcl-package->cl-source-package sbcl-slime-swank)) (define-public ecl-slime-swank (sbcl-package->ecl-package sbcl-slime-swank)) @@ -5024,7 +5050,7 @@ is a library for creating graphical user interfaces.") (define-public sbcl-cl-webkit (package (name "sbcl-cl-webkit") - (version "3.5.9") + (version "3.5.10") (source (origin (method git-fetch) @@ -5034,7 +5060,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "00h61p5mrvvbycp703isy0wvgqlfb7k0cidw4vg75y7s29m3k6k0")))) + "0bn8idvbi58kg0g76lanvjzkgnkcy41yn9vbp7f80q9fa7w892rq")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) @@ -5531,8 +5557,8 @@ client and server.") (sbcl-package->cl-source-package sbcl-trivial-arguments)) (define-public sbcl-trivial-clipboard - (let ((commit "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b") - (revision "6")) + (let ((commit "aee67d6132a46237f61d508ae4bd9ff44032566d") + (revision "7")) (package (name "sbcl-trivial-clipboard") (version (git-version "0.0.0" revision commit)) @@ -5544,7 +5570,7 @@ client and server.") (commit commit))) (file-name (git-file-name "cl-trivial-clipboard" version)) (sha256 - (base32 "04qmm69zyx8rs23pfhgzgxn0j108byv3b7skfdv0h01a76wlhplz")))) + (base32 "029qmx523xfk54p99ndgbmdd20s5i32mzpf77xymngrn4c33v9jk")))) (build-system asdf-build-system/sbcl) (inputs ;; Pick xsel instead of xclip because its closure size is slightly @@ -5581,8 +5607,8 @@ client and server.") (sbcl-package->ecl-package sbcl-trivial-clipboard)) (define-public sbcl-trivial-backtrace - (let ((commit "6eb65bde7229413040c81d42ea22f0e4c9c8cfc9") - (revision "1")) + (let ((commit "7f90b4a4144775cca0728791e4b92ac2557b07a1") + (revision "2")) (package (name "sbcl-trivial-backtrace") (version (git-version "1.1.0" revision commit)) @@ -5590,11 +5616,11 @@ client and server.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-backtrace") + (url "https://github.com/hraban/trivial-backtrace") (commit commit))) (file-name (git-file-name "trivial-backtrace" version)) (sha256 - (base32 "1mbaqiwj5034iw6jzw30jyhwzp1pvhnz1zcy0lns0z5j2h9ldapw")))) + (base32 "11j0p3vgmnn5q84xw7sacr5p3cvff2hfhsh2is8xpm2iwxc723kn")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -7710,8 +7736,8 @@ CPython implementation of Python) and Common Lisp.") (sbcl-package->ecl-package sbcl-burgled-batteries3)) (define-public sbcl-metabang-bind - (let ((commit "c93b7f7e1c18c954c2283efd6a7fdab36746ab5e") - (revision "1")) + (let ((commit "08196426cb099db0623e6cae2aeca566e0b788b2") + (revision "2")) (package (name "sbcl-metabang-bind") (version (git-version "0.8.0" revision commit)) @@ -7719,12 +7745,12 @@ CPython implementation of Python) and Common Lisp.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metabang-bind") + (url "https://github.com/hraban/metabang-bind") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0hd0kr91795v77akpbcyqiss9p0p7ypa9dznrllincnmgvsxlmf0")))) + "14g7k3zhm8cd6bssc5mm5h6iq1dv5lfhiq33aimcmj5a6vbiq47d")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -9200,8 +9226,8 @@ discontiguous ranges of time.") (sbcl-package->ecl-package sbcl-periods)) (define-public sbcl-metatilities-base - (let ((commit "6eaa9e3ff0939a93a92109dd0fcd218de85417d5") - (revision "1")) + (let ((commit "ef04337759972fd622c9b27b53149f3d594a841f") + (revision "2")) (package (name "sbcl-metatilities-base") (version (git-version "0.6.6" revision commit)) @@ -9209,12 +9235,12 @@ discontiguous ranges of time.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metatilities-base") + (url "https://github.com/hraban/metatilities-base") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "0xpa86pdzlnf4v5g64j3ifaplx71sx2ha8b7vvakswi652679ma0")))) + "069rk5ncwvjnnzvvky6xiriynl72yzvjpnzl6jw9jf3b8na14zrk")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -9232,8 +9258,8 @@ which implements a set of utilities.") (sbcl-package->ecl-package sbcl-metatilities-base)) (define-public sbcl-cl-containers - (let ((commit "3d1df53c22403121bffb5d553cf7acb1503850e7") - (revision "3")) + (let ((commit "781ebfe0888bae46f07c018f7d473898b1bd4f5f") + (revision "4")) (package (name "sbcl-cl-containers") (version (git-version "0.12.1" revision commit)) @@ -9241,12 +9267,12 @@ which implements a set of utilities.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-containers") + (url "https://github.com/hraban/cl-containers") (commit commit))) (file-name (git-file-name "cl-containers" version)) (sha256 (base32 - "18s6jfq11n8nv9k4biz32pm1s7y9zl054ry1gmdbcf39nisy377y")))) + "1nrql8s1j123v5gscy99lxvhlzp0ijig9x94w30v3lwfa58hf90l")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lift)) @@ -10493,6 +10519,36 @@ as readmes, documentation files, and docstrings.") (define-public ecl-staple (sbcl-package->ecl-package sbcl-staple)) +(define-public sbcl-helambdap + (let ((commit "5bf65f57a36ee094cadb096caca6e90eb3ba46c4") + (revision "0")) + (package + (name "sbcl-helambdap") + (version (git-version "20220103" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/helambdap/code") + (commit commit))) + (file-name (git-file-name "cl-helambdap" version)) + (sha256 + (base32 "1kzapbf9l2bw8i9m9sxv0dfnkksrxq81d5hbn34pm25abk0i937j")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-cl-fad + sbcl-clad + sbcl-split-sequence + sbcl-xhtmlambda)) + (synopsis "Common Lisp documentation system") + (description "HELambdap is a Common Lisp documentation system which +strives to be simple to use, yet easily customizable.") + (home-page "https://helambdap.sourceforge.net") + (license license:expat)))) + +(define-public cl-helambdap + (sbcl-package->cl-source-package sbcl-helambdap)) + (define-public sbcl-form-fiddle (let ((commit "e0c23599dbb8cff3e83e012f3d86d0764188ad18") (revision "0")) @@ -10594,6 +10650,74 @@ LASS files.") (define-public ecl-lass (sbcl-package->ecl-package sbcl-lass)) +(define-public sbcl-xhtmlambda + (let ((commit "c86376bccebf77ca428e8033df2ba7d8450ea1e8") + (revision "0")) + (package + (name "sbcl-xhtmlambda") + (version + ;; The source repository doesn't provide any version nor revision, but + ;; a timestamp + (git-version "2022-01-21" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/xhtmlambda/XHTMLambda") + (commit commit))) + (file-name (git-file-name "cl-xhtmlambda" version)) + (sha256 + (base32 "0narbzz06ry1wn048avm1fwihvnjvvc4wfcv5hmdazkilpvnqz2y")))) + (build-system asdf-build-system/sbcl) + (inputs (list sbcl-cl-unicode)) + (synopsis "(X)HTML library for Common Lisp") + (description + "(X)HTMLambda is yet another (X)HTML library which +emphasizes programmability and user-friendliness. Each (X)HTML element is a +structured object and pretty-printing of (X)HTML trees is well defined to +provide properly indented human-readable output even for complex recursive +arrangements.") + (home-page "https://xhtmlambda.common-lisp.dev/") + (license license:expat)))) + +(define-public cl-xhtmlambda + (sbcl-package->cl-source-package sbcl-xhtmlambda)) + +(define-public sbcl-clad + (let ((commit "1ff6f417d4ee3836d1edd96923d4b03f3cafa849") + (revision "0")) + (package + (name "sbcl-clad") + (version + ;; There's no version, but there's a timestamp + (git-version "2023-01-21" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/mantoniotti/CLAD") + (commit commit))) + (file-name (git-file-name "cl-clad" version)) + (sha256 + (base32 "184mhdq7pxd6hd4rzv8z4lfbwnkyhgm5bdn3xsqaav2j0d1dqm6i")) + (modules '((guix build utils))) + (snippet + ;; Delete compiled ABCL files. + '(begin + (delete-file "clad-package.abcl") + (delete-file "clad.abcl"))))) + (build-system asdf-build-system/sbcl) + (synopsis "Library providing standard locations on the file system") + (description + "The Common Lisp Application Directories (CLAD) library is +a simple API collection that provides access to a set of @emph{standard} +Common Lisp folders on a per-application or per-library basis.") + (home-page "https://gitlab.common-lisp.net/mantoniotti/CLAD") + (license license:expat)))) ;the mit-modern-variant is used + +(define-public cl-clad + (sbcl-package->cl-source-package sbcl-clad)) + (define-public sbcl-plump (let ((commit "0c3e0b57b43b6e0c5794b6a902f1cf5bee2a2927") (revision "3")) @@ -12017,6 +12141,50 @@ for reading and writing JPEG image files.") (define-public ecl-cl-jpeg (sbcl-package->ecl-package sbcl-cl-jpeg)) +(define-public sbcl-jpeg-turbo + (let ((commit "f79c646cc266c107bdace53572a31664754c6e0c") + (revision "1")) + (package + (name "sbcl-jpeg-turbo") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shamazmazum/jpeg-turbo/") + (commit commit))) + (file-name (git-file-name "cl-jpeg-turbo" version)) + (sha256 + (base32 "1andd1ibbk3224idnpsnrn96flr5d1wm9ja3di57fs04wn577sag")))) + (build-system asdf-build-system/sbcl) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-lib-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/jpeg-turbo.lisp" + (("\"libturbojpeg\\.so\\.0\"") + (string-append "\"" + (search-input-file inputs + "/lib/libturbojpeg.so") + "\"")))))))) + (native-inputs + (list sbcl-fiveam)) + (inputs + (list libjpeg-turbo sbcl-cffi)) + (synopsis "Common Lisp wrapper for libjpeg-turbo") + (description + "This is a Common Lisp wrapper for libjpeg-turbo library which provides +TurboJPEG API for compressing and decompressing JPEG images.") + (home-page "https://github.com/shamazmazum/jpeg-turbo/") + (license license:bsd-2)))) + +(define-public cl-jpeg-turbo + (sbcl-package->cl-source-package sbcl-jpeg-turbo)) + +(define-public ecl-cl-jpeg-turbo + (sbcl-package->ecl-package sbcl-jpeg-turbo)) + (define-public sbcl-png (let ((commit "11b965fe378fd0561abe3616b18ff03af5179648") (revision "1")) @@ -12091,11 +12259,11 @@ Scalable Vector Graphics files.") (sbcl-package->cl-source-package sbcl-cl-svg)) (define-public sbcl-nodgui - (let ((commit "b1d15fa9cca8550926f7823dbdd8be3b34387f1a") - (revision "2")) + (let ((commit "6baccf45371afd4dcc8cd3f38332b300614783b6") + (revision "1")) (package (name "sbcl-nodgui") - (version (git-version "0.4.8.5" revision commit)) + (version (git-version "0.4.8.6" revision commit)) (source (origin (method git-fetch) @@ -12104,19 +12272,20 @@ Scalable Vector Graphics files.") (commit commit))) (file-name (git-file-name "cl-nodgui" version)) (sha256 - (base32 "1gsxg8igiavs8fr39vgw8ypa42wjqaq9sszwqiifpm7yvq54lls7")))) + (base32 "0fjz8362qmvkbzj9ylyllkdxg7vvj38l3y5qn4xi2gim92x4lx67")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria sbcl-bordeaux-threads sbcl-cl-colors2 - sbcl-cl-jpeg sbcl-cl-ppcre-unicode sbcl-cl-unicode sbcl-clunit2 sbcl-esrap + sbcl-jpeg-turbo sbcl-named-readtables sbcl-parse-number + sbcl-pngload tk tklib)) (arguments @@ -12466,7 +12635,7 @@ them as PNG files.") (define-public sbcl-history-tree (package (name "sbcl-history-tree") - (version "0.1.1") + (version "0.1.2") (source (origin (method git-fetch) @@ -12475,12 +12644,7 @@ them as PNG files.") (commit version))) (file-name (git-file-name "cl-history-tree" version)) (sha256 - (base32 "16fynij438zs4g29m7c0vmkfb0sbaz8gj7zjnxpbgjckbim93qwl")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "nasdf") - #t)))) + (base32 "1n3q6aqh0wm24pksj8371j5iinxpzy2kcnz97kmpndm1yhv4x5f2")))) (build-system asdf-build-system/sbcl) (inputs (list @@ -12489,7 +12653,7 @@ them as PNG files.") sbcl-local-time sbcl-nclasses sbcl-trivial-package-local-nicknames)) - (native-inputs (list sbcl-nasdf sbcl-lisp-unit2)) + (native-inputs (list sbcl-lisp-unit2)) (home-page "https://github.com/atlas-engineer/history-tree") (synopsis "Store the history of a browser's visited paths") (description @@ -16979,12 +17143,21 @@ not so easy to copy (ssyntax, argument destructuring, etc.).") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/trivial-shell") + (url "https://github.com/hraban/trivial-shell") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "08mpkl5ij5sjfsyn8pq2kvsvpvyvr7ha1r8g1224fa667b8k2q85")))) (build-system asdf-build-system/sbcl) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "dev/definitions.lisp" + (("/bin/sh") + (which "sh")))))))) (native-inputs (list sbcl-lift)) (home-page "https://common-lisp.net/project/trivial-shell/") @@ -17569,31 +17742,34 @@ It aims to be implementation-agnostic and to climb the syntax trees.") (sbcl-package->ecl-package sbcl-agnostic-lizard)) (define-public sbcl-dynamic-classes - (package - (name "sbcl-dynamic-classes") - (version "1.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gwkkwg/dynamic-classes") - (commit (string-append "version-" version)))) - (file-name (git-file-name "dynamic-classes" version)) - (sha256 - (base32 "1z3ag6w4ff0v6715xa9zhvwjqnp4i6zrjfmxdz8m115sklbwgm6c")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("metatilities-base" ,sbcl-metatilities-base))) - (arguments - ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing - ;; test suites. lift-standard.config contains referances to deprecated - ;; functionality. - `(#:tests? #f)) - (home-page "https://common-lisp.net/project/dynamic-classes/") - (synopsis "Dynamic class definition for Common Lisp") - (description "Dynamic-Classes helps to ease the prototyping process by + (let ((commit "ebd7405603f67b16e8f2bc08ce8e2bcfcf439501") + (revision "0")) + (package + (name "sbcl-dynamic-classes") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hraban/dynamic-classes") + (commit commit))) + (file-name (git-file-name "dynamic-classes" version)) + (sha256 + (base32 "1k9lkchwyi2xhygp2v8ifq3kg1l3wcnihhzgr06jrivjxgdqpc1a")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("metatilities-base" ,sbcl-metatilities-base))) + (arguments + ;; NOTE: (Sharlatan-20210106222900+0000) Circular dependencies and failing + ;; test suites. lift-standard.config contains referances to deprecated + ;; functionality. + ;; See https://github.com/hraban/dynamic-classes/issues/2 + `(#:tests? #f)) + (home-page "https://common-lisp.net/project/dynamic-classes/") + (synopsis "Dynamic class definition for Common Lisp") + (description "Dynamic-Classes helps to ease the prototyping process by bringing dynamism to class definition.") - (license license:expat))) + (license license:expat)))) (define-public ecl-dynamic-classes (sbcl-package->ecl-package sbcl-dynamic-classes)) @@ -17602,41 +17778,47 @@ bringing dynamism to class definition.") (sbcl-package->cl-source-package sbcl-dynamic-classes)) (define-public sbcl-cl-markdown - ;; NOTE: (Sharlatan-20210106214629+0000) latest version tag - ;; "version-0.10.6_version-0.10.6" is failing to build due to missing system - ;; #:container-dynamic-classes - (package - (name "sbcl-cl-markdown") - (version "0.10.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gwkkwg/cl-markdown") - (commit (string-append "version-" version)))) - (file-name (git-file-name "cl-markdown" version)) - (sha256 - (base32 "1wdjbdd1zyskxf7zlilcp6fmwkivybj0wjp64vvzb265d5xi7p8p")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("anaphora" ,sbcl-anaphora) - ("cl-containers" ,sbcl-cl-containers) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("dynamic-classes" ,sbcl-dynamic-classes) - ("metabang-bind" ,sbcl-metabang-bind) - ("metatilities-base" ,sbcl-metatilities-base))) - (arguments - ;; NOTE: (Sharlatan-20210107213629+0000) Tests depend on too many not - ;; available systems, which themself are abandoned. - `(#:tests? #f)) - (home-page "https://common-lisp.net/project/cl-markdown/") - (synopsis "Common Lisp rewrite of Markdown") - (description - "This is an implementation of a Markdown parser in Common Lisp.") - (license license:expat))) + ;; The latest changes with fixes are not released yet, see + ;; https://github.com/hraban/cl-markdown/issues/9 + (let ((commit "3788802199228b49d0e06c3feb80c1c22af05cfc") + (revision "0")) + (package + (name "sbcl-cl-markdown") + (version (git-version "0.10.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hraban/cl-markdown") + (commit commit))) + (file-name (git-file-name "cl-markdown" version)) + (sha256 + (base32 "1algqwmafipyf194cx9wfhg0pdx1ppx6s444p1pm8yaycbsyla1v")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-lift sbcl-trivial-shell)) + (inputs + (list sbcl-anaphora + sbcl-cl-containers + sbcl-cl-ppcre + sbcl-dynamic-classes + sbcl-metabang-bind + sbcl-metatilities-base)) + (home-page "https://common-lisp.net/project/cl-markdown/") + (synopsis "Common Lisp rewrite of Markdown") + (description + "This is an implementation of a Markdown parser in Common Lisp.") + (license license:expat)))) (define-public ecl-cl-markdown - (sbcl-package->ecl-package sbcl-cl-markdown)) + (let ((pkg (sbcl-package->ecl-package sbcl-cl-markdown))) + (package + (inherit pkg) + (arguments + ;; XXX: Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is + ;; undefined" on ECL. + ;; See https://github.com/hraban/cl-markdown/issues/11 + '(#:tests? #f))))) (define-public cl-markdown (sbcl-package->cl-source-package sbcl-cl-markdown)) @@ -18399,8 +18581,8 @@ building Jupyter kernels, based on Maxima-Jupyter which was based on (sbcl-package->cl-source-package sbcl-common-lisp-jupyter)) (define-public sbcl-radiance - (let ((commit "a7237831970edfd330dddd5b347d3d1277853bf0") - (revision "2")) + (let ((commit "8d826c7fe1935338565580931db43f46181e0e85") + (revision "3")) (package (name "sbcl-radiance") (version (git-version "2.1.2" revision commit)) @@ -18412,7 +18594,7 @@ building Jupyter kernels, based on Maxima-Jupyter which was based on (commit commit))) (file-name (git-file-name "radiance" version)) (sha256 - (base32 "1q4x9mswiizwgr7acl5zi6lkssfg2zajqbdq7xhw1kq6xfnq37j2")))) + (base32 "1j823dgp87www0sjbcbv9j025bfxlkwhjd7kz6635mrqwmmlki4l")))) (build-system asdf-build-system/sbcl) (arguments `(#:tests? #f ; TODO: The tests require some configuration. @@ -18714,7 +18896,7 @@ HTML documents.") (sbcl-package->cl-source-package sbcl-cl-html-diff)) (define-public sbcl-tooter - (let ((commit "2e1b22f0993419c1e7e6d10ead45d7bcafb5b6cb") + (let ((commit "2dcc2facddcacd79d0cce545a8c4b73c35826fc1") (revision "4")) (package (name "sbcl-tooter") @@ -18727,10 +18909,13 @@ HTML documents.") (commit commit))) (file-name (git-file-name "cl-tooter" version)) (sha256 - (base32 "02ys58gzasvk7r84jmz6k522qcw2hkbgv8p0ax5i8dggjhr04cz2")))) + (base32 "1zisrmslj4rnibm02vxh7hbas2cfsjh6iizs2nfdg3a3pn7bhf6h")))) (build-system asdf-build-system/sbcl) (inputs - (list sbcl-cl-ppcre sbcl-documentation-utils sbcl-drakma + (list sbcl-alexandria + sbcl-cl-ppcre + sbcl-documentation-utils + sbcl-drakma sbcl-yason)) (synopsis "Common Lisp client library for Mastodon instances") (description @@ -18748,7 +18933,7 @@ protocol for Mastodon.") (define-public sbcl-croatoan (package (name "sbcl-croatoan") - (version "0.1") + (version "0.2") (source (origin (method git-fetch) @@ -18757,7 +18942,7 @@ protocol for Mastodon.") (commit (string-append "v" version)))) (file-name (git-file-name "cl-croatoan" version)) (sha256 - (base32 "1whbvwc4df7zz0002xy3aczrpf4s3vk6kmyh9wydgwl112h060pd")))) + (base32 "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg")))) (build-system asdf-build-system/sbcl) (arguments '(#:phases @@ -19363,7 +19548,7 @@ immediately loaded.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/cl-mathstats") + (url "https://github.com/hraban/cl-mathstats") (commit commit))) (file-name (git-file-name "cl-mathstats" version)) (sha256 @@ -19373,7 +19558,7 @@ immediately loaded.") (list sbcl-lift)) (inputs (list sbcl-cl-containers sbcl-metatilities-base)) - (home-page "https://github.com/gwkkwg/cl-mathstats") + (home-page "https://github.com/hraban/cl-mathstats") (synopsis "Common Lisp collection of mathematical routines") (description "This package provides Common Lisp math and statistics routines.") @@ -21101,8 +21286,8 @@ running into parallelism problems when having to change directory.") (sbcl-package->cl-source-package sbcl-simple-inferiors)) (define-public sbcl-metacopy - (let ((commit "1b5bf443206cc1dea7801ae23d1167bd02122d30") - (revision "1")) + (let ((commit "df7856f2a43fa91124fe780ef22f792040bc130c") + (revision "2")) (package (name "sbcl-metacopy") (version (git-version "0.2.0" revision commit)) @@ -21110,27 +21295,27 @@ running into parallelism problems when having to change directory.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/gwkkwg/metacopy") + ;; Upstream changed the maintaner. + ;; legacy https://github.com/gwkkwg/metacopy + (url "https://github.com/hraban/metacopy") (commit commit))) (file-name (git-file-name "cl-metacopy" version)) (sha256 - (base32 "1rzp112djgw5n76s6hy2aq92bc43p0zd5bgzvqwvgvws4pls42s9")))) + (base32 "0l5ryg8pvqz9sn9s8bsvd0plvcnm7crsx86iqk5wxblkialaizip")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-asdf-system-connections sbcl-lift)) (inputs (list sbcl-contextl sbcl-moptilities)) - (home-page "https://github.com/gwkkwg/metacopy") + (home-page "https://github.com/hraban/metacopy") (synopsis "Flexible Common Lisp shallow/deep copy mechanism") (description "This package provides a flexible shallow/deep copy mechanism for Common Lisp.") (license license:expat)))) -;; NOTE: (Sharlatan-20221112T214131+0000): There is no ecl-moptilities variable -;; required for tests. -;; -;; ecl-metacopy +(define-public ecl-metacopy + (sbcl-package->ecl-package sbcl-metacopy)) (define-public cl-metacopy (sbcl-package->cl-source-package sbcl-metacopy)) @@ -25714,7 +25899,7 @@ JavaScript code.") (define-public sbcl-nhooks (package (name "sbcl-nhooks") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) @@ -25724,7 +25909,7 @@ JavaScript code.") (file-name (git-file-name "cl-nhooks" version)) (sha256 (base32 - "10ym4ybda2l426flicqz0f4yg7fbw7yjk1k0wqpf4wfk24gm1b8g")))) + "1m9dfp7wjm8k16x45qnw258ca8gnic3k2ik79sdn5gxcx6qxy3g8")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-serapeum)) @@ -25800,7 +25985,7 @@ access lexicographic data from WordNet.") (define-public sbcl-nfiles (package (name "sbcl-nfiles") - (version "1.1.3") + (version "1.1.4") (source (origin (method git-fetch) @@ -25810,12 +25995,7 @@ access lexicographic data from WordNet.") (file-name (git-file-name "cl-nfiles" version)) (sha256 (base32 - "1rndrxqb16wfbi5zkg8gbqm163xhs31ka0algsxvrhb9kf2j8c4q")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "nasdf") - #t)))) + "1a8zsphbbl9r4sdm95kgm4ljd9b148c9fnwlq7f930fh9826kf72")))) (build-system asdf-build-system/sbcl) (inputs (list gnupg @@ -25827,8 +26007,7 @@ access lexicographic data from WordNet.") sbcl-trivial-package-local-nicknames sbcl-trivial-types)) (native-inputs - (list sbcl-lisp-unit2 - sbcl-nasdf)) + (list sbcl-lisp-unit2)) (arguments `(#:phases (modify-phases %standard-phases @@ -25925,7 +26104,7 @@ desktop files to the right directories. (define-public sbcl-nclasses (package (name "sbcl-nclasses") - (version "0.6.0") + (version "0.6.1") (source (origin (method git-fetch) @@ -25935,18 +26114,12 @@ desktop files to the right directories. (file-name (git-file-name "cl-nclasses" version)) (sha256 (base32 - "0kp5wim5frr4l52rgchaz1cj74daqngagrz3r0lgasii6bwlzsi6")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "nasdf") - #t)))) + "00is7fg1jsj9r3jawphbk5gh8kmiixl7g60xg1ic2q2cpilfd1by")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-moptilities)) (native-inputs - (list sbcl-lisp-unit2 - sbcl-nasdf)) + (list sbcl-lisp-unit2)) (home-page "https://github.com/atlas-engineer/nclasses") (synopsis "Simplify class, condition, and generic function definitions.") (description @@ -25966,22 +26139,17 @@ extra features like type inference.") (define-public sbcl-prompter (package (name "sbcl-prompter") - (version "0.1.0") + (version "0.1.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/atlas-engineer/prompter") (commit version))) - (file-name (git-file-name "prompter" version)) + (file-name (git-file-name "cl-prompter" version)) (sha256 (base32 - "1489qg99n5bpl9b88pq3smnw5l9hrq08sbnabvavv3jcd4pzpsqf")) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "nasdf") - #t)))) + "008bq36siza9qwmz6b1pvpm53lxmzryahnhy372l18gl3180in03")))) (build-system asdf-build-system/sbcl) (inputs (list @@ -25996,37 +26164,23 @@ extra features like type inference.") sbcl-serapeum sbcl-trivial-package-local-nicknames)) (native-inputs - (list sbcl-lisp-unit2 - sbcl-nasdf)) + (list sbcl-lisp-unit2)) (home-page "https://github.com/atlas-engineer/prompter") (synopsis "Live-narrowing, fuzzy-matching, extensible prompt framework") (description "This prompter library is heavily inspired by Emacs' minibuffer and Helm (@url{https://emacs-helm.github.io/helm/}). It only deals with the -backend side of things, it does not handle any display. - -Non-exhaustive list of features: - -@itemize -@item Asynchronous suggestion computation. -@item Multiple sources. -@item Multiple return actions. -@item Customizable matching and sorting. -@item Multiple attributes to match and display (also known as 'multiple column -display'). -@item Customizable initialization and cleanup functions. -@item Notifications sent when suggestion list is updated. -@item Per-source history. -@item Resumable prompters. -@item Marks actions (event-driven on marks change). -@item Current suggestion actions (event-driven on current suggestion change). -@item Automatically return the prompt when narrowed down to a single suggestion. -@end itemize\n") +backend side of things, it does not handle any display. Features include +asynchronous suggestion computation, multiple sources, actions and resumable +prompters.") (license license:bsd-3))) (define-public cl-prompter (sbcl-package->cl-source-package sbcl-prompter)) +(define-public ecl-prompter + (sbcl-package->ecl-package sbcl-prompter)) + (define-public sbcl-cl-template (let ((commit "46193a9a389bb950530e579eae7e6e5a18184832") (revision "0")) @@ -26581,7 +26735,7 @@ in a native template application).") (define-public sbcl-nkeymaps (package (name "sbcl-nkeymaps") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -26590,7 +26744,7 @@ in a native template application).") (commit version))) (file-name (git-file-name "cl-nkeymaps" version)) (sha256 - (base32 "08q3bmb3i7mjpm83msp1qgpifpzf019ggikbxwc2dk04i3c2w0vv")))) + (base32 "179hrnkn3pkwkp4ap6ax0zgp7xcr9cq7icff42r79gh43ri3kpzy")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria @@ -26653,10 +26807,52 @@ instead of #'FOO. (define-public ecl-nkeymaps (sbcl-package->ecl-package sbcl-nkeymaps)) +(define-public sbcl-xkbcommon + (let ((commit "aa9513d93f42d7816f88dd1bd8bd21375e7d7512") + (revision "0")) + (package + (name "sbcl-xkbcommon") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sdilts/cl-xkbcommon") + (commit commit))) + (file-name (git-file-name "cl-xkbcommon" version)) + (sha256 + (base32 "02zdbkh7yliw9vg8i8wx2xgcpfni0fr4z0w19kkxvaib8xm9rx1q")))) + (build-system asdf-build-system/sbcl) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "xkbcommon.lisp" + (("libxkbcommon.so.0") + (search-input-file inputs "/lib/libxkbcommon.so")))))))) + (native-inputs + (list pkg-config)) + (inputs + (list libxkbcommon + sbcl-cffi)) + (home-page "https://github.com/sdilts/cl-xkbcommon") + (synopsis "Common Lisp FFI bindings for xkbcommon") + (description + "This package provides Common Lisp FFI bindings for xkbcommon +(libxkbcommon) using cffi-grovel.") + (license license:expat)))) + +(define-public cl-xkbcommon + (sbcl-package->cl-source-package sbcl-xkbcommon)) + +(define-public ecl-xkbcommon + (sbcl-package->ecl-package sbcl-xkbcommon)) + (define-public sbcl-njson (package (name "sbcl-njson") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -26665,7 +26861,7 @@ instead of #'FOO. (file-name (git-file-name "cl-njson" version)) (sha256 (base32 - "0p3zvn3jfzcdzpvikdaw3g14wfsklq0msw0rjaxin3aa7vmqpyqk")))) + "05v5bk3l47mds4ihxs8jlqm19gqq7hb4q0161bgg99w9847l63lk")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-cl-json sbcl-jzon)) (native-inputs (list sbcl-lisp-unit2)) @@ -26763,7 +26959,7 @@ JSON handling. Load the parser backend you prefer! (define-public sbcl-nsymbols (package (name "sbcl-nsymbols") - (version "0.3.1") + (version "0.3.2") (source (origin (method git-fetch) @@ -26772,7 +26968,7 @@ JSON handling. Load the parser backend you prefer! (commit version))) (file-name (git-file-name "cl-nsymbols" version)) (sha256 - (base32 "14zdwsk2nrismj3xb54kfpgcdcsdzw3fyd7zwxlsir66lv9w9ji9")))) + (base32 "1awh793s4fwhddllfcjz4sbkxwinh5w54s3glxh7rv00c7skdjd6")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-lisp-unit2)) (inputs (list cl-closer-mop)) @@ -27386,6 +27582,54 @@ definition.") (define-public ecl-slot-extra-options (sbcl-package->ecl-package sbcl-slot-extra-options)) +(define-public sbcl-slite + (let ((commit "942a95330592d30be5ac02fb1b697fb14ccbf1af") + (revision "0")) + (package + (name "sbcl-slite") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdrhq/slite/") + (commit commit))) + (file-name (git-file-name "slite" version)) + (sha256 + (base32 "0b4c4vs1zlhcvr9flv8bx76v9hrwc9qmazmp60407q7cghn0k8zk")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-cl-str + sbcl-fiveam + sbcl-parachute + sbcl-lisp-unit2)) + (home-page "https://github.com/tdrhq/slite") + (synopsis "Common Lisp system for Slite ") + (description + "This package provides the Common Lisp part of the emacs-slite test runner.") + (license license:asl2.0)))) + +(define-public cl-slite + (sbcl-package->cl-source-package sbcl-slite)) + +(define-public ecl-slite + (sbcl-package->ecl-package sbcl-slite)) + +(define-public emacs-slite + (package + (inherit sbcl-slite) + (name "emacs-slite") + (build-system emacs-build-system) + (synopsis "SLIme-based TEst runner for FiveAM and Parachute Tests") + (description + "Slite interactively runs your Common Lisp tests (currently only FiveAM +and Parachute are supported). It allows you to see the summary of test +failures, jump to test definitions, rerun tests with debugger all from inside +Emacs. + +In order to work, this also requires the slite Common Lisp system to be +present. See the code@{*cl-slite packages}."))) + (define-public sbcl-parseq (package (name "sbcl-parseq") diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index c54a9b4b3a..35f041c8e0 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -999,7 +999,7 @@ the HTML documentation of TXR.") (define-public txr (package (name "txr") - (version "291") + (version "292") (source (origin (method git-fetch) @@ -1008,7 +1008,7 @@ the HTML documentation of TXR.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nsb302arpd2mw2z2l12j6yg9pp94lfb79h3sym72ih7rmklnfx7")))) + (base32 "0lly446pinfrr5d4rgsas8c7kqal2g03bbsbmn0yvhvazb39c15g")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -1061,8 +1061,9 @@ the HTML documentation of TXR.") '("txr-manpage.html" "txr-manpage.pdf"))))) (add-after 'install 'install-vim-files (lambda _ - (let ((syntax (string-append #$output - "/share/vim/vimfiles/syntax"))) + (let ((syntax (string-append + #$output + "/share/vim/vimfiles/pack/guix/start/txr/syntax"))) (install-file "tl.vim" syntax) (install-file "txr.vim" syntax))))))) (native-inputs @@ -1246,7 +1247,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.29.1") + (version "1.32.1") (source (origin (method git-fetch) @@ -1255,7 +1256,7 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18684mxnb0jk63mkzi36zlmd8rjjv0msx3xxpmn67mhrnwz4x861")))) + (base32 "1nnqbpql6749597m0lp56i2zqm003pg690399l0g8kb9kwvpv1yv")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -1439,7 +1440,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.") (define-public eisl (package (name "eisl") - (version "3.00") + (version "3.50") (source (origin (method git-fetch) @@ -1448,7 +1449,7 @@ executable Common Lisp image. It is similar to cl-launch and hu.dwim.build.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nppbzfdx4cjy72b4n0yk177i7063a0nhsrs9b1y45y4avbrbl00")))) + (base32 "18alxwpvkcjfm63bc5kp6nn8351fl0p0ccxc8j9a7nb3fmg4fvyb")))) (build-system gnu-build-system) (inputs (list bash-minimal freeglut gdbm libiconv ncurses tcl tk)) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index daff67f7f2..56e2279f69 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Dennis Mungai <dmngaie@gmail.com> -;;; Copyright © 2016, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016, 2018, 2019, 2020, 2021, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> @@ -26,6 +26,7 @@ ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> +;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,11 +73,13 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages swig) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (make-lld-wrapper - system->llvm-target)) + system->llvm-target + clang-properties)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -85,19 +88,32 @@ "Return the LLVM target name that corresponds to SYSTEM, a system type such as \"x86_64-linux\"." ;; See the 'lib/Target' directory of LLVM for a list of supported targets. + (match (system->llvm-target-arch system) + ("RISCV64" "RISCV") + ("X86_64" "X86") + (x x))) + +(define* (system->llvm-target-arch #:optional + (system (or (and=> (%current-target-system) + gnu-triplet->nix-system) + (%current-system)))) + "Return the LLVM target arch name that corresponds to SYSTEM, a system type such +as \"x86_64-linux\"." + ;; See the 'cmake/config-ix.cmake' file of LLVM for a list of supported targets arch. + ;; start with # Determine the native architecture. (letrec-syntax ((matches (syntax-rules (=>) ((_ (system-prefix => target) rest ...) (if (string-prefix? system-prefix system) target (matches rest ...))) ((_) - (error "LLVM target for system is unknown" system))))) + (error "LLVM target arch for system is unknown" system))))) (matches ("aarch64" => "AArch64") ("armhf" => "ARM") ("mips64el" => "Mips") ("powerpc" => "PowerPC") - ("riscv" => "RISCV") - ("x86_64" => "X86") + ("riscv64" => "RISCV64") + ("x86_64" => "X86_64") ("i686" => "X86") ("i586" => "X86")))) @@ -126,9 +142,19 @@ as \"x86_64-linux\"." (patches (map search-patch patches))) (llvm-monorepo (package-version llvm)))) (build-system cmake-build-system) - (native-inputs (package-native-inputs llvm)) + (native-inputs + (if (version>=? version "15") + ;; TODO: Remove this when GCC 12 is the default. + ;; libfuzzer fails to build with GCC 11 + (modify-inputs (package-native-inputs llvm) + (prepend gcc-12)) + (package-native-inputs llvm))) (inputs - (list llvm)) + (append + (list llvm) + (if (version>=? version "15") + (list libffi) + '()))) (arguments `(;; Don't use '-g' during the build to save space. #:build-type "Release" @@ -137,6 +163,11 @@ as \"x86_64-linux\"." (ice-9 match) ,@%cmake-build-system-modules) #:phases (modify-phases (@ (guix build cmake-build-system) %standard-phases) + ,@(if hash + '() + '((add-after 'unpack 'change-directory + (lambda _ + (chdir "compiler-rt"))))) (add-after 'set-paths 'hide-glibc ;; Work around https://issues.guix.info/issue/36882. We need to ;; remove glibc from CPLUS_INCLUDE_PATH so that the one hardcoded @@ -329,6 +360,15 @@ until LLVM/Clang 14." (("@GLIBC_LIBDIR@") (string-append libc "/lib")))))) #t))) + ,@(if (version>=? version "17") + '((add-after 'unpack 'include-test-runner + (lambda _ + (substitute* "CMakeLists.txt" + ((".*llvm_gtest" line) + (string-append + "add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\ +ttest third-party/unittest)\n" line)))))) + '()) ;; Awkwardly, multiple phases added after the same phase, ;; e.g. unpack, get applied in the reverse order. In other ;; words, adding 'change-directory last means it occurs @@ -561,11 +601,15 @@ output), and Binutils.") (define %llvm-monorepo-hashes '(("14.0.6" . "14f8nlvnmdkp9a9a79wv67jbmafvabczhah8rwnqrgd5g3hfxxxx") - ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2"))) + ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2") + ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky") + ("17.0.5" . "149flpr96vcn7a1ckya6mm93m9yp85l47w156fjd0r99ydxrw5kv"))) (define %llvm-patches '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) - ("15.0.7" . ("clang-15.0-libc-search-path.patch")))) + ("15.0.7" . ("clang-15.0-libc-search-path.patch")) + ("16.0.6" . ("clang-16.0-libc-search-path.patch")) + ("17.0.5" . ("clang-17.0-libc-search-path.patch")))) (define (llvm-monorepo version) (origin @@ -598,7 +642,7 @@ output), and Binutils.") #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (system->llvm-target-arch)) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) '()) @@ -658,7 +702,7 @@ of programming tools as well as libraries with equivalent functionality.") #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (system->llvm-target-arch)) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) '()) @@ -690,34 +734,10 @@ of programming tools as well as libraries with equivalent functionality.") ("perl" ,perl))))) (define-public clang-runtime-15 - (let ((template (clang-runtime-from-llvm llvm-15))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt"))))))) - (native-inputs - (modify-inputs (package-native-inputs template) - (prepend gcc-12))) ;libfuzzer fails to build with GCC 11 - (inputs - (modify-inputs (package-inputs template) - (append libffi)))))) + (clang-runtime-from-llvm llvm-15)) (define-public clang-runtime-14 - (let ((template (clang-runtime-from-llvm llvm-14))) - (package - (inherit template) - (arguments - (substitute-keyword-arguments (package-arguments template) - ((#:phases phases '(@ (guix build cmake-build-system) %standard-phases)) - #~(modify-phases #$phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "compiler-rt")))))))))) + (clang-runtime-from-llvm llvm-14)) (define-public clang-15 (clang-from-llvm @@ -901,7 +921,7 @@ Library.") #$(string-append "-DLLVM_DEFAULT_TARGET_TRIPLE=" (%current-target-system)) #$(string-append "-DLLVM_TARGET_ARCH=" - (system->llvm-target)) + (system->llvm-target-arch)) #$(string-append "-DLLVM_TARGETS_TO_BUILD=" (system->llvm-target))) #~()) @@ -1445,6 +1465,74 @@ Library.") #:legacy-build-shared-libs? #t #:patches '("clang-3.5-libc-search-path.patch"))) +(define-public llvm-16 + (package + (inherit llvm-15) + (version "16.0.6") + (source (llvm-monorepo version)))) + +(define-public clang-runtime-16 + (clang-runtime-from-llvm llvm-16)) + +(define-public clang-16 + (clang-from-llvm + llvm-16 clang-runtime-16 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-16))) + (sha256 + (base32 + "0cbgffciql06a1i0ybyyqbnkkr4g7x8cxaar5a5v3415vd27hk0p"))))) + +(define-public libomp-16 + (package + (inherit libomp-15) + (version (package-version llvm-16)) + (source (llvm-monorepo version)) + (native-inputs + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-16) + (replace "llvm" llvm-16))))) + +(define-public clang-toolchain-16 + (make-clang-toolchain clang-16 libomp-16)) + +(define-public llvm-17 + (package + (inherit llvm-15) + (version "17.0.5") + (source (llvm-monorepo version)))) + +(define-public clang-runtime-17 + (clang-runtime-from-llvm llvm-17)) + +(define-public clang-17 + (clang-from-llvm + llvm-17 clang-runtime-17 + #:tools-extra + (origin + (method url-fetch) + (uri (llvm-uri "clang-tools-extra" + (package-version llvm-17))) + (sha256 + (base32 + "12dbp10bhq25a44qnvz978mf9y6pdycwpp7sgq8a93by0fpgb72r"))))) + +(define-public libomp-17 + (package + (inherit libomp-15) + (version (package-version llvm-17)) + (source (llvm-monorepo version)) + (native-inputs + (modify-inputs (package-native-inputs libomp-15) + (replace "clang" clang-17) + (replace "llvm" llvm-17))))) + +(define-public clang-toolchain-17 + (make-clang-toolchain clang-17 libomp-17)) + ;; Default LLVM and Clang version. (define-public libomp libomp-13) (define-public llvm llvm-13) @@ -1589,6 +1677,20 @@ components which highly leverage existing libraries in the larger LLVM Project." (inputs (modify-inputs (package-inputs lld) (replace "llvm" llvm-11))))) +(define-public lld-16 + (package + (inherit lld-15) + (version (package-version llvm-16)) + (source (llvm-monorepo version)) + (inputs (list llvm-16)))) + +(define-public lld-17 + (package + (inherit lld-15) + (version (package-version llvm-17)) + (source (llvm-monorepo version)) + (inputs (list llvm-17)))) + (define-public lld lld-14) (define* (make-lld-wrapper lld #:key lld-as-ld?) @@ -1846,37 +1948,37 @@ standard C++ library.") (define-public libclc (package (name "libclc") - (version "9.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/llvm/llvm-project") - (commit (string-append "llvmorg-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1d1qayvrvvc1di7s7jfxnjvxq2az4lwq1sw1b2gq2ic0nksvajz0")))) + (version (package-version llvm-15)) + (source (llvm-monorepo version)) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DLLVM_CLANG=" - (assoc-ref %build-inputs "clang") - "/bin/clang") - (string-append "-DPYTHON=" - (assoc-ref %build-inputs "python") - "/bin/python3")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "libclc") #t))))) + (list + #:configure-flags + #~(list (string-append "-DLLVM_CLANG=" + (assoc-ref %build-inputs "clang") + "/bin/clang") + (string-append "-DLLVM_SPIRV=" + (assoc-ref %build-inputs "spirv-llvm-translator") + "/bin/llvm-spirv")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'enter-subdirectory + (lambda _ + (chdir "libclc"))) + (add-after 'enter-subdirectory 'skip-clspv-tests + (lambda _ + (substitute* "CMakeLists.txt" + (("ptx\\.\\*") "[ptx|clspv].*"))))))) + (propagated-inputs + (list spirv-llvm-translator spirv-tools)) (native-inputs - (list clang-9 llvm-9 python)) + (list clang-15 llvm-15 python)) (home-page "https://libclc.llvm.org") (synopsis "Libraries for the OpenCL programming language") (description "This package provides an implementation of the OpenCL library requirements according to version 1.1 of the OpenCL specification.") + (properties `((release-monitoring-url . ,%llvm-release-monitoring-url))) ;; Apache license 2.0 with LLVM exception (license license:asl2.0))) @@ -1957,25 +2059,27 @@ requirements according to version 1.1 of the OpenCL specification.") (build-system python-build-system) (outputs '("out")) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'build 'change-directory - (lambda _ - (chdir "bindings/python"))) - (add-before 'build 'create-setup-py - (lambda _ - ;; Generate a basic "setup.py", enough so it can be - ;; built and installed. - (with-output-to-file "setup.py" - (lambda () - (display "from setuptools import setup -setup(name=\"clang\", packages=[\"clang\"])\n"))))) - (add-before 'build 'set-libclang-file-name - (lambda* (#:key inputs #:allow-other-keys) - ;; Record the absolute file name of libclang.so. - (let ((libclang (search-input-file inputs - "/lib/libclang.so"))) - (substitute* "clang/cindex.py" - (("libclang\\.so") libclang)))))))) + (list + #:phases #~(modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "bindings/python"))) + (add-before 'build 'create-setup-py + (lambda _ + ;; Generate a basic "setup.py", enough so it can be + ;; built and installed. + (with-output-to-file "setup.py" + (lambda () + (format #true "from setuptools import setup +setup(name=\"clang\", version=\"~a\", packages=[\"clang\"])\n" + #$(package-version this-package)))))) + (add-before 'build 'set-libclang-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Record the absolute file name of libclang.so. + (let ((libclang (search-input-file inputs + "/lib/libclang.so"))) + (substitute* "clang/cindex.py" + (("libclang\\.so") libclang)))))))) (inputs (list clang)) (synopsis "Python bindings to libclang"))) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 65cab6511c..1cde6bd66c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1269,6 +1269,39 @@ simplicity, and reach of Lua with the flexibility of a Lisp syntax and macro system.") (license license:expat))) +(define-public antifennel + (package + (version "0.2.0") + (name "antifennel") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~technomancy/antifennel") + (commit version))) + (sha256 + (base32 "1hd9h17q31b3gg88c657zq4han4air2ag55rrakbmcpy6n8acsqc")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (inputs (list luajit)) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (delete 'configure) + ;; Tests pass after the fix introduced by the commit + ;; ecd2169fcad1fa6616fdf6e6a8569f5b866601e5 + (delete 'check) + (replace 'install + (lambda _ + (install-file "antifennel" + (string-append #$output "/bin"))))))) + (home-page "https://git.sr.ht/~technomancy/antifennel") + (synopsis "Turn Lua code into Fennel code") + (description + "This package provides a way to turn Lua code into Fennel code. +This compiler does the opposite of what the Fennel compiler does.") + (license license:expat))) + (define-public fnlfmt (package (name "fnlfmt") diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7a9605bb3b..c10e5c4a55 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -151,6 +151,42 @@ representations and sentence classification.") (inputs (list fasttext)) (native-inputs (list pybind11)))) +(define-public python-funsor + (package + (name "python-funsor") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "funsor" version)) + (sha256 + (base32 "0cgysij0dix0fikyz2x4f8jvaskm5s5a04s07chzaz2dw1fpxdq8")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-makefun python-multipledispatch + python-numpy python-opt-einsum + python-typing-extensions)) + (native-inputs (list python-black + python-flake8 + python-isort + python-nbsphinx + python-pandas + python-pillow + python-pyro-api + python-pytest + python-pytest-xdist + python-requests + python-scipy + python-sphinx + python-sphinx-gallery + python-sphinx-rtd-theme + python-torchvision)) + (home-page "https://github.com/pyro-ppl/funsor") + (synopsis "Tensor-like library for functions and distributions") + (description + "This package provides a tensor-like library for functions and +distributions.") + (license license:asl2.0))) + (define-public fann ;; The last release is >100 commits behind, so we package from git. (let ((commit "d71d54788bee56ba4cf7522801270152da5209d7")) @@ -260,6 +296,42 @@ classification.") (list python)) (synopsis "Python bindings of libSVM"))) +(define-public python-ml-collections + (package + (name "python-ml-collections") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ml_collections" version)) + (sha256 + (base32 "1k38psfzqsqnl99fl578bd07zdmvfkja61r3sgjs2fj3xircrvrz")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; TODO: we can't seem to run the config_flags tests, because + ;; the installed Python files conflict with those from the + ;; source directory, resulting in constants to be defined more + ;; than once. + (invoke "pytest" "ml_collections/config_dict/tests" + ;; This one fails because we're testing the __main__ + ;; class, not config_dict_test. + "-k" "not testJSONConversionBestEffort"))))))) + (propagated-inputs + (list python-absl-py python-contextlib2 python-pyyaml python-six)) + (native-inputs (list python-mock python-pytest)) + (home-page "https://github.com/google/ml_collections") + (synopsis "Python collections designed for Machine Learning usecases") + (description + "ML Collections is a library of Python collections designed for Machine +Learning usecases.") + (license license:asl2.0))) + (define-public ghmm ;; The latest release candidate is several years and a couple of fixes have ;; been published since. This is why we download the sources from the SVN @@ -1460,6 +1532,54 @@ computing environments.") data analysis.") (license license:bsd-3))) +(define-public python-scikit-learn-extra + (package + (name "python-scikit-learn-extra") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/scikit-learn-contrib/scikit-learn-extra") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yy6ka94ss88f3r7b6mpjf1l8lnv7aabhsg844pigfj8lfiv0wvl")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-ext + (lambda _ + (invoke "python" "setup.py" "build_ext" + "--inplace"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Restrict OpenBLAS threads to prevent segfaults while testing! + (setenv "OPENBLAS_NUM_THREADS" "1") + + ;; Some tests require write access to $HOME. + (setenv "HOME" "/tmp") + + ;; Step out of the source directory to avoid interference; + ;; we want to run the installed code with extensions etc. + (with-directory-excursion "/tmp" + (invoke "pytest" "-vv" "--pyargs" + "sklearn_extra" + ;; ignore tests that require network + "-k" "not test_build")))))))) + (propagated-inputs (list python-numpy python-scikit-learn python-scipy)) + (native-inputs (list python-pytest python-pytest-cov python-cython)) + (home-page "https://github.com/scikit-learn-contrib/scikit-learn-extra") + (synopsis "Set of tools for scikit-learn") + (description + "This package provides a Python module for machine learning that extends +scikit-learn. It includes algorithms that are useful but do not satisfy the +scikit-learn inclusion criteria, for instance due to their novelty or lower +citation number.") + (license license:bsd-3))) + (define-public python-thinc (package (name "python-thinc") @@ -1591,45 +1711,42 @@ and forecasting.") (define-public python-imbalanced-learn (package (name "python-imbalanced-learn") - (version "0.9.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "imbalanced-learn" version)) - (sha256 - (base32 - "0qnrmysnqpc8ii1w5n8mci20gcjhmjr7khvk7f2apdbqc2pgf52f")))) + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "imbalanced-learn" version)) + (sha256 + (base32 "1p4gdgc8nsq0vjmw4y4d2bp9g0m1c23d0zgrzs90pnz6b24ax0km")))) (build-system pyproject-build-system) (arguments (list - #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'unbreak-tests - (lambda _ - ;; The doctests require tensorflow - (substitute* "setup.cfg" - (("--doctest-modules") "")) - ;; Some tests require a home directory - (setenv "HOME" (getcwd)) - ;; We don't have keras - (delete-file "imblearn/keras/tests/test_generator.py") - ;; We don't have tensorflow - (delete-file "imblearn/tensorflow/tests/test_generator.py")))))) - (propagated-inputs - (list python-joblib - python-numpy - python-scikit-learn - python-scipy - python-threadpoolctl)) - (native-inputs - (list python-black - python-flake8 - python-mypy - python-pandas - python-pytest - python-pytest-cov)) + #:test-flags '(list "-k" + ;; Although we cannot satify the Tensorflow and Keras requirements + ;; (python-keras >= 2.4.3 and tensorflow >= 2.4.3), all tests + ;; besides these pass. + "not balanced_batch_generator and not BalancedBatchGenerator") + #:phases '(modify-phases %standard-phases + (add-after 'unpack 'unbreak-tests + (lambda _ + ;; Some tests require a home directory + (setenv "HOME" + (getcwd))))))) + (propagated-inputs (list python-joblib python-numpy python-scikit-learn + python-scipy python-threadpoolctl)) + (native-inputs (list python-black + python-flake8 + python-keras + python-mypy + python-numpydoc + python-pandas + python-pytest + python-pytest-cov + tensorflow)) (home-page "https://github.com/scikit-learn-contrib/imbalanced-learn") (synopsis "Toolbox for imbalanced dataset in machine learning") - (description "This is a Python package offering a number of re-sampling + (description + "This is a Python package offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance. It is compatible with @code{scikit-learn}.") (license license:expat))) @@ -1672,7 +1789,7 @@ for k-neighbor-graph construction and approximate nearest neighbor search.") (define-public python-opentsne (package (name "python-opentsne") - (version "0.7.1") + (version "1.0.0") (source (origin (method git-fetch) ; no tests in PyPI release @@ -1681,7 +1798,7 @@ for k-neighbor-graph construction and approximate nearest neighbor search.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12wp98mh67v6v683yi7wbv8zhpafrfz21z349bww4wgi2q7bl3il")))) + (base32 "05qzpq1zjs42bl0z8girfwcj3nfxs1a99c5525vp3589sglk351g")))) (build-system python-build-system) (arguments `(#:phases @@ -1851,9 +1968,9 @@ Covariance Matrix Adaptation Evolution Strategy (CMA-ES) for Python.") (license license:expat))) (define-public python-autograd - (let* ((commit "442205dfefe407beffb33550846434baa90c4de7") + (let* ((commit "c6d81ce7eede6db801d4e9a92b27ec5d409d0eab") (revision "0") - (version (git-version "0.0.0" revision commit))) + (version (git-version "1.5" revision commit))) (package (name "python-autograd") (home-page "https://github.com/HIPS/autograd") @@ -1864,19 +1981,14 @@ Covariance Matrix Adaptation Evolution Strategy (CMA-ES) for Python.") (commit commit))) (sha256 (base32 - "189sv2xb0mwnjawa9z7mrgdglc1miaq93pnck26r28fi1jdwg0z4")) + "04kljgydng42xlg044h6nbzxpban1ivd6jzb8ydkngfq88ppipfk")) (file-name (git-file-name name version)))) (version version) - (build-system python-build-system) + (build-system pyproject-build-system) (native-inputs (list python-nose python-pytest)) (propagated-inputs (list python-future python-numpy)) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "py.test" "-v")))))) (synopsis "Efficiently computes derivatives of NumPy code") (description "Autograd can automatically differentiate native Python and NumPy code. It can handle a large subset of Python's features, including loops, @@ -2030,13 +2142,13 @@ discrete, and conditional dimensions.") (define-public python-deepxde (package (name "python-deepxde") - (version "1.9.3") + (version "1.10.0") (source (origin (method url-fetch) (uri (pypi-uri "DeepXDE" version)) (sha256 (base32 - "1zw2gqssc0s3maf4gdjckxmzx1d3036hbp1iir26kd08hxj93vzs")))) + "0fdxrjrm7l19yx6n8vaklxlhwzx0bw9n08vp8idikzdifybz5gij")))) (build-system pyproject-build-system) (arguments (list #:tests? #f ; there are no tests diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f2a8615dd9..99f5ac29fd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com> @@ -53,6 +53,7 @@ ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; Copyright © 2023 Arjan Adriaanse <arjan@adriaan.se> +;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,6 +108,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) #:use-module (gnu packages gtk) @@ -116,6 +118,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages kerberos) #:use-module (gnu packages language) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) @@ -1204,14 +1207,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.10.7") + (version "1.10.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/download/v" version "/mu-" version ".tar.xz")) (sha256 - (base32 "089w1m6sd0nk9l9j40d357fjym8kxmz7kwh3bclk58jxa6xckapa")))) + (base32 "129m6rz8vbd7370c3h3ma66bxqdkm6wsdix5qkmv1vm7sanxh4bb")))) (build-system meson-build-system) (native-inputs (list pkg-config @@ -1219,7 +1222,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") gnupg ; for tests texinfo)) (inputs - (list glib gmime xapian)) + (list glib gmime guile-3.0 xapian)) (arguments (list #:modules '((guix build meson-build-system) @@ -1227,6 +1230,8 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (guix build utils)) #:imported-modules `(,@%meson-build-system-modules (guix build emacs-utils)) + #:configure-flags + #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-bin-references @@ -1239,6 +1244,11 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (substitute* '("lib/tests/bench-indexer.cc" "lib/utils/mu-test-utils.cc") (("/bin/rm") (which "rm"))))) + (add-after 'install 'fix-ffi + (lambda _ + (substitute* (find-files #$output "mu.scm") + (("\"libguile-mu\"") + (format #f "\"~a/lib/libguile-mu\"" #$output))))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads @@ -1836,14 +1846,14 @@ addons which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.24") + (version "1.8.25") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "0nda218iz72pvh6v10s2qlihp1mdxzir6yb4hqdxc5xbmaql8rmx")))) + (base32 "0f6pa8kdlfingw6yf61dshnxgygx5v6ykcmnn3h6zllpnfxivzid")))) (build-system gnu-build-system) (inputs (list libsecret gnutls zlib gsasl)) @@ -1865,7 +1875,8 @@ addons which can add many functionalities to the base client.") (doc (string-append out "/share/doc/msmtp")) (msmtpq "scripts/msmtpq") (msmtpqueue "scripts/msmtpqueue") - (vimfiles (string-append out "/share/vim/vimfiles/syntax"))) + (vimfiles (string-append + out "/share/vim/vimfiles/pack/guix/start/msmtp/syntax"))) (install-file (string-append msmtpq "/msmtpq") bin) (install-file (string-append msmtpq "/msmtp-queue") bin) (install-file (string-append msmtpqueue "/msmtp-enqueue.sh") bin) @@ -1886,7 +1897,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.96") + (version "4.96.1") (source (origin (method url-fetch) @@ -1900,7 +1911,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "18ziihkpa23lybm7m2l9wp2farxw0bd5ng7xm9ylgcrfgf95d6i9")))) + (base32 "0g83cxkq3znh5b3r2a3990qxysw7d2l71jwcxaxzvq8pqdahgb4k")))) (build-system gnu-build-system) (arguments (list #:phases @@ -2229,6 +2240,16 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") ;; Likely to be included in next version (search-patches "isync-openssl3-fix.patch")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'substitute-openssl-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* (string-append #$output "/bin/mbsync-get-cert") + (("openssl s_client") + (string-append (search-input-file inputs "/bin/openssl") + " s_client")))))))) (native-inputs (list perl)) (inputs @@ -3173,26 +3194,32 @@ from the Cyrus IMAP project.") (define-public opensmtpd (package (name "opensmtpd") - (version "7.3.0p2") + (version "7.4.0p1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-" version ".tar.gz")) (sha256 - (base32 "0kjs5cxbh9lq51b8p20hxmiah61cfm8yzkcwpw9005cdp72zpkgw")))) + (base32 "1dbhvf73z9qi9pzj4h58bgnzsafiwpmy7n17rba83q8rjkna50ly")))) (build-system gnu-build-system) (inputs + ;; OpenSMTPd bundled (a subset of) libasr and libtls, which we use. See + ;; https://www.mail-archive.com/misc@opensmtpd.org/msg05909.html for why. (list bdb + libbsd ;https://github.com/OpenSMTPD/OpenSMTPD/issues/1233 libevent libressl linux-pam zlib)) (native-inputs - (list bison groff)) ; for man pages + (list bison + groff ;for man pages + pkg-config)) (arguments `(#:configure-flags (list "--localstatedir=/var" + "--with-libbsd" ;; This is the default only if it exists at build time—it doesn't. "--with-path-socket=/var/run" "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt" @@ -4234,10 +4261,7 @@ Git and exports them in maildir format or to an MDA through a pipe.") (file-name (git-file-name name version)))) (build-system perl-build-system) (arguments - `(#:imported-modules (,@%perl-build-system-modules - (guix build syscalls)) - #:modules ((guix build perl-build-system) - (guix build syscalls) + `(#:modules ((guix build perl-build-system) (guix build utils) (ice-9 match)) #:phases @@ -4274,18 +4298,20 @@ Git and exports them in maildir format or to an MDA through a pipe.") (setenv "TMP" "/tmp") (setenv "TMPDIR" "/tmp") - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; lei-daemon is kept as a zombie and the testsuite - ;; fails thinking that it didn't quit as it should. - (set-child-subreaper!) - (apply execlp "tini" "--" + (apply execlp "make" "make" "check" test-flags)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`make check' exited with status" status)))))) + (make-pid + ;; Reap child processes; otherwise, lei-daemon is kept as + ;; a zombie and the testsuite fails thinking that it + ;; didn't quit as it should. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid make-pid) + (unless (zero? status) + (error "`make check' exited with status" + status)) + (loop))))))) (format #t "test suite not run~%")))) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) @@ -4305,7 +4331,7 @@ Git and exports them in maildir format or to an MDA through a pipe.") (find-files (string-append out "/bin"))))))))) (native-inputs (list ;; For testing. - lsof openssl tini)) + lsof openssl)) (inputs (append (if (not (target-64bit?)) @@ -4892,11 +4918,12 @@ remote SMTP server.") (string-append "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* "commands/z.go" - (("\"zoxide\"") - (string-append - "\"" (search-input-file inputs "bin/zoxide") - "\""))) + (when (assoc-ref inputs "zoxide") + (substitute* "commands/z.go" + (("\"zoxide\"") + (string-append + "\"" (search-input-file inputs "bin/zoxide") + "\"")))) (substitute* (list "lib/crypto/gpg/gpg.go" "lib/crypto/gpg/gpg_test.go" "lib/crypto/gpg/gpgbin/keys.go" @@ -4916,45 +4943,49 @@ remote SMTP server.") (invoke "make" "CC=gcc" "install" "-C" (string-append "src/" import-path) (string-append "PREFIX=" #$output))))))) - (inputs (list gnupg - go-github-com-zenhack-go-notmuch - go-golang-org-x-oauth2 - go-github-com-xo-terminfo - go-github-com-stretchr-testify - go-github-com-riywo-loginshell - go-github-com-pkg-errors - go-github-com-mitchellh-go-homedir - go-github-com-miolini-datacounter - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-lithammer-fuzzysearch - go-github-com-kyoh86-xdg - go-github-com-imdario-mergo - go-github-com-google-shlex - go-github-com-go-ini-ini - go-github-com-gdamore-tcell-v2 - go-github-com-gatherstars-com-jwz - go-github-com-fsnotify-fsnotify - go-github-com-emersion-go-smtp - go-github-com-emersion-go-sasl - go-github-com-emersion-go-pgpmail - go-github-com-emersion-go-message - go-github-com-emersion-go-maildir - go-github-com-emersion-go-imap-sortthread - go-github-com-emersion-go-imap - go-github-com-emersion-go-msgauth - go-github-com-emersion-go-mbox - go-github-com-ddevault-go-libvterm - go-github-com-danwakefield-fnmatch - go-github-com-creack-pty - go-github-com-arran4-golang-ical - go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb-leveldb - go-git-sr-ht-sircmpwn-getopt - go-git-sr-ht-rockorager-tcell-term - python - python-vobject - zoxide)) + (inputs + (append + (list gnupg + go-github-com-zenhack-go-notmuch + go-golang-org-x-oauth2 + go-github-com-xo-terminfo + go-github-com-stretchr-testify + go-github-com-riywo-loginshell + go-github-com-pkg-errors + go-github-com-mitchellh-go-homedir + go-github-com-miolini-datacounter + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-lithammer-fuzzysearch + go-github-com-kyoh86-xdg + go-github-com-imdario-mergo + go-github-com-google-shlex + go-github-com-go-ini-ini + go-github-com-gdamore-tcell-v2 + go-github-com-gatherstars-com-jwz + go-github-com-fsnotify-fsnotify + go-github-com-emersion-go-smtp + go-github-com-emersion-go-sasl + go-github-com-emersion-go-pgpmail + go-github-com-emersion-go-message + go-github-com-emersion-go-maildir + go-github-com-emersion-go-imap-sortthread + go-github-com-emersion-go-imap + go-github-com-emersion-go-msgauth + go-github-com-emersion-go-mbox + go-github-com-ddevault-go-libvterm + go-github-com-danwakefield-fnmatch + go-github-com-creack-pty + go-github-com-arran4-golang-ical + go-github-com-protonmail-go-crypto + go-github-com-syndtr-goleveldb-leveldb + go-git-sr-ht-sircmpwn-getopt + go-git-sr-ht-rockorager-tcell-term + python + python-vobject) + (if (supported-package? zoxide) + (list zoxide) + '()))) (native-inputs (list scdoc)) (home-page "https://git.sr.ht/~rjarry/aerc") (synopsis "Email client for the terminal") diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index ad2d74f742..4a9a382104 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2022 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,39 +126,39 @@ convert it to structurally valid XHTML (or HTML).") "See License.text in the distribution.")))) (define-public lowdown - (let ((commit "1de10c1d71bfb4348ae0beaec8b1547d5e114969") - (revision "1")) - (package - (name "lowdown") - (version (git-version "0.10.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kristapsdz/lowdown") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) - (build-system gnu-build-system) - (arguments - (list - #:test-target "regress" - #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda _ - (invoke "./configure" - (string-append "PREFIX=" #$output) - (string-append "MANDIR=" #$output "/share/man"))))) - #:make-flags #~(list "CFLAGS=-fPIC"))) - (native-inputs - (list which)) - (home-page "https://kristaps.bsd.lv/lowdown/") - (synopsis "Simple Markdown translator") - (description "Lowdown is a Markdown translator producing HTML5, -roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") - (license license:isc)))) + (package + (name "lowdown") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" + version ".tar.gz")) + (sha256 + (base32 "0y88gffrg1zrin0y53j4gbkmpia0r8p0kyklj501wavkqi83j7pk")))) + (build-system gnu-build-system) + (arguments + (list + #:test-target "regress" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "./configure" + (string-append "PREFIX=" #$output) + (string-append "MANDIR=" #$output "/share/man")))) + (replace 'install + (lambda _ + (invoke "make" "install" "install_libs")))) + #:make-flags #~(list "CFLAGS=-fPIC"))) + (native-inputs + (list which)) + (home-page "https://kristaps.bsd.lv/lowdown/") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, roff +documents in the ms and man formats, LaTeX, gemini, and terminal output.") + (license license:isc))) (define-public discount (package @@ -391,7 +392,7 @@ CommonMark C library libcmark. It closely follows the original API.") (package (inherit cmark) (name "cmark-gfm") - (version "0.29.0.gfm.2") + (version "0.29.0.gfm.13") (home-page "https://github.com/github/cmark-gfm") (source (origin (method git-fetch) @@ -399,16 +400,15 @@ CommonMark C library libcmark. It closely follows the original API.") (file-name (git-file-name name version)) (sha256 (base32 - "0vz6zs3m22k7jzfj4782lahciwfjlbi4m3qz5crsmssip3rwdy7h")))) + "1apy9i76rgs0bmgdlpjszv0fpqhlap2s12m68wvnsv8j3fsqc90y")))) (arguments - '(#:test-target "test" - #:phases (modify-phases %standard-phases - (add-after 'install 'install-config - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; XXX: cmark-gfm-core-extensions.h includes this file. - (install-file "src/config.h" - (string-append out "/include")))))))) + (list #:test-target "test" + #:phases #~(modify-phases %standard-phases + (add-after 'install 'install-config + (lambda _ + ;; XXX: cmark-gfm-core-extensions.h includes this file. + (install-file "src/config.h" + (string-append #$output "/include"))))))) (synopsis "GitHub flavored CommonMark") (description "This package is a fork of @code{cmark}, with GitHub-specific Markdown @@ -429,13 +429,13 @@ additions."))) (base32 "1jm7lhnzjx4q7gcwlkvsbffcy0zppywyh50d71ami6dnq182vvcc")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" - (assoc-ref %outputs "out"))) - #:tests? #f ; no tests included - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:tests? #f ; no tests included + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (home-page "https://github.com/Gottox/smu") (synopsis "Simple markup") (description diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index c1237b2a55..cbeccdb402 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -119,6 +119,7 @@ Features include: (list gdk-pixbuf ; so pixbuf loader cache (for webp) is generated gettext-minimal `(,glib "bin") ; for glib-compile-resources + gsettings-desktop-schemas ; for the org.gnome.system.proxy schema pkg-config)) (inputs (list gst-plugins-bad @@ -144,68 +145,7 @@ seamlessly with your desktop environment.") (license license:gpl3))) (define-public tootle - (package - (name "tootle") - (version "1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bleakgrey/tootle") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1nm57239mhdq462an6bnhdlijpijxmjs9mqbyirwxwa048d3n4rm")) - (patches - (search-patches - ;; https://github.com/bleakgrey/tootle/pull/339 - "tootle-glib-object-naming.patch" - ;; https://github.com/bleakgrey/tootle/pull/322 - "tootle-reason-phrase.patch")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson/post_install.py" - (("gtk-update-icon-cache") "true")))) - (add-after 'unpack 'patch-source - (lambda _ - (substitute* "src/Dialogs/NewAccount.vala" - (("xdg-mime") (which "xdg-mime"))) - ;; Patch for building on glib < 2.64 - (substitute* "src/Build.vala" - (("(os_name = ).*" _ first) (string-append first "\"GNU\";\n")) - (("(os_ver = ).*" _ first) (string-append first "\"Guix\";\n")) - (("GLib.Environment.get_os_info.*") "\"unknown\";\n")))) - (add-after 'install 'symlink-package - (lambda* (#:key outputs #:allow-other-keys) - (symlink "com.github.bleakgrey.tootle" - (string-append (assoc-ref outputs "out") - "/bin/tootle"))))))) - (native-inputs - (list gettext-minimal - `(,glib "bin") ; for glib-compile-resources - gsettings-desktop-schemas pkg-config)) - (inputs - (list glib-networking - gtk+ - json-glib - libgee - libhandy - libsoup-minimal-2 - vala - xdg-utils)) - (home-page "https://github.com/bleakgrey/tootle") - (synopsis "GTK3 client for Mastodon") - (description "Tootle is a GTK client for Mastodon. It provides a clean, -native interface that allows you to integrate Mastodon's social experience -seamlessly with your desktop environment.") - (license license:gpl3+))) + (deprecated-package "tootle" tuba)) (define-public python-mastodon-py (package diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 75eab86d2a..2dd8f187c9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022, 2023 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at> ;;; Copyright © 2022 Akira Kyle <akira@akirakyle.com> +;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com> ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com> ;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net> @@ -103,6 +104,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -114,6 +116,7 @@ #:use-module (gnu packages coq) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages cpp) #:use-module (gnu packages datamash) #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) @@ -134,6 +137,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages java) #:use-module (gnu packages less) #:use-module (gnu packages lisp) @@ -161,6 +165,8 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -170,6 +176,7 @@ #:use-module (gnu packages scheme) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages simulation) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) @@ -830,6 +837,44 @@ LP/MIP solver is included in the package.") (base32 "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2")))))) +(define-public linasm + (package + (name "linasm") + (version "1.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/linasm/linasm") + (commit (string-append "v" version "(stable)")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11095bxjxsq3a9apvyi1kpddwkg9b2hc5ga65qhrdxzvdsrjhaaq")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #false ;there are none + #:make-flags + #~(list (string-append "prefix=" #$output)) + #:phases + '(modify-phases %standard-phases + (delete 'configure)))) + (supported-systems '("x86_64-linux")) + (home-page "https://sourceforge.net/projects/linasm/") + (synopsis "Collection of fast and optimized assembly libraries for x86-64") + (description + "LinAsm is collection of very fast and SIMD optimized assembly written +libraries for x86-64. + +It implements many common and widely used algorithms for array manipulations: +searching, sorting, arithmetic and vector operations, unit conversions; fast +mathematical and statistic functions; numbers and time converting algorithms; +@dfn{finite impulse response} (FIR) digital filters; spectrum analysis +algorithms, Fast Hartley transformation; CPU cache friendly functions and +extremely fast @dfn{abstract data types} (ADT) such as hash tables b-trees, +and much more.") + (license license:lgpl3+))) + (define-public 4ti2 (package (name "4ti2") @@ -1263,14 +1308,14 @@ in the terminal or with an external viewer.") (define-public gnuplot (package (name "gnuplot") - (version "5.4.8") + (version "5.4.9") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" version "/gnuplot-" version ".tar.gz")) (sha256 - (base32 "1kzmj4yyxvlxqzqbrw6sx6dnvhj1zzqnciyb8ryzy6mdrb3pj4lk")))) + (base32 "15vabi30s4ln4vi82csx4nvfms3ik8704rk0prcm9h1xylhs0a53")))) (build-system gnu-build-system) (native-inputs (list pkg-config (texlive-updmap.cfg))) @@ -1278,7 +1323,8 @@ in the terminal or with an external viewer.") (list cairo gd lua pango readline)) (arguments (list #:configure-flags - #~(list (string-append "--with-texdir=" #$output + #~(list "--with-qt=no" + (string-append "--with-texdir=" #$output "/texmf-local/tex/latex/gnuplot")) ;; Plot on a dumb terminal during tests. #:make-flags #~'("GNUTERM=dumb"))) @@ -2383,7 +2429,7 @@ interfaces.") (define-public nomad-optimizer (package (name "nomad-optimizer") - (version "4.2.0") + (version "4.3.1") (source (origin (method git-fetch) @@ -2392,164 +2438,109 @@ interfaces.") (commit (string-append "v." version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1r4ygy3xn83dnppsw1451ynklsxpb238g5gk57inn84ghmdk08mj")))) + (base32 "08bxdvx8p5qzdw331xa5irc1896as4q5hajsid7f3qcxjm4nq4v3")))) (build-system cmake-build-system) (native-inputs - (list python-wrapper python-cython)) + (list openmpi)) (arguments - `(#:imported-modules ((guix build python-build-system) - ,@%cmake-build-system-modules) - #:modules (((guix build python-build-system) - #:select (python-version site-packages)) - (guix build cmake-build-system) - (guix build utils)) - #:configure-flags - '("-DBUILD_INTERFACE_C=ON" - "-DBUILD_INTERFACE_PYTHON=ON" - "-DBUILD_TESTS=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-sources-for-build - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - ;; CMAKE_INSTALL_PREFIX is accidentally hardcoded. - (("set\\(CMAKE_INSTALL_PREFIX .* FORCE\\)") "") - ;; Requiring GCC version 8 or later is unwarranted. - (("message\\(FATAL_ERROR \"GCC version < 8") - "message(STATUS \"GCC version < 8")) - - (let ((out (assoc-ref outputs "out"))) - (substitute* "interfaces/PyNomad/CMakeLists.txt" - ;; We don't want to build in-place, and anyway the install - ;; command further below runs build_ext as a prerequisite. - (("COMMAND python setup_PyNomad\\.py .* build_ext --inplace\n") - "") - ;; Don't install locally. - (("COMMAND python (setup_PyNomad\\.py .* install) --user\n" - _ args) - (string-append "COMMAND ${CMAKE_COMMAND} -E env" - " CC=" ,(cc-for-target) - " CXX=" ,(cxx-for-target) - " " (which "python") - " " args - " --prefix=" out - "\n"))) - ;; Fix erroneous assumptions about the paths of the include and - ;; library directories. - (substitute* "interfaces/PyNomad/setup_PyNomad.py" - (("^( +os_include_dirs = ).*" _ prefix) - (string-append prefix "[\"../../src\"]\n")) - (("^(installed_lib_dir1 = ).*" _ prefix) - (string-append prefix "\"" out "/lib\"\n")) - (("^installed_lib_dir2 = .*") "") - (("^ +link_args\\.append\\(\"-Wl,-rpath,\" \\+ installed_lib_dir2\\)\n") - ""))))) - - ;; Fix the tests so they run in out-of-source builds. - ;; - ;; TODO: Add support for examples/basic/batch/single_obj_MPIparallel, - ;; by adding openmpi to native-inputs and adjusting the example's - ;; BB_EXE parameter. - (add-after 'fix-sources-for-build 'fix-sources-for-tests - (lambda _ - (substitute* "examples/CMakeLists.txt" - ;; This test passes only sometimes. - ;; See https://github.com/bbopt/nomad/issues/72. - (("^ +add_subdirectory\\(\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/advanced/library/PSDMads\\)\n") - "") - ;; examples/basic/batch/example3 is accidentally omitted. - (("^(add_subdirectory\\(\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/basic/batch/example)2(\\)\n)" - _ prefix suffix) - (string-append prefix "2" suffix - prefix "3" suffix)) - - ;; The generated runExampleTest.sh script runs the test as part - ;; of a pipeline and incorrectly (because pipefail is unset) - ;; relies on the value of the exit status immediately after the - ;; pipeline. - ;; (The patch-shebangs phase runs later than this one, so no - ;; need to update the path to bash here.) - (("#!/bin/bash") "#!/bin/bash\nset -o pipefail")) - - (substitute* - (map (lambda (d) (string-append "examples/" d "/CMakeLists.txt")) - (append - (map (lambda (d) (string-append "basic/library/" d)) - '("example1" "example2" "example3" - "single_obj_parallel")) - (map (lambda (d) (string-append "advanced/library/" d)) - '("FixedVariable" "NMonly" "PSDMads" "Restart" - "c_api/example1" "c_api/example2" - "exampleSuggestAndObserve")))) - ;; The runExampleTest.sh script is run with WORKING_DIRECTORY - ;; set to CMAKE_CURRENT_SOURCE_DIR. - ;; Other scripts invoked by that script (for example - ;; examples/advanced/batch/SuggestAndObserve/loopSuggestAndObserve.sh) - ;; are in that same directory, but compiled examples are - ;; located in CMAKE_CURRENT_BINARY_DIR. - (("(COMMAND \\$\\{CMAKE_BINARY_DIR\\}/examples/runExampleTest\\.sh )\\.(/.*)" - _ command test) - (string-append command "${CMAKE_CURRENT_BINARY_DIR}" test))) - - ;; The examples/basic/batch/example3 executable is already named - ;; bb3.exe. - (substitute* "examples/basic/batch/single_obj_parallel/CMakeLists.txt" - (("bb3.exe") "bb_parallel.exe")) - - ;; (Unrelated to support for out-of-source testing.) - (make-file-writable - "examples/advanced/library/exampleSuggestAndObserve/cache0.txt") - - (let ((builddir (string-append (getcwd) "/../build"))) - (let ((dir "examples/advanced/library/FixedVariable")) - (substitute* (string-append dir "/fixedVariable.cpp") - (("^( +std::string sExe = ).*" _ prefix) - (string-append prefix "\"" builddir "/" dir "/ufl.exe" "\";\n")))) - - ;; The BB_EXE and SURROGATE_EXE paths are interpreted relative - ;; to the configuration file provided to NOMAD. - ;; However, the configuration files are all in the source tree - ;; rather than in the build tree (unlike the compiled - ;; executables). - (let ((fix-exe-path (lambda* (dir #:optional - (file "param.txt") - (exe-opt "BB_EXE")) - (substitute* (string-append dir "/" file) - (((string-append "^" exe-opt " +")) - ;; The $ prevents NOMAD from prefixing - ;; the executable with the path of the - ;; parent directory of the configuration - ;; file NOMAD was provided with as - ;; argument (param.txt or some such). - (string-append exe-opt " $" - builddir "/" dir "/")))))) - (for-each - (lambda (dir) - (let ((dir (string-append "examples/" dir))) - (substitute* (string-append dir "/CMakeLists.txt") - ;; The install phase has not yet run. - (("COMMAND \\$\\{CMAKE_INSTALL_PREFIX\\}/bin/nomad ") - "COMMAND ${CMAKE_BINARY_DIR}/src/nomad ")) - (fix-exe-path dir) - (when (equal? dir "examples/basic/batch/surrogate_sort") - (fix-exe-path dir "param.txt" "SURROGATE_EXE")))) - (append (map (lambda (d) (string-append "basic/batch/" d)) - '("example1" "example2" "example3" - "single_obj" - "single_obj_parallel" - ;; "single_obj_MPIparallel" - "surrogate_sort")) - '("advanced/batch/LHonly"))) - - (let ((dir "examples/advanced/batch/FixedVariable")) - (substitute* (string-append dir "/runFixed.sh") - ;; Hardcoded path to NOMAD executable. - (("^\\.\\./\\.\\./\\.\\./\\.\\./bin/nomad ") - (string-append builddir "/src/nomad "))) - (for-each - (lambda (f) (fix-exe-path dir f)) - '("param1.txt" "param2.txt" "param3.txt" "param10.txt")))))))))) + (list + ;; Cannot build Python interface because it is incompatible with OpenMP + ;; support, which is enabled by default. + #:configure-flags + #~(list "-DBUILD_TESTS=ON" + "-DBUILD_INTERFACE_C=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "examples/CMakeLists.txt" + ;; This test passes only sometimes. + ;; See https://github.com/bbopt/nomad/issues/72. + (("^ +add_subdirectory\\(\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/advanced/library/PSDMads\\)\n") + "")) + (make-file-writable + "examples/advanced/library/exampleSuggestAndObserve/cache0.txt") + ;; Fix the tests so they run in out-of-source builds. + (substitute* + '("examples/basic/library/COCO/CMakeLists.txt" + "examples/basic/library/example1/CMakeLists.txt" + "examples/basic/library/example2/CMakeLists.txt" + "examples/basic/library/example3/CMakeLists.txt" + "examples/basic/library/example4/CMakeLists.txt" + "examples/basic/library/single_obj_parallel/CMakeLists.txt" + "examples/advanced/library/FixedVariable/CMakeLists.txt" + "examples/advanced/library/NMonly/CMakeLists.txt" + "examples/advanced/library/PSDMads/CMakeLists.txt" + "examples/advanced/library/Restart/CMakeLists.txt" + "examples/advanced/library/Restart_VNS/CMakeLists.txt" + "examples/advanced/library/c_api/example1/CMakeLists.txt" + "examples/advanced/library/c_api/example2/CMakeLists.txt" + "examples/advanced/library/exampleSuggestAndObserve/CMakeLists.txt") + ;; The runExampleTest.sh script is run with WORKING_DIRECTORY + ;; set to CMAKE_CURRENT_SOURCE_DIR. + ;; Other scripts invoked by that script (for example + ;; examples/advanced/batch/SuggestAndObserve/loopSuggestAndObserve.sh) + ;; are in that same directory, but compiled examples are + ;; located in CMAKE_CURRENT_BINARY_DIR. + (("(COMMAND \\$\\{CMAKE_BINARY_DIR\\}/examples/runExampleTest\\.sh )\\.(/.*)" + _ command test) + (string-append command "${CMAKE_CURRENT_BINARY_DIR}" test))) + (let ((builddir (string-append (getcwd) "/../build"))) + (let ((dir "examples/advanced/library/FixedVariable")) + (substitute* (string-append dir "/fixedVariable.cpp") + (("^( +std::string sExe = ).*" _ prefix) + (string-append prefix "\"" builddir "/" dir "/ufl.exe" "\";\n")))) + ;; The BB_EXE and SURROGATE_EXE paths are interpreted relative + ;; to the configuration file provided to NOMAD. + ;; However, the configuration files are all in the source tree + ;; rather than in the build tree (unlike the compiled + ;; executables). + (let ((fix-exe-path (lambda* (dir #:optional + (file "param.txt") + (exe-opt "BB_EXE")) + (substitute* (string-append dir "/" file) + (((string-append "^" exe-opt " +")) + ;; The $ prevents NOMAD from prefixing + ;; the executable with the path of the + ;; parent directory of the configuration + ;; file NOMAD was provided with as + ;; argument (param.txt or some such). + (string-append exe-opt " $" + builddir "/" dir "/")))))) + (for-each + (lambda (dir) + (substitute* (string-append dir "/CMakeLists.txt") + ;; The install phase has not yet run. + (("(COMMAND.*)\\$\\{CMAKE_INSTALL_PREFIX\\}/bin/nomad\\b" + _ prefix) + (string-append prefix "${CMAKE_BINARY_DIR}/src/nomad"))) + (if (equal? dir "examples/basic/batch/single_obj_MPIparallel") + (substitute* (string-append dir "/param.txt") + (("^BB_EXE +'\\$.*mpirun \\$-np \\$4 ") + (string-append "BB_EXE '$" (which "mpirun") " $" + builddir "/" dir "/"))) + (fix-exe-path dir)) + (when (equal? dir "examples/basic/batch/surrogate_sort") + (fix-exe-path dir "param.txt" "SURROGATE_EXE")) + (when (equal? dir "examples/advanced/batch/FixedVariable") + (fix-exe-path dir "param1.txt") + (fix-exe-path dir "param2.txt") + (fix-exe-path dir "param3.txt") + (fix-exe-path dir "param10.txt"))) + '("examples/basic/batch/coco_bbob-constrained" + "examples/basic/batch/example1" + "examples/basic/batch/example2" + "examples/basic/batch/example3" + "examples/basic/batch/multi_obj" + "examples/basic/batch/multi_obj2" + "examples/basic/batch/single_obj" + "examples/basic/batch/single_obj_MPIparallel" + "examples/basic/batch/single_obj_parallel" + "examples/basic/batch/surrogate_sort" + "examples/advanced/batch/FixedVariable" + "examples/advanced/batch/LHonly")))))) + (add-before 'configure 'mpi-setup + #$%openmpi-setup)))) (home-page "https://www.gerad.ca/nomad/") (synopsis "Nonlinear optimization by mesh-adaptive direct search") (description @@ -2931,7 +2922,7 @@ can solve two kinds of problems: (define-public octave-cli (package (name "octave-cli") - (version "8.3.0") + (version "8.4.0") (source (origin (method url-fetch) @@ -2939,7 +2930,7 @@ can solve two kinds of problems: version ".tar.xz")) (sha256 (base32 - "1aav8i88y2yl11g5d44wpjngkpldvzk90ja7wghkb91cy2a9974i")))) + "1a58zyrl1lx6b6wr2jbf6w806vjxr3jzbh6n85iinag47qxdg6kg")))) (build-system gnu-build-system) (inputs (list alsa-lib @@ -3141,6 +3132,109 @@ This is the certified version of the Open Cascade Technology (OCCT) library.") ;; File src/NCollection/NCollection_StdAllocator.hxx: license:public-domain)))) +(define-public fast-downward + (package + (name "fast-downward") + (version "23.06.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aibasel/downward") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xrgnvbkzkdf6srbrlsnf4qrgp0f1lkk7yxf34ynna0w49l468d4")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-driver + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "driver/run_components.py" + ;; strip gratuitous "bin" + (("os\\.path\\.join\\((.*), \"bin\"\\)" all keep) + (string-append "os.path.join(" keep ")"))))) + (add-before 'configure 'chdir + (lambda _ (chdir "src"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest (string-append out "/libexec/fast-downward" + "/builds/release"))) + (mkdir-p dest) + (with-directory-excursion "bin" + (install-file "downward" dest) + (copy-recursively "translate" + (string-append dest "/translate")))))) + (add-after 'install 'install-driver + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion ".." + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/fast-downward")) + (dest (string-append out "/libexec/fast-downward"))) + (copy-recursively "driver" + (string-append dest "/driver")) + (mkdir-p (dirname bin)) + (copy-file "fast-downward.py" bin) + (wrap-program bin + `("PYTHONPATH" prefix (,dest)))))))))) + (inputs (list bash-minimal python)) + (home-page "https://www.fast-downward.org/") + (synopsis "Domain-independant classical planning system") + (description "Fast Downward is a portfolio-based planning system that +supports the propositional fragment of PDDL2.2.") + (license license:gpl3+))) + +(define-public popf + (package + (name "popf") + (version "0.0.15") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fmrico/popf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i1am3h6japn8fgapi5s5mnyrm31a05jkjhzgk48cd2n42c5060v")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-cmake + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "CMakeLists\\.txt") + (("/usr/local/opt/flex/include") + (dirname (search-input-file inputs "include/FlexLexer.h")))) + (substitute* "CMakeLists.txt" + (("find_package\\(ament_cmake REQUIRED\\)") "") + (("ament_.*") "") + (("(RUNTIME DESTINATION) .*" all dst) + (string-append dst " libexec/${PROJECT_NAME}"))))) + (add-after 'install 'symlink + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/bin")) + (for-each (lambda (link) + (symlink + (string-append out "/libexec/popf/" (cdr link)) + (string-append out "/bin/" (car link)))) + '(("popf" . "popf") ("VAL" . "validate"))))))))) + (inputs (list cbc flex)) + (native-inputs (list flex bison perl)) + (home-page "https://github.com/fmrico/popf") + (synopsis "Forward-chaining temporal planner") + (description "This package contains an implementation of the @acronym{POPF, +Partial Order Planning Forwards} planner described in @cite{Forward-Chaining +Partial Order Planning}, that has been updated to compile with newer C++ +compilers.") + (license license:gpl2+))) + (define-public gmsh (package (name "gmsh") @@ -3560,6 +3654,146 @@ Cassowary solver with typical use cases gaining a 40x improvement. Memory savings are consistently > 5x.") (license license:bsd-3))) +(define-public python-accupy + (package + (name "python-accupy") + (version "0.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diego-hayashi/accupy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sxkwpp2xy2jgakhdxr4nh1cspqv8l89kz6s832h05pbpyc0n767")) + (patches (search-patches "python-accupy-use-matplotx.patch" + "python-accupy-fix-use-of-perfplot.patch")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-eigen-include-dir + (lambda _ + (substitute* "setup.py" + (("include_dirs=\\[\"\\/usr\\/include\\/eigen3\\/\"\\]," _) + (string-append "include_dirs=[\"" + #$(file-append (this-package-input "eigen") + "/include/eigen3/") + "\"],")))))))) + (propagated-inputs (list eigen python-mpmath python-pyfma)) + (native-inputs (list pybind11 + python-matplotx + python-perfplot + python-pytest)) + (home-page "https://github.com/diego-hayashi/accupy") + (synopsis "Accurate calculation of sums and dot products") + (description + "@code{accupy} is a Python library for accurately computing sums +and (dot) products. It implements Kahan summation, Shewchuck's +algorithm and summation in K-fold precision.") + (license license:gpl3+))) + +(define-public python-ndim + (package + (name "python-ndim") + (version "0.1.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diego-hayashi/ndim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hri82k7pcpw9dns8l1f2asa3dm7hjv71wnxi3752258ia2qa44v")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-sympy)) + (native-inputs (list python-flit-core python-pytest)) + (home-page "https://github.com/diego-hayashi/ndim") + (synopsis "Multidimensional volumes and monomial integrals") + (description + "@code{ndim} computes all kinds of volumes and integrals of +monomials over such volumes in a fast, numerically stable way, using +recurrence relations.") + (license license:gpl3+))) + +(define-public python-orthopy + (package + (name "python-orthopy") + (version "0.9.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diego-hayashi/orthopy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00s2rwjdlq38zkf7wl1gvm2aw057r30266lkzfxkrfzr4i705xnq")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-importlib-metadata + python-ndim + python-numpy + python-sympy)) + (native-inputs (list ;python-cplot ;only used in deselected tests + python-matplotx + python-meshio + python-meshzoo + python-pytest + python-scipy)) + (arguments + (list + #:test-flags + ;; These tests fails with unexpected keyword arguments + ;; in calls to cplot. + #~(list "--deselect" "tests/test_u3.py::test_write_single" + "--deselect" "tests/test_u3.py::test_write_tree"))) + (home-page "https://github.com/diego-hayashi/orthopy") + (synopsis "Tools for orthogonal polynomials, Gaussian quadrature") + (description "@code{orthopy} provides various orthogonal polynomial +classes for lines, triangles, quadrilaterals, disks, spheres, hexahedra, +and n-cubes. All computations are done using numerically stable +recurrence schemes. Furthermore, all functions are fully vectorized and +can return results in exact arithmetic.") + (license license:gpl3+))) + +(define-public python-quadpy + (package + (name "python-quadpy") + (version "0.16.10") + (source + (origin + (method url-fetch) + ; Download zipfile from zenodo, because git checkout is missing + ; some data files that are stored via git-lfs. + (uri (string-append + "https://zenodo.org/records/5541216/files/nschloe/quadpy-v" + version + ".zip")) + (sha256 + (base32 + "1f989dipv7lqxvalfrvvlmhlxyl67a87lavyyqrr1mh88glhl592")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-importlib-metadata + python-numpy + python-orthopy + python-scipy + python-sympy)) + (native-inputs (list python-accupy python-pytest unzip vtk)) + (home-page "https://github.com/diego-hayashi/quadpy") + (synopsis "Numerical integration, quadrature for various domains") + (description + "More than 1500 numerical integration schemes for line segments, circles, +disks, triangles, quadrilaterals, spheres, balls, tetrahedra, hexahedra, +wedges, pyramids, n-spheres, n-balls, n-cubes, n-simplices, and the +1D/2D/3D/nD spaces with weight functions exp(-r) and exp(-r2) for fast +integration of real-, complex-, and vector-valued functions.") + (license license:gpl3+))) + (define-public slepc (package (name "slepc") @@ -4344,7 +4578,44 @@ bio-chemistry.") (define-public pt-scotch-shared (deprecated-package "pt-scotch-shared" pt-scotch)) +(define-public gklib + (let ((commit "8bd6bad750b2b0d90800c632cf18e8ee93ad72d7") + (revision "1")) + (package + (name "gklib") + (version (git-version "5.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KarypisLab/GKlib") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08k4zzyd7zsisdhfmnwz7zb9w3pzpgagyjq52mwk8i6sqajdxsdn")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + #$@(if (target-x86?) + '() + '("-DNO_X86=1"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-march=native + (lambda _ + (substitute* "GKlibSystem.cmake" + (("-march=native") ""))))))) + (home-page "https://github.com/KarypisLab/GKlib") + (synopsis "Helper library for METIS") + (description + "GKlib is a library of various helper routines and frameworks used by +software from KarypisLab, such as METIS.") + (license license:asl2.0)))) +;; XXX: Remove once the full SuiteSparse package is replaced. (define-public metis (package (name "metis") @@ -4378,6 +4649,53 @@ recursive-bisection, multilevel k-way, and multi-constraint partitioning schemes.") (license license:asl2.0))) ;As of version 5.0.3 +(define-public metis-5.2 + (package + (name "metis") + (version "5.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KarypisLab/METIS") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19vi1wsi2gp2m5vb715yfnzd2g7brm4r40qxg65ysrzgl13lpmvr")) + (snippet + #~(delete-file "manual/manual.pdf")))) + (build-system cmake-build-system) + (inputs (list gklib openblas)) + (arguments + (list + #:tests? #f ; Tests are not automatic + #:configure-flags + #~(list "-DSHARED=ON" + (string-append "-DGKLIB_PATH=" #$gklib)) + #:phases + #~(modify-phases %standard-phases + ;; The original Makefile copies some files and invokes CMake. + (add-before 'configure 'prepare-cmake + (lambda _ + (substitute* "Makefile" + (("config: distclean") "config:") + (("BUILDDIR =.*") + "BUILDDIR = .\n") + ((".*cmake.*") "")) + (substitute* "CMakeLists.txt" + (("build/") "../source/")) + (invoke "make" "config")))))) + (home-page "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview") + (synopsis "Graph partitioning and fill-reducing matrix ordering library") + (description + "METIS is a set of serial programs for partitioning graphs, partitioning +finite element meshes, and producing fill-reducing orderings for sparse +matrices. The algorithms implemented in METIS are based on the multilevel +recursive-bisection, multilevel k-way, and multi-constraint partitioning +schemes.") + (license license:asl2.0))) + (define-public p4est (package (name "p4est") @@ -4572,7 +4890,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "22.12.0") + (version "23.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -4581,7 +4899,7 @@ point numbers.") (file-name (git-file-name name version)) (sha256 (base32 - "12bjadmy2mf7d8v4iszmzckahfcwjzaba8wpbigksh4brvhb4gj5")))) + "0xj91wfkm19avwmpcfwgzdkcqjwfpkl3glhkpn4advsqc6sx3ra0")))) (build-system cmake-build-system) (native-inputs (list gettext-minimal)) (inputs (list bash-minimal @@ -5039,6 +5357,876 @@ Fresnel integrals, and similar related functions as well.") ;; public domain software. (license (list license:expat license:public-domain)))) +;; Source for the modular SuiteSparse packages. When updating, also update the +;; (different) versions of the subpackages. +(define suitesparse-version "7.2.0") +(define suitesparse-source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DrTimothyAldenDavis/SuiteSparse") + (commit (string-append "v" suitesparse-version)))) + (file-name (git-file-name "suitesparse" suitesparse-version)) + (sha256 + (base32 + "1draljn8i46862drc6008cnb2zjpklf74j8c34jirjazzpf53kaa")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Delete autogenerated and bundled files + (for-each delete-file (find-files "." "\\.pdf$")) + ;; ssget + (delete-file-recursively "ssget") + ;; SuiteSparse_config + (delete-file "SuiteSparse_config/SuiteSparse_config.h") + ;; CHOLMOD + (delete-file-recursively "CHOLMOD/SuiteSparse_metis") + ; GraphBLAS + (delete-file "GraphBLAS/README.md") + (delete-file "GraphBLAS/Config/GB_config.h") + (delete-file "GraphBLAS/Config/GB_prejit.c") + (delete-file-recursively "GraphBLAS/cpu_features") + (delete-file "GraphBLAS/CUDA/GB_cuda_common_jitFactory.hpp") + (delete-file "GraphBLAS/JITpackage/GB_JITpackage.c") + (delete-file-recursively "GraphBLAS/lz4/lz4.c") + (delete-file-recursively "GraphBLAS/lz4/lz4.h") + (delete-file-recursively "GraphBLAS/lz4/lz4hc.c") + (delete-file-recursively "GraphBLAS/lz4/lz4hc.h") + (delete-file "GraphBLAS/GraphBLAS/Config/GB_config.h") + (delete-file "GraphBLAS/Tcov/PreJIT/GB_prejit.c") + (delete-file-recursively "GraphBLAS/Source/FactoryKernels") + (delete-file "GraphBLAS/Source/GB_AxB__include1.h") + (delete-file "GraphBLAS/xxHash/xxhash.h") + (delete-file-recursively "GraphBLAS/zstd/zstd_subset") + ;; KLU + (delete-file "KLU/Include/klu.h") + (delete-file "KLU/Doc/klu_version.tex") + ;; LDL + (delete-file "LDL/Include/ldl.h") + (delete-file "LDL/Doc/ldl_version.tex") + ;; RBio + (delete-file "RBio/Include/RBio.h") + ;; SPEX + (delete-file "SPEX/Include/SPEX.h") + (delete-file "SPEX/Doc/SPEX_version.tex") + ;; SPQR + (delete-file "SPQR/Include/SuiteSparseQR_definitions.h") + (delete-file "SPQR/Doc/spqr_version.tex") + ;; UMFPACK + (delete-file "UMFPACK/Include/umfpack.h") + (delete-file "UMFPACK/Doc/umfpack_version.tex"))))) + +(define-public suitesparse-config + (package + (name "suitesparse-config") + (version suitesparse-version) + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SuiteSparse_config")))))) + (inputs (list openblas)) + (native-inputs (list pkg-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Configuration for all SuiteSparse packages") + (description "SuiteSparse is a suite of sparse matrix algorithms. This +package contains a library with common configuration options.") + (license license:bsd-3))) + +(define-public suitesparse-amd + (package + (name "suitesparse-amd") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "AMD"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../AMD/Doc" + (invoke "make")))) + ;; Required for suitesparse-umfpack + (add-after 'install 'install-internal-header + (lambda _ + (install-file "../AMD/Include/amd_internal.h" + (string-append #$output "/include")))) + (add-after 'install-internal-header 'install-doc + (lambda _ + (install-file "../AMD/Doc/AMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../AMD/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (native-inputs (list gfortran (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse matrix ordering for Cholesky factorization") + (description "AMD is a set of routines for ordering a sparse matrix prior +to Cholesky factorization (or for LU factorization with diagonal pivoting).") + (license license:bsd-3))) + +(define-public suitesparse-btf + (package + (name "suitesparse-btf") + (version "2.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "BTF"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../BTF/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for permuting matrices into block upper triangular form") + (description "BTF (Block Triangular Form) is a C library for permuting a +matrix into block upper triangular form.") + (license license:lgpl2.1+))) + +(define-public suitesparse-camd + (package + (name "suitesparse-camd") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CAMD"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../CAMD/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../CAMD/Doc/CAMD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../CAMD/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse matrix ordering for Cholesky factorization with constraints") + (description "CAMD is a set of routines for ordering a sparse matrix prior +to Cholesky factorization (or for LU factorization with diagonal pivoting). +It is a variant of AMD which has the the option to apply constraints to the +ordering.") + (license license:bsd-3))) + +(define-public suitesparse-colamd + (package + (name "suitesparse-colamd") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "COLAMD"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../COLAMD/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Column Approximate Minimum Degree Ordering") + (description "COLAMD is library for computing a permutation vector for a +matrix with which the LU factorization becomes sparser.") + (license license:bsd-3))) + +(define-public suitesparse-ccolamd + (package + (name "suitesparse-ccolamd") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CCOLAMD"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (install-file "../CCOLAMD/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Column Approximate Minimum Degree Ordering with constraints") + (description "CCOLAMD is library for computing a permutation vector for a +matrix with which the LU factorization becomes sparser. It is a variant of +COLAMD which has the the option to apply constraints to the ordering.") + (license license:bsd-3))) + +(define-public gklib-suitesparse + (package/inherit gklib + (name "gklib-suitesparse") + (source (origin + (inherit (package-source gklib)) + (patches (cons + (search-patch + "gklib-suitesparse.patch") + (origin-patches (package-source gklib)))))) + (arguments + (substitute-keyword-arguments (package-arguments gklib) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("add_library\\(GKlib.*" all) + (string-append + all + "target_link_libraries(GKlib PUBLIC" + " ${SUITESPARSE_CONFIG_LIBRARIES} m)\n"))))))))) + (propagated-inputs (list suitesparse-config)))) + +(define-public metis-suitesparse + (package/inherit metis-5.2 + (name "metis-suitesparse") + (arguments + (substitute-keyword-arguments (package-arguments metis-5.2) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'prepare-cmake 'set-idxwidth + (lambda _ + (substitute* "Makefile" + (("IDXWIDTH.*=.*") + "IDXWIDTH = \"\\#define IDXTYPEWIDTH 64\"\n")))) + (add-before 'prepare-cmake 'link-suitesparse-config + (lambda _ + (substitute* "programs/CMakeLists.txt" + (("include_directories.*" all) + (string-append + all "find_package(SuiteSparse_config REQUIRED)\n")) + (("(target_link_libraries.*)GKlib(.*)" _ start end) + (string-append + start "GKlib ${SUITESPARSE_CONFIG_LIBRARIES}" end))))))) + ((#:configure-flags _) + #~(list "-DSHARED=ON" + (string-append "-DGKLIB_PATH=" #$gklib-suitesparse))))) + (inputs (list suitesparse-config gklib-suitesparse)))) + +(define-public suitesparse-cholmod + (package + (name "suitesparse-cholmod") + (version "4.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CHOLMOD"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n")) + (("add_subdirectory.*GPU.*") "\n") + ((".*cmake_modules/FindCHOLMOD_CUDA.cmake.*") "\n")))) + (add-after 'chdir 'use-external-metis + (lambda _ + (let ((port (open-file "CMakeLists.txt" "a"))) + (display + (string-append + "find_library(METIS_LIBRARY NAME metis PATHS ENV LIBRARY_PATH) +get_filename_component(METIS_LIBRARY ${METIS_LIBRARY} REALPATH) +find_library(GKLIB_LIBRARY NAME GKlib PATHS ENV LIBRARY_PATH) +get_filename_component(GKLIB_LIBRARY ${GKLIB_LIBRARY} REALPATH) +target_link_libraries(CHOLMOD PRIVATE ${METIS_LIBRARY} ${GKLIB_LIBRARY}) +target_link_libraries(CHOLMOD_static PRIVATE ${METIS_LIBRARY} ${GKLIB_LIBRARY})") + port) + (close-port port)) + (delete-file "Partition/cholmod_metis_wrapper.c") + (delete-file "Partition/cholmod_metis_wrapper.h") + (substitute* "Partition/cholmod_metis.c" + (("#include \"cholmod_metis_wrapper\\.h\"") "") + (("#include \"SuiteSparse_metis/include/metis.h\"") + "#include <metis.h>") + (("SuiteSparse_metis_METIS") "METIS")))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../CHOLMOD/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../CHOLMOD/Doc/CHOLMOD_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../CHOLMOD/Doc/License.txt" out) + (install-file "../CHOLMOD/Core/lesser.txt" out) + (install-file "../CHOLMOD/MatrixOps/gpl.txt" out))))))) + (inputs + (list gklib-suitesparse + metis-suitesparse + openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-colamd)) + (propagated-inputs (list suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for solving sparse symmetric positive definite linear +equations") + (description "CHOLMOD is a set of routins for factorizing sparse symmetrix +positive definite matrices, updating/downdating sparse Cholesky factorizations +and other related operations.") + (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public suitesparse-cxsparse + (package + (name "suitesparse-cxsparse") + (version "4.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "CXSparse"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../CXSparse/Doc/License.txt" out) + (install-file "../CXSparse/Doc/lesser.txt" out))))))) + (propagated-inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Concise eXtended Sparse Matrix Package") + (description "CXSparse is a collection of sparse matrix algorithms for +direct methods on both real and complex matrices.") + (license license:lgpl2.1+))) + +(define-public suitesparse-klu + (package + (name "suitesparse-klu") + (version "2.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "KLU"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-btf + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (substitute* "../KLU/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../KLU/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../KLU/Doc/KLU_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../KLU/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs + (list suitesparse-camd + suitesparse-ccolamd + suitesparse-colamd + suitesparse-config)) + (propagated-inputs + (list suitesparse-amd + suitesparse-btf + suitesparse-cholmod)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Routines for solving sparse linear problems with a LU factorization") + (description "KLU is a method for computing the LU factorization of sparse +for real and complex matrices.") + (license license:lgpl2.1+))) + +(define-public suitesparse-ldl + (package + (name "suitesparse-ldl") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "LDL"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (substitute* "../LDL/Doc/Makefile" + (("\\.\\./\\.\\./BTF/Include/btf.h") + (string-append #$suitesparse-btf "/include/btf.h"))) + (with-directory-excursion "../LDL/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../LDL/Doc/ldl_userguide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../LDL/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-amd)) + (propagated-inputs (list suitesparse-config)) + (native-inputs (list (texlive-updmap.cfg '()))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "LDL' factorization method for sparse, symmetric matrices") + (description "This package contains a set of routines for computing the +LDL' factorization of sparse, symmetric matrices. Its focus lies on concise +code.") + (license license:lgpl2.1+))) + +(define-public suitesparse-rbio + (package + (name "suitesparse-rbio") + (version "4.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "RBio"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (replace 'install-license-files + (lambda _ + (let ((out (string-append #$output + "/share/doc/" #$name "-" #$version))) + (install-file "../RBio/Doc/License.txt" out) + (install-file "../RBio/Doc/gpl.txt" out))))))) + (propagated-inputs (list suitesparse-config)) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Library for the Rutherford/Boeing sparse matrix format") + (description "This package provides the C library of RBio. It can be used +for reading and writing sparse matrices in the Rutherford/Boeing format.") + (license license:gpl2+))) + +(define-public suitesparse-mongoose + (package + (name "suitesparse-mongoose") + (version "3.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "Mongoose"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append "set(CMAKE_MODULE_PATH " + #$suitesparse-config "/lib/cmake/SuiteSparse)\n" + "set(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + ;; XeLaTeX fails with .eps graphics + (with-directory-excursion "../Mongoose/Doc" + (for-each + (lambda (name) + (invoke "epstopdf" name)) + (find-files "Figures" "\\.eps$")) + (substitute* "Mongoose_UserGuide.tex" + (("\\.eps") ".pdf")) + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../Mongoose/Doc/Mongoose_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../Mongoose/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (propagated-inputs (list suitesparse-config)) + (native-inputs + (list texlive-epstopdf + (texlive-updmap.cfg + (list texlive-algorithmicx + texlive-booktabs + texlive-lastpage + texlive-multirow + texlive-pgf + texlive-caption + texlive-etoolbox + texlive-csquotes + texlive-fancybox + texlive-enumitem + texlive-microtype + texlive-cancel + texlive-sourcecodepro + texlive-xkeyval + texlive-fontspec + texlive-wasy + texlive-wasysym + texlive-float + texlive-tcolorbox + texlive-environ + texlive-xcolor + texlive-xetex + texlive-listings)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Graph partitioning library") + (description "Mongoose is a library for graph partitioning by computing +edge cuts using a coarsening and refinement framework.") + (license license:gpl3))) + +(define-public suitesparse-spex + (package + (name "suitesparse-spex") + (version "2.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SPEX"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../SPEX/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../SPEX/Doc/SPEX_UserGuide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list suitesparse-amd suitesparse-colamd)) + (propagated-inputs (list gmp mpfr suitesparse-config)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-paralist + texlive-comment + texlive-psfrag + texlive-soul + texlive-multirow + texlive-algorithms + texlive-float + texlive-algorithmicx + texlive-cprotect + texlive-bigfoot + texlive-caption + texlive-listings + texlive-xcolor + texlive-framed + texlive-mdframed + texlive-etoolbox + texlive-zref + texlive-needspace)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Package for SParse EXact algebra") + (description "SPEX is a set of routines for sparse exact linear algebra. +It contains the SPEX Left LU library for computing a sparse exact left-looking +LU factorization for solving unsymmetric sparse linear systems.") + ;; Dual licensed. + (license (list license:lgpl3+ license:gpl2+)))) + +(define-public suitesparse-spqr + (package + (name "suitesparse-spqr") + (version "4.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "SPQR"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../SPQR/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (install-file "../SPQR/Doc/spqr_user_guide.pdf" + (string-append #$output "/share/doc/" + #$name "-" #$version)))) + (replace 'install-license-files + (lambda _ + (install-file "../SPQR/Doc/License.txt" + (string-append #$output "/share/doc/" + #$name "-" #$version))))))) + (inputs (list openblas + suitesparse-amd + suitesparse-camd + suitesparse-ccolamd + suitesparse-colamd + suitesparse-config)) + (propagated-inputs (list suitesparse-cholmod)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-epsf)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Sparse QR factorization method") + (description "The SPQR (SuiteSparseQR) package provides sparse QR +factorization based on the multifrontal method, using BLAS for the frontal +matrices.") + (license license:gpl2+))) + +(define-public suitesparse-umfpack + (package + (name "suitesparse-umfpack") + (version "6.2.0") + (source suitesparse-source) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "UMFPACK"))) + (add-after 'chdir 'set-cmake-module-path + (lambda _ + (substitute* "CMakeLists.txt" + (("set.*CMAKE_MODULE_PATH.*") + (string-append + "set(CMAKE_MODULE_PATH " + (string-join + (map (lambda (path) + (string-append path "/lib/cmake/SuiteSparse")) + (list #$suitesparse-amd + #$suitesparse-camd + #$suitesparse-ccolamd + #$suitesparse-cholmod + #$suitesparse-colamd + #$suitesparse-config))) + ")\nset(DUMMY\n"))))) + (add-after 'build 'build-doc + (lambda _ + (with-directory-excursion "../UMFPACK/Doc" + (invoke "make")))) + (add-after 'install 'install-doc + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../UMFPACK/Doc/UMFPACK_UserGuide.pdf" outdir) + (install-file "../UMFPACK/Doc/UMFPACK_QuickStart.pdf" outdir)))) + (replace 'install-license-files + (lambda _ + (let ((outdir + (string-append #$output "/share/doc/" + #$name "-" #$version))) + (install-file "../UMFPACK/Doc/License.txt" outdir) + (install-file "../UMFPACK/Doc/gpl.txt" outdir))))))) + (inputs (list openblas + suitesparse-camd + suitesparse-ccolamd + suitesparse-cholmod + suitesparse-colamd)) + (propagated-inputs + (list suitesparse-amd + suitesparse-config)) + (native-inputs + (list (texlive-updmap.cfg + (list texlive-etoolbox + texlive-framed + texlive-mdframed + texlive-needspace + texlive-xcolor + texlive-zref)))) + (home-page "https://people.engr.tamu.edu/davis/suitesparse.html") + (synopsis "Routines for solving sparse linear problems via LU factorization") + (description "UMFPACK is a set of routines for solving unsymmetric sparse +linear systems using the Unsymmetric MultiFrontal method and direct sparse LU +factorization.") + (license license:gpl2+))) + (define-public suitesparse (package (name "suitesparse") @@ -5111,7 +6299,10 @@ multifrontal LU factorization; CHOLMOD, supernodal Cholesky; SPQR, multifrontal QR; KLU and BTF, sparse LU factorization, well-suited for circuit simulation; ordering methods (AMD, CAMD, COLAMD, and CCOLAMD); CSparse and CXSparse, a concise sparse Cholesky factorization package; and many other -packages.") +packages. + +This package contains all of the above-mentioned parts. +") ;; LGPLv2.1+: ;; AMD, CAMD, BTF, COLAMD, CCOLAMD, CSparse, CXSparse, KLU, LDL ;; GPLv2+: @@ -5429,13 +6620,13 @@ revised simplex and the branch-and-bound methods.") (string-replace-substring version "." "-"))))) (file-name (git-file-name "trilinos" version)) (sha256 - (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")))) + (base32 "0fnwlhzsh85qj38cq3igbs8nm1b2jdgr2z734sapmyyzsy21mkgp")) + (patches + (search-patches "teuchos-remove-duplicate-using.patch" + "tpetra-remove-duplicate-using.patch")))) (build-system cmake-build-system) (native-inputs (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 @@ -5560,17 +6751,17 @@ A unique design feature of Trilinos is its focus on packages.") (define-public dealii (package (name "dealii") - (version "9.4.0") + (version "9.5.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/dealii/dealii/releases/" "download/v" version "/dealii-" version ".tar.gz")) (sha256 - (base32 "0v73q6f35f2yrjihaq6vh9lma07qc4cdv75nwmc3c5yrdh07g1i3")) + (base32 "0phgcfnil4rb41xipsdbm4lxrymlqxbiccakg3pkm3a8wqsva658")) (modules '((guix build utils))) (snippet - ;; Remove bundled boost, muparser, TBB and UMFPACK. + ;; Remove bundled boost, Kokkos, muparser, TBB and UMFPACK. #~(delete-file-recursively "bundled")))) (build-system cmake-build-system) (outputs '("out" "doc")) @@ -5594,6 +6785,7 @@ A unique design feature of Trilinos is its focus on packages.") ;; the requisite interpreter to its native inputs. (list boost hdf5 + kokkos suitesparse ; For UMFPACK. sundials tbb)) @@ -5618,6 +6810,18 @@ A unique design feature of Trilinos is its focus on packages.") "/examples"))) #:phases #~(modify-phases %standard-phases + ;; Without unsetting CPATH, the build fails with the following + ;; error (similar to <https://bugs.gnu.org/30756>): + ;; + ;; /gnu/store/…-gcc-11.3.0/include/c++/math.h:30:16: fatal error: math.h: No such file or directory + ;; 30 | # include_next <math.h> + ;; | ^~~~~~~~ + ;; + ;; Why does unsetting CPATH magically fix the error? + ;; TODO: Properly fix this issue. + (add-after 'set-paths 'unset-cpath + (lambda _ + (unsetenv "CPATH"))) (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 @@ -5649,7 +6853,7 @@ in finite element programs.") scalapack))) (propagated-inputs (modify-inputs (package-propagated-inputs dealii) - (delete "hdf5" "sundials") + (delete "hdf5" "kokkos" "sundials") (prepend hdf5-parallel-openmpi openmpi p4est-openmpi @@ -5660,7 +6864,12 @@ in finite element programs.") (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags flags) - #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)))) + #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + ;; The build failure fixed by this phase does not manifest when + ;; Kokkos is included via Trilinos. + (delete 'unset-cpath))))) (synopsis "Finite element library (with MPI support)"))) (define-public flann @@ -6530,60 +7739,65 @@ symmetric matrices.") (synopsis "Eigenvalue solvers for symmetric matrices (with MPI support)"))) (define-public elemental - (package - (name "elemental") - (version "0.87.7") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/elemental/Elemental") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1687xpjjzig27y2pnqv7hv09smpijyfdpz7qjgmcxf4shfajlfkc")))) - (build-system cmake-build-system) - (home-page "https://github.com/elemental/Elemental") - (native-inputs - (list gfortran)) - (inputs - `(("blas" ,openblas) - ("gfortran:lib" ,gfortran "lib") - ("gmp" ,gmp) - ("lapack" ,lapack) - ("metis" ,metis) - ("mpc" ,mpc) - ("mpfr" ,mpfr) - ("mpi" ,openmpi) - ("qd" ,qd))) - (arguments - `(#:build-type "Release" ;default RelWithDebInfo not supported - #:configure-flags `("-DEL_DISABLE_PARMETIS:BOOL=YES" - "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" - "-DEL_CACHE_WARNINGS:BOOL=YES" - "-DEL_TESTS:BOOL=YES" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DGFORTRAN_LIB=gfortran") - #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup) - (add-before 'check 'setup-tests - (lambda _ - ;; Parallelism is done at the MPI layer. - (setenv "OMP_NUM_THREADS" "1") - #t)) - (add-after 'install 'remove-tests - (lambda* (#:key outputs #:allow-other-keys) - ;; Tests are installed, with no easy configuration - ;; switch to prevent this, so delete them. - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) - #t))))) - (synopsis "Dense and sparse-direct linear algebra and optimization") - (description "Elemental is a modern C++ library for distributed-memory + ;; The build of 0.87.7 is failed for a long time due to new version of GCC. The + ;; latest commit has fixes. + ;; See https://github.com/elemental/Elemental/issues/254 + (let ((commit "6eb15a0da2a4998bf1cf971ae231b78e06d989d9") + (revision "0")) + (package + (name "elemental") + (version (git-version "0.87.7" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elemental/Elemental") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06xcs4ic60ndcf2hq19gr8yjwdsnphpcyhapab41rkw726z4lm7p")))) + (build-system cmake-build-system) + (arguments + (list + #:build-type "Release" ;default RelWithDebInfo not supported + #:configure-flags + #~(list "-DEL_DISABLE_PARMETIS:BOOL=YES" + "-DEL_AVOID_COMPLEX_MPI:BOOL=NO" + "-DEL_CACHE_WARNINGS:BOOL=YES" + "-DEL_TESTS:BOOL=YES" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DGFORTRAN_LIB=gfortran") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'mpi-setup + #$%openmpi-setup) + (add-before 'check 'setup-tests + (lambda _ ;; Parallelism is done at the MPI layer. + (setenv "OMP_NUM_THREADS" "1"))) + (add-after 'install 'remove-tests + (lambda _ + ;; Tests are installed, with no easy configuration + ;; switch to prevent this, so delete them. + (delete-file-recursively + (string-append #$output "/bin/test"))))))) + (native-inputs + (list gfortran)) + (inputs + (list `(,gfortran "lib") + gmp + lapack + metis + mpc + mpfr + openmpi + qd + openblas)) + (home-page "https://github.com/elemental/Elemental") + (synopsis "Dense and sparse-direct linear algebra and optimization") + (description "Elemental is a modern C++ library for distributed-memory dense and sparse-direct linear algebra, conic optimization, and lattice reduction.") - (license license:bsd-2))) + (license license:bsd-2)))) (define-public mcrl2 (package @@ -7504,15 +8718,15 @@ management via the GIMPS project's Primenet server.") (define-public nauty (package (name "nauty") - (version "2.7r4") + (version "2.8.6") (source (origin (method url-fetch) (uri (string-append "https://pallini.di.uniroma1.it/" - "nauty" (string-join (string-split version #\.) "") ".tar.gz")) + "nauty" (string-join (string-split version #\.) "_") ".tar.gz")) (sha256 - (base32 "19j8i10cgnqavphj0p7kq939azxckj9ayjpjr6sg76g2dxdch45q")))) + (base32 "1yp6wpz2drq0viww8px1vl4pw919nq3xgxrmrrdhycx8bhi9ikpj")))) (build-system gnu-build-system) (outputs '("out" "lib")) (arguments @@ -7521,37 +8735,11 @@ management via the GIMPS project's Primenet server.") #:configure-flags #~(list "--enable-generic") ;prevent -march-native #:phases #~(modify-phases %standard-phases - ;; Default make target does not build all available - ;; executables. Create them now. - (add-after 'build 'build-extra-programs - (lambda _ - (for-each (lambda (target) (invoke "make" target)) - '("blisstog" "bliss2dre" "checks6" "sumlines")))) - ;; Upstream does not provide any install target. - (replace 'install + (add-after 'unpack 'normalize-pkgconfig-files-location (lambda _ - (let* ((bin (string-append #$output "/bin")) - (doc (string-append #$output "/share/doc/nauty/")) - (include (string-append #$output:lib "/include/nauty")) - (lib (string-append #$output:lib "/lib/nauty"))) - (for-each (lambda (f) (install-file f bin)) - '("addedgeg" "amtog" "assembleg" "biplabg" "blisstog" - "bliss2dre" "catg" "checks6" "complg" "converseg" - "copyg" "countg" "cubhamg" "deledgeg" "delptg" - "directg" "dreadnaut" "dretodot" "dretog" "genbg" - "genbgL" "geng" "genquarticg" "genrang" "genspecialg" - "gentourng" "gentreeg" "hamheuristic" "labelg" - "linegraphg" "listg" "multig" "newedgeg" "pickg" - "planarg" "ranlabg" "shortg" "showg" "subdivideg" - "sumlines" "twohamg" "underlyingg" "vcolg" - "watercluster2" "NRswitchg")) - (for-each (lambda (f) (install-file f include)) - (find-files "." "\\.h$")) - (for-each (lambda (f) (install-file f lib)) - (find-files "." "\\.a$")) - (for-each (lambda (f) (install-file f doc)) - (append '("formats.txt" "README" "schreier.txt") - (find-files "." "\\.pdf$"))))))))) + (substitute* "makefile.in" + (("^(pkgconfigexecdir=).*" _ prefix) + (string-append prefix "${libdir}/pkgconfig\n")))))))) (inputs (list gmp)) ;for sumlines (home-page "https://pallini.di.uniroma1.it/") @@ -8487,7 +9675,7 @@ computation is supported via MPI.") (define-public scilab (package (name "scilab") - (version "2023.1.0") + (version "2024.0.0") (source (origin (method git-fetch) @@ -8497,10 +9685,9 @@ computation is supported via MPI.") (file-name (git-file-name name version)) (sha256 (base32 - "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) + "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) (modules '((guix build utils) (ice-9 ftw))) - (patches (search-patches "scilab-hdf5-1.8-api.patch")) (snippet #~(begin ;; Delete everything except for scilab itself: @@ -8517,7 +9704,8 @@ computation is supported via MPI.") (for-each delete-file-recursively '("scilab" "config" - "libs/GetWindowsVersion")) + "libs/GetWindowsVersion" + "Visual-Studio-settings")) (for-each delete-file (cons* "aclocal.m4" "configure" @@ -8529,22 +9717,23 @@ computation is supported via MPI.") "m4/ltversion.m4" "m4/lt~obsolete.m4" "m4/pkg.m4" + "Scilab.sln" (find-files "." "^Makefile\\.in$"))) ;; And finally some files in the modules directory: (for-each - (lambda (file) - (delete-file - (string-append "modules/dynamic_link/src/scripts/" file))) - '("aclocal.m4" - "configure" - "compile" - "config.guess" - "config.sub" - "ltmain.sh" - "depcomp" - "install-sh" - "missing")) + (lambda (file) + (delete-file + (string-append "modules/dynamic_link/src/scripts/" file))) + '("aclocal.m4" + "configure" + "compile" + "config.guess" + "config.sub" + "ltmain.sh" + "depcomp" + "install-sh" + "missing")) (delete-file-recursively "modules/dynamic_link/src/scripts/m4") (for-each delete-file '("modules/ast/src/cpp/parse/scanscilab.cpp" @@ -8553,7 +9742,7 @@ computation is supported via MPI.") "modules/ast/src/cpp/parse/parsescilab.cpp")))))) (build-system gnu-build-system) (native-inputs - (list autoconf + (list autoconf-2.71 autoconf-archive automake bison @@ -8570,8 +9759,9 @@ computation is supported via MPI.") curl fftw gettext-minimal - hdf5-1.14 + hdf5-1.10 lapack + libarchive libx11 libxml2 matio @@ -8582,83 +9772,125 @@ computation is supported via MPI.") tcl tk)) (arguments - (list - ;; The tests require java code. - #:tests? #f - #:configure-flags - #~(list - "--enable-relocatable" - "--disable-static-system-lib" - "--enable-build-parser" - ;; Disable all java code. - "--without-gui" - "--without-javasci" - "--disable-build-help" - "--with-external-scirenderer" - ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (dirname - (search-input-file %build-inputs "include/tcl.h"))) - (string-append "--with-tcl-library=" - (dirname - (search-input-directory %build-inputs "lib/tcl8"))) - (string-append "--with-tk-include=" - (dirname - (search-input-file %build-inputs "include/tk.h"))) - (string-append "--with-tk-library=" - (dirname - (search-input-directory %build-inputs "lib/tk8.6"))) - (string-append "--with-eigen-include=" - (search-input-directory %build-inputs "include/eigen3")) - ;; Find and link to the OCaml Num package - "OCAMLC=ocamlfind ocamlc -package num" - "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg" - ;; There are some 2018-fortran errors that are ignored - ;; with this fortran compiler flag. - "FFLAGS=-fallow-argument-mismatch") - #:phases - #~(modify-phases %standard-phases - ;; The Num library is specified with the OCAMLC and - ;; OCAMLOPT variables above. - (add-after 'unpack 'fix-ocaml-num - (lambda _ - (substitute* - '("modules/scicos/Makefile.modelica.am" - "modules/scicos/src/translator/makefile.mak" - "modules/scicos/src/modelica_compiler/makefile.mak") - (("nums\\.cmx?a") "")))) - ;; Install only scilab-cli.desktop - (add-after 'unpack 'remove-desktop-files - (lambda _ - (substitute* "desktop/Makefile.am" - (("desktop_DATA =") - "desktop_DATA = scilab-cli.desktop\nDUMMY =")))) - ;; These generated files are assumed to be present during - ;; the build. - (add-after 'bootstrap 'bootstrap-dynamic_link-scripts - (lambda _ - (with-directory-excursion "modules/dynamic_link/src/scripts" - ((assoc-ref %standard-phases 'bootstrap))))) - (add-before 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - ;; Fix scilab script. - (substitute* "bin/scilab" - (("\\/bin\\/ls") - (search-input-file inputs "bin/ls"))) - ;; Fix core.start. - (substitute* "modules/core/etc/core.start" - (("'SCI/modules") - "SCI+'/modules")) - ;; Set SCIHOME to /tmp before macros compilation. - (setenv "SCIHOME" "/tmp"))) - ;; Prevent race condition - (add-after 'pre-build 'build-parsers - (lambda* (#:key (make-flags #~'()) #:allow-other-keys) - (with-directory-excursion "modules/ast" - (apply invoke "make" - "src/cpp/parse/parsescilab.cpp" - "src/cpp/parse/scanscilab.cpp" - make-flags))))))) + (let* ((tcl (this-package-input "tcl")) + (tk (this-package-input "tk"))) + (list + #:configure-flags + #~(list + "--enable-relocatable" + "--disable-static-system-lib" + "--enable-build-parser" + ;; Disable all java code. + "--without-gui" + "--without-javasci" + "--disable-build-help" + "--with-external-scirenderer" + ;; Tcl and Tk library locations. + (string-append "--with-tcl-include=" #$tcl "/include") + (string-append "--with-tcl-library=" #$tcl "/lib") + (string-append "--with-tk-include=" #$tk "/include") + (string-append "--with-tk-library=" #$tk "/lib") + (string-append "--with-eigen-include=" + (search-input-directory %build-inputs "include/eigen3")) + ;; Find and link to the OCaml Num package + "OCAMLC=ocamlfind ocamlc -package num" + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") + #:phases + #~(modify-phases %standard-phases + ;; The Num library is specified with the OCAMLC and + ;; OCAMLOPT variables above. + (add-after 'unpack 'fix-ocaml-num + (lambda _ + (substitute* + '("modules/scicos/Makefile.modelica.am" + "modules/scicos/src/translator/makefile.mak" + "modules/scicos/src/modelica_compiler/makefile.mak") + (("nums\\.cmx?a") "")))) + (add-after 'unpack 'fix-linking + (lambda _ + (substitute* "modules/Makefile.am" + (("libscilab_cli_la_LDFLAGS = .*\\)" all) + (string-append all " -lcurl"))))) + (add-after 'unpack 'set-version + (lambda _ + (substitute* "modules/core/includes/version.h.in" + (("scilab-branch-main") ; version + (string-append + "scilab-" + #$(version-major+minor (package-version this-package))))))) + (add-after 'unpack 'restrain-to-scilab-cli + (lambda _ + ;; Install only scilab-cli.desktop + (substitute* "desktop/Makefile.am" + (("desktop_DATA =") + "desktop_DATA = scilab-cli.desktop\nDUMMY =")) + ;; Replace scilab with scilab-cli for tests. + (substitute* "Makefile.incl.am" + (("scilab-bin") "scilab-cli-bin") + (("scilab -nwni") "scilab-cli") + ;; Do not install tests, demos and examples. + ;; This saves up to 140 Mo in the final output. + (("(TESTS|DEMOS|EXAMPLES)_DIR=.*" all kind) + (string-append kind "_DIR="))))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "Makefile" + (("TESTS = .*") + "TESTS =\n")) + (substitute* "modules/functions_manager/Makefile" + (("check:.*") + "check:\n")) + (substitute* "modules/types/Makefile" + (("\\$\\(MAKE\\) \\$\\(AM_MAKEFLAGS\\) check-am") + "")))) + ;; These generated files are assumed to be present during + ;; the build. + (add-after 'bootstrap 'bootstrap-dynamic_link-scripts + (lambda _ + (with-directory-excursion "modules/dynamic_link/src/scripts" + ((assoc-ref %standard-phases 'bootstrap))))) + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix scilab script. + (substitute* "bin/scilab" + (("/bin/ls") + (search-input-file inputs "bin/ls"))) + ;; Fix core.start. + (substitute* "modules/core/etc/core.start" + (("'SCI/modules") + "SCI+'/modules")))) + ;; Prevent race condition + (add-after 'pre-build 'build-parsers + (lambda* (#:key (make-flags #~'()) #:allow-other-keys) + (with-directory-excursion "modules/ast" + (apply invoke "make" + "src/cpp/parse/parsescilab.cpp" + "src/cpp/parse/scanscilab.cpp" + make-flags)))) + ;; The startup script is mostly there to define the following env + ;; variables properly. We can do this with guix directly. + (add-after 'install 'rewrap-scilab-cli + (lambda _ + (define (bin path) (string-append #$output "/bin/" path)) + (delete-file (bin "scilab-cli")) + (wrap-program (bin "scilab-cli-bin") + `("SCI" = (,(string-append #$output "/share/scilab"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$output "/lib/scilab"))) + `("TCL_LIBRARY" = (,(string-append #$tcl "/lib"))) + `("TK_LIBRARY" = (,(string-append #$tk "/lib")))) + (copy-file (bin "scilab-cli-bin") (bin "scilab-cli")) + (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) + (delete-file (bin ".scilab-cli-bin-real")) + (substitute* (bin "scilab-cli") + ;; Also set SCIHOME to sensible XDG base dirs value. + (("\\.scilab-cli-bin-real\"") + (string-append + "scilab-cli-bin\" -scihome " + "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/" + #$(package-version this-package) "\"")) + (("export SCI=") + "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab @@ -8703,3 +9935,88 @@ user has been TensorFlow Lite, where it is used by default on the ARM CPU architecture.") (license license:asl2.0)))) +(define-public bliss + (package + (name "bliss") + (version "0.77") + (source (origin + (method url-fetch) + (uri (string-append + "https://users.aalto.fi/~tjunttil/bliss/downloads/bliss-" + version ".zip")) + (sha256 + (base32 + "193jb63kdwfas2cf61xj3fgkvhb6v2mnbwwpr0jas3zk6j0bkj5c")))) + (build-system cmake-build-system) + (arguments + (list + ;; There are no tests + #:tests? #f + #:configure-flags #~(list "-DUSE_GMP=ON") ; Used by igraph + #:phases + #~(modify-phases %standard-phases + ;; Ensure that GMP is used, otherwise the BigNum type changes. + (add-after 'unpack 'define-use-gmp + (lambda _ + (substitute* "src/bignum.hh" + (("#pragma once.*" all) + (string-append all "#define BLISS_USE_GMP"))))) + ;; Move headers under the bliss/ prefix. This is a Guix choice, + ;; since there are no upstream installation instructions and the + ;; header names are sufficiently generic to cause confusions with + ;; other packages (e.g. "heap.hh"). + (add-after 'define-use-gmp 'move-headers + (lambda _ + (substitute* (find-files "src") + (("#include \"(.*)\"" _ path) + (string-append "#include <bliss/" path ">"))) + (mkdir-p "include/bliss") + (for-each + (lambda (file) + (rename-file file + (string-append "include/bliss/" (basename file)))) + (find-files "src" "\\.(h|hh)$")) + (substitute* "Doxyfile" + (("INPUT *=.*") "INPUT = bliss")))) + (add-after 'move-headers 'patch-cmake + (lambda _ + (let ((port (open-file "CMakeLists.txt" "a"))) + (display + (apply + string-append + ;; Install the executable and the shared library. + "install(TARGETS bliss)\n" + "install(TARGETS bliss-executable)\n" + "install(DIRECTORY include/bliss DESTINATION include)\n" + "target_link_libraries(bliss PUBLIC ${GMP_LIBRARIES})\n" + ;; Missing include directories. + (map + (lambda (name) + (string-append + "target_include_directories(" name " PUBLIC\n" + "${CMAKE_CURRENT_SOURCE_DIR}/include" + " ${GMP_INCLUDE_DIR})\n")) + '("bliss" "bliss_static" "bliss-executable"))) + port) + (close-port port)))) + (add-after 'build 'build-doc + (lambda _ + (mkdir "doc") + (with-directory-excursion "doc" + (let ((srcdir (string-append "../../bliss-" #$version))) + (copy-recursively (string-append srcdir "/include/bliss") + "bliss") + (invoke "doxygen" (string-append srcdir "/Doxyfile")))))) + (add-after 'install 'install-doc + (lambda _ + (copy-recursively + "doc/html" (string-append #$output "/share/doc/" + #$name "-" #$version "/html"))))))) + (native-inputs (list doxygen graphviz unzip)) + (propagated-inputs (list gmp)) + (home-page "https://users.aalto.fi/~tjunttil/bliss/index.html") + (synopsis "Tool for computing automorphism groups and canonical labelings of graphs") + (description "@code{bliss} is a library for computing automorphism groups ++and canonical forms of graphs. It has both a command line user interface as ++well as C++ and C programming language APIs.") + (license license:lgpl3))) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index a7924d943d..df7fbb409b 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages texinfo) #:use-module (guix build-system gnu) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix licenses) #:use-module (guix packages) @@ -153,15 +154,16 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.24.2") + (version "0.26") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "0vp8v88zszh1imm3dvdfi3m8cywshdj7xcrsq4cgmss69s2y1nkx")))) - (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) + "1m45wcrpp3syzdniqx12nyr6v8f9hsg516pwl1k9894nb2ni08hg")))) + (supported-systems '("armhf-linux" "i686-linux" + "x86_64-linux" "riscv64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) (native-inputs (append (list guile-3.0) @@ -173,8 +175,13 @@ parsers to allow execution with Guile as extension languages."))) ;; MesCC 64 bit .go files installed ready for use with Guile. (list (cross-binutils "i686-unknown-linux-gnu") (cross-gcc "i686-unknown-linux-gnu"))) - (else - '()))) + ((string-prefix? "aarch64-linux" target-system) + ;; Use cross-compiler rather than #:system "armhf-linux" to get + ;; MesCC 64 bit .go files installed ready for use with Guile. + (let ((triplet "arm-linux-gnueabihf")) + (list (cross-binutils triplet) (cross-gcc triplet)))) + (else + '()))) (list graphviz help2man m2-planet perl ;build-aux/gitlog-to-changelog @@ -206,26 +213,24 @@ Guile.") (define-public mescc-tools (package (name "mescc-tools") - (version "1.4.0") + (version "1.5.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.nongnu.org/r/mescc-tools.git") - (commit (string-append "Release_" version)) - (recursive? #t))) ;for M2libc - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "mirror://savannah/" name "/" + name "-" version ".tar.gz")) (sha256 (base32 - "0z2ni2qn2np1walcaqlxz8sinzb78d4hiq9glddzf26wxc226hs4")))) + "1jak61gxab8bj8ddpgwfn9lqs917szq1phadmg8y5cjsndn1hv4k")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux" "aarch64-linux" "riscv64-linux")) (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (delete 'configure)))) + (list + #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:test-target "test" + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) (native-inputs (list which)) (synopsis "Tools for the full source bootstrapping process") (description @@ -239,19 +244,20 @@ get_machine.") (define-public m2-planet (package (name "m2-planet") - (version "1.9.0") + (version "1.11.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/oriansj/m2-planet") - (commit (string-append "Release_" version)) - (recursive? #t))) ;for M2libc - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append + "https://github.com/oriansj/M2-Planet/releases/download/" + "Release_" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0cgvvq91cbxxm93k8ayyvhpaf3c2lv10qw4wyqwn3hc1qb1cfyvr")))) + "1c510p55amxjyvjlx9jpa30gixlgmf6mmfnaqcs46412krymwg38")))) (native-inputs (list mescc-tools)) (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux" + "armhf-linux" "aarch64-linux" + "riscv32-linux" "riscv64-linux")) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) ,(string-append "CC=" (cc-for-target))) @@ -269,3 +275,4 @@ built as Phase-5 of the full source bootstrapping process and is capable of building GNU Mes.") (home-page "https://github.com/oriansj/m2-planet") (license gpl3+))) + diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cbc303d170..27a584f25f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name> ;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> -;;; Copyright © 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 jgart <jgart@dismail.de> ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org> @@ -1483,14 +1483,14 @@ Qt-based XMPP library QXmpp.") (define-public prosody (package (name "prosody") - (version "0.12.3") + (version "0.12.4") (source (origin (method url-fetch) (uri (string-append "https://prosody.im/downloads/source/" "prosody-" version ".tar.gz")) (sha256 (base32 - "0091vc0v8xnxkpdi4qpy4dirn92y4pa09q1qssi40q7l3w1hvnim")))) + "0mjqss1h2cw0nlyj9nkxdg1bnq1j0zndlv1g8665aa9g7hki5ms7")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;tests require "busted" @@ -2640,11 +2640,11 @@ replacement.") (license license:gpl2+))) (define-public tdlib - (let ((commit "4d1d22d6f477d61f6ff2b8f6e49de1847092c5b4") + (let ((commit "4ed0b23c9c99868ab4d2d28e8ff244687f7b3144") (revision "0")) (package (name "tdlib") - (version (git-version "1.8.16" revision commit)) + (version (git-version "1.8.20" revision commit)) (source (origin (method git-fetch) @@ -2652,7 +2652,7 @@ replacement.") (url "https://github.com/tdlib/td") (commit commit))) (sha256 - (base32 "0nv921k795kq0l993rxzd5pm5v3l3mnwbaxb7d7d0m0506l4w9fk")) + (base32 "16kprlcnphi89yfwgnlaxjwwb1xx24az8xd710rx8cslb4zv00qw")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -3198,7 +3198,7 @@ designed for experienced users.") (define-public matterbridge (package (name "matterbridge") - (version "1.25.2") + (version "1.26.0") (source (origin (method git-fetch) (uri (git-reference @@ -3207,7 +3207,7 @@ designed for experienced users.") (file-name (git-file-name name version)) (sha256 (base32 - "0csvxsgl62fjkrmk0wy64h2qaiy16m0wh6pqfbhz0kfacq16p9an")))) + "0939fiy7z53izznfhlr7c6vaskbmkbj3ncb09fzx5dmz9cjngy80")))) ;; Using the go-build-system results in the same error message ;; than in the bug 1551[1]. So we fix it by running go build ;; manually in the git repository as-is as this is the solution @@ -3384,7 +3384,7 @@ Weechat communicate over the Matrix protocol.") (define-public weechat-wee-slack (package (name "weechat-wee-slack") - (version "2.9.1") + (version "2.10.1") (source (origin (method git-fetch) @@ -3394,7 +3394,7 @@ Weechat communicate over the Matrix protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "1zhiwbljh4rgbj8i9rrcimi9v3a7g1nm7v2m2f754rnddck9343z")))) + "0ykzmn4q592ih9d6m5ks2dzbxkz3mj81sxwsn9g2vzsxj7w3p2r7")))) (build-system python-build-system) (arguments `(#:phases @@ -3419,9 +3419,9 @@ Weechat communicate over the Matrix protocol.") (when tests? (invoke "pytest"))))))) (inputs - (list python-mock python-websocket-client)) + (list python-websocket-client)) (native-inputs - (list python-pytest)) + (list python-mock python-pytest)) (home-page "https://github.com/wee-slack/wee-slack") (synopsis "Weechat Slack script") (description "@code{weechat-wee-slack} is a WeeChat native client for @@ -3524,4 +3524,57 @@ phone numbers (get validity information, reformat them, or extract numbers from a text snippet), using @code{libphonenumber}.") (license license:asl2.0))) +(define-public senpai + (package + (name "senpai") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://git.sr.ht/~taiite/senpai") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qw955i5f3jr42h4afr23v7wq616bcsyq68if75qdw8j1yibnpmb")))) + (build-system go-build-system) + (arguments + (list #:import-path "git.sr.ht/~taiite/senpai/cmd/senpai" + #:unpack-path "git.sr.ht/~taiite/senpai" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda* (#:key unpack-path #:allow-other-keys) + (invoke "make" "doc/senpai.1" "doc/senpai.5" + "-C" (string-append "src/" unpack-path)))) + (add-after 'install 'install-doc + (lambda* (#:key unpack-path #:allow-other-keys) + (let ((man1 (string-append #$output "/share/man/man1")) + (man5 (string-append #$output "/share/man/man5"))) + (mkdir-p man1) + (mkdir-p man5) + (install-file + (string-append "src/" unpack-path "/doc/senpai.1") + man1) + (install-file + (string-append "src/" unpack-path "/doc/senpai.5") + man5))))))) + (native-inputs (list go-git-sr-ht-emersion-go-scfg + go-github-com-delthas-go-libnp + go-github-com-delthas-go-localeinfo + go-github-com-gdamore-tcell-v2 + go-github-com-mattn-go-runewidth + go-golang-org-x-net + go-golang-org-x-term + go-golang-org-x-time + go-mvdan-cc-xurls + scdoc)) + (home-page "https://sr.ht/~taiite/senpai") + (synopsis "Modern terminal IRC client") + (description + "@code{senpai} is an IRC client that works best with bouncers.") + (license license:isc))) + ;;; messaging.scm ends here diff --git a/gnu/packages/mold.scm b/gnu/packages/mold.scm index 1e67f80081..4ce3741be2 100644 --- a/gnu/packages/mold.scm +++ b/gnu/packages/mold.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com> +;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,7 @@ (define-public mold (package (name "mold") - (version "1.10.1") + (version "2.3.2") (source (origin (method git-fetch) @@ -43,10 +44,22 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bqv1a93n3nks38k8fdc5i7v7ca2sav8n4xxaph0ikaqw1mkjcg7")) + (base32 "1p6w92caysy9h0vkl26iv3viv0lvwzvbd357yykls0p13hnzlzkr")) (modules '((guix build utils))) (snippet #~(begin + ;; Fix detection of i686 systems. + ;; This can be removed with the next release of mold. + (substitute* "test/elf/common.inc" + (("echo i386") "echo i686")) + (substitute* '("test/elf/common.inc" + "test/elf/global-offset-table.sh" + "test/elf/i386_tls-module-base.sh" + "test/elf/large-alignment-dso.sh" + "test/elf/large-alignment.sh" + "test/elf/nocopyreloc.sh" + "test/elf/range-extension-thunk.sh") + (("MACHINE = i386") "MACHINE = i686")) (for-each (lambda (x) (delete-file-recursively (string-append "third-party/" x))) @@ -55,7 +68,8 @@ (arguments (list #:configure-flags #~(list "-DMOLD_USE_SYSTEM_MIMALLOC=ON" - "-DMOLD_USE_SYSTEM_TBB=ON") + "-DMOLD_USE_SYSTEM_TBB=ON" + "-DBUILD_TESTING=ON") #:phases #~(modify-phases %standard-phases (add-before 'configure 'force-system-xxhash @@ -69,6 +83,10 @@ (("CC=\"\\$\\{TEST_CC:-cc\\}\"") "CC=gcc") (("CXX=\"\\$\\{TEST_CXX:-c\\+\\+\\}\"") "CXX=g++")))) + (add-before 'configure 'skip-tbb-lto-test + (lambda _ + ;; This test needs tbb 2021.9.0 or newer + (delete-file "test/elf/lto-version-script.sh"))) (add-before 'configure 'disable-rpath-test (lambda _ ;; This test fails because mold expect the RUNPATH as-is, diff --git a/gnu/packages/moreutils.scm b/gnu/packages/moreutils.scm index 6291adfbbb..861aad776f 100644 --- a/gnu/packages/moreutils.scm +++ b/gnu/packages/moreutils.scm @@ -34,7 +34,7 @@ (define-public moreutils (package (name "moreutils") - (version "0.67") + (version "0.68") (source (origin (method url-fetch) (uri (string-append @@ -43,7 +43,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "045d2dfvsd4sxxr2i2qvkpgvi912qj9vc4gpc8fb4hr9q912z1q3")))) + "1rxn01hgm5nypcpnl4s9v5zr4fxzf8vxinzbg0s781qlpk3lpcay")))) (build-system gnu-build-system) (arguments (list #:phases diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index bc94cab19b..da56d3f9ac 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages lua) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -116,7 +117,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.23.13") + (version "0.23.14") (source (origin (method url-fetch) (uri @@ -125,7 +126,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "06fmy68lfrsi5y03l53dnwcynqhwh5f5vhdpbsr8lzmvzgk02sx9")))) + "1lh9nn4a7ng6i08df7rbs8c4nbgmz883pss9p2gswa6m4rsadfc5")))) (build-system meson-build-system) (arguments (list @@ -246,7 +247,16 @@ protocol.") ;; actually invoked. (lambda _ (substitute* "doc/meson.build" - (("rsync") "ls"))))))) + (("rsync") "ls")))) + (add-after 'install 'move-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (contrib (string-append out "/share/doc/mpc/contrib")) + (completion + (string-append out "/etc/bash_completion.d/"))) + (mkdir-p completion) + (rename-file (string-append contrib "/mpc-completion.bash") + (string-append completion "/mpc")))))))) (inputs (list libmpdclient)) (native-inputs (list pkg-config python-sphinx)) @@ -614,7 +624,7 @@ mpdevil loads all tags and covers on demand.") (define-public mympd (package (name "mympd") - (version "12.0.2") + (version "13.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -623,22 +633,29 @@ mpdevil loads all tags and covers on demand.") (file-name (git-file-name name version)) (sha256 (base32 - "19139ina79jdfmc2vh6xcp5n0z8c41fi2fz2fmvg623bpix3fcgf")))) + "1ly3iw4irybfxyafgrldldwc28a879wwnd1pg32m2sgrwyhr0czm")))) + (outputs '("out" "doc")) (build-system cmake-build-system) (arguments (list #:configure-flags - #~(list "-DMYMPD_BUILD_TESTING=ON" - ;; Handled by 'strip' phase. - "-DMYMPD_STRIP_BINARY=OFF") + #~(list "-DCMAKE_INSTALL_LOCALSTATEDIR=/var" + "-DMYMPD_BUILD_TESTING=ON" + "-DMYMPD_DOC_HTML=ON") #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; The following test requires network connectivity. - (invoke "ctest" "--exclude-regex" "test_http_client"))))))) - (native-inputs (list jq perl pkg-config)) + (invoke "ctest" "--exclude-regex" "test_http_client")))) + (add-after 'install 'move-doc + (lambda _ + (let ((old (string-append #$output "/share/doc")) + (new (string-append #$output:doc "/share/doc"))) + (mkdir-p (dirname new)) + (rename-file old new))))))) + (native-inputs (list jekyll jq perl pkg-config)) (inputs (list flac libid3tag lua openssl pcre2)) (home-page "https://jcorporation.github.io/") (synopsis "Web-based MPD client") diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index eec13e450d..d3bd15df3e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -141,7 +141,7 @@ bind processes, and much more.") (define-public hwloc-2 (package (inherit hwloc-1) - (version "2.9.2") + (version "2.9.3") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -149,7 +149,7 @@ bind processes, and much more.") "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "1kv0n3b9knb8aawf0hxaxn9wc9bbpwh676r2gmb0pc7qfzvgv1qa")))) + "1v0dzzgzp40slakdwdb8vy0hy4m2ff3gnzqpzi8k8vbgap764h2w")))) ;; libnuma is no longer needed. (inputs (modify-inputs (package-inputs hwloc-1) @@ -184,7 +184,7 @@ bind processes, and much more.") (define-public openmpi (package (name "openmpi") - (version "4.1.5") + (version "4.1.6") (source (origin (method url-fetch) @@ -192,7 +192,7 @@ bind processes, and much more.") (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56")) + (base32 "05g4245v0pdqcyjmgn50519ry5v5q8ig26iinmiynvaihm29jh7p")) (patches (search-patches "openmpi-mtl-priorities.patch")))) (properties diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index 3d11523a07..bbb0347a1d 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -251,30 +252,29 @@ error. Additionally, iRRAM uses the concept of multi-valued functions.") (define-public qd (package (name "qd") - (version "2.3.23") + (version "2.3.24") (source (origin (method url-fetch) (uri (string-append "https://crd-legacy.lbl.gov/~dhbailey/mpdist/qd-" version ".tar.gz")) (sha256 - (base32 "09pfd77rmy370hy7qdqw84z21y9zpl3fcwzf93rhiv0kwhfg9smk")))) + (base32 "0f0fwsyh23p5zfyrj6n16q7b56g213fnhdc8dbl22r3fz1rnqyx4")))) (build-system gnu-build-system) - (native-inputs - (list gfortran)) + (native-inputs (list automake autoconf gfortran)) (arguments - `(#:configure-flags `("--disable-enable_fma" ;weird :/ - "--disable-static" - "--enable-shared" - ,,@(if (string-prefix? "aarch64" - (or (%current-target-system) - (%current-system))) - ;; XXX: The qd_test test fails numerical - ;; accuracy checks for 'dd_real::exp()' on - ;; aarch64 with GCC 5.4 at -O2. Disabling - ;; expensive optimizations lets it pass. - '("CXXFLAGS=-O3 -fno-expensive-optimizations") - '("CXXFLAGS=-O3"))))) + (list + #:configure-flags + #~(list "--disable-enable_fma" ;weird :/ + "--disable-static" + "--enable-shared" + #$@(if (target-aarch64?) + ;; XXX: The qd_test test fails numerical + ;; accuracy checks for 'dd_real::exp()' on + ;; aarch64 with GCC 5.4 at -O2. Disabling + ;; expensive optimizations lets it pass. + '("CXXFLAGS=-O3 -fno-expensive-optimizations") + '("CXXFLAGS=-O3"))))) (home-page "https://www.davidhbailey.com/dhbsoftware/") (synopsis "Double-double and quad-double library") (description "This package supports both a double-double diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 62746234a2..cf368dce16 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2021 Frank Pursel <frank.pursel@gmail.com> ;;; Copyright © 2021 Rovanion Luckey <rovanion.luckey@gmail.com> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> -;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021, 2022, 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Thomas Albers Raviola <thomas@thomaslabs.org> @@ -553,7 +553,7 @@ you create custom user interfaces for your MIDI hardware.") (define-public strawberry (package (name "strawberry") - (version "1.0.18") + (version "1.0.21") (source (origin (method git-fetch) (uri (git-reference @@ -562,7 +562,7 @@ you create custom user interfaces for your MIDI hardware.") (file-name (git-file-name name version)) (sha256 (base32 - "1knijckphq2jxrz8nmv4cb64zl1rz3bjyq5ipac09hnj2gvv5rmw")) + "1ibs7x7i1zz2r13wg238c5bhr1j4x8vl7hvjg01vdl5hfrh2gk1i")) (modules '((guix build utils) (ice-9 regex))) (snippet @@ -620,6 +620,7 @@ you create custom user interfaces for your MIDI hardware.") gst-plugins-good icu4c libcdio + libebur128 libmtp protobuf pulseaudio @@ -3760,7 +3761,7 @@ event-based scripts for scrobbling, notifications, etc.") (define-public picard (package (name "picard") - (version "2.9.2") + (version "2.10") (source (origin (method url-fetch) (uri (string-append @@ -3768,7 +3769,7 @@ event-based scripts for scrobbling, notifications, etc.") "picard/picard-" version ".tar.gz")) (sha256 (base32 - "1gd4mypqcmpf8xnil1kqfv56znqg9pllvsj7fx8nq8jqaaw9cy6g")))) + "0f9rvif9m83jhal9n9x8kks17c0cgcipi1hjqmki7a296lz175ss")))) (build-system python-build-system) (arguments (list @@ -4961,7 +4962,7 @@ includes LV2 plugins and a JACK standalone client.") (define-public musescore (package (name "musescore") - (version "4.0.2") + (version "4.1.1") (source (origin (method git-fetch) @@ -4970,14 +4971,11 @@ includes LV2 plugins and a JACK standalone client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1yri94xs4xw0lsvmk5q7bqnpgmdadchfn08r7bb2y07jsi8qgm6w")) + (base32 "12h26k9qnsq027gdpch579nchwrqva1ymwm2fj5xmlh0aayrwy4d")) (modules '((guix build utils))) (snippet '(begin - ;; Remove unused libraries... - (for-each delete-file-recursively - '("thirdparty/freetype")) - ;; ... and precompiled binaries. + ;; Delete precompiled binaries. (delete-file-recursively "src/diagnostics/crashpad_handler") (substitute* "src/diagnostics/CMakeLists.txt" (("install") "#install")))))) @@ -5106,7 +5104,7 @@ studio.") (define-public gsequencer (package (name "gsequencer") - (version "5.5.0") + (version "6.1.3") (source (origin (method git-fetch) @@ -5115,7 +5113,7 @@ studio.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dl3gsmpc7b4hi97qri5d5rc3ikx639r3l1dy204p6dx8pwpv2ry")))) + (base32 "1h5zw9047qmhhc6n4ny11id1h1p8322wadl7p8j65bwrz8kbfx99")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -5201,15 +5199,15 @@ specification and header.") (define-public rosegarden (package (name "rosegarden") - (version "22.12.1") + (version "23.06") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/rosegarden/rosegarden/" (version-major+minor version) "/" - "rosegarden-" version ".tar.bz2")) + "rosegarden-" version ".tar.xz")) (sha256 - (base32 "01ljv4rkglicvx7fd6d5chi8k6wia5d6374gf20rgi75grzs59vy")))) + (base32 "1k3j5p6lx3w6pbsh95xiyfj8g8ysmvd18v0wmx7kdb3vyj5mfd0z")))) (build-system cmake-build-system) (arguments (list @@ -6771,7 +6769,7 @@ plugin support, JACK support and chord assistance.") (define-public dragonfly-reverb (package (name "dragonfly-reverb") - (version "3.2.5") + (version "3.2.10") (source (origin (method git-fetch) @@ -6783,7 +6781,7 @@ plugin support, JACK support and chord assistance.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "14kia9wjs0nqfx4psnr3vf4x6hihkf80gb0mjzmdnnnk4cnrdydm")))) + (base32 "11i2k888m3zj4gz9si4y5mach8dwdq3yksbvjn1syrbwj99phwk1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 4ff6d676f7..30460b404d 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -36,14 +36,14 @@ ;; yet, so we'll keep both for just a little longer. (package (name "ncdu") - (version "1.18.1") + (version "1.19") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "01946cqp5z38srbpq08d75f1n0cgpfyn8h8ppbaawnnq57ms23vw")))) + "0zdidd4rhik5j0qdrdg1yh9094jlw496q07vqx90gphc30ck0dih")))) (build-system gnu-build-system) (inputs (list ncurses)) (synopsis "Ncurses-based disk usage analyzer") @@ -53,9 +53,7 @@ run on a remote server where you don't have an entire graphical setup, but have to do with a simple SSH connection. ncdu aims to be fast, simple and easy to use, and should be able to run in any minimal POSIX-like environment with ncurses installed.") - (license (x11-style - (string-append "https://g.blicky.net/ncdu.git/plain/COPYING?id=v" - version))) + (license (x11-style "file://COPYING")) (home-page "https://dev.yorhel.nl/ncdu"))) (define-public ncdu @@ -80,8 +78,7 @@ ncurses installed.") #:make-flags #~(list (string-append "PREFIX=" #$output) (string-append "CC=" #$(cc-for-target)) - ;; XXX By default, zig builds with -march=native! - (string-append "ZIG_FLAGS=-Drelease-fast -Dcpu=baseline")) + (string-append "ZIG_FLAGS=-Drelease-fast")) #:phases #~(modify-phases %standard-phases (delete 'configure) ; No configure script. @@ -97,7 +94,8 @@ ncurses installed.") (when tests? (invoke "zig" "test" "build.zig"))))))) (native-inputs - (list perl zig-0.10)))) + (list perl zig-0.10)) + (properties `((tunable? . #t))))) (define-public ncdu-2 (deprecated-package "ncdu2" ncdu)) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index c5f63e0b67..3b2f9b15f9 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -348,7 +348,7 @@ of your system.") ;; Some programs look for libstfl.so.0. (symlink "libstfl.so" (string-append lib "/libstfl.so.0")))))))) (inputs (list ncurses)) - (native-inputs (list swig)) + (native-inputs (list ncurses swig)) (home-page "https://www.clifford.at/stfl/") (synopsis "Structured terminal forms library") (description "Stfl is a library which implements a curses-based widget diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 92137f99f2..b3d1494ede 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -60,6 +60,7 @@ ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -127,6 +128,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libevent) #:use-module (gnu packages libidn) #:use-module (gnu packages libusb) @@ -154,7 +156,6 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) - #:use-module (gnu packages ruby) #:use-module (gnu packages samba) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -327,42 +328,26 @@ Unix Domain Sockets, SCTP for both IPv4 and IPv6.") (define-public lcsync (package (name "lcsync") - (version "0.2.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 - "0bsd3dkir2i647nmrmyb7skbv16v0f6f3gfwkpxz8g42978dlms5")))) + (version "0.3.0") + (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 "1rhk80ybd2zranay76z1ysifnnm786lg9kiiijcwv76qy95in9ks")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f - #:configure-flags - (list - (string-append "--prefix=" - (assoc-ref %outputs "out"))) + #:configure-flags (list (string-append "--prefix=" + (assoc-ref %outputs "out"))) #:make-flags (let ((target ,(%current-target-system))) (list ,(string-append "CC=" (cc-for-target)))) - #:test-target "test" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'use-prefix-from-configure-in-doc-makefile - ;; Use prefix from configure. Fixed upstream: - ;; https://codeberg.org/librecast/lcsync/commit/4ba00f6 - ;; XXX: Remove for 0.2.2+ - (lambda _ - (substitute* "doc/Makefile.in" - (("PREFIX .= /usr/local") "PREFIX ?= @prefix@")))) - (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 lcrq librecast libsodium)) + #:test-target "test")) + (inputs (list lcrq librecast libsodium libbsd)) (home-page "https://librecast.net/lcsync.html") (synopsis "Librecast file and data syncing tool") (description @@ -391,7 +376,7 @@ them in order to efficiently transfer a minimal amount of data.") (build-system meson-build-system) (outputs '("out" "doc" "gst" "tools")) (arguments - (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags #~(list (string-append "-Dbindir=" (assoc-ref %outputs "tools") "/bin") @@ -400,6 +385,16 @@ them in order to efficiently transfer a minimal amount of data.") "-Dpycamera=disabled") #:phases #~(modify-phases %standard-phases + #$@(if (target-aarch64?) + ;; The 'log_process' test fails on aarch64-linux with a + ;; SIGinvalid error (see: + ;; https://bugs.libcamera.org/show_bug.cgi?id=173). + #~((add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "test/log/meson.build" + ((".*'name': 'log_process'.*") + ""))))) + #~()) (add-after 'install 'move-doc-and-gst (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -513,16 +508,16 @@ GLib-based library, libnice, as well as GStreamer elements to use it.") (define-public librecast (package (name "librecast") - (version "0.7.0") - (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 - "0y0km0fv39m3i227pyg7fcr7d94gbji51fkcywqyrjgmk4j1hp1n")))) + (version "0.8.0") + (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 "01m0q4n2hy3csbzil8ivjyzb1mh4w9jlh9iiv6z53kasl7aas27i")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f @@ -532,7 +527,7 @@ GLib-based library, libnice, as well as GStreamer elements to use it.") (string-append "PREFIX=" (assoc-ref %outputs "out")))) #:test-target "test")) - (inputs (list libsodium lcrq)) + (inputs (list libsodium lcrq libbsd)) (synopsis "IPv6 multicast library") (description "Librecast is a C library which supports IPv6 multicast networking.") @@ -857,25 +852,9 @@ publish/subscribe, RPC-style request/reply, or service discovery.") (sha256 (base32 "01ddfzjlkf2dgijrmm3j3j8irccsnbgfvjcnwslsfaxnrmrq5s64")))) (build-system cmake-build-system) - (outputs '("out" "doc")) (arguments `(#:configure-flags - (list - "-DNN_ENABLE_COVERAGE=ON") - #:phases - (modify-phases %standard-phases - (add-after 'install 'move-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share/doc")) - (rename-file - (string-append out "/share/doc/nanomsg") - (string-append doc "/share/doc/nanomsg")) - #t)))))) - (native-inputs - `(("asciidoctor" ,ruby-asciidoctor) - ("pkg-config" ,pkg-config))) + (list "-DNN_ENABLE_COVERAGE=ON"))) (synopsis "Scalable socket library") (description "Nanomsg is a socket library that provides several common communication patterns. It aims to make the networking layer fast, scalable, @@ -3967,7 +3946,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.") (define-public iwd (package (name "iwd") - (version "2.7") + (version "2.8") (source (origin (method git-fetch) (uri (git-reference @@ -3976,7 +3955,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.") (file-name (git-file-name name version)) (sha256 (base32 - "0xn0db37x0nrvwlw0r4w6q3yk57ijqh9zxd15wf3qqvs01hqkk2j")))) + "0bpksqyaqr624bj7zm9hi22rnp6wnjbngx4q08l7lbd0r7r93vcb")))) (build-system gnu-build-system) (inputs (list dbus ell (package-source ell) readline)) @@ -4021,7 +4000,7 @@ powerful route filtering syntax and an easy-to-use configuration interface.") ;; Don't try to 'mkdir /var'. (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) (home-page "https://git.kernel.org/pub/scm/network/wireless/iwd.git/") - (synopsis "Internet Wireless Daemon") + (synopsis "iNet Wireless Daemon") (description "iwd is a wireless daemon for Linux that aims to replace WPA Supplicant. It optimizes resource utilization by not depending on any external libraries and instead utilizing features provided by the Linux kernel to the @@ -4413,10 +4392,31 @@ client and server. It allows you to use remote block devices over a TCP/IP network.") (license license:gpl2))) +(define-public ngtcp2 + (package + (name "ngtcp2") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/ngtcp2/ngtcp2/" + "releases/download/v" version "/" + "ngtcp2-" version ".tar.xz")) + (sha256 + (base32 "0l84hnj9n4bfxjizgmqsqbz71jx7m00a7l1z43fg5ls3apx9ij11")))) + (build-system gnu-build-system) + (native-inputs (list cunit)) + (home-page "https://nghttp2.org/ngtcp2/") + (synopsis "QUIC protocol implementation") + (description + "The ngtcp2 project is an effort to implement the RFC9000 (IETF) +QUIC protocol.") + (license license:expat))) + (define-public yggdrasil (package (name "yggdrasil") - (version "0.4.7") + (version "0.5.2") (source (origin (method git-fetch) @@ -4427,8 +4427,8 @@ network.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "01mllfrsr55lnfivxwa57cfrjas6w4shsvx9k81pw8jixc124myk")) - (patches (search-patches "yggdrasil-extra-config.patch")))) + (base32 "0ahgb94s30sq1wwyc8h53mjj3j43ifr0aanj8262rsm6rqk04kzq")) + (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments (list #:import-path "github.com/yggdrasil-network/yggdrasil-go" @@ -4454,32 +4454,37 @@ network.") (list "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasil" "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) - ;; https://github.com/kardianos/minwinsvc is windows only (propagated-inputs - (list ;;("go-golang-zx2c4-com-wireguard-windows" - ;; ,go-golang-zx2c4-com-wireguard-windows) - go-golang-zx2c4-com-wireguard - go-golang-org-x-text - go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-crypto - go-golang-org-x-tools - go-netns - go-netlink - go-github-com-olekukonko-tablewriter - go-github-com-mitchellh-mapstructure - go-github-com-mattn-go-runewidth - go-github-com-mattn-go-isatty - go-github-com-mattn-go-colorable - go-github-com-kardianos-minwinsvc - go-github-com-hjson-hjson-go - go-github-com-hashicorp-go-syslog - go-github-com-gologme-log - go-github-com-fatih-color - go-github-com-cheggaaa-pb-v3 - go-github-com-vividcortex-ewma - go-github-com-arceliar-phony - go-github-com-arceliar-ironwood)) + (let ((p (package-input-rewriting + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) + #:deep? #true))) + (cons go-golang-org-x-sys-0.8 + (map p + (list go-golang-zx2c4-com-wireguard + go-golang-org-x-text + go-golang-org-x-net + go-golang-org-x-crypto + go-golang-org-x-tools + go-netns + go-netlink + go-github-com-bits-and-blooms-bitset + go-github-com-bits-and-blooms-bloom + go-github-com-quic-go-quic-go + go-github-com-hjson-hjson-go + go-github-com-olekukonko-tablewriter + go-github-com-mitchellh-mapstructure + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-mattn-go-colorable + go-github-com-kardianos-minwinsvc + go-github-com-hjson-hjson-go + go-github-com-hashicorp-go-syslog + go-github-com-gologme-log + go-github-com-fatih-color + go-github-com-cheggaaa-pb-v3 + go-github-com-vividcortex-ewma + go-github-com-arceliar-phony + go-github-com-arceliar-ironwood))))) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") @@ -4538,7 +4543,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send (define-public phantomsocks (package (name "phantomsocks") - (version "0.0.0-20230829023258-013a0002abe2") + (version "0.0.0-20231031033204-8b0ac27fc450") (source (origin (method git-fetch) (uri (git-reference @@ -4547,10 +4552,11 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send (file-name (git-file-name name version)) (sha256 (base32 - "0pqq4mh6dr7fb7i001wggwkxpvavxq0ps9h2cmm4gv8ygh4v6f10")))) + "1q4i8pgj6hzry9wzlczx729dmmgqdqfb26rfaim2ngmp1dyy9drl")))) (build-system go-build-system) (arguments - (list #:install-source? #f + (list #:go go-1.20 + #:install-source? #f #:import-path "github.com/macronut/phantomsocks" #:build-flags #~'("-tags" #$(if (target-linux?) "rawsocket" diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d769066dc4..6e30ad486a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -738,14 +738,14 @@ source files.") (define-public node-lts (package (inherit node) - (version "18.17.1") + (version "18.18.2") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0dachvhf5jxrb1av8mn2dikbhwklxsgc9y2zg4h50fcwh5d54mqi")) + "0ci1faxjsbp0lv05kskh5anfljn6zawqcf7dawiby5d5qg7x572h")) (modules '((guix build utils))) (snippet '(begin @@ -903,7 +903,26 @@ source files.") "/lib/node_modules/npm/node_modules" "/tar/lib/write-entry.js"))) (substitute* file - (("this.stat.nlink > 1") "false"))))))))) + (("this.stat.nlink > 1") "false"))))) + (add-after 'install 'install-node-gyp-wrapper + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/lib/node_modules/npm/bin/node-gyp-bin")) + (file (string-append dir "/node-gyp"))) + (mkdir-p dir) + ;; See https://github.com/npm/cli/issues/6842 + (call-with-output-file file + (lambda (port) + (format port "#!~a/bin/sh +if [ \"x$npm_config_node_gyp\" = \"x\" ]; then + ~a/bin/node \"~a/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js\" \"$@\" +else + \"$npm_config_node_gyp\" \"$@\" +fi" + (assoc-ref inputs "bash") + out + out))) + (chmod file #o555)))))))) (native-inputs (list ;; Runtime dependencies for binaries used as a bootstrap. c-ares-for-node diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d2727ddf13..327f3449a3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1359,7 +1359,7 @@ libpanel, librsvg and quartz.") (define-public unison (package (name "unison") - (version "2.51.2") + (version "2.53.3") (source (origin (method git-fetch) (uri (git-reference @@ -1368,52 +1368,18 @@ libpanel, librsvg and quartz.") (file-name (git-file-name name version)) (sha256 (base32 - "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq")) - (patches (search-patches "unison-fix-ocaml-4.08.patch")))) - (build-system gnu-build-system) - (outputs '("out" - "doc")) ; 1.9 MiB of documentation - (native-inputs - `(("ocaml" ,ocaml-4.09) - ;; For documentation - ("ghostscript" ,ghostscript) - ("texlive" ,(texlive-updmap.cfg)) - ("hevea" ,hevea) - ("lynx" ,lynx) - ("which" ,which))) - (arguments - `(#:parallel-build? #f - #:parallel-tests? #f - #:test-target "selftest" - #:tests? #f ; Tests require writing to $HOME. - ; If some $HOME is provided, they fail with the message - ; "Fatal error: Skipping some tests -- remove me!" - #:phases + "05ihxk1yynw08586i06w19xab9r24h9hr6v9bknqm98qrlshm92w")))) + (build-system dune-build-system) + (propagated-inputs (list lablgtk3 zlib)) + (native-inputs (list ghostscript (texlive-updmap.cfg '()) hevea lynx which)) + (arguments + `(#:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'prepare-install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (setenv "HOME" out) ; forces correct INSTALLDIR in Makefile - #t))) - (add-after 'install 'install-fsmonitor - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - ;; 'unison-fsmonitor' is used in "unison -repeat watch" mode. - (install-file "src/unison-fsmonitor" bin) - #t))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") + (let ((doc (string-append (assoc-ref outputs "out") "/share/doc/unison"))) (mkdir-p doc) - ;; Remove an '\n' that prevents the doc to be generated - ;; correctly with newer hevea. - (substitute* "doc/local.tex" - (("----SNIP----.*") "----SNIP----")) ;; This file needs write-permissions, because it's ;; overwritten by 'docs' during documentation generation. (chmod "src/strings.ml" #o600) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5b541c353a..02a82d98bd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -174,8 +174,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "b9fae146d6cc4a6968a8eb18beef29aa1414a31e") - (revision 12)) + (commit "aeb494322ca9dec4a4d66a7d063239c8536bd538") + (revision 16)) (package (name "guix") @@ -191,7 +191,7 @@ (commit commit))) (sha256 (base32 - "1pxdfd2g1q3vb5wmv5c53zphsv9q8m835vd00vhjaijzvz9ri7ja")) + "1xl769lkpvkjpvq4vwkxm4dp77sr9finvr6izvf4kvyi6s3hbsys")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -525,7 +525,7 @@ $(prefix)/etc/openrc\n"))) ("git-minimal" ,git-minimal) ;for 'guix perform-download' - ("glibc-utf8-locales" ,glibc-utf8-locales))) + ("glibc-utf8-locales" ,(libc-utf8-locales-for-target)))) (propagated-inputs `(("guile-gnutls" ,guile-gnutls) ;; Avahi requires "glib" which doesn't cross-compile yet. @@ -1511,8 +1511,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "9c42dcb726fc925606b12695e195ae1dc7e28cc3") - (revision "89")) + (let ((commit "78df0b3a9f4f27df8341da36d4dfa8e49dfad900") + (revision "92")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1523,7 +1523,7 @@ environments.") (commit commit))) (sha256 (base32 - "18m368rgmaiscmr1jlz77qkfw5fp4m8szgh90l6wbi9w68yfmr4n")) + "06xp38k6yfvsvl20hrqvmarpysd07nkbj53an729lqr50qdd4jcq")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -1755,8 +1755,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "53682fac7e00cd2801406edbd014922c1720c347") - (revision "21")) + (let ((commit "5ccd6cbbdf5fc41e43a491d3414c1663e1fba64d") + (revision "23")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -1767,7 +1767,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "18mzrpc5ni8d6xbp1bg0nzdj0brmnji4jm1gyiq77dm17c118zyz")) + "1lid5k4wgghl9lzhazx1c473qv18yxp0xxrvj04b33pdvxnaawl8")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -2053,7 +2053,7 @@ cp -r /tmp/locale/*/en_US.*"))) dbus ; for dbus-daemon gettext-minimal `(,glib "bin") ; for glib-mkenums + gdbus-codegen - glibc-utf8-locales + (libc-utf8-locales-for-target) gobject-introspection libcap pkg-config diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index df7b498d1f..e12035e47d 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; @@ -64,14 +64,14 @@ (define-public parallel (package (name "parallel") - (version "20230922") + (version "20231122") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0qz0pzy6icgdr6ak0gszzlxqm4s0w514ayyg2d8gcpayvlb78i0i")) + (base32 "1qpa3dhmdddw7l5906y8ck8rnri66kqkxcbxhsnj058pmbw9qb42")) (snippet '(begin (use-modules (guix build utils)) @@ -131,7 +131,7 @@ and they are executed on lists of files, hosts, users or other items.") (define-public xe (package (name "xe") - (version "0.11") + (version "1.0") (source (origin (method git-fetch) @@ -140,7 +140,7 @@ and they are executed on lists of files, hosts, users or other items.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x")))) + (base32 "1ijvf7q5pxk4rlj7p9q6fmpdqiwmc28gffkk6yg390k1a1z3msf9")))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -185,7 +185,7 @@ when jobs finish.") (define-public slurm (package (name "slurm") - (version "22.05.1") + (version "23.02.6") (source (origin (method url-fetch) (uri (string-append @@ -193,7 +193,7 @@ when jobs finish.") version ".tar.bz2")) (sha256 (base32 - "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi")) + "08rz3r1rlnb3pmfdnbh542gm44ja0fdy8rkj4vm4lclc48cvqp2a")) (modules '((guix build utils))) (snippet '(begin @@ -281,6 +281,20 @@ by managing a queue of pending work.") ;; As noted in the link, YY.MM is the release scheme, and the 'maintenance' ;; digit does not introduce incompatibilities. +(define-public slurm-22.05 + (package + (inherit slurm) + (version "22.05.1") + (source (origin + (inherit (package-source slurm)) + (method url-fetch) + (uri (string-append + "https://download.schedmd.com/slurm/slurm-" + version ".tar.bz2")) + (sha256 + (base32 + "0f3hhlki8g7slllsnyj1qikbsvr62i0hig85lcdcfnmsagzlhbyi")))))) + (define-public slurm-21.08 (package (inherit slurm) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 62f7377555..754ea035ce 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -675,7 +675,7 @@ any X11 window.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (requisites '("getopt" "git" "gpg" "qrencode" "sed" - "tree" "which" "wl-copy" "xclip")) + "tail" "tree" "which" "wl-copy" "xclip")) (path (map (lambda (pkg) (dirname (search-input-file inputs (string-append "/bin/" pkg)))) @@ -697,6 +697,7 @@ any X11 window.") (files '("lib/password-store/extensions"))))) (inputs (list bash-minimal + coreutils dmenu util-linux git diff --git a/gnu/packages/patches/agda-categories-use-stdlib-1.7.3.patch b/gnu/packages/patches/agda-categories-use-stdlib-1.7.3.patch new file mode 100644 index 0000000000..32680b99d7 --- /dev/null +++ b/gnu/packages/patches/agda-categories-use-stdlib-1.7.3.patch @@ -0,0 +1,28 @@ +From 76d3863a5e6e7b9ee948f10a3faec3420a2020f1 Mon Sep 17 00:00:00 2001 +Message-ID: <76d3863a5e6e7b9ee948f10a3faec3420a2020f1.1698265016.git.dev@jpoiret.xyz> +From: Josselin Poiret <dev@jpoiret.xyz> +Date: Wed, 25 Oct 2023 22:15:43 +0200 +Subject: [PATCH] Bump stdlib to 1.7.3 + +From: Josselin Poiret <dev@jpoiret.xyz> + +--- + agda-categories.agda-lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/agda-categories.agda-lib b/agda-categories.agda-lib +index 5b19c405..4d63d415 100644 +--- a/agda-categories.agda-lib ++++ b/agda-categories.agda-lib +@@ -1,3 +1,3 @@ + name: agda-categories +-depend: standard-library-1.7.2 ++depend: standard-library-1.7.3 + include: src/ + +base-commit: 9d61106740147a67fa2cae0a89ac066897b24a51 +prerequisite-patch-id: 508dabd923ba9ac1ee4d8dab6697432b4bd8ba18 +prerequisite-patch-id: b5f39b4fc9e4c9993ab31300de041ed2c7eb696b +-- +2.41.0 + diff --git a/gnu/packages/patches/agda-use-sphinx-5.patch b/gnu/packages/patches/agda-use-sphinx-5.patch new file mode 100644 index 0000000000..19fcf252f9 --- /dev/null +++ b/gnu/packages/patches/agda-use-sphinx-5.patch @@ -0,0 +1,51 @@ +From 99ed1b59ef73fd35053810f6a09e034e1513caee Mon Sep 17 00:00:00 2001 +Message-ID: <99ed1b59ef73fd35053810f6a09e034e1513caee.1698243851.git.dev@jpoiret.xyz> +From: Josselin Poiret <dev@jpoiret.xyz> +Date: Wed, 25 Oct 2023 16:23:32 +0200 +Subject: [PATCH] Revert "Docs: bump Sphinx to 6.0.0" + +From: Josselin Poiret <dev@jpoiret.xyz> + +This reverts commit 40dd42eaa7c04e134fa38cb4f958414a76df27a7. +--- + doc/user-manual/conf.py | 5 ++--- + doc/user-manual/requirements.txt | 4 ++-- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/doc/user-manual/conf.py b/doc/user-manual/conf.py +index 127f6582dc..d737ede19b 100644 +--- a/doc/user-manual/conf.py ++++ b/doc/user-manual/conf.py +@@ -35,7 +35,7 @@ release = version + # + # If your change the version here also change it in the + # `requirements.txt` file [Issue #1936]. +-needs_sphinx = '6.0.0' ++needs_sphinx = '5.0.0' + + # Add any Sphinx extension module names here, as strings. They can be + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +@@ -43,8 +43,7 @@ needs_sphinx = '6.0.0' + extensions = [ + 'sphinx.ext.imgmath', + 'sphinx.ext.ifconfig', +- 'sphinx.ext.imgconverter', +- 'sphinxcontrib.jquery' ++ 'sphinx.ext.imgconverter' + ] + + # Add any paths that contain templates here, relative to this directory. +diff --git a/doc/user-manual/requirements.txt b/doc/user-manual/requirements.txt +index 384b1466b4..656e6c9ac0 100644 +--- a/doc/user-manual/requirements.txt ++++ b/doc/user-manual/requirements.txt +@@ -1,2 +1,2 @@ +-Sphinx >= 7.2.5 +-sphinx_rtd_theme >= 1.3.0 ++Sphinx >= 5.0.0, != 5.2.0.post0 ++sphinx_rtd_theme >= 1.0 + +base-commit: 08b79a684d712ba3dc4b26e5052ec49f49f5ff6c +-- +2.41.0 + diff --git a/gnu/packages/patches/aria2-unbundle-wslay.patch b/gnu/packages/patches/aria2-unbundle-wslay.patch new file mode 100644 index 0000000000..e3e534bbe1 --- /dev/null +++ b/gnu/packages/patches/aria2-unbundle-wslay.patch @@ -0,0 +1,54 @@ +This patch causes aria2 to depend on an external wslay. +The wslay version was copied from the configure.ac in deps/wslay +configure still needs to be deleted to update the script +deps/wslay is no longer necessary and can also be removed + +diff --git a/Makefile.am b/Makefile.am +index afe70a2..8c4d058 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = po lib deps src doc test ++SUBDIRS = po lib src doc test + + ACLOCAL_AMFLAGS = -I m4 --install + RST2HTML = @RST2HTML@ +diff --git a/configure.ac b/configure.ac +index 14b340f..74d5937 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1001,15 +1001,18 @@ if test "x$have_option_const_name" = "xyes"; then + fi + + if test "x$enable_websocket" = "xyes"; then +- AC_CONFIG_SUBDIRS([deps/wslay]) ++ PKG_CHECK_MODULES([WSLAY], [libwslay >= 1.1.1], [have_wslay=yes], [have_wslay=no]) + enable_websocket=yes + AC_DEFINE([ENABLE_WEBSOCKET], [1], + [Define 1 if WebSocket support is enabled.]) +- # $(top_srcdir) for `make distcheck` +- WSLAY_CFLAGS="-I\$(top_builddir)/deps/wslay/lib/includes -I\$(top_srcdir)/deps/wslay/lib/includes" +- WSLAY_LIBS="\$(top_builddir)/deps/wslay/lib/libwslay.la" +- AC_SUBST([WSLAY_CFLAGS]) +- AC_SUBST([WSLAY_LIBS]) ++ if test "x$have_wslay" = "xyes"; then ++ WSLAY_CFLAGS="$WSLAY_CFLAGS" ++ WSLAY_LIBS="$WSLAY_LIBS" ++ AC_SUBST([WSLAY_CFLAGS]) ++ AC_SUBST([WSLAY_LIBS]) ++ else ++ ARIA2_DEP_NOT_MET([wslay]) ++ fi + fi + AM_CONDITIONAL([ENABLE_WEBSOCKET], [test "x$enable_websocket" = "xyes"]) + +@@ -1071,8 +1074,7 @@ AC_CONFIG_FILES([Makefile + doc/manual-src/ru/Makefile + doc/manual-src/ru/conf.py + doc/manual-src/pt/Makefile +- doc/manual-src/pt/conf.py +- deps/Makefile]) ++ doc/manual-src/pt/conf.py]) + AC_OUTPUT + + AC_MSG_NOTICE([summary of build options: diff --git a/gnu/packages/patches/clang-16.0-libc-search-path.patch b/gnu/packages/patches/clang-16.0-libc-search-path.patch new file mode 100644 index 0000000000..282f58f03b --- /dev/null +++ b/gnu/packages/patches/clang-16.0-libc-search-path.patch @@ -0,0 +1,95 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index 87a0c5a58511..86ea82eda4b5 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -98,6 +98,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp +index aa125bb308e8..8b86e144054c 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/lib/Driver/ToolChains/Cuda.cpp +@@ -124,6 +124,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index c6fb290ffdb4..4736f4bb3392 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -189,6 +189,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -249,6 +253,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + #ifdef ENABLE_LINKER_BUILD_ID + ExtraOpts.push_back("--build-id"); ++#endif + #endif + + // The selection of paths to try here is designed to match the patterns which +@@ -270,6 +275,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -298,9 +304,11 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs + // libc++.so in D.Dir+"/../lib/". Detect this path. + // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. +@@ -310,6 +318,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { diff --git a/gnu/packages/patches/clang-17.0-libc-search-path.patch b/gnu/packages/patches/clang-17.0-libc-search-path.patch new file mode 100644 index 0000000000..dd4d8cb998 --- /dev/null +++ b/gnu/packages/patches/clang-17.0-libc-search-path.patch @@ -0,0 +1,90 @@ +Clang attempts to guess file names based on the OS and distro (yes!), +but unfortunately, that doesn't work for us. + +This patch makes it easy to insert libc's $libdir so that Clang passes the +correct absolute file name of crt1.o etc. to 'ld'. It also disables all +the distro-specific stuff and removes the hard-coded FHS directory names +to make sure Clang also works on foreign distros. + +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index 6e0087565941..c0a3ba7d7702 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -99,6 +99,10 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + } + + static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) { ++ // The compiler should always behave the same, even when used via Guix on a ++ // foreign distro. ++ return Distro::UnknownDistro; ++ + Distro::DistroType Version = Distro::UnknownDistro; + + // Newer freedesktop.org's compilant systemd-based systems +diff --git a/clang/lib/Driver/ToolChains/Cuda.cpp b/clang/lib/Driver/ToolChains/Cuda.cpp +index 3a577650eb08..ca3373edc127 100644 +--- a/clang/lib/Driver/ToolChains/Cuda.cpp ++++ b/clang/lib/Driver/ToolChains/Cuda.cpp +@@ -128,6 +128,9 @@ CudaInstallationDetector::CudaInstallationDetector( + const Driver &D, const llvm::Triple &HostTriple, + const llvm::opt::ArgList &Args) + : D(D) { ++ // Don't look for CUDA in /usr. ++ return; ++ + struct Candidate { + std::string Path; + bool StrictChecking; +diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp +index 1ba222bf83b1..28766c5ab792 100644 +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -220,6 +220,10 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + Generic_GCC::PushPPaths(PPaths); + ++ // Comment out the distro-specific tweaks so that they don't bite when ++ // using Guix on a foreign distro. ++#if 0 ++ + Distro Distro(D.getVFS(), Triple); + + if (Distro.IsAlpineLinux() || Triple.isAndroid()) { +@@ -280,6 +284,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + + #ifdef ENABLE_LINKER_BUILD_ID + ExtraOpts.push_back("--build-id"); ++#endif + #endif + + // The selection of paths to try here is designed to match the patterns which +@@ -301,6 +306,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + } + Generic_GCC::AddMultilibPaths(D, SysRoot, OSLibDir, MultiarchTriple, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib", MultiarchTriple), Paths); + addPathIfExists(D, concat(SysRoot, "/lib/..", OSLibDir), Paths); + +@@ -329,11 +335,21 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) + addPathIfExists(D, concat(SysRoot, "/", OSLibDir, ABIName), Paths); + addPathIfExists(D, concat(SysRoot, "/usr", OSLibDir, ABIName), Paths); + } ++#endif + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++#if 0 + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); ++#endif ++ ++ // Add libc's lib/ directory to the search path, so that crt1.o, crti.o, ++ // and friends can be found. ++ addPathIfExists(D, "@GLIBC_LIBDIR@", Paths); ++ ++ // Add GCC's lib/ directory so libstdc++.so can be found. ++ addPathIfExists(D, GCCInstallation.getParentLibPath(), Paths); + } + + ToolChain::RuntimeLibType Linux::GetDefaultRuntimeLibType() const { diff --git a/gnu/packages/patches/connman-CVE-2022-32292.patch b/gnu/packages/patches/connman-CVE-2022-32292.patch deleted file mode 100644 index cbe30742e1..0000000000 --- a/gnu/packages/patches/connman-CVE-2022-32292.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd - -From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001 -From: Nathan Crandall <ncrandall@tesla.com> -Date: Tue, 12 Jul 2022 08:56:34 +0200 -Subject: gweb: Fix OOB write in received_data() - -There is a mismatch of handling binary vs. C-string data with memchr -and strlen, resulting in pos, count, and bytes_read to become out of -sync and result in a heap overflow. Instead, do not treat the buffer -as an ASCII C-string. We calculate the count based on the return value -of memchr, instead of strlen. - -Fixes: CVE-2022-32292 ---- - gweb/gweb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gweb/gweb.c b/gweb/gweb.c -index 12fcb1d8..13c6c5f2 100644 ---- a/gweb/gweb.c -+++ b/gweb/gweb.c -@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond, - } - - *pos = '\0'; -- count = strlen((char *) ptr); -+ count = pos - ptr; - if (count > 0 && ptr[count - 1] == '\r') { - ptr[--count] = '\0'; - bytes_read--; --- -cgit - diff --git a/gnu/packages/patches/connman-CVE-2022-32293-pt1.patch b/gnu/packages/patches/connman-CVE-2022-32293-pt1.patch deleted file mode 100644 index c4d1aec31b..0000000000 --- a/gnu/packages/patches/connman-CVE-2022-32293-pt1.patch +++ /dev/null @@ -1,140 +0,0 @@ -https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=72343929836de80727a27d6744c869dff045757c - -From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001 -From: Daniel Wagner <wagi@monom.org> -Date: Tue, 5 Jul 2022 08:32:12 +0200 -Subject: wispr: Add reference counter to portal context - -Track the connman_wispr_portal_context live time via a -refcounter. This only adds the infrastructure to do proper reference -counting. - -Fixes: CVE-2022-32293 ---- - src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 42 insertions(+), 10 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index a07896ca..bde7e63b 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -56,6 +56,7 @@ struct wispr_route { - }; - - struct connman_wispr_portal_context { -+ int refcount; - struct connman_service *service; - enum connman_ipconfig_type type; - struct connman_wispr_portal *wispr_portal; -@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL; - static char *online_check_ipv6_url = NULL; - static bool enable_online_to_ready_transition = false; - -+#define wispr_portal_context_ref(wp_context) \ -+ wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__) -+#define wispr_portal_context_unref(wp_context) \ -+ wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__) -+ - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { - DBG(""); -@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context( - { - DBG("context %p", wp_context); - -- if (!wp_context) -- return; -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context( - g_free(wp_context); - } - -+static struct connman_wispr_portal_context * -+wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount + 1, file, line, caller); -+ -+ __sync_fetch_and_add(&wp_context->refcount, 1); -+ -+ return wp_context; -+} -+ -+static void wispr_portal_context_unref_debug( -+ struct connman_wispr_portal_context *wp_context, -+ const char *file, int line, const char *caller) -+{ -+ if (!wp_context) -+ return; -+ -+ DBG("%p ref %d by %s:%d:%s()", wp_context, -+ wp_context->refcount - 1, file, line, caller); -+ -+ if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1) -+ return; -+ -+ free_connman_wispr_portal_context(wp_context); -+} -+ - static struct connman_wispr_portal_context *create_wispr_portal_context(void) - { -- return g_try_new0(struct connman_wispr_portal_context, 1); -+ return wispr_portal_context_ref( -+ g_new0(struct connman_wispr_portal_context, 1)); - } - - static void free_connman_wispr_portal(gpointer data) -@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data) - if (!wispr_portal) - return; - -- free_connman_wispr_portal_context(wispr_portal->ipv4_context); -- free_connman_wispr_portal_context(wispr_portal->ipv6_context); -+ wispr_portal_context_unref(wispr_portal->ipv4_context); -+ wispr_portal_context_unref(wispr_portal->ipv6_context); - - g_free(wispr_portal); - } -@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result, - connman_info("Client-Timezone: %s", str); - - if (!enable_online_to_ready_transition) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); -@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service, - return; - } - -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - -@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context) - - if (wp_context->token == 0) { - err = -EINVAL; -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - } - } else if (wp_context->timeout == 0) { - wp_context->timeout = g_idle_add(no_proxy_callback, wp_context); -@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service, - - /* If there is already an existing context, we wipe it */ - if (wp_context) -- free_connman_wispr_portal_context(wp_context); -+ wispr_portal_context_unref(wp_context); - - wp_context = create_wispr_portal_context(); - if (!wp_context) --- -cgit - diff --git a/gnu/packages/patches/connman-CVE-2022-32293-pt2.patch b/gnu/packages/patches/connman-CVE-2022-32293-pt2.patch deleted file mode 100644 index 556e69e397..0000000000 --- a/gnu/packages/patches/connman-CVE-2022-32293-pt2.patch +++ /dev/null @@ -1,173 +0,0 @@ -https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a - -From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001 -From: Daniel Wagner <wagi@monom.org> -Date: Tue, 5 Jul 2022 09:11:09 +0200 -Subject: wispr: Update portal context references - -Maintain proper portal context references to avoid UAF. - -Fixes: CVE-2022-32293 ---- - src/wispr.c | 34 ++++++++++++++++++++++------------ - 1 file changed, 22 insertions(+), 12 deletions(-) - -diff --git a/src/wispr.c b/src/wispr.c -index bde7e63b..84bed33f 100644 ---- a/src/wispr.c -+++ b/src/wispr.c -@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false; - - static void connman_wispr_message_init(struct connman_wispr_message *msg) - { -- DBG(""); -- - msg->has_error = false; - msg->current_element = NULL; - -@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context) - static void free_connman_wispr_portal_context( - struct connman_wispr_portal_context *wp_context) - { -- DBG("context %p", wp_context); -- - if (wp_context->wispr_portal) { - if (wp_context->wispr_portal->ipv4_context == wp_context) - wp_context->wispr_portal->ipv4_context = NULL; -@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result, - &str)) - connman_info("Client-Timezone: %s", str); - -- if (!enable_online_to_ready_transition) -- wispr_portal_context_unref(wp_context); -- - __connman_service_ipconfig_indicate_state(service, - CONNMAN_SERVICE_STATE_ONLINE, type); - -@@ -546,14 +539,17 @@ static void wispr_portal_request_portal( - { - DBG(""); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - wp_context->status_url, - wispr_portal_web_result, - wispr_route_request, - wp_context); - -- if (wp_context->request_id == 0) -+ if (wp_context->request_id == 0) { - wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); -+ } - } - - static bool wispr_input(const guint8 **data, gsize *length, -@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service, - return; - - if (!authentication_done) { -- wispr_portal_error(wp_context); - free_wispr_routes(wp_context); -+ wispr_portal_error(wp_context); -+ wispr_portal_context_unref(wp_context); - return; - } - - /* Restarting the test */ - __connman_service_wispr_start(service, wp_context->type); -+ wispr_portal_context_unref(wp_context); - } - - static void wispr_portal_request_wispr_login(struct connman_service *service, -@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result, - - wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN; - -+ wispr_portal_context_ref(wp_context); - if (__connman_agent_request_login_input(wp_context->service, - wispr_portal_request_wispr_login, -- wp_context) != -EINPROGRESS) -+ wp_context) != -EINPROGRESS) { - wispr_portal_error(wp_context); -- else -+ wispr_portal_context_unref(wp_context); -+ } else - return true; - - break; -@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (length > 0) { - g_web_parser_feed_data(wp_context->wispr_parser, - chunk, length); -+ wispr_portal_context_unref(wp_context); - return true; - } - -@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - switch (status) { - case 000: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - if (g_web_result_get_header(result, "X-ConnMan-Status", - &str)) { - portal_manage_status(result, wp_context); -+ wispr_portal_context_unref(wp_context); - return false; -- } else -+ } else { -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->redirect_url, wp_context); -+ } - - break; - case 300: -@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - !g_web_result_get_header(result, "Location", - &redirect)) { - -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - wp_context->redirect_url = g_strdup(redirect); - -+ wispr_portal_context_ref(wp_context); - wp_context->request_id = g_web_request_get(wp_context->web, - redirect, wispr_portal_web_result, - wispr_route_request, wp_context); -@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - - break; - case 505: -+ wispr_portal_context_ref(wp_context); - __connman_agent_request_browser(wp_context->service, - wispr_portal_browser_reply_cb, - wp_context->status_url, wp_context); -@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data) - wp_context->request_id = 0; - done: - wp_context->wispr_msg.message_type = -1; -+ wispr_portal_context_unref(wp_context); - return false; - } - -@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data) - xml_wispr_parser_callback, wp_context); - - wispr_portal_request_portal(wp_context); -+ wispr_portal_context_unref(wp_context); - } - - static gboolean no_proxy_callback(gpointer user_data) --- -cgit - diff --git a/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch b/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch new file mode 100644 index 0000000000..4432c161fd --- /dev/null +++ b/gnu/packages/patches/connman-add-missing-libppp-compat.h.patch @@ -0,0 +1,140 @@ +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Sun Sep 24 02:00:00 2023 +0200 +Subject: connman: Add missing libppp-compat.h. + +This file was taken verbatim from upstream commit +a48864a2e5d2a725dfc6eef567108bc13b43857f. Its absence was since +fixed in upstream commit 09c1bbfd55647b18b5bbbb99ef2b6d902465ca16. + +--- +diff -Naur a/scripts/libppp-compat.h b/scripts/libppp-compat.h +--- a/scripts/libppp-compat.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/scripts/libppp-compat.h 2023-09-29 00:45:18.726709659 +0200 +@@ -0,0 +1,127 @@ ++/* Copyright (C) Eivind Naess, eivnaes@yahoo.com */ ++/* SPDX-License-Identifier: GPL-2.0-or-later */ ++ ++#ifndef __LIBPPP_COMPAT_H__ ++#define __LIBPPP_COMPAT_H__ ++ ++/* Define USE_EAPTLS compile with EAP TLS support against older pppd headers, ++ * pppd >= 2.5.0 use PPP_WITH_EAPTLS and is defined in pppdconf.h */ ++#define USE_EAPTLS 1 ++ ++/* Define INET6 to compile with IPv6 support against older pppd headers, ++ * pppd >= 2.5.0 use PPP_WITH_IPV6CP and is defined in pppdconf.h */ ++#define INET6 1 ++ ++/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. ++ * this silly macro magic is to work around that. */ ++#undef VERSION ++#include <pppd/pppd.h> ++ ++#ifndef PPPD_VERSION ++#define PPPD_VERSION VERSION ++#endif ++ ++#include <pppd/fsm.h> ++#include <pppd/ccp.h> ++#include <pppd/eui64.h> ++#include <pppd/ipcp.h> ++#include <pppd/ipv6cp.h> ++#include <pppd/eap.h> ++#include <pppd/upap.h> ++ ++#ifdef HAVE_PPPD_CHAP_H ++#include <pppd/chap.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_NEW_H ++#include <pppd/chap-new.h> ++#endif ++ ++#ifdef HAVE_PPPD_CHAP_MS_H ++#include <pppd/chap_ms.h> ++#endif ++ ++#ifndef PPP_PROTO_CHAP ++#define PPP_PROTO_CHAP 0xc223 ++#endif ++ ++#ifndef PPP_PROTO_EAP ++#define PPP_PROTO_EAP 0xc227 ++#endif ++ ++ ++#if WITH_PPP_VERSION < PPP_VERSION(2,5,0) ++ ++static inline bool ++debug_on (void) ++{ ++ return debug; ++} ++ ++static inline const char ++*ppp_ipparam (void) ++{ ++ return ipparam; ++} ++ ++static inline int ++ppp_ifunit (void) ++{ ++ return ifunit; ++} ++ ++static inline const char * ++ppp_ifname (void) ++{ ++ return ifname; ++} ++ ++static inline int ++ppp_get_mtu (int idx) ++{ ++ return netif_get_mtu(idx); ++} ++ ++typedef enum ppp_notify ++{ ++ NF_PID_CHANGE, ++ NF_PHASE_CHANGE, ++ NF_EXIT, ++ NF_SIGNALED, ++ NF_IP_UP, ++ NF_IP_DOWN, ++ NF_IPV6_UP, ++ NF_IPV6_DOWN, ++ NF_AUTH_UP, ++ NF_LINK_DOWN, ++ NF_FORK, ++ NF_MAX_NOTIFY ++} ppp_notify_t; ++ ++typedef void (ppp_notify_fn) (void *ctx, int arg); ++ ++static inline void ++ppp_add_notify (ppp_notify_t type, ppp_notify_fn *func, void *ctx) ++{ ++ struct notifier **list[NF_MAX_NOTIFY] = { ++ [NF_PID_CHANGE ] = &pidchange, ++ [NF_PHASE_CHANGE] = &phasechange, ++ [NF_EXIT ] = &exitnotify, ++ [NF_SIGNALED ] = &sigreceived, ++ [NF_IP_UP ] = &ip_up_notifier, ++ [NF_IP_DOWN ] = &ip_down_notifier, ++ [NF_IPV6_UP ] = &ipv6_up_notifier, ++ [NF_IPV6_DOWN ] = &ipv6_down_notifier, ++ [NF_AUTH_UP ] = &auth_up_notifier, ++ [NF_LINK_DOWN ] = &link_down_notifier, ++ [NF_FORK ] = &fork_notifier, ++ }; ++ ++ struct notifier **notify = list[type]; ++ if (notify) { ++ add_notifier(notify, func, ctx); ++ } ++} ++ ++#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */ ++#endif /* #if__LIBPPP_COMPAT_H__ */ diff --git a/gnu/packages/patches/converseen-hide-updates-checks.patch b/gnu/packages/patches/converseen-hide-updates-checks.patch index c4c80b5bec..6d3aabdb1a 100644 --- a/gnu/packages/patches/converseen-hide-updates-checks.patch +++ b/gnu/packages/patches/converseen-hide-updates-checks.patch @@ -43,17 +43,17 @@ index 704e75c..bb3f9b0 100755 int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp -index 2b6d68d..83a365f 100755 +index 6562e35..d19bc28 100755 --- a/src/mainwindowimpl.cpp +++ b/src/mainwindowimpl.cpp -@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() +@@ -163,7 +163,6 @@ void MainWindowImpl::createActions() connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); - connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); - } + connect(actionHelp, SIGNAL(triggered()), this, SLOT(onlineHelp())); - void MainWindowImpl::setupMenu() + // Create first toolbar button diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui index e59148d..6cb23f5 100755 --- a/ui/dialogoptions.ui @@ -82,18 +82,18 @@ index e59148d..6cb23f5 100755 <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui -index a5f55f0..28df8cc 100755 +index 569565f..b86fc2e 100755 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui -@@ -190,7 +190,6 @@ - </property> +@@ -356,7 +356,6 @@ + <addaction name="separator"/> <addaction name="actionDonatePaypal"/> <addaction name="separator"/> - <addaction name="actionCheckForUpdates"/> <addaction name="actionReportBug"/> <addaction name="separator"/> - </widget> -@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + <addaction name="actionInfo"/> +@@ -1412,14 +1411,6 @@ p, li { white-space: pre-wrap; } <string>Import windows icon (*.ico *.icon)</string> </property> </action> @@ -105,6 +105,6 @@ index a5f55f0..28df8cc 100755 - <string>Check if a new version of Converseen is available</string> - </property> - </action> - </widget> - <customwidgets> - <customwidget> + <action name="actionAddDirectory"> + <property name="icon"> + <iconset resource="../resources.qrc"> diff --git a/gnu/packages/patches/emacs-debbugs-keep-patch-subject.patch b/gnu/packages/patches/emacs-debbugs-keep-patch-subject.patch deleted file mode 100644 index 7a6cb642d0..0000000000 --- a/gnu/packages/patches/emacs-debbugs-keep-patch-subject.patch +++ /dev/null @@ -1,29 +0,0 @@ -Preserve subject when replying to patch threads. -Upstream status: likely to be in the next release (bug#66330) - -diff --git a/debbugs-gnu.el b/debbugs-gnu.el -index f366fba11d..cd549e364d 100644 ---- a/debbugs-gnu.el -+++ b/debbugs-gnu.el -@@ -1747,6 +1747,12 @@ MERGED is the list of bugs merged with this one." - (format "Re: bug#%d: %s" id (alist-get 'subject status))) - (debbugs-gnu-summary-mode 1))) - -+(defcustom debbugs-gnu-summary-keep-subject -+ (rx "[PATCH" (? (0+ (not (any digit "/]"))) (1+ digit) "/" (1+ digit)) "]") -+ "Regular expression which keeps the original message subject in replies." -+ :version "29.1" -+ :type 'regexp) -+ - (defvar debbugs-gnu-summary-mode-map - (let ((map (make-sparse-keymap))) - (define-key map "C" #'debbugs-gnu-send-control-message) -@@ -1778,6 +1784,8 @@ MERGED is the list of bugs merged with this one." - (cons new new)) - address)))))) - ,@(and debbugs-gnu-subject -+ (not (string-match-p debbugs-gnu-summary-keep-subject -+ debbugs-gnu-subject)) - `((subject ,debbugs-gnu-subject))))))) - - (defun debbugs-gnu-guess-current-id () diff --git a/gnu/packages/patches/emacs-next-exec-path.patch b/gnu/packages/patches/emacs-next-exec-path.patch new file mode 100644 index 0000000000..6e33e25258 --- /dev/null +++ b/gnu/packages/patches/emacs-next-exec-path.patch @@ -0,0 +1,18 @@ +Do not capture the build-time value of $PATH in the 'emacs' executable +since this can noticeably increase the size of the closure of Emacs +with things like GCC being referenced. + +Index: emacs-next/lisp/loadup.el +=================================================================== +--- emacs-next.orig/lisp/loadup.el ++++ emacs-next/lisp/loadup.el +@@ -599,7 +599,8 @@ lost after dumping"))) + ((equal dump-mode "dump") "emacs") + ((equal dump-mode "bootstrap") "emacs") + ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") +- (t (error "Unrecognized dump mode %s" dump-mode))))) ++ (t (error "Unrecognized dump mode %s" dump-mode)))) ++ (exec-path nil)) + (when (and (featurep 'native-compile) + (equal dump-mode "pdump")) + ;; Don't enable this before bootstrap is completed, as the diff --git a/gnu/packages/patches/emacs-next-native-comp-driver-options.patch b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch new file mode 100644 index 0000000000..e4ed5a48f1 --- /dev/null +++ b/gnu/packages/patches/emacs-next-native-comp-driver-options.patch @@ -0,0 +1,18 @@ +We substitute this anyway, so let's make it easier to substitute. + +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -203,9 +203,7 @@ and above." + :type '(repeat string) + :version "28.1") + +-(defcustom native-comp-driver-options +- (cond ((eq system-type 'darwin) '("-Wl,-w")) +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++(defcustom native-comp-driver-options nil + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. +-- +2.38.0 + diff --git a/gnu/packages/patches/ergodox-firmware-fix-json-target.patch b/gnu/packages/patches/ergodox-firmware-fix-json-target.patch new file mode 100644 index 0000000000..52da4e2497 --- /dev/null +++ b/gnu/packages/patches/ergodox-firmware-fix-json-target.patch @@ -0,0 +1,1405 @@ +Submitted upstream: +<https://github.com/benblazak/ergodox-firmware/pull/99> +<https://github.com/benblazak/ergodox-firmware/pull/98> + +diff --git a/build-scripts/gen-layout.py b/build-scripts/gen-layout.py +index fd5e54c..251a463 100755 +--- a/build-scripts/gen-layout.py ++++ b/build-scripts/gen-layout.py +@@ -22,8 +22,10 @@ import sys + + # ----------------------------------------------------------------------------- + +-class Namespace(): +- pass ++ ++class Namespace: ++ pass ++ + + template = Namespace() + doc = Namespace() +@@ -31,45 +33,45 @@ info = Namespace() + + # ----------------------------------------------------------------------------- + ++ + def main(): +- arg_parser = argparse.ArgumentParser( +- description = "Generate a picture of the firmware's " +- + "keyboard layout" ) ++ arg_parser = argparse.ArgumentParser( ++ description="Generate a picture of the firmware's " + "keyboard layout" ++ ) + +- arg_parser.add_argument( +- '--ui-info-file', +- required = True ) ++ arg_parser.add_argument("--ui-info-file", required=True) + +- args = arg_parser.parse_args(sys.argv[1:]) ++ args = arg_parser.parse_args(sys.argv[1:]) + +- # constant file paths +- args.template_svg_file = './build-scripts/gen_layout/template.svg' +- args.template_js_file = './build-scripts/gen_layout/template.js' ++ # constant file paths ++ args.template_svg_file = "./build-scripts/gen_layout/template.svg" ++ args.template_js_file = "./build-scripts/gen_layout/template.js" + +- # normalize paths +- args.ui_info_file = os.path.abspath(args.ui_info_file) +- args.template_svg_file = os.path.abspath(args.template_svg_file) +- args.template_js_file = os.path.abspath(args.template_js_file) ++ # normalize paths ++ args.ui_info_file = os.path.abspath(args.ui_info_file) ++ args.template_svg_file = os.path.abspath(args.template_svg_file) ++ args.template_js_file = os.path.abspath(args.template_js_file) + +- # set vars +- doc.main = '' # to store the html document we're generating +- template.svg = open(args.template_svg_file).read() +- template.js = open(args.template_js_file).read() +- info.all = json.loads(open(args.ui_info_file).read()) ++ # set vars ++ doc.main = "" # to store the html document we're generating ++ template.svg = open(args.template_svg_file).read() ++ template.js = open(args.template_js_file).read() ++ info.all = json.loads(open(args.ui_info_file).read()) + +- info.matrix_positions = info.all['mappings']['matrix-positions'] +- info.matrix_layout = info.all['mappings']['matrix-layout'] ++ info.matrix_positions = info.all["mappings"]["matrix-positions"] ++ info.matrix_layout = info.all["mappings"]["matrix-layout"] + +- # prefix +- doc.prefix = (""" ++ # prefix ++ doc.prefix = ( ++ """ + <?xml version="1.0" encoding="UTF-8" standalone="no"?> + <html> + + <head> + <script> + """ +-+ template.js + +-""" </script> ++ + template.js ++ + """ </script> + </head> + + <body> +@@ -78,9 +80,13 @@ def main(): + + <ul> + <li>git commit date: +- <code>""" + info.all['miscellaneous']['git-commit-date'] + """</code></li> ++ <code>""" ++ + info.all["miscellaneous"]["git-commit-date"] ++ + """</code></li> + <li>git commit id: +- <code>""" + info.all['miscellaneous']['git-commit-id'] + """</code></li> ++ <code>""" ++ + info.all["miscellaneous"]["git-commit-id"] ++ + """</code></li> + </ul> + + <h2>Notes</h2> +@@ -123,301 +129,293 @@ def main(): + + <br> + +-""")[1:-1] ++""" ++ )[1:-1] + +- # suffix +- doc.suffix = (""" ++ # suffix ++ doc.suffix = ( ++ """ + </body> + </html> + +-""")[1:-1] +- +- # substitute into template +- # ------- +- # note: this is not general enough to handle any possible layout well, at +- # the moment. but it should handle more standard ones well. (hopefully +- # minor) modifications may be necessary on a case by case basis +- # ------- +- layer_number = -1 +- for (layout, layer) in zip( info.matrix_layout, +- range(len(info.matrix_layout))): +- layer_number += 1 +- svg = template.svg +- for (name, (code, press, release)) \ +- in zip(info.matrix_positions, layout): +- replace = '' +- if press == 'kbfun_transparent': +- replace = '' +- elif press == 'kbfun_shift_press_release': +- replace = 'sh ' + keycode_to_string.get(code, '[n/a]') +- elif press == 'kbfun_jump_to_bootloader': +- replace = '[btldr]' +- elif press == 'NULL' and release == 'NULL': +- replace = '(null)' +- elif re.search(r'numpad', press+release): +- replace = '[num]' +- elif re.search(r'layer', press+release): +- replace = 'la ' + re.findall(r'\d+', press+release)[0] + ' ' +- if re.search(r'push', press+release): +- replace += '+' +- if re.search(r'pop', press+release): +- replace += '-' +- replace += ' ' + str(code) +- else: +- replace = keycode_to_string.get(code, '[n/a]') +- +- svg = re.sub( +- '>'+name+'<', '>'+replace+'<', svg ) +- svg = re.sub( +- r"\('(" + name + r".*)'\)", +- r"('\1', " + str(layer) + r")", +- svg ) +- +- doc.main += '<h2>Layer ' + str(layer_number) + '</h2>\n' + svg +- +- # change the font size +- doc.main = re.sub(r'22.5px', '15px', doc.main) +- +- print(doc.prefix + doc.main + doc.suffix) ++""" ++ )[1:-1] ++ ++ # substitute into template ++ # ------- ++ # note: this is not general enough to handle any possible layout well, at ++ # the moment. but it should handle more standard ones well. (hopefully ++ # minor) modifications may be necessary on a case by case basis ++ # ------- ++ layer_number = -1 ++ for (layout, layer) in zip( ++ info.matrix_layout, range(len(info.matrix_layout)) ++ ): ++ layer_number += 1 ++ svg = template.svg ++ for (name, (code, press, release)) in zip( ++ info.matrix_positions, layout ++ ): ++ replace = "" ++ if press == "kbfun_transparent": ++ replace = "" ++ elif press == "kbfun_shift_press_release": ++ replace = "sh " + keycode_to_string.get(code, "[n/a]") ++ elif press == "kbfun_jump_to_bootloader": ++ replace = "[btldr]" ++ elif press == "NULL" and release == "NULL": ++ replace = "(null)" ++ elif re.search(r"numpad", press + release): ++ replace = "[num]" ++ elif re.search(r"layer", press + release): ++ replace = "la " + re.findall(r"\d+", press + release)[0] + " " ++ if re.search(r"push", press + release): ++ replace += "+" ++ if re.search(r"pop", press + release): ++ replace += "-" ++ replace += " " + str(code) ++ else: ++ replace = keycode_to_string.get(code, "[n/a]") ++ ++ svg = re.sub(">" + name + "<", ">" + replace + "<", svg) ++ svg = re.sub( ++ r"\('(" + name + r".*)'\)", r"('\1', " + str(layer) + r")", svg ++ ) ++ ++ doc.main += "<h2>Layer " + str(layer_number) + "</h2>\n" + svg ++ ++ # change the font size ++ doc.main = re.sub(r"22.5px", "15px", doc.main) ++ ++ print(doc.prefix + doc.main + doc.suffix) ++ + + # ----------------------------------------------------------------------------- + # ----------------------------------------------------------------------------- + + keycode_to_string = { +- 0x01: "Error", # ErrorRollOver +- 0x02: "POSTFail", +- 0x03: "Error", # ErrorUndefined +- 0x04: "a A", +- 0x05: "b B", +- 0x06: "c C", +- 0x07: "d D", +- 0x08: "e E", +- 0x09: "f F", +- 0x0A: "g G", +- 0x0B: "h H", +- 0x0C: "i I", +- 0x0D: "j J", +- 0x0E: "k K", +- 0x0F: "l L", +- 0x10: "m M", +- 0x11: "n N", +- 0x12: "o O", +- 0x13: "p P", +- 0x14: "q Q", +- 0x15: "r R", +- 0x16: "s S", +- 0x17: "t T", +- 0x18: "u U", +- 0x19: "v V", +- 0x1A: "w W", +- 0x1B: "x X", +- 0x1C: "y Y", +- 0x1D: "z Z", +- 0x1E: "1 !", +- 0x1F: "2 @", +- 0x20: "3 #", +- 0x21: "4 $", +- 0x22: "5 %", +- 0x23: "6 ^", +- 0x24: "7 &", +- 0x25: "8 *", +- 0x26: "9 (", +- 0x27: "0 )", +- 0x28: "Return", +- 0x29: "Esc", +- 0x2A: "Backspace", +- 0x2B: "Tab", +- 0x2C: "Space", +- 0x2D: "- _", +- 0x2E: "= +", +- 0x2F: "[ {", +- 0x30: "] }", +- 0x31: "\ |", +- 0x32: "# ~", +- 0x33: "; :", +- 0x34: "\' \"", +- 0x35: "` ~", +- 0x36: ", <", +- 0x37: ". >", +- 0x38: "/ ?", +- 0x39: "Caps", +- 0x3A: "F1", +- 0x3B: "F2", +- 0x3C: "F3", +- 0x3D: "F4", +- 0x3E: "F5", +- 0x3F: "F6", +- 0x40: "F7", +- 0x41: "F8", +- 0x42: "F9", +- 0x43: "F10", +- 0x44: "F11", +- 0x45: "F12", +- 0x46: "PrintScreen", +- 0x47: "ScrollLock", +- 0x48: "Pause", +- 0x49: "Ins", # Insert +- 0x4A: "Hm", # Home +- 0x4B: "Pg\u2191", # up arrow +- 0x4C: "Delete", +- 0x4D: "End", +- 0x4E: "Pg\u2193", # down arrow +- 0x4F: "\u2192", # right arrow +- 0x50: "\u2190", # left arrow +- 0x51: "\u2193", # down arrow +- 0x52: "\u2191", # up arrow +- +- 0x53: "Num", +- 0x54: "/", +- 0x55: "*", +- 0x56: "-", +- 0x57: "+", +- 0x58: "Enter", +- 0x59: "1 End", +- 0x5A: "2 \u2193", # down arrow +- 0x5B: "3 Pg\u2193", # down arrow +- 0x5C: "4 \u2190", # left arrow +- 0x5D: "5", +- 0x5E: "6 \u2192", # right arrow +- 0x5F: "7 Hm", # Home +- 0x60: "8 \u2191", # up arrow +- 0x61: "9 Pg\u2191", # up arrow +- 0x62: "0 Ins", # Insert +- 0x63: ". Del", +- +- 0x64: "\ |", +- 0x65: "App", +- 0x66: "Power", +- +- 0x67: "=", +- +- 0x68: "F13", +- 0x69: "F14", +- 0x6A: "F15", +- 0x6B: "F16", +- 0x6C: "F17", +- 0x6D: "F18", +- 0x6E: "F19", +- 0x6F: "F20", +- 0x70: "F21", +- 0x71: "F22", +- 0x72: "F23", +- 0x73: "F24", +- 0x74: "Exec", +- 0x75: "Help", +- 0x76: "Menu", +- 0x77: "Select", +- 0x78: "Stop", +- 0x79: "Again", +- 0x7A: "Undo", +- 0x7B: "Cut", +- 0x7C: "Copy", +- 0x7D: "Paste", +- 0x7E: "Find", +- 0x7F: "Mute", +- 0x80: "VolUp", +- 0x81: "VolDown", +- 0x82: "LockingCapsLock", +- 0x83: "LockingNumLock", +- 0x84: "LockingScrollLock", +- +- 0x85: ",", +- 0x86: "=", +- +- 0x87: "Int1", +- 0x88: "Int2", +- 0x89: "Int3", +- 0x8A: "Int4", +- 0x8B: "Int5", +- 0x8C: "Int6", +- 0x8D: "Int7", +- 0x8E: "Int8", +- 0x8F: "Int9", +- 0x90: "LANG1", +- 0x91: "LANG2", +- 0x92: "LANG3", +- 0x93: "LANG4", +- 0x94: "LANG5", +- 0x95: "LANG6", +- 0x96: "LANG7", +- 0x97: "LANG8", +- 0x98: "LANG9", +- 0x99: "AlternateErase", +- 0x9A: "SysReq_Attention", +- 0x9B: "Cancel", +- 0x9C: "Clear", +- 0x9D: "Prior", +- 0x9E: "Return", +- 0x9F: "Separator", +- 0xA0: "Out", +- 0xA1: "Oper", +- 0xA2: "Clear_Again", +- 0xA3: "CrSel_Props", +- 0xA4: "ExSel", +- +- 0xB0: "00", +- 0xB1: "000", +- +- 0xB2: "Thousands_Sep", +- 0xB3: "Decimal_Sep", +- 0xB4: "$", +- 0xB5: "Currency_Subunit", +- +- 0xB6: "(", +- 0xB7: ")", +- 0xB8: "{", +- 0xB9: "}", +- +- 0xBA: "Tab", +- 0xBB: "Backspace", +- 0xBC: "A", +- 0xBD: "B", +- 0xBE: "C", +- 0xBF: "D", +- 0xC0: "E", +- 0xC1: "F", +- 0xC2: "XOR", +- 0xC3: "^", +- 0xC4: "%", +- 0xC5: "<", +- 0xC6: ">", +- 0xC7: "&", +- 0xC8: "&&", +- 0xC9: "|", +- 0xCA: "||", +- 0xCB: ":", +- 0xCC: "#", +- 0xCD: "Space", +- 0xCE: "@", +- 0xCF: "!", +- 0xD0: "Mem_Store", +- 0xD1: "Mem_Recall", +- 0xD2: "Mem_Clear", +- 0xD3: "Mem_+", +- 0xD4: "Mem_-", +- 0xD5: "Mem_*", +- 0xD6: "Mem_/", +- 0xD7: "+-", +- 0xD8: "Clear", +- 0xD9: "ClearEntry", +- 0xDA: "Binary", +- 0xDB: "Octal", +- 0xDC: ".", +- 0xDD: "Hexadecimal", +- +- 0xE0: "L-Ctrl", +- 0xE1: "L-Shift", +- 0xE2: "L-Alt", +- 0xE3: "L-GUI", +- 0xE4: "R-Ctrl", +- 0xE5: "R-Shift", +- 0xE6: "R-Alt", +- 0xE7: "R-GUI", +- } ++ 0x01: "Error", # ErrorRollOver ++ 0x02: "POSTFail", ++ 0x03: "Error", # ErrorUndefined ++ 0x04: "a A", ++ 0x05: "b B", ++ 0x06: "c C", ++ 0x07: "d D", ++ 0x08: "e E", ++ 0x09: "f F", ++ 0x0A: "g G", ++ 0x0B: "h H", ++ 0x0C: "i I", ++ 0x0D: "j J", ++ 0x0E: "k K", ++ 0x0F: "l L", ++ 0x10: "m M", ++ 0x11: "n N", ++ 0x12: "o O", ++ 0x13: "p P", ++ 0x14: "q Q", ++ 0x15: "r R", ++ 0x16: "s S", ++ 0x17: "t T", ++ 0x18: "u U", ++ 0x19: "v V", ++ 0x1A: "w W", ++ 0x1B: "x X", ++ 0x1C: "y Y", ++ 0x1D: "z Z", ++ 0x1E: "1 !", ++ 0x1F: "2 @", ++ 0x20: "3 #", ++ 0x21: "4 $", ++ 0x22: "5 %", ++ 0x23: "6 ^", ++ 0x24: "7 &", ++ 0x25: "8 *", ++ 0x26: "9 (", ++ 0x27: "0 )", ++ 0x28: "Return", ++ 0x29: "Esc", ++ 0x2A: "Backspace", ++ 0x2B: "Tab", ++ 0x2C: "Space", ++ 0x2D: "- _", ++ 0x2E: "= +", ++ 0x2F: "[ {", ++ 0x30: "] }", ++ 0x31: "\ |", ++ 0x32: "# ~", ++ 0x33: "; :", ++ 0x34: "' \"", ++ 0x35: "` ~", ++ 0x36: ", <", ++ 0x37: ". >", ++ 0x38: "/ ?", ++ 0x39: "Caps", ++ 0x3A: "F1", ++ 0x3B: "F2", ++ 0x3C: "F3", ++ 0x3D: "F4", ++ 0x3E: "F5", ++ 0x3F: "F6", ++ 0x40: "F7", ++ 0x41: "F8", ++ 0x42: "F9", ++ 0x43: "F10", ++ 0x44: "F11", ++ 0x45: "F12", ++ 0x46: "PrintScreen", ++ 0x47: "ScrollLock", ++ 0x48: "Pause", ++ 0x49: "Ins", # Insert ++ 0x4A: "Hm", # Home ++ 0x4B: "Pg\u2191", # up arrow ++ 0x4C: "Delete", ++ 0x4D: "End", ++ 0x4E: "Pg\u2193", # down arrow ++ 0x4F: "\u2192", # right arrow ++ 0x50: "\u2190", # left arrow ++ 0x51: "\u2193", # down arrow ++ 0x52: "\u2191", # up arrow ++ 0x53: "Num", ++ 0x54: "/", ++ 0x55: "*", ++ 0x56: "-", ++ 0x57: "+", ++ 0x58: "Enter", ++ 0x59: "1 End", ++ 0x5A: "2 \u2193", # down arrow ++ 0x5B: "3 Pg\u2193", # down arrow ++ 0x5C: "4 \u2190", # left arrow ++ 0x5D: "5", ++ 0x5E: "6 \u2192", # right arrow ++ 0x5F: "7 Hm", # Home ++ 0x60: "8 \u2191", # up arrow ++ 0x61: "9 Pg\u2191", # up arrow ++ 0x62: "0 Ins", # Insert ++ 0x63: ". Del", ++ 0x64: "\ |", ++ 0x65: "App", ++ 0x66: "Power", ++ 0x67: "=", ++ 0x68: "F13", ++ 0x69: "F14", ++ 0x6A: "F15", ++ 0x6B: "F16", ++ 0x6C: "F17", ++ 0x6D: "F18", ++ 0x6E: "F19", ++ 0x6F: "F20", ++ 0x70: "F21", ++ 0x71: "F22", ++ 0x72: "F23", ++ 0x73: "F24", ++ 0x74: "Exec", ++ 0x75: "Help", ++ 0x76: "Menu", ++ 0x77: "Select", ++ 0x78: "Stop", ++ 0x79: "Again", ++ 0x7A: "Undo", ++ 0x7B: "Cut", ++ 0x7C: "Copy", ++ 0x7D: "Paste", ++ 0x7E: "Find", ++ 0x7F: "Mute", ++ 0x80: "VolUp", ++ 0x81: "VolDown", ++ 0x82: "LockingCapsLock", ++ 0x83: "LockingNumLock", ++ 0x84: "LockingScrollLock", ++ 0x85: ",", ++ 0x86: "=", ++ 0x87: "Int1", ++ 0x88: "Int2", ++ 0x89: "Int3", ++ 0x8A: "Int4", ++ 0x8B: "Int5", ++ 0x8C: "Int6", ++ 0x8D: "Int7", ++ 0x8E: "Int8", ++ 0x8F: "Int9", ++ 0x90: "LANG1", ++ 0x91: "LANG2", ++ 0x92: "LANG3", ++ 0x93: "LANG4", ++ 0x94: "LANG5", ++ 0x95: "LANG6", ++ 0x96: "LANG7", ++ 0x97: "LANG8", ++ 0x98: "LANG9", ++ 0x99: "AlternateErase", ++ 0x9A: "SysReq_Attention", ++ 0x9B: "Cancel", ++ 0x9C: "Clear", ++ 0x9D: "Prior", ++ 0x9E: "Return", ++ 0x9F: "Separator", ++ 0xA0: "Out", ++ 0xA1: "Oper", ++ 0xA2: "Clear_Again", ++ 0xA3: "CrSel_Props", ++ 0xA4: "ExSel", ++ 0xB0: "00", ++ 0xB1: "000", ++ 0xB2: "Thousands_Sep", ++ 0xB3: "Decimal_Sep", ++ 0xB4: "$", ++ 0xB5: "Currency_Subunit", ++ 0xB6: "(", ++ 0xB7: ")", ++ 0xB8: "{", ++ 0xB9: "}", ++ 0xBA: "Tab", ++ 0xBB: "Backspace", ++ 0xBC: "A", ++ 0xBD: "B", ++ 0xBE: "C", ++ 0xBF: "D", ++ 0xC0: "E", ++ 0xC1: "F", ++ 0xC2: "XOR", ++ 0xC3: "^", ++ 0xC4: "%", ++ 0xC5: "<", ++ 0xC6: ">", ++ 0xC7: "&", ++ 0xC8: "&&", ++ 0xC9: "|", ++ 0xCA: "||", ++ 0xCB: ":", ++ 0xCC: "#", ++ 0xCD: "Space", ++ 0xCE: "@", ++ 0xCF: "!", ++ 0xD0: "Mem_Store", ++ 0xD1: "Mem_Recall", ++ 0xD2: "Mem_Clear", ++ 0xD3: "Mem_+", ++ 0xD4: "Mem_-", ++ 0xD5: "Mem_*", ++ 0xD6: "Mem_/", ++ 0xD7: "+-", ++ 0xD8: "Clear", ++ 0xD9: "ClearEntry", ++ 0xDA: "Binary", ++ 0xDB: "Octal", ++ 0xDC: ".", ++ 0xDD: "Hexadecimal", ++ 0xE0: "L-Ctrl", ++ 0xE1: "L-Shift", ++ 0xE2: "L-Alt", ++ 0xE3: "L-GUI", ++ 0xE4: "R-Ctrl", ++ 0xE5: "R-Shift", ++ 0xE6: "R-Alt", ++ 0xE7: "R-GUI", ++} + + # ----------------------------------------------------------------------------- + # ----------------------------------------------------------------------------- + +-if __name__ == '__main__': +- main() +- ++if __name__ == "__main__": ++ main() +diff --git a/build-scripts/gen-ui-info.py b/build-scripts/gen-ui-info.py +index 1c93d32..0fa52e3 100755 +--- a/build-scripts/gen-ui-info.py ++++ b/build-scripts/gen-ui-info.py +@@ -13,7 +13,16 @@ Depends on: + - the project '.map' file (generated by the compiler) + """ + +-_FORMAT_DESCRIPTION = (""" ++import argparse ++import json ++import os ++import pathlib ++import re ++import subprocess ++import sys ++ ++_FORMAT_DESCRIPTION = ( ++ """ + /* ---------------------------------------------------------------------------- + * Version 0 + * ---------------------------------------------------------------------------- +@@ -31,7 +40,7 @@ var ui_info = { + ".meta-data": { // for the JSON file + "version": "<number>", + "date-generated": "<string>", // format: RFC 3339 +- "description": "<string>", ++ "description": "<string>", + }, + "keyboard-functions": { + "<(function name)>": { +@@ -57,7 +66,7 @@ var ui_info = { + "..." + }, + "mappings": { +- /* ++ /* + * The mappings prefixed with 'matrix' have their elements in the same + * order as the .hex file (whatever order that is). The mappings + * prefixed with 'physical' will have their elements in an order +@@ -113,365 +122,304 @@ var ui_info = { + "number-of-layers": "<number>" + } + } +-""")[1:-1] ++""" ++)[1:-1] + + # ----------------------------------------------------------------------------- + +-import argparse +-import json +-import os +-import re +-import subprocess +-import sys +- +-# ----------------------------------------------------------------------------- + + def gen_static(current_date=None, git_commit_date=None, git_commit_id=None): +- """Generate static information""" +- +- return { +- '.meta-data': { +- 'version': 0, # the format version number +- 'date-generated': current_date, +- 'description': _FORMAT_DESCRIPTION, +- }, +- 'miscellaneous': { +- 'git-commit-date': git_commit_date, # should be passed by makefile +- 'git-commit-id': git_commit_id, # should be passed by makefile +- }, +- } +- +-def gen_derived(data): +- return {} # don't really need this info anymore +-# """ +-# Generate derived information +-# Should be called last +-# """ +-# return { +-# 'miscellaneous': { +-# 'number-of-layers': +-# int( data['layout-matrices']['_kb_layout']['length']/(6*14) ), +-# # because 6*14 is the number of bytes/layer for '_kb_layout' +-# # (which is a uint8_t matrix) +-# }, +-# } +- +-# ----------------------------------------------------------------------------- ++ """Generate static information""" + +-def parse_mapfile(map_file_path): +- return {} # don't really need this info anymore +-# """Parse the '.map' file""" +-# +-# def parse_keyboard_function(f, line): +-# """Parse keyboard-functions in the '.map' file""" +-# +-# search = re.search(r'(0x\S+)\s+(0x\S+)', next(f)) +-# position = int( search.group(1), 16 ) +-# length = int( search.group(2), 16 ) +-# +-# search = re.search(r'0x\S+\s+(\S+)', next(f)) +-# name = search.group(1) +-# +-# return { +-# 'keyboard-functions': { +-# name: { +-# 'position': position, +-# 'length': length, +-# }, +-# }, +-# } +-# +-# def parse_layout_matrices(f, line): +-# """Parse layout matrix information in the '.map' file""" +-# +-# name = re.search(r'.progmem.data.(_kb_layout\S*)', line).group(1) +-# +-# search = re.search(r'(0x\S+)\s+(0x\S+)', next(f)) +-# position = int( search.group(1), 16 ) +-# length = int( search.group(2), 16 ) +-# +-# return { +-# 'layout-matrices': { +-# name: { +-# 'position': position, +-# 'length': length, +-# }, +-# }, +-# } +-# +-# # --- parse_mapfile() --- +-# +-# # normalize paths +-# map_file_path = os.path.abspath(map_file_path) +-# # check paths +-# if not os.path.exists(map_file_path): +-# raise ValueError("invalid 'map_file_path' given") +-# +-# output = {} +-# +-# f = open(map_file_path) +-# +-# for line in f: +-# if re.search(r'^\s*\.text\.kbfun_', line): +-# dict_merge(output, parse_keyboard_function(f, line)) +-# elif re.search(r'^\s*\.progmem\.data.*layout', line): +-# dict_merge(output, parse_layout_matrices(f, line)) +-# +-# return output ++ return { ++ ".meta-data": { ++ "version": 0, # the format version number ++ "date-generated": current_date, ++ "description": _FORMAT_DESCRIPTION, ++ }, ++ "miscellaneous": { ++ "git-commit-date": git_commit_date, # should be passed by makefile ++ "git-commit-id": git_commit_id, # should be passed by makefile ++ }, ++ } + + + def find_keyboard_functions(source_code_path): +- """Parse all files in the source directory""" +- +- def read_comments(f, line): +- """ +- Read in properly formatted multi-line comments +- - Comments must start with '/*' and end with '*/', each on their own +- line +- """ +- comments = '' +- while(line.strip() != r'*/'): +- comments += line[2:].strip()+'\n' +- line = next(f) +- return comments +- +- def parse_comments(comments): +- """ +- Parse an INI style comment string +- - Fields begin with '[field-name]', and continue until the next field, +- or the end of the comment +- - Fields '[name]', '[description]', and '[note]' are treated specially +- """ +- +- def add_field(output, field, value): +- """Put a field+value pair in 'output', the way we want it, if the +- pair is valid""" +- +- value = value.strip() +- +- if field is not None: +- if field in ('name', 'description'): +- if field not in output: +- output[field] = value +- else: +- if field == 'note': +- field = 'notes' +- +- if field not in output: +- output[field] = [] +- +- output[field] += [value] +- +- # --- parse_comments() --- +- +- output = {} +- +- field = None +- value = None +- for line in comments.split('\n'): +- line = line.strip() +- +- if re.search(r'^\[.*\]$', line): +- add_field(output, field, value) +- field = line[1:-1] +- value = None +- +- else: +- if value is None: +- value = '' +- if len(value) > 0 and value[-1] == '.': +- line = ' '+line +- value += ' '+line +- +- add_field(output, field, value) +- +- return output +- +- def parse_keyboard_function(f, line, comments): +- """Parse keyboard-functions in the source code""" +- +- search = re.search(r'void\s+(kbfun_\S+)\s*\(void\)', line) +- name = search.group(1) +- +- return { +- 'keyboard-functions': { +- name: { +- 'comments': parse_comments(comments), +- }, +- }, +- } +- +- # --- find_keyboard_functions() --- +- +- # normalize paths +- source_code_path = os.path.abspath(source_code_path) +- # check paths +- if not os.path.exists(source_code_path): +- raise ValueError("invalid 'source_code_path' given") +- +- output = {} +- +- for tup in os.walk(source_code_path): +- for file_name in tup[2]: +- # normalize paths +- file_name = os.path.abspath( os.path.join( tup[0], file_name ) ) +- +- # ignore non '.c' files +- if file_name[-2:] != '.c': +- continue +- +- f = open(file_name) +- +- comments = '' +- for line in f: +- if line.strip() == r'/*': +- comments = read_comments(f, line) +- elif re.search(r'void\s+kbfun_\S+\s*\(void\)', line): +- dict_merge( +- output, +- parse_keyboard_function(f, line, comments) ) +- +- return output ++ """Parse all files in the source directory""" ++ ++ def read_comments(f, line): ++ """ ++ Read in properly formatted multi-line comments ++ - Comments must start with '/*' and end with '*/', each on their own ++ line ++ """ ++ comments = "" ++ while line.strip() != r"*/": ++ comments += line[2:].strip() + "\n" ++ line = next(f) ++ return comments ++ ++ def parse_comments(comments): ++ """ ++ Parse an INI style comment string ++ - Fields begin with '[field-name]', and continue until the next field, ++ or the end of the comment ++ - Fields '[name]', '[description]', and '[note]' are treated specially ++ """ ++ ++ def add_field(output, field, value): ++ """Put a field+value pair in 'output', the way we want it, if the ++ pair is valid""" ++ ++ value = value.strip() ++ ++ if field is not None: ++ if field in ("name", "description"): ++ if field not in output: ++ output[field] = value ++ else: ++ if field == "note": ++ field = "notes" ++ ++ if field not in output: ++ output[field] = [] ++ ++ output[field] += [value] ++ ++ # --- parse_comments() --- ++ ++ output = {} ++ ++ field = None ++ value = None ++ for line in comments.split("\n"): ++ line = line.strip() ++ ++ if re.search(r"^\[.*\]$", line): ++ add_field(output, field, value) ++ field = line[1:-1] ++ value = None ++ else: ++ if value is None: ++ value = "" ++ if len(value) > 0 and value[-1] == ".": ++ line = " " + line ++ value += " " + line ++ ++ add_field(output, field, value) ++ ++ return output ++ ++ def parse_keyboard_function(f, line, comments): ++ """Parse keyboard-functions in the source code""" ++ ++ search = re.search(r"void\s+(kbfun_\S+)\s*\(void\)", line) ++ name = search.group(1) ++ ++ return { ++ "keyboard-functions": { ++ name: { ++ "comments": parse_comments(comments), ++ }, ++ }, ++ } ++ ++ # --- find_keyboard_functions() --- ++ ++ # normalize paths ++ source_code_path = os.path.abspath(source_code_path) ++ # check paths ++ if not os.path.exists(source_code_path): ++ raise ValueError("invalid 'source_code_path' given") ++ ++ output = {} ++ ++ for tup in os.walk(source_code_path): ++ for file_name in tup[2]: ++ # normalize paths ++ file_name = os.path.abspath(os.path.join(tup[0], file_name)) ++ ++ # ignore non '.c' files ++ if file_name[-2:] != ".c": ++ continue ++ ++ f = open(file_name) ++ ++ comments = "" ++ for line in f: ++ if line.strip() == r"/*": ++ comments = read_comments(f, line) ++ elif re.search(r"void\s+kbfun_\S+\s*\(void\)", line): ++ dict_merge( ++ output, parse_keyboard_function(f, line, comments) ++ ) ++ ++ return output + + + def gen_mappings(matrix_file_path, layout_file_path): +- # normalize paths +- matrix_file_path = os.path.abspath(matrix_file_path) +- layout_file_path = os.path.abspath(layout_file_path) +- +- def parse_matrix_file(matrix_file_path): +- match = re.search( # find the whole 'KB_MATRIX_LAYER' macro +- r'#define\s+KB_MATRIX_LAYER\s*\(([^)]+)\)[^{]*\{\{([^#]+)\}\}', +- open(matrix_file_path).read() ) +- +- return { +- "mappings": { +- "physical-positions": re.findall(r'k..', match.group(1)), +- "matrix-positions": re.findall(r'k..|na', match.group(2)), +- }, +- } +- +- def parse_layout_file(layout_file_path): +- match = re.findall( # find each whole '_kb_layout*' matrix definition +- r'(_kb_layout\w*)[^=]*=((?:[^{}]*\{){3}[^=]*(?:[^{}]*\}){3})', +- subprocess.getoutput("gcc -E '"+layout_file_path+"'") ) +- +- layout = {} +- # collect all the values +- for (name, matrix) in match: +- layout[name] = [ +- re.findall( # find all numbers and function pointers +- r'[x0-9A-F]+|&\w+|NULL', +- re.sub( # replace '((void *) 0)' with 'NULL' +- r'\(\s*\(\s*void\s*\*\s*\)\s*0\s*\)', +- 'NULL', +- el ) ) +- for el in +- re.findall( # find each whole layer +- r'(?:[^{}]*\{){2}((?:[^}]|\}\s*,)+)(?:[^{}]*\}){2}', +- matrix ) ] +- +- # make the numbers into actual numbers +- layout['_kb_layout'] = \ +- [[eval(el) for el in layer] for layer in layout['_kb_layout']] +- # remove the preceeding '&' from function pointers +- for matrix in ('_kb_layout_press', '_kb_layout_release'): +- layout[matrix] = \ +- [ [re.sub(r'&', '', el) for el in layer] +- for layer in layout[matrix] ] +- +- return { +- "mappings": { +- "matrix-layout": +- # group them all properly +- [ [[c, p, r] for (c, p, r) in zip(code, press, release)] +- for (code, press, release) in +- zip( layout['_kb_layout'], +- layout['_kb_layout_press'], +- layout['_kb_layout_release'] ) ] +- }, +- } +- +- return dict_merge( +- parse_matrix_file(matrix_file_path), +- parse_layout_file(layout_file_path) ) ++ # normalize paths ++ matrix_file_path = os.path.abspath(matrix_file_path) ++ layout_file_path = os.path.abspath(layout_file_path) ++ layout_name = pathlib.Path(layout_file_path).with_suffix('').name ++ ++ def parse_matrix_file(matrix_file_path): ++ match = re.search( # find the whole 'KB_MATRIX_LAYER' macro ++ r"#define\s+KB_MATRIX_LAYER\s*\(([^)]+)\)[^{]*\{\{([^#]+)\}\}", ++ open(matrix_file_path).read(), ++ ) ++ ++ return { ++ "mappings": { ++ "physical-positions": re.findall(r"k..", match.group(1)), ++ "matrix-positions": re.findall(r"k..|na", match.group(2)), ++ }, ++ } ++ ++ def parse_layout_file(layout_file_path): ++ output = subprocess.check_output( ++ ['avr-gcc', f'-DMAKEFILE_KEYBOARD_LAYOUT={layout_name}', ++ '-E', layout_file_path], encoding='UTF-8') ++ match = re.findall( # find each whole '_kb_layout*' matrix definition ++ r"(_kb_layout\w*)[^=]*=((?:[^{}]*\{){3}[^=]*(?:[^{}]*\}){3})", ++ output, ++ ) ++ ++ layout = {} ++ # collect all the values ++ for (name, matrix) in match: ++ layout[name] = [ ++ re.findall( # find all numbers and function pointers ++ r"[x0-9A-F]+|&\w+|NULL", ++ re.sub( # replace '((void *) 0)' with 'NULL' ++ r"\(\s*\(\s*void\s*\*\s*\)\s*0\s*\)", "NULL", el ++ ), ++ ) ++ for el in re.findall( # find each whole layer ++ r"(?:[^{}]*\{){2}((?:[^}]|\}\s*,)+)(?:[^{}]*\}){2}", matrix ++ ) ++ ] ++ ++ # make the numbers into actual numbers ++ layout["_kb_layout"] = [ ++ [eval(el) for el in layer] for layer in layout["_kb_layout"] ++ ] ++ # remove the preceeding '&' from function pointers ++ for matrix in ("_kb_layout_press", "_kb_layout_release"): ++ layout[matrix] = [ ++ [re.sub(r"&", "", el) for el in layer] ++ for layer in layout[matrix] ++ ] ++ ++ return { ++ "mappings": { ++ "matrix-layout": ++ # group them all properly ++ [ ++ [[c, p, r] for (c, p, r) in zip(code, press, release)] ++ for (code, press, release) in zip( ++ layout["_kb_layout"], ++ layout["_kb_layout_press"], ++ layout["_kb_layout_release"], ++ ) ++ ] ++ }, ++ } ++ ++ return dict_merge( ++ parse_matrix_file(matrix_file_path), ++ parse_layout_file(layout_file_path), ++ ) + + + # ----------------------------------------------------------------------------- + ++ + def dict_merge(a, b): +- """ +- Recursively merge two dictionaries +- - I was looking around for an easy way to do this, and found something +- [here] +- (http://www.xormedia.com/recursively-merge-dictionaries-in-python.html). +- This is pretty close, but i didn't copy it exactly. +- """ ++ """ ++ Recursively merge two dictionaries ++ - I was looking around for an easy way to do this, and found something ++ [here] ++ (http://www.xormedia.com/recursively-merge-dictionaries-in-python.html). ++ This is pretty close, but i didn't copy it exactly. ++ """ ++ ++ if not isinstance(a, dict) or not isinstance(b, dict): ++ return b + +- if not isinstance(a, dict) or not isinstance(b, dict): +- return b ++ for (key, value) in b.items(): ++ if key in a: ++ a[key] = dict_merge(a[key], value) ++ else: ++ a[key] = value + +- for (key, value) in b.items(): +- if key in a: +- a[key] = dict_merge(a[key], value) +- else: +- a[key] = value ++ return a + +- return a + + # ----------------------------------------------------------------------------- + ++ + def main(): +- arg_parser = argparse.ArgumentParser( +- description = 'Generate project data for use with the UI' ) +- +- arg_parser.add_argument( +- '--current-date', +- help = ( "should be in the format rfc-3339 " +- + "(e.g. 2006-08-07 12:34:56-06:00)" ), +- required = True ) +- arg_parser.add_argument( +- '--git-commit-date', +- help = ( "should be in the format rfc-3339 " +- + "(e.g. 2006-08-07 12:34:56-06:00)" ), +- required = True ) +- arg_parser.add_argument( +- '--git-commit-id', +- help = "the git commit ID", +- required = True ) +- arg_parser.add_argument( +- '--map-file-path', +- help = "the path to the '.map' file", +- required = True ) +- arg_parser.add_argument( +- '--source-code-path', +- help = "the path to the source code directory", +- required = True ) +- arg_parser.add_argument( +- '--matrix-file-path', +- help = "the path to the matrix file we're using", +- required = True ) +- arg_parser.add_argument( +- '--layout-file-path', +- help = "the path to the layout file we're using", +- required = True ) +- +- args = arg_parser.parse_args(sys.argv[1:]) +- +- output = {} +- dict_merge( output, gen_static( args.current_date, +- args.git_commit_date, +- args.git_commit_id ) ) +- dict_merge(output, parse_mapfile(args.map_file_path)) +- dict_merge(output, find_keyboard_functions(args.source_code_path)) +- dict_merge(output, gen_mappings( args.matrix_file_path, +- args.layout_file_path )) +- dict_merge(output, gen_derived(output)) +- +- print(json.dumps(output, sort_keys=True, indent=4)) ++ arg_parser = argparse.ArgumentParser( ++ description="Generate project data for use with the UI" ++ ) ++ ++ arg_parser.add_argument( ++ "--current-date", ++ help=( ++ "should be in the format rfc-3339 " ++ "(e.g. 2006-08-07 12:34:56-06:00)" ++ ), ++ required=True, ++ ) ++ arg_parser.add_argument( ++ "--git-commit-date", ++ help=( ++ "should be in the format rfc-3339 " ++ "(e.g. 2006-08-07 12:34:56-06:00)" ++ ), ++ required=True, ++ ) ++ arg_parser.add_argument( ++ "--git-commit-id", help="the git commit ID", required=True ++ ) ++ arg_parser.add_argument( ++ "--map-file-path", help="the path to the '.map' file", required=True ++ ) ++ arg_parser.add_argument( ++ "--source-code-path", ++ help="the path to the source code directory", ++ required=True, ++ ) ++ arg_parser.add_argument( ++ "--matrix-file-path", ++ help="the path to the matrix file we're using", ++ required=True, ++ ) ++ arg_parser.add_argument( ++ "--layout-file-path", ++ help="the path to the layout file we're using", ++ required=True, ++ ) ++ ++ args = arg_parser.parse_args(sys.argv[1:]) ++ ++ output = {} ++ dict_merge( ++ output, ++ gen_static( ++ args.current_date, args.git_commit_date, args.git_commit_id ++ ) ++ ) ++ dict_merge(output, find_keyboard_functions(args.source_code_path)) ++ dict_merge( ++ output, gen_mappings(args.matrix_file_path, args.layout_file_path) ++ ) ++ ++ print(json.dumps(output, sort_keys=True, indent=4)) + +-# ----------------------------------------------------------------------------- + +-if __name__ == '__main__': +- main() ++# ----------------------------------------------------------------------------- + ++if __name__ == "__main__": ++ main() +diff --git a/makefile b/makefile +index d9fe10c..971ee0e 100644 +--- a/makefile ++++ b/makefile +@@ -58,24 +58,27 @@ SCRIPTS := build-scripts + all: dist + + clean: +- git clean -dX # remove ignored files and directories +- -rm -r '$(BUILD)' ++ git clean -fdX # remove ignored files and directories ++ rm -rf '$(BUILD)' + + checkin: + -git commit -a + + build-dir: +- -rm -r '$(BUILD)/$(TARGET)'* +- -mkdir -p '$(BUILD)/$(TARGET)' ++ rm -rf '$(BUILD)/$(TARGET)'* ++ mkdir -p '$(BUILD)/$(TARGET)' + + firmware: + cd src; $(MAKE) LAYOUT=$(LAYOUT) all + +-$(ROOT)/firmware.%: firmware ++$(ROOT): ++ mkdir -p '$@' ++ ++$(ROOT)/firmware.%: firmware $(ROOT) + cp 'src/firmware.$*' '$@' + + +-$(ROOT)/firmware--ui-info.json: $(SCRIPTS)/gen-ui-info.py checkin ++$(ROOT)/firmware--ui-info.json: $(SCRIPTS)/gen-ui-info.py checkin firmware + ( ./'$<' \ + --current-date '$(shell $(DATE_PROG) --rfc-3339 s)' \ + --git-commit-date '$(GIT_COMMIT_DATE)' \ diff --git a/gnu/packages/patches/ergodox-firmware-fix-numpad.patch b/gnu/packages/patches/ergodox-firmware-fix-numpad.patch new file mode 100644 index 0000000000..47af9f8398 --- /dev/null +++ b/gnu/packages/patches/ergodox-firmware-fix-numpad.patch @@ -0,0 +1,18 @@ +Submitted upstream: https://github.com/benblazak/ergodox-firmware/pull/100 + +diff --git a/src/lib/key-functions/public/special.c b/src/lib/key-functions/public/special.c +index 42aba45..6488137 100644 +--- a/src/lib/key-functions/public/special.c ++++ b/src/lib/key-functions/public/special.c +@@ -102,9 +102,9 @@ void kbfun_2_keys_capslock_press_release(void) { + static uint8_t numpad_layer_id; + + static inline void numpad_toggle_numlock(void) { +- _kbfun_press_release(true, KEY_LockingNumLock); ++ _kbfun_press_release(true, KEYPAD_NumLock_Clear); + usb_keyboard_send(); +- _kbfun_press_release(false, KEY_LockingNumLock); ++ _kbfun_press_release(false, KEYPAD_NumLock_Clear); + usb_keyboard_send(); + } + diff --git a/gnu/packages/patches/ghc-basement-fix-32bit.patch b/gnu/packages/patches/ghc-basement-fix-32bit.patch new file mode 100644 index 0000000000..7407b2ef75 --- /dev/null +++ b/gnu/packages/patches/ghc-basement-fix-32bit.patch @@ -0,0 +1,177 @@ +https://github.com/haskell-foundation/foundation/pull/573 +https://github.com/haskell-foundation/foundation/commit/38be2c93acb6f459d24ed6c626981c35ccf44095.patch + +Changes made: +Changed '904' to '902' to use the fix with GHC-9.2. + +diff --git a/Basement/Bits.hs b/Basement/Bits.hs +index 7eeea0f..b1e9afd 100644 +--- a/Basement/Bits.hs ++++ b/Basement/Bits.hs +@@ -54,8 +54,12 @@ import GHC.Int + import Basement.Compat.Primitive + + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++import GHC.Exts ++#else + import GHC.IntWord64 + #endif ++#endif + + -- | operation over finite bits + class FiniteBitsOps bits where +diff --git a/Basement/Numerical/Additive.hs b/Basement/Numerical/Additive.hs +index d0dfb97..79b7033 100644 +--- a/Basement/Numerical/Additive.hs ++++ b/Basement/Numerical/Additive.hs +@@ -30,8 +30,12 @@ import qualified Basement.Types.Word128 as Word128 + import qualified Basement.Types.Word256 as Word256 + + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++import GHC.Exts ++#else + import GHC.IntWord64 + #endif ++#endif + + -- | Represent class of things that can be added together, + -- contains a neutral element and is commutative. +diff --git a/Basement/Numerical/Conversion.hs b/Basement/Numerical/Conversion.hs +index db502c0..abb6d93 100644 +--- a/Basement/Numerical/Conversion.hs ++++ b/Basement/Numerical/Conversion.hs +@@ -26,8 +26,12 @@ import GHC.Word + import Basement.Compat.Primitive + + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++import GHC.Exts ++#else + import GHC.IntWord64 + #endif ++#endif + + intToInt64 :: Int -> Int64 + #if WORD_SIZE_IN_BITS == 64 +@@ -96,11 +100,22 @@ int64ToWord64 (I64# i) = W64# (int64ToWord64# i) + #endif + + #if WORD_SIZE_IN_BITS == 64 ++#if __GLASGOW_HASKELL__ >= 904 ++word64ToWord# :: Word64# -> Word# ++word64ToWord# i = word64ToWord# i ++#else + word64ToWord# :: Word# -> Word# + word64ToWord# i = i ++#endif + {-# INLINE word64ToWord# #-} + #endif + ++#if WORD_SIZE_IN_BITS < 64 ++word64ToWord32# :: Word64# -> Word32# ++word64ToWord32# i = wordToWord32# (word64ToWord# i) ++{-# INLINE word64ToWord32# #-} ++#endif ++ + -- | 2 Word32s + data Word32x2 = Word32x2 {-# UNPACK #-} !Word32 + {-# UNPACK #-} !Word32 +@@ -113,9 +128,14 @@ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# (G + word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64)) + #endif + #else ++#if __GLASGOW_HASKELL__ >= 902 ++word64ToWord32s :: Word64 -> Word32x2 ++word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64)) ++#else + word64ToWord32s :: Word64 -> Word32x2 + word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64)) + #endif ++#endif + + wordToChar :: Word -> Char + wordToChar (W# word) = C# (chr# (word2Int# word)) +diff --git a/Basement/PrimType.hs b/Basement/PrimType.hs +index f8ca292..b8fbaf7 100644 +--- a/Basement/PrimType.hs ++++ b/Basement/PrimType.hs +@@ -54,7 +54,11 @@ import Basement.Nat + import qualified Prelude (quot) + + #if WORD_SIZE_IN_BITS < 64 +-import GHC.IntWord64 ++#if __GLASGOW_HASKELL__ >= 902 ++import GHC.Exts ++#else ++import GHC.IntWord64 ++#endif + #endif + + #ifdef FOUNDATION_BOUNDS_CHECK +diff --git a/Basement/Types/OffsetSize.hs b/Basement/Types/OffsetSize.hs +index cd94492..b2903ba 100644 +--- a/Basement/Types/OffsetSize.hs ++++ b/Basement/Types/OffsetSize.hs +@@ -70,8 +70,12 @@ import Data.List (foldl') + import qualified Prelude + + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++import GHC.Exts ++#else + import GHC.IntWord64 + #endif ++#endif + + -- | File size in bytes + newtype FileSize = FileSize Word64 +@@ -225,7 +229,11 @@ countOfRoundUp alignment (CountOf n) = CountOf ((n + (alignment-1)) .&. compleme + + csizeOfSize :: CountOf Word8 -> CSize + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz))) ++#else + csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz)) ++#endif + #else + #if __GLASGOW_HASKELL__ >= 904 + csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz))) +@@ -238,7 +246,11 @@ csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz)) + + csizeOfOffset :: Offset8 -> CSize + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz))) ++#else + csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz)) ++#endif + #else + #if __GLASGOW_HASKELL__ >= 904 + csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz))) +@@ -250,7 +262,11 @@ csizeOfOffset (Offset (I# sz)) = CSize (W64# (int2Word# sz)) + sizeOfCSSize :: CSsize -> CountOf Word8 + sizeOfCSSize (CSsize (-1)) = error "invalid size: CSSize is -1" + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz)) ++#else + sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz) ++#endif + #else + #if __GLASGOW_HASKELL__ >= 904 + sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz)) +@@ -261,7 +277,11 @@ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# sz) + + sizeOfCSize :: CSize -> CountOf Word8 + #if WORD_SIZE_IN_BITS < 64 ++#if __GLASGOW_HASKELL__ >= 902 ++sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz))) ++#else + sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz)) ++#endif + #else + #if __GLASGOW_HASKELL__ >= 904 + sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz))) diff --git a/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch b/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch deleted file mode 100644 index 97caf2cc9b..0000000000 --- a/gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch +++ /dev/null @@ -1,303 +0,0 @@ -Taken from https://github.com/bos/bloomfilter/pull/20 - -From fb79b39c44404fd791a3bed973e9d844fb084f1e Mon Sep 17 00:00:00 2001 -From: Simon Jakobi <simon.jakobi@gmail.com> -Date: Fri, 12 Nov 2021 01:37:36 +0100 -Subject: [PATCH] Fix build with GHC 9.2 - -The `FastShift.shift{L,R}` methods are replaced with `unsafeShift{L,R}` -introduced in base-4.5. - -Fixes #19. ---- - Data/BloomFilter.hs | 16 +++++------ - Data/BloomFilter/Hash.hs | 15 +++++----- - Data/BloomFilter/Mutable.hs | 20 +++++++------- - Data/BloomFilter/Util.hs | 55 ++++++------------------------------- - bloomfilter.cabal | 2 +- - 5 files changed, 34 insertions(+), 74 deletions(-) - -diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs -index 2210cef..6b47c21 100644 ---- a/Data/BloomFilter.hs -+++ b/Data/BloomFilter.hs -@@ -78,8 +78,8 @@ import Control.DeepSeq (NFData(..)) - import Data.Array.Base (unsafeAt) - import qualified Data.Array.Base as ST - import Data.Array.Unboxed (UArray) --import Data.Bits ((.&.)) --import Data.BloomFilter.Util (FastShift(..), (:*)(..)) -+import Data.Bits ((.&.), unsafeShiftL, unsafeShiftR) -+import Data.BloomFilter.Util ((:*)(..)) - import qualified Data.BloomFilter.Mutable as MB - import qualified Data.BloomFilter.Mutable.Internal as MB - import Data.BloomFilter.Mutable.Internal (Hash, MBloom) -@@ -98,7 +98,7 @@ data Bloom a = B { - } - - instance Show (Bloom a) where -- show ub = "Bloom { " ++ show ((1::Int) `shiftL` shift ub) ++ " bits } " -+ show ub = "Bloom { " ++ show ((1::Int) `unsafeShiftL` shift ub) ++ " bits } " - - instance NFData (Bloom a) where - rnf !_ = () -@@ -172,7 +172,7 @@ singleton hash numBits elt = create hash numBits (\mb -> MB.insert mb elt) - -- | Given a filter's mask and a hash value, compute an offset into - -- a word array and a bit offset within that word. - hashIdx :: Int -> Word32 -> (Int :* Int) --hashIdx mask x = (y `shiftR` logBitsInHash) :* (y .&. hashMask) -+hashIdx mask x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask) - where hashMask = 31 -- bitsInHash - 1 - y = fromIntegral x .&. mask - -@@ -191,7 +191,7 @@ hashesU ub elt = hashIdx (mask ub) `map` hashes ub elt - -- /still/ some possibility that @True@ will be returned. - elem :: a -> Bloom a -> Bool - elem elt ub = all test (hashesU ub elt) -- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) /= 0 -+ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) /= 0 - - modify :: (forall s. (MBloom s a -> ST s z)) -- ^ mutation function (result is discarded) - -> Bloom a -@@ -255,11 +255,11 @@ insertList elts = modify $ \mb -> mapM_ (MB.insert mb) elts - -- is /still/ some possibility that @True@ will be returned. - notElem :: a -> Bloom a -> Bool - notElem elt ub = any test (hashesU ub elt) -- where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `shiftL` bit) == 0 -+ where test (off :* bit) = (bitArray ub `unsafeAt` off) .&. (1 `unsafeShiftL` bit) == 0 - - -- | Return the size of an immutable Bloom filter, in bits. - length :: Bloom a -> Int --length = shiftL 1 . shift -+length = unsafeShiftL 1 . shift - - -- | Build an immutable Bloom filter from a seed value. The seeding - -- function populates the filter as follows. -@@ -318,7 +318,7 @@ fromList hashes numBits = unfold hashes numBits convert - logPower2 :: Int -> Int - logPower2 k = go 0 k - where go j 1 = j -- go j n = go (j+1) (n `shiftR` 1) -+ go j n = go (j+1) (n `unsafeShiftR` 1) - - -- $overview - -- -diff --git a/Data/BloomFilter/Hash.hs b/Data/BloomFilter/Hash.hs -index 132a3a4..d071fd4 100644 ---- a/Data/BloomFilter/Hash.hs -+++ b/Data/BloomFilter/Hash.hs -@@ -38,8 +38,7 @@ module Data.BloomFilter.Hash - ) where - - import Control.Monad (foldM) --import Data.Bits ((.&.), (.|.), xor) --import Data.BloomFilter.Util (FastShift(..)) -+import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR, xor) - import Data.List (unfoldr) - import Data.Int (Int8, Int16, Int32, Int64) - import Data.Word (Word8, Word16, Word32, Word64) -@@ -91,11 +90,11 @@ class Hashable a where - -> Word64 -- ^ salt - -> IO Word64 - hashIO64 v salt = do -- let s1 = fromIntegral (salt `shiftR` 32) .&. maxBound -+ let s1 = fromIntegral (salt `unsafeShiftR` 32) .&. maxBound - s2 = fromIntegral salt - h1 <- hashIO32 v s1 - h2 <- hashIO32 v s2 -- return $ (fromIntegral h1 `shiftL` 32) .|. fromIntegral h2 -+ return $ (fromIntegral h1 `unsafeShiftL` 32) .|. fromIntegral h2 - - -- | Compute a 32-bit hash. - hash32 :: Hashable a => a -> Word32 -@@ -149,8 +148,8 @@ cheapHashes :: Hashable a => Int -- ^ number of hashes to compute - cheapHashes k v = go 0 - where go i | i == j = [] - | otherwise = hash : go (i + 1) -- where !hash = h1 + (h2 `shiftR` i) -- h1 = fromIntegral (h `shiftR` 32) -+ where !hash = h1 + (h2 `unsafeShiftR` i) -+ h1 = fromIntegral (h `unsafeShiftR` 32) - h2 = fromIntegral h - h = hashSalt64 0x9150a946c4a8966e v - j = fromIntegral k -@@ -163,7 +162,7 @@ instance Hashable Integer where - (salt `xor` 0x3ece731e) - | otherwise = hashIO32 (unfoldr go k) salt - where go 0 = Nothing -- go i = Just (fromIntegral i :: Word32, i `shiftR` 32) -+ go i = Just (fromIntegral i :: Word32, i `unsafeShiftR` 32) - - instance Hashable Bool where - hashIO32 = hashOne32 -@@ -224,7 +223,7 @@ instance Hashable Word64 where - -- | A fast unchecked shift. Nasty, but otherwise GHC 6.8.2 does a - -- test and branch on every shift. - div4 :: CSize -> CSize --div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `shiftR` 2) -+div4 k = fromIntegral ((fromIntegral k :: HTYPE_SIZE_T) `unsafeShiftR` 2) - - alignedHash :: Ptr a -> CSize -> Word32 -> IO Word32 - alignedHash ptr bytes salt -diff --git a/Data/BloomFilter/Mutable.hs b/Data/BloomFilter/Mutable.hs -index edff1fc..0bb5cc9 100644 ---- a/Data/BloomFilter/Mutable.hs -+++ b/Data/BloomFilter/Mutable.hs -@@ -65,9 +65,9 @@ module Data.BloomFilter.Mutable - import Control.Monad (liftM, forM_) - import Control.Monad.ST (ST) - import Data.Array.Base (unsafeRead, unsafeWrite) --import Data.Bits ((.&.), (.|.)) -+import Data.Bits ((.&.), (.|.), unsafeShiftL, unsafeShiftR) - import Data.BloomFilter.Array (newArray) --import Data.BloomFilter.Util (FastShift(..), (:*)(..), nextPowerOfTwo) -+import Data.BloomFilter.Util ((:*)(..), nextPowerOfTwo) - import Data.Word (Word32) - import Data.BloomFilter.Mutable.Internal - -@@ -86,9 +86,9 @@ new hash numBits = MB hash shft msk `liftM` newArray numElems numBytes - | numBits > maxHash = maxHash - | isPowerOfTwo numBits = numBits - | otherwise = nextPowerOfTwo numBits -- numElems = max 2 (twoBits `shiftR` logBitsInHash) -- numBytes = numElems `shiftL` logBytesInHash -- trueBits = numElems `shiftL` logBitsInHash -+ numElems = max 2 (twoBits `unsafeShiftR` logBitsInHash) -+ numBytes = numElems `unsafeShiftL` logBytesInHash -+ trueBits = numElems `unsafeShiftL` logBitsInHash - shft = logPower2 trueBits - msk = trueBits - 1 - isPowerOfTwo n = n .&. (n - 1) == 0 -@@ -109,7 +109,7 @@ logBytesInHash = 2 -- logPower2 (sizeOf (undefined :: Hash)) - -- | Given a filter's mask and a hash value, compute an offset into - -- a word array and a bit offset within that word. - hashIdx :: Int -> Word32 -> (Int :* Int) --hashIdx msk x = (y `shiftR` logBitsInHash) :* (y .&. hashMask) -+hashIdx msk x = (y `unsafeShiftR` logBitsInHash) :* (y .&. hashMask) - where hashMask = 31 -- bitsInHash - 1 - y = fromIntegral x .&. msk - -@@ -125,7 +125,7 @@ insert mb elt = do - let mu = bitArray mb - forM_ (hashesM mb elt) $ \(word :* bit) -> do - old <- unsafeRead mu word -- unsafeWrite mu word (old .|. (1 `shiftL` bit)) -+ unsafeWrite mu word (old .|. (1 `unsafeShiftL` bit)) - - -- | Query a mutable Bloom filter for membership. If the value is - -- present, return @True@. If the value is not present, there is -@@ -135,7 +135,7 @@ elem elt mb = loop (hashesM mb elt) - where mu = bitArray mb - loop ((word :* bit):wbs) = do - i <- unsafeRead mu word -- if i .&. (1 `shiftL` bit) == 0 -+ if i .&. (1 `unsafeShiftL` bit) == 0 - then return False - else loop wbs - loop _ = return True -@@ -145,7 +145,7 @@ elem elt mb = loop (hashesM mb elt) - - -- | Return the size of a mutable Bloom filter, in bits. - length :: MBloom s a -> Int --length = shiftL 1 . shift -+length = unsafeShiftL 1 . shift - - - -- | Slow, crummy way of computing the integer log of an integer known -@@ -153,7 +153,7 @@ length = shiftL 1 . shift - logPower2 :: Int -> Int - logPower2 k = go 0 k - where go j 1 = j -- go j n = go (j+1) (n `shiftR` 1) -+ go j n = go (j+1) (n `unsafeShiftR` 1) - - -- $overview - -- -diff --git a/Data/BloomFilter/Util.hs b/Data/BloomFilter/Util.hs -index 7f695dc..6ade6e5 100644 ---- a/Data/BloomFilter/Util.hs -+++ b/Data/BloomFilter/Util.hs -@@ -2,15 +2,11 @@ - - module Data.BloomFilter.Util - ( -- FastShift(..) -- , nextPowerOfTwo -+ nextPowerOfTwo - , (:*)(..) - ) where - --import Data.Bits ((.|.)) --import qualified Data.Bits as Bits --import GHC.Base --import GHC.Word -+import Data.Bits ((.|.), unsafeShiftR) - - -- | A strict pair type. - data a :* b = !a :* !b -@@ -22,46 +18,11 @@ nextPowerOfTwo :: Int -> Int - {-# INLINE nextPowerOfTwo #-} - nextPowerOfTwo n = - let a = n - 1 -- b = a .|. (a `shiftR` 1) -- c = b .|. (b `shiftR` 2) -- d = c .|. (c `shiftR` 4) -- e = d .|. (d `shiftR` 8) -- f = e .|. (e `shiftR` 16) -- g = f .|. (f `shiftR` 32) -- in case we're on a 64-bit host -+ b = a .|. (a `unsafeShiftR` 1) -+ c = b .|. (b `unsafeShiftR` 2) -+ d = c .|. (c `unsafeShiftR` 4) -+ e = d .|. (d `unsafeShiftR` 8) -+ f = e .|. (e `unsafeShiftR` 16) -+ g = f .|. (f `unsafeShiftR` 32) -- in case we're on a 64-bit host - !h = g + 1 - in h -- ---- | This is a workaround for poor optimisation in GHC 6.8.2. It ---- fails to notice constant-width shifts, and adds a test and branch ---- to every shift. This imposes about a 10% performance hit. --class FastShift a where -- shiftL :: a -> Int -> a -- shiftR :: a -> Int -> a -- --instance FastShift Word32 where -- {-# INLINE shiftL #-} -- shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftL#` i#) -- -- {-# INLINE shiftR #-} -- shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#) -- --instance FastShift Word64 where -- {-# INLINE shiftL #-} -- shiftL (W64# x#) (I# i#) = W64# (x# `uncheckedShiftL64#` i#) -- -- {-# INLINE shiftR #-} -- shiftR (W64# x#) (I# i#) = W64# (x# `uncheckedShiftRL64#` i#) -- --instance FastShift Int where -- {-# INLINE shiftL #-} -- shiftL (I# x#) (I# i#) = I# (x# `iShiftL#` i#) -- -- {-# INLINE shiftR #-} -- shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#) -- --instance FastShift Integer where -- {-# INLINE shiftL #-} -- shiftL = Bits.shiftL -- -- {-# INLINE shiftR #-} -- shiftR = Bits.shiftR -diff --git a/bloomfilter.cabal b/bloomfilter.cabal -index 821a5d7..c621f7f 100644 ---- a/bloomfilter.cabal -+++ b/bloomfilter.cabal -@@ -18,7 +18,7 @@ extra-source-files: README.markdown cbits/lookup3.c cbits/lookup3.h - library - build-depends: - array, -- base >= 4.4 && < 5, -+ base >= 4.5 && < 5, - bytestring >= 0.9, - deepseq - exposed-modules: Data.BloomFilter diff --git a/gnu/packages/patches/ghc-memory-fix-32bit.patch b/gnu/packages/patches/ghc-memory-fix-32bit.patch new file mode 100644 index 0000000000..cb81b42521 --- /dev/null +++ b/gnu/packages/patches/ghc-memory-fix-32bit.patch @@ -0,0 +1,40 @@ +https://github.com/vincenthz/hs-memory/commit/2738929ce15b4c8704bbbac24a08539b5d4bf30e.patch +https://github.com/vincenthz/hs-memory/pull/99 +Adjusted so the '904' becomes '902' + +From 2738929ce15b4c8704bbbac24a08539b5d4bf30e Mon Sep 17 00:00:00 2001 +From: sternenseemann <sternenseemann@systemli.org> +Date: Mon, 14 Aug 2023 10:51:30 +0200 +Subject: [PATCH] Data.Memory.Internal.CompatPrim64: fix 32 bit with GHC >= 9.4 + +Since 9.4, GHC.Prim exports Word64# operations like timesWord64# even on +i686 whereas GHC.IntWord64 no longer exists. Therefore, we can just use +the ready made solution. + +Closes #98, as it should be the better solution. +--- + Data/Memory/Internal/CompatPrim64.hs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Data/Memory/Internal/CompatPrim64.hs b/Data/Memory/Internal/CompatPrim64.hs +index b9eef8a..a134c88 100644 +--- a/Data/Memory/Internal/CompatPrim64.hs ++++ b/Data/Memory/Internal/CompatPrim64.hs +@@ -150,6 +150,7 @@ w64# :: Word# -> Word# -> Word# -> Word64# + w64# w _ _ = w + + #elif WORD_SIZE_IN_BITS == 32 ++#if __GLASGOW_HASKELL__ < 902 + import GHC.IntWord64 + import GHC.Prim (Word#) + +@@ -158,6 +159,9 @@ timesWord64# a b = + let !ai = word64ToInt64# a + !bi = word64ToInt64# b + in int64ToWord64# (timesInt64# ai bi) ++#else ++import GHC.Prim ++#endif + + w64# :: Word# -> Word# -> Word# -> Word64# + w64# _ hw lw = diff --git a/gnu/packages/patches/ghc-persistent-fix-32bit.patch b/gnu/packages/patches/ghc-persistent-fix-32bit.patch new file mode 100644 index 0000000000..d0aace2445 --- /dev/null +++ b/gnu/packages/patches/ghc-persistent-fix-32bit.patch @@ -0,0 +1,25 @@ +https://sources.debian.org/data/main/h/haskell-persistent/2.13.3.5-2/debian/patches/fix-tests-32-bit +Inspired by: https://github.com/yesodweb/persistent/pull/1429 + +--- a/test/Database/Persist/THSpec.hs ++++ b/test/Database/Persist/THSpec.hs +@@ -25,6 +25,7 @@ module Database.Persist.THSpec where + + import Control.Applicative (Const(..)) + import Data.Aeson (decode, encode) ++import Data.Bits (bitSizeMaybe) + import Data.ByteString.Lazy.Char8 () + import Data.Coerce + import Data.Functor.Identity (Identity(..)) +@@ -237,7 +238,10 @@ spec = describe "THSpec" $ do + it "should have usual haskell name" $ do + fieldHaskell `shouldBe` FieldNameHS "Id" + it "should have correct underlying sql type" $ do +- fieldSqlType `shouldBe` SqlInt64 ++ fieldSqlType `shouldBe` ++ if bitSizeMaybe (0 :: Int) <= Just 32 ++ then SqlInt32 ++ else SqlInt64 + it "should have correct haskell type" $ do + fieldType `shouldBe` FTTypeCon Nothing "Int" + diff --git a/gnu/packages/patches/gklib-suitesparse.patch b/gnu/packages/patches/gklib-suitesparse.patch new file mode 100644 index 0000000000..8b6c708b6a --- /dev/null +++ b/gnu/packages/patches/gklib-suitesparse.patch @@ -0,0 +1,65 @@ +This patch contains the relevant changes to GKlib made in SuiteSparse +(CHOLMOD) for the version 7.2.0 +(https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/8a7641cdb4809533c681417e94f98058c07c5da2). +The disabling of signal handling when MATLAB_MEX_FILE is defined is omitted. + +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ + + option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) + ++find_package ( SuiteSparse_config 7.1.0 REQUIRED ) ++ + get_filename_component(abs "." ABSOLUTE) + set(GKLIB_PATH ${abs}) + unset(abs) +diff -ur a/GKlib.h b/GKlib.h +--- a/GKlib.h ++++ b/GKlib.h +@@ -59,6 +59,24 @@ + #include <omp.h> + #endif + ++/* -------------------------------------------------------------------------- */ ++/* Added for incorporation into SuiteSparse. ++ Tim Davis, Oct 31, 2022, Texas A&M University. */ ++#include "SuiteSparse_config.h" ++#define malloc SuiteSparse_config_malloc ++#define calloc SuiteSparse_config_calloc ++#define realloc SuiteSparse_config_realloc ++#define free(p) \ ++{ \ ++ if ((p) != NULL) \ ++ { \ ++ SuiteSparse_config_free (p) ; \ ++ (p) = NULL ; \ ++ } \ ++} ++ ++/* -------------------------------------------------------------------------- */ ++ + + + +diff -ur a/memory.c b/memory.c +--- a/memory.c ++++ b/memory.c +@@ -108,6 +108,8 @@ + /*************************************************************************/ + int gk_malloc_init() + { ++ gkmcore = NULL; ++#if 0 + if (gkmcore == NULL) + gkmcore = gk_gkmcoreCreate(); + +@@ -115,6 +117,7 @@ + return 0; + + gk_gkmcorePush(gkmcore); ++#endif + + return 1; + } diff --git a/gnu/packages/patches/glibc-2.35-CVE-2023-4911.patch b/gnu/packages/patches/glibc-2.35-CVE-2023-4911.patch new file mode 100644 index 0000000000..d8044f064d --- /dev/null +++ b/gnu/packages/patches/glibc-2.35-CVE-2023-4911.patch @@ -0,0 +1,160 @@ +From 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa Mon Sep 17 00:00:00 2001 +From: Siddhesh Poyarekar <siddhesh@sourceware.org> +Date: Tue, 19 Sep 2023 18:39:32 -0400 +Subject: [PATCH 1/1] tunables: Terminate if end of input is reached + (CVE-2023-4911) + +The string parsing routine may end up writing beyond bounds of tunestr +if the input tunable string is malformed, of the form name=name=val. +This gets processed twice, first as name=name=val and next as name=val, +resulting in tunestr being name=name=val:name=val, thus overflowing +tunestr. + +Terminate the parsing loop at the first instance itself so that tunestr +does not overflow. + +This also fixes up tst-env-setuid-tunables to actually handle failures +correct and add new tests to validate the fix for this CVE. + +Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org> +Reviewed-by: Carlos O'Donell <carlos@redhat.com> +--- +Backported to 2.35 by Liliana Marie Prikler <liliana.prikler@gmail.com> + + NEWS | 5 +++++ + elf/dl-tunables.c | 17 +++++++++------- + elf/tst-env-setuid-tunables.c | 37 +++++++++++++++++++++++++++-------- + 3 files changed, 44 insertions(+), 15 deletions(-) + +Index: glibc-2.35/NEWS +=================================================================== +--- glibc-2.35.orig/NEWS ++++ glibc-2.35/NEWS +@@ -199,6 +199,11 @@ Security related changes: + corresponds to the / directory through an unprivileged mount + namespace. Reported by Qualys. + ++ CVE-2023-4911: If a tunable of the form NAME=NAME=VAL is passed in the ++ environment of a setuid program and NAME is valid, it may result in a ++ buffer overflow, which could be exploited to achieve escalated ++ privileges. This flaw was introduced in glibc 2.34. ++ + The following bugs are resolved with this release: + + [12889] nptl: Race condition in pthread_kill +Index: glibc-2.35/elf/dl-tunables.c +=================================================================== +--- glibc-2.35.orig/elf/dl-tunables.c ++++ glibc-2.35/elf/dl-tunables.c +@@ -187,11 +187,7 @@ parse_tunables (char *tunestr, char *val + /* If we reach the end of the string before getting a valid name-value + pair, bail out. */ + if (p[len] == '\0') +- { +- if (__libc_enable_secure) +- tunestr[off] = '\0'; +- return; +- } ++ break; + + /* We did not find a valid name-value pair before encountering the + colon. */ +@@ -251,9 +247,16 @@ parse_tunables (char *tunestr, char *val + } + } + +- if (p[len] != '\0') +- p += len + 1; ++ /* We reached the end while processing the tunable string. */ ++ if (p[len] == '\0') ++ break; ++ ++ p += len + 1; + } ++ ++ /* Terminate tunestr before we leave. */ ++ if (__libc_enable_secure) ++ tunestr[off] = '\0'; + } + #endif + +Index: glibc-2.35/elf/tst-env-setuid-tunables.c +=================================================================== +--- glibc-2.35.orig/elf/tst-env-setuid-tunables.c ++++ glibc-2.35/elf/tst-env-setuid-tunables.c +@@ -52,6 +52,8 @@ const char *teststrings[] = + "glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096", + "glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096", + "not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.check=2", + "glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2", + "glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096", + ":glibc.malloc.garbage=2:glibc.malloc.check=1", +@@ -70,6 +72,8 @@ const char *resultstrings[] = + "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096", + "glibc.malloc.mmap_threshold=4096", + "glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=glibc.malloc.mmap_threshold=4096", ++ "", + "", + "", + "", +@@ -89,6 +93,8 @@ test_child (int off) + + if (val != NULL) + printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val); ++ else ++ printf ("[%d] GLIBC_TUNABLES environment variable absent\n", off); + + return 1; + #else +@@ -117,21 +123,26 @@ do_test (int argc, char **argv) + if (ret != 0) + exit (1); + +- exit (EXIT_SUCCESS); ++ /* Special return code to make sure that the child executed all the way ++ through. */ ++ exit (42); + } + else + { +- int ret = 0; +- + /* Spawn tests. */ + for (int i = 0; i < array_length (teststrings); i++) + { + char buf[INT_BUFSIZE_BOUND (int)]; + +- printf ("Spawned test for %s (%d)\n", teststrings[i], i); ++ printf ("[%d] Spawned test for %s\n", i, teststrings[i]); + snprintf (buf, sizeof (buf), "%d\n", i); ++ fflush (stdout); + if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0) +- exit (1); ++ { ++ printf (" [%d] Failed to set GLIBC_TUNABLES: %m", i); ++ support_record_failure (); ++ continue; ++ } + + int status = support_capture_subprogram_self_sgid (buf); + +@@ -139,9 +150,14 @@ do_test (int argc, char **argv) + if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) + return EXIT_UNSUPPORTED; + +- ret |= status; ++ if (WEXITSTATUS (status) != 42) ++ { ++ printf (" [%d] child failed with status %d\n", i, ++ WEXITSTATUS (status)); ++ support_record_failure (); ++ } + } +- return ret; ++ return 0; + } + } + diff --git a/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch b/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch new file mode 100644 index 0000000000..7a243f5d80 --- /dev/null +++ b/gnu/packages/patches/go-gopkg-in-yaml-v3-32bit.patch @@ -0,0 +1,50 @@ +https://sources.debian.org/src/golang-gopkg-yaml.v3/3.0.1-3/debian/patches/0001-Fix-0b-on-32-bit-systems.patch/ + +From: Shengjing Zhu <zhsj@debian.org> +Date: Fri, 16 Apr 2021 00:40:09 +0800 +Subject: Fix -0b on 32-bit systems + +Origin: backport, https://github.com/go-yaml/yaml/pull/442 +--- + decode_test.go | 7 ++++--- + resolve.go | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/decode_test.go b/decode_test.go +index 51f5070..9cac74c 100644 +--- a/decode_test.go ++++ b/decode_test.go +@@ -175,9 +175,6 @@ var unmarshalTests = []struct { + }, { + "bin: -0b101010", + map[string]interface{}{"bin": -42}, +- }, { +- "bin: -0b1000000000000000000000000000000000000000000000000000000000000000", +- map[string]interface{}{"bin": -9223372036854775808}, + }, { + "decimal: +685_230", + map[string]int{"decimal": 685230}, +@@ -357,6 +354,10 @@ var unmarshalTests = []struct { + "int64_min: -9223372036854775808", + map[string]int64{"int64_min": math.MinInt64}, + }, ++ { ++ "int64_min_base2: -0b1000000000000000000000000000000000000000000000000000000000000000", ++ map[string]int64{"int64_min_base2": math.MinInt64}, ++ }, + { + "int64_neg_base2: -0b111111111111111111111111111111111111111111111111111111111111111", + map[string]int64{"int64_neg_base2": -math.MaxInt64}, +diff --git a/resolve.go b/resolve.go +index 64ae888..1b7d8c3 100644 +--- a/resolve.go ++++ b/resolve.go +@@ -223,7 +223,7 @@ func resolve(tag string, in string) (rtag string, out interface{}) { + } else if strings.HasPrefix(plain, "-0b") { + intv, err := strconv.ParseInt("-"+plain[3:], 2, 64) + if err == nil { +- if true || intv == int64(int(intv)) { ++ if intv == int64(int(intv)) { + return intTag, int(intv) + } else { + return intTag, intv diff --git a/gnu/packages/patches/hplip-usb-timeout.patch b/gnu/packages/patches/hplip-usb-timeout.patch new file mode 100644 index 0000000000..b98ed1cc78 --- /dev/null +++ b/gnu/packages/patches/hplip-usb-timeout.patch @@ -0,0 +1,24 @@ +# Source: <https://bugs.launchpad.net/hplip/+bug/1922404> + +--- a/config_usb_printer.py ++++ b/config_usb_printer.py +@@ -28,6 +28,7 @@ + # Std Lib + import sys + import os ++import time + + # Local + from base.g import * +@@ -181,9 +182,10 @@ + # ******************************* RUNNING FIRMWARE DOWNLOAD TO DEVICE FOR SUPPORTED PRINTER'S + fw_download_req = mq.get('fw-download', False) + if fw_download_req: +- fw_cmd = "hp-firmware -y3 -s %s"%param ++ fw_cmd = "hp-firmware -n -y3 -s %s"%param + log.info(fw_cmd) + fw_sts, fw_out = utils.run(fw_cmd) ++ time.sleep(5) + if fw_sts == 0: + log.debug("Firmware downloaded to %s "%device_uri) + else: diff --git a/gnu/packages/patches/icecat-compare-paths.patch b/gnu/packages/patches/icecat-compare-paths.patch new file mode 100644 index 0000000000..69c03e05ee --- /dev/null +++ b/gnu/packages/patches/icecat-compare-paths.patch @@ -0,0 +1,21 @@ +See comment in gnu/build/icecat-extension.scm. + +--- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm ++++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -3452,6 +3452,7 @@ const XPIDatabaseReconcile = { + if ( + newAddon || + oldAddon.updateDate != xpiState.mtime || ++ oldAddon.path != xpiState.path || + (aUpdateCompatibility && this.isAppBundledLocation(installLocation)) + ) { + newAddon = this.updateMetadata( +@@ -3460,8 +3461,6 @@ const XPIDatabaseReconcile = { + xpiState, + newAddon + ); +- } else if (oldAddon.path != xpiState.path) { +- newAddon = this.updatePath(installLocation, oldAddon, xpiState); + } else if (aUpdateCompatibility || aSchemaChange) { + newAddon = this.updateCompatibility( + installLocation, diff --git a/gnu/packages/patches/icecat-use-system-wide-dir.patch b/gnu/packages/patches/icecat-use-system-wide-dir.patch new file mode 100644 index 0000000000..a635a4d18e --- /dev/null +++ b/gnu/packages/patches/icecat-use-system-wide-dir.patch @@ -0,0 +1,36 @@ +Replace "/usr/lib/mozilla" (the system-wide directory for extensions and +native manifests) with "$ICECAT_SYSTEM_DIR". + +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -293,24 +293,12 @@ nsresult nsXREDirProvider::GetBackgroundTasksProfilesRootDir( + static nsresult GetSystemParentDirectory(nsIFile** aFile) { + nsresult rv; + nsCOMPtr<nsIFile> localDir; +-# if defined(XP_MACOSX) +- rv = GetOSXFolderType(kOnSystemDisk, kApplicationSupportFolderType, +- getter_AddRefs(localDir)); +- if (NS_SUCCEEDED(rv)) { +- rv = localDir->AppendNative("Mozilla"_ns); +- } +-# else +- constexpr auto dirname = +-# ifdef HAVE_USR_LIB64_DIR +- "/usr/lib64/mozilla"_ns +-# elif defined(__OpenBSD__) || defined(__FreeBSD__) +- "/usr/local/lib/mozilla"_ns +-# else +- "/usr/lib/mozilla"_ns +-# endif +- ; +- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir)); +-# endif ++ ++ const char* systemParentDir = getenv("ICECAT_SYSTEM_DIR"); ++ if (!systemParentDir || !*systemParentDir) return NS_ERROR_FAILURE; ++ ++ rv = NS_NewNativeLocalFile(nsDependentCString(systemParentDir), false, ++ getter_AddRefs(localDir)); + + if (NS_SUCCEEDED(rv)) { + localDir.forget(aFile); diff --git a/gnu/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch b/gnu/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch new file mode 100644 index 0000000000..5d149d8f28 --- /dev/null +++ b/gnu/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch @@ -0,0 +1,33 @@ +From b6b3e89231a623441940889b5badd90f74bdce2b Mon Sep 17 00:00:00 2001 +From: Frank Tang <ftang@chromium.org> +Date: Mon, 18 Sep 2023 20:20:42 -0700 +Subject: [PATCH] ICU-22512 Fix broken TestHebrewCalendarInTemporalLeapYear + +Fix broken test mistakenly landed in +https://github.com/unicode-org/icu/pull/2274 + +Some important steps were missed in the last landing. +--- + icu4c/source/test/intltest/caltest.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp +index 9d89f468eef0..18b96f231ba3 100644 +--- a/source/test/intltest/caltest.cpp ++++ b/source/test/intltest/caltest.cpp +@@ -4028,6 +4028,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + for (gc.set(startYear, UCAL_JANUARY, 1); + gc.get(UCAL_YEAR, status) <= stopYear; + gc.add(UCAL_DATE, incrementDays, status)) { ++ cal->setTime(gc.getTime(status), status); + if (failure(status, "add/get/set/getTime/setTime incorrect")) return; + + int32_t cal_year = cal->get(UCAL_EXTENDED_YEAR, status); +@@ -4036,6 +4037,7 @@ void CalendarTest::TestHebrewCalendarInTemporalLeapYear() { + leapTest->set(UCAL_MONTH, 0); + leapTest->set(UCAL_DATE, 1); + // If 10 months after TISHRI is TAMUZ, then it is a leap year. ++ leapTest->add(UCAL_MONTH, 10, status); + hasLeapMonth = leapTest->get(UCAL_MONTH, status) == icu::HebrewCalendar::TAMUZ; + yearForHasLeapMonth = cal_year; + } diff --git a/gnu/packages/patches/igraph-fix-varargs-integer-size.patch b/gnu/packages/patches/igraph-fix-varargs-integer-size.patch new file mode 100644 index 0000000000..2d7ffd7e68 --- /dev/null +++ b/gnu/packages/patches/igraph-fix-varargs-integer-size.patch @@ -0,0 +1,39 @@ +If the size of int is different from IGRAPH_INTEGER_SIZE, the integer size +passed to these vararg arguments is different from the assumed one, +leading to undefined behavior. +Submitted upstream: https://github.com/igraph/igraph/pull/2423 + + +diff -ur a/examples/simple/igraph_union.c b/examples/simple/igraph_union.c +--- a/examples/simple/igraph_union.c ++++ b/examples/simple/igraph_union.c +@@ -103,7 +103,7 @@ + igraph_vector_ptr_init(&glist, 10); + for (i = 0; i < igraph_vector_ptr_size(&glist); i++) { + VECTOR(glist)[i] = calloc(1, sizeof(igraph_t)); +- igraph_vector_int_init_int_end(&v, -1, i, i + 1, 1, 0, -1); ++ igraph_vector_int_init_int_end(&v, -1, (int) i, (int) i + 1, 1, 0, -1); + igraph_create(VECTOR(glist)[i], &v, 0, IGRAPH_DIRECTED); + igraph_vector_int_destroy(&v); + } +@@ -123,7 +123,7 @@ + igraph_vector_ptr_init(&glist, 10); + for (i = 0; i < igraph_vector_ptr_size(&glist); i++) { + VECTOR(glist)[i] = calloc(1, sizeof(igraph_t)); +- igraph_vector_int_init_int_end(&v, -1, i, i + 1, 1, 0, -1); ++ igraph_vector_int_init_int_end(&v, -1, (int) i, (int) i + 1, 1, 0, -1); + igraph_create(VECTOR(glist)[i], &v, 0, IGRAPH_UNDIRECTED); + igraph_vector_int_destroy(&v); + } +diff -ur a/src/core/matrix.pmt b/src/core/matrix.pmt +--- a/src/core/matrix.pmt ++++ b/src/core/matrix.pmt +@@ -1863,7 +1863,7 @@ + #ifdef FPRINTFUNC_ALIGNED + FPRINTFUNC_ALIGNED(file, VECTOR(column_width)[j], MATRIX(*m, i, j)); + #else +- fprintf(file, format, VECTOR(column_width)[j], MATRIX(*m, i, j)); ++ fprintf(file, format, (int) VECTOR(column_width)[j], MATRIX(*m, i, j)); + #endif + } + fprintf(file, "\n"); diff --git a/gnu/packages/patches/igt-gpu-tools-Use-libproc2.patch b/gnu/packages/patches/igt-gpu-tools-Use-libproc2.patch deleted file mode 100644 index 131fea28fc..0000000000 --- a/gnu/packages/patches/igt-gpu-tools-Use-libproc2.patch +++ /dev/null @@ -1,505 +0,0 @@ -diff --git a/lib/igt_aux.c b/lib/igt_aux.c -index 672d7d4b0..4c24b0928 100644 ---- a/lib/igt_aux.c -+++ b/lib/igt_aux.c -@@ -52,8 +52,16 @@ - #include <assert.h> - #include <grp.h> - --#include <proc/readproc.h> --#include <libudev.h> -+#ifdef HAVE_LIBPROCPS -+# include <proc/readproc.h> -+#else -+# include <libproc2/pids.h> -+#endif -+ -+#include <dirent.h> -+#ifdef __linux__ -+# include <libudev.h> -+#endif - - #include "drmtest.h" - #include "i915_drm.h" -@@ -1217,6 +1225,7 @@ void igt_unlock_mem(void) - */ - int igt_is_process_running(const char *comm) - { -+#if HAVE_LIBPROCPS - PROCTAB *proc; - proc_t *proc_info; - bool found = false; -@@ -1235,6 +1244,26 @@ int igt_is_process_running(const char *comm) - - closeproc(proc); - return found; -+#else -+ enum pids_item Item[] = { PIDS_CMD }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ char *pid_comm; -+ bool found = false; -+ -+ if (procps_pids_new(&info, Item, 1) < 0) -+ return false; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ pid_comm = PIDS_VAL(0, str, stack, info); -+ if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) { -+ found = true; -+ break; -+ } -+ } -+ -+ procps_pids_unref(&info); -+ return found; -+#endif - } - - /** -@@ -1251,6 +1280,7 @@ int igt_is_process_running(const char *comm) - */ - int igt_terminate_process(int sig, const char *comm) - { -+#if HAVE_LIBPROCPS - PROCTAB *proc; - proc_t *proc_info; - int err = 0; -@@ -1272,6 +1302,28 @@ int igt_terminate_process(int sig, const char *comm) - - closeproc(proc); - return err; -+#else -+ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ char *pid_comm; -+ int pid; -+ int err = 0; -+ -+ if (procps_pids_new(&info, Items, 2) < 0) -+ return -errno; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ pid = PIDS_VAL(0, s_int, stack, info); -+ pid_comm = PIDS_VAL(1, str, stack, info); -+ if (!strncasecmp(pid_comm, comm, strlen(pid_comm))) { -+ if (kill(pid, sig) < 0) -+ err = -errno; -+ break; -+ } -+ } -+ procps_pids_unref(&info); -+ return err; -+#endif - } - - struct pinfo { -@@ -1341,9 +1393,9 @@ igt_show_stat_header(void) - } - - static void --igt_show_stat(proc_t *info, int *state, const char *fn) -+igt_show_stat(const pid_t tid, const char *cmd, int *state, const char *fn) - { -- struct pinfo p = { .pid = info->tid, .comm = info->cmd, .fn = fn }; -+ struct pinfo p = { .pid = tid, .comm = cmd, .fn = fn }; - - if (!*state) - igt_show_stat_header(); -@@ -1353,7 +1405,7 @@ igt_show_stat(proc_t *info, int *state, const char *fn) - } - - static void --__igt_lsof_fds(proc_t *proc_info, int *state, char *proc_path, const char *dir) -+__igt_lsof_fds(const pid_t tid, const char *cmd, int *state, char *proc_path, const char *dir) - { - struct dirent *d; - struct stat st; -@@ -1400,7 +1452,7 @@ again: - dirn = dirname(copy_fd_lnk); - - if (!strncmp(dir, dirn, strlen(dir))) -- igt_show_stat(proc_info, state, fd_lnk); -+ igt_show_stat(tid, cmd, state, fd_lnk); - - free(copy_fd_lnk); - free(fd_lnk); -@@ -1416,13 +1468,13 @@ again: - static void - __igt_lsof(const char *dir) - { -- PROCTAB *proc; -- proc_t *proc_info; -- - char path[30]; - char *name_lnk; - struct stat st; - int state = 0; -+#ifdef HAVE_LIBPROCPS -+ PROCTAB *proc; -+ proc_t *proc_info; - - proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); - igt_assert(proc != NULL); -@@ -1443,19 +1495,56 @@ __igt_lsof(const char *dir) - name_lnk[read] = '\0'; - - if (!strncmp(dir, name_lnk, strlen(dir))) -- igt_show_stat(proc_info, &state, name_lnk); -+ igt_show_stat(proc_info->tid, proc_info->cmd, &state, name_lnk); - - /* check also fd, seems that lsof(8) doesn't look here */ - memset(path, 0, sizeof(path)); - snprintf(path, sizeof(path), "/proc/%d/fd", proc_info->tid); - -- __igt_lsof_fds(proc_info, &state, path, dir); -+ __igt_lsof_fds(proc_info->tid, proc_info->cmd, &state, path, dir); - - free(name_lnk); - freeproc(proc_info); - } - - closeproc(proc); -+#else -+ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ -+ if (procps_pids_new(&info, Items, 2) < 0) -+ return; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ ssize_t read; -+ int tid = PIDS_VAL(0, s_int, stack, info); -+ char *pid_comm = PIDS_VAL(1, str, stack, info); -+ -+ /* check current working directory */ -+ memset(path, 0, sizeof(path)); -+ snprintf(path, sizeof(path), "/proc/%d/cwd", tid); -+ -+ if (stat(path, &st) == -1) -+ continue; -+ -+ name_lnk = malloc(st.st_size + 1); -+ -+ igt_assert((read = readlink(path, name_lnk, st.st_size + 1))); -+ name_lnk[read] = '\0'; -+ -+ if (!strncmp(dir, name_lnk, strlen(dir))) -+ igt_show_stat(tid, pid_comm, &state, name_lnk); -+ -+ /* check also fd, seems that lsof(8) doesn't look here */ -+ memset(path, 0, sizeof(path)); -+ snprintf(path, sizeof(path), "/proc/%d/fd", tid); -+ -+ __igt_lsof_fds(tid, pid_comm, &state, path, dir); -+ -+ free(name_lnk); -+ } -+ procps_pids_unref(&info); -+#endif - } - - /** -@@ -1490,7 +1579,7 @@ igt_lsof(const char *dpath) - free(sanitized); - } - --static void pulseaudio_unload_module(proc_t *proc_info) -+static void pulseaudio_unload_module(const uid_t euid, const gid_t egid) - { - struct igt_helper_process pa_proc = {}; - char xdg_dir[PATH_MAX]; -@@ -1498,14 +1587,14 @@ static void pulseaudio_unload_module(proc_t *proc_info) - struct passwd *pw; - - igt_fork_helper(&pa_proc) { -- pw = getpwuid(proc_info->euid); -+ pw = getpwuid(euid); - homedir = pw->pw_dir; -- snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid); -+ snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid); - - igt_info("Request pulseaudio to stop using audio device\n"); - -- setgid(proc_info->egid); -- setuid(proc_info->euid); -+ setgid(egid); -+ setuid(euid); - clearenv(); - setenv("HOME", homedir, 1); - setenv("XDG_RUNTIME_DIR",xdg_dir, 1); -@@ -1524,10 +1613,13 @@ static void pipewire_reserve_wait(void) - char xdg_dir[PATH_MAX]; - const char *homedir; - struct passwd *pw; -- proc_t *proc_info; -- PROCTAB *proc; -+ int tid = 0, euid, egid; - -+#ifdef HAVE_LIBPROCPS - igt_fork_helper(&pw_reserve_proc) { -+ proc_t *proc_info; -+ PROCTAB *proc; -+ - igt_info("Preventing pipewire-pulse to use the audio drivers\n"); - - proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); -@@ -1540,19 +1632,45 @@ static void pipewire_reserve_wait(void) - } - closeproc(proc); - -+ tid = proc_info->tid; -+ euid = proc_info->euid; -+ egid = proc_info->egid; -+ freeproc(proc_info); -+#else -+ igt_fork_helper(&pw_reserve_proc) { -+ enum pids_item Items[] = { PIDS_ID_PID, PIDS_ID_EUID, PIDS_ID_EGID }; -+ enum rel_items { EU_PID, EU_EUID, EU_EGID }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ -+ igt_info("Preventing pipewire-pulse to use the audio drivers\n"); -+ -+ if (procps_pids_new(&info, Items, 3) < 0) { -+ igt_info("error getting pids: %d\n", errno); -+ exit(errno); -+ } -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ tid = PIDS_VAL(EU_PID, s_int, stack, info); -+ if (pipewire_pulse_pid == tid) -+ break; -+ } -+ euid = PIDS_VAL(EU_EUID, s_int, stack, info); -+ egid = PIDS_VAL(EU_EGID, s_int, stack, info); -+ procps_pids_unref(&info); -+#endif -+ - /* Sanity check: if it can't find the process, it means it has gone */ -- if (pipewire_pulse_pid != proc_info->tid) -+ if (pipewire_pulse_pid != tid) - exit(0); - -- pw = getpwuid(proc_info->euid); -+ pw = getpwuid(euid); - homedir = pw->pw_dir; -- snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", proc_info->euid); -- setgid(proc_info->egid); -- setuid(proc_info->euid); -+ snprintf(xdg_dir, sizeof(xdg_dir), "/run/user/%d", euid); -+ setgid(egid); -+ setuid(euid); - clearenv(); - setenv("HOME", homedir, 1); - setenv("XDG_RUNTIME_DIR",xdg_dir, 1); -- freeproc(proc_info); - - /* - * pw-reserve will run in background. It will only exit when -@@ -1570,9 +1688,7 @@ static void pipewire_reserve_wait(void) - int pipewire_pulse_start_reserve(void) - { - bool is_pw_reserve_running = false; -- proc_t *proc_info; - int attempts = 0; -- PROCTAB *proc; - - if (!pipewire_pulse_pid) - return 0; -@@ -1584,6 +1700,10 @@ int pipewire_pulse_start_reserve(void) - * pipewire version 0.3.50 or upper. - */ - for (attempts = 0; attempts < PIPEWIRE_RESERVE_MAX_TIME; attempts++) { -+#ifdef HAVE_LIBPROCPS -+ PROCTAB *proc; -+ proc_t *proc_info; -+ - usleep(1000); - proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); - igt_assert(proc != NULL); -@@ -1598,6 +1718,24 @@ int pipewire_pulse_start_reserve(void) - freeproc(proc_info); - } - closeproc(proc); -+#else -+ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ -+ usleep(1000); -+ -+ if (procps_pids_new(&info, Items, 2) < 0) -+ return 1; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ if (!strcmp(PIDS_VAL(1, str, stack, info), "pw-reserve")) { -+ is_pw_reserve_running = true; -+ pipewire_pw_reserve_pid = PIDS_VAL(0, s_int, stack, info); -+ break; -+ } -+ } -+ procps_pids_unref(&info); -+#endif - if (is_pw_reserve_running) - break; - } -@@ -1645,7 +1783,7 @@ void pipewire_pulse_stop_reserve(void) - * If the check fails, it means that the process can simply be killed. - */ - static int --__igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) -+__igt_lsof_audio_and_kill_proc(const pid_t tid, const char *cmd, const uid_t euid, const gid_t egid, char *proc_path) - { - const char *audio_dev = "/dev/snd/"; - char path[PATH_MAX * 2]; -@@ -1670,10 +1808,10 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) - * 2) unload/unbind the the audio driver(s); - * 3) stop the pw-reserve thread. - */ -- if (!strcmp(proc_info->cmd, "pipewire-pulse")) { -+ if (!strcmp(cmd, "pipewire-pulse")) { - igt_info("process %d (%s) is using audio device. Should be requested to stop using them.\n", -- proc_info->tid, proc_info->cmd); -- pipewire_pulse_pid = proc_info->tid; -+ tid, cmd); -+ pipewire_pulse_pid = tid; - return 0; - } - /* -@@ -1685,9 +1823,9 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) - * will respawn them. So, just ignore here, they'll honor pw-reserve, - * when the time comes. - */ -- if (!strcmp(proc_info->cmd, "pipewire-media-session")) -+ if (!strcmp(cmd, "pipewire-media-session")) - return 0; -- if (!strcmp(proc_info->cmd, "wireplumber")) -+ if (!strcmp(cmd, "wireplumber")) - return 0; - - dp = opendir(proc_path); -@@ -1723,22 +1861,22 @@ __igt_lsof_audio_and_kill_proc(proc_t *proc_info, char *proc_path) - * enough to unbind audio modules and won't cause race issues - * with systemd trying to reload it. - */ -- if (!strcmp(proc_info->cmd, "pulseaudio")) { -- pulseaudio_unload_module(proc_info); -+ if (!strcmp(cmd, "pulseaudio")) { -+ pulseaudio_unload_module(euid, egid); - break; - } - - /* For all other processes, just kill them */ - igt_info("process %d (%s) is using audio device. Should be terminated.\n", -- proc_info->tid, proc_info->cmd); -+ tid, cmd); - -- if (kill(proc_info->tid, SIGTERM) < 0) { -+ if (kill(tid, SIGTERM) < 0) { - igt_info("Fail to terminate %s (pid: %d) with SIGTERM\n", -- proc_info->cmd, proc_info->tid); -- if (kill(proc_info->tid, SIGABRT) < 0) { -+ cmd, tid); -+ if (kill(tid, SIGABRT) < 0) { - fail++; - igt_info("Fail to terminate %s (pid: %d) with SIGABRT\n", -- proc_info->cmd, proc_info->tid); -+ cmd, tid); - } - } - -@@ -1760,23 +1898,47 @@ int - igt_lsof_kill_audio_processes(void) - { - char path[PATH_MAX]; -+ int fail = 0; -+ -+#ifdef HAVE_LIBPROCPS - proc_t *proc_info; - PROCTAB *proc; -- int fail = 0; - - proc = openproc(PROC_FILLCOM | PROC_FILLSTAT | PROC_FILLARG); - igt_assert(proc != NULL); - pipewire_pulse_pid = 0; -- - while ((proc_info = readproc(proc, NULL))) { - if (snprintf(path, sizeof(path), "/proc/%d/fd", proc_info->tid) < 1) - fail++; - else -- fail += __igt_lsof_audio_and_kill_proc(proc_info, path); -+ fail += __igt_lsof_audio_and_kill_proc(proc_info->tid, proc_info->cmd, proc_info->euid, proc_info->egid, path); - - freeproc(proc_info); - } - closeproc(proc); -+#else -+ enum pids_item Items[] = { PIDS_ID_PID, PIDS_CMD, PIDS_ID_EUID, PIDS_ID_EGID }; -+ enum rel_items { EU_PID, EU_CMD, EU_EUID, EU_EGID }; -+ struct pids_info *info = NULL; -+ struct pids_stack *stack; -+ pid_t tid; -+ -+ if (procps_pids_new(&info, Items, 4) < 0) -+ return 1; -+ while ((stack = procps_pids_get(info, PIDS_FETCH_TASKS_ONLY))) { -+ tid = PIDS_VAL(EU_PID, s_int, stack, info); -+ -+ if (snprintf(path, sizeof(path), "/proc/%d/fd", tid) < 1) -+ fail++; -+ else -+ fail += __igt_lsof_audio_and_kill_proc(tid, -+ PIDS_VAL(EU_CMD, str, stack, info), -+ PIDS_VAL(EU_EUID, s_int, stack, info), -+ PIDS_VAL(EU_EGID, s_int, stack, info), -+ path); -+ } -+ procps_pids_unref(&info); -+#endif - - return fail; - } -diff --git a/lib/meson.build b/lib/meson.build -index 85f100f75..55efdc83b 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -114,7 +114,6 @@ lib_deps = [ - libdrm, - libdw, - libkmod, -- libprocps, - libudev, - math, - pciaccess, -@@ -178,6 +177,12 @@ if chamelium.found() - lib_sources += 'monitor_edids/monitor_edids_helper.c' - endif - -+if libprocps.found() -+ lib_deps += libprocps -+else -+ lib_deps += libproc2 -+endif -+ - if get_option('srcdir') != '' - srcdir = join_paths(get_option('srcdir'), 'tests') - else -diff --git a/meson.build b/meson.build -index 1c872cc9c..0487158dc 100644 ---- a/meson.build -+++ b/meson.build -@@ -125,7 +125,15 @@ build_info += 'With libdrm: ' + ','.join(libdrm_info) - - pciaccess = dependency('pciaccess', version : '>=0.10') - libkmod = dependency('libkmod') --libprocps = dependency('libprocps', required : true) -+libprocps = dependency('libprocps', required : false) -+libproc2 = dependency('libproc2', required : false) -+if libprocps.found() -+ config.set('HAVE_LIBPROCPS', 1) -+elif libproc2.found() -+ config.set('HAVE_LIBPROC2', 1) -+else -+ error('Either libprocps or libproc2 is required') -+endif - - libunwind = dependency('libunwind', required : get_option('libunwind')) - build_info += 'With libunwind: @0@'.format(libunwind.found()) diff --git a/gnu/packages/patches/online-judge-tools.patch b/gnu/packages/patches/online-judge-tools.patch new file mode 100644 index 0000000000..9e016d7104 --- /dev/null +++ b/gnu/packages/patches/online-judge-tools.patch @@ -0,0 +1,62 @@ +Skip failing tests and an assertion. The skipped tests require network +connections. + +--- a/tests/command_download.py ++++ b/tests/command_download.py +@@ -90,6 +90,7 @@ class DownloadTest(unittest.TestCase): + def snippet_call_download_failure(self, *args, **kwargs): + tests.command_download.snippet_call_download_failure(self, *args, **kwargs) + ++ @unittest.skip("Disabled by Guix") + def test_call_download_atcoder_abc114_c(self): + self.snippet_call_download('https://atcoder.jp/contests/abc114/tasks/abc114_c', [ + { +@@ -106,6 +107,7 @@ class DownloadTest(unittest.TestCase): + }, + ], type='json') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_atcoder_abc003_4(self): + self.snippet_call_download('https://atcoder.jp/contests/abc003/tasks/abc003_4', [ + { +@@ -126,9 +128,11 @@ class DownloadTest(unittest.TestCase): + }, + ], type='json') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_invalid_url(self): + self.snippet_call_download_failure('http://abc001.contest.atcoder.jp/tasks/abc001_100') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_413(self): + # This task is not supported. + self.snippet_call_download_failure('https://chokudai001.contest.atcoder.jp/tasks/chokudai_001_a') +@@ -141,13 +145,16 @@ class DownloadInvalidTest(unittest.TestCase): + def snippet_call_download_twice(self, *args, **kwargs): + tests.command_download.snippet_call_download_twice(self, *args, **kwargs) + ++ @unittest.skip("Disabled by Guix") + def test_call_download_invalid(self): + self.snippet_call_download_failure('https://not_exist_contest.jp/tasks/001_a') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_no_sample_found(self): + self.snippet_call_download_failure('https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a') + self.snippet_call_download_failure('https://open.kattis.com/problems/hello') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_twice(self): + self.snippet_call_download_twice('https://atcoder.jp/contests/abc114/tasks/abc114_c', 'https://atcoder.jp/contests/abc003/tasks/abc003_4', [ + { + +--- a/tests/command_test.py ++++ b/tests/command_test.py +@@ -1319,7 +1319,7 @@ class TestTest(unittest.TestCase): + timer = threading.Timer(1.0, send_keyboard_interrupt) + timer.start() + result = tests.utils.run_in_sandbox(args=['-v', 'test', '-c', tests.utils.python_c("import time; time.sleep(10) # {}".format(marker_for_callee)), 'test/{}-1.in'.format(marker_for_caller)], files=files) +- self.assertNotEqual(result['proc'].returncode, 0) ++ # self.assertNotEqual(result['proc'].returncode, 0) + + # check there are no processes whose command-line arguments contains the marker word + for cmdline in pathlib.Path('/proc').glob('*/cmdline'): diff --git a/gnu/packages/patches/php-fix-streams-copy-length.patch b/gnu/packages/patches/php-fix-streams-copy-length.patch deleted file mode 100644 index d68f658071..0000000000 --- a/gnu/packages/patches/php-fix-streams-copy-length.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cddcc10becb013ae498ea9c2836792f407b61678 Mon Sep 17 00:00:00 2001 -From: Julien Lepiller <julien@lepiller.eu> -Date: Tue, 7 Feb 2023 22:55:59 +0100 -Subject: [PATCH] Fix file corruption when using copy_file_range. - -This patch is adapted from https://github.com/php/php-src/pull/10440. ---- - main/streams/streams.c | 21 +++++++++++++++++---- - 1 file changed, 17 insertions(+), 4 deletions(-) - -diff --git a/main/streams/streams.c b/main/streams/streams.c -index 20029fc7..68dc76c5 100644 ---- a/main/streams/streams.c -+++ b/main/streams/streams.c -@@ -1634,8 +1634,21 @@ PHPAPI zend_result _php_stream_copy_to_stream_ex(php_stream *src, php_stream *de - char *p; - - do { -- size_t chunk_size = (maxlen == 0 || maxlen > PHP_STREAM_MMAP_MAX) ? PHP_STREAM_MMAP_MAX : maxlen; -- size_t mapped; -+ /* We must not modify maxlen here, because otherwise the file copy fallback below can fail */ -+ size_t chunk_size, must_read, mapped; -+ if (maxlen == 0) { -+ /* Unlimited read */ -+ must_read = chunk_size = PHP_STREAM_MMAP_MAX; -+ } else { -+ must_read = maxlen - haveread; -+ if (must_read >= PHP_STREAM_MMAP_MAX) { -+ chunk_size = PHP_STREAM_MMAP_MAX; -+ } else { -+ /* In case the length we still have to read from the file could be smaller than the file size, -+ * chunk_size must not get bigger the size we're trying to read. */ -+ chunk_size = must_read; -+ } -+ } - - p = php_stream_mmap_range(src, php_stream_tell(src), chunk_size, PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped); - -@@ -1667,8 +1680,8 @@ PHPAPI zend_result _php_stream_copy_to_stream_ex(php_stream *src, php_stream *de - return SUCCESS; - } - if (maxlen != 0) { -- maxlen -= mapped; -- if (maxlen == 0) { -+ must_read -= mapped; -+ if (must_read == 0) { - return SUCCESS; - } - } --- -2.38.1 - diff --git a/gnu/packages/patches/plasp-fix-normalization.patch b/gnu/packages/patches/plasp-fix-normalization.patch new file mode 100644 index 0000000000..dc2d3e4b98 --- /dev/null +++ b/gnu/packages/patches/plasp-fix-normalization.patch @@ -0,0 +1,51 @@ +From cddbfa3ade23695dd9996f6e208615702a3a42e1 Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> +Date: Thu, 23 Nov 2023 09:53:38 +0100 +Subject: [PATCH 1/2] normalization: No longer work around compiler bugs in + Precondition. +To: Patrick Lühne <patrick-github@luehne.de> +Cc: Martin Gebser <martin.gebser@aau.at> + +Newer versions of GCC (such as GCC 11) point out that std::move is meaningless +in this position, so remove it. +--- + lib/pddl/src/pddl/detail/normalization/Precondition.cpp | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/lib/pddl/src/pddl/detail/normalization/Precondition.cpp b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp +index 4eebfee..4297e52 100644 +--- a/lib/pddl/src/pddl/detail/normalization/Precondition.cpp ++++ b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp +@@ -83,8 +83,7 @@ normalizedAST::Literal normalizeNested(ast::AndPointer<ast::Precondition> &and_, + + derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::And<normalizedAST::Literal>>(std::move(normalizedArguments)); + +- // TODO: investigate, could be a compiler bug +- return std::move(derivedPredicate); ++ return derivedPredicate; + } + + //////////////////////////////////////////////////////////////////////////////////////////////////// +@@ -112,8 +111,7 @@ normalizedAST::Literal normalizeNested(ast::ExistsPointer<ast::Precondition> &ex + return normalizeTopLevel(x, normalizationContext); + }); + +- // TODO: investigate, could be a compiler bug +- return std::move(derivedPredicate); ++ return derivedPredicate; + } + + //////////////////////////////////////////////////////////////////////////////////////////////////// +@@ -174,8 +172,7 @@ normalizedAST::Literal normalizeNested(ast::OrPointer<ast::Precondition> &or_, d + + derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::Or<normalizedAST::Literal>>(std::move(normalizedArguments)); + +- // TODO: investigate, could be a compiler bug +- return std::move(derivedPredicate); ++ return derivedPredicate; + } + + //////////////////////////////////////////////////////////////////////////////////////////////////// +-- +2.41.0 + diff --git a/gnu/packages/patches/plasp-include-iostream.patch b/gnu/packages/patches/plasp-include-iostream.patch new file mode 100644 index 0000000000..9722e6fc03 --- /dev/null +++ b/gnu/packages/patches/plasp-include-iostream.patch @@ -0,0 +1,26 @@ +From 95c6a506e14cf248e2a3cae2ed3f41ed1eedf278 Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> +Date: Thu, 23 Nov 2023 09:53:38 +0100 +Subject: [PATCH 2/2] app: Add missing #include <iostream>. +To: Patrick Lühne <patrick-github@luehne.de> +Cc: Martin Gebser <martin.gebser@aau.at> + +--- + app/include/plasp-app/Command.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/app/include/plasp-app/Command.h b/app/include/plasp-app/Command.h +index 5755ee3..671804b 100644 +--- a/app/include/plasp-app/Command.h ++++ b/app/include/plasp-app/Command.h +@@ -1,6 +1,7 @@ + #ifndef __PLASP_APP__COMMAND_H + #define __PLASP_APP__COMMAND_H + ++#include <iostream> // std::cout, std::endl + #include <tuple> + + #include <cxxopts.hpp> +-- +2.41.0 + diff --git a/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch b/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch new file mode 100644 index 0000000000..5b874e0056 --- /dev/null +++ b/gnu/packages/patches/python-accupy-fix-use-of-perfplot.patch @@ -0,0 +1,48 @@ +From 567558a4eb9b73ab30f9e469b36091eccf445f80 Mon Sep 17 00:00:00 2001 +From: Felix Gruber <felgru@posteo.net> +Date: Sun, 23 Apr 2023 16:48:59 +0200 +Subject: [PATCH] Fix use of perfplot. + +data tuples are unpacked by perfplot before it calls the kernel +functions. +--- + tests/test_dot.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/test_dot.py b/tests/test_dot.py +index a8160fe..51307ad 100644 +--- a/tests/test_dot.py ++++ b/tests/test_dot.py +@@ -76,10 +76,10 @@ def test_speed_comparison1(n_range=None): + perfplot.plot( + setup=lambda n: (np.random.rand(n, 100), np.random.rand(100, n)), + kernels=[ +- lambda xy: np.dot(*xy), +- lambda xy: accupy.kdot(*xy, K=2), +- lambda xy: accupy.kdot(*xy, K=3), +- lambda xy: accupy.fdot(*xy), ++ lambda x, y: np.dot(x, y), ++ lambda x, y: accupy.kdot(x, y, K=2), ++ lambda x, y: accupy.kdot(x, y, K=3), ++ lambda x, y: accupy.fdot(x, y), + ], + labels=["np.dot", "accupy.kdot[2]", "accupy.kdot[3]", "accupy.fdot"], + n_range=n_range, +@@ -96,10 +96,10 @@ def test_speed_comparison2(n_range=None): + perfplot.plot( + setup=lambda n: (np.random.rand(100, n), np.random.rand(n, 100)), + kernels=[ +- lambda xy: np.dot(*xy), +- lambda xy: accupy.kdot(*xy, K=2), +- lambda xy: accupy.kdot(*xy, K=3), +- lambda xy: accupy.fdot(*xy), ++ lambda x, y: np.dot(x, y), ++ lambda x, y: accupy.kdot(x, y, K=2), ++ lambda x, y: accupy.kdot(x, y, K=3), ++ lambda x, y: accupy.fdot(x, y), + ], + labels=["np.dot", "accupy.kdot[2]", "accupy.kdot[3]", "accupy.fdot"], + n_range=n_range, +-- +2.39.2 + diff --git a/gnu/packages/patches/python-accupy-use-matplotx.patch b/gnu/packages/patches/python-accupy-use-matplotx.patch new file mode 100644 index 0000000000..f3dd17da22 --- /dev/null +++ b/gnu/packages/patches/python-accupy-use-matplotx.patch @@ -0,0 +1,113 @@ +From 1da1ed24cfba8a051b6c2f452a67ebfee77ca040 Mon Sep 17 00:00:00 2001 +From: Felix Gruber <felgru@posteo.net> +Date: Sun, 23 Apr 2023 15:42:19 +0200 +Subject: [PATCH] Use dufte style from matplotx. + +The stand-alone dufte package has been deprecated in favor of the dufte +style that has been integrated into matplotx. +--- + tests/test_dot.py | 10 +++++----- + tests/test_sums.py | 12 ++++++------ + tox.ini | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/tests/test_dot.py b/tests/test_dot.py +index 0a40a0c..a8160fe 100644 +--- a/tests/test_dot.py ++++ b/tests/test_dot.py +@@ -1,5 +1,5 @@ +-import dufte + import matplotlib.pyplot as plt ++import matplotx + import numpy as np + import perfplot + import pytest +@@ -33,7 +33,7 @@ def test_fdot(cond): + + + def test_accuracy_comparison_illcond(target_cond=None): +- plt.style.use(dufte.style) ++ plt.style.use(matplotx.styles.dufte) + + if target_cond is None: + target_cond = [10 ** k for k in range(2)] +@@ -61,13 +61,13 @@ def test_accuracy_comparison_illcond(target_cond=None): + for label, d in zip(labels, data.T): + plt.loglog(condition_numbers, d, label=label) + +- dufte.legend() ++ matplotx.line_labels() + plt.xlabel("condition number") +- dufte.ylabel("relative error") ++ matplotx.ylabel_top("relative error") + + + def test_speed_comparison1(n_range=None): +- plt.style.use(dufte.style) ++ plt.style.use(matplotx.styles.dufte) + + if n_range is None: + n_range = [2 ** k for k in range(2)] +diff --git a/tests/test_sums.py b/tests/test_sums.py +index 1c0f6b0..8cd9ddb 100644 +--- a/tests/test_sums.py ++++ b/tests/test_sums.py +@@ -1,5 +1,5 @@ +-import dufte + import matplotlib.pyplot as plt ++import matplotx + import numpy as np + import perfplot + import pytest +@@ -32,7 +32,7 @@ def test_fsum(cond): + + + def test_accuracy_comparison_illcond(target_conds=None): +- plt.style.use(dufte.style) ++ plt.style.use(matplotx.styles.dufte) + + if target_conds is None: + target_conds = [10 ** k for k in range(1, 2)] +@@ -71,14 +71,14 @@ def test_accuracy_comparison_illcond(target_conds=None): + for label, color, d in zip(labels, colors, data.T): + plt.loglog(condition_numbers, d, label=label, color=color) + +- dufte.legend() ++ matplotx.line_labels() + plt.xlabel("condition number") +- dufte.ylabel("relative error") ++ matplotx.ylabel_top("relative error") + # plt.gca().set_aspect(1.3) + + + def test_speed_comparison1(n_range=None): +- plt.style.use(dufte.style) ++ plt.style.use(matplotx.styles.dufte) + + if n_range is None: + n_range = [2 ** k for k in range(2)] +@@ -109,7 +109,7 @@ def test_speed_comparison1(n_range=None): + + + def test_speed_comparison2(n_range=None): +- plt.style.use(dufte.style) ++ plt.style.use(matplotx.styles.dufte) + + if n_range is None: + n_range = [2 ** k for k in range(2)] +diff --git a/tox.ini b/tox.ini +index 79a53ec..524b3bc 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -4,7 +4,7 @@ isolated_build = True + + [testenv] + deps = +- dufte ++ matplotx + perfplot + pytest + pytest-cov +-- +2.39.2 + diff --git a/gnu/packages/patches/python-online-judge-api-client-tests.patch b/gnu/packages/patches/python-online-judge-api-client-tests.patch new file mode 100644 index 0000000000..f999828ab3 --- /dev/null +++ b/gnu/packages/patches/python-online-judge-api-client-tests.patch @@ -0,0 +1,429 @@ +Skip tests which requires network connections. + +--- a/tests/dispatch.py ++++ b/tests/dispatch.py +@@ -4,6 +4,7 @@ from onlinejudge import dispatch, service + + + class DispatchAtCoderTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_problem_from_url(self): + problem = dispatch.problem_from_url('https://atcoder.jp/contests/arc001/tasks/arc001_1') + self.assertIsInstance(problem, service.atcoder.AtCoderProblem) + +--- a/tests/service_anarchygolf.py ++++ b/tests/service_anarchygolf.py +@@ -10,6 +10,7 @@ class AnarchyGolfServiceTest(unittest.TestCase): + self.assertIsInstance(AnarchyGolfService.from_url('http://golf.shinh.org/p.rb?Indent+Space+Alignment'), AnarchyGolfService) + + ++@unittest.skip("Disabled by Guix") + class AnarchyGolfProblemTest(unittest.TestCase): + def test_download_sample_cases(self): + self.assertEqual(AnarchyGolfProblem.from_url('http://golf.shinh.org/p.rb?last+non+zero').download_sample_cases(), [ + +--- a/tests/service_aoj.py ++++ b/tests/service_aoj.py +@@ -20,6 +20,7 @@ class AOJProblemTest(unittest.TestCase): + self.assertEqual(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/challenges/sources/JAG/Spring/2394?year=2011').problem_id, '2394') + self.assertIsNone(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#RitsCamp19Day2/problems/A')) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(AOJProblem.from_url('http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=DSL_1_A').download_sample_cases(), [ + TestCase(name='sample-1', input_name='1', input_data=b'5 12\n0 1 4\n0 2 3\n1 1 2\n1 3 4\n1 1 4\n1 3 2\n0 1 3\n1 2 4\n1 3 0\n0 0 4\n1 0 2\n1 3 0\n', output_name='1', output_data=b'0\n0\n1\n1\n1\n0\n1\n1\n'), +@@ -39,6 +40,7 @@ class AOJProblemTest(unittest.TestCase): + TestCase(name='sample-1', input_name='1', input_data=b'4\n0 0\n10 0\n10 10\n0 10\n3\n0 0\n1 0\n0 1\n0\n', output_name='1', output_data=b'Case 1: 14.142135624\nCase 2: 1.41421356\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_not_registered(self): + # see: https://github.com/kmyk/online-judge-tools/issues/207 + self.assertEqual(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/challenges/sources/ICPC/Regional/1399').download_sample_cases(), [ +@@ -57,11 +59,13 @@ class AOJArenaProblemTest(unittest.TestCase): + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#ACPC2018Day2/problems/d').alphabet, 'D') + self.assertIsNone(AOJArenaProblem.from_url('http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=DSL_1_A')) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#yupro/problems/A').download_sample_cases(), [ + TestCase(name='sample-1', input_name='1', input_data=b'koukyoukoukokukikou\nabrakadabra\nacmicpc\njapaque\nhelloworld\n#\n', output_name='1', output_data=b'0\n2\n4\n5\n7\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_not_registered(self): + # see: https://github.com/kmyk/online-judge-tools/issues/207 + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#RitsCamp18Day3/problems/B').download_sample_cases(), [ + +--- a/tests/service_atcoder.py ++++ b/tests/service_atcoder.py +@@ -15,6 +15,7 @@ class AtCoderSerivceTest(unittest.TestCase): + self.assertIsInstance(AtCoderService.from_url('https://atcoder.jp/contests/agc001/submissions/806160'), AtCoderService) + self.assertIsNone(AtCoderService.from_url('https://codeforces.com/')) + ++ @unittest.skip("Disabled by Guix") + def test_iterate_contests(self): + contests = list(AtCoderService().iterate_contests()) + contest_ids = [contest.contest_id for contest in contests] +@@ -37,6 +38,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(AtCoderContest.from_url('https://atcoder.jp/contests/agc030').contest_id, 'agc030') + self.assertIsNone(AtCoderContest.from_url('https://atcoder.jp/contests/')) + ++ @unittest.skip("Disabled by Guix") + def test_load_details(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/keyence2019') + self.assertEqual(contest.download_data(lang='en').name, 'KEYENCE Programming Contest 2019') +@@ -62,10 +64,12 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(data.rated_range, '-') + self.assertEqual(data.penalty.total_seconds(), 5 * 60) + ++ @unittest.skip("Disabled by Guix") + def test_get_penalty_a_singular_form(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/chokudai_S002') + self.assertEqual(contest.download_data().penalty.total_seconds(), 60) # Penalty is written as "1 minute", not "1 minutes" + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/agc028') + problems = contest.list_problems() +@@ -79,6 +83,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[6].download_data().alphabet, 'F2') + self.assertEqual(problems[6].problem_id, 'agc028_f2') + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_with_float_values(self): + """ + .. seealso: +@@ -92,6 +97,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[1].download_data().time_limit_msec, 5252) + self.assertEqual(problems[1].download_data().memory_limit_byte, 512 * 1000 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_time_limit_is_less_than_msec(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/joi2019ho') + problems = contest.list_problems() +@@ -101,12 +107,14 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[3].download_data().time_limit_msec, 1000) + self.assertEqual(problems[4].download_data().time_limit_msec, 2000) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_memory_limit_is_zero(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/future-contest-2019-final-open') + problems = contest.list_problems() + self.assertEqual(problems[0].download_data().memory_limit_byte, 1024 * 1000 * 1000) # 1024 MB + self.assertEqual(problems[1].download_data().memory_limit_byte, 0) # 0 KB + ++ @unittest.skip("Disabled by Guix") + def test_iterate_submissions(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/code-festival-2014-exhibition-open') + submissions = list(contest.iterate_submissions()) +@@ -114,6 +122,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(submissions[0].get_url(), 'https://atcoder.jp/contests/code-festival-2014-exhibition-open/submissions/272697') + self.assertEqual(submissions[1].get_url(), 'https://atcoder.jp/contests/code-festival-2014-exhibition-open/submissions/272700') + ++ @unittest.skip("Disabled by Guix") + def test_get_contest_without_penalty(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/otemae2019') + self.assertEqual(contest.download_data(lang='ja').name, '大手前プロコン 2019') +@@ -154,6 +163,7 @@ class AtCoderProblemTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://kupc2014.contest.atcoder.jp/tasks/kupc2014_d'), AtCoderProblem.from_url('https://atcoder.jp/contests/kupc2014/tasks/kupc2014_d')) + self.assertNotEqual(AtCoderProblem.from_url('https://kupc2014.contest.atcoder.jp/tasks/kupc2014_d'), AtCoderProblem.from_url('https://atcoder.jp/contests/agc030/tasks/agc030_c')) + ++ @unittest.skip("Disabled by Guix") + def test_load_details(self): + problem = AtCoderProblem.from_url('https://atcoder.jp/contests/abc118/tasks/abc118_a') + data = problem.download_data() +@@ -163,14 +173,17 @@ class AtCoderProblemTest(unittest.TestCase): + self.assertEqual(data.memory_limit_byte, 1024 * 1000 * 1000) + self.assertEqual(data.score, 100) + ++ @unittest.skip("Disabled by Guix") + def test_get_alphabet(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/agc028/tasks/agc028_f').download_data().alphabet, 'F') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/agc028/tasks/agc028_f2').download_data().alphabet, 'F2') + ++ @unittest.skip("Disabled by Guix") + def test_get_score(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2018-final/tasks/future_contest_2018_final_a').download_data().score, 50000000) + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/abc001/tasks/abc001_4').download_data().score, None) + ++ @unittest.skip("Disabled by Guix") + def test_get_score_latex(self): + """ + .. seealso:: +@@ -179,13 +192,16 @@ class AtCoderProblemTest(unittest.TestCase): + + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/wupc2019/tasks/wupc2019_a').download_data().score) + ++ @unittest.skip("Disabled by Guix") + def test_get_time_limit_is_less_than_msec(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/joi2019ho/tasks/joi2019ho_c').download_data().time_limit_msec, 500) + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2019-qual/tasks/future_contest_2019_qual_b').download_data().time_limit_msec, 0) + ++ @unittest.skip("Disabled by Guix") + def test_get_memory_limit_is_zero(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2019-qual/tasks/future_contest_2019_qual_b').download_data().memory_limit_byte, 0) + ++ @unittest.skip("Disabled by Guix") + def test_iterate_submissions(self): + problem = AtCoderProblem.from_url('https://atcoder.jp/contests/abc119/tasks/abc119_c') + submissions = problem.iterate_submissions() +@@ -204,6 +220,7 @@ class AtCoderSubmissionTest(unittest.TestCase): + + + class AtCoderProblemDataTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_from_html_very_old(self): + url = 'https://atcoder.jp/contests/utpc2011/tasks/utpc2011_1' + resp = requests.get(url) +@@ -225,6 +242,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 1 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_old(self): + url = 'https://atcoder.jp/contests/abc003/tasks/abc003_4' + resp = requests.get(url) +@@ -247,6 +265,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_standard(self): + url = 'https://atcoder.jp/contests/abc114/tasks/abc114_d' + resp = requests.get(url) +@@ -268,6 +287,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, 400) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_with_empty_output(self): + url = 'https://atcoder.jp/contests/agc036/tasks/agc036_b' + resp = requests.get(url) +@@ -290,6 +310,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, 700) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_without_sample_cases(self): + url = 'https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a' + resp = requests.get(url) +@@ -307,6 +328,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_issue_414(self): + url = 'https://atcoder.jp/contests/fuka5/tasks/fuka_graphcut' + resp = requests.get(url) +@@ -399,6 +421,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 5 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_pre_without_prettyprint_insection(self): + # see: https://github.com/kmyk/online-judge-tools/issues/625 + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/tdpc/tasks/tdpc_fibonacci').download_sample_cases(), [ +@@ -406,6 +429,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + TestCase(name='sample-2', input_name='Sample Input 2', input_data=b'3 10\n', output_name='Sample Output 2', output_data=b'105\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_s8pc_broken_html(self): + # see: https://github.com/kmyk/online-judge-tools/issues/615 + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/s8pc-4/tasks/s8pc_4_d').download_sample_cases(), [ +@@ -427,6 +451,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + + + class AtCoderProblemGetInputFormatTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_normal(self): + """ + .. code-block:: html +@@ -456,6 +481,7 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + + self.assertEqual(AtCoderProblem.from_url('https://beta.atcoder.jp/contests/arc083/tasks/arc083_a').download_data().input_format, '<var>A</var> <var>B</var> <var>C</var> <var>D</var> <var>E</var> <var>F</var>\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_old_problem(self): + """ + :note: https://github.com/kmyk/online-judge-tools/issues/380 +@@ -475,6 +501,7 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/arc002/tasks/arc002_3').download_data().input_format, '\r\n<var>N</var>\r\n<var>c_{1}c_{2}...c_{N}</var>\r\n') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/arc034/tasks/arc034_4').download_data().input_format, '\r\n<var>A</var> <var>B</var> <var>C</var>\r\n<var>a_1</var> <var>a_2</var> .. <var>a_A</var>\r\n<var>b_1</var> <var>b_2</var> .. <var>b_B</var>\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_dwacon_problem(self): + """ + :note: https://github.com/kmyk/online-judge-tools/issues/142 +@@ -493,9 +520,11 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/dwacon2018-final/tasks/dwacon2018_final_a').download_data().input_format, '\r\n<var>H</var> <var>M</var> <var>S</var>\r\n<var>C_1</var> <var>C_2</var>\r\n') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/dwacon2018-final/tasks/dwacon2018_final_b').download_data().input_format, '\r\n<var>N</var> <var>K</var>\r\n<var>v_1</var> <var>...</var> <var>v_N</var>\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input(self): + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a').download_data().input_format) + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input_format(self): + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/joi2006ho/tasks/joi2006ho_a').download_data().input_format) + +--- a/tests/service_codechef.py ++++ b/tests/service_codechef.py +@@ -15,6 +15,7 @@ class CodeChefProblemTest(unittest.TestCase): + self.assertEqual(CodeChefProblem.from_url('https://www.codechef.com/COOK113A/problems/DAND').contest_id, 'COOK113A') + self.assertEqual(CodeChefProblem.from_url('https://www.codechef.com/COOK113A/problems/DAND').problem_id, 'DAND') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_chfgcd(self): + url = 'https://www.codechef.com/COOK131B/problems/CHFGCD' + expected = [ + +--- a/tests/service_codeforces.py ++++ b/tests/service_codeforces.py +@@ -25,6 +25,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(CodeforcesContest.from_url('http://m3.codeforces.com/contest/1333').get_url(), CodeforcesContest.from_url('https://codeforces.com/contest/1333').get_url()) + self.assertIsNone(CodeforcesContest.from_url('http://m4.codeforces.com/contest/1333')) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_data(self): + contest = CodeforcesContest.from_url('https://codeforces.com/contest/1157') + problems = contest.list_problem_data() +@@ -38,6 +39,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(problems[6].tags, ['constructive algorithms', 'dp', 'greedy', 'two pointers']) + self.assertEqual(problems[7].tags, ['brute force', 'constructive algorithms']) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + contest = CodeforcesContest.from_url('https://codeforces.com/contest/1157') + problems = contest.list_problems() +@@ -46,6 +48,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(problems[6].get_url(), 'https://codeforces.com/contest/1157/problem/F') + self.assertEqual(problems[7].download_data().tags, ['brute force', 'constructive algorithms']) + ++ @unittest.skip("Disabled by Guix") + def test_download_data(self): + contest = CodeforcesContest.from_url('http://codeforces.com/contest/1200') + data = contest.download_data() +@@ -85,6 +88,7 @@ class CodeforcesProblemTest(unittest.TestCase): + self.assertEqual(CodeforcesProblem.from_url('https://codeforces.com/contest/1133/problem/F1').index, 'F1') + self.assertEqual(CodeforcesProblem.from_url('https://codeforces.com/contest/1133/problem/F2').index, 'F2') + ++ @unittest.skip("Disabled by Guix") + def test_download_problem(self): + problem = CodeforcesProblem.from_url('http://codeforces.com/contest/1205/problem/D') + data = problem.download_data() + +--- a/tests/service_google.py ++++ b/tests/service_google.py +@@ -42,6 +42,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + self.assertEqual(problem.contest_id, '8404486') + self.assertEqual(problem.problem_id, 'p0') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_codejam(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/codejam/round/000000000019fd27/000000000020993c') + sample_input = textwrap.dedent("""\ +@@ -76,6 +77,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + ), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_kickstart(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/kickstart/round/000000000019ffc7/00000000001d3f56') + sample_input = textwrap.dedent("""\ +@@ -102,6 +104,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + ), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_multiple_samples(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/kickstart/round/000000000019ffc7/00000000001d3ff3') + sample_input1 = textwrap.dedent("""\ + +--- a/tests/service_library_checker.py ++++ b/tests/service_library_checker.py +@@ -29,13 +29,13 @@ class LibraryCheckerProblemTest(unittest.TestCase): + def test_from_url(self): + self.assertEqual(LibraryCheckerProblem.from_url('https://judge.yosupo.jp/problem/point_add_range_sum').problem_id, 'point_add_range_sum') + +- @unittest.skipIf(os.name == 'nt', "Library Checker is not supported on Windows") ++ @unittest.skip("Disabled by Guix") + def test_download_samples(self): + self.assertEqual(LibraryCheckerProblem.from_url('https://judge.yosupo.jp/problem/unionfind').download_sample_cases(), [ + TestCase(name='example_00', input_name='example_00.in', input_data=b'4 7\n1 0 1\n0 0 1\n0 2 3\n1 0 1\n1 1 2\n0 0 2\n1 1 3\n', output_name='example_00.out', output_data=b'0\n1\n0\n1\n'), + ]) + +- @unittest.skipIf(os.name == 'nt', "Library Checker is not supported on Windows") ++ @unittest.skip("Disabled by Guix") + def test_pull_repository(self): + # reset + LibraryCheckerService.is_repository_updated = False + +--- a/tests/service_spoj.py ++++ b/tests/service_spoj.py +@@ -14,11 +14,13 @@ class SPOJProblemTest(unittest.TestCase): + def test_from_url(self): + self.assertEqual(SPOJProblem.from_url('https://www.spoj.com/problems/ACARGO/').problem_id, 'ACARGO') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples(self): + self.assertEqual(SPOJProblem.from_url('https://www.spoj.com/problems/ACARGO/').download_sample_cases(), [ + TestCase(name='sample-1', input_name='Sample Input:', input_data=b'3 5\n0\n1\n3\n2 3\n0\n1\n5 20\n2\n7\n12\n9\n13\n0 0\n', output_name='Sample Output:', output_data=b'1\n0\n10\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_todo(self): + # No samples found. + self.assertFalse(SPOJProblem.from_url('https://www.spoj.com/problems/MKLABELS/').download_sample_cases()) + +--- a/tests/service_yukicoder.py ++++ b/tests/service_yukicoder.py +@@ -20,6 +20,7 @@ class YukicoderProblemTest(unittest.TestCase): + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/no/123/').problem_no, 123) + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/123').problem_id, 123) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/no/9000').download_sample_cases(), [ + TestCase(name='sample-1', input_name='サンプル1 入力', input_data=b'yukicoder\n', output_name='サンプル1 出力', output_data=b'Hello World!\n'), +@@ -45,6 +46,7 @@ class YukicoderProblemTest(unittest.TestCase): + TestCase(name='sample-4', input_name='サンプル4 入力', input_data=b'\n', output_name='サンプル4 出力', output_data=b'1\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_issue_355(self): + # see https://github.com/kmyk/online-judge-tools/issues/355 + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/649').download_sample_cases(), [ +@@ -54,6 +56,7 @@ class YukicoderProblemTest(unittest.TestCase): + TestCase(name='sample-4', input_name='サンプル4 入力', input_data=b'1 1\n2\n', output_name='サンプル4 出力', output_data=b'-1\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_issue_192(self): + # see https://github.com/kmyk/online-judge-tools/issues/192 + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/750').download_sample_cases(), [ +@@ -133,6 +136,7 @@ class YukicoderContestTest(unittest.TestCase): + self.assertEqual(YukicoderContest.from_url('https://yukicoder.me/contests/276').contest_id, 276) + self.assertEqual(YukicoderContest.from_url('http://yukicoder.me/contests/276/all').contest_id, 276) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + self.assertEqual(YukicoderContest.from_url('https://yukicoder.me/contests/276').list_problems(), [ + YukicoderProblem(problem_id=4401), +@@ -145,6 +149,7 @@ class YukicoderContestTest(unittest.TestCase): + + + class YukicoderProblemGetInputFormatTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_normal(self): + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/1').get_input_format(), '\\(N\\)\n\\(C\\)\n\\(V\\)\n\\(S_1\\ S_2\\ S_3\\ \\dots\\ S_V\\)\n\\(T_1\\ T_2\\ T_3\\ \\dots\\ T_V\\)\n\\(Y_1\\ Y_2\\ Y_3\\ \\dots\\ Y_V\\)\n\\(M_1\\ M_2\\ M_3\\ \\dots\\ M_V\\)\n') + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/2').get_input_format(), 'N\n') +@@ -154,6 +159,7 @@ class YukicoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/512').get_input_format(), '$X$ $Y$\n$N$\n$A_1$ $\\cdots$ $A_N$\n') + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/777').get_input_format(), '$N$\n$A_1$ $B_1$ $C_1$\n$A_2$ $B_2$ $C_2$\n…\n$A_N$ $B_N$ $C_N$\n') + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input(self): + self.assertIsNone(YukicoderProblem.from_url('https://yukicoder.me/problems/no/3003').get_input_format()) +
\ No newline at end of file diff --git a/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch b/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch deleted file mode 100644 index 3570b94e9b..0000000000 --- a/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fix CVE-2013-7459: - -https://github.com/dlitz/pycrypto/issues/176 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-7459 - -Copied from Debian: - -https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/commit/?id=0de2243837ed369a086f15c50cca2be85bdfab9d - -Debian adapts this upstream commit: - -https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 - -From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001 -From: Legrandin <helderijs@gmail.com> -Date: Sun, 22 Dec 2013 22:24:46 +0100 -Subject: [PATCH] Throw exception when IV is used with ECB or CTR - -The IV parameter is currently ignored when initializing -a cipher in ECB or CTR mode. - -For CTR mode, it is confusing: it takes some time to see -that a different parameter is needed (the counter). - -For ECB mode, it is outright dangerous. - -This patch forces an exception to be raised. ---- - lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++-------- - src/block_template.c | 11 +++++++++++ - 2 files changed, 34 insertions(+), 8 deletions(-) - ---- a/lib/Crypto/SelfTest/Cipher/common.py -+++ b/lib/Crypto/SelfTest/Cipher/common.py -@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase): - return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,) - - def runTest(self): -- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP): -+ -+ ## ECB mode -+ mode = self.module.MODE_ECB -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ ciphertext = encryption_cipher.encrypt(self.plaintext) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## OPENPGP mode -+ mode = self.module.MODE_OPENPGP -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext) -+ eiv = eiv_ciphertext[:self.module.block_size+2] -+ ciphertext = eiv_ciphertext[self.module.block_size+2:] -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## All other non-AEAD modes (but CTR) -+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB): - encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - ciphertext = encryption_cipher.encrypt(self.plaintext) -- -- if mode != self.module.MODE_OPENPGP: -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -- else: -- eiv = ciphertext[:self.module.block_size+2] -- ciphertext = ciphertext[self.module.block_size+2:] -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - decrypted_plaintext = decryption_cipher.decrypt(ciphertext) - self.assertEqual(self.plaintext, decrypted_plaintext) - -+ - class PGPTest(unittest.TestCase): - def __init__(self, module, params): - unittest.TestCase.__init__(self) ---- a/src/block_template.c -+++ b/src/block_template.c -@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, P - "Key cannot be the null string"); - return NULL; - } -+ if (IVlen != 0 && mode == MODE_ECB) -+ { -+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV"); -+ return NULL; -+ } -+ if (IVlen != 0 && mode == MODE_CTR) -+ { -+ PyErr_Format(PyExc_ValueError, -+ "CTR mode needs counter parameter, not IV"); -+ return NULL; -+ } - if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR) - { - PyErr_Format(PyExc_ValueError, diff --git a/gnu/packages/patches/python-pycrypto-time-clock.patch b/gnu/packages/patches/python-pycrypto-time-clock.patch deleted file mode 100644 index 9b7a8232a2..0000000000 --- a/gnu/packages/patches/python-pycrypto-time-clock.patch +++ /dev/null @@ -1,23 +0,0 @@ -Drop use of the deprecated time.clock which was removed in Python 3.8. - -Adapted from upstream pull request: - -https://github.com/dlitz/pycrypto/pull/296 - -diff --git a/lib/Crypto/Random/_UserFriendlyRNG.py b/lib/Crypto/Random/_UserFriendlyRNG.py ---- a/lib/Crypto/Random/_UserFriendlyRNG.py -+++ b/lib/Crypto/Random/_UserFriendlyRNG.py -@@ -73,8 +73,11 @@ class _EntropyCollector(object): - t = time.time() - self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - -- # Add the fractional part of time.clock() -- t = time.clock() -+ # Add the fractional part of time.process_time() -+ try: -+ t = time.process_time() -+ except AttributeError: -+ t = time.clock() - self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - - diff --git a/gnu/packages/patches/python-sphinx-prompt-docutils-0.19.patch b/gnu/packages/patches/python-sphinx-prompt-docutils-0.19.patch new file mode 100644 index 0000000000..01c1879f1c --- /dev/null +++ b/gnu/packages/patches/python-sphinx-prompt-docutils-0.19.patch @@ -0,0 +1,35 @@ +From a885c54d54e71a089b916502f1c222ef14a07a93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Brunner?= <stephane.brunner@camptocamp.com> +Date: Mon, 15 Aug 2022 10:41:40 +0200 +Subject: [PATCH] Fix the tests + +--- + tests/test_sphinx_prompt.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/tests/test_sphinx_prompt.py b/tests/test_sphinx_prompt.py +index 47d16c5..6a31798 100644 +--- a/tests/test_sphinx_prompt.py ++++ b/tests/test_sphinx_prompt.py +@@ -1,3 +1,7 @@ ++from io import StringIO ++ ++import docutils.statemachine ++import docutils.utils + import pytest + + sphinx_prompt = __import__("sphinx_prompt") +@@ -150,6 +154,12 @@ + def test(arguments, options, content, expected): + sphinx_prompt._cache.next_index = 1 + sphinx_prompt._cache.prompts.clear() +- directive = sphinx_prompt.PromptDirective("prompt", arguments, options, content, 0, 0, "", None, None) ++ stream = StringIO() ++ reporter = docutils.utils.Reporter("test data", 2, 4, stream, 1) ++ statemachine = docutils.statemachine.StateMachine([], None) ++ setattr(statemachine, "reporter", reporter) ++ directive = sphinx_prompt.PromptDirective( ++ "prompt", arguments, options, content, 0, 0, "", None, statemachine ++ ) + result = directive.run() + assert result[0].astext() == expected diff --git a/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch b/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch new file mode 100644 index 0000000000..69e68cc8e1 --- /dev/null +++ b/gnu/packages/patches/qmk-firmware-fix-hacker-dvorak.patch @@ -0,0 +1,15 @@ +Submitted upstream: https://github.com/qmk/qmk_firmware/pull/22102 + +diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c +index bd4fd10ad1..5ce5f5298f 100644 +--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c ++++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c +@@ -4,7 +4,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { + + switch (layer) { + case DVORAK: +- rgblight_sethsv_noeeprom(GREEN); ++ rgblight_sethsv_noeeprom(HSV_GREEN); + rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); + + if (PLOVER_MODE) { diff --git a/gnu/packages/patches/qtbase-5-use-TZDIR.patch b/gnu/packages/patches/qtbase-5-use-TZDIR.patch new file mode 100644 index 0000000000..b6c377b133 --- /dev/null +++ b/gnu/packages/patches/qtbase-5-use-TZDIR.patch @@ -0,0 +1,39 @@ +Use $TZDIR to search for time-zone data. Thus avoid depending on package +"tzdata", which often introduces changes with near-immediate effects, so it's +important to be able to update it fast. + +Based on a patch fron NixOS. +=================================================================== +--- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on GuixSD. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on GuixSD. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -645,6 +649,9 @@ + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { ++ // Try TZDIR first, in case we're running on GuixSD. ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { + // Open named tz, try modern path first, if fails try legacy path + tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +@@ -652,6 +659,7 @@ + if (!tzif.open(QIODevice::ReadOnly)) + return; + } ++ } + } + + QDataStream ds(&tzif); diff --git a/gnu/packages/patches/qtbase-use-TZDIR.patch b/gnu/packages/patches/qtbase-use-TZDIR.patch index b6c377b133..98bf7493e9 100644 --- a/gnu/packages/patches/qtbase-use-TZDIR.patch +++ b/gnu/packages/patches/qtbase-use-TZDIR.patch @@ -1,39 +1,141 @@ -Use $TZDIR to search for time-zone data. Thus avoid depending on package -"tzdata", which often introduces changes with near-immediate effects, so it's -important to be able to update it fast. +From 1075606f8b2f9e153c82f8e50cbd69cea9c72e87 Mon Sep 17 00:00:00 2001 +From: Edward Welbourne <edward.welbourne@qt.io> +Date: Mon, 11 Sep 2023 11:41:39 +0200 +Subject: [PATCH] Support the TZDIR environment variable -Based on a patch fron NixOS. -=================================================================== ---- qtbase-opensource-src-5.14.2.orig/src/corelib/time/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.15.2/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -70,7 +70,11 @@ - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories +On Linux / glibc, this overrides the default system location for the +zone info. So check for files there first. Break out a function to +manage the trying of (now three) zoneinfo directories when opening a +file by name relative to there. + +Pick-to: 6.6 6.5 +Task-number: QTBUG-116017 +Change-Id: I1f97107aabd9015c0a5543639870f1d70654ca67 +--- +* Rebased on top of v6.5.2. + + src/corelib/time/qtimezoneprivate_tz.cpp | 73 ++++++++++++++++-------- + 1 file changed, 49 insertions(+), 24 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 067191d816..a8b2fc894e 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -51,17 +51,41 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; + + static bool isTzFile(const QString &name); + ++// Open a named file under the zone info directory: ++static bool openZoneInfo(QString name, QFile *file) ++{ ++ // At least on Linux / glibc (see man 3 tzset), $TZDIR overrides the system ++ // default location for zone info: ++ const QString tzdir = qEnvironmentVariable("TZDIR"); ++ if (!tzdir.isEmpty()) { ++ file->setFileName(QDir(tzdir).filePath(name)); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ // Try modern system path first: ++ constexpr auto zoneShare = "/usr/share/zoneinfo/"_L1; ++ if (tzdir != zoneShare && tzdir != zoneShare.chopped(1)) { ++ file->setFileName(zoneShare + name); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ // Fall back to legacy system path: ++ constexpr auto zoneLib = "/usr/lib/zoneinfo/"_L1; ++ if (tzdir != zoneLib && tzdir != zoneLib.chopped(1)) { ++ file->setFileName(zoneShare + name); ++ if (file->open(QIODevice::ReadOnly)) ++ return true; ++ } ++ return false; ++} ++ + // Parse zone.tab table for territory information, read directories to ensure we + // find all installed zones (many are omitted from zone.tab; even more from + // zone1970.tab). static QTzTimeZoneHash loadTzTimeZones() { - QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on GuixSD. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on GuixSD. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); +- if (!QFile::exists(path)) +- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); +- +- QFile tzif(path); +- if (!tzif.open(QIODevice::ReadOnly)) ++ QFile tzif; ++ if (!openZoneInfo("zone.tab"_L1, &tzif)) + return QTzTimeZoneHash(); -@@ -645,6 +649,9 @@ + QTzTimeZoneHash zonesHash; +@@ -91,6 +115,7 @@ static QTzTimeZoneHash loadTzTimeZones() + } + } + ++ const QString path = tzif.fileName(); + const qsizetype cut = path.lastIndexOf(u'/'); + Q_ASSERT(cut > 0); + const QDir zoneDir = QDir(path.first(cut)); +@@ -761,20 +786,13 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + tzif.setFileName(QStringLiteral("/etc/localtime")); if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -+ // Try TZDIR first, in case we're running on GuixSD. -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { - // Open named tz, try modern path first, if fails try legacy path - tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -@@ -652,6 +659,7 @@ - if (!tzif.open(QIODevice::ReadOnly)) - return; + return ret; +- } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName("/usr/share/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName("/usr/lib/zoneinfo/"_L1 + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- auto check = validatePosixRule(ianaId); +- if (check.isValid) { +- ret.m_hasDst = check.hasDst; +- ret.m_posixRule = ianaId; +- } +- return ret; +- } ++ } else if (!openZoneInfo(QString::fromLocal8Bit(ianaId), &tzif)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ auto check = validatePosixRule(ianaId); ++ if (check.isValid) { ++ ret.m_hasDst = check.hasDst; ++ ret.m_posixRule = ianaId; ++ return ret; } -+ } } - QDataStream ds(&tzif); +@@ -1317,7 +1335,8 @@ private: + { + // On most distros /etc/localtime is a symlink to a real file so extract + // name from the path +- const auto zoneinfo = "/zoneinfo/"_L1; ++ const QString tzdir = qEnvironmentVariable("TZDIR"); ++ constexpr auto zoneinfo = "/zoneinfo/"_L1; + QString path = QStringLiteral("/etc/localtime"); + long iteration = getSymloopMax(); + // Symlink may point to another symlink etc. before being under zoneinfo/ +@@ -1325,9 +1344,15 @@ private: + // symlink, like America/Montreal pointing to America/Toronto + do { + path = QFile::symLinkTarget(path); +- int index = path.indexOf(zoneinfo); +- if (index >= 0) // Found zoneinfo file; extract zone name from path: +- return QStringView{ path }.mid(index + zoneinfo.size()).toUtf8(); ++ // If it's a zoneinfo file, extract the zone name from its path: ++ int index = tzdir.isEmpty() ? -1 : path.indexOf(tzdir); ++ if (index >= 0) { ++ const auto tail = QStringView{ path }.sliced(index + tzdir.size()).toUtf8(); ++ return tail.startsWith(u'/') ? tail.sliced(1) : tail; ++ } ++ index = path.indexOf(zoneinfo); ++ if (index >= 0) ++ return QStringView{ path }.sliced(index + zoneinfo.size()).toUtf8(); + } while (!path.isEmpty() && --iteration > 0); + + return QByteArray(); + +base-commit: af457a9f0f7eb1a2a7d11f495da508faab91a442 +-- +2.41.0 + diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..d72a8fb07a --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,21 @@ +@@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml 2023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml 2023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ + + [target."cfg(unix)".dependencies.rustix] + version = "0.37.0" +-features = ["fs"] ++features = ["fs", "cc"] + + [target."cfg(windows)".dependencies.windows-sys] + version = "0.45.0" +--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies = [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch deleted file mode 100644 index 5872d4cf22..0000000000 --- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400 -+++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400 -@@ -31,10 +31,6 @@ - [package.metadata.pkg-config] - openssl = "1.0.1" - --[dependencies.bssl-sys] --version = "0.1.0" --optional = true -- - [dependencies.libc] - version = "0.2" - -@@ -46,16 +42,12 @@ - [build-dependencies.cc] - version = "1.0" - --[build-dependencies.openssl-src] --version = "111" --optional = true -- - [build-dependencies.pkg-config] - version = "0.3.9" - - [features] --unstable_boringssl = ["bssl-sys"] --vendored = ["openssl-src"] -+unstable_boringssl = [] -+vendored = [] - - [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] - version = "0.2.8" diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/packages/patches/scilab-hdf5-1.8-api.patch deleted file mode 100644 index 8b453e4720..0000000000 --- a/gnu/packages/patches/scilab-hdf5-1.8-api.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch fixes the compilation with hdf5 version >= 1.10. Adapted from -https://aur.archlinux.org/cgit/aur.git/plain/hdf5_18_api.patch?h=scilab-git. - -diff -ur a/scilab/modules/hdf5/includes/HDF5Objects.h b/scilab/modules/hdf5/includes/HDF5Objects.h ---- a/scilab/modules/hdf5/includes/HDF5Objects.h -+++ b/scilab/modules/hdf5/includes/HDF5Objects.h -@@ -16,14 +16,12 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - --#define H5Eset_auto_vers 2 - #include <hdf5.h> - #include <hdf5_hl.h> - --#undef H5_NO_DEPRECATED_SYMBOLS - - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ -diff -ur a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefile.am ---- a/scilab/modules/hdf5/Makefile.am -+++ b/scilab/modules/hdf5/Makefile.am -@@ -104,8 +104,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - - libscihdf5_la_CPPFLAGS = \ -diff -ur a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ---- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -@@ -13,6 +13,8 @@ - * - */ - -+#define H5_USE_18_API -+ - #include <vector> - #include "function.hxx" - #include "string.hxx" -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include <sys/time.h> -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include <sys/time.h> diff --git a/gnu/packages/patches/teuchos-remove-duplicate-using.patch b/gnu/packages/patches/teuchos-remove-duplicate-using.patch new file mode 100644 index 0000000000..55cd3f6fc3 --- /dev/null +++ b/gnu/packages/patches/teuchos-remove-duplicate-using.patch @@ -0,0 +1,34 @@ +commit e27d9ae98502626d8407045a4e082797682ba56b +Author: Christian Glusa <caglusa@sandia.gov> +Date: Fri Jul 3 18:02:27 2020 -0600 + + Teuchos Comm test: remove duplicate 'using ...' + +diff --git a/packages/teuchos/comm/test/Comm/reduce.cpp b/packages/teuchos/comm/test/Comm/reduce.cpp +index c05ebc0dc34..eac1975ef83 100644 +--- a/packages/teuchos/comm/test/Comm/reduce.cpp ++++ b/packages/teuchos/comm/test/Comm/reduce.cpp +@@ -53,9 +53,6 @@ bool + testReduceSum (bool& success, std::ostream& out, + const int root, const Teuchos::Comm<int>& comm) + { +-#ifdef HAVE_TEUCHOS_MPI +- using Teuchos::MpiComm; +-#endif // HAVE_TEUCHOS_MPI + using Teuchos::reduce; + using Teuchos::TypeNameTraits; + using std::endl; +diff --git a/packages/teuchos/comm/test/Comm/scatter.cpp b/packages/teuchos/comm/test/Comm/scatter.cpp +index 0ca961d2846..001009029c4 100644 +--- a/packages/teuchos/comm/test/Comm/scatter.cpp ++++ b/packages/teuchos/comm/test/Comm/scatter.cpp +@@ -53,9 +53,6 @@ bool + testScatter (bool& success, std::ostream& out, + const int root, const Teuchos::Comm<int>& comm) + { +-#ifdef HAVE_TEUCHOS_MPI +- using Teuchos::MpiComm; +-#endif // HAVE_TEUCHOS_MPI + using Teuchos::scatter; + using Teuchos::TypeNameTraits; + using std::endl; diff --git a/gnu/packages/patches/tootle-glib-object-naming.patch b/gnu/packages/patches/tootle-glib-object-naming.patch deleted file mode 100644 index 08ee23dd8f..0000000000 --- a/gnu/packages/patches/tootle-glib-object-naming.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0816105028c26965e37c9afc7c598854f3fecde1 Mon Sep 17 00:00:00 2001 -From: Clayton Craft <clayton@craftyguy.net> -Date: Tue, 26 Oct 2021 15:03:25 -0700 -Subject: [PATCH] Adhere to GLib.Object naming conventions for properties - -Vala now validates property names against GLib.Object conventions, this -fixes a compilation error as a result of this enforcement: - -../src/API/Status.vala:27.5-27.23: error: Name `_url' is not valid for a GLib.Object property - public string? _url { get; set; } - ^^^^^^^^^^^^^^^^^^^ - -Relevant Vala change: -https://gitlab.gnome.org/GNOME/vala/-/commit/38d61fbff037687ea4772e6df85c7e22a74b335e - -fixes #337 - -Signed-off-by: Clayton Craft <clayton@craftyguy.net> ---- - src/API/Attachment.vala | 6 +++--- - src/API/Status.vala | 8 ++++---- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/API/Attachment.vala b/src/API/Attachment.vala -index 88bc5bb..35c4018 100644 ---- a/src/API/Attachment.vala -+++ b/src/API/Attachment.vala -@@ -4,10 +4,10 @@ public class Tootle.API.Attachment : Entity, Widgetizable { - public string kind { get; set; default = "unknown"; } - public string url { get; set; } - public string? description { get; set; } -- public string? _preview_url { get; set; } -+ private string? t_preview_url { get; set; } - public string? preview_url { -- set { this._preview_url = value; } -- get { return (this._preview_url == null || this._preview_url == "") ? url : _preview_url; } -+ set { this.t_preview_url = value; } -+ get { return (this.t_preview_url == null || this.t_preview_url == "") ? url : t_preview_url; } - } - - public File? source_file { get; set; } -diff --git a/src/API/Status.vala b/src/API/Status.vala -index 4f92cdb..00e8a9f 100644 ---- a/src/API/Status.vala -+++ b/src/API/Status.vala -@@ -28,16 +28,16 @@ public class Tootle.API.Status : Entity, Widgetizable { - public ArrayList<API.Mention>? mentions { get; set; default = null; } - public ArrayList<API.Attachment>? media_attachments { get; set; default = null; } - -- public string? _url { get; set; } -+ private string? t_url { get; set; } - public string url { - owned get { return this.get_modified_url (); } -- set { this._url = value; } -+ set { this.t_url = value; } - } - string get_modified_url () { -- if (this._url == null) { -+ if (this.t_url == null) { - return this.uri.replace ("/activity", ""); - } -- return this._url; -+ return this.t_url; - } - - public Status formal { diff --git a/gnu/packages/patches/tootle-reason-phrase.patch b/gnu/packages/patches/tootle-reason-phrase.patch deleted file mode 100644 index 72a1d1ecfa..0000000000 --- a/gnu/packages/patches/tootle-reason-phrase.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 858ee78fbebe161a4cdd707a469dc0f045211a51 Mon Sep 17 00:00:00 2001 -From: Max Harmathy <harmathy@mailbox.org> -Date: Wed, 25 Aug 2021 13:05:58 +0200 -Subject: [PATCH] Use reason_phrase instead of get_phrase - ---- - src/Services/Cache.vala | 2 +- - src/Services/Network.vala | 7 +------ - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/Services/Cache.vala b/src/Services/Cache.vala -index 2251697..2ed314e 100644 ---- a/src/Services/Cache.vala -+++ b/src/Services/Cache.vala -@@ -88,7 +88,7 @@ public class Tootle.Cache : GLib.Object { - try { - var code = msg.status_code; - if (code != Soup.Status.OK) { -- var error = network.describe_error (code); -+ var error = msg.reason_phrase; - throw new Oopsie.INSTANCE (@"Server returned $error"); - } - -diff --git a/src/Services/Network.vala b/src/Services/Network.vala -index fa2839c..d0143b0 100644 ---- a/src/Services/Network.vala -+++ b/src/Services/Network.vala -@@ -56,7 +56,7 @@ public class Tootle.Network : GLib.Object { - else if (status == Soup.Status.CANCELLED) - debug ("Message is cancelled. Ignoring callback invocation."); - else -- ecb ((int32) status, describe_error ((int32) status)); -+ ecb ((int32) status, msg.reason_phrase); - }); - } - catch (Error e) { -@@ -65,11 +65,6 @@ public class Tootle.Network : GLib.Object { - } - } - -- public string describe_error (uint code) { -- var reason = Soup.Status.get_phrase (code); -- return @"$code: $reason"; -- } -- - public void on_error (int32 code, string message) { - warning (message); - app.toast (message); diff --git a/gnu/packages/patches/tpetra-remove-duplicate-using.patch b/gnu/packages/patches/tpetra-remove-duplicate-using.patch new file mode 100644 index 0000000000..e9cb2c6472 --- /dev/null +++ b/gnu/packages/patches/tpetra-remove-duplicate-using.patch @@ -0,0 +1,18 @@ +commit 919ceb0acbf4c6bc4f463433504a338c643612c2 +Author: Karen D. Devine <kddevin@sandia.gov> +Date: Tue Feb 2 13:49:13 2021 -0700 + + tpetra: removed duplicate using statement #8673 + +diff --git a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp +index a76f78c41a8..69d4dc46d03 100644 +--- a/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp ++++ b/packages/tpetra/core/src/Tpetra_Details_FixedHashTable_def.hpp +@@ -1094,7 +1094,6 @@ init (const keys_type& keys, + + // Allocate the array of (key,value) pairs. Don't fill it with + // zeros, because we will fill it with actual data below. +- using Kokkos::ViewAllocateWithoutInitializing; + typedef typename val_type::non_const_type nonconst_val_type; + nonconst_val_type val (ViewAllocateWithoutInitializing ("Tpetra::FixedHashTable::pairs"), + theNumKeys); diff --git a/gnu/packages/patches/u-boot-patman-change-id.patch b/gnu/packages/patches/u-boot-patman-change-id.patch new file mode 100644 index 0000000000..354aee2755 --- /dev/null +++ b/gnu/packages/patches/u-boot-patman-change-id.patch @@ -0,0 +1,232 @@ +Upstream status: https://patchwork.ozlabs.org/project/uboot/patch/20231013030633.7191-1-maxim.cournoyer@gmail.com/ + +From f83a5e07b0934e38cbee923e0c5b7fc0a890926c Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Thu, 12 Oct 2023 17:04:25 -0400 +Subject: [PATCH] patman: Add a 'keep_change_id' setting + +A Change-Id can be useful for traceability purposes, and some projects +may wish to have them preserved. This change makes it configurable +via a new 'keep_change_id' setting. + +Series-version: 2 +Series-changes: 2 +- Add missing argument to send parser +--- + tools/patman/__main__.py | 2 ++ + tools/patman/control.py | 12 +++++++++--- + tools/patman/patchstream.py | 17 ++++++++++++----- + tools/patman/patman.rst | 11 ++++++----- + tools/patman/test_checkpatch.py | 16 ++++++++++++++++ + 5 files changed, 45 insertions(+), 13 deletions(-) + +diff --git a/tools/patman/__main__.py b/tools/patman/__main__.py +index 8eba5d3486..197ac1aad1 100755 +--- a/tools/patman/__main__.py ++++ b/tools/patman/__main__.py +@@ -103,6 +103,8 @@ send.add_argument('--no-signoff', action='store_false', dest='add_signoff', + default=True, help="Don't add Signed-off-by to patches") + send.add_argument('--smtp-server', type=str, + help="Specify the SMTP server to 'git send-email'") ++send.add_argument('--keep-change-id', action='store_true', ++ help='Preserve Change-Id tags in patches to send.') + + send.add_argument('patchfiles', nargs='*') + +diff --git a/tools/patman/control.py b/tools/patman/control.py +index 916ddf8fcf..b292da9dc2 100644 +--- a/tools/patman/control.py ++++ b/tools/patman/control.py +@@ -16,11 +16,14 @@ from patman import gitutil + from patman import patchstream + from u_boot_pylib import terminal + ++ + def setup(): + """Do required setup before doing anything""" + gitutil.setup() + +-def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): ++ ++def prepare_patches(col, branch, count, start, end, ignore_binary, signoff, ++ keep_change_id=False): + """Figure out what patches to generate, then generate them + + The patch files are written to the current directory, e.g. 0001_xxx.patch +@@ -35,6 +38,7 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): + end (int): End patch to use (0=last one in series, 1=one before that, + etc.) + ignore_binary (bool): Don't generate patches for binary files ++ keep_change_id (bool): Preserve the Change-Id tag. + + Returns: + Tuple: +@@ -59,11 +63,12 @@ def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): + branch, start, to_do, ignore_binary, series, signoff) + + # Fix up the patch files to our liking, and insert the cover letter +- patchstream.fix_patches(series, patch_files) ++ patchstream.fix_patches(series, patch_files, keep_change_id) + if cover_fname and series.get('cover'): + patchstream.insert_cover_letter(cover_fname, series, to_do) + return series, cover_fname, patch_files + ++ + def check_patches(series, patch_files, run_checkpatch, verbose, use_tree): + """Run some checks on a set of patches + +@@ -166,7 +171,8 @@ def send(args): + col = terminal.Color() + series, cover_fname, patch_files = prepare_patches( + col, args.branch, args.count, args.start, args.end, +- args.ignore_binary, args.add_signoff) ++ args.ignore_binary, args.add_signoff, ++ keep_change_id=args.keep_change_id) + ok = check_patches(series, patch_files, args.check_patch, + args.verbose, args.check_patch_use_tree) + +diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py +index f91669a940..e2e2a83e67 100644 +--- a/tools/patman/patchstream.py ++++ b/tools/patman/patchstream.py +@@ -68,6 +68,7 @@ STATE_PATCH_SUBJECT = 1 # In patch subject (first line of log for a commit) + STATE_PATCH_HEADER = 2 # In patch header (after the subject) + STATE_DIFFS = 3 # In the diff part (past --- line) + ++ + class PatchStream: + """Class for detecting/injecting tags in a patch or series of patches + +@@ -76,7 +77,7 @@ class PatchStream: + unwanted tags or inject additional ones. These correspond to the two + phases of processing. + """ +- def __init__(self, series, is_log=False): ++ def __init__(self, series, is_log=False, keep_change_id=False): + self.skip_blank = False # True to skip a single blank line + self.found_test = False # Found a TEST= line + self.lines_after_test = 0 # Number of lines found after TEST= +@@ -86,6 +87,7 @@ class PatchStream: + self.section = [] # The current section...END section + self.series = series # Info about the patch series + self.is_log = is_log # True if indent like git log ++ self.keep_change_id = keep_change_id # True to keep Change-Id tags + self.in_change = None # Name of the change list we are in + self.change_version = 0 # Non-zero if we are in a change list + self.change_lines = [] # Lines of the current change +@@ -452,6 +454,8 @@ class PatchStream: + + # Detect Change-Id tags + elif change_id_match: ++ if self.keep_change_id: ++ out = [line] + value = change_id_match.group(1) + if self.is_log: + if self.commit.change_id: +@@ -763,7 +767,7 @@ def get_metadata_for_test(text): + pst.finalise() + return series + +-def fix_patch(backup_dir, fname, series, cmt): ++def fix_patch(backup_dir, fname, series, cmt, keep_change_id=False): + """Fix up a patch file, by adding/removing as required. + + We remove our tags from the patch file, insert changes lists, etc. +@@ -776,6 +780,7 @@ def fix_patch(backup_dir, fname, series, cmt): + fname (str): Filename to patch file to process + series (Series): Series information about this patch set + cmt (Commit): Commit object for this patch file ++ keep_change_id (bool): Keep the Change-Id tag. + + Return: + list: A list of errors, each str, or [] if all ok. +@@ -783,7 +788,7 @@ def fix_patch(backup_dir, fname, series, cmt): + handle, tmpname = tempfile.mkstemp() + outfd = os.fdopen(handle, 'w', encoding='utf-8') + infd = open(fname, 'r', encoding='utf-8') +- pst = PatchStream(series) ++ pst = PatchStream(series, keep_change_id=keep_change_id) + pst.commit = cmt + pst.process_stream(infd, outfd) + infd.close() +@@ -795,7 +800,7 @@ def fix_patch(backup_dir, fname, series, cmt): + shutil.move(tmpname, fname) + return cmt.warn + +-def fix_patches(series, fnames): ++def fix_patches(series, fnames, keep_change_id=False): + """Fix up a list of patches identified by filenames + + The patch files are processed in place, and overwritten. +@@ -803,6 +808,7 @@ def fix_patches(series, fnames): + Args: + series (Series): The Series object + fnames (:type: list of str): List of patch files to process ++ keep_change_id (bool): Keep the Change-Id tag. + """ + # Current workflow creates patches, so we shouldn't need a backup + backup_dir = None #tempfile.mkdtemp('clean-patch') +@@ -811,7 +817,8 @@ def fix_patches(series, fnames): + cmt = series.commits[count] + cmt.patch = fname + cmt.count = count +- result = fix_patch(backup_dir, fname, series, cmt) ++ result = fix_patch(backup_dir, fname, series, cmt, ++ keep_change_id=keep_change_id) + if result: + print('%d warning%s for %s:' % + (len(result), 's' if len(result) > 1 else '', fname)) +diff --git a/tools/patman/patman.rst b/tools/patman/patman.rst +index 038b651ee8..a8b317eed6 100644 +--- a/tools/patman/patman.rst ++++ b/tools/patman/patman.rst +@@ -371,11 +371,12 @@ Series-process-log: sort, uniq + Separate each tag with a comma. + + Change-Id: +- This tag is stripped out but is used to generate the Message-Id +- of the emails that will be sent. When you keep the Change-Id the +- same you are asserting that this is a slightly different version +- (but logically the same patch) as other patches that have been +- sent out with the same Change-Id. ++ This tag is used to generate the Message-Id of the emails that ++ will be sent. When you keep the Change-Id the same you are ++ asserting that this is a slightly different version (but logically ++ the same patch) as other patches that have been sent out with the ++ same Change-Id. The Change-Id tag line is removed from outgoing ++ patches, unless the `keep_change_id` settings is set to `True`. + + Various other tags are silently removed, like these Chrome OS and + Gerrit tags:: +diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py +index a8bb364e42..59a53ef8ca 100644 +--- a/tools/patman/test_checkpatch.py ++++ b/tools/patman/test_checkpatch.py +@@ -160,6 +160,22 @@ Signed-off-by: Simon Glass <sjg@chromium.org> + + rc = os.system('diff -u %s %s' % (inname, expname)) + self.assertEqual(rc, 0) ++ os.remove(inname) ++ ++ # Test whether the keep_change_id settings works. ++ inhandle, inname = tempfile.mkstemp() ++ infd = os.fdopen(inhandle, 'w', encoding='utf-8') ++ infd.write(data) ++ infd.close() ++ ++ patchstream.fix_patch(None, inname, series.Series(), com, ++ keep_change_id=True) ++ ++ with open(inname, 'r') as f: ++ content = f.read() ++ self.assertIn( ++ 'Change-Id: I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413', ++ content) + + os.remove(inname) + os.remove(expname) + +base-commit: f9a47ac8d97da2b3aaf463f268a9a872a8d921df +-- +2.41.0 + diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch index c441a0861a..2a0e4ce138 100644 --- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch +++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch @@ -3,102 +3,121 @@ TCP network interfaces cannot be obtained via /sys/class/net. This patch provides alternative code that uses the SIOCGIFCONF ioctl to get the names of the available TCP network interfaces. +Initially submitted at <https://github.com/openucx/ucx/pull/4462>. + diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c -index cad4a2709..7c1d2c9de 100644 +index 6a6cd34fa..af32bb2e9 100644 --- a/src/uct/tcp/tcp_iface.c +++ b/src/uct/tcp/tcp_iface.c -@@ -17,6 +17,8 @@ - #include <sys/poll.h> +@@ -18,6 +18,8 @@ #include <netinet/tcp.h> #include <dirent.h> + #include <float.h> +#include <net/if.h> +#include <sys/ioctl.h> + #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net" - extern ucs_class_t UCS_CLASS_DECL_NAME(uct_tcp_iface_t); -@@ -586,6 +588,68 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, +@@ -875,6 +877,85 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, uct_worker_h, const uct_iface_params_t*, const uct_iface_config_t*); +/* Fetch information about available network devices through an ioctl. */ -+static ucs_status_t query_devices_ioctl(uct_md_h md, -+ uct_tl_device_resource_t **tl_devices_p, -+ unsigned *num_tl_devices_p) ++static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md, ++ uct_tl_device_resource_t **devices_p, ++ unsigned *num_devices_p) +{ + int sock, err, i; -+ uct_tl_device_resource_t *resources, *tmp; -+ unsigned num_resources; ++ uct_tl_device_resource_t *devices, *tmp; ++ unsigned num_devices; + ucs_status_t status; + struct ifconf conf; -+ struct ifreq reqs[10]; + -+ conf.ifc_len = sizeof reqs; -+ conf.ifc_req = reqs; ++ conf.ifc_len = 0; ++ conf.ifc_req = NULL; ++ ++ status = ucs_socket_create(AF_INET, SOCK_STREAM, &sock); ++ if (status != UCS_OK) { ++ goto out; ++ } ++ ++ err = ioctl(sock, SIOCGIFCONF, &conf); ++ if (err < 0) { ++ ucs_error("ioctl(SIOCGIFCONF) failed: %m"); ++ status = UCS_ERR_IO_ERROR; ++ goto out; ++ } + -+ sock = socket(SOCK_STREAM, AF_INET, 0); -+ if (sock < 0) { -+ ucs_error("socket(2) failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; ++ conf.ifc_req = ucs_calloc(1, conf.ifc_len, "ifreq"); ++ if (conf.ifc_req == NULL) { ++ ucs_error("memory alocation failed"); ++ status = UCS_ERR_NO_MEMORY; ++ goto out; + } + + err = ioctl(sock, SIOCGIFCONF, &conf); + if (err < 0) { -+ ucs_error("SIOCGIFCONF ioctl failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; ++ ucs_error("ioctl(SIOCGIFCONF) failed: %m"); ++ status = UCS_ERR_IO_ERROR; ++ goto out_free; + } + -+ resources = NULL; -+ num_resources = 0; -+ for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) { -+ const char *name = reqs[i].ifr_name; ++ devices = NULL; ++ num_devices = 0; ++ for (i = 0; i < (conf.ifc_len / sizeof(struct ifreq)); i++) { ++ const char *name = conf.ifc_req[i].ifr_name; ++ sa_family_t family = conf.ifc_req[i].ifr_addr.sa_family; + -+ if (!ucs_netif_is_active(name, AF_INET)) { ++ if (!ucs_netif_is_active(name, family)) { + continue; + } + -+ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1), -+ "tcp resources"); ++ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1), ++ "tcp devices"); + if (tmp == NULL) { -+ ucs_free(resources); ++ ucs_free(devices); + status = UCS_ERR_NO_MEMORY; -+ goto out; ++ goto out_free; + } -+ resources = tmp; ++ devices = tmp; + -+ ucs_snprintf_zero(resources[i].name, sizeof(resources[i].name), ++ ucs_snprintf_zero(devices[num_devices].name, ++ sizeof(devices[num_devices].name), + "%s", name); -+ resources[i].type = UCT_DEVICE_TYPE_NET; -+ ++num_resources; ++ devices[num_devices].type = UCT_DEVICE_TYPE_NET; ++ ++num_devices; + } + -+ *num_tl_devices_p = num_resources; -+ *tl_devices_p = resources; -+ status = UCS_OK; ++ *num_devices_p = num_devices; ++ *devices_p = devices; ++ status = UCS_OK; + ++out_free: ++ ucs_free(conf.ifc_req); +out: -+ if (sock >= 0) close(sock); ++ if (sock >= 0) { ++ close(sock); ++ } + return status; +} + ucs_status_t uct_tcp_query_devices(uct_md_h md, uct_tl_device_resource_t **devices_p, unsigned *num_devices_p) -@@ -599,9 +663,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, dir = opendir(UCT_TCP_IFACE_NETDEV_DIR); if (dir == NULL) { - ucs_error("opendir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR); - status = UCS_ERR_IO_ERROR; - goto out; -+ /* When /sys is unavailable, as can be the case in a container, -+ * resort to a good old 'ioctl'. */ -+ return query_devices_ioctl(md, devices_p, num_devices_p); ++ /* When /sys is unavailable, as can be the case in a container, ++ * resort to a good old 'ioctl'. */ ++ return uct_tcp_query_devices_ioctl(md, devices_p, num_devices_p); } devices = NULL; -@@ -655,7 +719,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, out_closedir: closedir(dir); diff --git a/gnu/packages/patches/unison-fix-ocaml-4.08.patch b/gnu/packages/patches/unison-fix-ocaml-4.08.patch deleted file mode 100644 index 811f590721..0000000000 --- a/gnu/packages/patches/unison-fix-ocaml-4.08.patch +++ /dev/null @@ -1,81 +0,0 @@ -This patch is taken from the opam repository: -https://github.com/ocaml/opam-repository/blob/master/packages/unison/unison.2.51.2/files/ocaml48.patch - -It fixes compatibility with changes introduced in OCaml 4.08. - -diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml -index 7cefa2e..378fc8b 100644 ---- a/src/Makefile.OCaml -+++ b/src/Makefile.OCaml -@@ -272,7 +272,7 @@ endif - - # Gtk GUI - ifeq ($(UISTYLE), gtk) -- CAMLFLAGS+=-I +lablgtk -+ CAMLFLAGS+=-I $(LABLGTKLIB) - OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo - OCAMLLIBS+=lablgtk.cma - endif -@@ -282,7 +282,7 @@ OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) - - ifeq ($(UISTYLE), gtk2) - ifndef OCAMLFIND -- CAMLFLAGS+=-I +lablgtk2 -+ CAMLFLAGS+=-I $(LABLGTK2LIB) - else - CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk2 ) - endif -diff --git a/src/files.ml b/src/files.ml -index 5ff1881..1d1fbcc 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -734,7 +734,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 2c619bb..2412c18 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -661,8 +661,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index 453027d..c2288b8 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index fbc5d8f..4e82cc2 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -94,7 +94,7 @@ let icon = - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = diff --git a/gnu/packages/patches/yggdrasil-extra-config.patch b/gnu/packages/patches/yggdrasil-extra-config.patch index 7934e2b50f..44c58a8fbd 100644 --- a/gnu/packages/patches/yggdrasil-extra-config.patch +++ b/gnu/packages/patches/yggdrasil-extra-config.patch @@ -1,108 +1,62 @@ -From 779f980451d20079b34812f7006f2d7230738ad0 Mon Sep 17 00:00:00 2001 -From: csepp <raingloom@riseup.net> -Date: Wed, 3 Nov 2021 21:14:54 +0100 +From 5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d Mon Sep 17 00:00:00 2001 +Message-ID: <5aeabc1a8a8c5ecea3f5d0b7bcfa0aa0767ac92d.1699726745.git.avityazev@posteo.org> +From: Aleksandr Vityazev <avityazev@posteo.org> +Date: Sat, 11 Nov 2023 19:50:46 +0300 Subject: [PATCH] add extra config file option to yggdrasil command This is useful in Guix and Nix, because one config file can come from the world-readable store and another can be placed directly into /etc with much stricter permissions. --- - cmd/yggdrasil/main.go | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) + cmd/yggdrasil/main.go | 12 ++++++++++++ + src/config/config.go | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go -index 58b8230..b9df98a 100644 +index a225755..3f53dda 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go -@@ -43,11 +43,12 @@ type node struct { - admin *admin.AdminSocket - } - --func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf bool) *config.NodeConfig { -+func readConfig(log *log.Logger, useconf bool, useconffile string, extraconffile string, normaliseconf bool) *config.NodeConfig { - // Use a configuration file. If -useconf, the configuration will be read - // from stdin. If -useconffile, the configuration will be read from the - // filesystem. - var conf []byte -+ var extraconf []byte - var err error - if useconffile != "" { - // Read the file from the filesystem -@@ -59,6 +60,21 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - if err != nil { - panic(err) - } -+ if extraconffile != "" { -+ extraconf, err = os.ReadFile(extraconffile); -+ } -+ if err != nil { -+ panic(err) -+ } -+ // Generate a new configuration - this gives us a set of sane defaults - -+ // then parse the configuration we loaded above on top of it. The effect -+ // of this is that any configuration item that is missing from the provided -+ // configuration will use a sane default. -+ cfg := defaults.GenerateConfig() -+ var confs [2][]byte -+ confs[0]=conf -+ confs[1]=extraconf -+ for _, conf := range confs { if len(conf)>0 { - // If there's a byte order mark - which Windows 10 is now incredibly fond of - // throwing everywhere when it's converting things into UTF-16 for the hell - // of it - remove it and decode back down into UTF-8. This is necessary -@@ -72,11 +88,6 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - panic(err) - } - } -- // Generate a new configuration - this gives us a set of sane defaults - -- // then parse the configuration we loaded above on top of it. The effect -- // of this is that any configuration item that is missing from the provided -- // configuration will use a sane default. -- cfg := defaults.GenerateConfig() - var dat map[string]interface{} - if err := hjson.Unmarshal(conf, &dat); err != nil { - panic(err) -@@ -136,6 +147,7 @@ func readConfig(log *log.Logger, useconf bool, useconffile string, normaliseconf - if err = mapstructure.Decode(dat, &cfg); err != nil { - panic(err) - } -+ }} - return cfg - } - -@@ -192,6 +204,7 @@ type yggArgs struct { - getaddr bool - getsnet bool - useconffile string -+ extraconffile string - logto string - loglevel string - } -@@ -200,6 +213,7 @@ func getArgs() yggArgs { +@@ -42,6 +42,7 @@ func main() { genconf := flag.Bool("genconf", false, "print a new config to stdout") useconf := flag.Bool("useconf", false, "read HJSON/JSON config from stdin") useconffile := flag.String("useconffile", "", "read HJSON/JSON config from specified file path") + extraconffile := flag.String("extraconffile", "", "extra (usually private) HJSON/JSON config from specified file path") normaliseconf := flag.Bool("normaliseconf", false, "use in combination with either -useconf or -useconffile, outputs your configuration normalised") + exportkey := flag.Bool("exportkey", false, "use in combination with either -useconf or -useconffile, outputs your private key in PEM format") confjson := flag.Bool("json", false, "print configuration from -genconf or -normaliseconf as JSON instead of HJSON") - autoconf := flag.Bool("autoconf", false, "automatic mode (dynamic IP, peer with IPv6 neighbors)") -@@ -213,6 +227,7 @@ func getArgs() yggArgs { - genconf: *genconf, - useconf: *useconf, - useconffile: *useconffile, -+ extraconffile: *extraconffile, - normaliseconf: *normaliseconf, - confjson: *confjson, - autoconf: *autoconf, -@@ -265,7 +280,7 @@ func run(args yggArgs, ctx context.Context, done chan struct{}) { - cfg = defaults.GenerateConfig() - case args.useconffile != "" || args.useconf: - // Read the configuration from either stdin or from the filesystem -- cfg = readConfig(logger, args.useconf, args.useconffile, args.normaliseconf) -+ cfg = readConfig(logger, args.useconf, args.useconffile, args.extraconffile, args.normaliseconf) - // If the -normaliseconf option was specified then remarshal the above - // configuration and print it back to stdout. This lets the user update - // their configuration file with newly mapped names (like above) or to +@@ -137,6 +138,17 @@ func main() { + return + } + ++ if *extraconffile !="" { ++ f, err := os.Open(*extraconffile) ++ if err != nil { ++ panic(err) ++ } ++ if _, err := cfg.ReadFrom(f); err != nil { ++ panic(err) ++ } ++ _ = f.Close() ++ } ++ + privateKey := ed25519.PrivateKey(cfg.PrivateKey) + publicKey := privateKey.Public().(ed25519.PublicKey) + +diff --git a/src/config/config.go b/src/config/config.go +index e899a35..76b9ec8 100644 +--- a/src/config/config.go ++++ b/src/config/config.go +@@ -112,7 +112,7 @@ func (cfg *NodeConfig) ReadFrom(r io.Reader) (int64, error) { + // then parse the configuration we loaded above on top of it. The effect + // of this is that any configuration item that is missing from the provided + // configuration will use a sane default. +- *cfg = *GenerateConfig() ++ // *cfg = *GenerateConfig() + if err := cfg.UnmarshalHJSON(conf); err != nil { + return n, err + } + +base-commit: b759683b76985665b5218346abab35f08d9f4d38 -- -2.33.1 +2.41.0 diff --git a/gnu/packages/patches/zig-use-baseline-cpu-by-default.patch b/gnu/packages/patches/zig-use-baseline-cpu-by-default.patch new file mode 100644 index 0000000000..be78d9c6c7 --- /dev/null +++ b/gnu/packages/patches/zig-use-baseline-cpu-by-default.patch @@ -0,0 +1,36 @@ +From 1dc188129950031243c5a0c80ec2562fab8ec549 Mon Sep 17 00:00:00 2001 +From: Ekaitz Zarraga <ekaitz@elenq.tech> +Date: Sat, 18 Nov 2023 15:04:16 +0100 +Subject: [PATCH] Use `baseline` cpu by default. + +This helps Guix tune the package later. Tunning will only add +`-Dcpu=whatever` which should override the standard behaviour. + +Zig by default uses `native`, which interferes with our build process. +In our previous zig-build-system we chose to add `-Dcpu=baseline` flag +in each `zig build` execution, but that doesn't allow us to tune the +package later. Tunning is only designed to add extra flags in the +command line call, and we already had one set for the baseline case. +With this patch we set the standard behavior to `baseline` so we don't +need to add the `-Dcpu=baseline` flag in the zig-build-system and we can +tune with no issues. +--- + lib/std/zig/CrossTarget.zig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/std/zig/CrossTarget.zig b/lib/std/zig/CrossTarget.zig +index 6c59a4a3a..f5ec065fe 100644 +--- a/lib/std/zig/CrossTarget.zig ++++ b/lib/std/zig/CrossTarget.zig +@@ -12,7 +12,7 @@ const mem = std.mem; + /// `null` means native. + cpu_arch: ?Target.Cpu.Arch = null, + +-cpu_model: CpuModel = CpuModel.determined_by_cpu_arch, ++cpu_model: CpuModel = CpuModel.baseline, + + /// Sparse set of CPU features to add to the set from `cpu_model`. + cpu_features_add: Target.Cpu.Feature.Set = Target.Cpu.Feature.Set.empty, +-- +2.41.0 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ee525c896d..d9de697438 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au> ;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -117,7 +117,7 @@ (define-public capypdf (package (name "capypdf") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -125,7 +125,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1mb3i0jq04gg5cm1l07mn9kal5s748miql97j6fpaf1x1j2lcrsx")))) + (base32 "15l8zwc83l65xh739s0qddlv5qv537wnx74s8fcwlm1r8y7kf2x4")))) (build-system meson-build-system) (arguments (list #:meson meson/newer @@ -824,14 +824,14 @@ and based on PDF specification 1.7.") (define-public mupdf (package (name "mupdf") - (version "1.23.3") + (version "1.23.7") (source (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" - "mupdf-" version "-source.tar.gz")) + "mupdf-" version "-source.tar.lz")) (sha256 - (base32 "1b8ajj5xmi2p9c92l8fd46amfshmxdw6zcg1hqajg8y0kd0ady8y")) + (base32 "0d0ig1amxyy50jvfbn6rz49zd0980p6syqzcx5v7wg0c3pl2iwwm")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -1003,7 +1003,7 @@ using a stylus.") (define-public xournalpp (package (name "xournalpp") - (version "1.1.3") + (version "1.2.2") (source (origin (method git-fetch) @@ -1012,11 +1012,11 @@ using a stylus.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17qq3clfmiyrcah89h8c5r6pc58xcskm5z1czbasv67bfq7chzhy")))) + (base32 "1svmdj43z1shm3wnkrdrq1h6rba843mp4x4d8jmxsx7kwiiz9l78")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DENABLE_CPPUNIT=ON") ;enable tests + #:configure-flags #~(list "-DENABLE_GTEST=ON") #:imported-modules `((guix build glib-or-gtk-build-system) ,@%cmake-build-system-modules) #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -1033,10 +1033,13 @@ using a stylus.") (string-append "\"" (search-input-file inputs "/bin/addr2line") " "))))) + (add-after 'build 'prepare-tests + (lambda _ + (invoke "cmake" "--build" "." "--target" "test-units"))) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cppunit gettext-minimal help2man pkg-config)) + (list cppunit gettext-minimal googletest help2man pkg-config)) (inputs (list alsa-lib gtk+ diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index cb6b4e7047..8419ac033b 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; ;;; This file is part of GNU Guix. @@ -62,7 +62,7 @@ (define-public php (package (name "php") - (version "8.2.2") + (version "8.2.13") (home-page "https://www.php.net/") (source (origin (method url-fetch) @@ -70,9 +70,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "0czflx9ikxymjfgnzaifjx9kc30ww2x4063075hcifjjwqwami5x")) - (patches - (search-patches "php-fix-streams-copy-length.patch")) + "0js5bm8r3kngsgmxhyr681vrpl4gib3318k8428pigqp06hvna96")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -177,98 +175,55 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) - ,@(if (target-arm32?) - ;; Drop tests known to fail on armhf. - '((for-each delete-file - (list - "ext/calendar/tests/unixtojd_error1.phpt" - "ext/opcache/tests/preload_006.phpt" - "ext/opcache/tests/preload_011.phpt" - ;; arm can be a lot slower, so a time-related test fails - "ext/fileinfo/tests/cve-2014-3538-nojit.phpt" - "ext/pcntl/tests/pcntl_unshare_01.phpt" - "ext/pcre/tests/bug76514.phpt" - "ext/pcre/tests/preg_match_error3.phpt" - "ext/pcre/tests/cache_limit.phpt" - "ext/sockets/tests/socket_getopt.phpt" - "ext/sockets/tests/socket_sendrecvmsg_error.phpt" - "ext/standard/tests/general_functions/var_export-locale.phpt" - "ext/standard/tests/general_functions/var_export_basic1.phpt" - "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt" - "ext/intl/tests/timezone_getOffset_error.phpt" - "sapi/cli/tests/cli_process_title_unix.phpt" - "sapi/cli/tests/upload_2G.phpt" - "Zend/tests/concat_003.phpt"))) - '()) - - ,@(if (target-x86-32?) - ;; Drop tests known to fail on i686. - '((for-each delete-file - (list - "ext/dba/tests/dba_gdbm.phpt"))) - '()) - - ,@(if (target-ppc64le?) - ;; Drop tests known to fail on powerpc64le. - '((for-each delete-file - (list - ;; phpdbg watchpoints don't work. - ;; Bug tracked upstream at: - ;; https://bugs.php.net/bug.php?id=81408 - "sapi/phpdbg/tests/watch_001.phpt" - "sapi/phpdbg/tests/watch_003.phpt" - "sapi/phpdbg/tests/watch_004.phpt" - "sapi/phpdbg/tests/watch_005.phpt" - "sapi/phpdbg/tests/watch_006.phpt"))) - '()) - - ,@(if (target-riscv64?) - ;; Drop tests known to fail on riscv64. - '((for-each delete-file - (list "sapi/cli/tests/upload_2G.phpt"))) - '()) + ;; Drop tests known to fail on different architectures: + (for-each delete-file + ,(cond + ((target-arm32?) + `(list "ext/calendar/tests/unixtojd_error1.phpt" + "ext/opcache/tests/preload_006.phpt" + "ext/opcache/tests/preload_011.phpt" + ;; arm can be a lot slower, so a time-related test fails + "ext/fileinfo/tests/cve-2014-3538-nojit.phpt" + "ext/pcntl/tests/pcntl_unshare_01.phpt" + "ext/pcre/tests/bug76514.phpt" + "ext/pcre/tests/preg_match_error3.phpt" + "ext/pcre/tests/cache_limit.phpt" + "ext/sockets/tests/socket_getopt.phpt" + "ext/sockets/tests/socket_sendrecvmsg_error.phpt" + "ext/standard/tests/general_functions/var_export-locale.phpt" + "ext/standard/tests/general_functions/var_export_basic1.phpt" + "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt" + "ext/intl/tests/timezone_getOffset_error.phpt" + "sapi/cli/tests/cli_process_title_unix.phpt" + "Zend/tests/concat_003.phpt")) + ((target-x86-32?) + `(list "ext/dba/tests/dba_gdbm.phpt")) + ((target-ppc32?) + `(list "sapi/phpdbg/tests/watch_001.phpt" + "sapi/phpdbg/tests/watch_003.phpt" + "sapi/phpdbg/tests/watch_004.phpt")) + ((target-ppc64le?) + `(list + ;; phpdbg watchpoints don't work. + ;; Bug tracked upstream at: + ;; https://bugs.php.net/bug.php?id=81408 + "sapi/phpdbg/tests/watch_001.phpt" + "sapi/phpdbg/tests/watch_003.phpt" + "sapi/phpdbg/tests/watch_004.phpt" + "sapi/phpdbg/tests/watch_005.phpt" + "sapi/phpdbg/tests/watch_006.phpt")) + (else `'()))) ;; Drop tests that are known to fail. (for-each delete-file '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. "ext/posix/tests/posix_getgrnam_basic.phpt" ; Requires /etc/group. "ext/sockets/tests/bug63000.phpt" ; Fails to detect OS. - "ext/sockets/tests/socket_shutdown.phpt" ; Requires DNS. - "ext/sockets/tests/socket_send.phpt" ; Likewise. - "ext/sockets/tests/mcast_ipv4_recv.phpt" ; Requires multicast. - ;; These needs /etc/services. - "ext/standard/tests/general_functions/getservbyname_basic.phpt" - "ext/standard/tests/general_functions/getservbyport_basic.phpt" - "ext/standard/tests/general_functions/getservbyport_variation1.phpt" - ;; And /etc/protocols. - "ext/standard/tests/network/getprotobyname_basic.phpt" - "ext/standard/tests/network/getprotobynumber_basic.phpt" - ;; And exotic locales. + ;; These need exotic locales. "ext/standard/tests/strings/setlocale_basic1.phpt" "ext/standard/tests/strings/setlocale_basic2.phpt" "ext/standard/tests/strings/setlocale_basic3.phpt" "ext/standard/tests/strings/setlocale_variation1.phpt" - ;; This failing test is skipped on PHP's Travis CI as it is - ;; supposedly inaccurate. - "ext/standard/tests/file/disk_free_space_basic.phpt" - ;; The following test erroneously expect the link - ;; count of a sub-directory to increase compared to - ;; its parent. - "ext/standard/tests/file/lstat_stat_variation8.phpt" - ;; This tests whether microseconds ‘differ enough’ and - ;; fails inconsistently on ‘fast’ machines. - "ext/date/tests/bug73837.phpt" - - ;; XXX: These gd tests fails. Likely because our version - ;; is different from the (patched) bundled one. - ;; Here, gd quits immediately after "fatal libpng error"; while the - ;; test expects it to additionally return a "setjmp" error and warning. - "ext/gd/tests/bug39780_extern.phpt" - "ext/gd/tests/libgd00086_extern.phpt" - ;; Extra newline in gd-png output. - "ext/gd/tests/bug45799.phpt" - ;; Test expects generic "gd warning" but gets the actual function name. - "ext/gd/tests/createfromwbmp2_extern.phpt" ;; This bug should have been fixed in gd 2.2.2. ;; Is it a regression? "ext/gd/tests/bug65148.phpt" @@ -291,47 +246,15 @@ "ext/gd/tests/xpm2gd.phpt" "ext/gd/tests/xpm2jpg.phpt" "ext/gd/tests/xpm2png.phpt" - ;; Whitespace difference, probably caused by a very - ;; long store path - "ext/gd/tests/bug77479.phpt" - ;; Expected invalid XBM but got EOF before image was - ;; complete. It's a warning in both cases and test - ;; result is the same. - "ext/gd/tests/bug77973.phpt" - ;; Test expects uninitialized value to be false, but - ;; instead gets "resource(5) of type (gd)". - "ext/gd/tests/bug79067.phpt" - ;; The following test fails with "The image size - ;; differs: expected 114x115, got 117x117". - "ext/gd/tests/bug79068.phpt" ;; AVIF support disabled "ext/gd/tests/avif_decode_encode.phpt" ;; Typo in expected outputs "ext/gd/tests/bug72339.phpt" - "ext/gd/tests/bug77272.phpt" - "ext/gd/tests/bug66356.phpt" ;; AVIF support disabled "ext/gd/tests/imagecreatefromstring_avif.phpt" - ;; XXX: These iconv tests have the expected outcome, - ;; but with different error messages. - ;; Expects "illegal character", instead gets "unknown error (84)". - "ext/iconv/tests/bug52211.phpt" - "ext/iconv/tests/bug60494.phpt" - ;; Expects "wrong charset", gets unknown error (22). - "ext/iconv/tests/iconv_strlen_error2.phpt" - "ext/iconv/tests/iconv_substr_error2.phpt" - ;; Expects conversion error, gets "error condition Termsig=11". - "ext/iconv/tests/iconv_strpos_error2.phpt" - "ext/iconv/tests/iconv_strrpos_error2.phpt" - ;; Expects "invalid multibyte sequence" but got - ;; "unknown error". - "ext/iconv/tests/bug76249.phpt" - ;; XXX: These test failures appear legitimate, needs investigation. ;; open_basedir() restriction failure. - "ext/curl/tests/bug61948-unix.phpt" - ;; Same error reason but error code slightly different "ext/curl/tests/curl_setopt_ssl.phpt" ;; Fail because there is no "root" in the build container's @@ -340,11 +263,6 @@ "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt" "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt" - ;; Wrong error name - "ext/dba/tests/dba_gdbm_creation_matrix.phpt" - ;; Expects a false boolean, gets empty array from glob(). - "ext/standard/tests/file/bug41655_1.phpt" - "ext/standard/tests/file/glob_variation5.phpt" ;; The test expects an Array, but instead get the contents(?). "ext/gd/tests/bug43073.phpt" ;; imagettftext() returns wrong coordinates. @@ -357,26 +275,12 @@ "ext/gd/tests/bug53504.phpt" ;; Wrong image size after scaling an image. "ext/gd/tests/bug73272.phpt" - ;; Expects iconv to detect illegal characters, instead gets - ;; "unknown error (84)" and heap corruption(!). - "ext/iconv/tests/bug48147.phpt" - ;; Expects illegal character ".", gets "=?utf-8?Q?." - "ext/iconv/tests/bug51250.phpt" - ;; iconv throws "buffer length exceeded" on some string checks. - "ext/iconv/tests/iconv_mime_encode.phpt" - ;; file_get_contents(): iconv stream filter - ;; ("ISO-8859-1"=>"UTF-8") unknown error. - "ext/standard/tests/file/bug43008.phpt" - ;; Table data not created in sqlite(?). - "ext/pdo_sqlite/tests/bug_42589.phpt" - ;; Expects an Array with 3 preg_matches; gets 0. - "ext/pcre/tests/bug79846.phpt" - ;; Expects an empty Array; gets one with " " in it. - "ext/pcre/tests/bug80118.phpt" - ;; Renicing a process fails in the build environment. - "ext/standard/tests/general_functions/proc_nice_basic.phpt" - ;; Can fail on fast machines? - "Zend/tests/bug74093.phpt")) + ;; PCRE with/without JIT gives different result + "ext/pcre/tests/gh11374.phpt" + "ext/pcre/tests/gh11956.phpt" + + ;; This test fails on most architectures. + "sapi/cli/tests/upload_2G.phpt")) ;; Accomodate two extra openssl errors flanking the expected one: ;; random number generator:RAND_{load,write}_file:Cannot open file @@ -413,7 +317,7 @@ ("libzip" ,libzip) ("oniguruma" ,oniguruma) ("openldap" ,openldap) - ("openssl" ,openssl-1.1) + ("openssl" ,openssl) ("pcre" ,pcre2) ("postgresql" ,postgresql) ("readline" ,readline) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index c1162679ff..c7b96883f6 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -95,10 +95,7 @@ (build-system meson-build-system) (arguments (list - #:imported-modules `(,@%meson-build-system-modules - (guix build syscalls)) #:modules '((guix build meson-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:configure-flags @@ -130,24 +127,23 @@ (replace 'check (lambda* (#:key tests? test-options #:allow-other-keys) (when tests? - ;; Run the test suite through tini to ensure signals are - ;; properly handled and zombie processes reaped. (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (apply execlp "tini" "--" - "meson" "--" "test" "-t" "0" "--print-errorlogs" + (apply execlp "meson" "meson" + "test" "-t" "0" "--print-errorlogs" test-options)) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`meson test' exited with status" - status)))))))))))) + (meson-pid + ;; Reap child processes; otherwise, python-dbusmock would + ;; waste time polling for the dbus processes it spawns to + ;; be reaped, in vain. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid meson-pid) + (unless (zero? status) + (error "`meson test' exited with status" + status)) + (loop))))))))))))) (inputs (list duktape expat elogind linux-pam nspr)) (propagated-inputs @@ -161,8 +157,7 @@ perl pkg-config python - python-dbusmock - tini)) + python-dbusmock)) (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index e6d7caa1ef..884da3c99f 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -221,6 +221,60 @@ satisfiability checking (SAT).") (description "Clingo computes answer sets for a given logic program.") (license license:expat))) +(define-public clingo-dl + (package + (name "clingo-dl") + (version "1.4.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/clingo-dl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dncwj63vdm6958vb7355d5j9mdr7hm037j4z82yz6l77jg3sipw")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f ; no tests + #:configure-flags #~`("-DPYCLINGODL_ENABLE=off"))) + (inputs (list clingo)) + (home-page "https://github.com/potassco/clingo-dl") + (synopsis "Solver for answer set programs modulo difference constraints") + (description "Clingo-DL is an extension to Clingo that models constraints +over difference logic.") + (license license:expat))) + +(define-public plasp + (package + (name "plasp") + (version "3.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/plasp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "123v1bjzh7yjwgcc5k55rkfz0lfl8ish5p3z8x3pn8k1svd50xal")) + (patches (search-patches + "plasp-fix-normalization.patch" + "plasp-include-iostream.patch")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ; No ‘test’ target + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively "bin" + (string-append (assoc-ref outputs "out") + "/bin"))))))) + (inputs (list cxxopts mapbox-variant)) + (home-page "https://potassco.org/") + (synopsis "ASP planning tools for PDDL") + (description "@command{plasp} is a tool collection for planning in +answer set programming. It supports a subset of PDDL 3.1 and SAS 3.") + (license license:expat))) + (define-public emacs-pasp-mode (let ((commit "59385eb0e8ebcfc8c11dd811fb145d4b0fa3cc92") (revision "1")) diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 8cd805799e..c157eabce0 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -156,8 +157,11 @@ data in motion, or as a file format for data at rest.") (install-file file slib) (delete-file file)) (find-files lib "\\.a$")))))))) - (native-inputs (list googletest)) - (inputs (list zlib)) + (native-inputs (append (if (%current-target-system) + (list this-package) + '()) + (list googletest))) + (inputs (list zlib googletest)) (home-page "https://github.com/protocolbuffers/protobuf") (synopsis "Data encoding for remote procedure calls (RPCs)") (description diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 0ccae07093..ea74472270 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> @@ -59,6 +59,24 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public python-assertpy + (package + (name "python-assertpy") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "assertpy" version)) + (sha256 + (base32 "0cs8xya465wvb9dw0kdl7cvkxwrslhbma66y44r1mmsajcll7imc")))) + (build-system pyproject-build-system) + (home-page "https://github.com/assertpy/assertpy") + (synopsis "Simple assertion library for unit testing") + (description + "This package provides a simple assertion library for unit testing in +Python with a fluent API.") + (license license:bsd-3))) + (define-public python-tappy (package (name "python-tappy") @@ -510,13 +528,13 @@ Astropy project, but is optimized for use with astropy-related projects.") (define-public python-pytest-astropy (package (name "python-pytest-astropy") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-astropy" version)) (sha256 - (base32 "04g2rh261s3s6ym8mwi4iv2a6anbgwvwzcvkyilfck6yxrncdqw5")))) + (base32 "1d9rcxnc57rjp96xag1gq725pwl11b3k5hdaz7c3w5lixncsmbjf")))) (build-system python-build-system) (arguments (list #:tests? #f)) ; there are no tests (native-inputs @@ -568,13 +586,13 @@ are too large to conveniently hard-code them in the tests.") (define-public python-pytest-doctestplus (package (name "python-pytest-doctestplus") - (version "0.12.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-doctestplus" version)) (sha256 - (base32 "10ciqylgziihxwxryxvxgmkqgws51pqcarn0gbh1d4cxx55rx5vs")))) + (base32 "17ylfnrcvvp6sd13bfj40jl40paqmjsbywysszb3xqgdr86l8l7n")))) (build-system pyproject-build-system) (arguments (list #:test-flags @@ -735,13 +753,13 @@ were inadvertently left open at the end of a unit test.") (define-public python-pytest-remotedata (package (name "python-pytest-remotedata") - (version "0.4.0") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "pytest-remotedata" version)) (sha256 - (base32 "1j5106j331cfdyfcwzrbs3yby84mq1b0kddfysq12z2dwdcca8dy")))) + (base32 "0ndvnj9zghfj17haphrygiri9iy38wb8lwq1xdkfvlfd73v8ph05")))) (build-system pyproject-build-system) (arguments (list diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0dbbb15448..b787d6207f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -486,15 +486,16 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "40.0.2") + (version "41.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "16hcprw919f2rl3jipsy2996bnsz170inway3lishqi30xwqf6x8")))) - (build-system python-build-system) + "17m1azxfc3w0390jp9mkx1v0k3xfv4v1lrgch4hvbbm77s0z42j4")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; No tests included. (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") (description @@ -505,14 +506,14 @@ is used by the Requests library to verify HTTPS requests.") (define-public python-cryptography (package (name "python-cryptography") - (version "40.0.2") + (version "41.0.4") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "16awbsm13vdksm98dybwvmpy2y1l636bq7g0s93scksrp0r0sg63")))) + "06pm952pr6f31pzwh5fb68zryqyss0hg9cbggxm15z15844w7svz")))) (build-system pyproject-build-system) (arguments (list @@ -567,6 +568,9 @@ ciphers, message digests and key derivation functions.") (guix build utils) (srfi srfi-1) (ice-9 match)) + #:install-source? #f + ;; As seen in noxfile.py + #:cargo-test-flags ''("--release" "--no-default-features") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'chdir @@ -584,26 +588,21 @@ ciphers, message digests and key derivation functions.") (apply (assoc-ref %standard-phases 'configure) (append args (list #:inputs (alist-delete "source" inputs)))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; As seen in tox.ini - (invoke "cargo" "test" "--no-default-features")))) (add-after 'install 'install-shared-library (lambda _ (install-file "target/release/libcryptography_rust.so" (string-append #$output "/lib"))))) #:cargo-inputs - `(("rust-asn1-0.13" ,rust-asn1-0.13) + `(("rust-asn1" ,rust-asn1-0.15) ("rust-cc" ,rust-cc-1) - ("rust-chrono-0.4" ,rust-chrono-0.4) - ("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1) - ("rust-once-cell-1" ,rust-once-cell-1) - ("rust-openssl-0.10" ,rust-openssl-0.10) - ("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9) - ("rust-ouroboros-0.15" ,rust-ouroboros-0.15) - ("rust-pem-1" ,rust-pem-1) - ("rust-pyo3-0.15" ,rust-pyo3-0.15)))) + ("rust-foreign-types" ,rust-foreign-types-0.3) + ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-ouroboros" ,rust-ouroboros-0.15) + ("rust-pem" ,rust-pem-1) + ("rust-pyo3" ,rust-pyo3-0.18)))) (native-inputs (list pkg-config python python-cffi)) ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs ;; doesn't honor propagated-inputs. @@ -614,14 +613,14 @@ ciphers, message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "23.1.1") + (version "23.2.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "1dxhip610zw1j2bz35g1w1h7vh374g0bnzn4nsqj65n6pswrh544")))) + "1b4bkcpzhmablf592g21rq3l8apbhklp6wcwlvgfflm4algr6vr7")))) (build-system python-build-system) (arguments (list @@ -1610,13 +1609,13 @@ signatures.") (define-public python-pgpy (package (name "python-pgpy") - (version "0.5.3") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "PGPy" version)) (sha256 - (base32 "11rrq15gmn6qbahli7czflfcngjl7zyybjlvk732my6axnf2d754")))) + (base32 "10w3h934fi1ijx72ppn67a50yhkf8n1db6xx02gk2fjc7wsjx717")))) (build-system python-build-system) (arguments `(#:phases @@ -1628,8 +1627,7 @@ signatures.") (native-inputs (list python-pytest python-wheel)) - (propagated-inputs (list python-cryptography python-pyasn1 - python-singledispatch python-six)) + (propagated-inputs (list python-cryptography python-pyasn1)) (home-page "https://github.com/SecurityInnovation/PGPy") (synopsis "Python implementation of OpenPGP") (description diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 36863a781d..2e238dc198 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2021 Roel Janssen <roel@gnu.org> ;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021, 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2022 Malte Frank Gerdes <malte.f.gerdes@gmail.com> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2022 jgart <jgart@dismail.de> +;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -349,16 +350,48 @@ implements several methods for sequential model-based optimization. @code{skopt} aims to be accessible and easy to use in many contexts.") (license license:bsd-3))) +(define-public python-tdda + (package + (name "python-tdda") + (version "2.0.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tdda" version)) + (sha256 + (base32 "1xs91s8b7cshjcqw88qsrjh10xly799k5rf2ycawqfz2mw8sy3br")))) + (build-system pyproject-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("pandas>=1.5.2") + "pandas")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "tdda" "test"))))))) + (native-inputs (list python-numpy python-pandas)) + (home-page "https://www.stochasticsolutions.com") + (synopsis "Test-driven data analysis library for Python") + (description + "The TDDA Python module provides command-line and Python API support +for the overall process of data analysis, through tools that peform +reference testing, constraint discovery for data, automatic inference +of regular expressions from text data and automatic test generation.") + (license license:expat))) ; MIT License + (define-public python-trimesh (package (name "python-trimesh") - (version "3.22.1") + (version "3.23.5") (source (origin (method url-fetch) (uri (pypi-uri "trimesh" version)) (sha256 - (base32 "1ck4dkhz1x6sznd83c1hlvsv2m6d22fr82na0947j5jf47a4c1gl")))) + (base32 "08967axlnmfv98n05dhrkynyrmcc814hl8184gzzmcy4rjg6dzdx")))) (build-system python-build-system) (propagated-inputs (list python-numpy)) @@ -387,6 +420,31 @@ manipulation and analysis, in the style of the Polygon object in the Shapely library.") (license license:expat))) +(define-public python-meshzoo + (package + (name "python-meshzoo") + (version "0.9.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/diego-hayashi/meshzoo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "107byfppbq16fqyp2hw7ydcvvahspzq0hzvlvzqg2zxi1aigbr68")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-numpy)) + (native-inputs (list python-flit-core python-matplotlib python-pytest)) + (home-page "https://github.com/diego-hayashi/meshzoo") + (synopsis "Mesh generator for simple geometries") + (description + "@code{meshzoo} is a mesh generator for finite element or finite +volume computations for simple domains like regular polygons, disks, +spheres, cubes, etc.") + (license license:gpl3+))) + (define-public python-tspex (package (name "python-tspex") @@ -810,7 +868,7 @@ functions and around einops with an API and features adapted to xarray.") (define-public python-pytensor (package (name "python-pytensor") - (version "2.14.2") + (version "2.18.1") (source (origin (method git-fetch) (uri (git-reference @@ -819,7 +877,7 @@ functions and around einops with an API and features adapted to xarray.") (file-name (git-file-name name version)) (sha256 (base32 - "1428l1v7yrnls8875xjx1svn48cmz0q83sv7sg0xdqghkfnyi7xx")))) + "0qa0y13xfm6w7ry7gp0lv84c8blyg34a9ns7ynwqyhf9majq08s5")))) (build-system pyproject-build-system) (arguments (list @@ -1321,7 +1379,8 @@ Mathematics (GLM) library to Python.") "test_tls_temporary_credentials_functional" "test_variable_in_task" "test_worker_preload_text" - "test_worker_uses_same_host_as_nanny") + "test_worker_uses_same_host_as_nanny" + "test_nanny_timeout") ; access to 127.0.0.1 " and not ") ;; These fail because it doesn't find dask[distributed] @@ -1344,7 +1403,8 @@ Mathematics (GLM) library to Python.") ;; These tests are rather flaky " and not test_quiet_quit_when_cluster_leaves" - " and not multiple_clients_restart")) + " and not multiple_clients_restart" + " and not test_steal_twice")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'versioneer @@ -1626,7 +1686,7 @@ and aims to provide a similar API and functionality in Python.") (define-public python-pyvista (package (name "python-pyvista") - (version "0.39.1") + (version "0.42.3") (source ;; The PyPI tarball does not contain the tests. ;; (However, we don't yet actually run the tests.) @@ -1637,7 +1697,7 @@ and aims to provide a similar API and functionality in Python.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00nij00z5r35f6dx7mwndsrpmiw43adjk8x35mk308c369ylbv9p")))) + (base32 "1qxq0y0hc72hb60w3qq48fma8l6ffz7bdm75ymn1020bvfqrm1s4")))) (build-system python-build-system) (propagated-inputs (list python-imageio @@ -1656,7 +1716,7 @@ and aims to provide a similar API and functionality in Python.") (delete 'check) ;; Disable the sanity check, which fails with the following error: ;; - ;; ...checking requirements: ERROR: pyvista==0.39.1 DistributionNotFound(Requirement.parse('vtk'), {'pyvista'}) + ;; ...checking requirements: ERROR: pyvista==0.42.3 DistributionNotFound(Requirement.parse('vtk'), {'pyvista'}) (delete 'sanity-check)))) (home-page "https://docs.pyvista.org/") (synopsis "3D plotting and mesh analysis through VTK") @@ -1812,7 +1872,11 @@ for parameterized model creation and handling. Its features include: (uri (pypi-uri "GPy" version)) (sha256 (base32 - "1yx65ajrmqp02ykclhlb0n8s3bx5r0xj075swwwigiqaippr7dx2")))) + "1yx65ajrmqp02ykclhlb0n8s3bx5r0xj075swwwigiqaippr7dx2")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "GPy/models/state_space_main.py" + (("collections\\.Iterable") "collections.abc.Iterable")))))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -1831,6 +1895,31 @@ Python, from the Sheffield machine learning group. GPy implements a range of machine learning algorithms based on GPs.") (license license:bsd-3))) +(define-public python-pyfma + (package + (name "python-pyfma") + (version "0.1.6") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/nschloe/pyfma") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12i68jj9n1qj9phjnj6f0kmfhlsd3fqjlk9p6d4gs008azw5m8yn")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-numpy)) + (native-inputs (list pybind11 python-pytest)) + (home-page "https://github.com/nschloe/pyfma") + (synopsis "Fused multiply-add for Python") + (description "@code{pyfma} provides an implementation of fused +multiply-add which computes @code{(x*y) + z} with a single rounding. +This is useful for dot products, matrix multiplications, polynomial +evaluations (e.g., with Horner's rule), Newton's method for evaluating +functions, convolutions, artificial neural networks etc.") + (license license:expat))) + (define-public python-pydicom (package (name "python-pydicom") @@ -2028,6 +2117,33 @@ Out-of-Core DataFrames (similar to Pandas), to visualize and explore big tabular datasets. This package provides the core modules of Vaex.") (license license:expat))) +(define-public python-salib + (package + (name "python-salib") + (version "1.4.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SALib/SALib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18xfyzircsx2q2lmfc9lxb6xvkxicnc83qzghd7df1jsprr5ymch")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-matplotlib + python-multiprocess + python-numpy + python-pandas + python-scipy)) + (native-inputs (list python-hatchling python-pytest python-pytest-cov)) + (home-page "https://salib.readthedocs.io/en/latest/") + (synopsis "Tools for global sensitivity analysis") + (description "SALib provides tools for global sensitivity analysis. It +contains Sobol', Morris, FAST, DGSM, PAWN, HDMR, Moment Independent and +fractional factorial methods.") + (license license:expat))) + (define-public python-pylems (package (name "python-pylems") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b8170807fb..14932459ff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1330,7 +1330,12 @@ Encryption} (JOSE) Web Standards.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0701hziiiw67blafgpmjhzspmrss8mfvif7fw0rs8fikddwwc9g6")))) + (base32 "0701hziiiw67blafgpmjhzspmrss8mfvif7fw0rs8fikddwwc9g6")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "scss/types.py" + (("from collections import Iterable") + "from collections.abc import Iterable")))))) (build-system python-build-system) (arguments ;; XXX: error in test collection, possible incompatibility with Pytest 6. @@ -1923,13 +1928,13 @@ service.") (define-public python-openai (package (name "python-openai") - (version "0.27.8") + (version "0.28.1") (source (origin (method url-fetch) (uri (pypi-uri "openai" version)) (sha256 (base32 - "0dlmxnib71fih9xzmd3v41alwv4qb8qrxixsrrsf5vmigmf0k0r4")))) + "1j6wsavgrxzh6ls8hp45nllz8f5l65a6vzk0lvhlqnx6579xmqab")))) (build-system pyproject-build-system) (arguments (list @@ -4384,7 +4389,7 @@ applications.") (build-system python-build-system) (arguments '(#:tests? #f)) ;no tests (propagated-inputs - (list python-flask-restful)) + (list python-flask-restful python-six)) (home-page "https://github.com/rantav/flask-restful-swagger") (synopsis "Extract Swagger specs from Flask-Restful projects") (description "This package lets you extract Swagger API documentation @@ -5136,22 +5141,23 @@ Google search engine. Its module is called @code{googlesearch}.") (define-public python-google-api-client (package (name "python-google-api-client") - (version "1.12.8") + (version "2.102.0") (source (origin (method url-fetch) (uri (pypi-uri "google-api-python-client" version)) (sha256 (base32 - "1fq89wifa9ymby655is246w5d54ixybffj5vz7lwzhpf8926ifgk")))) + "07b9afz3g3lk976i974h6ikvl7wzwm0a0ws0iynxvmd4favgjvwh")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; tests require internet access (propagated-inputs - (list python-google-api-core-1 - python-google-auth-1 + (list python-google-api-core + python-google-auth python-google-auth-httplib2 python-httplib2 + python-pyparsing python-six python-uritemplate-3)) (home-page "https://github.com/google/google-api-python-client") @@ -5162,12 +5168,12 @@ Google search engine. Its module is called @code{googlesearch}.") (define-public python-google-auth-httplib2 (package (name "python-google-auth-httplib2") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (pypi-uri "google-auth-httplib2" version)) (sha256 - (base32 "1b1hrhah01hx6bj3rb83iybrdwqv0bbdy63py39srv1bcgykjz50")))) + (base32 "0agwwgw04nks7lzpm224fbvpnjfgzz67pkrfls77ipf6zmawajy6")))) (build-system python-build-system) (propagated-inputs (list python-google-auth python-httplib2 python-six)) @@ -5180,57 +5186,52 @@ Google search engine. Its module is called @code{googlesearch}.") for httplib2 transport.") (license license:asl2.0))) +(define-public python-google-auth-oauthlib + (package + (name "python-google-auth-oauthlib") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "google-auth-oauthlib" version)) + (sha256 + (base32 "1yvsjd1vh440nsh9vpnig23sq4k1ia749x5g1dwm7r4110xqrsl3")))) + (build-system python-build-system) + (propagated-inputs (list python-google-auth python-requests-oauthlib)) + (native-inputs (list python-flask)) + (home-page + "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib") + (synopsis "Google Authentication Library: oauthlib") + (description "This package provides a Google Authentication Library plugin +with oauthlib.") + (license license:asl2.0))) + (define-public whoogle-search (package (name "whoogle-search") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (pypi-uri "whoogle-search" version)) (sha256 (base32 - "1r6ymainwc3b8aar90b74mpnx3rsfscgzh0llwvsb03fbhiypw5g")))) + "09b9k97jflajvrs0npyz994rj8xkk400s98jw63b6vpsgw9q9nk4")))) (build-system pyproject-build-system) (arguments (list ;; The tests need network access #:tests? #f)) (propagated-inputs - (list python-attrs - python-beautifulsoup4 - python-cachelib - python-certifi - python-cffi + (list python-beautifulsoup4 python-brotli - python-chardet - python-click python-cryptography python-cssutils python-defusedxml python-flask - python-flask-session - python-idna - python-itsdangerous - python-jinja2 - python-markupsafe - python-more-itertools - python-packaging - python-pluggy - python-py - python-pycodestyle - python-pycparser - python-pyopenssl - python-pyparsing - python-pysocks - python-dateutil + python-dotenv python-requests - python-soupsieve python-stem - python-urllib3 - python-waitress - python-wcwidth - python-werkzeug - python-dotenv)) + python-waitress)) (home-page "https://github.com/benbusby/whoogle-search") (synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine") (description @@ -7548,42 +7549,6 @@ of the CRC32C hashing algorithm.") server-to-server authentication mechanisms to access Google APIs.") (license license:asl2.0))) -(define-public python-google-auth-1 - (package - (inherit python-google-auth) - (name "python-google-auth") - (version "1.35.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "google-auth" version)) - (sha256 - (base32 "13nqj6hikvbdmbs1vb78c88ym0pd03m09ch00biqw64c0blkn0xp")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) - (propagated-inputs - (list python-cachetools - python-pyasn1-modules - python-rsa - python-six - ;; For the extras - python-pyopenssl - python-pyu2f)) - (native-inputs - (list python-flask - python-freezegun - python-oauth2client - python-pytest - python-pytest-localserver - python-requests - python-responses - python-urllib3)))) - (define-public python-google-resumable-media (package (name "python-google-resumable-media") @@ -7683,52 +7648,6 @@ common protos in the @code{googleapis/api-common-protos} repository.") clients.") (license license:asl2.0))) -(define-public python-google-api-core-1 - (package - (inherit python-google-api-core) - (name "python-google-api-core") - (version "1.32.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "google-api-core" version)) - (sha256 - (base32 "0709va9sisll7axkv6ii2x5s0ls38rqp1jnvs6nkpmg7z163q70h")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (for-each - delete-file - '(;; The test suite can't find AsyncMock. - "tests/asyncio/test_page_iterator_async.py" - "tests/asyncio/test_retry_async.py" - ;; Skip the tests depending on grpc. - "tests/asyncio/test_operation_async.py" - "tests/asyncio/test_grpc_helpers_async.py" - "tests/asyncio/operations_v1/test_operations_async_client.py" - "tests/unit/test_bidi.py" - "tests/unit/test_exceptions.py" - "tests/unit/test_grpc_helpers.py" - "tests/unit/test_operation.py" - "tests/unit/operations_v1/test_operations_client.py")) - (delete-file-recursively "tests/asyncio/gapic") - (delete-file-recursively "tests/unit/gapic") - (invoke "pytest" "-k" "not test_constructor_defaults"))))))) - (propagated-inputs - (list python-google-auth-1 - python-googleapis-common-protos - python-packaging - python-protobuf - python-proto-plus - python-pytz - python-requests)) - (native-inputs - (list python-pytest - python-pytest-asyncio)))) - (define-public python-google-cloud-core (package (name "python-google-cloud-core") @@ -8161,13 +8080,13 @@ regular expressions.") (define-public python-scrapy (package (name "python-scrapy") - (version "2.10.1") + (version "2.11.0") (source (origin (method url-fetch) (uri (pypi-uri "Scrapy" version)) (sha256 - (base32 "03yil4hjn14amx5jnvjfahmm78qqax2664z30xxn0dxmzdspimli")))) + (base32 "199nbc7vipdsvxmfxc0lrzbprgl3hr2xgqhvss1083iz1k7fvg9w")))) (build-system pyproject-build-system) (arguments (list #:test-flags diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca7d80c350..5ed1336d1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -63,7 +63,7 @@ ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Jacob MacDonald <jaccarmac@gmail.com> -;;; Copyright © 2019, 2020, 2021 Giacomo Leidi <goodoldpaul@autistici.org> +;;; Copyright © 2019-2021, 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019, 2021-2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> @@ -108,7 +108,7 @@ ;;; Copyright © 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021, 2022, 2023 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2021, 2022 Pradana Aumars <paumars@courrier.dev> -;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021, 2022, 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Sébastien Lerique <sl@eauchat.org> ;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be> ;;; Copyright © 2021 ZmnSCPxj <ZmnSCPxj@protonmail.com> @@ -139,11 +139,13 @@ ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw> ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net> ;;; Copyright © 2023 Ontje Lünsdorf <ontje.luensdorf@dlr.de> +;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Parnikkapore <poomklao@yahoo.com> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © c4droid <c4droid@foxmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name> +;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,6 +248,7 @@ #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages regex) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages scanner) #:use-module (gnu packages sdl) #:use-module (gnu packages search) @@ -1220,13 +1223,13 @@ Markdown. All extensions are found under the module namespace of pymdownx.") (define-public python-pint (package (name "python-pint") - (version "0.20.1") + (version "0.22") (source (origin (method url-fetch) (uri (pypi-uri "Pint" version)) (sha256 (base32 - "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q")))) + "0cs4lsvngrkfzpnrmxcwz728m47y0xbw1knksz51cc6gpdm9y4rd")))) (build-system pyproject-build-system) (arguments ;; This single test tries to write to $HOME/.cache/pint. @@ -1241,7 +1244,9 @@ Markdown. All extensions are found under the module namespace of pymdownx.") python-pytest-subtests python-setuptools-scm python-sparse + python-uncertainties python-xarray)) + (propagated-inputs (list python-typing-extensions)) (home-page "https://github.com/hgrecco/pint") (synopsis "Physical quantities module") (description @@ -1287,6 +1292,31 @@ different units.") scatter plots, histograms and heatmaps in the terminal using braille dots.") (license license:expat))) +(define-public python-portpicker + (package + (name "python-portpicker") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "portpicker" version)) + (sha256 + (base32 "1yiisk4h8qliwf99khz3lszrpjf6km76fbhzg01fwrbgz7b7yl5x")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; This fails because portserver ends up in bin, not site-packages + '(list "--ignore=src/tests/portserver_test.py"))) + (propagated-inputs (list python-psutil)) + (native-inputs (list python-pytest net-tools)) + (home-page "https://github.com/google/python_portpicker") + (synopsis "Choose unique available network ports") + (description + "This package provides a library to choose unique available network +ports.") + (license license:asl2.0))) + (define-public python-mdx-gh-links (package (name "python-mdx-gh-links") @@ -1550,7 +1580,7 @@ of a loop structure or other iterative computation.") (define-public python-glymur (package (name "python-glymur") - (version "0.12.0") + (version "0.12.8") (source (origin (method git-fetch) ; no tests data in PyPi package @@ -1559,7 +1589,7 @@ of a loop structure or other iterative computation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03nny8k42yxdyw7sjv43szmg23x3rqplbaf7m0a0lpvwla1dl78i")))) + (base32 "0mfyn9j7h13242d41vg12acw55yl2mv6lmgi265hfp11k7g52b6n")))) (build-system pyproject-build-system) (arguments (list @@ -1588,7 +1618,7 @@ of a loop structure or other iterative computation.") ;; which is patched above. (delete-file "tests/test_config.py")))))) (native-inputs - (list python-pytest)) + (list python-pytest python-scikit-image)) (inputs (list openjpeg ; glymur/lib/openjp2.py libtiff)) ; glymur/lib/tiff.py @@ -1828,6 +1858,28 @@ It can handle tasks such as scanning, tracerouting, probing, unit tests, attacks or network discovery.") (license license:gpl2))) +(define-public python-icmplib + (package + (name "python-icmplib") + (version "3.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "icmplib" version)) + (sha256 + (base32 "1phnlgbb5di79ijm55pyd5jj1ggss4b6nn6mw701h501vcn8z1jp")))) + (arguments + '(#:tests? #f)) ;test data not present + (build-system python-build-system) + (home-page "https://github.com/ValentinBELYN/icmplib") + (synopsis + "Python implementation of the Internet Control Message Protocol (ICMP)") + (description + "@code{icmplib} is a supporting library for both IPv4 and IPv6 networks. +ICMP is typically used for diagnostic or control purposes - well known from +utilities such as ping(1).") + (license license:lgpl3))) + (define-public python-rasterio (package (name "python-rasterio") @@ -2515,13 +2567,13 @@ conventions and aliases in the same expression.") (define-public python-wand (package (name "python-wand") - (version "0.6.11") + (version "0.6.13") (source (origin (method url-fetch) (uri (pypi-uri "Wand" version)) (sha256 - (base32 "15d9kxyc7qvknx0kv27m2jamnmisckyf89i7wlqykwgqm46p0qdn")))) + (base32 "1jpwm956vm35hmgjndr2jwrcql0bwvpsl88q5nr0x8ppxa2380gm")))) (build-system python-build-system) (arguments `(#:phases @@ -2904,6 +2956,40 @@ abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a CAN bus.") (license license:lgpl3+))) +(define-public python-canmatrix + (package + (name "python-canmatrix") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "canmatrix" version)) + (sha256 + (base32 "046dzmggfm6h0fvfvwrblvih0blhc70ma0pqxzry3cphc08jvsrg")) + ;; The test suite uder ./test is a legacy test suite. The new test + ;; suite is defined under src/canmatrix/tests. + (modules '((guix build utils))) + (snippet '(delete-file-recursively "test")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (propagated-inputs (list python-attrs python-click python-future + python-six)) + (native-inputs (list python-lxml python-pytest python-xlrd python-xlwt)) + (home-page "https://github.com/ebroecker/canmatrix") + (synopsis "@acronym{CAN, Controller Area Network} matrices in Python") + (description + "This package implements a @acronym{CAN, Controller Area Network} matrix +object in Python which describes the CAN-communication and its needed objects +such as board units, frames, signals, and values. It also includes two +command-line tools (@command{canconvert} and @command{cancompare}) for +converting and comparing CAN databases.") + (license license:bsd-2))) + (define-public python-canopen (package (name "python-canopen") @@ -3007,13 +3093,13 @@ help formatter.") (define-public python-orjson (package (name "python-orjson") - (version "3.8.8") + (version "3.9.7") (source (origin (method url-fetch) (uri (pypi-uri "orjson" version)) (sha256 (base32 - "1nn617pzn8smjkf7j593ybq16qfnj53bla52qjwzzrms4fjxg5n0")))) + "0hh1j7akxgx1nvsnwx1p4f4h4pkgr7v9aqr99l2pwbwfyyc93qw5")))) (build-system cargo-build-system) (arguments (list @@ -3024,47 +3110,10 @@ help formatter.") (guix build utils)) #:phases #~(modify-phases %standard-phases - (add-after 'install 'prepare-python-module - (lambda _ - ;; We don't use maturin. - (delete-file "pyproject.toml") - (call-with-output-file "pyproject.toml" - (lambda (port) - (format port "\ -[build-system] -build-backend = 'setuptools.build_meta' -requires = ['setuptools'] -"))) - (call-with-output-file "setup.cfg" - (lambda (port) - (format port "\ -[metadata] -name = orjson -version = ~a - -[options] -packages = find: - -[options.packages.find] -exclude = - src - integration - test - Cargo.toml -" #$version))))) (add-after 'prepare-python-module 'build-python-module (assoc-ref py:%standard-phases 'build)) (add-after 'build-python-module 'install-python-module - (assoc-ref py:%standard-phases 'install)) - (add-after 'install-python-module 'install-python-library - (lambda _ - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages"))) - (mkdir-p site) - (copy-file "target/release/liborjson.so" - (string-append site "/orjson.so")))))) + (assoc-ref py:%standard-phases 'install))) #:cargo-inputs `(("rust-ahash" ,rust-ahash-0.8) ("rust-arrayvec" ,rust-arrayvec-0.7) @@ -3077,17 +3126,20 @@ exclude = ("rust-itoa" ,rust-itoa-1) ("rust-itoap" ,rust-itoap-1) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.18) + ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.19) ("rust-ryu" ,rust-ryu-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-simdutf8" ,rust-simdutf8-0.1) - ("rust-smallvec" ,rust-smallvec-1)) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-cc" ,rust-cc-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.19) + ("rust-version-check" ,rust-version-check-0.9)) #:install-source? #false)) + (inputs + (list maturin)) (native-inputs - (list python-wrapper - python-pypa-build - python-wheel)) + (list python-wrapper)) (home-page "https://github.com/ijl/orjson") (synopsis "Python JSON library supporting dataclasses, datetimes, and numpy") (description "Orjson is a fast, correct JSON library for Python. It @@ -3623,7 +3675,12 @@ in the current session, Python, and the OS.") (uri (pypi-uri "schedule" version)) (sha256 (base32 - "0vplyjcbfrq50sphlwya749z8p2pcyi2nycw3518i0qpd9a6189i")))) + "0vplyjcbfrq50sphlwya749z8p2pcyi2nycw3518i0qpd9a6189i")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "schedule/__init__.py" + (("collections\\.Hashable") + "collections.abc.Hashable")))))) (build-system python-build-system) (native-inputs (list python-pytest python-mock)) @@ -4865,6 +4922,30 @@ between Julian dates and Gregorian dates.") compare, diff, and patch JSON and JSON-like structures in Python.") (license license:expat))) +(define-public python-ddlparse + (package + (name "python-ddlparse") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ddlparse" version)) + (sha256 + (base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634")))) + (build-system pyproject-build-system) + (native-inputs + (list python-codecov + python-coveralls + python-pytest + python-pytest-cov + python-tox)) + (propagated-inputs (list python-pyparsing)) + (home-page "https://github.com/shinichi-takii/ddlparse") + (synopsis "Parses and converts DDL to BigQuery JSON schema") + (description "This package provides @{ddlparse}, a Python library to parse +and convert DDL to BigQuery JSON schema.") + (license license:bsd-3))) + (define-public python-jsonschema (package (name "python-jsonschema") @@ -5004,13 +5085,13 @@ to Roman Numerals.") (define-public python-rollbar (package (name "python-rollbar") - (version "0.16.3") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "rollbar" version)) (sha256 (base32 - "1qpd0j50wqli3867xmhwk65pm1cxjs60yg83mcvcf3kic3y3sc82")))) + "1bzkgp4r79d789q15vnjji2gcb34bnksx9l7q9pjkw12kzjbfiv3")))) (build-system python-build-system) (native-inputs (list python-pytest-runner python-unittest2)) (inputs (list python-requests python-six python-httpx python-blinker @@ -5803,14 +5884,17 @@ flexibility and power of the Python language.") (define-public python-dm-tree (package (name "python-dm-tree") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (pypi-uri "dm-tree" version)) (sha256 - (base32 "0apxfxgmqh22qpk92zmmf3acqkavhwxz78lnwz026a5rlnncizih")))) - (build-system python-build-system) - (inputs (list pybind11 abseil-cpp python)) + (base32 "0c4l9gpaqd7j34qwnpjibv53j9sm0nyl0wcy8dvh76772jxspjhg")))) + (build-system pyproject-build-system) + ;; We link the static abseil libraries here to avoid problems in + ;; downstream libraries using potentially different variants of + ;; abseil-cpp. This is also what's done in the upstream CMake build. + (inputs (list pybind11 static-abseil-cpp python)) (propagated-inputs (list python-wheel python-absl-py python-attrs @@ -5851,13 +5935,15 @@ flexibility and power of the Python language.") (string-append "-Wl," "-rpath=" python "/lib") "-fno-semantic-interposition" "build/temp/tree/tree.o" + "-Wl,--whole-archive" "-L" (string-append python "/lib") - "-L" (string-append abseil-cpp "/lib") - "-l" "absl_int128" - "-l" "absl_raw_hash_set" - "-l" "absl_raw_logging_internal" - "-l" "absl_strings" - "-l" "absl_throw_delegate" + (string-append abseil-cpp "/lib/libabsl_int128.a") + (string-append abseil-cpp "/lib/libabsl_raw_hash_set.a") + (string-append abseil-cpp "/lib/libabsl_raw_logging_internal.a") + (string-append abseil-cpp "/lib/libabsl_strings.a") + (string-append abseil-cpp "/lib/libabsl_strings_internal.a") + (string-append abseil-cpp "/lib/libabsl_throw_delegate.a") + "-Wl,--no-whole-archive" "-o" "build/lib/tree/_tree.so"))))))) (home-page "https://github.com/deepmind/tree") (synopsis "Work with nested data structures in Python") @@ -7385,6 +7471,28 @@ capabilities.") (description "This package provides the complete NumPy documentation in the Texinfo, HTML, and PDF formats."))) +(define-public python-npx + (package + (name "python-npx") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "npx" version)) + (sha256 + (base32 + "1m0v2p5mh3aqrypl4ipgzvr5nhx7bk5vv9ah2xr9l1xgj6nnmqnc")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-numpy)) + (native-inputs (list python-flit-core python-networkx python-pytest)) + (home-page "https://github.com/nschloe/npx") + (synopsis "Extensions for NumPy") + (description "NumPy is a large library used everywhere in scientific +computing. That's why breaking backwards-compatibility comes at a +significant cost and is almost always avoided, even if the API of some +methods is arguably lacking. This package provides drop-in wrappers +\"fixing\" those.") + (license license:bsd-3))) + (define-public python-munch (package (name "python-munch") @@ -8216,6 +8324,92 @@ Jupyter.") three-way Venn diagrams in @code{matplotlib}.") (license license:expat))) +(define-public python-matplotx + (package + (name "python-matplotx") + (version "0.3.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nschloe/matplotx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1j301mr7ai2jmbm5mkva0jd99fzxhyq585pqzqfmrf5pil8j4q8i")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-matplotlib + python-numpy + ;; optional dependencies + python-networkx + python-pypng + python-scipy)) + (native-inputs (list python-imageio + python-meshzoo + python-pytest + python-scikit-fem)) + (arguments + (list + #:test-flags + ;; This test fails with ValueError: not enough values to unpack. + #~(list "--deselect" "tests/test_spy.py::test_cli"))) + (home-page "https://github.com/nschloe/matplotx") + (synopsis "Minimal matplotlib styles") + (description + "This package includes some extensions for Matplotlib to create +clean plots with a minimalistic style.") + (license license:expat))) + +(define-public python-cplot + (package + (name "python-cplot") + (version "0.9.3") + (source + (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/nschloe/cplot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zk7hpq358sbympmkms7w2wjs7nw8mdfvkvdasblg2nhqayv42qz")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-matplotlib + python-matplotx + python-npx + python-numpy)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/nschloe/cplot") + (synopsis "Plot complex-valued functions") + (description "@code{cplot} is a Python library for plotting +complex-valued functions.") + (license license:gpl3+))) + +(define-public python-perfplot + (package + (name "python-perfplot") + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "perfplot" version)) + (sha256 + (base32 + "0hbyv17f9ra6l6albcrqx4rylmfv2m6z4qsnhb4bar256dralvfp")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-matplotlib + python-matplotx + python-numpy + python-rich)) + (native-inputs (list python-flit-core + python-pytest)) + (home-page "https://github.com/nschloe/perfplot") + (synopsis "Performance plots for Python code snippets") + (description "@code{perfplot} extends Python's timeit by testing +snippets with input parameters (e.g., the size of an array) and plotting +the results.") + (license license:gpl3+))) + (define-public python-pysnptools (package (name "python-pysnptools") @@ -8680,6 +8874,7 @@ retrieve text and metadata from PDFs as well as merge entire files together.") python-attrs python-coverage python-hypothesis + python-setuptools-scm python-psutil python-pytest python-pytest-cov @@ -9605,11 +9800,18 @@ Python language binding specification.") (source (origin (method url-fetch) - (uri - (pypi-uri "grako" version ".zip")) + (uri (pypi-uri "grako" version ".zip")) (sha256 - (base32 - "0r63i68wcnv63rfjkasq1ah81frz61a6mzbcnaxhrkdpx84p7hzw")))) + (base32 "0r63i68wcnv63rfjkasq1ah81frz61a6mzbcnaxhrkdpx84p7hzw")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "grako/grammars.py" + (("from collections import defaultdict, Mapping") + (string-append "from collections import defaultdict\n" + "from collections.abc import Mapping"))) + (substitute* '("grako/util.py" + "grako/walkers.py") + (("collections\\.Mapping") "collections.abc.Mapping")))))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Test file 'grako.ebnf' is missing from archive. (native-inputs @@ -10644,10 +10846,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (build-system pyproject-build-system) (arguments (list - #:imported-modules `(,@%pyproject-build-system-modules - (guix build syscalls)) #:modules '((guix build pyproject-build-system) - (guix build syscalls) (guix build utils) (ice-9 match)) #:phases @@ -10666,20 +10865,19 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (when tests? (match (primitive-fork) (0 ;child process - (set-child-subreaper!) - ;; XXX: Tini provides proper PID1-like signal handling that - ;; reaps zombie processes, necessary for the - ;; 'test_shutdown_subprocesses' test to pass. - - ;; TODO: Complete https://issues.guix.gnu.org/30948. (setenv "HOME" "/tmp") - (execlp "tini" "--" "pytest" "-vv")) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`pytest' exited with status" - status))))))))) + (execlp "pytest" "pytest" "-vv")) + (pytest-pid + ;; Reap zombie processes, necessary for the + ;; 'test_shutdown_subprocesses' test to pass. + (let loop () + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid pytest-pid) + (unless (zero? status) + (error "`pytest' exited with status" + status)) + (loop)))))))))) (add-after 'install 'set-python-file-name (lambda* (#:key inputs #:allow-other-keys) ;; Record the absolute file name of the 'python' executable in @@ -10708,8 +10906,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") ;; and causes deprecation warnings. Using the bootstrap variant ;; avoids that. python-pytest-bootstrap - python-pytest-timeout - tini)) + python-pytest-timeout)) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") @@ -13456,6 +13653,24 @@ provided that can be used to do various manipulations with LilyPond files.") should be stored on various operating systems.") (license license:expat))) +(define-public python-google-pasta + (package + (name "python-google-pasta") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "google-pasta" version)) + (sha256 + (base32 "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-six)) + (home-page "https://github.com/google/pasta") + (synopsis "pasta is an AST-based Python refactoring library") + (description "This package provides \"pasta\", an AST-based Python +refactoring library.") + (license license:asl2.0))) + (define-public python-gorilla (package (name "python-gorilla") @@ -13734,22 +13949,6 @@ similar to the Python standard library's @code{json} module.") includes dependency resolution logic.") (license license:isc))) -;;; This older version is required by ansible-core. -(define-public python-resolvelib-0.5 - (package/inherit python-resolvelib - (name "python-resolvelib") - (version "0.5.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sarugaku/resolvelib") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0697y330sqhiclk25v151qxg7aixzpj434lbg5qib0qlna5zg9la")))))) - (define-public python-commonmark (package (name "python-commonmark") @@ -15847,7 +16046,7 @@ programmatically with command-line parsers like @code{getopt} and (define-public python-pythonanywhere (package (name "python-pythonanywhere") - (version "0.9.10") + (version "0.12.1") (source (origin (method git-fetch) @@ -15857,7 +16056,7 @@ programmatically with command-line parsers like @code{getopt} and (file-name (git-file-name name version)) (sha256 (base32 - "0vzzc1g8pl7cb9yvm3n1j5zlzxf0jd423rzspc2kvpb8yhvydklx")))) + "12898jrq8bi90s5v3wirj7zprk08smwzwdx09y07x770frqd80vl")))) (build-system python-build-system) (arguments `(#:phases @@ -15888,8 +16087,9 @@ programmatically with command-line parsers like @code{getopt} and (home-page "https://github.com/pythonanywhere/helper_scripts/") (synopsis "PythonAnywhere helper tools for users") (description "PythonAnywhere provides a command-line interface and an -application programming interface that allows managing Web apps and scheduled -tasks. It includes single-command deployment for the Django Girls tutorial.") +application programming interface that allows managing files Web apps, scheduled +tasks and students. It includes single-command deployment for the Django Girls +tutorial.") (license license:expat))) (define-public python-pythondialog @@ -17698,13 +17898,13 @@ ISO 8859, etc.).") (define-public python-pyqtgraph (package (name "python-pyqtgraph") - (version "0.13.1") + (version "0.13.3") (source (origin (method url-fetch) (uri (pypi-uri "pyqtgraph" version)) (sha256 - (base32 "026wq2p7h1dmg2ldwhxiv28i5qld0llhnak06dxp4rdrkpsqg3v9")))) + (base32 "1kiazyc8mqyx0479qdcvdclzq0g1hpp93dyq8444w1f72628s42q")))) (build-system pyproject-build-system) (arguments ;; This test fails. It suggests to disable assert rewriting in Pytest, @@ -18403,19 +18603,14 @@ to support both Python 2 and Python 3 with minimal overhead.") (define-public python-cysignals (package (name "python-cysignals") - (version "1.9.0") + (version "1.11.4") (source - (origin - (method url-fetch) - (uri (pypi-uri "cysignals" version)) - (sha256 - (base32 - "15ix8crpad26cfl1skyg7qajqqfdrm8q5ahhmlfmqi1aw0jqj2g2")))) + (origin + (method url-fetch) + (uri (pypi-uri "cysignals" version)) + (sha256 + (base32 "1hrqn976xhrq189x1086f3z9vzznjx21wsm3hqf90zx0alg347hg")))) (build-system python-build-system) - (native-inputs - (list python-cython python-sphinx)) - (inputs - (list pari-gp)) (arguments `(#:modules ((guix build python-build-system) ((guix build gnu-build-system) #:prefix gnu:) @@ -18424,17 +18619,15 @@ to support both Python 2 and Python 3 with minimal overhead.") ;; when not installing into standard locations; the author is working ;; on a fix. #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before - 'build 'configure - (assoc-ref gnu:%standard-phases 'configure))))) - (home-page - "https://github.com/sagemath/cysignals") - (synopsis - "Handling of interrupts and signals for Cython") - (description - "The cysignals package provides mechanisms to handle interrupts (and + #:phases (modify-phases %standard-phases + (add-before 'build 'configure + (assoc-ref gnu:%standard-phases 'configure))))) + (native-inputs (list python-cython-3 python-sphinx)) + (inputs (list pari-gp)) + (home-page "https://github.com/sagemath/cysignals") + (synopsis "Handling of interrupts and signals for Cython") + (description + "The cysignals package provides mechanisms to handle interrupts (and other signals and errors) in Cython code, using two related approaches, for mixed Cython/Python code or external C libraries and pure Cython code, respectively.") @@ -19955,13 +20148,13 @@ etc.") (define-public python-pyvirtualdisplay (package (name "python-pyvirtualdisplay") - (version "2.1") + (version "3.0") (source (origin (method url-fetch) (uri (pypi-uri "PyVirtualDisplay" version)) (sha256 - (base32 "1z2fzgiw3xv3m1d9ppn53g07zhnpj05addiz56sm6ircxibnjk4x")))) + (base32 "0nb1s7nilakrkcm0vq08pz9mh8rzyhjm9jkyn1gp5sxnrv1mnx89")))) (build-system python-build-system) (arguments ;; Tests fail with: @@ -24519,6 +24712,102 @@ in Python. You can simply type pybtex instead of bibtex.") time-based (TOTP) passwords.") (license license:expat))) +(define-public python-online-judge-api-client + (package + (name "python-online-judge-api-client") + (version "10.10.1") + ;; Source distributions are not uploaded to PyPI. + ;; https://pypi.org/project/online-judge-api-client/10.10.1/#files + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/online-judge-tools/api-client") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yjqhh44va5nawd9rpqcjyf0g7rjlkvn7s90fmwmwjyqvy6lhjiz")) + (patches (search-patches + "python-online-judge-api-client-tests.patch")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;; These tests require network connections + (add-after 'unpack 'remove-failing-test + (lambda _ + (for-each delete-file + '("tests/get_contest_atcoder.py" + "tests/get_contest_atcoder_problems.py" + "tests/get_contest_codechef.py" + "tests/get_contest_codeforces.py" + "tests/get_contest_yukicoder.py" + "tests/get_problem_anarchygolf.py" + "tests/get_problem_aoj.py" + "tests/get_problem_atcoder.py" + "tests/get_problem_codechef.py" + "tests/get_problem_codeforces.py" + "tests/get_problem_csacademy.py" + "tests/get_problem_facebook.py" + "tests/get_problem_hackerrank.py" + "tests/get_problem_kattis.py" + "tests/get_problem_library_checker.py" + "tests/get_problem_poj.py" + "tests/get_problem_topcoder.py" + "tests/get_problem_toph.py" + "tests/get_problem_yukicoder.py" + "tests/login_service.py")) #t))))) + (propagated-inputs (list python-appdirs + python-beautifulsoup4 + python-colorlog + python-lxml + python-requests + python-toml + python-jsonschema)) + (home-page "https://github.com/online-judge-tools/api-client") + (synopsis "API client for various online judges") + (description + "This is an API client for various online judges, used as the backend +library of @code{oj} command. You can use the Python +library (@code{onlinejudge} module) and the command-line +interface (@command{oj-api} command) which talks JSON compatible with +jmerle/competitive-companion.") + (license license:expat))) + +(define-public online-judge-tools + (package + (name "online-judge-tools") + (version "11.5.1") + ;; Source distributions are not uploaded to PyPI. + ;; https://pypi.org/project/online-judge-tools/11.5.1/#files + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/online-judge-tools/oj") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zkzmmjgjb6lyrzq1ip54cpnp7al9a7mcyjyi5vx58bvnx3q0c6m")) + (patches (search-patches "online-judge-tools.patch")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;; These tests require network connections + (add-after 'unpack 'remove-failing-test + (lambda _ + (delete-file "tests/command_version.py") #t))))) + (inputs (list time)) + (propagated-inputs (list python-online-judge-api-client python-colorama + python-requests)) + (home-page "https://github.com/online-judge-tools/oj") + (synopsis "Command to help solving problems on various online judges") + (description + "@command{oj} is a command line tool to help solving problems on +various online judges. This command automates downloading sample +cases, generating additional test cases, testing for your code, and +submitting it.") + (license license:expat))) + (define-public python-parso (package (name "python-parso") @@ -27161,41 +27450,41 @@ for YAML and JSON.") "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g")))) (build-system python-build-system) (arguments - `(#:imported-modules (,@%python-build-system-modules - (guix build syscalls)) - #:modules ((guix build python-build-system) - (guix build syscalls) - (guix build utils) - (ice-9 match)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "tests/test_code.py" - (("/bin/bash") (which "bash"))) - (substitute* "dbusmock/testcase.py" - (("'dbus-daemon'") - (string-append "'" (assoc-ref inputs "dbus") - "/bin/dbus-daemon'"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (match (primitive-fork) - (0 ;child process - (set-child-subreaper!) - ;; Use tini so that signals are properly handled and - ;; doubly-forked processes get reaped; otherwise, - ;; python-dbusmock would waste time polling for the dbus - ;; processes it spawns to be reaped, in vain. - (execlp "tini" "--" "pytest" "-vv")) - (pid - (match (waitpid pid) - ((_ . status) - (unless (zero? status) - (error "`pytest' exited with status" - status)))))))))))) - (native-inputs - (list dbus python-pytest tini which)) + (list #:modules `((guix build python-build-system) + (guix build utils) + (ice-9 match)) + + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_code.py" + (("/bin/bash") + (which "bash"))) + (substitute* "dbusmock/testcase.py" + (("'dbus-daemon'") + (object->string + (search-input-file inputs "/bin/dbus-daemon")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (match (primitive-fork) + (0 ;child process + (execlp "pytest" "pytest" "-vv")) + (pytest-pid + (let loop () + ;; Reap child processes; otherwise, python-dbusmock + ;; would waste time polling for the dbus processes + ;; it spawns to be reaped, in vain. + (match (waitpid WAIT_ANY) + ((pid . status) + (if (= pid pytest-pid) + (unless (zero? status) + (error "`pytest' exited with status" + status)) + (loop))))))))))))) + (native-inputs + (list dbus python-pytest which)) (inputs (list dbus)) (propagated-inputs @@ -28908,7 +29197,7 @@ accessor layer.") (define-public pyzo (package (name "pyzo") - (version "4.12.8") + (version "4.13.3") (source (origin (method git-fetch) @@ -28918,7 +29207,7 @@ accessor layer.") (file-name (git-file-name name version)) (sha256 (base32 - "036snpv6j63bv9z9mbq317qb43zwsj1m8vljra3c0kiakahp7cc3")))) + "1m0mrp20wjvy804214f4zzlbaqrakam0g3qr562yn2mjcgfba554")))) (build-system python-build-system) (arguments `(#:phases @@ -28955,8 +29244,12 @@ workspace...") (method url-fetch) (uri (pypi-uri "python-osc" version)) (sha256 - (base32 - "0cnh0z5lnng7fh48nmfaqqn8j25k13gkd4rhxd3m6sjqiix9s3vn")))) + (base32 "0cnh0z5lnng7fh48nmfaqqn8j25k13gkd4rhxd3m6sjqiix9s3vn")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "pythonosc/udp_client.py" + (("from collections import Iterable") + "from collections.abc import Iterable")))))) (build-system python-build-system) (home-page "https://github.com/attwad/python-osc") (synopsis "Open Sound Control server and client implementations") @@ -29879,26 +30172,48 @@ applications with variable CPU loads).") (define-public python-versioneer (package (name "python-versioneer") - (version "0.21") + (version "0.29") (source (origin (method url-fetch) (uri (pypi-uri "versioneer" version)) (sha256 (base32 - "084fglxafbzvf1vbkzfajvs9qwnvjwwn8pxql9nrlpyipv5xpwk4")) + "0cap4cjckxp9mlkprqayfs77k3pn5iwpr2riacdxc4bjhnwq7cjs")) (patches (search-patches "python-versioneer-guix-support.patch")))) - (build-system python-build-system) - (home-page - "https://github.com/python-versioneer/python-versioneer") - (synopsis - "Version-string management for VCS-controlled trees") + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Taken from tox.ini. + (invoke "python" "setup.py" "make_versioneer") + (invoke "python" "-m" "unittest" "discover" "test") + (invoke "python" "test/git/test_git.py" "-v") + ;; Some invocation tests require the network. + ;;(invoke "python" "test/git/test_invocations.py" "-v") + (invoke "python" "setup.py" "make_long_version_py_git") + (invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py") + (invoke "python" "test/run_pyflakes_src.py") + (invoke "pyflakes" "test") + (invoke "flake8" "git_version.py" "versioneer.py") + (invoke "pycodestyle" "--max-line-length=88" + "git_version.py" "versioneer.py"))))))) + (native-inputs + (list git python-flake8 python-pycodestyle python-pyflakes)) + (propagated-inputs + (list python-tomli)) + (home-page "https://github.com/python-versioneer/python-versioneer") + (synopsis "Version-string management for VCS-controlled trees") (description "@code{versioneer} is a tool for managing a recorded version number in distutils-based python projects. The goal is to remove the tedious and error-prone \"update the embedded version string\" step from your release process.") - (license license:public-domain))) + (license license:unlicense))) (define-public python-gamera (package @@ -31895,13 +32210,13 @@ development, testing, production]}; (define-public python-pudb (package (name "python-pudb") - (version "2022.1.3") + (version "2023.1") (source (origin (method url-fetch) (uri (pypi-uri "pudb" version)) (sha256 (base32 - "0jk61qgacvwy6zkz1f55jawax4ggb1aawy6w3wnfkzqrkvd3ms2q")))) + "00rgx80inpvsbcydp29mrhw44xizyqdqxvv6lqcak1xs79h3rpqm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -32341,13 +32656,13 @@ Psycopg 2 is both Unicode and Python 3 friendly.") (define-public python-pyfuse3 (package (name "python-pyfuse3") - (version "3.2.1") + (version "3.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pyfuse3" version)) (sha256 - (base32 "0cvybynv9igssfa4l13q09gb6m7afmwk34wsbq8jk14sqpd4dl92")))) + (base32 "1gbkwmk7gpyy70cqj9226qvwrx13xlwxfz86l86n5ybr4i0zwc9b")))) (build-system python-build-system) (native-inputs (list pkg-config)) (inputs (list fuse)) @@ -32418,13 +32733,13 @@ collection.") (define-public python-types-pytz (package (name "python-types-pytz") - (version "2021.3.6") + (version "2023.3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "types-pytz" version)) (sha256 - (base32 "14yr5hg2ww8s4a0mz2bkd549fv8qgm538fnzxvqv92ld1pcpym3l")))) + (base32 "16mbinqac2fjjh4gqw2940q8ysjqwj0hrvj4p9mqz76l5hcx08yc")))) (build-system python-build-system) (home-page "https://github.com/python/typeshed") (synopsis "Typing stubs for pytz") @@ -33973,6 +34288,23 @@ functions markdown-compliant strings.") (license license:expat))) +(define-public python-yattag + (package + (name "python-yattag") + (version "1.15.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "yattag" version)) + (sha256 + (base32 "05p4dgdp8wwvnsvcv7n4zn8k602w345kw4vq67s9d792w55sa3wn")))) + (build-system python-build-system) + (synopsis "HTML or XML generator for Python") + (description + "Yattag is a Python library for generating HTML or XML in a pythonic way.") + (home-page "https://www.yattag.org/") + (license license:lgpl2.1))) + (define-public python-zbarlight (package (name "python-zbarlight") @@ -34012,6 +34344,28 @@ software by taking care of all interactions with low-level network programming interfaces.") (license license:gpl2))) +(define-public python-islenska + (package + (name "python-islenska") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "islenska" version)) + (sha256 + (base32 "0fdp90mzy0sd4kyw8kd8kybd1ni765fvqn8hz2wx5sqbjjkm4d5k")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-cffi python-typing-extensions)) + (home-page "https://github.com/mideind/BinPackage") + (synopsis + "Vocabulary of the modern Icelandic language, in a Python package") + (description + "Islenska is a Python package that embeds the vocabulary of the Database +of Icelandic Morphology and offers various lookups and queries of the data. +The database contains over 6.5 million entries, over 3.1 million unique word +forms, and about 300,000 distinct lemmas.") + (license license:expat))) + (define-public python-zeroc-ice-3.6 (package (inherit python-zeroc-ice) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e6ce9f1774..63fc016c43 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -60,6 +60,7 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix deprecation) + #:use-module (guix search-paths) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -364,7 +365,7 @@ system, and the core design of Django is reused in Grantlee.") (base32 "1fcg3kx5akvj0kqxd99h5lv3kv4pw2cj0makmpvhpw90inqnrl60")) ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" + (patches (search-patches "qtbase-5-use-TZDIR.patch" "qtbase-moc-ignore-gcc-macro.patch" "qtbase-absolute-runpath.patch")) (modules '((guix build utils))) @@ -392,7 +393,7 @@ system, and the core design of Django is reused in Grantlee.") fontconfig freetype glib - gtk+ ;for GTK theme support + gtk+ ;for GTK theme support harfbuzz icu4c libinput-minimal @@ -405,7 +406,10 @@ system, and the core design of Django is reused in Grantlee.") libxfixes libxi libxinerama - libxkbcommon + ;; Use libxkbcommon-1.5 as 1.6.0 removed keysyms referenced in the + ;; qtbase source. + ;; TODO: Check if libxkbcommon can be used on next update. + libxkbcommon-1.5 libxml2 libxrandr libxrender @@ -437,7 +441,8 @@ system, and the core design of Django is reused in Grantlee.") vulkan-headers ruby-2.7)) (arguments - `(#:configure-flags + `(#:disallowed-references ,(list python) + #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list "-verbose" "-prefix" out @@ -583,7 +588,16 @@ system, and the core design of Django is reused in Grantlee.") (("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b) (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)) (("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))))))) + (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))))) + (add-after 'install 'do-not-capture-python + (lambda* (#:key outputs #:allow-other-keys) + ;; For some reason, patching the file after the + ;; patch-source-shebangs phase doesn't work for Qt 5. + (substitute* + (search-input-file + outputs "lib/qt5/mkspecs/features/uikit/devices.py") + (((which "python3")) + "/usr/bin/env python3"))))))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH") @@ -666,20 +680,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") "-DFEATURE_system_sqlite=ON" "-DFEATURE_system_xcb_xinput=ON" ;; Don't use the precompiled headers. - "-DBUILD_WITH_PCH=OFF" - ;; Drop special machine instructions that do not have runtime - ;; detection. - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() ;implicitly enabled - '("-DFEATURE_sse2=OFF" - "-DFEATURE_sse3=OFF" - "-DFEATURE_ssse3=OFF" - "-DFEATURE_sse4_1=OFF" - "-DFEATURE_sse4_2=OFF")) - "-DFEATURE_mips_dsp=OFF" - "-DFEATURE_mips_dspr2=OFF"))) + "-DBUILD_WITH_PCH=OFF"))) ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'honor-CMAKE_PREFIX_PATH @@ -724,17 +725,20 @@ developers using C++ or QML, a CSS & JavaScript like language.") (substitute* "src/corelib/CMakeLists.txt" (("/bin/ls") (search-input-file inputs "bin/ls"))))) + (delete 'do-not-capture-python) ;move after patch-source-shebangs (add-after 'patch-source-shebangs 'do-not-capture-python (lambda _ (substitute* '("mkspecs/features/uikit/devices.py" - "util/testrunner/qt-testrunner.py") + "util/testrunner/qt-testrunner.py" + "util/testrunner/sanitizer-testrunner.py") (((which "python3")) "/usr/bin/env python3")))) (replace 'configure (assoc-ref %standard-phases 'configure)) (delete 'check) ;move after patch-prl-files (add-after 'patch-prl-files 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? + native-inputs inputs #:allow-other-keys) (when tests? ;; The tests expect to find the modules provided by this ;; package; extend the environment variables needed to do so. @@ -757,6 +761,18 @@ developers using C++ or QML, a CSS & JavaScript like language.") ;; /tree/src/testlib/qtestblacklist.cpp). (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") (setenv "HOME" "/tmp") ;some tests require a writable HOME + + ;; Note: the search path specified for TZDIR is only + ;; effective for users of the package, not while it's being + ;; built. + (setenv "TZDIR" (search-input-directory + (or native-inputs inputs) "share/zoneinfo")) + + ;; This is to avoid QTimeZone::systemTimeZone() returning + ;; invalid QDate objects due to missing /etc/timezone or + ;; /etc/localtime. + (setenv "TZ" "Etc/UTC") + (invoke "xvfb-run" "ctest" "--output-on-failure" "-j" (if parallel-tests? @@ -766,98 +782,130 @@ developers using C++ or QML, a CSS & JavaScript like language.") (string-append "(" (string-join - (list - ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". - "tst_moc" - - ;; The 'tst_qdate' test fails because the current time - ;; is reported as an invalid date (see: - ;; https://bugreports.qt.io/browse/QTBUG-116017). - "tst_qdate" - - ;; The qgraphicsview and qopenglwidget tests fail with a - ;; segfault for unknown reasons (see: - ;; https://bugreports.qt.io/browse/QTBUG-116018). - "tst_qgraphicsview" - "tst_qopenglwidget" - - ;; 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" - ;; Not all of the tested formats are supported by our - ;; build of openssl; 871 passed, 122 failed. - "tst_qsslkey" - ;; 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_QObjectRace::destroyRace is flaky (see: - ;; https://bugreports.qt.io/browse/QTBUG-103489). - "tst_qobjectrace" - ;; 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" - ;; This test is susceptible to the 600 ms timeout used: - "tst_qpauseanimation") "|") ")"))))) + (append + (list + ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". + "tst_moc" + + ;; The qgraphicsview and qopenglwidget tests fail with a + ;; segfault for unknown reasons (see: + ;; https://bugreports.qt.io/browse/QTBUG-116018). + "tst_qgraphicsview" + "tst_qopenglwidget" + + ;; 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" + ;; Not all of the tested formats are supported by our + ;; build of openssl; 871 passed, 122 failed. + "tst_qsslkey" + ;; 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_QObjectRace::destroyRace is flaky (see: + ;; https://bugreports.qt.io/browse/QTBUG-103489). + "tst_qobjectrace" + ;; 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" + ;; This test is susceptible to the 600 ms timeout used: + "tst_qpauseanimation") + #$@(cond + ((target-ppc64le?) + #~((list + ;; The 'tst_QPainter::fpe_radialGradients' + ;; test fails with a 'Floating point + ;; exception' error on powerpc64le (see: + ;; https://bugreports.qt.io/browse/QTBUG-117113). + "tst_qpainter" + + ;; The 'startStopStartStopBuffers' test fails + ;; on the powerpc64le architecture (see: + ;; https://bugreports.qt.io/browse/QTBUG-80953). + "tst_qprocess" + + ;; The 'tst_QSqlThread::readWriteThreading' + ;; test may fail with an sqlite related error, + ;; "'Unable to fetch row' || 'database is + ;; locked'" (see: + ;; https://bugreports.qt.io/browse/QTBUG-117114). + "tst_qsqlthread"))) + ((target-x86-32?) + #~((list + ;; QCOMPARE(qRound(actual), expected) returned TRUE + ;; unexpectedly. + "tst_qglobal" + + ;; Actual (llMinDbl == llMin) : 0 + ;; Expected (-9223372036854775807.0 == + ;; Q_INT64_C(-9223372036854775807)) : 1 + "tst_json" + + ;; 'QVector3D::normal(QVector3D(), v1, v2) == + ;; v3.normalized()' returned FALSE. () + "tst_qvectornd" + + ;; Actual (qRed(p)) : 11 + ;; Expected (qGreen(p)): 10 + "tst_qcolorspace" + + ;; Actual (dv.validate(value, dummy)): Invalid + ;; Expected (standard_state) : Intermediate + "tst_qdoublevalidator"))) + (else #~()))) "|") ")"))))) (replace 'patch-mkspecs (lambda* (#:key outputs #:allow-other-keys) (let* ((archdata (search-input-directory outputs "lib/qt6")) @@ -897,7 +945,8 @@ developers using C++ or QML, a CSS & JavaScript like language.") (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (native-inputs (modify-inputs (package-native-inputs qtbase-5) - (prepend wayland-protocols + (prepend tzdata-for-tests + wayland-protocols xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) @@ -921,6 +970,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (search-path-specification (variable "QT_PLUGIN_PATH") (files '("lib/qt6/plugins"))) + $TZDIR (search-path-specification (variable "XDG_DATA_DIRS") (files '("share"))) @@ -1335,6 +1385,7 @@ with JavaScript and C++."))) (base32 "06c7xfqn2a5s2m8j1bcvx3pyjqg1rgqkjvp49737gb4z9vjiz8gk")) (patches (search-patches "qtdeclarative-disable-qmlcache.patch")))) + (outputs '("out" "debug")) (build-system cmake-build-system) (arguments (list @@ -1751,7 +1802,14 @@ set of plugins for interacting with pulseaudio and GStreamer.") "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "") (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") - "")))) + "")) + #$@(if (target-aarch64?) + ;; The tst_surface::createSubsurface test fails on + ;; aarch64 (see: + ;; https://bugreports.qt.io/browse/QTBUG-117112). + #~((substitute* "tests/auto/client/client.pro" + ((".*surface.*") ""))) + #~()))) (add-before 'check 'set-test-environment (lambda _ ;; Do not fail just because /etc/machine-id is missing. @@ -2906,7 +2964,12 @@ linux/libcurl_wrapper.h") (lambda _ ;; Valid QT_BUILD_PARTS variables are: ;; libs tools tests examples demos docs translations - (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--" + (invoke "qmake" + #$@(if (target-x86-32?) + ;; Don't exhaust memory while linking. + #~("QMAKE_LFLAGS+=-Wl,--no-keep-memory -Wl,-z,now") + #~()) + "QT_BUILD_PARTS = libs tools" "--" "--webengine-printing-and-pdf=no" "--webengine-ffmpeg=system" ;; FIXME: Building qtwebengine-5 5.12.2 with diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 352f706b94..f97a2565e3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages openstack) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -87,6 +89,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -102,6 +105,7 @@ #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -215,49 +219,46 @@ mathematical operations, and much more.") (license license:expat))) (define-public rtl-sdr - ;; No tagged release since 2018 - (let ((commit "5e73f90f1d85d8db2e583f3dbf1cff052d71d59b") - (revision "1")) - (package - (name "rtl-sdr") - (version (git-version "0.6.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.osmocom.org/rtl-sdr/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "106fwzyr7cba952f3p3wm3hdqzm9zvm0v3gcz4aks2n7fnvrgrvn")))) - (build-system cmake-build-system) - (inputs - (list libusb)) - (native-inputs - (list pkg-config)) - (arguments - `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON" - "-DINSTALL_UDEV_RULES=ON") - #:tests? #f ; No tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("DESTINATION \"/etc/udev/") - (string-append "DESTINATION \"" - (assoc-ref outputs "out") - "/lib/udev/"))))) - (add-after 'fix-paths 'fix-udev-rules - (lambda _ - (substitute* "rtl-sdr.rules" - ;; The plugdev group does not exist; use dialout as in - ;; the hackrf package. - (("GROUP=\"plugdev\"") - "GROUP=\"dialout\""))))))) - (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") - (synopsis "Software defined radio driver for Realtek RTL2832U") - (description "DVB-T dongles based on the Realtek RTL2832U can be used as a + (package + (name "rtl-sdr") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/rtl-sdr/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0z8dn0gdava894fb9fs9gcwvmik31fcj6ldkggylc0mhgw5145pr")))) + (build-system cmake-build-system) + (inputs + (list libusb)) + (native-inputs + (list pkg-config)) + (arguments + `(#:configure-flags '("-DDETACH_KERNEL_DRIVER=ON" + "-DINSTALL_UDEV_RULES=ON") + #:tests? #f ; No tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("DESTINATION \"/etc/udev/") + (string-append "DESTINATION \"" + (assoc-ref outputs "out") + "/lib/udev/"))))) + (add-after 'fix-paths 'fix-udev-rules + (lambda _ + (substitute* "rtl-sdr.rules" + ;; The plugdev group does not exist; use dialout as in + ;; the hackrf package. + (("GROUP=\"plugdev\"") + "GROUP=\"dialout\""))))))) + (home-page "https://osmocom.org/projects/sdr/wiki/rtl-sdr") + (synopsis "Software defined radio driver for Realtek RTL2832U") + (description "DVB-T dongles based on the Realtek RTL2832U can be used as a cheap software defined radio, since the chip allows transferring the raw I/Q samples to the host. @code{rtl-sdr} provides drivers for this purpose. @@ -272,7 +273,7 @@ system configuration: To install the rtl-sdr udev rules, you must extend 'udev-service-type' with this package. E.g.: @code{(udev-rules-service 'rtl-sdr rtl-sdr)}") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public airspy (let ((commit "6f92f47146aa8a8fce59b60927cf8c53da6851b3") @@ -1198,7 +1199,7 @@ satellites.") (define-public gqrx (package (name "gqrx") - (version "2.16") + (version "2.17.3") (source (origin (method git-fetch) @@ -1207,7 +1208,7 @@ satellites.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "189cgmp88kabv823l5bfn1xfyyj6sldi5sdbmflvncxicf51b0yp")))) + (base32 "00pasp13gqglixl0iy9jb242vx1kczgpinjs3d8a1cl8yv5w6xkl")))) (build-system qt-build-system) (native-inputs (list pkg-config)) @@ -1660,13 +1661,19 @@ instances over the network, and general QSO and DXpedition logging.") (base32 "1lqd77v9xm58k9g9kfwxva3mmzm1yyk1v27nws5j1a293zfg2hkw")))) (build-system qt-build-system) (arguments - (list #:tests? #f)) ; No test suite + (list #:tests? #f ; No test suite + #:configure-flags + (if (this-package-native-input "ruby-asciidoctor") + #~'() + #~(list "-DWSJT_GENERATE_DOCS=OFF")))) (native-inputs - (list asciidoc - gfortran - pkg-config - qttools-5 - ruby-asciidoctor)) + (append (list asciidoc + gfortran + pkg-config + qttools-5) + (if (supported-package? ruby-asciidoctor) + (list ruby-asciidoctor) + '()))) (inputs (list boost fftw @@ -1912,7 +1919,7 @@ from devices on the 433 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz ISM bands.") (define-public multimon-ng (package (name "multimon-ng") - (version "1.2.0") + (version "1.3.0") (source (origin (method git-fetch) @@ -1921,7 +1928,7 @@ from devices on the 433 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz ISM bands.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0hm7391z1iz2sk4xkwfphqz8qvihqjzsh45csz14gb4jfs1p6ks2")))) + (base32 "1gd3kxb1w2fc6waa8g7af036yicjbg4a7hs0dgdci4d3aqwyz690")))) (build-system cmake-build-system) (inputs (list libx11 pulseaudio)) @@ -2336,7 +2343,7 @@ defined radio with support for rtl-sdr.") (define-public csdr (package (name "csdr") - (version "0.18.1") + (version "0.18.2") (source (origin (method git-fetch) @@ -2345,7 +2352,7 @@ defined radio with support for rtl-sdr.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1vgl7d03khdql45jq5xxayqfhb5sasxhjmrl621gyk1k8kxaqs8a")))) + (base32 "0j5d64na47w1j1sprwj41d9dzvs2x7xwyp0pbl439g686iwp7m9d")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) @@ -2567,7 +2574,7 @@ voice formats.") (define-public sdrangel (package (name "sdrangel") - (version "7.16.0") + (version "7.17.0") (source (origin (method git-fetch) @@ -2576,7 +2583,7 @@ voice formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1c2pdxw2a3pysqlmr42gghg0ga33afwdp6wc97h7s6gwc5km6zlk")))) + (base32 "16hpnfzccpj8a3i24ryli870ym6kjih981sjapcqdc8va0q14qdz")))) (build-system qt-build-system) (native-inputs (list doxygen graphviz pkg-config)) @@ -3089,6 +3096,53 @@ For example, it can decode the telemetry and images sent by some meteorological satellites.") (license license:gpl3))) +(define-public chirp + (let ((commit "f59b5b254c33be55c73368d6ab036eaadd9e5e76") + (revision "1")) + (package + (name "chirp") + (version (git-version "0.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kk7ds/chirp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1s2qwz00nxqqfrs87ayjbdqg5i8mxf5xgxmqpincsn8rjxgw1s7x")))) + (build-system python-build-system) + (native-inputs + (list python-mock + python-mox3 + python-pep8 + python-pytest + python-pytest-mock + python-pyyaml + python-tox)) + (inputs + (list python-future + python-importlib-resources + python-pyserial + python-requests + python-six + python-wxpython + python-yattag)) + (arguments + (list ;; FIXME: How to run the tests? The default way crashes. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'set-home-for-tests + (lambda _ + (setenv "HOME" "/tmp")))))) + (synopsis "Cross-radio programming tool") + (description "Chirp is a cross-radio programming tool. It supports a +growing list of radios across several manufacturers and allows transferring of +memory contents between them.") + (home-page "https://chirp.danplanet.com") + (license license:gpl3+)))) + (define-public qdmr (package (name "qdmr") diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index 80bfaf0896..5c25ed96da 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -199,7 +199,7 @@ Raspberry Pi. Note: It does not work on Raspberry Pi 1.") ("ld-wrapper" ,ld-wrapper) ("make" ,gnu-make) ("gcc" ,gcc-6) - ("locales" ,glibc-utf8-locales))) + ("locales" ,(libc-utf8-locales-for-target)))) (inputs `()) (arguments diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 97a0be0e65..b48e4ae53f 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -168,7 +168,7 @@ of parts of the Windows API.") (define-public xrdp (package (name "xrdp") - (version "0.9.22.1") + (version "0.9.23.1") (source (origin (method url-fetch) (uri (string-append @@ -176,7 +176,7 @@ of parts of the Windows API.") version "/xrdp-" version ".tar.gz")) (sha256 (base32 - "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd")))) + "1jpmwywzb6law2hrzm94qy2hgivs7izc2ci0w2h9yxn2j1mizdwg")))) (build-system gnu-build-system) (inputs (list check fuse-2 diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ff6829082c..1490c783fa 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,7 +130,13 @@ (build-system gnu-build-system) (arguments `(#:test-target "test" - #:configure-flags '("--enable-shared") ; dynamic linking + #:configure-flags + ,(if (%current-target-system) + '(list (string-append + "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--enable-shared") + ''("--enable-shared")) ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi @@ -147,6 +154,9 @@ "tool/rbinstall.rb") (("/bin/sh") (which "sh"))) #t))))) + (native-inputs (if (%current-target-system) + (list this-package) + '())) (inputs (list readline openssl-1.1 libffi gdbm)) (propagated-inputs @@ -177,7 +187,13 @@ a focus on simplicity and productivity.") "042xrdk7hsv4072bayz3f8ffqh61i8zlhvck10nfshllq063n877")))) (arguments `(#:test-target "test" - #:configure-flags '("--enable-shared") ; dynamic linking + #:configure-flags + ,(if (%current-target-system) + '(list (string-append + "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib") + "--enable-shared") + ''("--enable-shared")) ; dynamic linking #:phases (modify-phases %standard-phases (add-before 'configure 'replace-bin-sh-and-remove-libffi @@ -204,7 +220,10 @@ a focus on simplicity and productivity.") (delete-file "test/ruby/test_io.rb")))) '())))) (native-inputs - (list autoconf)))) + (append (if (%current-target-system) + (list this-package) + '()) + (list autoconf))))) (define ruby-2.7-fixed (package diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 894173b7dd..eb5214f534 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com> ;;; Copyright © 2023 Arnav Andrew Jose <arnav.jose@gmail.com> +;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1043,8 +1044,10 @@ bar. It is also compatible with sway.") "/share/man/man1")))) #t))) #:features '("pcre2"))) + (inputs + (list pcre2)) (native-inputs - (list asciidoc pcre2 pkg-config)) + (list asciidoc pkg-config)) (home-page "https://github.com/BurntSushi/ripgrep") (synopsis "Line-oriented search tool") (description @@ -1081,7 +1084,7 @@ touchscreen devices.") (define-public rust-swc (package (name "rust-swc") - (version "1.2.24") + (version "1.2.124") (source (origin (method git-fetch) @@ -1091,81 +1094,125 @@ touchscreen devices.") (file-name (git-file-name name version)) (sha256 (base32 - "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) + "1cb65vl437sy7shflsazi2k4sz53v3r85dj8rb32ny1j6njczj4h")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* (find-files "." "^Cargo\\.toml$") + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-base64" ,rust-base64-0.12) + `(#:install-source? #f + #:cargo-build-flags + '("--release" "-p" "swc_cli") + #:cargo-test-flags + '("--release" "-p" "swc_cli") + #:cargo-inputs + (("rust-abi-stable" ,rust-abi-stable-0.10) + ("rust-ahash" ,rust-ahash-0.7) + ("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-arbitrary" ,rust-arbitrary-1) + ("rust-auto-impl" ,rust-auto-impl-0.5) + ("rust-auto-impl" ,rust-auto-impl-0.4) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bincode" ,rust-bincode-1) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-browserslist-rs" ,rust-browserslist-rs-0.6) + ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-copyless" ,rust-copyless-0.1) ("rust-crc" ,rust-crc-1) ("rust-darling" ,rust-darling-0.10) - ("rust-dashmap" ,rust-dashmap-3) + ("rust-dashmap" ,rust-dashmap-4) + ("rust-debug-unreachable" ,rust-debug-unreachable-0.1) + ("rust-difference" ,rust-difference-2) ("rust-either" ,rust-either-1) - ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-glob" ,rust-glob-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-inflector" ,rust-inflector-0.11) ("rust-is-macro" ,rust-is-macro-0.1) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-log" ,rust-log-0.4) - ("rust-mimalloc" ,rust-mimalloc-0.1) - ("rust-napi" ,rust-napi-0.5) - ("rust-napi-build" ,rust-napi-build-0.2) - ("rust-napi-derive" ,rust-napi-derive-0.5) + ("rust-lexical" ,rust-lexical-5) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-lru" ,rust-lru-0.7) + ("rust-mimalloc-rust" ,rust-mimalloc-rust-0.1) + ("rust-napi" ,rust-napi-2) + ("rust-napi-build" ,rust-napi-build-1) + ("rust-napi-derive" ,rust-napi-derive-2) ("rust-nom" ,rust-nom-5) + ("rust-normpath" ,rust-normpath-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-ordered-float" ,rust-ordered-float-1) + ("rust-ordered-float" ,rust-ordered-float-2) + ("rust-owning-ref" ,rust-owning-ref-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-parking-lot" ,rust-parking-lot-0.7) + ("rust-parking-lot-core" ,rust-parking-lot-core-0.8) ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-paw" ,rust-paw-1) ("rust-petgraph" ,rust-petgraph-0.5) ("rust-phf" ,rust-phf-0.8) + ("rust-pmutil" ,rust-pmutil-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rayon" ,rust-rayon-1) ("rust-radix-fmt" ,rust-radix-fmt-1) ("rust-regex" ,rust-regex-1) ("rust-relative-path" ,rust-relative-path-1) ("rust-retain-mut" ,rust-retain-mut-0.1) + ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-semver" ,rust-semver-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-regex" ,rust-serde-regex-1) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-sourcemap" ,rust-sourcemap-6) ("rust-st-map" ,rust-st-map-0.1) ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-syn" ,rust-syn-1) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-typed-arena" ,rust-typed-arena-2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-anyhow" ,rust-anyhow-1) + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-dashmap" ,rust-dashmap-4) ("rust-env-logger" ,rust-env-logger-0.7) - ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-hex" ,rust-hex-0.4) + ("rust-ntest" ,rust-ntest-0.7) + ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha-1" ,rust-sha-1-0.9) ("rust-sourcemap" ,rust-sourcemap-6) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) - ("rust-tempfile" ,rust-tempfile-3)) - #:tests? #f ;; tests env_query_chrome_71 and project_env fail + ("rust-tempfile" ,rust-tempfile-3) + ("rust-url" ,rust-url-2) + ("rust-walkdir" ,rust-walkdir-2)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - (substitute* "ecmascript/jsdoc/src/lib.rs" - (("pub use self" all) - (string-append "#![feature(non_exhaustive)]\n" all))) - (substitute* "ecmascript/parser/src/lib.rs" - (("//! es2019" all) - (string-append "#![feature(non_exhaustive)] -#![feature(mem_take)] -#![feature(proc_macro_hygiene)] -" all))) - (substitute* "ecmascript/transforms/src/lib.rs" - (("#!\\[cfg_attr" all) - (string-append "#![feature(mem_take)]\n" all))) - #t)) - (add-after 'enable-unstable-features 'patch-build-failures - (lambda _ - (chmod ".cargo/config" 420) - (substitute* "ecmascript/transforms/macros/src/lib.rs" - (("use proc_macro::") - "extern crate proc_macro;\nuse proc_macro::")) - (substitute* "common/src/errors/emitter.rs" - ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) - #t))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "target/release/swc" bin))))))) (home-page "https://swc.rs/") (synopsis "Typescript/javascript compiler") (description "@code{rust-swc} is a typescript/javascript compiler. It @@ -1323,35 +1370,45 @@ rebase.") "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) -(define-public rust-cbindgen-0.24 +(define-public rust-cbindgen-0.26 (package (inherit rust-cbindgen) (name "rust-cbindgen") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jdbxmn5h5nlr4bifx85gny309djv5djs9q78fa1d7sj0wdw2sys")))) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-3) + ("rust-heck" ,rust-heck-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5)))) + (native-inputs (list python-cython)))) + +(define-public rust-cbindgen-0.24 + (package + (inherit rust-cbindgen-0.26) + (name "rust-cbindgen") (version "0.24.3") (source (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) - (arguments - `(#:cargo-inputs - (("rust-clap" ,rust-clap-3) - ("rust-heck" ,rust-heck-0.4) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-syn" ,rust-syn-1) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-toml" ,rust-toml-0.5)) - #:cargo-development-inputs - (("rust-serial-test" ,rust-serial-test-0.5)))) - (native-inputs - (list python-cython)))) + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))))) (define-public rust-cbindgen-0.23 (package @@ -1908,7 +1965,7 @@ background agent taking care of maintaining the necessary state.") (("rust-arbitrary" ,rust-arbitrary-1) ("rust-derive-arbitrary" ,rust-derive-arbitrary-1) ("rust-expect-test" ,rust-expect-test-1) - ("rust-oorandom" ,rust-oorandom-11.1) + ("rust-oorandom" ,rust-oorandom-11) ("rust-quote" ,rust-quote-1.0.10) ("rust-rayon" ,rust-rayon-1) ("rust-tracing" ,rust-tracing-0.1) @@ -2149,7 +2206,8 @@ consecutive lines and since program start.") (bin (string-append out "/bin")) (share (string-append out "/share")) (man (string-append out "/share/man")) - (vimfiles (string-append share "/vim/vimfiles/plugin")) + (vimfiles (string-append + share "/vim/vimfiles/pack/guix/start/skim/plugin")) (bash-completion (string-append share "/bash-completions/completions")) (zsh-site (string-append share "/zsh/site-functions")) @@ -2453,6 +2511,149 @@ are safe to modify, and which staged changes belong to each of those commits. It will then write @code{fixup!} commits for each of those changes.") (license license:bsd-3))) +(define-public rust-xremap + (package + (name "rust-xremap") + (version "0.8.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "xremap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1815hz1a93brj6v9102xypds1qslf6gxgk9vcvxhxlhy1c2pfxvj")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("1\\.0\\.75") "1.0.68") ; rust-anyhow + (("0\\.4\\.19") "0.4.17") ; rust-log + (("1\\.9\\.4") "1.9.1") ; regex + (("3\\.3") "3.0")))))) ; serde-with + (build-system cargo-build-system) + (arguments + `(#:features '() + #:install-source? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-derive-where" ,rust-derive-where-1) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-evdev" ,rust-evdev-0.12) + ("rust-fork" ,rust-fork-0.1) + ("rust-hyprland" ,rust-hyprland-0.3) + ("rust-indoc" ,rust-indoc-2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.26) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with" ,rust-serde-with-3) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-swayipc" ,rust-swayipc-3) + ("rust-wayland-client" ,rust-wayland-client-0.30) + ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1) + ("rust-x11rb" ,rust-x11rb-0.12) + ("rust-zbus" ,rust-zbus-1)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (xremap (string-append out "/bin/xremap"))) + (mkdir-p (string-append share "/bash-completion/completions")) + (with-output-to-file + (string-append share "/bash-completion/completions/xremap") + (lambda _ (invoke xremap "--completions" "bash"))) + (mkdir-p (string-append share "/fish/vendor_completions.d")) + (with-output-to-file + (string-append share "/fish/vendor_completions.d/xremap.fish") + (lambda _ (invoke xremap "--completions" "fish"))) + (mkdir-p (string-append share "/zsh/site-functions")) + (with-output-to-file + (string-append share "/zsh/site-functions/_xremap") + (lambda _ (invoke xremap "--completions" "zsh"))) + (mkdir-p (string-append share "/elvish/lib")) + (with-output-to-file + (string-append share "/elvish/lib/xremap") + (lambda _ (invoke xremap "--completions" "elvish"))))))))) + (home-page "https://github.com/k0kubun/xremap") + (synopsis "Dynamic key remapp for X and Wayland") + (description "This package provides dynamic key remapp for X and Wayland.") + (license license:expat))) + +(define-public xremap-gnome + (package + (inherit rust-xremap) + (name "xremap-gnome") + (arguments + (substitute-keyword-arguments (package-arguments rust-xremap) + ((#:features _) '(list "gnome")))))) + +(define-public xremap-sway + (package + (inherit rust-xremap) + (name "xremap-sway") + (arguments + (substitute-keyword-arguments (package-arguments rust-xremap) + ((#:features _) '(list "sway")))))) + +(define-public xremap-wlroots + (package + (inherit rust-xremap) + (name "xremap-wlroots") + (arguments + (substitute-keyword-arguments (package-arguments rust-xremap) + ((#:features _) '(list "wlroots")))))) + +(define-public xremap-x11 + (package + (inherit rust-xremap) + (name "xremap-x11") + (arguments + (substitute-keyword-arguments (package-arguments rust-xremap) + ((#:features _) '(list "x11")))))) + +(define-public xsv + (package + (name "xsv") + (version "0.13.0") + (source (origin + (method url-fetch) + (uri (crate-uri "xsv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pvzr7x5phlya6m5yikvy13vgbazshw0plysckz9zmf2ly5x4jl8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-chan" ,rust-chan-0.1) + ("rust-csv" ,rust-csv-1) + ("rust-csv-index" ,rust-csv-index-0.1) + ("rust-docopt" ,rust-docopt-1) + ("rust-filetime" ,rust-filetime-0.1) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-rand" ,rust-rand-0.4) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-streaming-stats" ,rust-streaming-stats-0.2) + ("rust-tabwriter" ,rust-tabwriter-1) + ("rust-threadpool" ,rust-threadpool-1)) + #:cargo-development-inputs + (("rust-log" ,rust-log-0.4) + ("rust-quickcheck" ,rust-quickcheck-0.6)))) + (home-page "https://github.com/BurntSushi/xsv") + (synopsis "High performance CSV command line toolkit") + (description + "This package provides a high performance CSV command line toolkit.") + (license (list license:unlicense license:expat)))) + (define-public zoxide (package (name "zoxide") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 54dcc4cc6b..e4ea3aaaad 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -16,6 +16,8 @@ ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org> ;;; Copyright © 2022 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2023 Fries <fries1234@protonmail.com> +;;; Copyright © 2023 Herman Rimm <herman_rimm@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -709,6 +711,115 @@ safety and thread safety guarantees.") (rust-bootstrapped-package rust-1.67 "1.68.2" "15ifyd5jj8rd979dkakp887hgmhndr68pqaqvd2hqkfdywirqcwk")) +(define rust-1.69 + (let ((base-rust + (rust-bootstrapped-package + rust-1.68 "1.69.0" + "03zn7kx5bi5mdfsqfccj4h8gd6abm7spj0kjsfxwlv5dcwc9f1gv"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$"))))))))) + +(define rust-1.70 + (let ((base-rust + (rust-bootstrapped-package + rust-1.69 "1.70.0" + "0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s1c0axgxj"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + ;; Rust 1.70 adds the rustix library which depends on the vendored + ;; fd-lock crate. The fd-lock crate uses Outline assembly which expects + ;; a precompiled static library. Enabling the "cc" feature tells the + ;; build.rs script to compile the assembly files instead of searching + ;; for a precompiled library. + (patches (search-patches "rust-1.70-fix-rustix-build.patch"))))))) + +(define rust-1.71 + (let ((base-rust + (rust-bootstrapped-package + rust-1.70 "1.71.1" "0bj79syjap1kgpg9pc0r4jxc0zkxwm6phjf3digsfafms580vabg"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + (lambda _ + (substitute* (cons* "Cargo.lock" + "src/bootstrap/Cargo.lock" + (find-files "src/tools" "Cargo.lock")) + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor")))))))))) + +(define rust-1.72 + (let ((base-rust + (rust-bootstrapped-package + rust-1.71 "1.72.1" "15gqd1jzhnc16a7gjmav4x1v83jjbzyjh1gvcdfvpkajd9gq8j3z"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust rustc_driver to explicitly use rustix with libc backend. + (substitute* "compiler/rustc_driver/Cargo.toml" + (("rustix = \"=0.37.11\"") + (string-append "rustix = { version = \"=0.37.11\"," + " features = [\"use-libc\"] }")))))))))) + +(define rust-1.73 + (let ((base-rust (rust-bootstrapped-package rust-1.72 "1.73.0" + "0fmvn7vg3qg9xprgfwv10g3ygy8i4j4bkcxcr1xdy89d3xnjxmln"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + (snippet + '(begin + (for-each delete-file-recursively + '("src/llvm-project" + "vendor/tikv-jemalloc-sys/jemalloc")) + ;; Remove vendored dynamically linked libraries. + ;; find . -not -type d -executable -exec file {} \+ | grep ELF + ;; Also remove the bundled (mostly Windows) libraries. + (for-each delete-file + (find-files "vendor" "\\.(a|dll|exe|lib)$")) + ;; Adjust vendored dependency to explicitly use rustix with libc backend. + (substitute* "vendor/tempfile-3.6.0/Cargo.toml" + (("features = \\[\"fs\"" all) + (string-append all ", \"use-libc\"")))))))))) + +(define (make-ignore-test-list strs) + "Function to make creating a list to ignore tests a bit easier." + (map (lambda (str) + `((,str) (string-append "#[ignore]\n" ,str))) + strs)) + ;;; Note: Only the latest version of Rust is supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time @@ -717,10 +828,10 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.68)) + (let ((base-rust rust-1.70)) (package (inherit base-rust) - (outputs (cons "rustfmt" (package-outputs base-rust))) + (outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) ((#:tests? _ #f) @@ -741,52 +852,36 @@ safety and thread safety guarantees.") (substitute* "src/tools/compiletest/src/runtest.rs" (("\"-nx\".as_ref\\(\\), ") "")))) - (add-after 'unpack 'patch-cargo-env-shebang - (lambda _ - (substitute* '("src/tools/cargo/tests/testsuite/build.rs" - "src/tools/cargo/tests/testsuite/fix.rs") - ;; The cargo *_wrapper tests set RUSTC.*WRAPPER environment - ;; variable which points to /usr/bin/env. Since it's not a - ;; shebang, it needs to be manually patched. - (("/usr/bin/env") - (which "env"))))) (add-after 'unpack 'disable-tests-requiring-git (lambda _ - (substitute* "src/tools/cargo/tests/testsuite/new.rs" - (("fn author_prefers_cargo") - "#[ignore]\nfn author_prefers_cargo") - (("fn finds_author_git") - "#[ignore]\nfn finds_author_git") - (("fn finds_local_author_git") - "#[ignore]\nfn finds_local_author_git")))) + (substitute* "src/tools/cargo/tests/testsuite/git.rs" + ,@(make-ignore-test-list + '("fn fetch_downloads_with_git2_first_"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ - (substitute* - "src/tools/cargo/tests/testsuite/init/simple_hg_ignore_exists/mod.rs" - (("fn simple_hg_ignore_exists") - "#[ignore]\nfn simple_hg_ignore_exists")) - (substitute* - "src/tools/cargo/tests/testsuite/init/mercurial_autodetect/mod.rs" - (("fn mercurial_autodetect") - "#[ignore]\nfn mercurial_autodetect")))) + (with-directory-excursion "src/tools/cargo/tests/testsuite/init" + (substitute* '("mercurial_autodetect/mod.rs" + "simple_hg_ignore_exists/mod.rs") + ,@(make-ignore-test-list + '("fn case")))))) (add-after 'unpack 'disable-tests-broken-on-aarch64 (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/" (substitute* "build_script_extra_link_arg.rs" - (("^fn build_script_extra_link_arg_bin_single" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn build_script_extra_link_arg_bin_single"))) (substitute* "build_script.rs" - (("^fn env_test" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn env_test"))) (substitute* "collisions.rs" - (("^fn collision_doc_profile_split" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn collision_doc_profile_split"))) (substitute* "concurrent.rs" - (("^fn no_deadlock_with_git_dependencies" m) - (string-append "#[ignore]\n" m))) + ,@(make-ignore-test-list + '("fn no_deadlock_with_git_dependencies"))) (substitute* "features2.rs" - (("^fn dep_with_optional_host_deps_activated" m) - (string-append "#[ignore]\n" m)))))) + ,@(make-ignore-test-list + '("fn dep_with_optional_host_deps_activated")))))) (add-after 'unpack 'patch-command-exec-tests ;; This test suite includes some tests that the stdlib's ;; `Command` execution properly handles in situations where @@ -794,16 +889,14 @@ safety and thread safety guarantees.") ;; since we don't have `echo` available at its usual FHS ;; location. (lambda _ - (substitute* (match (find-files "." "^command-exec.rs$") - ((file) file)) + (substitute* "tests/ui/command/command-exec.rs" (("Command::new\\(\"echo\"\\)") (format #f "Command::new(~s)" (which "echo")))))) (add-after 'unpack 'patch-command-uid-gid-test (lambda _ - (substitute* (match (find-files "." "^command-uid-gid.rs$") - ((file) file)) - (("/bin/sh") - (which "sh"))))) + (substitute* "tests/ui/command/command-uid-gid.rs" + (("/bin/sh") (which "sh")) + (("/bin/ls") (which "ls"))))) (add-after 'unpack 'skip-shebang-tests ;; This test make sure that the parser behaves properly when a ;; source file starts with a shebang. Unfortunately, the @@ -815,26 +908,29 @@ safety and thread safety guarantees.") (add-after 'unpack 'patch-process-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (assoc-ref inputs "bash"))) - (substitute* "library/std/src/process/tests.rs" - (("\"/bin/sh\"") - (string-append "\"" bash "/bin/sh\""))) - ;; The three tests which are known to fail upstream on QEMU - ;; emulation on aarch64 and riscv64 also fail on x86_64 in Guix's - ;; build system. Skip them on all builds. - (substitute* "library/std/src/sys/unix/process/process_common/tests.rs" - (("target_arch = \"arm\",") "target_os = \"linux\","))))) + (with-directory-excursion "library/std/src" + (substitute* "process/tests.rs" + (("\"/bin/sh\"") + (string-append "\"" bash "/bin/sh\""))) + ;; The three tests which are known to fail upstream on QEMU + ;; emulation on aarch64 and riscv64 also fail on x86_64 in + ;; Guix's build system. Skip them on all builds. + (substitute* "sys/unix/process/process_common/tests.rs" + ;; We can't use make-ignore-test-list because we will get + ;; build errors due to the double [ignore] block. + (("target_arch = \"arm\"" arm) + (string-append "target_os = \"linux\",\n" + " " arm))))))) (add-after 'unpack 'disable-interrupt-tests (lambda _ ;; This test hangs in the build container; disable it. - (substitute* (match (find-files "." "^freshness.rs$") - ((file) file)) - (("fn linking_interrupted") - "#[ignore]\nfn linking_interrupted")) + (substitute* "src/tools/cargo/tests/testsuite/freshness.rs" + ,@(make-ignore-test-list + '("fn linking_interrupted"))) ;; Likewise for the ctrl_c_kills_everyone test. - (substitute* (match (find-files "." "^death.rs$") - ((file) file)) - (("fn ctrl_c_kills_everyone") - "#[ignore]\nfn ctrl_c_kills_everyone")))) + (substitute* "src/tools/cargo/tests/testsuite/death.rs" + ,@(make-ignore-test-list + '("fn ctrl_c_kills_everyone"))))) (add-after 'unpack 'adjust-rpath-values ;; This adds %output:out to rpath, allowing us to install utilities in ;; different outputs while reusing the shared libraries. @@ -854,18 +950,20 @@ safety and thread safety guarantees.") (string-append all "gdb = \"" gdb "/bin/gdb\"\n")))))) (replace 'build - ;; Phase overridden to also build rustfmt. + ;; Phase overridden to also build more tools. (lambda* (#:key parallel-build? #:allow-other-keys) (let ((job-spec (string-append "-j" (if parallel-build? (number->string (parallel-job-count)) "1")))) (invoke "./x.py" job-spec "build" - "library/std" ;rustc + "library/std" ;rustc "src/tools/cargo" + "src/tools/clippy" + "src/tools/rust-analyzer" "src/tools/rustfmt")))) (replace 'check - ;; Phase overridden to also test rustfmt. + ;; Phase overridden to also test more tools. (lambda* (#:key tests? parallel-build? #:allow-other-keys) (when tests? (let ((job-spec (string-append @@ -875,9 +973,11 @@ safety and thread safety guarantees.") (invoke "./x.py" job-spec "test" "-vv" "library/std" "src/tools/cargo" + "src/tools/clippy" + "src/tools/rust-analyzer" "src/tools/rustfmt"))))) (replace 'install - ;; Phase overridden to also install rustfmt. + ;; Phase overridden to also install more tools. (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") (substitute* "config.toml" @@ -886,10 +986,26 @@ safety and thread safety guarantees.") (format #f "prefix = ~s" (assoc-ref outputs "cargo")))) (invoke "./x.py" "install" "cargo") (substitute* "config.toml" - ;; Adjust the prefix to the 'rustfmt' output. + ;; Adjust the prefix to the 'tools' output. (("prefix = \"[^\"]*\"") - (format #f "prefix = ~s" (assoc-ref outputs "rustfmt")))) - (invoke "./x.py" "install" "rustfmt"))))))) + (format #f "prefix = ~s" (assoc-ref outputs "tools")))) + (invoke "./x.py" "install" "clippy") + (invoke "./x.py" "install" "rust-analyzer") + (invoke "./x.py" "install" "rustfmt"))) + (add-after 'install 'install-rust-src + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "rust-src")) + (dest "/lib/rustlib/src/rust")) + (mkdir-p (string-append out dest)) + (copy-recursively "library" (string-append out dest "/library")) + (copy-recursively "src" (string-append out dest "/src"))))) + (add-after 'install-rust-src 'wrap-rust-analyzer + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "tools") + "/bin/rust-analyzer") + `("RUST_SRC_PATH" ":" = + (,(string-append (assoc-ref outputs "rust-src") + "/lib/rustlib/src/rust/library")))))))))) ;; Add test inputs. (native-inputs (cons* `("gdb" ,gdb/pinned) `("procps" ,procps) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index e40fa9f7db..18acf52cbf 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -466,34 +466,30 @@ key-value pair databases and a real LDAP database.") (define-public ppp (package (name "ppp") - (version "2.4.9") + (version "2.5.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ppp-project/ppp") - (commit version))) + (commit (string-append "ppp-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) + "1pkvaxi5318lvsadspj603wdkxah01vgjhywri7rv249p249vfr7")))) (build-system gnu-build-system) (arguments - (list #:tests? #f ;; No "check" target - #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'patch-Makefile - (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl (assoc-ref inputs "openssl")) - (libpcap (assoc-ref inputs "libpcap"))) - (substitute* "pppd/Makefile.linux" - (("/usr/include/openssl") - (string-append openssl "/include")) - (("-DPPP_FILTER") - (string-append "-DPPP_FILTER -I" libpcap "/include"))) - (substitute* "pppd/pppcrypt.h" - (("des\\.h") "openssl/des.h"))) - #t))))) + (list #:tests? #f ; no tests + #:configure-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "--with-openssl=" + (assoc-ref %build-inputs "openssl"))) + #:make-flags #~(list "V=1") ; better build logs + #:phases + #~(modify-phases %standard-phases + (add-before 'bootstrap 'no-/bin/sh + (lambda _ (delete-file "autogen.sh")))))) + (native-inputs + (list autoconf automake libtool)) (inputs (list libpcap openssl)) (synopsis "Implementation of the Point-to-Point Protocol") @@ -510,6 +506,38 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.") license:gpl2+ license:public-domain)))) +(define-public ppp-2.4.9 + (package + (inherit ppp) + (name "ppp") + (version "2.4.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ppp-project/ppp") + (commit (string-append "ppp-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk")))) + (arguments + (list #:tests? #f ;; No "check" target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-Makefile + (lambda* (#:key inputs #:allow-other-keys) + (let ((openssl (assoc-ref inputs "openssl")) + (libpcap (assoc-ref inputs "libpcap"))) + (substitute* "pppd/Makefile.linux" + (("/usr/include/openssl") + (string-append openssl "/include")) + (("-DPPP_FILTER") + (string-append "-DPPP_FILTER -I" libpcap "/include"))) + (substitute* "pppd/pppcrypt.h" + (("des\\.h") "openssl/des.h"))) + #t))))))) + (define-public wsdd (package (name "wsdd") diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 11aa5e1602..3a4aafcaa7 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -14,6 +14,8 @@ ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com> +;;; Copyright © 2023 dan <i@dan.games> ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +43,7 @@ #: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 trivial) #:use-module (gnu packages audio) @@ -58,6 +61,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages gl) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -114,7 +118,7 @@ joystick, and graphics hardware.") (package (inherit sdl) (name "sdl2") - (version "2.26.2") + (version "2.28.5") (source (origin (method url-fetch) (uri @@ -122,7 +126,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "1q4r1camsr17mnpv00d6h3qy93b481rp68r6fbxbszq3vv1rplwm")))) + "1r36cspzv6h8abiqbbkrgm17g975p9wiziir2xabj3721dyv6b1k")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) @@ -131,11 +135,13 @@ joystick, and graphics hardware.") #$flags)) ((#:make-flags flags ''()) #~(cons* - ;; SDL dlopens libudev, so make sure it is in rpath. This overrides - ;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary - ;; as sdl2 includes Mesa by default. + ;; SDL dlopens libudev and libvulkan, so make sure they are in + ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags, + ;; which isn’t necessary as sdl2 includes Mesa by default. (string-append "LDFLAGS=-Wl,-rpath," - #$(this-package-input "eudev") "/lib") + #$(this-package-input "eudev") "/lib" + ",-rpath," + #$(this-package-input "vulkan-loader") "/lib") #$flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems @@ -149,6 +155,7 @@ joystick, and graphics hardware.") ibus-minimal libxkbcommon libxcursor ;enables X11 cursor support + vulkan-loader wayland wayland-protocols))) (license license:bsd-3))) @@ -563,6 +570,31 @@ directory.") (prepend harfbuzz freetype))) (properties '((upstream-name . "SDL2_ttf"))))) +(define-public sdl2-gamecontrollerdb + (let ((commit "6f3c4edcb5a2e2ed090ca8af40d2c0f00dcd77f6") + (revision "0")) + (package + (name "sdl2-gamecontrollerdb") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gabomdq/SDL_GameControllerDB") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gciqc8qm2qgcjj5s9jpclznznsp6awl4ldrnj7g01chkcx0l6a3")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("gamecontrollerdb.txt" "share/sdl2/")))) + (home-page "https://github.com/gabomdq/SDL_GameControllerDB") + (synopsis "SDL2 game controller database") + (description + "This package provides a community sourced database of game controller +mappings intended for the use with SDL2's game controller functionality.") + (license license:zlib)))) + (define-public guile-sdl (package (name "guile-sdl") diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index d0b4bd2735..e836b4f8b3 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2017, 2019, 2020, 2021, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2019, 2020, 2022 Marius Bakke <marius@gnu.org> @@ -819,6 +819,23 @@ game development and other performance-critical applications.") ;; Compile with -fPIC, needed for shared lib. #~(cons "-DFLATBUFFERS_CXX_FLAGS=-fPIC" #$flags)))))) +(define-public python-flatbuffers + (package + (name "python-flatbuffers") + (version "23.1.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flatbuffers" version)) + (sha256 + (base32 "11gzc7mhl984248q6abz5rrsph76j0y99mwk24xc90sxpcxr2j59")))) + (build-system pyproject-build-system) + (home-page "https://google.github.io/flatbuffers/") + (synopsis "FlatBuffers serialization for Python") + (description "This package provides the @code{FlatBuffers} serialization +format for Python.") + (license license:asl2.0))) + (define-public python-feather-format (package (name "python-feather-format") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8042fab12f..8d2aadc0aa 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -543,14 +543,14 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "1wcv1sk8igs5kb9fqb8njbxwiqbwzpn0kdx9xkaddq3wn6msma25")) + "0fddxzd45zvfr687mvd90f5s376yz0a8ln7qbpl94q89z7l0y77k")) (modules '((guix build utils))) (snippet #~(begin @@ -789,7 +789,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (define-public loksh (package (name "loksh") - (version "7.3") + (version "7.4") (source (origin (method git-fetch) (uri (git-reference @@ -801,7 +801,7 @@ The OpenBSD Korn Shell is a cleaned up and enhanced ksh.") (file-name (git-file-name name version)) (sha256 (base32 - "1miydvb79wagckchinp189l8i81f08lqajg5jngn77m4x4gwjf3n")))) + "0arbncmgs3wzkwlqzp5za8rwh9px2r5mn3i979rabc4cms1bs0l1")))) (build-system meson-build-system) (inputs (list ncurses)) (native-inputs (list pkg-config)) @@ -938,8 +938,16 @@ as part of the Guix bootstrap process.") (base32 "18ylb54l9lmaynapbncc1zhbsirhihznrxihhxgqrpqgyjkfbap6")))) (build-system gnu-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'skip-failing-tests + (lambda _ + (substitute* "Makefile.am" + (("tests/sort\\.org") "")) + (for-each delete-file '("configure" "Makefile.in"))))))) (native-inputs - (list pkg-config)) + (list autoconf automake pkg-config)) (inputs (list guile-3.0 gash)) (home-page "https://savannah.nongnu.org/projects/gash/") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index a7c437d6b4..7e5a929241 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages jupyter) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) @@ -528,35 +529,42 @@ Sphinx documentation into your web application. It provides tools to integrate Sphinx documents in web templates and to handle searches.") (license license:bsd-3))) - (define-public python-sphinx-gallery (package (name "python-sphinx-gallery") - (version "0.10.1") + (version "0.14.0") (source (origin (method url-fetch) (uri (pypi-uri "sphinx-gallery" version)) (sha256 - (base32 "1r07sa34511fbnwi2s32q00qdyv5d23d05imyfgnh2ivhfq34gwm")))) - (build-system python-build-system) + (base32 "1hj380d5bjhbzxmhjw8f8b71jy1wk8crad0g3n750m990fphljia")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'writable-files-for-tests + (list + #:test-flags + '(list "--pyargs" "sphinx_gallery" "-k" + (string-append + ;; These tests require online data. + "not test_embed_code_links_get_data" + " and not test_run_sphinx" + ;; Requires webp support + " and not test_image_formats" + ;; Needs graphviz + " and not test_rebuild" + ;; Fails because we've deleted an example file, so the numbers + ;; don't match. + " and not test_junit" + ;; AssertionError. + " and not test_embed_links_and_styles")) + #:phases + '(modify-phases %standard-phases + ;; TODO: Our version of matplotlib does not support webp. + (add-after 'unpack 'delete-webp-example (lambda _ - (for-each make-file-writable (find-files ".")))) - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest" "--pyargs" "sphinx_gallery" "-k" - (string-append - ;; These tests require online data. - "not test_embed_code_links_get_data" - " and not test_run_sphinx" - ;; AssertionError. - " and not test_embed_links_and_styles")))))))) + (delete-file "sphinx_gallery/tests/tinybuild/examples/plot_webp.py")))))) + (propagated-inputs + (list python-jupyterlite-sphinx)) (native-inputs (list python-joblib python-matplotlib @@ -626,7 +634,9 @@ introspection of @code{zope.interface} instances in code.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x9wmgf04rzivbzp7jv1b7fkhkpi02lpk5w1qf4i7bcgih00ym8a")))) + (base32 "0x9wmgf04rzivbzp7jv1b7fkhkpi02lpk5w1qf4i7bcgih00ym8a")) + (patches + (search-patches "python-sphinx-prompt-docutils-0.19.patch")))) (build-system python-build-system) (arguments `(#:phases diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index f4ba512873..31f7b54641 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -199,7 +199,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "9.4p1") + (version "9.5p1") (source (origin (method url-fetch) @@ -207,7 +207,7 @@ a server that supports the SSH-2 protocol.") "openssh-" version ".tar.gz")) (patches (search-patches "openssh-trust-guix-store-directory.patch")) (sha256 - (base32 "11bahrik5qi337m954g5479f63cxnxdch076ng7668fvi28gs21n")))) + (base32 "0sq8hqk6f0x6djgvqawjbwwxpwd8r1nzjahqfl7m9yx7kfvyf9ph")))) (build-system gnu-build-system) (arguments (list @@ -474,33 +474,31 @@ with optional @acronym{TLS, Transport-Level Security} to protect credentials.") "1pax8sqlvcc7ammsxd9r53yx4m2hg1827wfz6f4rrwjx9q9lnbl7")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-FHS-file-names - (lambda _ - (substitute* "scripts/mosh.pl" - (("/bin/sh") - (which "sh"))) - #t)) - (add-after 'install 'wrap - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'mosh' can find 'mosh-client' and - ;; 'mosh-server'. - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (wrap-program (string-append bin "/mosh") - `("PATH" ":" prefix (,bin))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/mosh.pl" + (("/bin/sh" shell) + (search-input-file inputs shell))))) + (add-after 'install 'wrap + (lambda _ + ;; Make sure 'mosh' can find 'mosh-client' and 'mosh-server'. + (let ((bin (string-append #$output "/bin"))) + (wrap-program (string-append bin "/mosh") + `("PATH" ":" prefix (,bin))))))))) (native-inputs (list pkg-config)) (inputs - `(("bash" ,bash-minimal) ; for wrap-program - ("openssl" ,openssl) - ("perl" ,perl) - ("perl-io-tty" ,perl-io-tty) - ("zlib" ,zlib) - ("ncurses" ,ncurses) - ("protobuf" ,protobuf) - ("boost-headers" ,boost))) + (list bash-minimal ;for 'wrap-program' + boost + ncurses + openssl + perl + perl-io-tty + protobuf + zlib)) (home-page "https://mosh.org/") (synopsis "Remote shell tolerant to intermittent connectivity") (description diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 4c43c144fb..26c1ac14ec 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -652,13 +652,13 @@ estimation) corresponding to the book: Wand, M.P. and Jones, M.C. (1995) (define-public r-lattice (package (name "r-lattice") - (version "0.21-9") + (version "0.22-5") (source (origin (method url-fetch) (uri (cran-uri "lattice" version)) (sha256 (base32 - "0ak9k6s6drd1a25m7mwzb426ms92a2p3ps04h2pacifwnk74ca59")))) + "1wd5dlxi0hd4l08g999y3xnxnaq06gwvflcqr9ym0cx131gbw7xs")))) (build-system r-build-system) (home-page "https://lattice.r-forge.r-project.org/") (synopsis "High-level data visualization system") @@ -672,14 +672,14 @@ also flexible enough to handle most nonstandard requirements.") (define-public r-matrix (package (name "r-matrix") - (version "1.6-1.1") + (version "1.6-3") (source (origin (method url-fetch) (uri (cran-uri "Matrix" version)) (sha256 (base32 - "1hlcxr38p4ybb67n25cc1ssh2q2r8cj0flc59lid8hclzvqv27ik")))) + "094n9qf5j7bzi4cyxhm276qx2b2qp676ad8w9gql0qhzhfc889li")))) (properties `((upstream-name . "Matrix"))) (build-system r-build-system) (propagated-inputs @@ -757,14 +757,14 @@ single hidden layer, and for multinomial log-linear models.") (define-public r-rpart (package (name "r-rpart") - (version "4.1.19") + (version "4.1.21") (source (origin (method url-fetch) (uri (cran-uri "rpart" version)) (sha256 (base32 - "0rcm4hk2k0ag9qmb0f933yqrq8jpnclwrzp6825swgsqnp83wwpy")))) + "0av28n5as53qrxm41hcrwv59qdv7gfli668q32z0a5r1bdkiqz77")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/rpart") (synopsis "Recursive partitioning and regression trees") @@ -1178,14 +1178,14 @@ solution for sending email, including attachments, from within R.") (define-public r-stringi (package (name "r-stringi") - (version "1.7.12") + (version "1.8.1") (source (origin (method url-fetch) (uri (cran-uri "stringi" version)) (sha256 (base32 - "02g0464sbprrbjlacx727p9ad1s5nbxl2mnvfmm9h7q000lsrs7g")))) + "0jm2f5wh231dzs46g7ic2k4633x9v9bd2a03dlpmq5rr46j299ay")))) (build-system r-build-system) (inputs (list icu4c)) (native-inputs (list pkg-config)) @@ -1204,13 +1204,13 @@ transliteration, concatenation, date-time formatting and parsing, etc.") (define-public r-stringr (package (name "r-stringr") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (cran-uri "stringr" version)) (sha256 - (base32 "0fk34ql5ak57f06l10ai300kxay6r7kkkyfanh8r24qaf3bmkcaj")))) + (base32 "1pj5xwg8kq2jllmszgkw96qj37wlb0x0vx4f3m5j211zpd8yrbd4")))) (build-system r-build-system) (propagated-inputs (list r-cli r-glue r-lifecycle r-magrittr r-rlang r-stringi r-vctrs)) @@ -1252,13 +1252,13 @@ using just two functions: melt and dcast (or acast).") (define-public r-ggplot2 (package (name "r-ggplot2") - (version "3.4.3") + (version "3.4.4") (source (origin (method url-fetch) (uri (cran-uri "ggplot2" version)) (sha256 - (base32 "0hx5j47y2fxrcg4fxavyn5jjycpwkmsiqsjh6kj7nwp7dg79mqjw")))) + (base32 "0iiywrzv8j0npasvzgkxwhw0zqisf4xmpx06jl0lsq1ybl3fqxid")))) (build-system r-build-system) (propagated-inputs (list r-cli @@ -1268,10 +1268,10 @@ using just two functions: melt and dcast (or acast).") r-lifecycle r-mass r-mgcv - r-tibble r-rlang r-scales r-svglite ; Needed for 'ggsave' + r-tibble r-vctrs r-withr)) (native-inputs @@ -1316,19 +1316,19 @@ agnes cluster diagrams.") (define-public r-gdtools (package (name "r-gdtools") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (cran-uri "gdtools" version)) (sha256 (base32 - "10rlx1ciyvh0ayic03kckv360idl9s1zyc2ar5lisns786c1hnns")))) + "00mak9js1s05j5bmkda24nl2z023jsyg8zc60nm4h2xs7w1l7mxa")))) (build-system r-build-system) (native-inputs (list pkg-config)) (inputs - (list cairo fontconfig freetype)) + (list cairo fontconfig freetype zlib)) (propagated-inputs (list r-curl r-fontquiver @@ -1346,22 +1346,19 @@ and to generate base64 encoded string from raster matrix.") (define-public r-svglite (package (name "r-svglite") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (cran-uri "svglite" version)) (sha256 - (base32 - "0mmcipyqq4hs8fnb7301gdhl9ic4m80f1fp2x6z5vc61xrlh2w28")))) + (base32 "0c00djvlnf4qr30srh3xjnx1valqq8grm5ib0q4485z8gphn7hf2")))) + (properties `((upstream-name . "svglite"))) (build-system r-build-system) - (inputs - (list libpng zlib)) - (propagated-inputs - (list r-cpp11 r-systemfonts)) - (native-inputs - (list r-knitr)) - (home-page "https://github.com/hadley/svglite") + (inputs (list libpng zlib)) + (propagated-inputs (list r-cpp11 r-systemfonts)) + (native-inputs (list r-knitr)) + (home-page "https://svglite.r-lib.org") (synopsis "SVG graphics device") (description "@code{svglite} is a graphics device that produces clean @@ -1451,13 +1448,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "0sz4zimz4brbd9sawdazfgipkmfzzdmdq01b5m8pnrql5xrxhiwh")))) + "0p540jl6sixpgk08cp2h9470d28p7n66pfafiskvz3rba0vrrky9")))) (build-system r-build-system) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") @@ -1537,13 +1534,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "1.9") + (version "1.11") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "0201v3spgl8a5c5xkddac5a3z9zh8d0nm9yg6alyhhj4cjwmgibh")))) + "052zrb6bnr6k3p9pmm3vfh3g7z20g6pjvphjdiqyjb4mb9sn3z27")))) (build-system r-build-system) ;; Skip check phase because the tests require the r-knitr package to be ;; installed. This prevents installation failures. Knitr normally @@ -1581,13 +1578,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.44") + (version "1.45") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "015ylljvx0q2himch4k813021nvh0l7p5x3aqdkj3w0ax8x8k3ki")))) + "1yw4fnzm8lvh6kpcdlvr1fahz7421h5mmaris58zlgn57fjxwbpf")))) (build-system r-build-system) (propagated-inputs (list r-evaluate r-highr r-xfun r-yaml)) @@ -1724,13 +1721,13 @@ R packages that praise their users.") (define-public r-testthat (package (name "r-testthat") - (version "3.1.10") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "1xh80rxv0whz618kpwzlzg0jg2vhm4073nyx03hd4xpg0ifhhd9i")))) + "03k58p8kd7vddx7rlcyi28sy48bh3w4xy4c7wi190l7yjlrfa2sv")))) (build-system r-build-system) (propagated-inputs (list r-brio @@ -1785,13 +1782,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "16fsibxbh4fy62x6fw358qbniw085qs1wjyr75n22xv9g6kwjpjy")))) + "14l0dz36wav2jbz0dd3w34va68lrhr7fgd9dqf1v4nawdvff23ia")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") @@ -1869,14 +1866,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "2.3.4") + (version "2.4.0") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1b6y1jhf5ix4vry165vwid5nqm0d99q61vxak6aw3vfkj379vgk9")))) + "1rzi8112fi0bx2fj0j5ak9bfgqgjk5k5dv66qrb890gsf5bz6m4i")))) (build-system r-build-system) (propagated-inputs (list r-blob @@ -2185,7 +2182,7 @@ comparison and diagnostics.") (define-public python-pymc (package (name "python-pymc") - (version "5.7.2") + (version "5.10.0") (source (origin (method git-fetch) ; no tests in PyPI (uri (git-reference @@ -2194,7 +2191,7 @@ comparison and diagnostics.") (file-name (git-file-name name version)) (sha256 (base32 - "1r3lxpfc782f0wphdqfgsskbz52i0gwgrmxb65307k6cqia69s3r")))) + "17gb7ny2isfgyps7qffdxq18a9p43qy1fhqhbh75cnqd5wv1yxzb")))) (build-system pyproject-build-system) (arguments (list #:tests? #f ; tests are too computationally intensive @@ -2296,6 +2293,53 @@ building design matrices.") ;; and is covered by the PSFL. (license (list license:bsd-2 license:psfl)))) +(define-public python-mapie + (package + (name "python-mapie") + (version "0.7.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "MAPIE" version)) + (sha256 + (base32 + "1nvi547avvwrck1n7rf5jh7d0ml6jaqjs2p59iwcq2a5xjmdsmsc")))) + (build-system pyproject-build-system) + (native-inputs (list python-pandas python-pytest)) + (propagated-inputs (list python-numpy python-scikit-learn)) + (home-page "https://github.com/scikit-learn-contrib/MAPIE") + (synopsis "Module for estimating prediction intervals") + (description "MAPIE allows you to easily estimate prediction intervals +(or prediction sets) using your favourite scikit-learn-compatible model for +single-output regression or multi-class classification settings. + +Prediction intervals output by MAPIE encompass both aleatoric and epistemic +uncertainties and are backed by strong theoretical guarantees thanks to +conformal prediction methods intervals.") + (license license:bsd-3))) + +(define-public python-emcee + (package + (name "python-emcee") + (version "3.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "emcee" version)) + (sha256 + (base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-numpy)) + (native-inputs (list python-coverage + python-pytest + python-pytest-cov + python-setuptools-scm)) + (home-page "https://emcee.readthedocs.io/en/stable/") + (synopsis "Ensemble sampling toolkit for MCMC") + (description + "@code{emcee} is a Python implementation of the affine-invariant ensemble +sampler for Markov chain Monte Carlo (MCMC).") + (license license:expat))) + (define-public python-statsmodels (package (name "python-statsmodels") @@ -2353,7 +2397,7 @@ inference for statistical models.") (define-public python-openturns (package (name "python-openturns") - (version "1.21") + (version "1.21.3") (source (origin (method git-fetch) @@ -2362,7 +2406,7 @@ inference for statistical models.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05lbx8npvvk7jyakvfpgi9ggdp6cnzwv2hjmjrkji2s42axv0q6d")))) + (base32 "0nf77p6zv2br23n3c0yidnclb0234ni07y67h1h1f2bng4kdn8jp")))) (build-system cmake-build-system) (arguments (list @@ -2594,14 +2638,14 @@ R version.") (define-public r-checkmate (package (name "r-checkmate") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "checkmate" version)) (sha256 (base32 - "064i6l0n4w4jncpnk5wnj6sxak0jirdz757iirglcxg8ayq19v4n")))) + "1m41idv7iwq6mby8dyvsbljj5jkyhj65k7caz2na17a83s2inwl8")))) (build-system r-build-system) (propagated-inputs (list r-backports)) @@ -2945,13 +2989,13 @@ tools to simplify the devolpment of R packages.") (define-public r-withr (package (name "r-withr") - (version "2.5.1") + (version "2.5.2") (source (origin (method url-fetch) (uri (cran-uri "withr" version)) (sha256 (base32 - "1kndhxl0fxn40v9yx0iglilani3ym3ywbjf6zbg1pnb52ncf0nm9")))) + "01a27nqlrrf1pws57hi9631f3aj33a9dashd640m5nlgf9nzmdnm")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -3019,13 +3063,13 @@ disk (or a connection).") (define-public r-plotrix (package (name "r-plotrix") - (version "3.8-2") + (version "3.8-4") (source (origin (method url-fetch) (uri (cran-uri "plotrix" version)) (sha256 (base32 - "07xwq3505qb2yak7pfda22yqwifj6m78f8b5rm0ym74808qrawmv")))) + "1mp8mb79prgf5fzlaix4fvslr4q67hrzxqdv3kr7mik1mf9jv8p6")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/plotrix") (synopsis "Various plotting functions") @@ -3082,13 +3126,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.12.6.4.0") + (version "0.12.6.6.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "1k7xq2yl4pkc7krz1bcdnx5kfj6n4zjmnm40nly2da2ji87agv49")))) + "171yflg07xi6570ich5gxhzsqqs7k3rxyhwg96amlkm1qn8v2pnk")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs @@ -3151,14 +3195,14 @@ encoder/decoder, round-off-error-free sum and cumsum, etc.") (define-public r-rprojroot (package (name "r-rprojroot") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "rprojroot" version)) (sha256 (base32 - "15zq606s544wmbvk5dw13xq0sspr9dsxyxlvzvn0r48f8x3l4q2h")))) + "16bf6ga5fgm83j3m67plw5i54az2vdbvw5m99ixaqkd24pxn7x5m")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -3296,13 +3340,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.3.1") + (version "2.3.3") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1jil3wgfh1asfb9c4cr9qyr74wb9f87r7sa03kj187201hb3xlly")))) + "0i1cjhqcclglv62j4dclxraaj5jmqdwyj4bs3qfbd8jd8v5d1c9j")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs @@ -3311,8 +3355,8 @@ a column in data frame.") r-cpp11 r-dbi r-memoise - r-plogr - r-pkgconfig)) + r-pkgconfig + r-plogr)) (native-inputs (list r-knitr)) (home-page "https://github.com/rstats-db/RSQLite") @@ -3326,13 +3370,13 @@ engine (version 3.8.8.2) is included.") (define-public r-rcurl (package (name "r-rcurl") - (version "1.98-1.12") + (version "1.98-1.13") (source (origin (method url-fetch) (uri (cran-uri "RCurl" version)) (sha256 (base32 - "1ci6lsxm0f13yzw712gcbq23syl54x5llvhs2w1b8wwm9vqgx0qs")))) + "01pkmip1sllislmp34c25i9m9mlrid9b48xfjbf93sml55ijz985")))) (properties `((upstream-name . "RCurl"))) (build-system r-build-system) (arguments @@ -3368,13 +3412,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.14") + (version "3.99-0.15") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "1ygi65ddgbsamxw2rm0p2clfak1xj44xyisgk48y72cd9ldaddic")))) + "0giv03bixc4kcq4dmcwzra7gp01i41hfr1710fd1v2hacya4d8cq")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) @@ -3956,13 +4000,13 @@ using the multicore functionality of the parallel package.") extensions))))) (package (name "r-dt") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "1b9qshrjv9xaak92rvg65vkak4pyci9js4j7nkfcg0p19ghnvlm8")) + "13k9zyapx6rqfsrl5afpgaqyni57qq88hxa1j3y3wjcv5bim66ig")) (modules '((guix build utils) (ice-9 match))) (snippet @@ -4045,7 +4089,7 @@ using the multicore functionality of the parallel package.") (list js-selectize)) (native-inputs `(("r-knitr" ,r-knitr) - ("uglifyjs" ,node-uglify-js) + ("esbuild" ,esbuild) ("datatables-plugins" ,(let ((version "1.13.4")) (origin @@ -4499,13 +4543,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "0vxd7g1fm4x0f72bs1xfik1d4yklvpjdyg1hpx86pl8fwr86i1wl")))) + "0h85hjvsmc8s3hyjdj83fykb2vl8jc7pb9ynp2xsl0q9v1sihrxl")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (arguments @@ -4690,13 +4734,13 @@ features present in other programming languages.") (define-public r-plotly (package (name "r-plotly") - (version "4.10.2") + (version "4.10.3") (source (origin (method url-fetch) (uri (cran-uri "plotly" version)) (sha256 (base32 - "0y2jiyfx895f15wcpizybssic4draw1vgvqz2b7f82z73319m01b")) + "13sxmanx2xck8dn0prn2fplgx4bafb7h2kk2wjmci21h8hk6qylb")) (modules '((guix build utils))) (snippet '(with-directory-excursion "inst/htmlwidgets/lib/" @@ -4943,7 +4987,12 @@ from within R.") (add-after 'mkdist 'no-mtune (lambda _ (substitute* "src/Makevars" - (("-mtune=native") ""))))))) + (("-mtune=native") "")))) + (add-after 'no-mtune 'use-c++11 + (lambda _ + (substitute* "src/Makevars" + (("-DUSE_BLAS_LIB" m) + (string-append m " -std=c++11")))))))) (native-inputs (list hevea perl @@ -5143,17 +5192,15 @@ tests for whether a value is missing, empty or contains only @code{NA} and (define-public r-gdata (package (name "r-gdata") - (version "2.19.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "gdata" version)) (sha256 (base32 - "1lv3cz990f7m2bfcf62fjm6wz6zd2ycrci06b7mfd0xmcn3bwifi")))) + "0zxi0634dkgczw7gicj8r6mhb83cpkxhsy2iivz0b9v52y9bjmm4")))) (build-system r-build-system) - (inputs - (list perl)) (propagated-inputs (list r-gtools)) (home-page "https://cran.r-project.org/web/packages/gdata") @@ -5168,7 +5215,6 @@ including: @item character vector operations @item factor manipulation @item obtaining information about R objects -@item manipulating MS-Excel formatted files @item generating fixed-width format files @item extricating components of date and time objects @item operations on columns of data frames @@ -5682,14 +5728,14 @@ and resampling-based inference.") (define-public r-prabclus (package (name "r-prabclus") - (version "2.3-2") + (version "2.3-3") (source (origin (method url-fetch) (uri (cran-uri "prabclus" version)) (sha256 (base32 - "0hg4d7y1w18jpgvw10z8833bbbcnlkwiasx0wh6iwa2pnnybq8gl")))) + "1haq8dvvi21fdnzl7ykm28sif5nv9pybir96vrqfcmy3k8500p80")))) (build-system r-build-system) (propagated-inputs (list r-mass r-mclust)) @@ -5705,14 +5751,14 @@ data for species delimitation, nearest neighbor based noise detection.") (define-public r-deoptimr (package (name "r-deoptimr") - (version "1.1-2") + (version "1.1-3") (source (origin (method url-fetch) (uri (cran-uri "DEoptimR" version)) (sha256 (base32 - "0swycypiyxkvhn1438q0wysz2c4ky6zjw89w62dggbciqwk8xdbq")))) + "1526g3fzii8kcy29gy6gjvaw4k9cxxidq8bh7m4j485h0wdsdn4d")))) (properties `((upstream-name . "DEoptimR"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/DEoptimR") @@ -5968,18 +6014,18 @@ based on an interface to Fortran implementations by M. J. D. Powell.") (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.3.9.3") + (version "0.3.3.9.4") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "0xhwgn77166ir7qnzl25mj0byskkqr0b36hihrpr2zaqsrzs8wsq")))) + "1faz1phvg7g14bchi88vizn5mfhgiwmsjg7jzkyf1yjg0f6vpsj1")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs - (list r-rcpp r-matrix)) + (list r-rcpp)) (home-page "http://eigen.tuxfamily.org") (synopsis "Rcpp integration for the Eigen templated linear algebra library") (description @@ -6014,14 +6060,14 @@ metrics for evaluating models.") (define-public r-matrixmodels (package (name "r-matrixmodels") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "MatrixModels" version)) (sha256 (base32 - "0ap3mfzb2psjwlksfjzs2ycl5598bllwzx5hfmf9db4yjsydn1hw")))) + "03zjfxjk4l2dl1117slz163w0ky675d23sjfni4d7fdhqq359ny2")))) (properties `((upstream-name . "MatrixModels"))) (build-system r-build-system) (propagated-inputs @@ -6096,14 +6142,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-34") + (version "1.1-35.1") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "1bbaxkrd5m3d40y6jdyrdr4vsjyzkfixbqjwj6c8inmks98f2wp8")))) + "0nzv1a22pfsf2ryw91h16ic4cb8y8g6wh0gx3msr7gv8dwwi3974")))) (build-system r-build-system) (propagated-inputs (list r-boot @@ -6349,14 +6395,14 @@ diagnostic tools (@code{ctlcurves} and @code{DiscrFact}).") (define-public r-ranger (package (name "r-ranger") - (version "0.15.1") + (version "0.16.0") (source (origin (method url-fetch) (uri (cran-uri "ranger" version)) (sha256 (base32 - "0bibv9xf6w8k8nsc13f2yd4kx99aq0i758h3wfh089szgkpdjrad")))) + "12c52gqqwaaid5b062gad18ir1vala1z3a0z5j4af1xqzlxgk583")))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-matrix r-rcppeigen)) @@ -6506,65 +6552,72 @@ levels (including collapsing rare levels into other, \"anonymizing\", and manually \"recoding\").") (license license:gpl3))) -(define-public r-tgstat - (let ((changeset "4f8e60c03598f49aff6f5beeab40f2b995377e9f") +(define-public r-tgconfig + (let ((commit "15cf199436ae0b2ac0006b2ca7f0aeeb5c9d4445") (revision "1")) (package - (name "r-tgstat") - (version (string-append "1.0.2-" revision "." (string-take changeset 7))) + (name "r-tgconfig") + (version (git-version "0.1.2" revision commit)) (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://bitbucket.org/tanaylab/tgstat") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tanaylab/tgconfig") + (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0ilkkyximy77zbncm91kdfqbxf0qyndg16pd3q3p6a3xc9qcmxvn")))) + (base32 "159m8hhbk9ip2fdy6zsa96v0173q1awcrzdz2rr2796awfaxjgx1")))) + (properties `((upstream-name . "tgconfig"))) (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-isnan - (lambda _ - (substitute* "src/tgstat.h" - (("#define isnan ::isnan") - "#define isnan std::isnan")) - #t))))) - (propagated-inputs - (list r-rcpp)) - (home-page "https://bitbucket.org/tanaylab/tgstat/") - (synopsis "Tanay's group statistical utilities") + (propagated-inputs (list r-yaml)) + (home-page "https://github.com/tanaylab/tgconfig") + (synopsis "Infrastructure for managing package parameters") (description - "The goal of tgstat is to provide fast and efficient statistical -tools.") - (license license:gpl2)))) + "This is a package to provide infrastructure for managing package parameters. +Parameters are easy to get in relevant functions within a package, +and rrror is thrown if a parameter is missing. Developers are able +to register parameters and set their default value in a config file +that is part of the package in YAML format, and users are able to +override parameters using their own YAML. Users get an exception +when trying to override a parameter that was not registered, and +can load multiple parameters to the current environment.") + (license license:gpl3+)))) -(define-public r-tgconfig - (let ((changeset "1e02c7614713bd0866c46f0c679a058f8c6d627e") +(define-public r-tgutil + (let ((commit "0e4a2e84e5cf1f74bc66df0a3d8eac89633fd7b1") (revision "1")) (package - (name "r-tgconfig") - (version (string-append "0.0.0.9000-" revision "." (string-take changeset 7))) + (name "r-tgutil") + (version (git-version "0.1.15" revision commit)) (source (origin - (method hg-fetch) - (uri (hg-reference - (url "https://bitbucket.org/tanaylab/tgconfig") - (changeset changeset))) - (file-name (string-append name "-" version "-checkout")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tanaylab/tgutil") + (commit commit))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0xy6c7s7mn1yx191154bwbv1bl424bnvc80syqpl1vdl28ba46rj")))) + (base32 "0pmacpzhrigprlpl8b5j4xz7l110ifw98017xwk569dghbf8zrq1")))) + (properties `((upstream-name . "tgutil"))) (build-system r-build-system) - (propagated-inputs - (list r-yaml)) - (home-page "https://bitbucket.org/tanaylab/tgconfig/") - (synopsis "Infrastructure for managing package parameters") - (description - "The goal of tgconfig is to provide infrastructure for managing package -parameters.") + (propagated-inputs (list r-broom + r-cowplot + r-data-table + r-dplyr + r-ggplot2 + r-glue + r-magrittr + r-matrix + r-matrixstats + r-qlcmatrix + r-readr + r-rlang + r-scales + r-tibble + r-tidyr)) + (home-page "https://github.com/tanaylab/tgutil") + (synopsis "Simple utility functions for Tanay lab code") + (description "Shared utility functions for multiple Tanay lab packages.") (license license:gpl3)))) (define-public r-catterplots @@ -7143,14 +7196,14 @@ or eta squared effect size.") (define-public r-logspline (package (name "r-logspline") - (version "2.1.20") + (version "2.1.21") (source (origin (method url-fetch) (uri (cran-uri "logspline" version)) (sha256 (base32 - "1nsrgz9sh9qg2fj0x7k48lqhpgzq1z78jfz89ckzp5xm4r8lpgcb")))) + "0xqbk3h28gkx3haj7hdg314616x673cmg9ia148g0q9j3zqkqflf")))) (properties `((upstream-name . "logspline"))) (build-system r-build-system) (native-inputs (list gfortran)) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 400832045f..714225c654 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -1247,7 +1247,7 @@ a nice format.") (delete 'configure)))) ;no configure script (native-inputs (list pkg-config)) (inputs (list freetype libx11 libxft libxtst libxinerama)) - (propagated-inputs (list glibc-utf8-locales)) + (propagated-inputs (list (libc-utf8-locales-for-target))) (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 diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b11c6219b3..6655c0e2b6 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -45,7 +45,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.24.0") + (version "1.25.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -53,7 +53,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "13v04slf231hd3rywyan0n7yyc94s34wfwnmwz8sfw4vgxk5k52a")))) + "18cyg0wnf34xi964fxvzxgcq6z0pbirk0k4z82w1cqi3f3l9jlg2")))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 565e311823..9d08378eea 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -226,14 +226,14 @@ cards.") (define-public newsboat (package (name "newsboat") - (version "2.32") + (version "2.33") (source (origin (method url-fetch) (uri (string-append "https://newsboat.org/releases/" version "/newsboat-" version ".tar.xz")) (sha256 - (base32 "1rp67fqsnsknlhlq75vgdjg9rggx8j7wbmixvps967m2f92m2qsv")))) + (base32 "1yilrfa8h63x24mcl8a6a17fsaa12imhl337br7g2dw3c1g0v78p")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -254,7 +254,6 @@ cards.") `(#:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) - #:vendor-dir "vendor" #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) @@ -263,7 +262,7 @@ cards.") ("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-cxx" ,rust-cxx-1) ("rust-cxx-build" ,rust-cxx-build-1) - ("rust-fastrand" ,rust-fastrand-1) + ("rust-fastrand" ,rust-fastrand-2) ("rust-gettext-rs" ,rust-gettext-rs-0.7) ("rust-lexopt" ,rust-lexopt-0.3) ("rust-libc" ,rust-libc-0.2) diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm index b2d276ac8b..ec630a029f 100644 --- a/gnu/packages/tbb.scm +++ b/gnu/packages/tbb.scm @@ -49,10 +49,33 @@ (build-system cmake-build-system) (arguments `(#:configure-flags - '(,@(if (target-riscv64?) + '(,@(if (or (target-riscv64?) + (target-ppc32?)) '("-DTBB_TEST_LINK_FLAGS=-latomic") `()) - "-DTBB_STRICT=OFF"))) ;; Don't fail on warnings + ,@(if (or (target-arm32?) + (target-ppc32?)) + '("-DTBB_TEST_COMPILE_FLAGS=-DTBB_TEST_LOW_WORKLOAD") + `()) + "-DTBB_STRICT=OFF") ;; Don't fail on warnings + #:phases + (modify-phases %standard-phases + ,@(cond + ((target-arm32?) + `((add-after 'unpack 'adjust-test-suite + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; Bus error, skipped on mips. + ((".*test_malloc_pools.*") "")))))) + ((target-ppc32?) + `((add-after 'unpack 'adjust-test-suite + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; These tests hang forever. + ((".*test_function_node.*") "") + ((".*test_multifunction_node.*") "") + ((".*test_async_node.*") "")))))) + (else '()))))) (home-page "https://www.threadingbuildingblocks.org") (synopsis "C++ library for parallel programming") (description diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..3092c39b24 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Francesco Frassinelli <fraph24@gmail.com> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> -;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2018, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Adonay Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@hyperbola.info> ;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net> @@ -901,7 +901,7 @@ telephony functionality into custom Telegram clients.") (define-public coturn (package (name "coturn") - (version "4.6.1") + (version "4.6.2") (source (origin (method git-fetch) @@ -910,7 +910,7 @@ telephony functionality into custom Telegram clients.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04d3c2lxc496zxx3nzqr9fskm2w57kqijdfq3wsa0yp2dp28yjkj")))) + (base32 "16rr8666spi84qcc8l2qga42hpskjmvrpj1w58jbanxnpsijv8h4")))) (inputs (list openssl sqlite diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 1697682dd4..f049ea334d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -30,12 +30,14 @@ ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Solene Rapenne <solene@perso.pw> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> +;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org> ;;; Copyright © 2022 ( <paren@disroot.org> -;;; Copyright © 2022 jgart <jgart@dismail.de> +;;; Copyright © 2022, 2023 jgart <jgart@dismail.de> ;;; Copyright © 2023 Aaron Covrig <aaron.covrig.us@ieee.org> ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +78,7 @@ #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crypto) + #:use-module (gnu packages curl) #:use-module (gnu packages dlang) #:use-module (gnu packages docbook) #:use-module (gnu packages fontutils) @@ -153,32 +156,27 @@ less to gain, as only the helper process is running with privileges (e.g., (package (name "tilda") (version "1.5.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lanoxx/tilda") - (commit (string-append "tilda-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0q2i9ny8sh7zjzgvkx8vcvk593wcvchjc4xq4nrlqdd377r7cg5q")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lanoxx/tilda") + (commit (string-append "tilda-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q2i9ny8sh7zjzgvkx8vcvk593wcvchjc4xq4nrlqdd377r7cg5q")))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-po-writable - (lambda _ - (for-each make-file-writable (find-files "po" ".")) - #t))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) - (inputs - (list libconfuse vte)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-po-writable + (lambda _ + (for-each make-file-writable + (find-files "po" ".")) #t))))) + (native-inputs (list autoconf automake gettext-minimal pkg-config)) + (inputs (list libconfuse vte)) (synopsis "GTK+-based drop-down terminal") - (description "Tilda is a terminal emulator similar to normal terminals like + (description + "Tilda is a terminal emulator similar to normal terminals like gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops down from the edge of a screen when a certain configurable hotkey is pressed. This is similar to the built-in consoles in some applications. Tilda is highly @@ -186,6 +184,29 @@ configurable through a graphical wizard.") (home-page "https://github.com/lanoxx/tilda") (license license:gpl2+))) +(define-public tilda-dbus + (package + (inherit tilda) + (name "tilda") + (version "1.6-alpha") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lanoxx/tilda") + (commit "51a980a55ad6d750daa21d43a66d44577dad277b"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pdarmlxkap9v689s88b89l5hi4vspsrrysh7pbm9rhdjmzk5m2c")))) + (synopsis "GTK+-based drop-down terminal with experimental D-Bus support") + (description + "Tilda is a terminal emulator similar to normal terminals like +gnome-terminal (GNOME) or Konsole (KDE), with the difference that it drops down +from the edge of a screen when a certain configurable hotkey is pressed. This +is similar to the built-in consoles in some applications. Tilda is highly +configurable through a graphical wizard. This version enables D-Bus support +which is necessary for using Tilda on Wayland."))) + (define-public termite (package (name "termite") @@ -228,7 +249,7 @@ managers.") (define-public asciinema (package (name "asciinema") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -237,7 +258,7 @@ managers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mqn12h51nqdmn1ya7hw1l2z2893937dqq4b1zh32y6bazd807fl")))) + (base32 "0qhf4sc5fl81rpq3rgzy7qcch620dh12scvsbdfczfbyjb10ps2i")))) (build-system pyproject-build-system) (arguments (list #:phases @@ -581,7 +602,18 @@ to all types of devices that provide serial consoles.") ;; The build environment lacks /dev/{console,tty*}. ;; In fact, even nckx's regular Guix System lacks ttyS1… ((": Permission denied") - ": No such file or directory"))))))) + ": No such file or directory")))) + (add-before 'install 'install-rules + (lambda _ + (mkdir-p (string-append #$output "/etc/udev/rules.d")) + (with-output-to-file + (string-append #$output + "/etc/udev/rules.d/70-pcspkr-beep.rules") + (lambda _ + (display (string-append "\ +ACTION==\"add\", SUBSYSTEM==\"input\", ATTRS{name}==\"PC Speaker\", " + "ENV{DEVNAME}!=\"\", " + "TAG+=\"uaccess\""))))))))) (synopsis "Linux command-line utility to control the PC speaker") (description "beep allows the user to control the PC speaker with precision, allowing different sounds to indicate different events. While it can be run @@ -831,33 +863,34 @@ eye-candy, customizable, and reasonably lightweight.") (define-public foot (package (name "foot") - (version "1.15.3") + (version "1.16.2") (home-page "https://codeberg.org/dnkl/foot") - (source (origin - (method git-fetch) - (uri (git-reference (url home-page) (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a224i2i7qk170kf2rzyxqcv3lnx9f548lwa37jgjr7i339x4zwf")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00wac8li1ac8ncmnlqvz3xnr5pi8gj4v3v341n0h2zzaayv9ngw5")))) (build-system meson-build-system) (arguments - `(;; Using a "release" build is recommended both for performance, and - ;; also to address a GCC 10 issue when doing PGO builds. - #:build-type "release" - ;; Enable LTO as recommended by INSTALL.md. - #:configure-flags '("-Db_lto=true"))) - (native-inputs - (list ncurses ;for 'tic' - pkg-config scdoc wayland-protocols)) + (list + ;; Using a "release" build is recommended both for performance, and + ;; also to address a GCC 10 issue when doing PGO builds. + #:build-type "release" + ;; Enable LTO as recommended by INSTALL.md. + #:configure-flags #~'("-Db_lto=true"))) + (native-inputs (list ncurses ;for 'tic' + pkg-config scdoc wayland-protocols)) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is ;; provided for usability reasons. See <https://bugs.gnu.org/22138>. (list (search-path-specification (variable "TERMINFO_DIRS") (files '("share/terminfo"))))) - (inputs - (list fcft libxkbcommon wayland)) + (inputs (list fcft libxkbcommon wayland)) (synopsis "Wayland-native terminal emulator") (description "@command{foot} is a terminal emulator for systems using the Wayland @@ -1075,14 +1108,14 @@ usable with any list--including files, command history, processes and more.") (define-public python-pyte (package (name "python-pyte") - (version "0.7.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pyte" version)) (sha256 (base32 - "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7")))) + "1c4pn2qijk6q8q25klfq365gbvlkrh8c0lz5lrr7b7kmh6vx3gxr")))) (build-system python-build-system) (arguments '(#:phases @@ -1384,30 +1417,20 @@ comfortably in a pager or editor. (define-public eternalterminal (package (name "eternalterminal") - (version "6.0.13") + (version "6.2.4") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/MisterTea/EternalTerminal") - (commit (string-append "et-v" version)))) - (file-name (git-file-name name version)) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MisterTea/EternalTerminal") + (commit (string-append "et-v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0sb1hypg2276y8c2a5vivrkcxp70swddvhnd9h273if3kv6j879r")))) + (base32 "13vhr701j85ga37d53339bxgrf9fqa6z1zcp6s3ly5bb8p7lyvzm")))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DBUILD_TEST=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'insert-googletests - (lambda* (#:key inputs #:allow-other-keys) - (let ((tests (assoc-ref inputs "googletest"))) - (copy-recursively tests "external/googletest")) - #t))))) - (inputs - (list gflags libsodium protobuf)) - (native-inputs - `(("googletest" ,(package-source googletest)))) + '(#:configure-flags '("-DBUILD_TEST=ON" "-DDISABLE_VCPKG=1"))) + (inputs (list libsodium protobuf openssl zlib curl)) (home-page "https://mistertea.github.io/EternalTerminal/") (synopsis "Remote shell that reconnects without interrupting the session") (description "@dfn{Eternal Terminal} (ET) is a remote shell that diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c3f9493d45..d8d63ddf97 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -743,7 +743,8 @@ and should be preferred to it whenever a package would otherwise depend on (("srcdir/tests/pprecA-0.ind pprecA-0.ind1 \\|\\| exit 1") "srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 77"))))) '()) - #$@(if (target-arm32?) + #$@(if (or (target-arm32?) + (target-ppc32?)) `((add-after 'unpack 'skip-faulty-test (lambda _ ;; Skip this faulty test on armhf-linux: diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0906d840ec..daeb4a9860 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1467,14 +1467,14 @@ highlighting for dozens of languages. Jed is very small and fast.") (define-public xnedit (package (name "xnedit") - (version "1.5.1") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/xnedit/" name "-" version ".tar.gz")) (sha256 (base32 - "14irfn9izkbd72yynfy634vc9pk2kmhkdmzb2w9al44wfzixlal3")))) + "09424qj03p7v7ih2gi3jnpm5iilr24ssab8rkijcjh6n9qn7izl0")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ddeb979334..ea182b1925 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages gettext) #:use-module (gnu packages java) #:use-module (gnu packages ncurses) @@ -1128,13 +1130,13 @@ documents into plain text.") "0im3kzvhxkjlx57w6h13mc9584c74ma1dyymgvpq2y61av3gc35v")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no make check - #:make-flags (list "CC=gcc" - (string-append "DESTDIR=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - ;; no configure script - (delete 'configure)))) + (list #:tests? #f ; no make check + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output)) + #:phases + #~(modify-phases %standard-phases + ;; no configure script + (delete 'configure)))) (inputs (list zlib)) (home-page "https://github.com/dstosberg/odt2txt/") @@ -1288,13 +1290,14 @@ Mainland China, Taiwan, and Hong-Kong.") "0anw0knr1iy4p9w3d3b3pbwzh1c43p1i2q4c28kw9zviw8kx2rly")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; test for perl module - #:make-flags (list "CC=gcc" "CFLAGS=-O2 -Wall -pedantic" - (string-append "prefix=" %output) - "MKDIR=mkdir -p") - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; No ./configure script + (list #:tests? #f ; test for perl module + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "CFLAGS=-O2 -Wall -pedantic" + (string-append "prefix=" #$output) + "MKDIR=mkdir -p") + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) ; No ./configure script (home-page "https://ja.osdn.net/projects/nkf/") (synopsis "Network Kanji Filter") (description "Nkf is yet another kanji code converter among networks, diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 61484bfd86..75e6370c72 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -200,6 +200,7 @@ living in the same process.") (package (name "gnutls") (version "3.7.7") + (replacement gnutls-3.8.1) (source (origin (method url-fetch) ;; Note: Releases are no longer on ftp.gnu.org since the @@ -303,6 +304,35 @@ required structures.") (define-deprecated/public-alias gnutls-latest gnutls) +;; Replacement for gnutls@3.7.7 to address GNUTLS-SA-2020-07-14 / +;; CVE-2023-0361 +(define-public gnutls-3.8.1 + (package + (inherit gnutls) + (version "3.8.1") + (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")) + (sha256 + (base32 + "1742jiigwsfhx7nj5rz7dwqr8d46npsph6b68j7siar0mqarx2xs")))) + (arguments + (if (target-hurd?) + ;; Fix reference to undefined 'PATH_MAX'. This is fixed in GnuTLS + ;; commit 3b6ec1e01de4e96d36276dfe34ee9e183f285264. + (substitute-keyword-arguments (package-arguments gnutls) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'set-path-max + (lambda _ + (substitute* "lib/pathbuf.h" + (("^#define GNUTLS_PATH_MAX PATH_MAX") + "#define GNUTLS_PATH_MAX 8192\n"))))))) + (package-arguments gnutls))))) + (define-public gnutls/dane ;; GnuTLS with build libgnutls-dane, implementing DNS-based ;; Authentication of Named Entities. This is required for GNS functionality @@ -961,7 +991,7 @@ number generator") (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha ;; when updating. - (version "2.28.0") + (version "2.28.5") (source (origin (method git-fetch) @@ -970,7 +1000,7 @@ number generator") (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1jlkvvyigpjvv404b8vmx68f1v6g1h2zr6rd78dhc0xgqi018phs")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 15918467aa..9d002ecab1 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -173,6 +173,11 @@ standard operating system features.") (arguments (substitute-keyword-arguments (package-arguments imgui) ((#:make-flags flags ''()) - ;; Remove the "-DImDrawIdx=unsigned int" make-flag as this breaks - ;; mangohud, the only user of this version. - #~(delete "-DImDrawIdx=unsigned int" #$flags)))))) + ;; Remove "-DImDrawIdx=unsigned int" and "-DIMGUI_ENABLE_FREETYPE" + ;; from make-flags as this breaks MangoHud, the only user of this + ;; version. + #~(filter (negate (lambda (x) (string-prefix? "-D" x))) + #$flags)))) + (inputs + (modify-inputs (package-inputs imgui) + (delete "freetype"))))) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 1eb62a950e..d4bf27a790 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -63,14 +63,14 @@ (define-public tor (package (name "tor") - (version "0.4.8.6") + (version "0.4.8.9") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "122h6l3nh8xrpzkmn4alsbz30jw8nxivwnhgnp97qv7nr9gqjbam")))) + "0rfgn88izn74nh6gy42ggwmiicnylp73skrlwm61n4znj247vfsr")))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 21d5279e85..2fa47315c0 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019, 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,6 +71,7 @@ (search-input-file inputs (string-append "bin/" cmd))))))))) (inputs (list bash-minimal coreutils sed + diffutils fmt gmp)) (native-inputs (list pkg-config)) (home-page "https://gitlab.com/lilyp/daikichi") diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index acec59ad20..41257d42f1 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2023 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Raven Hallsby <karl@hallsby.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,16 +98,16 @@ Tree-sitter parsing library.") (define-public tree-sitter (package (name "tree-sitter") - (version "0.20.8") + (version "0.20.10") ;untagged (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tree-sitter/tree-sitter") - (commit (string-append "v" version)))) + (commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))) (file-name (git-file-name name version)) (sha256 (base32 - "10w17lfn9asqrk612xivkx26lc620s3nnm30hhlyqd4bj19k7gyv")) + "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) (modules '((guix build utils))) (snippet #~(begin ;; Remove bundled ICU parts @@ -174,6 +175,7 @@ This package includes the @code{libtree-sitter} runtime library.") ;; good compromise compared to maintaining two different sets of ;; grammars (Guix packages vs test fixtures). "--skip=tests::corpus_test" + "--skip=tests::github_issue_test" "--skip=tests::highlight_test" "--skip=tests::node_test" "--skip=tests::parser_test" @@ -195,6 +197,7 @@ This package includes the @code{libtree-sitter} runtime library.") ("rust-dirs" ,rust-dirs-3) ("rust-html-escape" ,rust-html-escape-0.2) ("rust-libloading" ,rust-libloading-0.7) + ("rust-path-slash" ,rust-path-slash-0.2) ("rust-rand" ,rust-rand-0.8) ("rust-rustc-hash" ,rust-rustc-hash-1) ("rust-semver" ,rust-semver-1) @@ -314,17 +317,35 @@ which will be used as a snippet in origin." "0.19.0")) (define-public tree-sitter-javascript - (tree-sitter-grammar - "javascript" "JavaScript(JSX)" - "175yrk382n2di0c2xn4gpv8y4n83x1lg4hqn04vabf0yqynlkq67" - "0.20.0" - #:commit "rust-0.20.0")) + ;; Commit required by tree-sitter-typescript 0.20.3. + (let ((commit "f772967f7b7bc7c28f845be2420a38472b16a8ee") + (revision "22")) + (tree-sitter-grammar + "javascript" "JavaScript(JSX)" + "0vp7z57scpbcvyxpya06lnpz9f5kjdb66wjlkrp684xwjjgq1wxd" + (git-version "0.20.0" revision commit) + #:commit commit + #:get-cleanup-snippet + (lambda (grammar-directories) + #~(begin + (use-modules (guix build utils)) + (delete-file "tree-sitter-javascript.wasm") + (delete-file "binding.gyp") + (delete-file-recursively "bindings") + (for-each + (lambda (lang) + (with-directory-excursion lang + (delete-file "src/grammar.json") + (delete-file "src/node-types.json") + (delete-file "src/parser.c") + (delete-file-recursively "src/tree_sitter"))) + '#$grammar-directories)))))) (define-public tree-sitter-typescript (tree-sitter-grammar "typescript" "TypeScript and TSX" - "07fl9d968lal0aqj4f0n16p3n94cjkgfp54wynfr8gbdkjss5v5x" - "0.20.1" + "08k785q3cy8byrb3zrg93mfidnj1pcx1ggm1xhd8rgmfs2v6jns5" + "0.20.3" #:inputs (list tree-sitter-javascript) #:grammar-directories '("typescript" "tsx"))) @@ -348,19 +369,15 @@ which will be used as a snippet in origin." (define-public tree-sitter-c (tree-sitter-grammar "c" "C" - "1w03r4l773ki4iq2xxsc2pqxf3pjsbybq3xq4glmnsihgylibn8v" - "0.20.2")) + "00mhz2rz98pxssgyhm0iymgcb8cbv8slsf3nmfgyjhfchpmb9n6z" + "0.20.6")) (define-public tree-sitter-cpp - ;; There are a lot of additions, the last tag was placed more than 1 year ago - (let ((commit "56cec4c2eb5d6af3d2942e69e35db15ae2433740") - (revision "0")) - (tree-sitter-grammar - "cpp" "C++" - "0c5iwg9j6naivvr18glfp095x32nfl9hbw0q02rhh1b59fkpjs09" - (git-version "0.20.0" revision commit) - #:commit commit - #:inputs (list tree-sitter-c)))) + (tree-sitter-grammar + "cpp" "C++" + "0fsb6la0da3azh7m9p1w3w079bpg6074dy8jisjw1yq1w1r9grxy" + "0.20.3" + #:inputs (list tree-sitter-c))) (define-public tree-sitter-cmake (tree-sitter-grammar @@ -373,14 +390,14 @@ which will be used as a snippet in origin." ;; No tags at all, version in the source code is 0.19.0 (let ((commit "b20eaa75565243c50be5e35e253d8beb58f45d56") (revision "0")) - (tree-sitter-grammar - "elixir" "Elixir" - "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" - (git-version "0.19.0" revision commit) - #:article "an" - #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" - #:commit commit - #:license (list license:asl2.0 license:expat)))) + (tree-sitter-grammar + "elixir" "Elixir" + "1i0c0xki3sv24649p0ws7xs2jagbwg7z7baz1960239bj94nl487" + (git-version "0.19.0" revision commit) + #:article "an" + #:repository-url "https://github.com/elixir-lang/tree-sitter-elixir" + #:commit commit + #:license (list license:asl2.0 license:expat)))) (define-public tree-sitter-heex (tree-sitter-grammar @@ -392,14 +409,14 @@ which will be used as a snippet in origin." (define-public tree-sitter-bash (tree-sitter-grammar "bash" "Bash" - "18c030bb65r50i6z37iy7jb9z9i8i36y7b08dbc9bchdifqsijs5" - "0.19.0")) + "01sjympivwhr037c0gdx5fqw8fvzchq4fd4m8wlr8mdw50di0ag2" + "0.20.4")) (define-public tree-sitter-c-sharp (tree-sitter-grammar "c-sharp" "C#" - "054fmpf47cwh59gbg00sc0nl237ba4rnxi73miz39yqzcs87055r" - "0.19.1")) + "0lijbi5q49g50ji00p2lb45rvd76h07sif3xjl9b31yyxwillr6l" + "0.20.0")) (define-public tree-sitter-dockerfile (tree-sitter-grammar @@ -424,14 +441,10 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod.git")) (define-public tree-sitter-go - ;; There are a lot of additions, the last tag was placed more than 1 year ago - (let ((commit "64457ea6b73ef5422ed1687178d4545c3e91334a") - (revision "0")) - (tree-sitter-grammar - "go" "Go" - "16d32m78y8jricba9xav35c9y0k2r29irj5xyqgq24323yln9jnz" - (git-version "0.19.1" revision commit) - #:commit commit))) + (tree-sitter-grammar + "go" "Go" + "0wlhwcdlaj74japyn8wjza0fbwckqwbqv8iyyqdk0a5jf047rdqv" + "0.20.0")) (define-public tree-sitter-haskell ;; There are a lot of additions, the last tag was placed more than 4 years ago @@ -482,14 +495,10 @@ which will be used as a snippet in origin." #:commit commit))) (define-public tree-sitter-python - ;; There are a lot of additions, the last tag was placed a while ago - (let ((commit "9e53981ec31b789ee26162ea335de71f02186003") - (revision "0")) - (tree-sitter-grammar - "python" "Python" - "1lv3pgb7h2a0f121897r0lwc228rjwb77y3a6g3ghifx1rgbwvqg" - (git-version "0.20.0" revision commit) - #:commit commit))) + (tree-sitter-grammar + "python" "Python" + "1sxz3npk3mq86abcnghfjs38nzahx7nrn3wdh8f8940hy71d0pvi" + "0.20.4")) (define-public tree-sitter-r ;; No tags @@ -514,8 +523,8 @@ which will be used as a snippet in origin." (define-public tree-sitter-rust (tree-sitter-grammar "rust" "Rust" - "149jhy01mqvavwa8jlxb8bnn7sxpfq2x1w35si6zn60b7kqjlx8f" - "0.20.3")) + "1pk4mb3gh62xk0qlhxa8ihhxvnf7grrcchwg2xv99yy6yb3yh26b" + "0.20.4")) (define-public tree-sitter-clojure (tree-sitter-grammar @@ -607,3 +616,16 @@ which will be used as a snippet in origin." (use-modules (guix build utils)) (delete-file "binding.gyp") (delete-file-recursively "bindings")))))) + +(define-public tree-sitter-lua + (tree-sitter-grammar + "lua" "Lua" + "05irhg6gg11r9cnzh0h3691pnxjhd396sa1x8xrgqjz2fd09brf3" + "0.0.19" + #:repository-url "https://github.com/MunifTanjim/tree-sitter-lua")) + +(define-public tree-sitter-scala + (tree-sitter-grammar + "scala" "Scala" + "0hs6gmkq5cx9qrmgfz1mh0c34flwffc0k2mhwf13laawswnywfkz" + "0.20.2")) diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 1602136e29..400e6656d1 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,17 +26,27 @@ (define-module (gnu packages upnp) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) + #:use-module (gnu packages file) #:use-module (gnu packages gettext) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) + #:use-module (gnu packages linux) + #:use-module (gnu packages logging) #:use-module (gnu packages mp3) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages sqlite) #:use-module (gnu packages video) #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) @@ -162,3 +173,48 @@ and others.") server, which serves multimedia content to compatible clients on the network. It aims to be fully compliant with DLNA and UPnP-AV standards.") (license license:gpl2))) + +(define-public gerbera + (package + (name "gerbera") + (version "1.12.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gerbera/gerbera") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jz3jpg6ja9vi5zykcdh410r07ysrn6g0kzyj0v7d3689jxp94lg")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DWITH_SYSTEMD=NO" + "-DWITH_AVCODEC=YES" + "-DWITH_TESTS=YES"))) + (inputs + (list curl + duktape + ffmpeg + file + fmt + libebml + libexif + libmatroska + libupnp + pugixml + spdlog + sqlite + taglib + `(,util-linux "lib") + zlib)) + (native-inputs + (list googletest pkg-config)) + (home-page "https://gerbera.io/") + (synopsis "UPnP media server") + (description "Gerbera is a UPnP media server which allows you to stream +your digital media through your home network and consume it on a variety of +UPnP compatible devices.") + (license license:gpl2))) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a5d8db1d1e..4c09de1954 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -106,6 +106,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages golang-check) #:use-module (gnu packages groff) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) @@ -3185,6 +3186,11 @@ will reconstruct the object along its delta-base chain and return it.") #:install-source? #f #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/github.com/git-lfs/git-lfs/lfs/hook.go" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) (add-after 'unpack 'fix-embed-x-net (lambda _ (delete-file-recursively "src/golang.org/x/net/publicsuffix/data") @@ -3192,26 +3198,33 @@ will reconstruct the object along its delta-base chain and return it.") #$(file-append (this-package-input "go-golang-org-x-net") "/src/golang.org/x/net/publicsuffix/data") "src/golang.org/x/net/publicsuffix/data"))) - (add-before 'build 'man-gen - ;; Without this, the binary generated in 'build - ;; phase won't have any embedded usage-text. - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "mangen")))) - (add-after 'build 'build-man-pages - (lambda _ - (with-directory-excursion "src/github.com/git-lfs/git-lfs" - (invoke "make" "man")))) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" - (for-each - (lambda (manpage) - (install-file manpage - (string-append #$output "/share/man/man1"))) - (find-files "." "^git-lfs.*\\.1$")))))))) + ;; Only build the man pages if ruby-asciidoctor is available. + #$@(if (this-package-native-input "ruby-asciidoctor") + #~((add-before 'build 'man-gen + ;; Without this, the binary generated in 'build + ;; phase won't have any embedded usage-text. + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "mangen")))) + (add-after 'build 'build-man-pages + (lambda _ + (with-directory-excursion "src/github.com/git-lfs/git-lfs" + (invoke "make" "man")))) + (add-after 'install 'install-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "src/github.com/git-lfs/git-lfs/man" + (for-each + (lambda (manpage) + (install-file manpage + (string-append #$output "/share/man/man1"))) + (find-files "." "^git-lfs.*\\.1$")))))) + #~())))) ;; make `ronn` available during build for man page generation - (native-inputs (list ronn-ng git-minimal ruby-asciidoctor)) + (native-inputs + (append (list git-minimal) + (if (supported-package? ruby-asciidoctor) + (list ronn-ng ruby-asciidoctor) + '()))) (propagated-inputs (list go-github-com-xeipuuv-gojsonschema go-github-com-xeipuuv-gojsonreference @@ -3723,7 +3736,7 @@ commit messages for style.") (define-public hut (package (name "hut") - (version "0.2.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -3732,7 +3745,7 @@ commit messages for style.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ybngrwwmkm00dlkdhvkfcvcjhp5xzs8fh90zqr0h12ssqx9pll3")))) + (base32 "0klp7qlii07j8ka9g91m5xg3ybg6cq0p5lp1ibfihq2p4kwqj57m")))) (build-system go-build-system) (arguments (list @@ -3755,6 +3768,7 @@ commit messages for style.") (inputs (list go-git-sr-ht-emersion-go-scfg go-git-sr-ht-emersion-gqlclient + go-github-com-dustin-go-humanize go-github-com-juju-ansiterm go-github-com-spf13-cobra go-golang-org-x-oauth2 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1a24bdc86c..afc93ad169 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -66,6 +66,7 @@ ;;; Copyright © 2023 Ott Joon <oj@vern.cc> ;;; Copyright © 2023 Dominik Delgado Steuter <dds@disroot.org> ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi> +;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -116,6 +117,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages bittorrent) #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) @@ -179,6 +181,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -194,6 +197,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) + #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -209,6 +213,78 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) +(define-public ani-cli + (package + (name "ani-cli") + (version "4.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pystardust/ani-cli") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ni9pzjb5qh87iz7c8252bx79qadr1qx6jnkqvvjcqrchh7q473a")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;nothing to configure + (delete 'build) ;nothing to build + (replace 'install + (lambda _ + (install-file "ani-cli" (string-append #$output "/bin")) + (install-file "ani-cli.1" + (string-append #$output "/share/man/man1")))) + (add-after 'install 'wrap + (lambda* (#:key inputs #:allow-other-keys) + (define (bin command) + (dirname (search-input-file + inputs (string-append "bin/" command)))) + (wrap-program (string-append #$output "/bin/ani-cli") + `("PATH" ":" prefix + ,(map bin (list "aria2c" + "curl" + "ffmpeg" + "fzf" + "grep" + "mpv" + "sed" + "tput" + "uname" + "yt-dlp"))))))))) + (inputs (list aria2 + bash-minimal + coreutils + curl + ffmpeg + fzf + grep + mpv + ncurses + sed + yt-dlp)) + (native-search-paths + ;; This was copied from the curl package. + (list (search-path-specification + (variable "CURL_CA_BUNDLE") + (file-type 'regular) + (separator #f) ;single entry + (files '("etc/ssl/certs/ca-certificates.crt"))))) + (home-page "https://github.com/pystardust/ani-cli") + (synopsis "Browse and watch anime from the command line") + (description + "ani-cli is a @acronym{CLI, command-line interface} to browse and watch +anime by streaming videos from @uref{https://allanime.to,All Anime}. + +There are different features such as episode browsing, history tracking, +streaming at multiple resolutions, and much more, depending on what programs the +user has installed.") + (license license:gpl3+))) + (define-public transcode (package (name "transcode") @@ -1783,14 +1859,14 @@ audio/video codec library.") (define-public ffmpeg-5 (package (inherit ffmpeg) - (version "5.1.3") + (version "5.1.4") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0biil32xnshg1b4lwzbdc5rxv1g7lpfsr5gdgaz96wlhzy9ka48v")))))) + "0qwhyhil805hns7yksdxagnrcc90h60al7lz1rc65kd1j2w3nf2l")))))) (define-public ffmpeg-4 (package @@ -1813,14 +1889,14 @@ audio/video codec library.") (define-public ffmpeg-3.4 (package (inherit ffmpeg-4) - (version "3.4.11") + (version "3.4.13") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1rijdvcx8xjqwh084qchwz91vcj8wsvb4diax0g8miywpir00ccw")))) + "0np0yalqdrm7rn7iykgfzz3ly4vbgigrajg48c1l6n7qrzqvfszv")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-4) ((#:modules modules %default-gnu-modules) @@ -1838,14 +1914,14 @@ audio/video codec library.") (define-public ffmpeg-2.8 (package (inherit ffmpeg-3.4) - (version "2.8.20") + (version "2.8.22") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1ivnfqmfnp3zmn1q2dxy4p85427y3r6d3jbnl5kprr7lqckf6rl5")))) + "0c8m4hhv2k5fybha908wzrpnf3wqkq52hayl658jq4bah0igdfqz")))) (arguments `(#:tests? #f ; XXX: Enable them later, if required #:configure-flags @@ -1941,6 +2017,81 @@ thumbnailer uses ffmpeg to decode frames from the video files, so supported videoformats depend on the configuration flags of ffmpeg.") (license license:gpl2+))) +(define-public ffmpeg-progress-yield + (package + (name "ffmpeg-progress-yield") + (version "0.7.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "ffmpeg-progress-yield" version)) + (sha256 + (base32 + "07j6m8p8z8ybl75h0d4xzjl1pvkfzr0i73siysqcgrrahdgsxrls")))) + (build-system pyproject-build-system) + (arguments + ;; Not sure if the test file actually does anything. + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "test/test.py")))) + (add-after 'wrap 'wrap-program + ;; Wrap ffmpeg on the executable. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((fpy "bin/ffmpeg-progress-yield") + (ffm "bin/ffmpeg")) + (wrap-program (search-input-file outputs fpy) + `("PATH" ":" prefix + (,(search-input-file inputs ffm)))))))))) + (inputs (list bash-minimal ffmpeg)) + (home-page "https://github.com/slhck/ffmpeg-progress-yield") + (synopsis "Run an ffmpeg command with progress") + (description "This package allows an ffmpeg command to run with progress. +It is usually a complement to @code{ffmpeg-normalize}.") + (license license:expat))) + +(define-public ffmpeg-normalize + (package + (name "ffmpeg-normalize") + (version "1.27.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "ffmpeg-normalize" version)) + (sha256 + (base32 + "0idqqgsr3p840vx2x3idn851qwghjdbm6v4yrq2kprppyfvglni7")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" + "test/test.py")))) + (add-after 'wrap 'wrap-ffmpeg + ;; Wrap ffmpeg on the executable. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((ffn (search-input-file outputs + "bin/ffmpeg-normalize")) + (ffm (search-input-file inputs "bin/ffmpeg"))) + (wrap-program ffn + `("FFMPEG_PATH" = (,ffm))))))))) + (native-inputs (list python-pytest)) + (inputs (list bash-minimal ffmpeg)) + (propagated-inputs (list ffmpeg-progress-yield + python-colorama + python-colorlog + python-tqdm)) + (home-page "https://github.com/slhck/ffmpeg-normalize") + (synopsis "Normalize audio via ffmpeg") + (description "This program normalizes media files to a certain loudness +level using the EBU R128 loudness normalization procedure. It can also +perform RMS-based normalization (where the mean is lifted or attenuated), +or peak normalization to a certain target level. Batch processing of several +input files is possible, including video files.") + (license license:expat))) + (define-public vlc (package (name "vlc") @@ -2354,7 +2505,7 @@ images and image hosting sites.") (define-public mpv-mpris (package (name "mpv-mpris") - (version "1.0") + (version "1.1") (source (origin (method git-fetch) @@ -2363,7 +2514,7 @@ images and image hosting sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1vpx4kzyg4pssn1hql2ci4s9x08sdx2v0kphw4aryywnz04yjhzf")))) + (base32 "1384y8n3l0xk8hbad1nsj9ljzb1h02g3ln3jysd8bd6shbl0x4mx")))) (build-system copy-build-system) (arguments '(#:install-plan @@ -2377,7 +2528,7 @@ images and image hosting sites.") (native-inputs (list pkg-config)) (inputs - (list glib mpv)) + (list ffmpeg glib mpv)) (home-page "https://github.com/hoyon/mpv-mpris") (synopsis "MPRIS plugin for mpv") (description "This package provides an @dfn{MPRIS} (Media Player Remote @@ -2606,7 +2757,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2023.09.24") + (version "2023.10.13") (source (origin (method git-fetch) @@ -2615,7 +2766,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15ngsg3cadf2bv700fa1k5az5xpsm0wqr0cixbz8fcbhwdflfq6f")))) + (base32 "1cy8cpqwq6yfsbrnln3qqp9lsjckn20m6w7b890ha7jahyir5m1n")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) @@ -3194,33 +3345,45 @@ and custom quantization matrices.") (define-public streamlink (package (name "streamlink") - (version "3.2.0") + (version "6.3.1") (source (origin (method url-fetch) (uri (pypi-uri "streamlink" version)) (sha256 (base32 - "09nrspga15svzi0hmakcarbciav0nzf30hg1ff53gia473cd4w4p")))) + "0i2qym2plm4gpcq50vl67j69m8a4zz9mb8gi2xryx28pbnpdzh4k")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "pyproject.toml" + (("trio >=0\\.22") "trio >=0.21")))))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:phases + (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "-m" "pytest"))))))) (native-inputs - (list python-freezegun python-mock python-pytest - python-requests-mock)) + (list python-freezegun + python-requests-mock + python-pytest + python-pytest-asyncio + python-pytest-trio)) (propagated-inputs - (list python-pysocks - python-websocket-client + (list python-certifi python-isodate python-lxml python-pycountry python-pycryptodome + python-pysocks python-requests - python-urllib3)) + python-trio + python-trio-websocket + python-typing-extensions + python-urllib3 + python-websocket-client)) (home-page "https://github.com/streamlink/streamlink") (synopsis "Extract streams from various services") (description "Streamlink is command-line utility that extracts streams @@ -3274,7 +3437,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "7.20.0") + (version "7.22.0") (source (origin (method git-fetch) @@ -3283,7 +3446,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dc09j8yvis6ilba5a13qicf6wbgxnzwllab6h48kzfl1lc0n8g7")))) + (base32 "1aa23kni64751x0kd54lr87ns9kdc8pblhqp8m8608ah8xwak4mw")))) (build-system cmake-build-system) (arguments (list @@ -3527,18 +3690,15 @@ and JACK.") (define-public obs-looking-glass (package (name "obs-looking-glass") - (version "B5") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gnif/LookingGlass") - (commit version) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09mn544x5hg1z31l92ksk7fi7yj9r8xdk0dcl9fk56ivcr452ylm")))) + (version "B6") + (source (origin + (method url-fetch) + (uri (string-append "https://looking-glass.io/artifact/" version + "/source")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")))) (build-system cmake-build-system) (arguments (list @@ -5338,16 +5498,19 @@ result in several formats: (define-public rav1e (package (name "rav1e") - (version "0.6.3") + (version "0.6.6") (source (origin (method url-fetch) (uri (crate-uri "rav1e" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0if94sfviy5cwljlnsy0f470ixfs090k54g416kcc0qd9w4rhy17")))) + (base32 "1h9fhmamb7mh3cv86y1qja9qb7r6w2jv3p8ydngvsyjy59lq7hqn")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -5365,8 +5528,8 @@ result in several formats: ("rust-cfg-if" ,rust-cfg-if-1) ("rust-clap" ,rust-clap-4) ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-clap-lex" ,rust-clap-lex-0.3) ("rust-console" ,rust-console-0.15) - ("rust-const-fn-assert" ,rust-const-fn-assert-0.1) ("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-dav1d-sys" ,rust-dav1d-sys-0.7) ("rust-fern" ,rust-fern-0.6) @@ -5400,12 +5563,16 @@ result in several formats: ("rust-toml" ,rust-toml-0.5) ("rust-v-frame" ,rust-v-frame-0.3) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-y4m" ,rust-y4m-0.7)) + ("rust-winnow" ,rust-winnow-0.4) + ("rust-y4m" ,rust-y4m-0.8)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) ("rust-criterion" ,rust-criterion-0.4) ("rust-interpolate-name" ,rust-interpolate-name-0.2) ("rust-nom" ,rust-nom-7) + ("rust-predicates" ,rust-predicates-2) + ("rust-predicates-core" ,rust-predicates-core-1) + ("rust-predicates-tree" ,rust-predicates-tree-1) ("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) @@ -5421,7 +5588,7 @@ result in several formats: (string-append "--prefix=" out))))) (add-after 'install 'delete-static-library (lambda* (#:key outputs #:allow-other-keys) - ;; Delete 80 MiB (!) static library. + ;; Delete 93 MiB (!) static library. (delete-file (string-append (assoc-ref outputs "out") "/lib/librav1e.a"))))))) (native-inputs diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 122f0f8ee7..9debed0b86 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -14,6 +14,8 @@ ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2022, 2023 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com> ;;; Copyright © 2023 Charles Jackson <charles.b.jackson@protonmail.com> +;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> +;;; Copyright © 2023 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,7 +33,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages vim) - #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix gexp) #:use-module (guix utils) @@ -42,13 +44,16 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) + #:use-module (guix build-system vim) #:use-module (gnu packages) #:use-module (gnu packages acl) #:use-module (gnu packages admin) ; For GNU hostname #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages code) + #:use-module (gnu packages coq) #:use-module (gnu packages enlightenment) #:use-module (gnu packages fontutils) #:use-module (gnu packages gawk) @@ -81,7 +86,7 @@ (define-public vim (package (name "vim") - (version "9.0.1672") + (version "9.0.2001") (source (origin (method git-fetch) (uri (git-reference @@ -90,7 +95,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1cl4a7rzks0ll0b8y0ffrbin622k0qww3l0nz9kb0mz2favw0b9q")))) + "1y0xfvndnyfv677gn4mkq0jf5k15mm1dngl96l9j90sp4lbqrszx")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -147,7 +152,11 @@ (string-append line "return\n"))) (substitute* "src/testdir/test_popupwin.vim" ((".*Test_popup_drag_termwin.*" line) - (string-append line "return\n"))))) + (string-append line "return\n"))) + (with-fluids ((%default-port-encoding #f)) + (substitute* "src/testdir/test_writefile.vim" + ((".*Test_write_with_xattr_support.*" line) + (string-append line "return\n")))))) (add-before 'install 'fix-installman.sh (lambda _ (substitute* "src/installman.sh" @@ -295,12 +304,9 @@ written in the Python 3, Perl, Ruby, Tcl, and Lua programming languages."))) (sha256 (base32 "1h6sci5mhdfg6sjsjpi8l5li02hg858zcayiwl60y9j2gqnd18lv")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "neocomplete")) (synopsis "Next generation completion framework for Vim") (description "@code{neocomplete}, an abbreviation of 'neo-completion with cache', @@ -328,10 +334,9 @@ features than Vim's built-in completion.") (sha256 (base32 "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("neosnippets" "share/vim/vimfiles/")))) + (list #:plugin-name "neosnippet")) ; Extends neosnippet (synopsis "Snippets for neosnippet") (description "@code{neosnippet-snippets} provides standard snippets for the Vim plugin @@ -357,17 +362,9 @@ you can fill in on the fly.") (sha256 (base32 "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("rplugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "neosnippet")) (synopsis "Snippet support for Vim") (description "@code{neosnippet}, is a plugin for Vim which adds snippet support to Vim. @@ -396,12 +393,9 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "04h946vr4f8wxap3wzqs69y2v8n50g2zbk22jsg2kxr4c01z5cbw")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("ftplugin" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-scheme")) (synopsis "Scheme syntax for Vim") (description "@code{vim-scheme} provides Scheme support for Vim (R7RS and CHICKEN).") @@ -424,10 +418,9 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0ka3qbhsh8lix1vyj4678j7dnchkd8khhirrnn3aylxxf8fpqyg8")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("colors" "share/vim/vimfiles/")))) + (list #:plugin-name "luna")) (synopsis "Dark color theme for Vim") (description "@code{vim-luna} is a dark color theme for Vim.") @@ -451,17 +444,74 @@ trouble using them, because you do not have to remember each snippet name.") (sha256 (base32 "0alvrfhmd91zkd9h83s8wvgyq4iakcf6rybsyjd369qbgpcqky89")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("autoload" "share/vim/vimfiles/")))) + (list #:plugin-name "context_filetype")) (synopsis "Context filetype library for Vim") (description "@code{vim-context-filetype} is context filetype library for Vim script.") (home-page "https://github.com/Shougo/context_filetype.vim") (license license:expat)))) ; ??? check again +(define-public vim-coqtail + (let ((commit "dfe3939c9caff69d9af76bfd74f1a40fb7dc5609") + (revision "0")) + (package + (name "vim-coqtail") + (version (git-version "1.7.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whonore/Coqtail") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks")))) + (build-system vim-build-system) + (arguments + '(#:plugin-name "coqtail" + #:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda* (#:key inputs native-inputs tests? #:allow-other-keys) + (when tests? + (display "Running Python unit tests.\n") + (setenv "PYTHONPATH" (string-append (getcwd) "/python")) + (invoke "pytest" "-q" "tests/unit") + + (display "Running Python Coq tests.\n") + (invoke "pytest" "-q" "tests/coq") + + (display "Running Vim unit tests.\n") + (let* ((vim-vader (assoc-ref (or native-inputs inputs) + "vim-vader")) + (vader-path (string-append + vim-vader + "/share/vim/vimfiles/pack/guix/start/vader"))) + (with-directory-excursion "tests/vim" + (setenv "VADER_PATH" vader-path) + (invoke (string-append + (assoc-ref (or native-inputs inputs) "vim-full") + "/bin/vim") + "-E" "-Nu" "vimrc" + "-c" "Vader! *.vader"))) + + ;; Remove __pycache__ files generated during testing so that + ;; they don't get installed. + (delete-file-recursively "python/__pycache__"))))))) + (native-inputs + `(("coq-for-coqtail" ,coq-for-coqtail) + ("python-pytest" ,python-pytest) + ("vim-full" ,vim-full) ; Plugin needs Python 3. + ("vim-vader" ,vim-vader))) + (propagated-inputs (list coq coq-ide-server)) + (synopsis "Interactive Coq proofs in Vim") + (description "Coqtail enables interactive Coq proof development in Vim +similar to CoqIDE or ProofGeneral.") + (home-page "https://github.com/whonore/Coqtail") + (license license:expat)))) + (define-public vim-fugitive (package (name "vim-fugitive") @@ -475,15 +525,9 @@ trouble using them, because you do not have to remember each snippet name.") (file-name (git-file-name name version)) (sha256 (base32 "138290g2aph1jjhaza6biky5qi4ka6435s01bwxivllgb53g3irc")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "fugitive")) (home-page "https://github.com/tpope/vim-fugitive") (synopsis "Vim plugin to work with Git") (description "Vim-fugitive is a wrapper for Vim that complements the @@ -505,12 +549,9 @@ commit or run any Git arbitrary command.") (sha256 (base32 "1aksmr73648pvyc75pfdz28k2d4ky52rn7xiwcv7lz87q3vqld7k")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "airline")) (synopsis "Statusline for Vim") (description "@code{vim-airline} is an extensible statusline for Vim. @@ -536,12 +577,9 @@ and powerline symbols, etc.") (sha256 (base32 "1sb7nb7j7bz0pv1c9bgdy0smhr0jk2b1vbdv9yzghg5lrknpsbr6")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "airline-themes")) (synopsis "Collection of themes for Vim-airline") (description "@code{vim-airline-themes} is a collection of themes for @code{vim-airline}.") @@ -561,13 +599,9 @@ and powerline symbols, etc.") (file-name (git-file-name name version)) (sha256 (base32 "0j91f72jaz1s6aw1hpjiz30vk2ds2aqd9gisk91grsldy6nz6hhz")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax_checkers" "share/vim/vimfiles/")))) + (list #:plugin-name "syntastic")) (synopsis "Syntax checking plugin for Vim") (description "Vim-syntastic is a syntax checking plugin for Vim. It runs files through @@ -577,6 +611,17 @@ are detected, the user is notified.") (home-page "https://github.com/vim-syntastic/syntastic") (license license:wtfpl2))) +(define-public neovim-syntastic + (package + (inherit vim-syntastic) + (name "neovim-syntastic") + (synopsis "Syntax checking plugin for Neovim") + (description + "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through +external syntax checkers and displays any resulting errors to the user. This +can be done on demand, or automatically as files are saved. If syntax errors +are detected, the user is notified."))) + (define-public vim-solarized (let ((commit "62f656a02f93c5190a8753159e34b385588d5ff3") (revision "1")) @@ -592,11 +637,15 @@ are detected, the user is notified.") (file-name (git-file-name name version)) (sha256 (base32 "0001mz5v3a8zvi3gzmxhi3yrsb6hs7qf6i497arsngnvj2cwn61d")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("vim-colors-solarized/colors" "share/vim/vimfiles/") - ("vim-colors-solarized/doc" "share/vim/vimfiles/")))) + (list + #:plugin-name "solarized" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "vim-colors-solarized")))))) (home-page "https://github.com/altercation/vim-colors-solarized") (synopsis "Solarized color scheme for Vim") (description @@ -614,6 +663,37 @@ It keeps the same selective contrast relationships and overall feel when switching between the light and dark background modes.") (license license:expat)))) +(define-public vim-rainbow + (package + (name "vim-rainbow") + (version "5c8094b56568aeaeda9cc09b3ebc6d2ed95e1ad8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mason1920/rainbow") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jya8wwlkmgs89hndrq6gsaskhk9g0fh62wdib8v9vz2x5g3738z")))) + (build-system vim-build-system) + (arguments + (list + #:plugin-name "rainbow" + #:mode "opt" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "opt/rainbow")))))) + (home-page "https://github.com/mason1920/rainbow") + (synopsis "Rainbow Parentheses Improved") + (description + "As everyone knows, the most complex codes were composed of a mass of different +kinds of parentheses (typically: lisp). This plugin will help you read these +codes by showing different levels of parentheses in different colors.") + (license license:asl2.0))) + (define-public editorconfig-vim (package (name "editorconfig-vim") @@ -628,12 +708,11 @@ switching between the light and dark background modes.") (sha256 (base32 "0mp80bi2m56bb93szw87vy6q5s85yk9g91sl4pr51316rgdv5kkv")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list + #:plugin-name "editorconfig" + #:vim? #t)) (home-page "https://editorconfig.org/") (synopsis "EditorConfig plugin for Vim") (description "EditorConfig makes it easy to maintain the correct coding @@ -658,11 +737,9 @@ editors.") (sha256 (base32 "1xn08z3a21mgfvp5i1nv57jnldwxwnl5nkryiff3zc99b1mizigp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - (list #:install-plan - #~'(("lua" "share/nvim/site/pack/guix/start/packer.nvim/") - ("doc" "share/nvim/site/pack/guix/start/packer.nvim/")))) + (list #:plugin-name "packer.nvim")) (home-page "https://github.com/wbthomason/packer.nvim") (synopsis "Plugin manager for Neovim") (description @@ -671,27 +748,10 @@ editors.") is based on Vim's builtin plugin support.") (license license:expat)))) -(define-public neovim-syntastic - (package - (inherit vim-syntastic) - (name "neovim-syntastic") - (arguments - '(#:install-plan - '(("autoload" "share/nvim/site/") - ("doc" "share/nvim/site/") - ("plugin" "share/nvim/site/") - ("syntax_checkers" "share/nvim/site/")))) - (synopsis "Syntax checking plugin for Neovim") - (description - "Vim-syntastic is a syntax checking plugin for Neovim. It runs files through -external syntax checkers and displays any resulting errors to the user. This -can be done on demand, or automatically as files are saved. If syntax errors -are detected, the user is notified."))) - (define-public neovim (package (name "neovim") - (version "0.9.1") + (version "0.9.4") (source (origin (method git-fetch) (uri (git-reference @@ -700,7 +760,7 @@ are detected, the user is notified."))) (file-name (git-file-name name version)) (sha256 (base32 - "18dsl9fjcqvcqffny6jmcxwx5a7d13aykn310hbgghny8l11rw3c")))) + "0wj1p5x88s58f22crdyzwlfiqgnwlqdkbw4wxllf0v5hg16gbnhp")))) (build-system cmake-build-system) (arguments (list #:modules @@ -861,12 +921,12 @@ and support for fonts with ligatures.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (vifm (string-append out "/share/vifm")) - (vimfiles (string-append out "/share/vim/vimfiles"))) + (vimfiles (string-append + out "/share/vim/vimfiles/pack/guix/start/vifm"))) (copy-recursively (string-append vifm "/colors") (string-append vimfiles "/colors")) (copy-recursively (string-append vifm "/vim") vimfiles) - (delete-file-recursively (string-append vifm "/colors")) (delete-file-recursively (string-append vifm "/vim")))))))) (native-inputs (list groff)) ; for the documentation @@ -958,17 +1018,9 @@ a nested nvim process.") (sha256 (base32 "013yn2n2nsspk12bldkc9xn4z4kjx9rvracbllc8i1nngldckxd0")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("compiler" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("indent" "share/vim/vimfiles/") - ("ftdetect" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "guix")) (home-page "https://git.sr.ht/~efraim/guix.vim") (synopsis "Guix integration in Vim") (description "This package provides support for GNU Guix in Vim.") @@ -987,11 +1039,10 @@ a nested nvim process.") (sha256 (base32 "11zcw0sll6qg6ha0rr6n1cw5v73azvf7ycwn9lgiwa5cj7rrqjf4")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("plugin" "share/vim/vimfiles/") - ("doc/" "share/vim/vimfiles/doc" #:include ("asyncrun.txt"))))) + (list + #:plugin-name "asyncrun")) (home-page "https://github.com/skywind3000/asyncrun.vim") (synopsis "Run Async Shell Commands in Vim") (description "This plugin takes the advantage of new APIs in Vim 8 (and @@ -1013,12 +1064,9 @@ quickfix window in realtime.") (sha256 (base32 "1m8b5mn2zqlphzs6xfwykwmghf6p0wabrhpjmh7vav35jgcxc4wl")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "dispatch")) (home-page "https://github.com/tpope/vim-dispatch") (synopsis "Asynchronous build and test dispatcher") (description "Leverage the power of Vim's compiler plugins without being @@ -1043,11 +1091,9 @@ the job completes, errors will be loaded and parsed automatically.") (file-name (git-file-name name version)) (sha256 (base32 "05ffhhfahjqwxyrqmsinsahrs15wknzl2qbj8mznyv319mn2civ2")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - `(#:install-plan - '(("ftdetect" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "gemini")) (home-page "https://git.sr.ht/~torresjrjr/gemini.vim") (synopsis "Vim syntax highlighting plugin for Gemini") (description "This Vim plugin provides a Vim syntax highlighting plugin @@ -1071,11 +1117,9 @@ specification.") (sha256 (base32 "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "eunuch")) (home-page "https://github.com/tpope/vim-eunuch") (synopsis "Vim sugar for the UNIX shell commands") (description "Vim sugar for the UNIX shell commands that need it the most. @@ -1099,13 +1143,9 @@ help working on Vim buffers and the files they reference with one command.") (file-name (git-file-name name version)) (sha256 (base32 "0k4b629jn6xlxyjxdl3cgm06v9dmx967rqnslv5m82c9kscwpyh4")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - `(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("ftplugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-slime")) (home-page "https://technotales.wordpress.com/2007/10/03/like-slime-for-vim/") (synopsis "Vim plugin to give you some slime") (description "SLIME is an Emacs plugin to turn Emacs into a Lisp IDE. You @@ -1131,28 +1171,29 @@ to Lisp.") (sha256 (base32 "1dfc1wyjsgkckrklkzvk4whaz3ahaka59rvm7rc724mabmk83pmp")) (file-name (git-file-name name version)))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("vim/autoload" "share/vim/vimfiles/") - ("vim/doc" "share/vim/vimfiles/") - ("vim/ftplugin" "share/vim/vimfiles/") - ("vim/syntax" "share/vim/vimfiles/") - ("vim/test" "share/vim/vimfiles/") - ;; This is so the Vimscript part of Vlime can find the lisp files. - ("lisp" "share/vim/") - ;; This is so lisp can load Vlime without the Vim part. - ("lisp" "share/common-lisp/source/vlime")) + '(#:plugin-name "vlime" #:phases (modify-phases %standard-phases - ;; Create a symbolic link to the .asd file so that - ;; (asdf:load-system "vlime") finds the system. - (add-after 'install 'link-asd + (add-after 'symlink-files 'install-lisp-files (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/share/common-lisp/systems/")) - (symlink (string-append out "/share/common-lisp/source/vlime/vlime.asd") - (string-append out "/share/common-lisp/systems/vlime.asd")))))))) + (let* ((out (assoc-ref outputs "out")) + (common-lisp (string-append out "/share/common-lisp"))) + ;; Create a symbolic link to the .asd file so that + ;; (asdf:load-system "vlime") finds the system. + (copy-recursively "lisp" (string-append common-lisp "/source/vlime")) + (mkdir-p (string-append common-lisp "/systems/")) + (symlink (string-append common-lisp "/source/vlime/vlime.asd") + (string-append common-lisp "/systems/vlime.asd"))))) + (add-after 'install 'symlink-files + (lambda* (#:key outputs plugin-name mode #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") + "/share/vim/vimfiles/pack/guix/" mode "/" plugin-name) + (for-each (lambda (dir) + (symlink (string-append "./vim/" dir) dir)) + (list "after" "autoload" "doc" "ftplugin" "syntax")))))))) (propagated-inputs (list cl-alexandria cl-slime-swank @@ -1183,11 +1224,9 @@ to aid you in your glorious Common Lisp hacking quest.") (file-name (git-file-name name version)) (sha256 (base32 "07d5s20r0ssd7rir45vy0fqlci44gha1a81rcilgar227f3nw328")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "paredit")) (home-page "https://github.com/kovisoft/paredit") (synopsis "Vim plugin for structured editing of Lisp S-expressions") (description @@ -1209,11 +1248,9 @@ to aid you in your glorious Common Lisp hacking quest.") (file-name (git-file-name name version)) (sha256 (base32 "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "surround")) (home-page "https://github.com/tpope/vim-surround") (synopsis "Vim plugin for easy quoting and parenthesizing") (description @@ -1234,12 +1271,9 @@ change and add such surroundings in pairs.") "/vim-gnupg-v" version ".tar.gz")) (sha256 (base32 "02w8lgyyh7wgxysvmmcf9ja5c06vrbyh3alzvv97x8cfhrp0skn7")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "vim-gnupg")) (home-page "https://www.vim.org/scripts/script.php?script_id=3645") (synopsis "Vim plugin for transparent editing of gpg encrypted files") (description @@ -1265,12 +1299,9 @@ swapfile, and undofile when editing encrypted files to increase security.") (file-name (git-file-name name version)) (sha256 (base32 "0n68hg59h4rjn0ziqbsh5pr03l3kr98zk54659ny6vq107af1w96")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "ctrlp.vim")) (home-page "https://ctrlpvim.github.io/ctrlp.vim/") (synopsis "Fuzzy file, buffer, mru, tag, etc. finder for Vim") (description @@ -1302,12 +1333,9 @@ anything). (file-name (git-file-name name version)) (sha256 (base32 "054g80n09mmxxlh8xaic29bn8bgn3clvv732rymljdyvbj1mlhwd")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "MUcomplete")) (home-page "https://github.com/lifepillar/vim-mucomplete") (synopsis "MUcomplete is a minimalist autocompletion plugin for Vim") (description @@ -1331,12 +1359,9 @@ result is returned.") (file-name (git-file-name name version)) (sha256 (base32 "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "gitgutter")) (synopsis "Vim plugin which shows a git diff in the sign column") (description "A Vim plugin which shows a git diff in the sign column. It shows which @@ -1360,12 +1385,9 @@ buffer.") (file-name (git-file-name name version)) (sha256 (base32 "0ppsbsd696ih40d9f76mdl9sd9y7p2pvm65qmvq4b2zhkv4xbpxz")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "characterize")) (home-page "https://github.com/tpope/vim-characterize") (synopsis "Vim plugin for showing Unicode character metadata") (description @@ -1394,13 +1416,9 @@ additions: (file-name (git-file-name name version)) (sha256 (base32 "1fqfs8msmr6d4kpvxqp14sdjvp5fj52q5w5kz71myzcd4kqzmirp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")) + '(#:plugin-name "tagbar" #:phases (modify-phases %standard-phases (add-after 'unpack 'link-universal-ctags @@ -1435,15 +1453,9 @@ the class they are defined in.") (file-name (git-file-name name version)) (sha256 (base32 "1si8qla86ng8cffbmfrk9gss0i3912yw0f1ph4bsiq0kk837lccp")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - '(#:install-plan - '(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("lib" "share/vim/vimfiles/") - ("nerdtree_plugin" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/") - ("syntax" "share/vim/vimfiles/")))) + (list #:plugin-name "nerdtree")) (home-page "https://github.com/preservim/nerdtree") (synopsis "Tree explorer plugin for Vim") (description @@ -1465,13 +1477,9 @@ files for reading or editing, and perform basic file system operations.") (file-name (git-file-name name version)) (sha256 (base32 "1ka2rqn7rby55aps3iblh1dcqxm7m7qx72mpkz6y2aaj8mkj0zyd")))) - (build-system copy-build-system) + (build-system vim-build-system) (arguments - (list - #:install-plan - #~`(("autoload" "share/vim/vimfiles/") - ("doc" "share/vim/vimfiles/") - ("plugin" "share/vim/vimfiles/")))) + (list #:plugin-name "nerdcommenter")) (home-page "https://github.com/preservim/nerdcommenter") (synopsis "Vim plugin for easy commenting of code") (description @@ -1479,3 +1487,92 @@ files for reading or editing, and perform basic file system operations.") operations and styles which are invoked via key mappings and a menu. These operations are available for most filetypes.") (license license:cc0))) + +(define-public vim-vader + (let ((revision "0") + (commit "6fff477431ac3191c69a3a5e5f187925466e275a")) + (package + (name "vim-vader") + (version (git-version "0.4.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/junegunn/vader.vim") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "179dbbqdyl6qf6jdb6kdazn3idz17m1h2n88rlggb1wnly74vjin")))) + (build-system vim-build-system) + (arguments + '(#:plugin-name "vader" + #:phases + (modify-phases %standard-phases + (add-before 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: suite1.vader fails with an unknown reason, + ;; lang-if.vader requires Python and Ruby. + (substitute* "test/vader.vader" + (("Include.*feature/suite1.vader.*$") "") + (("Include.*feature/lang-if.vader.*$") "")) + + (display "Running Vim tests\n") + (with-directory-excursion "test" + (setenv "VADER_TEST_VIM" "vim -E") + (invoke "bash" "./run-tests.sh")))))))) + (native-inputs (list vim)) + (home-page "https://github.com/junegunn/vader.vim") + (synopsis "Test framework for Vimscript") + (description "Vader is a test framework for Vimscript designed to +simplify the process of writing and running unit tests. Vader.vim provides an +intuitive test syntax for defining test cases and expectations, it also can +be integrated with @acronym{CI, Continuous Integration} pipelines to +automate testing and is compatible with Vim and Neovim.") + (license license:expat)))) ;; Specified in README.md. + +(define-public vim-jedi-vim + (package + (name "vim-jedi-vim") + (version "0.11.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/davidhalter/jedi-vim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03fj7f5cpchrdmz9szal6fdg05wdwb0j6260nnyp37nmpcpn13yc")))) + (build-system vim-build-system) + (arguments (list #:plugin-name "jedi-vim")) + (propagated-inputs (list python-jedi)) + (home-page "https://github.com/davidhalter/jedi-vim") + (synopsis "Jedi autocompletion library for Vim") + (description + "@code{jedi-vim} is a VIM binding to the autocompletion library Jedi.") + (license license:expat))) + +(define-public vim-srcery-vim + (package + (name "vim-srcery-vim") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/srcery-colors/srcery-vim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nwk81y9j5ljjm3k19kf1zmscdxiis4mwan026wv7cqp7f9qhxlr")))) + (build-system vim-build-system) + (arguments + (list #:plugin-name "srcery" + #:mode "opt")) + (home-page "https://srcery.sh") + (synopsis "Dark colorscheme for gvim and vim") + (description + "Srcery is a color scheme with clearly defined contrasting colors +and a slightly earthy tone.") + (license license:expat))) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 58939a7ffc..dac0083d40 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2023 Juliana Sims <juli@incana.org> ;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org> +;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages containers) #: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) @@ -79,8 +81,8 @@ #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) - #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -113,17 +115,17 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) - #:use-module (gnu packages pulseaudio) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) - #:use-module (gnu packages selinux) #:use-module (gnu packages sdl) + #:use-module (gnu packages selinux) #:use-module (gnu packages sphinx) #:use-module (gnu packages spice) #:use-module (gnu packages ssh) @@ -135,6 +137,7 @@ #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -142,9 +145,8 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) - #:use-module (guix git-download) #:use-module (guix gexp) - #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1) @@ -1720,6 +1722,156 @@ manages Xen and LXC (Linux containers). It presents a summary view of running domains, their live performance and resource utilization statistics.") (license license:gpl2+))) +(define-public vmware-open-vm-tools + (package + (name "vmware-open-vm-tools") + (version "12.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vmware/open-vm-tools") + (commit (string-append "stable-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hbimhady0v1kd45azknl1lgzgldhgdjd7bj540rn3y4cai5cnk1")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list "--with-fuse=fuse3" + "--without-kernel-modules" + "--without-x" + (string-append + "--with-udev-rules-dir=" #$output "/lib/udev/rules.d")) + ;; TODO: Add iproute2 dbus which commands wrap. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "open-vm-tools"))) + (replace 'bootstrap + (lambda _ + (system* "autoreconf" "-if"))) + (add-after 'bootstrap 'patch-paths + (lambda _ + (substitute* "Makefile.am" + (("/etc/vmware-tools/") + (string-append #$output "/etc/vmware-tools/"))) + (substitute* "scripts/Makefile.am" + (("/etc/vmware-tools") + (string-append #$output "/etc/vmware-tools")) + (("/usr/bin") + (string-append #$output "/bin"))) + (substitute* "services/vmtoolsd/Makefile.am" + (("/etc/vmware-tools") + (string-append #$output "/etc/vmware-tools")) + (("\\$\\(PAM_PREFIX\\)") + (string-append #$output "/$(PAM_PREFIX)"))) + (substitute* "vgauth/service/Makefile.am" + (("/etc/vmware-tools/vgauth/schemas") + (string-append #$output "/etc/vmware-tools/vgauth/schemas")) + (("etc/vmware-tools/vgauth.conf") + (string-append #$output "/etc/vmware-tools/vgauth.conf"))) + (substitute* "vmhgfs-fuse/config.c" + (("/bin/fusermount3") + (string-append + #$(this-package-input "fuse") "/bin/fusermount3"))) + ;; XXX: This part might need more testing with shutdown and halt + ;; commands provided by Shepherd. + (substitute* "lib/system/systemLinux.c" + (("/sbin/shutdown") + (string-append + #$(this-package-input "shepherd") "/sbin/shutdown")) + (("/bin/reboot") + (string-append + #$(this-package-input "shepherd") "/sbin/reboot"))) + (substitute* "services/plugins/vix/foundryToolsDaemon.c" + (("/bin/mount") + (string-append + #$(this-package-input "util-linux") "/bin/mount")) + (("/usr/bin/vmhgfs-fuse") + (string-append #$output "/bin/vmhgfs-fuse")))))))) + (native-inputs + (list `(,glib "bin") ; for glib-genmarshal + autoconf + automake + libltdl + libtool + pkg-config)) + (inputs + (list eudev + fuse + glib + xmlsec + libmspack + ;; libdnet ; Not packed + libtirpc + libxcrypt + libxml2 + linux-pam + openssl + procps + rpcsvc-proto + shepherd ;for 'halt' and 'reboot', invoked from VMWare host. + util-linux + xmlsec)) + (home-page "https://github.com/vmware/open-vm-tools") + (synopsis "Tools for VMWare guest VM to enhance host-guest integration") + (description + "@code{open-vm-tools} is a set of services and modules that enable several +features in VMware products for better management of, and seamless user +interactions with, guests. + +@code{open-vm-tools} enables the following features in VMware products: + +@itemize +@item The ability to perform virtual machine power operations gracefully. +@item Execution of VMware provided or user configured scripts in guests during +various power operations. +@item The ability to run programs, commands and file system operation in guests +to enhance guest automation. +@item Authentication for guest operations. +@item Periodic collection of network, disk, and memory usage information from +the guest. +@item Generation of heartbeat from guests to hosts so VMware's HA solution can +determine guests' availability. +@item Clock synchronization between guests and hosts or client desktops. +@item Quiescing guest file systems to allow hosts to capture +file-system-consistent guest snapshots. +@item Execution of pre-freeze and post-thaw scripts while quiescing guest file +systems. +@item The ability to customize guest operating systems immediately after +powering on virtual machines. +@item Enabling shared folders between host and guest file systems on VMware +Workstation and VMware Fusion. +@item Copying and pasting text, graphics, and files between guests and hosts or +client desktops. +@end itemize") + (license license:gpl2))) + +(define-public vmware-open-vm-tools-gtk + (package/inherit vmware-open-vm-tools + (name "vmware-open-vm-tools-gtk") + (inputs + (modify-inputs (package-inputs vmware-open-vm-tools) + (prepend gdk-pixbuf-xlib + gtk+ + gtkmm-3 + libdrm + libx11 + libxext + libxi + libxinerama + libxrandr + libxrender + libxtst))) + (arguments + (substitute-keyword-arguments (package-arguments vmware-open-vm-tools) + ((#:configure-flags flags) + #~(delete "--without-x" #$flags)))) + (description "This package provides a GTK+ support for @code{open-vm-tools}."))) + (define-public criu (package (name "criu") diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6627abd8eb..9c3a97801e 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -825,7 +825,9 @@ others.") (native-inputs (list autoconf automake pkg-config)) (inputs - (list openssl ppp)) + ;; ppp < 2.5.0 is required due to + ;; <https://github.com/adrienverge/openfortivpn/pull/1148>. + (list openssl ppp-2.4.9)) (home-page "https://github.com/adrienverge/openfortivpn") (synopsis "Client for PPP+SSL VPN tunnel services") (description "Openfortivpn is a client for PPP+SSL VPN tunnel services. It diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1d2e58f1d4..ca771a30b1 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) + #:use-module (gnu packages llvm) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages wine) @@ -152,6 +153,38 @@ parser,disassembler, validator, and optimizer for SPIR-V.") SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (license license:asl2.0))) +(define-public spirv-llvm-translator + (package + (name "spirv-llvm-translator") + (version "15.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/SPIRV-LLVM-Translator") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lix3bpli7i9csz26bq0d9g1v7c0gim498m5bm2gp8kifj2yih1s")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list (string-append "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=" + (assoc-ref %build-inputs "spirv-headers") + "/include/spirv") + (string-append "-DLLVM_EXTERNAL_LIT=" + (assoc-ref %build-inputs "python-lit") + "/bin/lit") + "-DLLVM_SPIRV_INCLUDE_TESTS=ON"))) + (inputs (list llvm-15)) + (native-inputs (list clang-15 llvm-15 python-lit spirv-headers)) + (home-page "https://github.com/KhronosGroup/SPIRV-LLVM-Translator") + (synopsis "Bi-directional translation between SPIR-V and LLVM IR") + (description + "The LLVM/SPIR-V Bi-Directional Translator is a library and tool for +translation between LLVM IR and SPIR-V.") + (license license:asl2.0))) + (define-public glslang (package (name "glslang") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ca41b89b57..d7c2bdaf7d 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -95,6 +95,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg)) @@ -585,7 +586,7 @@ driven and does not detract you from your daily work.") (define-public nyxt (package (name "nyxt") - (version "3.7.0") + (version "3.9.2") (source (origin (method git-fetch) @@ -594,7 +595,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "0mar3y69b62jby4kfdsm2xsnb830v1d468zspa3frpnphwxv4a5y")) + "1v85jn46d9vacjig6n9z797fch88fw6vzwbfdzlqdkm86vvm8dwn")) (file-name (git-file-name "nyxt" version)) (modules '((guix build utils))) (snippet @@ -847,16 +848,16 @@ http, and https via third-party applications.") (define-public tinmop (package (name "tinmop") - (version "0.9.9.141") + (version "0.9.9.1414213") (source (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/tinmop") + (url "https://codeberg.org/cage/tinmop") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hx52kaq0q9iccalkxk50q1v3mf9ypardjgv56d5sdrbhfqyashl")))) + (base32 "0rlgnqld6ls46452xvcr8k4ji4lwmlsrxib5ii9l9clkm0s477wv")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -867,6 +868,7 @@ http, and https via third-party applications.") nano openssl sbcl + tk unzip xdg-utils)) (inputs @@ -888,10 +890,12 @@ http, and https via third-party applications.") sbcl-crypto-shortcuts sbcl-drakma sbcl-esrap + sbcl-flexi-streams sbcl-ieee-floats sbcl-local-time sbcl-log4cl sbcl-marshal + sbcl-nodgui sbcl-osicat sbcl-parse-number sbcl-percent-encoding @@ -902,6 +906,7 @@ http, and https via third-party applications.") sbcl-trivial-clipboard sbcl-unix-opts sbcl-usocket + sbcl-yason sqlite)) (arguments `(#:tests? #f @@ -932,10 +937,10 @@ http, and https via third-party applications.") "--eval \"(push \\\"$$(pwd)/\\\" asdf:*central-registry*)\" ")))) #t))))) (synopsis - "Gemini, gopher, kami and pleroma client with a terminal interface") + "Gemini, gopher, kami and mastodon/pleroma client with a terminal interface") (description - "This package provides a Gemini, gopher, kami and pleroma client with a -terminal interface.") + "This package provides a Gemini, gopher, kami and mastodon/pleroma client +with a terminal interface, for Gemini also a GUI is available.") (home-page "https://www.autistici.org/interzona/tinmop.html") (license license:gpl3+))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5823469a83..a7396ac1a7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu> ;;; Copyright © 2023 Christopher Howard <christopher@librehacker.com> ;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> +;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,6 +186,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages re2c) #:use-module (gnu packages readline) + #:use-module (gnu packages sdl) #:use-module (gnu packages search) #:use-module (gnu packages serialization) #:use-module (gnu packages skribilo) @@ -278,14 +280,14 @@ (define-public httpd (package (name "httpd") - (version "2.4.57") + (version "2.4.58") (source (origin (method url-fetch) (uri (string-append "mirror://apache/httpd/httpd-" version ".tar.bz2")) (sha256 (base32 - "0ajdz5f2w9nbmqydip2mv9m4xlnc4swmw7mqzgnrbq4mxr5bik6v")))) + "1id45r2ccgkbjm9i998997ch32lvicpyynyx8x6aa4420wmdf5ps")))) (build-system gnu-build-system) (native-inputs (list `(,pcre "bin"))) ;for 'pcre-config' (inputs (list apr apr-util openssl perl)) ; needed to run bin/apxs @@ -424,10 +426,32 @@ Interface} specification.") (license license:asl2.0) (home-page "https://modwsgi.readthedocs.io/"))) +(define-public ablorb + (package + (name "ablorb") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/lilyp/ablorb") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i705p2gw5aryj0myfj3rmsrmj3ilqdn5w7xd5dwjkyi80rc20kj")))) + (build-system meson-build-system) + (inputs (list glib gconf gnome-vfs libxml2)) + (native-inputs (list pkg-config)) + (home-page "https://gitlab.gnome.org/lilyp/ablorb") + (synopsis "Replace asset links with data URIs") + (description "Ablorb takes an XML file and resolves relative links, +replacing them with data URIs.") + (license license:gpl3+))) + (define-public monolith (package (name "monolith") - (version "2.6.1") + (version "2.7.0") (source (origin (method git-fetch) @@ -436,23 +460,24 @@ Interface} specification.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pj4wnsw5a4ys79sqw68ib6zimaqlkplb89x6yncg949a6hj8516")))) + (base32 "0ccwjsp8gdgp0wafc3zvlfmx3f58axc1k1ac80qha3g60xccqn56")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-base64" ,rust-base64-0.13) ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-2) - ("rust-cssparser" ,rust-cssparser-0.28) + ("rust-clap" ,rust-clap-3) + ("rust-cssparser" ,rust-cssparser-0.29) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-html5ever" ,rust-html5ever-0.24) + ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-regex" ,rust-regex-1) ("rust-reqwest" ,rust-reqwest-0.11) - ("rust-sha2" ,rust-sha2-0.9) + ("rust-sha2" ,rust-sha2-0.10) ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-1)))) + (("rust-assert-cmd" ,rust-assert-cmd-2)))) (native-inputs (list pkg-config)) (inputs @@ -982,7 +1007,7 @@ similar to live activity monitoring provided with NGINX plus.") (define-public lighttpd (package (name "lighttpd") - (version "1.4.71") + (version "1.4.73") (source (origin (method url-fetch) (uri (string-append "https://download.lighttpd.net/lighttpd/" @@ -990,7 +1015,7 @@ similar to live activity monitoring provided with NGINX plus.") "lighttpd-" version ".tar.xz")) (sha256 (base32 - "1b5g4l9q84sjfwx9x1d7bqp9n5j0wkaj8cyzak1zv5h3l9fr3dmq")))) + "1a2cx3di07wf8qii7dpk4yr5wvaz8c9na1x7523smc0lng81d241")))) (build-system gnu-build-system) (arguments (list #:configure-flags @@ -4933,8 +4958,8 @@ Cloud.") (license license:expat))) (define-public guix-data-service - (let ((commit "1c7539418743e0dfe3a9cad22c414fd732daef8f") - (revision "42")) + (let ((commit "e13febc81706fbfb7f073bc4e9ce73fbc80d5180") + (revision "44")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4946,7 +4971,7 @@ Cloud.") (file-name (git-file-name name version)) (sha256 (base32 - "1gp4mhjssxky0jjjz916rfgz4w2f327wfd5ixb6lb00ydlfh5mws")))) + "0pk86b44zg2yn73sxlcd9pqbz8xwprwzaib2npnq80y3yzc6qc22")))) (build-system gnu-build-system) (arguments (list @@ -5689,6 +5714,39 @@ project.") written in C. It is developed as part of the NetSurf project.") (license license:expat))) +(define-public libnsfb + (package + (name "libnsfb") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.netsurf-browser.org/libs/releases/" + name "-" version "-src.tar.gz")) + (sha256 + (base32 "16m3kv8x8mlic4z73h2s3z8lqmyp0z8i30x95lzr1pslxfinqi5y")))) + (build-system gnu-build-system) + (native-inputs + (list netsurf-buildsystem pkg-config)) + (inputs + ;; SDL is needed to accept any (keyboard, mouse) input. Don't propagate it + ;; to satisfy libnsfb.pc: netsurf is the only user and not worth the pain. + (list sdl)) + (arguments netsurf-buildsystem-arguments) + (home-page "https://www.netsurf-browser.org/projects/libnsfb/") + (synopsis "Framebuffer display abstraction library") + (description + "LibNSFB is a framebuffer abstraction library, written in C. It is +developed as part of the NetSurf project and is intended to be suitable for use +in other projects too. + +The overall idea of the library is to provide a generic abstraction to a linear +section of memory which corresponds to a visible array of pixel elements on a +display device. Different colour depths are supported and the library provides +routines for tasks such as drawing onto the framebuffer and rectangle copy +operations.") + (license license:expat))) + (define-public libnsgif (package (name "libnsgif") @@ -6637,7 +6695,10 @@ command-line arguments or read from stdin.") (("^import re\n" line) (string-append line "re._pattern_type = re.Pattern\n")))) (find-files "." "\\.py$")) - #t)))) + ;; Mapping got moved to collections.abc + (substitute* "internetarchive/utils.py" + (("from collections import Mapping") + "from collections.abc import Mapping")))))) (build-system python-build-system) (arguments `(#:phases @@ -7885,6 +7946,35 @@ features include: @end enumerate\n") (license license:expat))) +(define-public monsterid + (let ((commit "5597f177b473343ff5cad9a6e0e5b255312c6096") + (revision "0")) + (package + (name "monsterid") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/splitbrain/monsterID") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ixyrrcbw96plcdna2rx1pqwisqy9hnr57kvamgj13lzlv2whdb3")))) + (build-system copy-build-system) + (arguments + '(#:install-plan '(("monsterid.php" "share/web/monsterid/") + ("parts/" "share/web/monsterid/parts/" + #:include-regexp ("\\.png$"))))) + (home-page "https://www.splitbrain.org/projects/monsterid") + (synopsis "The original MonsterID implementation") + (description + "MonsterID is a method to generate a unique monster image based upon a +certain identifier (IP address, email address, whatever). It can be +used to automatically provide personal avatar images in blog comments +or other community services.") + (license license:expat)))) + (define-public cat-avatar-generator (let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa") (revision "1")) @@ -7933,7 +8023,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.49.0") + (version "1.58.0") (source (origin (method url-fetch) @@ -7942,7 +8032,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") "nghttp2-" version ".tar.xz")) (sha256 (base32 - "0vm692c7q2wc4xxz8c41nr8jps2fkwf51xp8fb233cghpf9d9kxh")))) + "1q4ps8acr7nyia7mf2z11m0yh3fn1imhyv855j3xjbx91l2a6s2a")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index c46bcd5662..0c82435cde 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -317,13 +317,13 @@ propagated by default) such as @code{gst-plugins-good} and (package (inherit webkitgtk) (name "wpewebkit") - (version "2.40.0") + (version "2.40.5") (source (origin (inherit (package-source webkitgtk)) (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1dl663nbm011sx099x9gdhk3aj119yn5rxp77jmnhdv1l77jpv58")))) + (base32 "0cv74qy67a0hg8sba18wrjcmmwkj4z23wqnn5yqrh3n594q8srac")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 3822165f7f..400f0e7607 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -79,7 +79,7 @@ (define-public wine-minimal (package (name "wine-minimal") - (version "8.16") + (version "8.18") (source (origin (method url-fetch) @@ -91,7 +91,8 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1zgkqflqgl2y3a90f2nvcc1vhzr9ni0lps276553j8zgbqvnd0hn")))) + (base32 "1nv06awb3hv26v64nqnks9yiz7w368scxznj77vxa3zpmhafzyih")))) + (properties '((upstream-name . "wine"))) (build-system gnu-build-system) (native-inputs (list bison flex)) (inputs `()) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 22f1241060..954cadaa58 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2023 Jonathan Brielamier <jonathan.brielmaier@web.de> ;;; Copyright © 2023 Vessel Wave <vesselwave@disroot.org> ;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr> +;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -786,7 +787,7 @@ desktop environment.") (define-public icewm (package (name "icewm") - (version "3.4.2") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append @@ -794,7 +795,7 @@ desktop environment.") version "/icewm-" version ".tar.lz")) (sha256 (base32 - "1qki2r0x9d3yhxypa4i875qzr4dsjig6prs8pvj1w83yb0z4nk5n")))) + "0cdsb2d45dwcr2dm4jfh0z5g6pkb0ghd4jaybxqiz74mbw5rmjhv")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig @@ -1083,7 +1084,8 @@ drags, snap-to-border support, and virtual desktops.") (add-after 'install 'install-vim-files (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (syntax (string-append out "/share/vim/vimfiles/syntax"))) + (syntax (string-append + out "/share/vim/vimfiles/pack/guix/start/fluxbox/syntax"))) (copy-recursively "3rd/vim/vim/syntax" syntax) #t))) (add-after 'install 'install-xsession @@ -1488,6 +1490,56 @@ It is inspired by Xmonad and dwm. Its major features include: project derived from the original Calm Window Manager.") (license license:isc))) +(define-public dunst + (package + (name "dunst") + (version "1.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dunst-project/dunst") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17zrw7jrnlyln81pxw7p4jgvl7j1w1gf488nfskhns6j6dcz90gh")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no check target + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "PREFIX=" %output) + (string-append "SYSCONFDIR=" %output "/etc") + ;; Otherwise it tries to install service file + ;; to "dbus" store directory. + (string-append "SERVICEDIR_DBUS=" %output + "/share/dbus-1/services") + "dunstify") + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list pkg-config perl ;for pod2man + which)) + (inputs (list dbus + (librsvg-for-system) ;for svg support + glib + cairo + pango + libnotify ;for dunstify + libx11 + libxscrnsaver + libxinerama + libxrandr + libxdg-basedir + wayland)) ;for wayland support + (home-page "https://dunst-project.org/") + (synopsis "Customizable and lightweight notification daemon") + (description + "Dunst is a highly configurable and minimalistic notification daemon. +It provides @code{org.freedesktop.Notifications} D-Bus service, so it is +started automatically on the first call via D-Bus.") + (license license:bsd-3))) + (define-public dwl (package (name "dwl") @@ -1986,7 +2038,7 @@ core/thread.") (define-public wlr-randr (package (name "wlr-randr") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -1995,7 +2047,7 @@ core/thread.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cj24fb6s7n8nphvhrp8ldrivjdcrjw64i5v9rsfb6z80q4qg548")))) + (base32 "13mya6j5z7cwg2a973y28ya8w36kxhj0fgj8bk9z6yf2w0ryr5xv")))) (build-system meson-build-system) (inputs (list wayland)) (native-inputs (list pkg-config)) @@ -2941,7 +2993,7 @@ read and write, and compatible with JSON.") (define-public labwc (package (name "labwc") - (version "0.6.4") + (version "0.6.5") (source (origin (method git-fetch) (uri (git-reference @@ -2950,13 +3002,14 @@ read and write, and compatible with JSON.") (file-name (git-file-name name version)) (sha256 (base32 - "00ajr7s8qywdfa9vhlfc02p1wwdcqaaa09pm1im9w6mrvb904lzh")))) + "04401k1i6b9s2v6mbhw5llla8fdpkhmgz826iva246iqch9z20lx")))) (build-system meson-build-system) (native-inputs (list pkg-config gettext-minimal scdoc)) (inputs (list cairo glib + librsvg libxcb libxml2 pango diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index d0c323e30c..b9c81472aa 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -66,7 +66,7 @@ (define-public wxwidgets (package (name "wxwidgets") - (version "3.2.2.1") + (version "3.2.3") (source (origin (method url-fetch) @@ -74,7 +74,7 @@ "releases/download/v" version "/wxWidgets-" version ".tar.bz2")) (sha256 - (base32 "00ic4h4j0621v8h6n8zbl9xgay01a4dynh48gx5zyvr9f6zbdz6z")) + (base32 "0ym6s4q1fh1cd6x4nh468i15ivjmw22flsi7c9qkhrz1qxksnw61")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-26))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c4606d1eb3..4b5d03836d 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -510,14 +510,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "1.4.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l")))) + "0awwz5pg9x5bj0d7dpg4a7bd4gl6k55mlpxwb12534fkrpn19p0f")))) (outputs '("out" "doc")) (build-system meson-build-system) (inputs @@ -572,6 +572,19 @@ X11 (yet).") "See 'COPYING' in the distribution.")) (properties '((cpe-name . "xkbcommon"))))) +(define-public libxkbcommon-1.5 + (package + (inherit libxkbcommon) + (version "1.5.0") + (source (origin + (inherit (package-source libxkbcommon)) + (method url-fetch) + (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" + version ".tar.xz")) + (sha256 + (base32 + "05z08rpa464x8myjxddhix7jp9jcmakd7xrybx4hz8dwpg2123sn")))))) + (define-public libfakekey (package (name "libfakekey") @@ -683,14 +696,14 @@ options are given, the action applies to the focused window.") (define-public xeyes (package (name "xeyes") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://www.x.org/releases/individual/app/" - name "-" version ".tar.bz2")) + name "-" version ".tar.xz")) (sha256 - (base32 "1nxn443pfhddmwl59wplpjkslhlyfk307qx18nrimvvb2hipx8gq")))) + (base32 "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09")))) (build-system gnu-build-system) (inputs (list libxext libxi libxmu libxrender libxt)) @@ -706,7 +719,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.40.0") + (version "0.42.2") (source (origin (method url-fetch) @@ -715,7 +728,7 @@ following the mouse.") "https://www.cairographics.org/releases/pixman-" version ".tar.gz")) (sha256 - (base32 "1z13n96m7x91j25qq9wlkxsbq04wfwjhw66ir17frna06zn0s83d")) + (base32 "0pk298iqxqr64vk3z6nhjwr6vjg1971zfrjkqy5r9zd2mppq057a")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) @@ -740,7 +753,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.114") + (version "2.4.117") (source (origin (method url-fetch) (uri (string-append @@ -748,7 +761,7 @@ rasterisation.") version ".tar.xz")) (sha256 (base32 - "09nhk3jx3qzggl5vyii3yh4zm0npjqsbxhzvxrg2xla77a2cyj9h")))) + "0ar4c4ikcbm1s4sg09ld406izq5s1yk7b2n0mmvql77bwdlqv252")))) (build-system meson-build-system) (arguments (list #:configure-flags @@ -762,6 +775,16 @@ rasterisation.") (_ ''())) #:phases #~(modify-phases %standard-phases + ;; A typo in a previous upstream commit disabled building + ;; libdrm_intel by default on supported platforms. This was + ;; fixed by the following change in upstream commit + ;; 8a933c778a0eb36526bf3fc8a289e25add9ff8b0. + ;; TODO: Remove on next update of libdrm. + (add-after 'unpack 'build-intel-by-default + (lambda _ + (substitute* "meson.build" + (("system\\(\\)\\.startswith") + "cpu_family().startswith")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1727,7 +1750,7 @@ less if you are working in front of the screen at night.") (define-public xscreensaver (package (name "xscreensaver") - (version "6.04") + (version "6.08") (source (origin (method url-fetch) @@ -1735,7 +1758,7 @@ less if you are working in front of the screen at night.") (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "0lmiyvp3qs2gngd53f191jmlizs9l04i2gnrqbn96mqckyr18w3q")) + (base32 "18vnbs2ns42cgnnsvwn0zh98wcfzxf2k9mib5x5zkv6f4njjpxaw")) (modules '((guix build utils))) (snippet ;; 'configure.ac' checks for $ac_unrecognized_opts and exits if it's @@ -1782,14 +1805,13 @@ less if you are working in front of the screen at night.") libjpeg-turbo linux-pam pango - gdk-pixbuf-xlib gtk+ perl cairo bc libxrandr glu - glib)) + `(,glib "bin"))) (home-page "https://www.jwz.org/xscreensaver/") (synopsis "Classic screen saver suite supporting screen locking") (description @@ -2791,9 +2813,16 @@ Wayland and @code{wlroots} by leveraging @command{grim} and @command{slurp}.") #~(list (string-append "-Dzshcompletiondir=" #$output "/share/zsh/site-functions") (string-append "-Dfishcompletiondir=" #$output - "/share/fish/completions")) + "/share/fish/vendor_completions.d")) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-bash-completion-dir + (lambda _ + (substitute* "completions/bash/meson.build" + (("bash_completion_dir =.*") + (string-append "bash_completion_dir = " + "join_paths(get_option('sysconfdir'), " + "'bash_completion.d')\n"))))) (add-after 'unpack 'patch-file-names (lambda* (#:key inputs #:allow-other-keys) (substitute* (find-files "src" "\\.c$") @@ -3211,6 +3240,7 @@ initialize programs.") (build-system gnu-build-system) (native-inputs (list autoconf automake + dbus-glib ;; for dbus-binding-tool `(,glib "bin") pkg-config)) (inputs (list dbus-glib glib libx11)) @@ -3266,7 +3296,7 @@ using @command{dmenu}.") (define-public fuzzel (package (name "fuzzel") - (version "1.9.1") + (version "1.9.2") (home-page "https://codeberg.org/dnkl/fuzzel") (source (origin (method git-fetch) @@ -3274,7 +3304,7 @@ using @command{dmenu}.") (file-name (git-file-name name version)) (sha256 (base32 - "0k65nl2yifxnb95nv6nnikqxdanng2baw7gl47ji1av3gsdx3bsm")))) + "1pmxqdr00x9qbg0h23q3kywhd06qna0f6r5kfa8a1v7x2n1gylsz")))) (build-system meson-build-system) (arguments (list #:build-type "release" diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index da764a0081..a78f58c270 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1035,7 +1035,7 @@ local and remote file systems and manage bookmarks of such.") (define-public parole (package (name "parole") - (version "4.18.0") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" @@ -1043,7 +1043,7 @@ local and remote file systems and manage bookmarks of such.") name "-" version ".tar.bz2")) (sha256 (base32 - "0w9p9zf87pnpl44bay8srrsczscxpmbsriwzqzv31gis9ny2zrdv")))) + "0rjsqm582c8i3lyi1n2ghp638cr0chw358i05g7njbw1hjj68wqc")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8bbdb8e27b..72256895f1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -970,9 +970,9 @@ rendering commands to the X server.") (uri (string-append "mirror://xorg/individual/app/iceauth-" version - ".tar.bz2")) + ".tar.xz")) (sha256 - (base32 "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6")))) + (base32 "01cc816fvdkkfcnqnyvgcshcip2jzjivwa8hzdvsz0snak5xzf9c")))) (build-system gnu-build-system) (inputs (list libice)) @@ -1432,18 +1432,17 @@ treat it as part of their software base when porting.") (define-public libxpm (package (name "libxpm") - (version "3.5.13") - (replacement libxpm/fixed) + (version "3.5.17") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXpm-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw")))) + "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) @@ -1457,21 +1456,6 @@ treat it as part of their software base when porting.") (description "XPM (X Pixmap) image file format library.") (license license:x11))) -(define-public libxpm/fixed - (package - (inherit libxpm) - (version "3.5.17") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libXpm-" - version - ".tar.xz")) - (sha256 - (base32 - "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4")))))) - (define-public libxres (package (name "libxres") @@ -5029,7 +5013,7 @@ by the Xorg server.") (define-public xorg-server (package (name "xorg-server") - (version "21.1.4") + (version "21.1.9") (source (origin (method url-fetch) @@ -5037,7 +5021,7 @@ by the Xorg server.") "/xserver/xorg-server-" version ".tar.xz")) (sha256 (base32 - "11y5w6z3rz3i4jyv0wc3scd2jh3bsmcklq0fm7a5invywj7bxi2w")) + "0fjk9ggcrn96blq0bm80739yj23s3gjjjsc0nxk4jk0v07i7nsgz")) (patches (list ;; See: @@ -5332,16 +5316,15 @@ Wayland.") (define-public libx11 (package (name "libx11") - (version "1.8.1") - (replacement libx11-fixed) ;security fixes + (version "1.8.7") (source (origin (method url-fetch) - (uri (string-append "https://xorg.freedesktop.org/archive/" - "/individual/lib/libX11-" version ".tar.xz")) + (uri (string-append "mirror://xorg/individual/lib/libX11-" + version ".tar.xz")) (sha256 (base32 - "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v")))) + "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5363,19 +5346,6 @@ Wayland.") (description "Xorg Core X11 protocol client library.") (license license:x11))) -(define-public libx11-fixed - (package - (inherit libx11) - (version "1.8.7") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/lib/libX11-" - version ".tar.xz")) - (sha256 - (base32 - "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5")))))) - ;; packages of height 5 in the propagated-inputs tree (define-public libxcursor @@ -6120,7 +6090,7 @@ Conventions Manual) and some of the @dfn{EWMH} (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - (list pkg-config autoconf automake)) + (list util-macros pkg-config autoconf automake)) (inputs (list libx11 libxext @@ -6139,14 +6109,14 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "5.0.2") + (version "5.0.4") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0gxv0h1spg2jl3g9cc6qxxkq6a7prmb92dqqwk0s6pvrj8w3izlk")) + (base32 "0zb49adrjrdsmf0k9xdc6j2idqy5lgzsjjrb4awjh5i4r3wc58m0")) (patches (search-patches "xpra-5.0-systemd-run.patch" "xpra-5.0-install_libs.patch")))) (build-system python-build-system) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index fd42c21638..200b5c9940 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -1,5 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2022 Maya Tomasek <maya.tomasek@disroot.org> +;;; Copyright © 2023 Ekaitz Zarraga <ekaitz@elenq.tech> +;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,10 +23,76 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) + #:use-module (guix build-system zig) #:use-module (guix gexp) #:use-module (gnu packages) - #:use-module (gnu packages zig) - #:use-module (gnu packages python)) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages man) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages wm) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #:use-module (gnu packages zig)) + +(define-public river + (package + (name "river") + (version "0.2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/riverwm/river") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nvhqs6wwisf8ama7y1y3q3nf2jm9sh5bn46z8kyds8cikm0x1vh")))) + (build-system zig-build-system) + (arguments + (list + #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support + #:zig-release-type "safe")) + (native-inputs (list libevdev + libxkbcommon + pkg-config + pixman + scdoc + wayland + wayland-protocols + wlroots)) + (home-page "https://github.com/riverwm/river") + (synopsis "Dynamic tiling Wayland compositor") + (description + "River is a dynamic tiling Wayland compositor with flexible +runtime configuration. It can run nested in an X11/Wayland session or also +directly from a tty using KMS/DRM.") + (license license:gpl3))) + +(define-public tigerbeetle + (package + (name "tigerbeetle") + (version "0.13.35") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tigerbeetledb/tigerbeetle") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0x8msknvq8s6vnlczq5fxmaiqvig2sbcv60c3x8zbgr28dsqpmll")))) + (build-system zig-build-system) + (arguments + (list + #:zig zig-0.9 + #:zig-release-type "safe")) + (synopsis "Distributed financial accounting database") + (description "TigerBeetle is a financial accounting database designed for +mission-critical safety and performance for financial services.") + (home-page "https://github.com/tigerbeetledb/tigerbeetle") + (license license:asl2.0))) (define-public zig-zls (package diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index dcca9a1121..c9c3ddca62 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages zig) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix git-download) @@ -29,10 +30,10 @@ #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig-0.10 +(define-public zig-0.9 (package (name "zig") - (version "0.10.1") + (version "0.9.1") (source (origin (method git-fetch) @@ -41,57 +42,66 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) - (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) + (patches (search-patches "zig-0.9-riscv-support.patch" + "zig-use-system-paths.patch" + "zig-do-not-link-against-librt.patch")))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list #$@(if (%current-target-system) + (list (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system))) + '())) + #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? (not (or (target-riscv64?) + (%current-target-system))) + #:phases + #~(modify-phases %standard-phases + #$@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))) (inputs - (list clang-15 ; Clang propagates llvm. - lld-15 - zlib - (list zstd "lib"))) + (list clang-13 ;Clang propagates llvm. + lld-13)) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs - (list llvm-15)) - (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - '(string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '()) - (string-append "-DZIG_TARGET_MCPU=baseline") - "-DZIG_SHARED_LLVM=ON" - (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") - "/lib/zig")) - #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. - #:out-of-source? #f ; for tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env-variables - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Set CC, since the stage 2 zig relies on it to find the libc - ;; installation, and otherwise silently links against its own. - (setenv "CC" ,(cc-for-target)) - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - (add-after 'patch-source-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - ;; Zig uses information about /usr/bin/env to determine the - ;; version of glibc and other data. - (substitute* "lib/std/zig/system/NativeTargetInfo.zig" - (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - "build" "test" - ;; We're not testing the compiler bootstrap chain. - "-Dskip-stage1" - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))) + (list llvm-13)) (native-search-paths (list (search-path-specification @@ -119,14 +129,15 @@ toolchain. Among other features it provides ;; https://github.com/ziglang/zig/issues/6485 (supported-systems %64bit-supported-systems) ;; Stage3 can take a lot of time and isn't verbose. - (properties `((max-silent-time . 9600))) + (properties `((max-silent-time . 9600) + ,@(clang-properties "13"))) (license license:expat))) -(define-public zig-0.9 +(define-public zig-0.10 (package - (inherit zig-0.10) + (inherit zig-0.9) (name "zig") - (version "0.9.1") + (version "0.10.1") (source (origin (method git-fetch) @@ -135,63 +146,55 @@ toolchain. Among other features it provides (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-0.9-riscv-support.patch" - "zig-use-system-paths.patch" - "zig-do-not-link-against-librt.patch")))) + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) + (patches (search-patches "zig-do-not-link-against-librt.patch" + "zig-use-baseline-cpu-by-default.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments zig-0.9) + ((#:configure-flags flags ''()) + #~(cons* "-DZIG_TARGET_MCPU=baseline" + "-DZIG_SHARED_LLVM=ON" + (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig") + #$flags)) + ;; TODO: zig binary can't find ld-linux. + ((#:validate-runpath? _ #t) #f) + ((#:tests? _ #t) #t) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + #$@(if (target-riscv64?) + `((delete 'adjust-tests)) + '()) + (add-after 'unpack 'set-CC + (lambda _ + ;; Set CC, since the stage 2 zig relies on it to find the libc + ;; installation, and otherwise silently links against its own. + (setenv "CC" #$(cc-for-target)))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native")))))))) (inputs - (list clang-13 ; Clang propagates llvm. - lld-13)) - ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (modify-inputs (package-inputs zig-0.9) + (prepend zlib `(,zstd "lib")) + (replace "clang" clang-15) + (replace "lld" lld-15))) (native-inputs - (list llvm-13)) - (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '())) - #:out-of-source? #f ; for tests - ;; There are too many unclear test failures. - #:tests? ,(not (or (target-riscv64?) - (%current-target-system))) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'set-cache-dir - (lambda _ - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - ,@(if (target-riscv64?) - ;; It is unclear why all these tests fail to build. - `((add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "build.zig" - ((".*addRuntimeSafetyTests.*") "") - ((".*addRunTranslatedCTests.*") "")) - (substitute* "test/standalone.zig" - ;; These tests fail to build on riscv64-linux. - ;; They both contain 'exe.linkSystemLibrary("c");' - ((".*shared_library.*") "") - ((".*mix_o_files.*") "") - ;; ld.lld: error: undefined symbol: __tls_get_addr - ;; Is this symbol x86 only in glibc? - ((".*link_static_lib_as_system_lib.*") ""))))) - '()) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - ;; and stage 2 tests require a lot of RAM. - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))))) + (modify-inputs (package-native-inputs zig-0.9) + (replace "llvm" llvm-15))) + (properties `((max-silent-time . 9600) + ,@(clang-properties "15"))))) (define-public zig zig-0.10) diff --git a/gnu/services.scm b/gnu/services.scm index ff153fbc7b..23c3d8a9f4 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -651,7 +651,9 @@ information is missing, return the empty list (for channels) and possibly ;; Force file names to be decoded as UTF-8. See ;; <https://bugs.gnu.org/26353>. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append + (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_CTYPE "en_US.utf8") (delete-file-recursively "/tmp") (delete-file-recursively "/var/run") diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 5cf74c6e4d..0b325fddb1 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -52,6 +52,10 @@ rottlog-configuration rottlog-configuration? + rottlog-configuration-rottlog + rottlog-configuration-rc-file + rottlog-configuration-rotations + rottlog-configuration-jobs rottlog-service rottlog-service-type @@ -193,25 +197,25 @@ for ROTATION." (define-record-type* <rottlog-configuration> rottlog-configuration make-rottlog-configuration rottlog-configuration? - (rottlog rottlog-rottlog ;file-like + (rottlog rottlog-configuration-rottlog ;file-like (default rottlog)) - (rc-file rottlog-rc-file ;file-like + (rc-file rottlog-configuration-rc-file ;file-like (default (file-append rottlog "/etc/rc"))) - (rotations rottlog-rotations ;list of <log-rotation> + (rotations rottlog-configuration-rotations ;list of <log-rotation> (default %default-rotations)) - (jobs rottlog-jobs ;list of <mcron-job> + (jobs rottlog-configuration-jobs ;list of <mcron-job> (default #f))) (define (rottlog-etc config) `(("rottlog" ,(file-union "rottlog" - (cons `("rc" ,(rottlog-rc-file config)) + (cons `("rc" ,(rottlog-configuration-rc-file config)) (log-rotations->/etc-entries - (rottlog-rotations config))))))) + (rottlog-configuration-rotations config))))))) (define (rottlog-jobs-or-default config) - (or (rottlog-jobs config) - (default-jobs (rottlog-rottlog config)))) + (or (rottlog-configuration-jobs config) + (default-jobs (rottlog-configuration-rottlog config)))) (define rottlog-service-type (service-type @@ -226,12 +230,12 @@ Old log files are removed or compressed according to the configuration.") ;; Add Rottlog to the global profile so users can access ;; the documentation. (service-extension profile-service-type - (compose list rottlog-rottlog)))) + (compose list rottlog-configuration-rottlog)))) (compose concatenate) (extend (lambda (config rotations) (rottlog-configuration (inherit config) - (rotations (append (rottlog-rotations config) + (rotations (append (rottlog-configuration-rotations config) rotations))))) (default-value (rottlog-configuration)))) diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 260abdefed..ae991ced4d 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -138,9 +138,6 @@ str) #\-) "_"))) -(define list-of-symbol? - (list-of symbol?)) - ;; Helpers for deprecated field types, to be removed later. (define %lazy-group (make-symbol "%lazy-group")) @@ -428,7 +425,7 @@ to be appended to the audio output configuration.") (sanitizer mpd-group-sanitizer)) (shepherd-requirement - (list-of-symbol '()) + (list-of-symbols '()) "This is a list of symbols naming Shepherd services that this service will depend on." empty-serializer) @@ -763,7 +760,7 @@ user-group instead~%")) empty-serializer) (shepherd-requirement - (list-of-symbol '()) + (list-of-symbols '()) "This is a list of symbols naming Shepherd services that this service will depend on." empty-serializer) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..dc001fdef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -63,7 +63,9 @@ #:use-module (gnu packages bash) #:use-module ((gnu packages base) #:select (coreutils glibc glibc/hurd - glibc-utf8-locales make-glibc-utf8-locales + glibc-utf8-locales + libc-utf8-locales-for-target + make-glibc-utf8-locales tar canonical-package)) #:use-module ((gnu packages compression) #:select (gzip)) #:use-module (gnu packages fonts) @@ -2147,7 +2149,8 @@ raise a deprecation warning if the 'compression-level' field was used." ;; nars for packages that contain UTF-8 file names such ;; as 'nss-certs'. See <https://bugs.gnu.org/26948>. (list (string-append "GUIX_LOCPATH=" - #$glibc-utf8-locales "/lib/locale") + #$(libc-utf8-locales-for-target) + "/lib/locale") "LC_ALL=en_US.utf8") #:log-file "/var/log/guix-publish.log")) (endpoints #~(let ((ai (false-if-exception @@ -2692,6 +2695,33 @@ Write, say, @samp{\"~a/24\"} for a 24-bit network mask.") address))))))) address) +(define (mac-address? str) + "Return true if STR is a valid MAC address." + (let ((pattern (make-regexp "^([0-9A-Fa-f]{2}:?){6}$"))) + (false-if-exception (vector? (regexp-exec pattern str))))) + +(define-compile-time-procedure (assert-network-link-mac-address (value identity)) + (cond + ((eq? value #f) value) + ((and (string? value) (mac-address? value)) value) + (else (raise + (make-compound-condition + (formatted-message (G_ "Value (~S) is not a valid mac address.~%") + value) + (condition (&error-location + (location (source-properties->location procedure-call-location))))))))) + +(define-compile-time-procedure (assert-network-link-type (value identity)) + (match value + (#f value) + (('quote _) (datum->syntax #'value value)) + (else + (raise + (make-compound-condition + (formatted-message (G_ "Value (~S) is not a symbol.~%") value) + (condition (&error-location + (location (source-properties->location procedure-call-location))))))))) + (define-record-type* <static-networking> static-networking make-static-networking static-networking? @@ -2719,8 +2749,14 @@ Write, say, @samp{\"~a/24\"} for a 24-bit network mask.") (define-record-type* <network-link> network-link make-network-link network-link? - (name network-link-name) ;string--e.g, "v0p0" - (type network-link-type) ;symbol--e.g.,'veth + (name network-link-name + (default #f)) ;string or #f --e.g, "v0p0" + (type network-link-type + (sanitize assert-network-link-type) + (default #f)) ;symbol or #f--e.g.,'veth, 'bond + (mac-address network-link-mac-address + (sanitize assert-network-link-mac-address) + (default #f)) (arguments network-link-arguments)) ;list (define-record-type* <network-route> @@ -2845,7 +2881,77 @@ to CONFIG." (scheme-file "set-up-network" (with-extensions (list guile-netlink) #~(begin - (use-modules (ip addr) (ip link) (ip route)) + (use-modules (ip addr) (ip link) (ip route) + (srfi srfi-1) + (ice-9 format) + (ice-9 match)) + + (define (match-link-by field-accessor value) + (fold (lambda (link result) + (if (equal? (field-accessor link) value) + link + result)) + #f + (get-links))) + + (define (alist->keyword+value alist) + (fold (match-lambda* + (((k . v) r) + (cons* (symbol->keyword k) v r))) '() alist)) + + ;; FIXME: It is interesting that "modprobe bonding" creates an + ;; interface bond0 straigt away. If we won't have bonding + ;; module, and execute `ip link add name bond0 type bond' we + ;; will get + ;; + ;; RTNETLINK answers: File exists + ;; + ;; This breaks our configuration if we want to + ;; use `bond0' name. Create (force modprobe + ;; bonding) and delete the interface to free up + ;; bond0 name. + #$(let lp ((links links)) + (cond + ((null? links) #f) + ((and (network-link? (car links)) + ;; Type is not mandatory + (false-if-exception + (eq? (network-link-type (car links)) 'bond))) + #~(begin + (false-if-exception (link-add "bond0" "bond")) + (link-del "bond0"))) + (else (lp (cdr links))))) + + #$@(map (match-lambda + (($ <network-link> name type mac-address arguments) + (cond + ;; Create a new interface + ((and (string? name) (symbol? type)) + #~(begin + (link-add #$name (symbol->string '#$type) #:type-args '#$arguments) + ;; XXX: If we add routes, addresses must be + ;; already assigned, and interfaces must be + ;; up. It doesn't matter if they won't have + ;; carrier or anything. + (link-set #$name #:up #t))) + + ;; Amend an existing interface + ((and (string? name) + (eq? type #f)) + #~(let ((link (match-link-by link-name #$name))) + (if link + (apply link-set + (link-id link) + (alist->keyword+value '#$arguments)) + (format #t (G_ "Interface with name '~a' not found~%") #$name)))) + ((string? mac-address) + #~(let ((link (match-link-by link-addr #$mac-address))) + (if link + (apply link-set + (link-id link) + (alist->keyword+value '#$arguments)) + (format #t (G_ "Interface with mac-address '~a' not found~%") #$mac-address))))))) + links) #$@(map (lambda (address) #~(begin @@ -2864,11 +2970,7 @@ to CONFIG." #:multicast-on #t #:up #t))) addresses) - #$@(map (match-lambda - (($ <network-link> name type arguments) - #~(link-add #$name #$type - #:type-args '#$arguments))) - links) + #$@(map (lambda (route) #~(route-add #$(network-route-destination route) #:device @@ -2912,11 +3014,9 @@ to CONFIG." #:src #$(network-route-source route)))) routes) - #$@(map (match-lambda - (($ <network-link> name type arguments) - #~(false-if-netlink-error - (link-del #$name)))) - links) + + ;; Cleanup addresses first, they might be assigned to + ;; created bonds, vlans or bridges. #$@(map (lambda (address) #~(false-if-netlink-error (addr-del #$(network-address-device @@ -2925,6 +3025,17 @@ to CONFIG." #:ipv6? #$(network-address-ipv6? address)))) addresses) + + ;; It is now safe to delete some links + #$@(map (match-lambda + (($ <network-link> name type mac-address arguments) + (cond + ;; We delete interfaces that were created + ((and (string? name) (symbol? type)) + #~(false-if-netlink-error + (link-del #$name))) + (else #t)))) + links) #f))))) (define (static-networking-shepherd-service config) diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index 367b85c1be..d2b1687496 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -42,6 +42,7 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-171) #:export (configuration-field configuration-field-name configuration-field-type @@ -59,6 +60,10 @@ define-configuration/no-serialization no-serialization + empty-serializer? + tfilter-maybe-value + base-transducer + serialize-configuration define-maybe define-maybe/no-serialization @@ -75,7 +80,9 @@ interpose list-of + list-of-packages? list-of-strings? + list-of-symbols? alist? serialize-file-like text-config? @@ -125,13 +132,36 @@ does not have a default value" field kind))) (default-value-thunk configuration-field-default-value-thunk) (documentation configuration-field-documentation)) +(define (empty-serializer? field) + "Predicate that checks whether FIELD is exempt from serialization." + (eq? empty-serializer + (configuration-field-serializer field))) + +(define (tfilter-maybe-value config) + "Return a transducer for CONFIG that removes all maybe-type fields whose +value is '%unset-marker." + (tfilter (lambda (field) + (let ((field-value ((configuration-field-getter field) config))) + (maybe-value-set? field-value))))) + +(define (base-transducer config) + "Return a transducer for CONFIG that calls the serializing procedures only +for fields marked for serialization and whose values are not '%unset-marker." + (compose (tremove empty-serializer?) + ;; Only serialize fields whose value isn't '%unset-marker%. + (tfilter-maybe-value config) + (tmap (lambda (field) + ((configuration-field-serializer field) + (configuration-field-name field) + ((configuration-field-getter field) config)))))) + (define (serialize-configuration config fields) + "Return a G-expression that contains the values corresponding to the +FIELDS of CONFIG, a record that has been generated by `define-configuration'. +The G-expression can then be serialized to disk by using something like +`mixed-text-file'." #~(string-append - #$@(map (lambda (field) - ((configuration-field-serializer field) - (configuration-field-name field) - ((configuration-field-getter field) config))) - fields))) + #$@(list-transduce (base-transducer config) rcons fields))) (define-syntax-rule (id ctx parts ...) "Assemble PARTS into a raw (unhygienic) identifier." @@ -190,32 +220,32 @@ does not have a default value" field kind))) (define (normalize-extra-args s) "Extract and normalize arguments following @var{doc}." (let loop ((s s) - (sanitizer* %unset-value) - (serializer* %unset-value)) + (sanitizer* #f) + (serializer* #f)) (syntax-case s (sanitizer serializer empty-serializer) (((sanitizer proc) tail ...) - (if (maybe-value-set? sanitizer*) - (syntax-violation 'sanitizer "duplicate entry" - #'proc) + (if sanitizer* + (syntax-violation 'sanitizer + "duplicate entry" #'proc) (loop #'(tail ...) #'proc serializer*))) (((serializer proc) tail ...) - (if (maybe-value-set? serializer*) - (syntax-violation 'serializer "duplicate or conflicting entry" - #'proc) + (if serializer* + (syntax-violation 'serializer + "duplicate or conflicting entry" #'proc) (loop #'(tail ...) sanitizer* #'proc))) ((empty-serializer tail ...) - (if (maybe-value-set? serializer*) + (if serializer* (syntax-violation 'empty-serializer "duplicate or conflicting entry" #f) (loop #'(tail ...) sanitizer* #'empty-serializer))) (() ; stop condition (values (list sanitizer* serializer*))) ((proc) ; TODO: deprecated, to be removed. - (null? (filter-map maybe-value-set? (list sanitizer* serializer*))) + (not (or sanitizer* serializer*)) (begin (warning #f (G_ "specifying serializers after documentation is \ deprecated, use (serializer ~a) instead~%") (syntax->datum #'proc)) - (values (list %unset-value #'proc))))))) + (values (list #f #'proc))))))) (syntax-case syn () ((_ stem (field field-type+def doc extra-args ...) ...) @@ -239,11 +269,11 @@ deprecated, use (serializer ~a) instead~%") (syntax->datum #'proc)) default-value)) #'((field-type def) ...))) ((field-sanitizer ...) - (map maybe-value #'(sanitizer* ...))) + #'(sanitizer* ...)) ((field-serializer ...) (map (lambda (type proc) (and serialize? - (or (maybe-value proc) + (or proc (if serializer-prefix (id #'stem serializer-prefix #'serialize- type) (id #'stem #'serialize- type))))) @@ -472,6 +502,11 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values." (cons delimiter acc)))) '() ls)) + +;;; +;;; Commonly used predicates +;;; + (define (list-of pred?) "Return a procedure that takes a list and check if all the elements of the list result in @code{#t} when applying PRED? on them." @@ -480,10 +515,20 @@ the list result in @code{#t} when applying PRED? on them." (every pred? x) #f))) +(define list-of-packages? + (list-of package?)) (define list-of-strings? (list-of string?)) +(define list-of-symbols? + (list-of symbol?)) + + +;;; +;;; Special serializers +;;; + (define alist? (list-of pair?)) diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 71787a85e6..fcbd5e08a5 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -73,6 +73,8 @@ (default "/var/log/cuirass-remote-server.log")) (cache cuirass-remote-server-configuration-cache ;string (default "/var/cache/cuirass/remote/")) + (log-expiry cuirass-remote-server-configuration-log-expiry + (default (* 6 30 24 3600))) ;6 months (publish? cuirass-remote-server-configuration-publish? ;boolean (default #t)) (trigger-url cuirass-remote-server-trigger-url ;string @@ -194,7 +196,7 @@ (stop #~(make-kill-destructor))) ,@(if remote-server (match-record remote-server <cuirass-remote-server-configuration> - (backend-port publish-port log-file cache publish? + (backend-port publish-port log-file log-expiry cache publish? trigger-url public-key private-key) (list (shepherd-service @@ -207,6 +209,9 @@ (string-append "--database=" #$database) (string-append "--cache=" #$cache) (string-append "--user=" #$user) + (string-append "--log-expiry=" + #$(number->string log-expiry) + "s") #$@(if backend-port (list (string-append "--backend-port=" diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm index c2023d618c..ebea0a473a 100644 --- a/gnu/services/docker.scm +++ b/gnu/services/docker.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,15 +30,36 @@ #:use-module (gnu services shepherd) #:use-module (gnu system setuid) #:use-module (gnu system shadow) + #:use-module (gnu packages admin) ;shadow #:use-module (gnu packages docker) #:use-module (gnu packages linux) ;singularity #:use-module (guix records) + #:use-module (guix diagnostics) #:use-module (guix gexp) + #:use-module (guix i18n) #:use-module (guix packages) + #:use-module (srfi srfi-1) + #:use-module (ice-9 format) + #:use-module (ice-9 match) #:export (docker-configuration docker-service-type - singularity-service-type)) + singularity-service-type + oci-container-configuration + oci-container-configuration? + oci-container-configuration-fields + oci-container-configuration-user + oci-container-configuration-group + oci-container-configuration-command + oci-container-configuration-entrypoint + oci-container-configuration-environment + oci-container-configuration-image + oci-container-configuration-provision + oci-container-configuration-network + oci-container-configuration-ports + oci-container-configuration-volumes + oci-container-service-type + oci-container-shepherd-service)) (define-configuration docker-configuration (docker @@ -216,3 +238,239 @@ bundles in Docker containers.") (service-extension activation-service-type (const %singularity-activation)))) (default-value singularity))) + + +;;; +;;; OCI container. +;;; + +(define (oci-sanitize-pair pair delimiter) + (define (valid? member) + (or (string? member) + (gexp? member) + (file-like? member))) + (match pair + (((? valid? key) . (? valid? value)) + #~(string-append #$key #$delimiter #$value)) + (_ + (raise + (formatted-message + (G_ "pair members must contain only strings, gexps or file-like objects +but ~a was found") + pair))))) + +(define (oci-sanitize-mixed-list name value delimiter) + (map + (lambda (el) + (cond ((string? el) el) + ((pair? el) (oci-sanitize-pair el delimiter)) + (else + (raise + (formatted-message + (G_ "~a members must be either a string or a pair but ~a was +found!") + name el))))) + value)) + +(define (oci-sanitize-environment value) + ;; Expected spec format: + ;; '(("HOME" . "/home/nobody") "JAVA_HOME=/java") + (oci-sanitize-mixed-list "environment" value "=")) + +(define (oci-sanitize-ports value) + ;; Expected spec format: + ;; '(("8088" . "80") "2022:22") + (oci-sanitize-mixed-list "ports" value ":")) + +(define (oci-sanitize-volumes value) + ;; Expected spec format: + ;; '(("/mnt/dir" . "/dir") "/run/current-system/profile:/java") + (oci-sanitize-mixed-list "volumes" value ":")) + +(define-maybe/no-serialization string) + +(define-configuration/no-serialization oci-container-configuration + (user + (string "oci-container") + "The user under whose authority docker commands will be run.") + (group + (string "docker") + "The group under whose authority docker commands will be run.") + (command + (list-of-strings '()) + "Overwrite the default command (@code{CMD}) of the image.") + (entrypoint + (maybe-string) + "Overwrite the default entrypoint (@code{ENTRYPOINT}) of the image.") + (environment + (list '()) + "Set environment variables. This can be a list of pairs or strings, even +mixed: + +@lisp +(list '(\"LANGUAGE\" . \"eo:ca:eu\") + \"JAVA_HOME=/opt/java\") +@end lisp + +String are passed directly to the Docker CLI. You can refer to the +@url{https://docs.docker.com/engine/reference/commandline/run/#env,upstream} +documentation for semantics." + (sanitizer oci-sanitize-environment)) + (image + (string) + "The image used to build the container. Images are resolved by the Docker +Engine, and follow the usual format +@code{myregistry.local:5000/testing/test-image:tag}.") + (provision + (maybe-string) + "Set the name of the provisioned Shepherd service.") + (network + (maybe-string) + "Set a Docker network for the spawned container.") + (ports + (list '()) + "Set the port or port ranges to expose from the spawned container. This can +be a list of pairs or strings, even mixed: + +@lisp +(list '(\"8080\" . \"80\") + \"10443:443\") +@end lisp + +String are passed directly to the Docker CLI. You can refer to the +@url{https://docs.docker.com/engine/reference/commandline/run/#publish,upstream} +documentation for semantics." + (sanitizer oci-sanitize-ports)) + (volumes + (list '()) + "Set volume mappings for the spawned container. This can be a +list of pairs or strings, even mixed: + +@lisp +(list '(\"/root/data/grafana\" . \"/var/lib/grafana\") + \"/gnu/store:/gnu/store\") +@end lisp + +String are passed directly to the Docker CLI. You can refer to the +@url{https://docs.docker.com/engine/reference/commandline/run/#volume,upstream} +documentation for semantics." + (sanitizer oci-sanitize-volumes)) + (container-user + (maybe-string) + "Set the current user inside the spawned container. You can refer to the +@url{https://docs.docker.com/engine/reference/run/#user,upstream} +documentation for semantics.") + (workdir + (maybe-string) + "Set the current working for the spawned Shepherd service. +You can refer to the +@url{https://docs.docker.com/engine/reference/run/#workdir,upstream} +documentation for semantics.")) + +(define oci-container-configuration->options + (lambda (config) + (let ((entrypoint + (oci-container-configuration-entrypoint config)) + (network + (oci-container-configuration-network config)) + (user + (oci-container-configuration-user config)) + (workdir + (oci-container-configuration-workdir config))) + (apply append + (filter (compose not unspecified?) + `(,(if (maybe-value-set? entrypoint) + `("--entrypoint" ,entrypoint) + '()) + ,(append-map + (lambda (spec) + (list "--env" spec)) + (oci-container-configuration-environment config)) + ,(if (maybe-value-set? network) + `("--network" ,network) + '()) + ,(if (maybe-value-set? user) + `("--user" ,user) + '()) + ,(if (maybe-value-set? workdir) + `("--workdir" ,workdir) + '()) + ,(append-map + (lambda (spec) + (list "-p" spec)) + (oci-container-configuration-ports config)) + ,(append-map + (lambda (spec) + (list "-v" spec)) + (oci-container-configuration-volumes config)))))))) + +(define (oci-container-shepherd-service config) + (define (guess-name name image) + (if (maybe-value-set? name) + name + (string-append "docker-" + (basename (car (string-split image #\:)))))) + + (let* ((docker-command (file-append docker-cli "/bin/docker")) + (user (oci-container-configuration-user config)) + (group (oci-container-configuration-group config)) + (command (oci-container-configuration-command config)) + (provision (oci-container-configuration-provision config)) + (image (oci-container-configuration-image config)) + (options (oci-container-configuration->options config)) + (name (guess-name provision image))) + + (shepherd-service (provision `(,(string->symbol name))) + (requirement '(dockerd user-processes)) + (respawn? #f) + (documentation + (string-append + "Docker backed Shepherd service for image: " image)) + (start + #~(make-forkexec-constructor + ;; docker run [OPTIONS] IMAGE [COMMAND] [ARG...] + (list #$docker-command "run" "--rm" + "--name" #$name + #$@options #$image #$@command) + #:user #$user + #:group #$group)) + (stop + #~(lambda _ + (invoke #$docker-command "rm" "-f" #$name))) + (actions + (list + (shepherd-action + (name 'pull) + (documentation + (format #f "Pull ~a's image (~a)." + name image)) + (procedure + #~(lambda _ + (invoke #$docker-command "pull" #$image))))))))) + +(define %oci-container-accounts + (list (user-account + (name "oci-container") + (comment "OCI services account") + (group "docker") + (system? #t) + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define (configs->shepherd-services configs) + (map oci-container-shepherd-service configs)) + +(define oci-container-service-type + (service-type (name 'oci-container) + (extensions (list (service-extension profile-service-type + (lambda _ (list docker-cli))) + (service-extension account-service-type + (const %oci-container-accounts)) + (service-extension shepherd-root-service-type + configs->shepherd-services))) + (default-value '()) + (extend append) + (compose concatenate) + (description + "This service allows the management of Docker and OCI +containers as Shepherd services."))) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index fe602efb99..389903451a 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -23,7 +23,7 @@ #:use-module (guix records) #:use-module (guix packages) #:use-module ((gnu packages base) - #:select (glibc-utf8-locales)) + #:select (libc-utf8-locales-for-target)) #:use-module (gnu packages admin) #:use-module (gnu packages databases) #:use-module (gnu packages web) @@ -381,7 +381,8 @@ #:pid-file-timeout 60 #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.utf8" "PATH=/run/current-system/profile/bin" ; for hooks #$@extra-environment-variables) @@ -508,7 +509,8 @@ #:user #$user #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") ;; XDG_CACHE_HOME is used by Guix when caching narinfo files "XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent" "LC_ALL=en_US.utf8") @@ -600,7 +602,8 @@ #:user #$user #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.utf8") #:log-file "/var/log/guix-build-coordinator/queue-builds.log")))) (stop #~(make-kill-destructor)) @@ -712,7 +715,8 @@ ca-certificates.crt file in the system profile." #:pid-file "/var/run/guix-data-service/pid" #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.UTF-8") #:log-file "/var/log/guix-data-service/web.log")) (stop #~(make-kill-destructor))) @@ -733,7 +737,8 @@ ca-certificates.crt file in the system profile." `("HOME=/var/lib/guix-data-service" "GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt" ,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.UTF-8") #:log-file "/var/log/guix-data-service/process-jobs.log")) (stop #~(make-kill-destructor)))))) @@ -989,7 +994,8 @@ ca-certificates.crt file in the system profile." #:pid-file "/var/run/nar-herder/pid" #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.utf8" #$@extra-environment-variables) #:log-file "/var/log/nar-herder/server.log")) @@ -1108,7 +1114,8 @@ ca-certificates.crt file in the system profile." #:directory "/var/lib/bffe" #:environment-variables `(,(string-append - "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") + "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.utf8" #$@extra-environment-variables) #:log-file "/var/log/bffe/server.log")) diff --git a/gnu/services/linux.scm b/gnu/services/linux.scm index 1f01b39a21..9ee0d93030 100644 --- a/gnu/services/linux.scm +++ b/gnu/services/linux.scm @@ -41,6 +41,7 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (srfi srfi-171) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (earlyoom-configuration @@ -252,13 +253,9 @@ more information)." (prefix fstrim-)) (define (serialize-fstrim-configuration config) - (concatenate - (filter list? - (map (lambda (field) - ((configuration-field-serializer field) - (configuration-field-name field) - ((configuration-field-getter field) config))) - fstrim-configuration-fields)))) + (list-transduce (compose (base-transducer config) tconcatenate) + rcons + fstrim-configuration-fields)) (define (fstrim-mcron-job config) (match-record config <fstrim-configuration> (package schedule) diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index 088de8c83b..e907d364da 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.scm @@ -165,7 +165,7 @@ files." (ice-9 popen) ;for the 'schedule' action (ice-9 rdelim) (ice-9 match) - (shepherd support) ;for '%user-log-dir' + ((shepherd support) #:hide (mkdir-p)) ;for '%user-log-dir' ,@%default-modules)) (start #~(make-forkexec-constructor (list #$(file-append mcron "/bin/mcron") diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index f4aff2d979..0508a4282c 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -353,7 +353,12 @@ (false-if-exception (delete-file #$pid-file)) (let ((pid (fork+exec-command - (cons* dhclient "-nw" + ;; By default dhclient uses a + ;; pre-standardization implementation of + ;; DDNS, which is incompatable with + ;; non-ISC DHCP servers; thus, pass '-I'. + ;; <https://kb.isc.org/docs/aa-01091>. + (cons* dhclient "-nw" "-I" "-pf" #$pid-file ifaces)))) (and (zero? (cdr (waitpid pid))) (read-pid-file #$pid-file))))) @@ -1808,7 +1813,10 @@ table inet filter { ct state { established, related } accept # allow from loopback - iifname lo accept + iif lo accept + # drop connections to lo not coming from lo + iif != lo ip daddr 127.0.0.1/8 drop + iif != lo ip6 daddr ::1/128 drop # allow icmp ip protocol icmp accept diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm index 42e4d0247e..e85dd50934 100644 --- a/gnu/services/rsync.scm +++ b/gnu/services/rsync.scm @@ -291,6 +291,7 @@ please use 'modules' instead~%"))) (make-socket-address AF_INET6 IN6ADDR_ANY #$port-number))) '())) + #:service-name-stem "rsync" #:user #$user #:group #$group) (make-forkexec-constructor #$rsync-command diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 23ccb8d403..c9b5d6cd99 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -37,6 +37,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-171) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (jami-account @@ -116,15 +117,10 @@ (or (string? val) (computed-file? val))) -(define (string-list? val) - (and (list? val) - (and-map string? val))) +(define account-fingerprint-list? + (list-of account-fingerprint?)) -(define (account-fingerprint-list? val) - (and (list? val) - (and-map account-fingerprint? val))) - -(define-maybe string-list) +(define-maybe list-of-strings) (define-maybe/no-serialization account-fingerprint-list) @@ -134,7 +130,7 @@ ;;; The following serializers are used to derive an account details alist from ;;; a <jami-account> record. -(define (serialize-string-list _ val) +(define (serialize-list-of-strings _ val) (string-join val ";")) (define (serialize-boolean _ val) @@ -187,7 +183,7 @@ maintain communication between devices on such network even when the connection to the the Internet has been lost. When left unspecified, the value from the account archive prevails.") (bootstrap-hostnames - maybe-string-list + maybe-list-of-strings "A list of hostnames or IPs pointing to OpenDHT nodes, that should be used to initially join the OpenDHT network. When left unspecified, the value from the account archive prevails.") @@ -204,26 +200,23 @@ SET-ACCOUNT-DETAILS." ('rendezvous-point? "Account.rendezVous") ('peer-discovery? "Account.peerDiscovery") ('bootstrap-hostnames "Account.hostname") - ('name-server-uri "RingNS.uri") - (_ #f))) + ('name-server-uri "RingNS.uri"))) - (filter-map (lambda (field) - (and-let* ((name (field-name->account-detail + (define jami-account-transducer + (compose (tremove empty-serializer?) + (tfilter-maybe-value jami-account-object) + (tmap (lambda (field) + (let* ((name (field-name->account-detail (configuration-field-name field))) - (value ((configuration-field-serializer field) - name ((configuration-field-getter field) - jami-account-object))) - ;; The define-maybe default serializer produces an - ;; empty string for unspecified values. - (value* (if (string-null? value) - #f - value))) - (cons name value*))) - jami-account-fields)) - -(define (jami-account-list? val) - (and (list? val) - (and-map jami-account? val))) + (value ((configuration-field-serializer field) + name ((configuration-field-getter field) + jami-account-object)))) + (cons name value)))))) + + (list-transduce jami-account-transducer rcons jami-account-fields)) + +(define jami-account-list? + (list-of jami-account?)) (define-maybe/no-serialization jami-account-list) diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index 076eca7ea2..f0f0ab3bf1 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -1085,6 +1085,20 @@ that will be listening to receive secret keys on port 1004, TCP." accounts) (operating-system-user-services os))))) +(define (operating-system-with-locked-root-account os) + "Return OS with a 'root' account whose password is uninitialized, thereby +preventing password-based authentication as 'root'." + (define root + ;; %ROOT-ACCOUNT has an empty password; change that to an uninitialized + ;; password. + (user-account + (inherit %root-account) + (password #f))) + + (operating-system + (inherit os) + (users (cons root (operating-system-users os))))) + (define %hurd-vm-operating-system (operating-system (inherit %hurd-default-operating-system) @@ -1147,8 +1161,14 @@ that will be listening to receive secret keys on port 1004, TCP." is added to the OS specified in CONFIG." (define transform (compose secret-service-operating-system + ;; When offloading is enabled, (1) add the 'offloading' account, + ;; and (2) prevent users from logging in as 'root' without a + ;; password as this would allow any user on the host to populate + ;; the host's store indirectly (for example by logging in as root + ;; in the Hurd VM over VNC). (if (hurd-vm-configuration-offloading? config) - operating-system-with-offloading-account + (compose operating-system-with-locked-root-account + operating-system-with-offloading-account) identity))) (let* ((os (transform (hurd-vm-configuration-os config))) diff --git a/gnu/services/vnc.scm b/gnu/services/vnc.scm index f90bd7258f..8b9ad0b179 100644 --- a/gnu/services/vnc.scm +++ b/gnu/services/vnc.scm @@ -149,7 +149,7 @@ CONFIG, a <xvnc-configuration> object." (xvnc display-number geometry depth port ipv4? ipv6? password-file xdmcp? inetd? frame-rate security-types localhost? log-level extra-options) #~(list #$(file-append xvnc "/bin/Xvnc") - #$(format #f ":~a" display-number) + #$@(if inetd? '() (list (format #f ":~a" display-number))) "-geometry" #$geometry "-depth" #$(number->string depth) #$@(if inetd? diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 818226a4f7..9fd2a3f742 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1498,7 +1498,8 @@ files.") '#$(optional anonip-configuration-regex "--regex")) ;; Run in a UTF-8 locale #:environment-variables - (list (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + (list (string-append "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale") "LC_ALL=en_US.utf8"))) @@ -1976,7 +1977,8 @@ WSGIPassAuthorization On (define (mumi-shepherd-services config) (define environment #~(list "LC_ALL=en_US.utf8" - (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales + (string-append "GUIX_LOCPATH=" + #$(libc-utf8-locales-for-target) "/lib/locale"))) (match config @@ -2101,7 +2103,7 @@ root=/srv/gemini (define gmnisrv-service-type (service-type - (name 'guix) + (name 'gmnisrv) (extensions (list (service-extension activation-service-type (const %gmnisrv-activation)) diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm index e37b733c6d..586cff1842 100644 --- a/gnu/system/accounts.scm +++ b/gnu/system/accounts.scm @@ -19,8 +19,7 @@ (define-module (gnu system accounts) #:use-module (guix records) #:use-module (ice-9 match) - #:export (<user-account> - user-account + #:export (user-account user-account? user-account-name user-account-password diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 45b4995574..dc6aff5273 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -4,6 +4,9 @@ (use-modules (gnu)) (use-service-modules networking ssh) +;; If you want to use HTTPS, you most likely want to include +;; "certs" in the line below. Also read the comment about +;; "nss-certs" later in this file. (use-package-modules screen ssh) (operating-system @@ -43,10 +46,12 @@ %base-user-accounts)) ;; Globally-installed packages. + ;; Add "nss-certs" for Mozilla's approved CA certs. You would + ;; have to have included "certs" in use-package-modules above. (packages (cons screen %base-packages)) - ;; Add services to the baseline: a DHCP client and - ;; an SSH server. + ;; Add services to the baseline: a DHCP client and an SSH + ;; server. You may wish to add an NTP service here. (services (append (list (service dhcp-client-service-type) (service openssh-service-type (openssh-configuration diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 529f1536de..6d385d71d4 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -369,7 +369,7 @@ TARGET in the other system." ;; List of know pseudo file system types. This is used when validating file ;; system definitions. '("binfmt_misc" "cgroup" "cgroup2" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" - "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs")) + "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs" "xenfs")) (define %fuse-control-file-system ;; Control file system for Linux' file systems in user-space (FUSE). diff --git a/gnu/system/image.scm b/gnu/system/image.scm index a990c4f861..b825892232 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -466,7 +466,9 @@ used in the image." ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be ;; decoded. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (libc-utf8-locales-for-target + (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") (initializer image-root @@ -633,7 +635,8 @@ used in the image. " ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") @@ -737,7 +740,8 @@ output file." ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") (set-path-environment-variable "PATH" '("bin" "sbin") '(#+tar)) @@ -816,7 +820,8 @@ output file." ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. (setenv "GUIX_LOCPATH" - #+(file-append glibc-utf8-locales "/lib/locale")) + #+(file-append (libc-utf8-locales-for-target (%current-system)) + "/lib/locale")) (setlocale LC_ALL "en_US.utf8") (let ((image-root (string-append (getcwd) "/tmp-root")) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 28161de153..336d13bd07 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -454,7 +454,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (service gc-root-service-type (append (list bare-bones-os - glibc-utf8-locales + (libc-utf8-locales-for-target system) texinfo guile-3.0) %default-locale-libcs))) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 9ca1895ded..47f19551b6 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -144,7 +144,8 @@ fi alias ls='ls -p --color=auto' alias ll='ls -l' -alias grep='grep --color=auto'\n")) +alias grep='grep --color=auto' +alias ip='ip -color=auto'\n")) (define (default-skeletons) "Return the default skeleton files for /etc/skel. These files are copied by diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 70f7b00116..8c27ff787d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -168,6 +168,12 @@ environment with the store shared with the host. MAPPINGS is a list of file-systems #:volatile-root? volatile? rest))) + ;; The (QEMU-only) "cirrus" graphics driver is still expected by some + ;; VPS with old QEMU versions. See <https://bugs.gnu.org/36069>. + (initrd-modules (let ((modules (operating-system-initrd-modules os))) + (if (member "cirrus" modules) + modules + (cons "cirrus" modules)))) ;; Disable swap. (swap-devices '()) diff --git a/gnu/tests.scm b/gnu/tests.scm index 96ecb40ea2..5ff9db82fc 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -33,6 +33,10 @@ #:use-module (gnu services base) #:use-module (gnu services shepherd) #:use-module (guix discovery) + #:use-module (guix monads) + #:use-module ((guix store) #:select (%store-monad)) + #:use-module ((guix utils) + #:select (%current-system %current-target-system)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9 gnu) #:use-module (ice-9 match) @@ -284,8 +288,9 @@ the system under test." (define-gexp-compiler (compile-system-test (test <system-test>) system target) "Compile TEST to a derivation." - ;; XXX: SYSTEM and TARGET are ignored. - (system-test-value test)) + (mparameterize %store-monad ((%current-system system) + (%current-target-system target)) + (system-test-value test))) (define (test-modules) "Return the list of modules that define system tests." diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index a192c7e655..b1ab43efb6 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -39,6 +39,7 @@ #:use-module (gnu services shepherd) #:use-module (ice-9 match) #:export (%test-static-networking + %test-static-networking-advanced %test-inetd %test-openvswitch %test-dhcpd @@ -124,6 +125,156 @@ (guix combinators))))) (run-static-networking-test (virtual-machine os)))))) +(define (run-static-networking-advanced-test vm) + (define test + (with-imported-modules '((gnu build marionette) + (guix build syscalls)) + #~(begin + (use-modules (gnu build marionette) + (guix build syscalls) + (srfi srfi-64)) + + (define marionette + (make-marionette + '(#$vm "-net" "nic,model=e1000,macaddr=98:11:22:33:44:55" + "-net" "nic,model=e1000,macaddr=98:11:22:33:44:56"))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "static-networking-advanced") + + (test-assert "service is up" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'networking)) + marionette)) + + (test-assert "network interfaces" + (marionette-eval + '(begin + (use-modules (guix build syscalls)) + (network-interface-names)) + marionette)) + + (test-equal "bond0 bonding mode" + "802.3ad 4" + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + (call-with-input-file "/sys/class/net/bond0/bonding/mode" read-line)) + marionette)) + + (test-equal "bond0 bonding lacp_rate" + "fast 1" + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + (call-with-input-file "/sys/class/net/bond0/bonding/lacp_rate" read-line)) + marionette)) + + (test-equal "bond0 bonding miimon" + "100" + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + (call-with-input-file "/sys/class/net/bond0/bonding/miimon" read-line)) + marionette)) + + (test-equal "bond0 bonding slaves" + "a b" + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + (call-with-input-file "/sys/class/net/bond0/bonding/slaves" read-line)) + marionette)) + + ;; The hw mac address will come from the first slave bonded to the + ;; channel. + (test-equal "bond0 mac address" + "98:11:22:33:44:55" + (marionette-eval + '(begin + (use-modules (ice-9 rdelim)) + (call-with-input-file "/sys/class/net/bond0/address" read-line)) + marionette)) + + (test-equal "bond0.1055 is up" + IFF_UP + (marionette-eval + '(let* ((sock (socket AF_INET SOCK_STREAM 0)) + (flags (network-interface-flags sock "bond0.1055"))) + (logand flags IFF_UP)) + marionette)) + + (test-equal "bond0.1055 address is correct" + "192.168.1.4" + (marionette-eval + '(let* ((sock (socket AF_INET SOCK_STREAM 0)) + (addr (network-interface-address sock "bond0.1055"))) + (close-port sock) + (inet-ntop (sockaddr:fam addr) (sockaddr:addr addr))) + marionette)) + + (test-equal "bond0.1055 netmask is correct" + "255.255.255.0" + (marionette-eval + '(let* ((sock (socket AF_INET SOCK_STREAM 0)) + (mask (network-interface-netmask sock "bond0.1055"))) + (close-port sock) + (inet-ntop (sockaddr:fam mask) (sockaddr:addr mask))) + marionette)) + (test-end)))) + + (gexp->derivation "static-networking-advanced" test)) + +(define %test-static-networking-advanced + (system-test + (name "static-networking-advanced") + (description "Test the 'static-networking' service with advanced features like bonds, vlans etc...") + (value + (let ((os (marionette-operating-system + (simple-operating-system + (service static-networking-service-type + (list (static-networking + (links (list + + (network-link + (mac-address "98:11:22:33:44:55") + (arguments '((name . "a")))) + + (network-link + (mac-address "98:11:22:33:44:56") + (arguments '((name . "b")))) + + (network-link + (name "bond0") + (type 'bond) + (arguments '((mode . "802.3ad") + (miimon . 100) + (lacp-active . "on") + (lacp-rate . "fast")))) + + (network-link + (name "a") + (arguments '((master . "bond0")))) + + (network-link + (name "b") + (arguments '((master . "bond0")))) + + (network-link + (name "bond0.1055") + (type 'vlan) + (arguments '((id . 1055) + (link . "bond0")))))) + + (addresses (list (network-address + (value "192.168.1.4/24") + (device "bond0.1055")))))))) + #:imported-modules '((gnu services herd) + (guix combinators))))) + (run-static-networking-advanced-test (virtual-machine os)))))) + ;;; ;;; Inetd. @@ -198,9 +349,8 @@ port 7, and a dict service on port 2628." ;; Make sure the PID file is created. (test-assert "PID file" - (marionette-eval - '(file-exists? "/var/run/inetd.pid") - marionette)) + (wait-for-file "/var/run/inetd.pid" marionette + #:timeout 30)) ;; Test the echo service. (test-equal "echo response" diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index b79164737b..ef4b130334 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -24,14 +24,15 @@ #:use-module (gnu tests) #:use-module (gnu image) #:use-module (gnu system) + #:use-module (gnu system accounts) #:use-module (gnu system file-systems) #:use-module (gnu system image) #:use-module (gnu system images hurd) + #:use-module ((gnu system shadow) #:select (%base-user-accounts)) #:use-module (gnu system vm) #:use-module (gnu services) #:use-module (gnu services dbus) #:use-module (gnu services networking) - #:use-module (gnu services ssh) #:use-module (gnu services virtualization) #:use-module (gnu packages ssh) #:use-module (gnu packages virtualization) @@ -232,17 +233,13 @@ (service dhcp-client-service-type) (service hurd-vm-service-type (hurd-vm-configuration - ;; Allow root login with an empty password to simplify the test - ;; below. (os (operating-system (inherit %hurd-vm-operating-system) - (services - (modify-services (operating-system-user-services - %hurd-vm-operating-system) - (openssh-service-type - config => (openssh-configuration - (inherit config) - (permit-root-login #t))))))))))) + (users (cons (user-account + (name "test") + (group "users") + (password "")) ;empty password + %base-user-accounts)))))))) (define (run-childhurd-test) (define (import-module? module) @@ -277,7 +274,7 @@ (ice-9 match) (ice-9 textual-ports)) - (let ((session (make-session #:user "root" + (let ((session (make-session #:user "test" #:port 10022 #:host "localhost" #:log-verbosity 'rare))) |