diff options
107 files changed, 4558 insertions, 2083 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 6e03d8bbcc..fcaf6b3fbb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -370,7 +370,7 @@ System Configuration * Keyboard Layout:: How the system interprets key strokes. * Locales:: Language and cultural convention settings. * Services:: Specifying system services. -* Setuid Programs:: Programs running with elevated privileges. +* Privileged Programs:: Programs running with elevated privileges. * X.509 Certificates:: Authenticating HTTPS servers. * Name Service Switch:: Configuring libc's name service switch. * Initial RAM Disk:: Linux-Libre bootstrapping. @@ -860,7 +860,7 @@ files, configuration, and services. @section Setting Up the Daemon @cindex daemon -During the installation, the @dfn{build daemon} that must be running +During installation, the @dfn{build daemon} that must be running to use Guix has already been set up and you can run @command{guix} commands in your terminal program, @pxref{Getting Started}: @@ -874,7 +874,7 @@ Setup}. However, now would be a good time to replace outdated daemon versions, tweak it, perform builds on other machines (@pxref{Daemon Offload -Setup}) or start it manually in special environments like Chroots +Setup}), or start it manually in special environments like ``chroots'' (@pxref{Chrooting into an existing system}) or WSL (not needed for WSL images created with Guix, @pxref{System Images, @code{wsl2-image-type}}). If you want to know more or optimize your @@ -2004,19 +2004,10 @@ We consider Guix System to be ready for a wide range of ``desktop'' and server use cases. The reliability guarantees it provides---transactional upgrades and rollbacks, reproducibility---make it a solid foundation. -Nevertheless, before you proceed with the installation, be aware of the -following noteworthy limitations applicable to version @value{VERSION}: +More and more system services are provided (@pxref{Services}). -@itemize -@item -More and more system services are provided (@pxref{Services}), but some -may be missing. - -@item -GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), -as well as a number of X11 window managers. However, KDE is currently -missing. -@end itemize +Nevertheless, before you proceed with the installation, be aware that some +services you rely on may still be missing from version @value{VERSION}. More than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in improving it. @xref{Contributing}, for more @@ -5388,7 +5379,8 @@ returns a package for the given channels, and using it as part of your operating system configuration, as in this example: @lisp -(use-modules (guix channels)) +(use-modules (gnu packages package-management) + (guix channels)) (define my-channels ;; Channels that should be available to @@ -16973,7 +16965,7 @@ instance to support new system services. * Keyboard Layout:: How the system interprets key strokes. * Locales:: Language and cultural convention settings. * Services:: Specifying system services. -* Setuid Programs:: Programs running with elevated privileges. +* Privileged Programs:: Programs running with elevated privileges. * X.509 Certificates:: Authenticating HTTPS servers. * Name Service Switch:: Configuring libc's name service switch. * Initial RAM Disk:: Linux-Libre bootstrapping. @@ -17697,9 +17689,9 @@ touch this field. Linux @dfn{pluggable authentication module} (PAM) services. @c FIXME: Add xref to PAM services section. -@item @code{setuid-programs} (default: @code{%setuid-programs}) -List of @code{<setuid-program>}. @xref{Setuid Programs}, for more -information. +@item @code{privileged-programs} (default: @code{%default-privileged-programs}) +List of @code{<privileged-program>}. @xref{Privileged Programs}, for +more information. @item @code{sudoers-file} (default: @code{%sudoers-specification}) @cindex sudoers file @@ -23708,10 +23700,10 @@ environment, you are unlikely to need this procedure. @defvar screen-locker-service-type Type for a service that adds a package for a screen locker or screen -saver to the set of setuid programs and/or add a PAM entry for it. The +saver to the set of privileged programs and/or add a PAM entry for it. The value for this service is a @code{<screen-locker-configuration>} object. -While the default behavior is to setup both a setuid program and PAM +While the default behavior is to setup both a privileged program and PAM entry, these two methods are redundant. Screen locker programs may not execute when PAM is configured and @code{setuid} is set on their executable. In this case, @code{using-setuid?} can be set to @code{#f}. @@ -24626,28 +24618,26 @@ The @code{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}}). -Additionally, the @code{gnome-desktop-service-type}, -@code{xfce-desktop-service}, @code{mate-desktop-service-type}, -@code{lxqt-desktop-service-type} and @code{enlightenment-desktop-service-type} -procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system. To -``add GNOME'' means that system-level services like the backlight adjustment -helpers and the power management utilities are added to the system, extending -@code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with -elevated privileges on a limited number of special-purpose system interfaces. -Additionally, adding a service made by @code{gnome-desktop-service-type} adds -the GNOME metapackage to the system profile. Likewise, adding the Xfce -service not only adds the @code{xfce} metapackage to the system profile, but -it also gives the Thunar file manager the ability to open a ``root-mode'' file -management window, if the user authenticates using the administrator's -password via the standard polkit graphical interface. To ``add MATE'' means -that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE -to operate with elevated privileges on a limited number of special-purpose -system interfaces. Additionally, adding a service of type -@code{mate-desktop-service-type} adds the MATE metapackage to the system -profile. ``Adding Enlightenment'' means that @code{dbus} is extended -appropriately, and several of Enlightenment's binaries are set as setuid, -allowing Enlightenment's screen locker and other functionality to work as -expected. +Additionally, the following procedures add one (or more!) desktop +environments to a system. + +@itemize +@item @code{gnome-desktop-service-type} adds GNOME, +@item @code{plasma-desktop-service-type} adds KDE Plasma, +@item @code{enlightenment-desktop-service-type} adds Enlightenment, +@item @code{lxqt-desktop-service-type} adds LXQt, +@item @code{mate-desktop-service-type} adds MATE, and +@item @code{xfce-desktop-service} adds Xfce. +@end itemize + +These service types add ``metapackages'' such as @code{gnome} or +@code{plasma} to the system profile, but most of them also set up other useful +services that mere packages can't do. + +For example, they may elevate privileges on a limited number of +special-purpose system interfaces and programs. This allows backlight +adjustment helpers, power management utilities, screen lockers, and +other integrated functionality to work as expected. The desktop environments in Guix use the Xorg display server by default. If you'd like to use the newer display server protocol @@ -25006,6 +24996,12 @@ Data type representing the configuration of @command{elogind}. @item @code{hybrid-sleep-mode} (default: @code{'("suspend" "platform" "shutdown")}) (type: list) ... +@item @code{hibernate-delay-seconds} (default: @code{*unspecified*}) (type: integer) +... + +@item @code{suspend-estimation-seconds} (default: @code{*unspecified*}) (type: integer) +... + @end table @end deftp @@ -27887,7 +27883,7 @@ remote servers. Run @command{man smtpd.conf} for more information. Make the following commands setgid to @code{smtpq} so they can be executed: @command{smtpctl}, @command{sendmail}, @command{send-mail}, @command{makemap}, @command{mailq}, and @command{newaliases}. -@xref{Setuid Programs}, for more information on setgid programs. +@xref{Privileged Programs}, for more information on setgid programs. @end table @end deftp @@ -40858,8 +40854,8 @@ create and run application bundles (aka. ``containers''). The value for this service is the Singularity package to use. The service does not install a daemon; instead, it installs helper programs as -setuid-root (@pxref{Setuid Programs}) such that unprivileged users can invoke -@command{singularity run} and similar commands. +setuid-root (@pxref{Privileged Programs}) such that unprivileged users can +invoke @command{singularity run} and similar commands. @end defvar @cindex OCI-backed, Shepherd services @@ -41659,11 +41655,14 @@ invokation. @c %end of fragment -@node Setuid Programs -@section Setuid Programs +@node Privileged Programs +@section Privileged Programs +@cindex privileged programs @cindex setuid programs @cindex setgid programs +@cindex capabilities, POSIX +@cindex setcap Some programs need to run with elevated privileges, even when they are launched by unprivileged users. A notorious example is the @command{passwd} program, which users can run to change their @@ -41674,46 +41673,48 @@ obvious security reasons. To address that, @command{passwd} should be (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism). -The store itself @emph{cannot} contain setuid programs: that would be a -security issue since any user on the system can write derivations that +The store itself @emph{cannot} contain privileged programs: that would be +a security issue since any user on the system can write derivations that populate the store (@pxref{The Store}). Thus, a different mechanism is -used: instead of changing the setuid or setgid bits directly on files that -are in the store, we let the system administrator @emph{declare} which +used: instead of directly granting permissions to files that are in +the store, we let the system administrator @emph{declare} which programs should be entrusted with these additional privileges. -The @code{setuid-programs} field of an @code{operating-system} -declaration contains a list of @code{<setuid-program>} denoting the +The @code{privileged-programs} field of an @code{operating-system} +declaration contains a list of @code{<privileged-program>} denoting the names of programs to have a setuid or setgid bit set (@pxref{Using the Configuration System}). For instance, the @command{mount.nfs} program, which is part of the nfs-utils package, with a setuid root can be designated like this: @lisp -(setuid-program - (program (file-append nfs-utils "/sbin/mount.nfs"))) +(privileged-program + (program (file-append nfs-utils "/sbin/mount.nfs")) + (setuid? #t)) @end lisp And then, to make @command{mount.nfs} setuid on your system, add the previous example to your operating system declaration by appending it to -@code{%setuid-programs} like this: +@code{%default-privileged-programs} like this: @lisp (operating-system ;; Some fields omitted... - (setuid-programs - (append (list (setuid-program - (program (file-append nfs-utils "/sbin/mount.nfs")))) - %setuid-programs))) + (privileged-programs + (append (list (privileged-program + (program (file-append nfs-utils "/sbin/mount.nfs")) + (setuid? #t)) + %default-privileged-programs))) @end lisp -@deftp {Data Type} setuid-program -This data type represents a program with a setuid or setgid bit set. +@deftp {Data Type} privileged-program +This data type represents a program with special privileges, such as setuid @table @asis @item @code{program} -A file-like object having its setuid and/or setgid bit set. +A file-like object to which all given privileges should apply. -@item @code{setuid?} (default: @code{#t}) +@item @code{setuid?} (default: @code{#f}) Whether to set user setuid bit. @item @code{setgid?} (default: @code{#f}) @@ -41727,22 +41728,27 @@ defaults to root. GID (integer) group name (string) for the group owner of the program, defaults to root. +@item @code{capabilities} (default: @code{#f}) +A string representing the program's POSIX capabilities, as described by +the @code{cap_to_text(3)} man page from the libcap package, or @code{#f} +to make no changes. + @end table @end deftp -A default set of setuid programs is defined by the -@code{%setuid-programs} variable of the @code{(gnu system)} module. +A default set of privileged programs is defined by the +@code{%default-privileged-programs} variable of the @code{(gnu system)} module. -@defvar %setuid-programs -A list of @code{<setuid-program>} denoting common programs that are -setuid-root. +@defvar {Scheme Variable} %default-privileged-programs +A list of @code{<privileged-program>} denoting common programs with +elevated privileges. The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}. @end defvar -Under the hood, the actual setuid programs are created in the -@file{/run/setuid-programs} directory at system activation time. The +Under the hood, the actual privileged programs are created in the +@file{/run/privileged/bin} directory at system activation time. The files in this directory refer to the ``real'' binaries, which are in the store. @@ -42684,7 +42690,7 @@ once @command{reconfigure} has completed. @end quotation This effects all the configuration specified in @var{file}: user -accounts, system services, global package list, setuid programs, etc. +accounts, system services, global package list, privileged programs, etc. The command starts system services specified in @var{file} that are not currently running; if a service is currently running this command will arrange for it to be upgraded the next time it is stopped (e.g.@: by @@ -44057,10 +44063,10 @@ In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file. @end defvar -@defvar setuid-program-service-type -Type for the ``setuid-program service''. This service collects lists of +@defvar privileged-program-service-type +Type for the ``privileged-program service''. This service collects lists of executable file names, passed as gexps, and adds them to the set of -setuid and setgid programs on the system (@pxref{Setuid Programs}). +privileged programs on the system (@pxref{Privileged Programs}). @end defvar @defvar profile-service-type diff --git a/etc/news.scm b/etc/news.scm index 3aaf87d4b8..866fa0d2d3 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,7 +1,7 @@ ;; GNU Guix news, for use by 'guix pull'. ;; ;; Copyright © 2019-2024 Ludovic Courtès <ludo@gnu.org> -;; Copyright © 2019–2021 Tobias Geerinckx-Rice <me@tobias.gr> +;; Copyright © 2019–2021, 2024 Tobias Geerinckx-Rice <me@tobias.gr> ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com> ;; Copyright © 2019, 2020 Konrad Hinsen <konrad.hinsen@fastmail.net> ;; Copyright © 2019, 2020, 2021, 2023 Julien Lepiller <julien@lepiller.eu> @@ -32,6 +32,31 @@ (channel-news (version 0) + (entry (commit "4e58dfee6c7456d1e662f66041b8a157efe8710a") + (title + (en "More capable @code{privileged-programs} replace @code{setuid-programs}") + (nl "Capabelere @code{privileged-programs} vervangen @code{setuid-programs}")) + (body + (en "Where the kernel supports it, Guix System can now assign +POSIX@tie{}@dfn{capabilities} to trusted executables. Capabilities offer a +more granular alternative to the traditional setuid and setgid permissions, +which remain available. + +To reflect this, @code{(gnu system setuid)} has been renamed to @code{(gnu +system privilege)}. @code{privileged-programs} replaces @code{setuid-programs} +as @code{operating-system} field and defaults to +@code{%default-privileged-programs}. The executables themselves have moved from +@file{/run/setuid-programs} to @file{/run/privileged/bin}.") + (nl "Waar de kernel dit toelaat kan Guix System nu +POSIX@tie{}@dfn{capabilities} toewijzen aan vertrouwde uitvoerbare bestanden. +``Capabilities'' zijn een fijnmaziger alternatief voor de klassieke setuid- en +setgid-rechten, die ook beschikbaar blijven. + +Om dit duidelijk te maken heet @code{(gnu system setuid)} nu @code{(gnu system +privilege)}. @code{privileged-programs} vervangt @code{setuid-programs} als +veld in het @code{operating-system} en heeft @code{%default-privileged-programs} +als standaardwaarde. De uitvoerbare bestanden verhuizen van +@file{/run/setuid-programs} naar @file{/run/privileged/bin}."))) (entry (commit "26638b8e8129aa755586d017677b4cf076bafda6") (title (en "The containerd service is separated from @code{docker-service-type}") diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index d8c0cd22a3..a57ca78a86 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; ;;; This file is part of GNU Guix. @@ -27,7 +28,7 @@ (define-module (gnu build activation) #:use-module (gnu system accounts) - #:use-module (gnu system setuid) + #:use-module (gnu system privilege) #:use-module (gnu build accounts) #:use-module (gnu build linux-boot) #:use-module (guix build utils) @@ -41,7 +42,7 @@ #:export (activate-users+groups activate-user-home activate-etc - activate-setuid-programs + activate-privileged-programs activate-special-files activate-modprobe activate-firmware @@ -279,56 +280,80 @@ they already exist." string<?))) (define %setuid-directory - ;; Place where setuid programs are stored. + ;; Place where setuid programs used to be stored. It exists for backwards + ;; compatibility & will be removed. Use %PRIVILEGED-PROGRAM-DIRECTORY instead. "/run/setuid-programs") -(define (activate-setuid-programs programs) - "Turn PROGRAMS, a list of file setuid-programs record, into setuid programs -stored under %SETUID-DIRECTORY." - (define (make-setuid-program program setuid? setgid? uid gid) - (let ((target (string-append %setuid-directory +(define %privileged-program-directory + ;; Place where privileged copies of programs are stored. + "/run/privileged/bin") + +(define (activate-privileged-programs programs libcap) + "Turn PROGRAMS, a list of file privileged-programs records, into privileged +copies stored under %PRIVILEGED-PROGRAM-DIRECTORY, using LIBCAP's setcap(8) +binary if needed." + (define (ensure-empty-directory directory) + (if (file-exists? directory) + (for-each (compose delete-file + (cut string-append directory "/" <>)) + (scandir directory + (lambda (file) + (not (member file '("." "..")))) + string<?)) + (mkdir-p directory)) ) + + (define (make-privileged-program program setuid? setgid? uid gid capabilities) + (let ((target (string-append %privileged-program-directory "/" (basename program))) (mode (+ #o0555 ; base permissions (if setuid? #o4000 0) ; setuid bit (if setgid? #o2000 0)))) ; setgid bit (copy-file program target) (chown target uid gid) - (chmod target mode))) + (chmod target mode) + (when (and capabilities libcap) + (system* (string-append libcap "/sbin/setcap") + "-q" capabilities target)))) + + (define (make-deprecated-wrapper program) + ;; This will eventually become a script that warns on usage, then vanish. + (symlink (string-append %privileged-program-directory + "/" (basename program)) + (string-append %setuid-directory + "/" (basename program)))) - (format #t "setting up setuid programs in '~a'...~%" - %setuid-directory) - (if (file-exists? %setuid-directory) - (for-each (compose delete-file - (cut string-append %setuid-directory "/" <>)) - (scandir %setuid-directory - (lambda (file) - (not (member file '("." "..")))) - string<?)) - (mkdir-p %setuid-directory)) + (format #t "setting up privileged programs in '~a'...~%" + %privileged-program-directory) + (ensure-empty-directory %privileged-program-directory) + (ensure-empty-directory %setuid-directory) (for-each (lambda (program) (catch 'system-error (lambda () - (let* ((program-name (setuid-program-program program)) - (setuid? (setuid-program-setuid? program)) - (setgid? (setuid-program-setgid? program)) - (user (setuid-program-user program)) - (group (setuid-program-group program)) + (let* ((program-name (privileged-program-program program)) + (setuid? (privileged-program-setuid? program)) + (setgid? (privileged-program-setgid? program)) + (user (privileged-program-user program)) + (group (privileged-program-group program)) + (capabilities (privileged-program-capabilities program)) (uid (match user ((? string?) (passwd:uid (getpwnam user))) ((? integer?) user))) (gid (match group ((? string?) (group:gid (getgrnam group))) ((? integer?) group)))) - (make-setuid-program program-name setuid? setgid? uid gid))) + (make-privileged-program program-name + setuid? setgid? uid gid + capabilities) + (make-deprecated-wrapper program-name))) (lambda args - ;; If we fail to create a setuid program, better keep going - ;; so that we don't leave %SETUID-DIRECTORY empty or - ;; half-populated. This can happen if PROGRAMS contains + ;; If we fail to create a privileged program, better keep going + ;; so that we don't leave %PRIVILEGED-PROGRAM-DIRECTORY empty + ;; or half-populated. This can happen if PROGRAMS contains ;; incorrect file names: <https://bugs.gnu.org/38800>. (format (current-error-port) - "warning: failed to make ~s setuid/setgid: ~a~%" - (setuid-program-program program) + "warning: failed to privilege ~s: ~a~%" + (privileged-program-program program) (strerror (system-error-errno args)))))) programs)) diff --git a/gnu/local.mk b/gnu/local.mk index 8bec41ae5e..11dff1c6c4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -771,6 +771,7 @@ GNU_SYSTEM_MODULES = \ %D%/system/mapped-devices.scm \ %D%/system/nss.scm \ %D%/system/pam.scm \ + %D%/system/privilege.scm \ %D%/system/setuid.scm \ %D%/system/shadow.scm \ %D%/system/uuid.scm \ @@ -1485,6 +1486,7 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ + %D%/packages/patches/heatshrink-add-cmake.patch \ %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 \ @@ -1509,6 +1511,7 @@ dist_patch_DATA = \ %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-icu-22132-fix-vtimezone.patch \ %D%/packages/patches/icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ @@ -1525,7 +1528,6 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ - %D%/packages/patches/isync-openssl3-fix.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jami-enable-testing.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ @@ -1841,9 +1843,8 @@ dist_patch_DATA = \ %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/procps-strtod-test.patch \ - %D%/packages/patches/prusa-slicer-boost-fixes.patch \ %D%/packages/patches/prusa-slicer-fix-tests.patch \ - %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ + %D%/packages/patches/prusa-wxwidgets-makefile-fix.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-3.12-fix-tests.patch \ %D%/packages/patches/python-accupy-use-matplotx.patch \ diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 0be9ebbc0d..3e10d984e7 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -178,6 +178,8 @@ shell command with escalated privileges for MACHINE's configuration." (if (string= "root" (machine-ssh-configuration-user (machine-configuration machine))) '() + ;; Use the old setuid-programs location until the remote is likely to + ;; have the new /run/privileged one in place. '("/run/setuid-programs/sudo" "-n" "--"))) (define (managed-host-remote-eval machine exp) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 51e1085e9f..e96c555e6a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -220,7 +220,7 @@ (lambda _ (substitute* "configure.ac" (("supath=`which su 2>/dev/null`") - "supath=/run/setuid-programs/su")) + "supath=/run/privileged/bin/su")) #t))))) (native-inputs (list autoconf automake libtool pkg-config)) @@ -2156,7 +2156,7 @@ commands and their arguments.") (substitute* "doas.c" (("safepath =" match) (string-append match " \"" - "/run/setuid-programs:" + "/run/privileged/bin:" "/run/current-system/profile/bin:" "/run/current-system/profile/sbin:" "\" "))))) @@ -2745,14 +2745,14 @@ features of ls(1), find(1), stat(1) and du(1).") (define-public direvent (package (name "direvent") - (version "5.3") + (version "5.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/direvent/direvent-" version ".tar.gz")) (sha256 (base32 - "15y4jk5vlcd003bvf42c6z9zd4gz4pwqpwaapqmyk7x4gnksh1cl")))) + "1flmswj1by9afqal55hc70l2hshcawyn0j2if92y6rxb58cwdfqx")))) (build-system gnu-build-system) (arguments (list #:phases @@ -3618,14 +3618,14 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.52") + (version "4.53") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/diskinfo-di/" "di-" version ".tar.gz")) (sha256 - (base32 "07vsnn1gxm3r7dchbrq63iazd64gza2ac7b2m1039708rf5flxdp")))) + (base32 "0gp806m7jk2rfymy5r62a2lfd8jq879qy94blrjqvb0xq7pmpp80")))) (build-system gnu-build-system) (arguments (list @@ -5090,7 +5090,7 @@ text table representation to stdout.") ":" (assoc-ref %build-inputs "grep") "/bin" ":" (assoc-ref %build-inputs "ncurses") "/bin" ":" (assoc-ref %build-inputs "sed") "/bin" - ":" "/run/setuid-programs" + ":" "/run/privileged/bin" ":" (getenv "PATH"))) (substitute* "hosts" (("#!/usr/bin/env bash") @@ -5169,14 +5169,14 @@ Netgear devices.") (define-public atop (package (name "atop") - (version "2.10.0") + (version "2.11.0") (source (origin (method url-fetch) (uri (string-append "https://www.atoptool.nl/download/atop-" version ".tar.gz")) (sha256 (base32 - "14szbpvsm9czib1629cbh8qcp7pxhgn0vjrfv1yqwmw25k7p79p7")) + "083fckjn2s3276fqyjb3rcwqrws7qc3fgk1f82zzgzrfc1kcd54v")) (snippet ;; The 'mkdate' script generates a new 'versdate.h' header ;; containing the build date. That makes builds @@ -6349,3 +6349,27 @@ versions of @command{find}, including POSIX, GNU, and *BSD find.") their content instead of their file names. It is useful for compressing backup directories or just finding duplicate files.") (license license:gpl2+))) + +(define-public sshguard + (package + (name "sshguard") + (version "2.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://bitbucket.org/sshguard/sshguard") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dkijr287zpwdz1bjdchxzmwf1sk6vzpkycz1skm25lkaba6nd9r")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf automake bison flex python-docutils)) + (home-page "https://sshguard.net/") + (synopsis "Daemon to blocks SSH brute-force attacks") + (description + "SSHGuard protects hosts from brute-force attacks against SSH and other +services. It aggregates system logs and blocks repeat offenders using one of +several firewall backends.") + (license license:isc))) diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index b7ccb153d3..5b2518277c 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Simon South <simon@simonsouth.net> ;;; Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -664,7 +665,24 @@ files.") #:tests? #f #:configure-flags #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest - "-DBUILD_SHARED_LIBS=ON"))) + "-DBUILD_SHARED_LIBS=ON" + #$@(let ((target (%current-target-system))) + (if target + (cond ((string-prefix? "arm" target) + '("-DCMAKE_SYSTEM_PROCESSOR=arm")) + ((string-prefix? "aarch64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=aarch64")) + ((string-prefix? "i686" target) + '("-DCMAKE_SYSTEM_PROCESSOR=x86")) + ((string-prefix? "x86_64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=x86_64")) + ;; 32-bit and 64-bit + ((string-prefix? "powerpc" target) + '("-DCMAKE_SYSTEM_PROCESSOR=powerpc")) + ((string-prefix? "riscv64" target) + '("-DCMAKE_SYSTEM_PROCESSOR=riscv64")) + (else '())) + '()))))) (home-page "https://github.com/google/cpu_features") (synopsis "Cross platform C99 library to get cpu features at runtime") (description diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 613e4d3fee..212650630c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2021, 2022 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> -;;; Copyright © 2023 Iliya Tikhonenko <tikhonenko@mpe.mpg.de> +;;; Copyright © 2023-2024 Iliya Tikhonenko <tikhonenko@mpe.mpg.de> ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net> @@ -35,6 +35,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) @@ -1538,39 +1539,65 @@ crowded star fields.") (package (name "siril") (version "1.2.3") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/free-astro/siril") - (commit version))) - (sha256 - (base32 - "0gkd8w2bpwq4ibl3vawx008yrm5k6zlj77lp98fflffcf7cj8hr5")) - (file-name (git-file-name name version)))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/free-astro/siril") + (commit version))) + (sha256 + (base32 "0gkd8w2bpwq4ibl3vawx008yrm5k6zlj77lp98fflffcf7cj8hr5")) + (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)) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `(,@%meson-build-system-modules (guix build + glib-or-gtk-build-system)) + #:modules '((guix build meson-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) + (add-after 'install 'wrap-program + (lambda* _ + (wrap-program (string-append #$output "/bin/siril") + ;; Wrapping GDK_PIXBUF_MODULE_FILE to load icons in pure + ;; environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) + (native-inputs + (list cmake git libconfig pkg-config)) + (inputs + (list cfitsio + (librsvg-for-system) + exiv2 + ffms2 + fftwf + gsl + gdk-pixbuf + gtk+ + json-glib + libheif + bash-minimal ;for wrap-program + libraw + librtprocess + opencv)) (home-page "https://siril.org/") (synopsis "Image processing software for amateur astronomy") (description - "This package provides an astronomical image processing tool - SIRIL. It is -specially tailored for noise reduction and improving the signal/noise ratio of -an image from multiple captures, as required in astronomy. SIRIL can align -automatically or manually, stack and enhance pictures from various file formats, -even image sequence files (films and SER files). It works well with limited -system resources, like in embedded platforms, but is also very fast when run on -more powerful computers and provides conversion to FITS from a large number of -image formats.") + "This package provides an astronomical image processing tool - SIRIL. It +is specially tailored for noise reduction and improving the signal/noise ratio +of an image from multiple captures, as required in astronomy. SIRIL can align +automatically or manually, stack and enhance pictures from various file +formats, even image sequence files (films and SER files). It works well with +limited system resources, like in embedded platforms, but is also very fast +when run on more powerful computers and provides conversion to FITS from a +large number of image formats.") (license license:gpl3+))) (define-public splash diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index cc9969d96a..80fe79f595 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3698,13 +3698,13 @@ for use in Bioconductor’s AnnotationHub.") (define-public r-anvil (package (name "r-anvil") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "AnVIL" version)) (sha256 (base32 - "0859gsgvljl2adjz4md52z4k1bcqh24i5xdfqddflw4gaq1zlm69")))) + "0i4skg2bpj0rbb3fbaprfs4d4nxg9aj8d6pni4a3k0wip3dw1cf9")))) (properties `((upstream-name . "AnVIL"))) (build-system r-build-system) (propagated-inputs @@ -5670,13 +5670,13 @@ bases such as COSMIC.") (define-public r-degreport (package (name "r-degreport") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DEGreport" version)) (sha256 (base32 - "087c7x3vz8z3yz4jdwbcskdqmv3kgz4c4vi3r9gvvay5z36yhpl5")) + "0z5wzdixw6pyfd72drh54aalmp9nd5p1xi5vn53d58w78hrb757p")) (snippet '(delete-file "docs/jquery.sticky-kit.min.js")))) (properties `((upstream-name . "DEGreport"))) @@ -5884,13 +5884,13 @@ calculation in parallel.") (define-public r-dmrcate (package (name "r-dmrcate") - (version "3.0.3") + (version "3.0.5") (source (origin (method url-fetch) (uri (bioconductor-uri "DMRcate" version)) (sha256 (base32 - "0xgsbsr3g04yiyjlc161424wcvlbik208sz0rzqssw4fj255i88q")))) + "1m5ilcpknzxd3cdk0kyvqqsahshlwxi7xpscigr4w7a83p775vqc")))) (properties `((upstream-name . "DMRcate"))) (build-system r-build-system) (propagated-inputs @@ -6192,13 +6192,13 @@ over-abundant or less-abundant as compared to that of normal cells.") (define-public r-iranges (package (name "r-iranges") - (version "2.38.0") + (version "2.38.1") (source (origin (method url-fetch) (uri (bioconductor-uri "IRanges" version)) (sha256 (base32 - "047688hrxyg2hxd1wbywxqnvxk1622xlldzana9g5hhxg9lldrk2")))) + "07q9j00rvgdbv582p01nxc99j0gfx4fsarpl1w1fjx5nb8y86k4v")))) (properties `((upstream-name . "IRanges"))) (build-system r-build-system) @@ -7801,13 +7801,13 @@ global-scaling and full-quantile normalization.") (define-public r-edger (package (name "r-edger") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (bioconductor-uri "edgeR" version)) (sha256 (base32 - "1w3dp3h30jqylbkql33j5ibp9i4vp7n1x6wdd2v0kdnv82il6hqg")))) + "0c9r4gcsaf6fqkc4r49vj8az6wplqsbkd423pb4fvrv5lka9aqi9")))) (properties `((upstream-name . "edgeR"))) (build-system r-build-system) (propagated-inputs @@ -8681,13 +8681,13 @@ fraction} are included.") (define-public r-raggedexperiment (package (name "r-raggedexperiment") - (version "1.28.0") + (version "1.28.1") (source (origin (method url-fetch) (uri (bioconductor-uri "RaggedExperiment" version)) (sha256 (base32 - "1mzjc52naf6brffv6d2bak16y3ygz9lsk8yqgcfa44180bslz3xx")))) + "0xfg88r5nh0qswsfc3mm595jmf2w8s2dr032apd15b3kc40hjlr9")))) (properties `((upstream-name . "RaggedExperiment"))) (build-system r-build-system) (propagated-inputs (list r-biocbaseutils @@ -9022,13 +9022,13 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.60.3") + (version "3.60.4") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "0fy3lmjrhy7301v9far5n6c3m4n3nad463rgy2fka3bk4jls6ipg")))) + "123z062fc0qf43zplmw5svzpdmpgxagyl1gi1bxa34426s1hfv6m")))) (build-system r-build-system) (native-inputs (list r-knitr)) (propagated-inputs (list r-statmod)) @@ -9656,13 +9656,13 @@ in SNV base substitution data.") (define-public r-msa (package (name "r-msa") - (version "1.36.0") + (version "1.36.1") (source (origin (method url-fetch) (uri (bioconductor-uri "msa" version)) (sha256 (base32 - "05i6pp10nn4icl51rx3b48s861hnd1yx72d933fphm6a5082zxms")))) + "16ixhinhcbf2nvdmqria231s4qhr8lzhr7yqr7ljrnnwiqadfr67")))) (properties `((upstream-name . "msa"))) (build-system r-build-system) (propagated-inputs @@ -11287,13 +11287,13 @@ single-cell RNA-seq.") (define-public r-seqarray (package (name "r-seqarray") - (version "1.44.0") + (version "1.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "SeqArray" version)) (sha256 (base32 - "1g8867y66f8ihr0w2shc17wxnavnkwn9y25f850nwvnn9nsbk88k")))) + "0b0i17kwa8141y568k2asiv46hz4z0lwiqjz687d96j6kz3r3zgg")))) (properties `((upstream-name . "SeqArray"))) (build-system r-build-system) (propagated-inputs (list r-biostrings @@ -12788,13 +12788,13 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (define-public r-qfeatures (package (name "r-qfeatures") - (version "1.14.1") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "QFeatures" version)) (sha256 (base32 - "1sgvabfad3zibrg449y7hw8l59yb2d8q01x7lp841m45b1g0q9d8")))) + "1vd1kvx2kr47czz58375msc2x8p155cn0zqr4w7i1v1ki951r3a4")))) (properties `((upstream-name . "QFeatures"))) (build-system r-build-system) (propagated-inputs (list r-annotationfilter @@ -13412,14 +13412,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.38.0") + (version "3.38.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "1g7p53g91xx3x10kad2f190bmg10ryp928m0q5wxz9n8lycb5rgl")))) + "11mswd6y4c8l0adrpc4z8hh96dcx59bf70zy572r5lfsj8rz0rgk")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -15874,14 +15874,14 @@ are standardized and usable by the accompanying mutossGUI package.") (define-public r-metap (package (name "r-metap") - (version "1.10") + (version "1.11") (source (origin (method url-fetch) (uri (cran-uri "metap" version)) (sha256 (base32 - "18l86026g5g0pdihw41h7yck1ad5k43bb7as5qih2k5xkr680mzx")))) + "1dwk402kbxigz5llh223z0b98cq2vs3ij049fgsj7bna7kycks1l")))) (build-system r-build-system) (propagated-inputs (list r-lattice @@ -16196,14 +16196,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.30.1") + (version "3.30.2") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "1kyrr1xxcif45ynyq4wsv2247bjily5sgzn17m1g3ypw2hkqcj53")))) + "1jf6l0ngmdz1lca2rcjg3rhi9qdrv1pzmn93wa09svi4glsfhy1h")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -16264,14 +16264,14 @@ correspondance between different data sources.") (define-public r-enrichplot (package (name "r-enrichplot") - (version "1.24.0") + (version "1.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "enrichplot" version)) (sha256 (base32 - "0rkp1zidz34h4d02m4jqv509vw0wyrc084hvj3lxr7mb9j7rnq48")))) + "03p0a1vyaznk405xpkp57f22wg8x7lxiipjh101p7dq97rbzr4r7")))) (build-system r-build-system) (propagated-inputs (list r-aplot @@ -16332,14 +16332,14 @@ attempts to assess their statistical significance.") (define-public r-clusterprofiler (package (name "r-clusterprofiler") - (version "4.12.0") + (version "4.12.2") (source (origin (method url-fetch) (uri (bioconductor-uri "clusterProfiler" version)) (sha256 (base32 - "0wmfbr4n8a1mg8g3gl9gnqrvq5p6cfay2858fqx7wxpr2q8yynhz")))) + "07vccjiizzk2z7v4448jybrsapcjxc3y6g6bhlclzdl80h566xxv")))) (properties `((upstream-name . "clusterProfiler"))) (build-system r-build-system) @@ -20093,14 +20093,14 @@ data.") (define-public r-universalmotif (package (name "r-universalmotif") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "universalmotif" version)) (sha256 (base32 - "1kasmib3lp68pq5f9qzh38z7gpv8hik536iz16g8a73pc6bcbmzy")))) + "0nb2xc0rw9k6nr7bgf4ip33g2cs5vnhy55ms6zkwsnd30hi69wyy")))) (properties `((upstream-name . "universalmotif"))) (build-system r-build-system) @@ -20287,14 +20287,14 @@ using whole genome sequencing data.") (define-public r-activepathways (package (name "r-activepathways") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (cran-uri "ActivePathways" version)) (sha256 (base32 - "07nmlkgznbv46kxy5s13bs7p3z9cxsynh6csbid6qsvqrpzv78pk")))) + "098p21g7rm3q03wifg0zb71ldg3dyqp3iwhqmg3ci9r73dl4agjh")))) (properties `((upstream-name . "ActivePathways"))) (build-system r-build-system) @@ -21165,14 +21165,14 @@ db and resource files to AWS S3 buckets.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.30.2") + (version "1.30.3") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "1j74ql0lz2xf0jsf4cjfapdmxbf6hb22699d3dyj8gwd1s92myjz")))) + "0spws2kawf5rqhp5h5wi46sa07c2yhhnjhdxpmxz8gkvqsvdjqkp")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) @@ -21788,13 +21788,13 @@ array-like semantic. It also provides: (define-public r-s4vectors (package (name "r-s4vectors") - (version "0.42.0") + (version "0.42.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Vectors" version)) (sha256 (base32 - "0aq0j70sl8a42gc1abxdwdy74mi9k4krz56yrbpwqv78x42cjjm9")))) + "080fr8f4lqzvn73y50wgz19w0a0hvkd9ilwswmv5gi34sihp8795")))) (properties `((upstream-name . "S4Vectors"))) (build-system r-build-system) @@ -21983,14 +21983,14 @@ provided.") (define-public r-hdf5array (package (name "r-hdf5array") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "HDF5Array" version)) (sha256 (base32 - "0j8rz99qw1rism3f5cv7rksccijmnchrkw7s9shxk0528f6dj6p1")))) + "1cfm15zwfp1gxgrkknyvdaqb5fm27s2nyjrhxwkrbn32yfdrgdnz")))) (properties `((upstream-name . "HDF5Array"))) (build-system r-build-system) (inputs @@ -22496,13 +22496,13 @@ of other packages.") (define-public r-scater (package (name "r-scater") - (version "1.32.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "096crwk5a9i7h2pykyi6vgnrnxas9wdz5dx920yh74smyh527jiq")))) + "1052jlflk596q8dbzhwx150ql53lhz109lljc011ni42a5zvjnbm")))) (build-system r-build-system) (propagated-inputs (list r-beachmat @@ -22711,14 +22711,14 @@ memory usage and processing time is minimized.") (define-public r-mscoreutils (package (name "r-mscoreutils") - (version "1.16.0") + (version "1.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MsCoreUtils" version)) (sha256 (base32 - "18m6qbj43p6zsrsdp7in15z3hcnqzqcxbk24qvbq7328rrhdk84a")))) + "1fjc0drsdkl9cyrq5k2kskb70x63mazbhpmlk9q7v77769v64gxb")))) (properties `((upstream-name . "MsCoreUtils"))) (build-system r-build-system) (propagated-inputs @@ -23720,14 +23720,14 @@ real numbers.") (define-public r-bgeecall (package (name "r-bgeecall") - (version "1.18.1") + (version "1.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BgeeCall" version)) (sha256 (base32 - "1ipypkyfqx6mahiwl0gzdsi7z9j9cm5rgfw4ybgh6blfq8kg9qyk")))) + "02k83a01fb4gydnw81j2vc3d1m92y0n44bskbdrlm7cb1zscvc13")))) (properties `((upstream-name . "BgeeCall"))) (build-system r-build-system) (propagated-inputs @@ -23742,6 +23742,7 @@ real numbers.") r-rslurm r-rtracklayer r-sjmisc + r-txdbmaker r-tximport)) (native-inputs (list r-knitr)) (home-page "https://github.com/BgeeDB/BgeeCall") @@ -24747,14 +24748,14 @@ fragments by exact matching.") (define-public r-dmrseq (package (name "r-dmrseq") - (version "1.24.0") + (version "1.24.1") (source (origin (method url-fetch) (uri (bioconductor-uri "dmrseq" version)) (sha256 (base32 - "0p7xpyl1wni17y7qsincpvllaynxwppmyg6hsza51srs4dhr7sf1")))) + "0x7gwdzpn1ziq5vm80fs1fcyknapwjs8zfbjszw66zs36nqnqgw4")))) (properties `((upstream-name . "dmrseq"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index d76e6f8c95..a2256fdcf8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -51,6 +51,7 @@ ;;; Copyright © 2024 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de> +;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,6 +84,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) @@ -277,6 +279,51 @@ source code editors and IDEs.") (base32 "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6")))))) +(define-public checkmake + (package + (name "checkmake") + (version "0.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mrtazz/checkmake") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ajrgnm5mg4b317brx53b8cpjvdw6vin1rk6yh9vrhrz014ifps2")) + (modules '((guix build utils))) + (snippet `(begin + (delete-file-recursively "vendor"))))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/mrtazz/checkmake" + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-man + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let ((man-dir (string-append #$output "/share/man"))) + (mkdir-p man-dir) + (invoke "go-md2man" + "-in" "man/man1/checkmake.1.md" + "-out" (string-append man-dir "/man1"))))))))) + (native-inputs + (list go-github-com-docopt-docopt-go + go-github-com-go-ini-ini + go-github-com-go-md2man + go-github-com-olekukonko-tablewriter + go-github-com-stretchr-testify)) + (home-page "https://github.com/mrtazz/checkmake") + (synopsis "Linter and analyzer for @file{Makefile}") + (description + "@samp{checkmake} is an experimental tool for linting and checking +Makefiles. It allows for a set of configurable rules being run +against a @file{Makefile} or a set of @file{*.mk} files.") + (license license:expat))) + ;;; XXX: This project is abandoned upstream, and included in modern catch2 ;;; releases. It is still depended by the restinio test suite at this time, ;;; so keep it (see: https://github.com/Stiffstream/restinio/issues/181). diff --git a/gnu/packages/clifm.scm b/gnu/packages/clifm.scm index 03b7692358..2718217381 100644 --- a/gnu/packages/clifm.scm +++ b/gnu/packages/clifm.scm @@ -30,7 +30,7 @@ (define-public clifm (package (name "clifm") - (version "1.19") + (version "1.20") (source (origin (method git-fetch) @@ -39,7 +39,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "062z3ic2knsrnj9bm5hh5ah47x18zpqdpvv4az88hyvrasy49p20")))) + (base32 "1hmky0rdrdp5zs1pgayrcgrf0ylvl2xh135r2c0g8k4ibwv3392c")))) (build-system gnu-build-system) (arguments `(#:make-flags (list (string-append "CC=" @@ -53,7 +53,8 @@ (inputs (list readline acl libcap)) (home-page "https://github.com/leo-arch/clifm") (synopsis "Command-line file manager") - (description "Clifm is a shell-like, text-based terminal file manager + (description + "Clifm is 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 diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 370b7714f1..7ed8ebe43d 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -574,6 +575,45 @@ than gzip and 15 % smaller output than bzip2.") (license (list license:gpl2+ license:lgpl2.1+)) ; bits of both (home-page "https://tukaani.org/xz/"))) +(define-public heatshrink + (package + (name "heatshrink") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/atomicobject/heatshrink/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sdhvk27yz8kahw18j8pddbpkgl78v8rh8fx6wspc3acj7w7yvrn")) + ;; Add CMake build script, wanted by prusa-slicer and libbgcode, which are the + ;; only users of this library (see + ;; <https://github.com/NixOS/nixpkgs/pull/269758/commits/fa36136ceed0e2c58e0c9e21492a7e60c3a64470>.) + (patches (search-patches "heatshrink-add-cmake.patch")))) + (build-system cmake-build-system) + (arguments + (list + ;; XXX: No tests available with CMake (see + ;; <https://github.com/atomicobject/heatshrink/pull/77>.) + #:tests? #f)) + (home-page "https://github.com/atomicobject/heatshrink/") + (synopsis "Data compression library for embedded/real-time systems") + (description + "A data compression/decompression library for embedded/real-time systems. + +Among its features are: +@itemize +@item Low memory usage (as low as 50 bytes.) It is useful for some cases with less +than 50 bytes, and useful for many general cases with less than 300 bytes. +@item Incremental, bounded CPU use. It can be used to chew on input data in +arbitrarily tiny bites. This is a useful property in hard real-time environments. +@item Can use either static or dynamic memory allocation. +@end itemize +") + (license license:isc))) + (define-public lhasa (package (name "lhasa") diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index cd773ccf19..f89c52055a 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -67,7 +67,7 @@ (define-public crun (package (name "crun") - (version "1.16") + (version "1.16.1") (source (origin (method url-fetch) @@ -77,7 +77,7 @@ "/crun-" version ".tar.gz")) (sha256 (base32 - "0m7z9jm6fwjwnp3ch4jm4ygsapqxs6qr4fpd099vhfm5mlczfczq")))) + "17i8vwj9zmr6dvi1w9i359vwr3rzwa9g03q83rz9w32ghzj8sm3h")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-systemd") @@ -274,7 +274,7 @@ containers or various tools.") (add-after 'unpack 'fix-hardcoded-paths (lambda _ (substitute* (find-files "tests" "\\.sh") - (("ping") "/run/setuid-programs/ping"))))))) + (("ping") "/run/privileged/bin/ping"))))))) (inputs (list glib libcap @@ -606,7 +606,7 @@ being rootless and not requiring any daemon to be running.") (define-public buildah (package (name "buildah") - (version "1.37.0") + (version "1.37.1") (source (origin (method git-fetch) @@ -614,7 +614,7 @@ being rootless and not requiring any daemon to be running.") (url "https://github.com/containers/buildah") (commit (string-append "v" version)))) (sha256 - (base32 "13xqv28p33jr4r1j3lzi0p83m8nxww91ssmvdx4wrbnzq0w88k3x")) + (base32 "1c15djlnqiawrahcyp7nl7bsnj0nz60ngncbwbab09f28szfk61g")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c1c2a4028b..7dca7a2d02 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -40,7 +40,8 @@ ;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com> ;;; Copyright © 2023 Paul A. Patience <paul@apatience.com> ;;; Copyright © 2024 dan <i@dan.games> -;;; +;;; Copyright © 2024 Peepo Froggings <peepofroggings@tutanota.de> + ;;; This file is part of GNU Guix. ;;; ;;; GNU Guix is free software; you can redistribute it and/or modify it @@ -188,36 +189,69 @@ allocator that makes it easy to generate complex code without a significant development effort.") (license license:zlib)))) -(define-public castxml +(define-public biblesync (package - (name "castxml") - (version "0.6.4") + (name "biblesync") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/CastXML/CastXML") - (commit (string-append "v" version)))) + (url "https://github.com/karlkleinpaste/biblesync") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0l5ys9zmllfgwhjrm897akbsf38iswfcarhxg27xfhiy0bmzcwsg")))) + (base32 + "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s")))) (build-system cmake-build-system) (arguments (list + #:tests? #f ;FIXME: Not sure how to run tests, if any #:configure-flags - #~(list - (string-append "-DCLANG_RESOURCE_DIR=" - #$(this-package-native-input "clang") "/lib/clang/" - #$(version-major - (package-version (this-package-native-input "clang"))))))) - (inputs (list libffi)) - (native-inputs (list clang-17 llvm-17)) - (home-page "https://github.com/CastXML/CastXML") - (synopsis "C-family abstract syntax tree XML output") - (description "CastXML is a C-family abstract syntax tree XML output tool. + #~(list (string-append "-DBUILD_SHARED_LIBS=TRUE")))) + (inputs (list `(,util-linux "lib"))) + (synopsis "C++ library implementing the BibleSync protocol") + (description + "BibleSync is a multicast protocol to support Bible software shared +co-navigation. The premise is that there is a local network over which to +multicast Bible navigation, and someone, possibly several someones, will +transmit, and others will receive. The library implementing the protocol is +a single C++ class providing a complete yet minimal public interface to +support mode setting, setup for packet reception, transmit on local +navigation, and handling of incoming packets.") + (home-page "https://github.com/karlkleinpaste/biblesync") + (license license:public-domain))) + +(define-public castxml +(package + (name "castxml") + (version "0.6.4") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/CastXML/CastXML") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0l5ys9zmllfgwhjrm897akbsf38iswfcarhxg27xfhiy0bmzcwsg")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list + (string-append "-DCLANG_RESOURCE_DIR=" + #$(this-package-native-input "clang") "/lib/clang/" + #$(version-major + (package-version (this-package-native-input "clang"))))))) + (inputs (list libffi)) + (native-inputs (list clang-17 llvm-17)) + (home-page "https://github.com/CastXML/CastXML") + (synopsis "C-family abstract syntax tree XML output") + (description "CastXML is a C-family abstract syntax tree XML output tool. This project is maintained by Kitware in support of ITK, the Insight Segmentation and Registration Toolkit.") - (license license:asl2.0))) + (license license:asl2.0))) (define-public range-v3 (package diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 32ee25e1ae..3f964857ff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -560,13 +560,13 @@ labels on the node can also be achieved.") (define-public r-collapse (package (name "r-collapse") - (version "2.0.14") + (version "2.0.15") (source (origin (method url-fetch) (uri (cran-uri "collapse" version)) (sha256 - (base32 "0njmis9a0jc8xmdxgxhpydsj2ygb89hg402gpqaw1h5bcwwpf0m8")))) + (base32 "19pa35yhdkas3kyrj4g3p794lckmrmhgy6gcqfqkcbqzzqiq6b2s")))) (properties `((upstream-name . "collapse"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -762,14 +762,14 @@ functions are included.") (define-public r-datawizard (package (name "r-datawizard") - (version "0.11.0") + (version "0.12.2") (source (origin (method url-fetch) (uri (cran-uri "datawizard" version)) (sha256 (base32 - "0cghk6flxxsz079sw8l4aw1h4girg7mwl61237a7ymmhvny70d4k")))) + "10g05f6jm7q59ihsb8wpg5fyy2an56gv33l7jiimjc818hh6bqzy")))) (properties `((upstream-name . "datawizard"))) (build-system r-build-system) (propagated-inputs @@ -1194,13 +1194,13 @@ plots.") (define-public r-ggstatsplot (package (name "r-ggstatsplot") - (version "0.12.3") + (version "0.12.4") (source (origin (method url-fetch) (uri (cran-uri "ggstatsplot" version)) (sha256 (base32 - "0lm48b664nin8f32a3xpqvc95cizi27sls5m4vrymfz3aarcwrxr")))) + "07xv8d5yv08wcrmz6abjcfq9vv8h78axsnhgxgz08iswhb7a377a")))) (properties `((upstream-name . "ggstatsplot"))) (build-system r-build-system) (propagated-inputs (list r-correlation @@ -1807,13 +1807,13 @@ Orcid ID.") (define-public r-rrna (package (name "r-rrna") - (version "1.1") + (version "1.2") (source (origin (method url-fetch) (uri (cran-uri "RRNA" version)) (sha256 - (base32 "0bgsakpz1wr3wr6c5xa7wx2xmzs3xzkscrgwn6dc7f93kpq1j17p")))) + (base32 "05ijsnxxylfan4c4hnl20655qjzix2l43i5qmdzm19wqcf4ipylp")))) (properties `((upstream-name . "RRNA"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=RRNA") @@ -2302,14 +2302,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser (define-public r-v8 (package (name "r-v8") - (version "4.4.2") + (version "5.0.0") (source (origin (method url-fetch) (uri (cran-uri "V8" version)) (sha256 (base32 - "0w4n794l4f7hwwjr83112zf3cjx72q6ak0fn45qm6pqg8brkbg77")))) + "06mjjrwg9bgyfxn4gcj3bf4xc9ijx08xf8dfd8g6w0bkz5cvg3v6")))) (properties `((upstream-name . "V8") (updater-extra-inputs . ("libnode")))) @@ -2528,13 +2528,13 @@ the system clipboards.") (define-public r-clock (package (name "r-clock") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "clock" version)) (sha256 (base32 - "0x58xhngpd2rj7da9gr1x1zwz4rliza7aakfadkqsc4c7wxpmral")))) + "1n7hl5mbywfshk8jid5shnsqsn1al0v636wsy14f681zkp1jyba3")))) (properties `((upstream-name . "clock"))) (build-system r-build-system) (propagated-inputs @@ -3355,13 +3355,13 @@ method for preprocessing data for conos.") (define-public r-pals (package (name "r-pals") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "pals" version)) (sha256 (base32 - "0z6lkvkq7b3wsxvizljf08sjqrdcj33p5kdx6074pc5jv36dylhb")))) + "1rnm6yvql39b4gbly90svbb5n9m66gc7f0abrxzkll6vsn71xfar")))) (properties `((upstream-name . "pals"))) (build-system r-build-system) (propagated-inputs @@ -4003,13 +4003,13 @@ related models. This is done using Markov chain Monte Carlo techniques.") (define-public r-shadowtext (package (name "r-shadowtext") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (cran-uri "shadowtext" version)) (sha256 (base32 - "109bq4d3j7vw6rcj9cjby955bdzgghkxwvwrb974xqq16kzzc6l6")))) + "1s3fsh6cmblyhlqrswialc9437as306ki36dyx0dv4001slvxl47")))) (properties `((upstream-name . "shadowtext"))) (build-system r-build-system) (propagated-inputs @@ -4386,13 +4386,13 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.") (define-public r-secretbase (package (name "r-secretbase") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "secretbase" version)) (sha256 - (base32 "1lnmkppw6scgdd3qd45jfvnrxx5bsa4b37z212aq6ss7xxjlv8wh")))) + (base32 "013f9lvsgfr5way2clkrwb1r2s9kvq2d3al68yjmf1lfpdmc1fdb")))) (properties `((upstream-name . "secretbase"))) (build-system r-build-system) (home-page "https://shikokuchuo.net/secretbase/") @@ -4484,14 +4484,14 @@ sources.") (define-public r-reprex (package (name "r-reprex") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "0ld90pkw2r7z115xdnyqk4p39vnxrc8jnn57sl4bkpg5frczw38a")))) + "174705043b90phm6aj5yb199pn1clipsnqgvhskhxybypj63cq68")))) (build-system r-build-system) (propagated-inputs (list r-callr @@ -4905,13 +4905,13 @@ particularly easy to create complete web applications using httpuv alone.") (define-public r-httr2 (package (name "r-httr2") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "httr2" version)) (sha256 (base32 - "1cpi2yr66g0nwd5ybz6254ivggvxql0bas2hwpakrcw1161jvs9k")))) + "0j0062wx5xzlr36cs2jh3qji9fin6d2myvl87cdlx7x5fizy7y6i")))) (properties `((upstream-name . "httr2"))) (build-system r-build-system) (propagated-inputs @@ -5143,13 +5143,13 @@ applications.") (define-public r-htmltable (package (name "r-htmltable") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (cran-uri "htmlTable" version)) (sha256 - (base32 "039nnxnvw5l284n7w8q0hnplm0b58nwhsrpjfi5asg61f9hxv0va")))) + (base32 "1pgndsyml68d9qd747043m9g0dxhaa10m533dchcsg1izwdx0f9p")))) (properties `((upstream-name . "htmlTable"))) (build-system r-build-system) (arguments @@ -5582,14 +5582,14 @@ expression estimates for all genes.") (define-public r-bslib (package (name "r-bslib") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "bslib" version)) (sha256 (base32 - "181cfmdvi64j978q8x69bl7wxwpjpx54a52sh4xng0pk3a2djd91")) + "00sbskl5f4mif2x54h5z3m2kv8ij2wv84a61n39931hj3gdjs67x")) (snippet '(for-each delete-file '("inst/components/dist/components.min.js" @@ -6934,13 +6934,13 @@ XML. To learn more about the Abbyy OCR API, see @url{http://ocrsdk.com/}.") (define-public r-colorspace (package (name "r-colorspace") - (version "2.1-0") + (version "2.1-1") (source (origin (method url-fetch) (uri (cran-uri "colorspace" version)) (sha256 - (base32 "0k31hazd2rq5lyg3y89y2v5jqadz2qlxd1bhvj89q4aldfxql1q4")))) + (base32 "02ydb0vncck0l9shfbz07gymdy5l2vinb0miivyb1r6nykjww8g7")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -7074,13 +7074,13 @@ initiative to bring PASSTEC 2000 functionalities to R.") (define-public r-partykit (package (name "r-partykit") - (version "1.2-20") + (version "1.2-21") (source (origin (method url-fetch) (uri (cran-uri "partykit" version)) (sha256 (base32 - "1np0sa7fx7wvwxbpk5lpgbdpz0xwcvppq0sc52nifx1dxnirll33")))) + "1414yspkfnx88rg4qid5q4nb2cdfz7bxpfs3kcn1rmikl9hl21rh")))) (build-system r-build-system) (propagated-inputs (list r-formula @@ -7120,13 +7120,13 @@ error stream.") (define-public r-pls (package (name "r-pls") - (version "2.8-3") + (version "2.8-4") (source (origin (method url-fetch) (uri (cran-uri "pls" version)) (sha256 - (base32 "1qvbwr567vxywpfsl7cb15lpwxpd04kf01nzk1v8dm4csf6p5sz6")))) + (base32 "0qnmndljjnk9amsrmx402dhpc742pm3cskqjxhdq2m4pcdiinnvq")))) (build-system r-build-system) (home-page "https://mevik.net/work/software/pls.html") (synopsis "Partial Least Squares and Principal Component Regression") @@ -7154,13 +7154,13 @@ print, summary, plot, update, etc. (define-public r-ps (package (name "r-ps") - (version "1.7.6") + (version "1.7.7") (source (origin (method url-fetch) (uri (cran-uri "ps" version)) (sha256 - (base32 "1lkd0mxr65sfh47dig0ck530kmsaxxqxdfy7ji59h78y7py5zhsj")))) + (base32 "1wi27l0a3z7wkrgn97jj5yqx6khy3brycj0y8nhlxagsp2rdrzj6")))) (build-system r-build-system) (home-page "https://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") @@ -7268,13 +7268,13 @@ value for each cluster in a dendrogram.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.12") + (version "1.0.13") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "1l1b0q2r6q2bjr4wvj98kp9844fyrsn2ppx339v05vmy8g65jwqc")))) + (base32 "1ki2vdfavwxvpw1y47kc0fpg248836zd3iw6zlspkr8kq58cdzi1")))) (build-system r-build-system) (home-page "https://www.rcpp.org") (synopsis "Seamless R and C++ integration") @@ -7644,13 +7644,13 @@ graphics packages that comes with the base installation.") (define-public r-ctrdata (package (name "r-ctrdata") - (version "1.19.0") + (version "1.19.1") (source (origin (method url-fetch) (uri (cran-uri "ctrdata" version)) (sha256 (base32 - "00wp5jf2sa4l28ffl109r87xvjm8c5i7nl09azypnml6rf0mqrhr")))) + "0w0bl39lgkb7fqvm3mg3b45kak1kjfjy2ghq31gwymyx41vh220v")))) (properties `((upstream-name . "ctrdata"))) (build-system r-build-system) (propagated-inputs @@ -8775,13 +8775,13 @@ transportation problems.") (define-public r-lpsolveapi (package (name "r-lpsolveapi") - (version "5.5.2.0-17.11") + (version "5.5.2.0-17.12") (source (origin (method url-fetch) (uri (cran-uri "lpSolveAPI" version)) (sha256 - (base32 "191zjgyap3kcsvh8fygqqyr9p0agbzm160fzynnpaxf19yp6r3dh")))) + (base32 "1vvhbgd54k0ynzh1zsrcdy8ry6w642vjk9dhlkig7pamf39aj02g")))) (properties `((upstream-name . "lpSolveAPI"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=lpSolveAPI") @@ -8864,17 +8864,17 @@ provides the R language without the environment.") (define-public r-fitdistrplus (package (name "r-fitdistrplus") - (version "1.1-11") + (version "1.2-1") (source (origin (method url-fetch) (uri (cran-uri "fitdistrplus" version)) (sha256 (base32 - "0gdm06anjmihfj1d0yiqy36d887kmc0d8553pjl1f90bf4mly9r6")))) + "0n25b3f92pghkavk4j9l25v1k6wjwkmpyvxslf05ixpzkmd23d38")))) (build-system r-build-system) (propagated-inputs - (list r-mass r-survival)) + (list r-mass r-rlang r-survival)) (native-inputs (list r-knitr)) (home-page "https://riskassessment.r-forge.r-project.org") @@ -9600,14 +9600,14 @@ Core algorithms are executed in parallel on systems supporting OpenMP.") (define-public r-rcpproll (package (name "r-rcpproll") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "RcppRoll" version)) (sha256 (base32 - "0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb")))) + "1prnc3svhc2v1w97vbdzfyxh545zx2h0p9d1q4753f7ynrwdkxfj")))) (properties `((upstream-name . "RcppRoll"))) (build-system r-build-system) (propagated-inputs @@ -9624,14 +9624,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-14") + (version "0.9-15") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "0dcgabbqk7lb8pfqs06ix87caf5c9p6kcppi5sskv76h8z43vj41")))) + "0jzfq06l2vxyjy46sjgqyk6l4pp06kx3w5j39hzjy9i127hjsxd4")))) (build-system r-build-system) (propagated-inputs (list r-class @@ -9742,20 +9742,19 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "1.0.10") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1m4v9j7by0w5avqljmwck1jsgjgwc8rsby0affa5zii3xkvvvifg")))) + "0v9063w4ahdc0xnwry3knykl4k2656df6jxv5f0p40k8piv8ip65")))) (build-system r-build-system) (propagated-inputs (list r-cli r-clock r-dplyr - r-ellipsis r-generics r-glue r-gower @@ -9962,13 +9961,13 @@ functions for: (define-public r-statsexpressions (package (name "r-statsexpressions") - (version "1.5.4") + (version "1.5.5") (source (origin (method url-fetch) (uri (cran-uri "statsExpressions" version)) (sha256 (base32 - "061qrhibfanh4f38pyhlj2z364y75d4njvrlr2415bww4jcwlpfd")))) + "0ba594rvqgczb10ldkmc637z9v6c0j3qixa1pw7jzd2bmhqfmaxh")))) (properties `((upstream-name . "statsExpressions"))) (build-system r-build-system) (propagated-inputs (list r-afex @@ -10007,13 +10006,13 @@ for ggstatsplot.") (define-public r-strawr (package (name "r-strawr") - (version "0.0.91") + (version "0.0.92") (source (origin (method url-fetch) (uri (cran-uri "strawr" version)) (sha256 (base32 - "1nbcn20g3f3f5x9sscj3020n5h4iaphr70s90n2fz31vc4snzq2m")))) + "0dy6pagwvmswmrlvb9ndy8lz3krcm8fqik83l0gmv9wjb9vba27s")))) (properties `((upstream-name . "strawr"))) (build-system r-build-system) (inputs (list curl zlib)) @@ -10543,14 +10542,14 @@ structure.") (define-public r-vioplot (package (name "r-vioplot") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "vioplot" version)) (sha256 (base32 - "1db7g0378jbcd6ssb7afff4y4r0v472qnb625hfwixx4wf1v8aap")))) + "0r89ac9ilz1jwwfgylzscg3c8is7dsy3c4dcl89ksmqhp3692kmh")))) (build-system r-build-system) (propagated-inputs (list r-sm r-zoo)) @@ -11239,13 +11238,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.45") + (version "0.46") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "049nk6h9xbdn2i6m07s26rqn790adww2y6mya03v95yj5xfg05iq")))) + (base32 "13dmylw2ja17kxzw1l5f3wrjxn97z6qw0ij3w20b0d3xlkd30gw2")))) (build-system r-build-system) (properties ;; knitr itself depends on xfun @@ -11434,14 +11433,14 @@ their own grammars and easily expose them in R packages.") (define-public r-uuid (package (name "r-uuid") - (version "1.2-0") + (version "1.2-1") (source (origin (method url-fetch) (uri (cran-uri "uuid" version)) (sha256 (base32 - "1z9a4b7hkymkwjq69d00myy5xw8kl9g99f4m2y4lxqqjz0a0lwbk")))) + "15jbzj0i4qphakbi8s9yk55lm8z9s2vhgp5bj77sfvkx7mrlj3pr")))) (build-system r-build-system) (home-page "https://www.rforge.net/uuid") (synopsis "Tools for generating and handling of UUIDs") @@ -11473,14 +11472,14 @@ vectors.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.51") + (version "0.52") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "1sn8fkmz01x0igsh7ynkqsl5h50ccl4xf8025a87i3mmni8kn4dv")))) + "0fji3yca7qpxpzdd8hy55v0g40jny41qvhz8d64gwlnxkwxp2alk")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) @@ -11558,13 +11557,13 @@ implementation of an approximate nearest neighbor search using hierarchical (define-public r-nestedcv (package (name "r-nestedcv") - (version "0.7.8") + (version "0.7.9") (source (origin (method url-fetch) (uri (cran-uri "nestedcv" version)) (sha256 - (base32 "1pdky7kzqs1rhl0f4hba3sggifplfgbp339imxym4dvvdb81b589")))) + (base32 "025xfs476r2mfzyjgpjzj2h9izfm2h9kia9hzhz9ikhxmj0a2lrd")))) (properties `((upstream-name . "nestedcv"))) (build-system r-build-system) (propagated-inputs (list r-caret @@ -12136,14 +12135,14 @@ financial trading strategies.") (define-public r-tseries (package (name "r-tseries") - (version "0.10-56") + (version "0.10-57") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "1s7sz95j6mm4708s3hffrnfkmdjgj43gba07wr6v24fg9xygq7m8")))) + "1vlvz009y683k3xz2bhzkfdnk5m2c9abfz7661p92a17cjvlnx8q")))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-quadprog r-quantmod r-zoo)) @@ -12327,14 +12326,14 @@ applied econometric analysis.") (define-public r-cubature (package (name "r-cubature") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "cubature" version)) (sha256 (base32 - "0r9n4xpm3ssjn3vywzlgh3naynzp1cxvjsd0pvah04k115b7i0jx")))) + "1156gv8ca3k034f34h50g0a4dg65dpv9d676i7h11rpl6gkj0wmk")))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -13660,14 +13659,14 @@ custom infix operators.") (define-public r-openxlsx (package (name "r-openxlsx") - (version "4.2.5.2") + (version "4.2.6.1") (source (origin (method url-fetch) (uri (cran-uri "openxlsx" version)) (sha256 (base32 - "0rwvzhk2brhbf1cdpg5jmwiwx5jhr9ybzvnhw0pg4bl3wpkqjw7f")))) + "1absl7kl3gzg2rwjv3qj74clcyj6xgfbxc6232ddi8fnll3ca262")))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-stringi r-zip)) @@ -13686,14 +13685,14 @@ dependency on Java.") (define-public r-rio (package (name "r-rio") - (version "1.1.1") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "rio" version)) (sha256 (base32 - "0llvdd4vdxpvjvbya3b6kh04h0k48ijy4dkjl77ynvhlh9wyzw9y")))) + "0iqfgic57qzbgqqxgfrccxwi05zknlgr5v929qqmb4mxx3569fmw")))) (build-system r-build-system) (propagated-inputs (list r-curl @@ -14841,14 +14840,14 @@ results to the user.") (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.3.10") + (version "1.3.11") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "0khj94z6ls6dnc6fpxwf1w93mk6f3z2p39mbihf0lz52jc36wjcj")))) + "1i58andd3k7ghmlv9f2frfa823p6lhdcwghyrszgmb3jpikxd5cp")))) (build-system r-build-system) (inputs (list hdf5 zlib)) @@ -15041,14 +15040,14 @@ implemented in bibutils.") (define-public r-rdpack (package (name "r-rdpack") - (version "2.6") + (version "2.6.1") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "02i21i85pb5aim529byjwhmyyz9jd82mi4j26a3kay0pcn6djxba")))) + "0igrmi0v17jsbfa770d6rcfnkjx6l2x3shskvjzhc5xbqjbn6qir")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs @@ -15306,14 +15305,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.20.1") + (version "0.20.3") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "19lg5dipnwlfxzcpq2mj348f8pnzn6i7sj77hf5ppzha370acgy2")))) + "1ckb25cbf6xg425fnkz86hxvmyrdkkl7889bkj73cg6d96c1h3mn")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -15393,13 +15392,13 @@ tidyverse workflow.") (define-public r-nodbi (package (name "r-nodbi") - (version "0.10.5") + (version "0.10.6") (source (origin (method url-fetch) (uri (cran-uri "nodbi" version)) (sha256 (base32 - "0cbwzclym2r28d1m662sg6krkpczsmpzigjzp3fhkkd7j7i1w9yi")))) + "1kgn6c0s0gac38ip5z5sm56psg912b9hg3klsymazam9r76ddaqx")))) (properties `((upstream-name . "nodbi"))) (build-system r-build-system) (propagated-inputs @@ -15528,13 +15527,13 @@ libxlsxwriter.") (define-public r-writexls (package (name "r-writexls") - (version "6.6.0") + (version "6.7.0") (source (origin (method url-fetch) (uri (cran-uri "WriteXLS" version)) (sha256 (base32 - "0adpwd80hhw6i965wp1w74s85vzq2gv5pf98zcvjwaqvpkrs25xw")))) + "0vr6h7jycwiic02krgz0ignzqhpi3vc9gsa5cykvg8wxdsfyyb6k")))) (properties `((upstream-name . "WriteXLS"))) (build-system r-build-system) (inputs (list perl)) @@ -15987,13 +15986,13 @@ the analyzed items.") (define-public r-slam (package (name "r-slam") - (version "0.1-50") + (version "0.1-52") (source (origin (method url-fetch) (uri (cran-uri "slam" version)) (sha256 - (base32 "1ggqcf8l1z2hpi7qy4mg0d2ps48bjjb8z1y1xz6fq162cqrbz6bq")))) + (base32 "09j1k63nw1m1vgblnla6s52v2337ixs958jmlzkjjz1xb01yd0y3")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/slam/") (synopsis "Sparse lightweight arrays and matrices") @@ -16432,14 +16431,14 @@ repeated measures data, respectively.") (define-public r-gam (package (name "r-gam") - (version "1.22-3") + (version "1.22-4") (source (origin (method url-fetch) (uri (cran-uri "gam" version)) (sha256 (base32 - "153ig136i3dpy87f8v9f5055x94sl74fnrf5ivpa9fc67f76ikb6")))) + "0wy0ia8z9mah8lr4lsbv9sn5z31zbqhrhmk6a74nzfzfyl478hbq")))) (properties `((upstream-name . "gam"))) (build-system r-build-system) (propagated-inputs @@ -17339,14 +17338,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.3") + (version "2.8.4") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "0yf08ns5qgqi2bzvxvawip521ji2rgvvfrhj747zb6ci5qnm4awk")))) + "02pa6kkymj4idawnffqk2fn6zgkw33ib6541vclvg5hd1wvh7j25")))) (properties '((updater-extra-inputs . ("imagemagick")))) (build-system r-build-system) @@ -17667,13 +17666,13 @@ estimation problem.") (define-public r-quickjsr (package (name "r-quickjsr") - (version "1.2.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "QuickJSR" version)) (sha256 (base32 - "1vb8b591imq737zin77sh3icld87pqk5mssmn7ddzj45cn22z12i")))) + "1lcg437b93yvbk4q63m2sh8ih4p2b6505invmjbyqf58hip9sm8h")))) (properties `((upstream-name . "QuickJSR"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -17889,14 +17888,14 @@ packages maintained by Torsten Hothorn.") (define-public r-multcomp (package (name "r-multcomp") - (version "1.4-25") + (version "1.4-26") (source (origin (method url-fetch) (uri (cran-uri "multcomp" version)) (sha256 (base32 - "10njzzxdi3jw5f419s7chcynxkzyqmmvzf7jk7ybdrwrlqhpiylx")))) + "1v3979my2yzpqc5lrx7fy72765j2cw1giv4xlpwrr2zvmzgvn051")))) (build-system r-build-system) (propagated-inputs (list r-codetools r-mvtnorm r-sandwich r-survival r-th-data)) @@ -18071,14 +18070,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.9.13") + (version "1.9.14") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "0yr9xnl57cgw1q210iip5fxbgqd6pswiw0kgwf23v3glkadqq4gb")))) + "1lvbjz9w8m6awww1vkzaw1qc4mmhlmdlk9s4qd5i0568zb15m72d")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs @@ -18159,14 +18158,14 @@ differentiation.") (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.13.2") + (version "0.14.0") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "15xnmjay0s9kgaj25z43cxky4qcjn3gv8yd1x548jzbxzxxma07n")))) + "10280l86a2wrlqjj8zh55pznvgjzpdzv6h3krxgg0ka19ch983zs")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs @@ -18186,14 +18185,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.12.0") + (version "0.12.2") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "0py6b1mix26z7fmarya7gfa9bwb8ymsr7z78ag8kld6ih3slga7z")))) + "0a20xnky7h6hgd6sk9n5jb4a2s201kr0cibhbii8i3jvnhz6cpmm")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) @@ -18240,14 +18239,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.8.8") + (version "0.8.9") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1dx83xv98iny4pzphrr64fv277k70cgmia1s18bh7fix2h3md45k")))) + "12qzz3zl5yn28ybmmryhmi29zwzwrfgqhb6wm7aqg78id463bjz9")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs @@ -18521,14 +18520,14 @@ user credentials.") (define-public r-gert (package (name "r-gert") - (version "2.0.1") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "gert" version)) (sha256 (base32 - "14nh7j0xz1s4ngsd5n3hixr534z843a38y57grwqkkh9g21q9mqf")))) + "0r59xn1c7axicl137a1l2mq74gzw5m7pi2x69ppyfji83c27q0s2")))) (properties `((upstream-name . "gert"))) (build-system r-build-system) (inputs @@ -18555,14 +18554,14 @@ User credentials are shared with command line git through the (define-public r-usethis (package (name "r-usethis") - (version "2.2.3") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "usethis" version)) (sha256 (base32 - "1cyy1k5iansg63ziph4w76kzl59dgmam7m2wp6sz9d93bjcrh34d")))) + "1dfcyxvw95lhm4giarsw266833sfbckk44nddjqpxqxarvwm1y4q")))) (build-system r-build-system) (propagated-inputs (list r-cli @@ -19133,14 +19132,14 @@ parallel calculations across cluster nodes.") (define-public r-chk (package (name "r-chk") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (cran-uri "chk" version)) (sha256 (base32 - "19q5ylkgrkdmnzg2df1lnrp2arbfzwfz4rbrr16j9ih2237kvd7r")))) + "0f6ilq9pbb6mgvclp6ksbaw8353wf114p1xqhlmkwgsfh2bg63xg")))) (properties `((upstream-name . "chk"))) (build-system r-build-system) (propagated-inputs @@ -19261,14 +19260,14 @@ package provides a minimal R interface by relying on the Rcpp package.") (define-public r-rcppparallel (package (name "r-rcppparallel") - (version "5.1.7") + (version "5.1.8") (source (origin (method url-fetch) (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "175j0plh9gzy45sxsck0wdqfkjwdsbb17m9511czrgqsrswhxhzr")) + "09m1pfblmcqh02simzvnal5qqv5swx35ls8kjggy6manv25b2mfn")) (modules '((guix build utils))) (snippet '(delete-file-recursively "src/tbb/")))) @@ -19663,14 +19662,14 @@ circular variables).") (define-public r-ouch (package (name "r-ouch") - (version "2.19") + (version "2.20") (source (origin (method url-fetch) (uri (cran-uri "ouch" version)) (sha256 (base32 - "15ryd76max77zwjlbijj4v7h42mscr4zqg8b01cq3gsr51l8bwkf")))) + "1r1nj4m2hw4gdaw596q14d6majcz15ppa0mfhfl8f791phcyarka")))) (build-system r-build-system) (propagated-inputs (list r-subplex)) (home-page "https://kingaa.github.io/ouch/") @@ -19683,13 +19682,13 @@ for evolution along a phylogenetic tree.") (define-public r-fmri (package (name "r-fmri") - (version "1.9.12") + (version "1.9.12.1") (source (origin (method url-fetch) (uri (cran-uri "fmri" version)) (sha256 (base32 - "1cv5mxcdpyf05n5pcjdawl59j7f4k40386r4m38qf15vcy45zdfq")))) + "0fyvnc39la5wgd9232nw6lp6yi1v3nkjwzn0sbhm4rckknibb5s4")))) (properties `((upstream-name . "fmri"))) (build-system r-build-system) (propagated-inputs (list r-aws r-metafor r-nlme r-oro-nifti)) @@ -19791,14 +19790,15 @@ Anderson-Darling Distribution\".") (define-public r-adimpro (package (name "r-adimpro") - (version "0.9.6") + (version "0.9.7") (source (origin (method url-fetch) (uri (cran-uri "adimpro" version)) (sha256 (base32 - "0d5viz9ayywpp1pas1yzmhllzn9rjrl8a3k7bj7h46f95l5x1586")))) - (properties `((upstream-name . "adimpro"))) + "1p34q78w1ib5xjvxg4c1bal680a55l5dqhiry367x9nzwq8a352c")))) + (properties `((upstream-name . "adimpro") + (updater-extra-propagated-inputs . ("imagemagick")))) (build-system r-build-system) (propagated-inputs (list r-awsmethods @@ -20016,14 +20016,14 @@ in-memory raw vectors.") (define-public r-nlp (package (name "r-nlp") - (version "0.2-1") + (version "0.3-0") (source (origin (method url-fetch) (uri (cran-uri "NLP" version)) (sha256 (base32 - "1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5")))) + "1v5kszwj56hdyd07ya9p0caxrd4ckpa1x6d0y6d1xrsi074638n0")))) (properties `((upstream-name . "NLP"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/NLP/") @@ -20036,14 +20036,14 @@ Processing.") (define-public r-tm (package (name "r-tm") - (version "0.7-13") + (version "0.7-14") (source (origin (method url-fetch) (uri (cran-uri "tm" version)) (sha256 (base32 - "1d0xczmmfsj82183nygvb4f9h1qbydz763b3jlzxb6ns8pi6q9p5")))) + "103n9m9vh1s1fn2wlab5qm4i1dx4wq0ffl7v69mwa6mvdklfw7ks")))) (properties `((upstream-name . "tm"))) (build-system r-build-system) (propagated-inputs @@ -20484,20 +20484,20 @@ definiteness of a matrix.") (define-public r-rspectra (package (name "r-rspectra") - (version "0.16-1") + (version "0.16-2") (source (origin (method url-fetch) (uri (cran-uri "RSpectra" version)) (sha256 (base32 - "16ij84wgpsmqmnxqiii8dgihy3bfxazry9znmckhwzba7m0d79fb")))) + "0zma49ah0sycjdx95m8mac21daa7p3gp9cg1mffygzhrjpblkwd2")))) (properties `((upstream-name . "RSpectra"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-rcpp r-rcppeigen)) (native-inputs - (list r-knitr)) + (list r-knitr r-rmarkdown)) (home-page "https://github.com/yixuan/RSpectra") (synopsis "Solvers for large-scale Eigenvalue and SVD problems") (description @@ -20959,14 +20959,14 @@ PostScript pictures in R plots.") (define-public r-grimport2 (package (name "r-grimport2") - (version "0.3-1") + (version "0.3-3") (source (origin (method url-fetch) (uri (cran-uri "grImport2" version)) (sha256 (base32 - "1lj58z6yc2p6ns27fkgh11ac90bcihi65hf62gxpsylcn5dilsi1")))) + "11glz1yi76235x3di9r7nny0nfcisk12acc4xsm4m2d9ingjh4pn")))) (properties `((upstream-name . "grImport2"))) (build-system r-build-system) (propagated-inputs @@ -22324,14 +22324,14 @@ model with finite state space using the Aalen-Johansen estimator.") (define-public r-epi (package (name "r-epi") - (version "2.51") + (version "2.53") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "0m9rvh21l9lqdlv71jrbix10g97wy2ryjv4zdjykfldhzzn4siik")))) + "1ndyvj24j7b85l5rdldnb6ngkyv7x08jnc11nbjsbh5mn7swg4qi")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs @@ -22505,14 +22505,14 @@ them in distributed compute environments.") (define-public r-parallelly (package (name "r-parallelly") - (version "1.37.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (cran-uri "parallelly" version)) (sha256 (base32 - "189ngbh9i6mqmfn4z6446in7687ddlpdq6v5rj3hr8zqinqlwznz")))) + "1ani63idvsx2apg3q2h9smi3sx7wbwpwpwjz585q9fyichy84b33")))) (properties `((upstream-name . "parallelly"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/parallelly") @@ -22533,14 +22533,14 @@ port-forwarding to your local computer.") (define-public r-future (package (name "r-future") - (version "1.33.2") + (version "1.34.0") (source (origin (method url-fetch) (uri (cran-uri "future" version)) (sha256 (base32 - "0rma4h9rjy28n7csn748v9b83m2v5hyh0hgwwckfpbnd5331m9xm")))) + "0pgs5n5pqqr3jg71nswjrl5did9bxg0m0z3sn8c1pswb3zyx8faq")))) (build-system r-build-system) (arguments `(#:phases @@ -24299,14 +24299,14 @@ tessellation.") (define-public r-wk (package (name "r-wk") - (version "0.9.1") + (version "0.9.2") (source (origin (method url-fetch) (uri (cran-uri "wk" version)) (sha256 (base32 - "0yxzyb09by9winspdn0585xhjmdcablb07wx6pf7ahg0q18sz85p")))) + "1y75hdg1p1h6pja3zxpllmbvzqlh67n5z9d3d6zhknxfkgfmwrrk")))) (properties `((upstream-name . "wk"))) (build-system r-build-system) (home-page "https://paleolimbot.github.io/wk/") @@ -24323,14 +24323,14 @@ high-performance functions are provided here.") (define-public r-s2 (package (name "r-s2") - (version "1.1.6") + (version "1.1.7") (source (origin (method url-fetch) (uri (cran-uri "s2" version)) (sha256 (base32 - "0rm0jd5k5w725v1bnn6ix8vic40grdh61y6qdy8jy4lhg1mjx78x")))) + "0y38g1zy19m7xsipns3m6avmjb9vnyw683nmlgsf4wnxa1qjqxih")))) (properties `((upstream-name . "s2"))) (build-system r-build-system) (arguments @@ -24347,7 +24347,7 @@ high-performance functions are provided here.") (propagated-inputs (list r-rcpp r-wk)) (inputs - (list openssl)) + (list openssl zlib)) (native-inputs (list pkg-config)) (home-page "https://r-spatial.github.io/s2/") @@ -24402,6 +24402,28 @@ datum transformations.") ;; Either of these licenses (license (list license:gpl2 license:expat)))) +(define-public r-sfd + (package + (name "r-sfd") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "sfd" version)) + (sha256 + (base32 "0zffbjzdzgvz7vj1wn7j7sqmnsvskkn94w7lkjxmaahd62xdh6v3")))) + (properties `((upstream-name . "sfd"))) + (build-system r-build-system) + (propagated-inputs (list r-cli r-rlang r-tibble)) + (home-page "https://cran.r-project.org/package=sfd") + (synopsis "Space-Filling Design Library") + (description + "This package provides a collection of pre-optimized space-filling +designs, for up to ten parameters, is contained here. Functions are provided +to access designs described by Husslage et al (2011) and Wang and Fang (2005). +The design types included are Audze-Eglais, MaxiMin, and uniform.") + (license license:expat))) + (define-public r-sftime (package (name "r-sftime") @@ -24851,13 +24873,13 @@ SELECT or UPDATE queries to an end-point.") (define-public r-bookdown (package (name "r-bookdown") - (version "0.39") + (version "0.40") (source (origin (method url-fetch) (uri (cran-uri "bookdown" version)) (sha256 (base32 - "1brfv50lq92m7d4d18n92ywhfr28lrbq02naf0bwdsmd0ngasxrm")) + "0fdciqazvsmc34hqfiqlmldigxn8gw546kkz74mc9dh48w24mpsq")) ;; TODO: there is one more file to replace: ;; inst/resources/gitbook/js/app.min.js (snippet @@ -25012,13 +25034,13 @@ multipliers. See <arXiv:1711.08013> for details.") (define-public r-kernlab (package (name "r-kernlab") - (version "0.9-32") + (version "0.9-33") (source (origin (method url-fetch) (uri (cran-uri "kernlab" version)) (sha256 - (base32 "1p3gbn9qgc6yqx9irkl8c23khvkx77jl96hk9hn4vsrx6i7g6kk5")))) + (base32 "0q9hvnams1cjjrx7hny0sjszqqg837pgn642nsdwhqipdmypih3h")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/kernlab") (synopsis "Kernel-based machine learning tools") @@ -25424,14 +25446,14 @@ package.") (define-public r-yulab-utils (package (name "r-yulab-utils") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "yulab.utils" version)) (sha256 (base32 - "0m1iip6w711z92y6qw0rc0flxl9bzj85vrhm2q2rqjz9pyqf3m1j")))) + "1xgpz7q86ac1y0ijp4635xxhgxjyrx9fqmci4mjp6xsj8m4p5qi6")))) (properties `((upstream-name . "yulab.utils"))) (build-system r-build-system) (propagated-inputs @@ -25529,14 +25551,14 @@ color.") (define-public r-polyclip (package (name "r-polyclip") - (version "1.10-6") + (version "1.10-7") (source (origin (method url-fetch) (uri (cran-uri "polyclip" version)) (sha256 (base32 - "0qwb5w1ishbhg1nhdp8985ddvcs7ljdyrbv059hx576xmgni6brw")))) + "1lshalmhdaw0g0hzfy2qwid282pq3kwzy4jz1hf73xmjlp1sm3pm")))) (build-system r-build-system) (native-inputs (list pkg-config)) (home-page "http://www.angusj.com/delphi/clipper.php") @@ -26461,14 +26483,14 @@ matched.") (define-public r-ggnewscale (package (name "r-ggnewscale") - (version "0.4.10") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "ggnewscale" version)) (sha256 (base32 - "1j8d512qhdlhfp3hb36d1dqlqlxs0i303mnn31xnq1adcwwibmlz")))) + "0bfzqjaxg5r9qzi6hav0m6rcw1cr90h8pwwjklbv930finrxrw5p")))) (properties `((upstream-name . "ggnewscale"))) (build-system r-build-system) (propagated-inputs @@ -27444,14 +27466,14 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "1.7.7.1") + (version "1.7.8.1") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "08wpxr8jkzsqb5zaw43bmq5r7k3jnb1ibjkliwh2ffjq7b7jr4gp")))) + "1s8vpj0rwyvzq6q4bby0szxwsj34z26mkrm7qx4pbs9g1g86yk9r")))) (build-system r-build-system) (propagated-inputs (list r-data-table r-jsonlite r-matrix)) @@ -28321,14 +28343,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.22.0") + (version "0.22.1") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "19g3sfmvvrarkgyl5p278fcpmybvsih8ancfbhp53w0gm80629z8")))) + "0axyl6iwa0x6yk340g5943v1d1q023z63smxf0j6033mdikf3xm4")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -28562,14 +28584,14 @@ porting.") (define-public r-subplex (package (name "r-subplex") - (version "1.8") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "subplex" version)) (sha256 (base32 - "19g5bd39gmcn27xdsklkzxg99x1r5v5q8zcw1iwry31qj24ivhrv")))) + "1dv9bpwm7ml662yrc2jnrjf4f8n1g5rfiipq6z0fx9j6pa6fma87")))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -31946,19 +31968,19 @@ problems (food web problems, linear programming problems).") (define-public r-shinycssloaders (package (name "r-shinycssloaders") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "shinycssloaders" version)) (sha256 (base32 - "0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl")))) + "0w7gw81j5d2dvjdk49dd222bqd40ll3sl8mykg68vcz64ihdg2h3")))) (properties `((upstream-name . "shinycssloaders"))) (build-system r-build-system) (propagated-inputs - (list r-digest r-glue r-shiny)) + (list r-digest r-glue r-htmltools r-shiny)) (home-page "https://github.com/andrewsali/shinycssloaders") (synopsis "Add CSS loading animations to Shiny outputs") (description @@ -32580,14 +32602,14 @@ machine learning, visually representing text and text analyses, and more.") (define-public r-topicmodels (package (name "r-topicmodels") - (version "0.2-16") + (version "0.2-17") (source (origin (method url-fetch) (uri (cran-uri "topicmodels" version)) (sha256 (base32 - "01g9avk0ldqnz15n8112vad31c1n7r6rih5dh6x3383vvmjrqp0d")))) + "138nsmwgg3npk3i78xagpm6fw1g4ixmikan1jmv3066kymgy2rrq")))) (properties '((upstream-name . "topicmodels") (updater-extra-inputs . ("gsl")))) @@ -32880,14 +32902,14 @@ perform @dfn{exploratory mediation} (XMed).") (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.32.9") + (version "2.32.10") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "0cqb5q9pi02vahr4fif07p4r3p2sik953a9i78z1j00j9srzxc17")))) + "10l523sckx3jis5x1zw99iqy9hihjmngmcjq484bgin4gn6mn4n3")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs (list pandoc)) @@ -33633,13 +33655,13 @@ recommendations for developers.") (define-public r-loo (package (name "r-loo") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "loo" version)) (sha256 - (base32 "0dnbbflglm7b29vr11rfrawnys9s3rl4h00h6xh9smjyalqz6r3n")))) + (base32 "0k14cf4mmviwslq931n5l1glalmsdsm7v3hq0m80w71fbaljgdxa")))) (properties `((upstream-name . "loo"))) (build-system r-build-system) (inputs @@ -34713,14 +34735,14 @@ including means, variances, intervals, and highest density regions.") (define-public r-posterior (package (name "r-posterior") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "posterior" version)) (sha256 (base32 - "1pp233ddrs116w1rmp3khhmibjf6l021b1x79k6z48g3r9zk042a")))) + "037l1cav2vglcd2pgp8n89apfpsb3822mhzmdsxf7a0mzcwjlq9l")))) (properties `((upstream-name . "posterior"))) (build-system r-build-system) (propagated-inputs @@ -34814,14 +34836,14 @@ with posterior predictive checks and leave-one-out cross-validation.") (define-public r-mstate (package (name "r-mstate") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "mstate" version)) (sha256 (base32 - "054dzrd5b0xjjjl7862q3aq1jwgrxbkqz7zpvbdirqsld3zksirw")))) + "0vxfayp9d21hgihrb3bfn04y76qgvqx0mcwbw5w6izpbqcwxlcw5")))) (properties `((upstream-name . "mstate"))) (build-system r-build-system) (propagated-inputs @@ -35046,14 +35068,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "4.4.0") + (version "4.5.0") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "082xmr33ki16i52a3z6lv9niv46pi4dbp0j3qn421sxml4115sf1")))) + "1bnyhwmmsacl0g1hhgjzdfh2kdxjqfm0r7cs5nz8vk1nrwyck02r")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs @@ -35491,13 +35513,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-7") + (version "3.3-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.explore" version)) (sha256 (base32 - "08740yclqv86mnds0a8xhn6r2qdqhw4qgkbrb2cl93crqwcdkr2f")))) + "09if9x87g1zgcpqrg4ad4j6l0nd2yalpbbd3syxdvs4m671y7gyc")))) (properties `((upstream-name . "spatstat.explore"))) (build-system r-build-system) (propagated-inputs @@ -35509,6 +35531,7 @@ diagonals. This package allows you to compute the tensor product of arrays.") r-spatstat-geom r-spatstat-random r-spatstat-sparse + r-spatstat-univar r-spatstat-utils)) (home-page "https://spatstat.org/") (synopsis "Exploratory data analysis for the spatstat family") @@ -35531,13 +35554,13 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-model (package (name "r-spatstat-model") - (version "3.2-11") + (version "3.3-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.model" version)) (sha256 (base32 - "0hvnqig6cdrp8hk2fkcajag3hrqsamfr6h66wn4cs30iblic23bh")))) + "19xgc4hmcyhxdk4cw7k5qyffr48vyc9dj76k3blxzgrbbydrc72w")))) (properties `((upstream-name . "spatstat.model"))) (build-system r-build-system) (propagated-inputs @@ -35552,6 +35575,7 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") r-spatstat-geom r-spatstat-random r-spatstat-sparse + r-spatstat-univar r-spatstat-utils r-tensor)) (home-page "https://spatstat.org/") @@ -35572,6 +35596,30 @@ tests for covariate effects (Cox-Berman-Waller-Lawson, Kolmogorov-Smirnov, ANOVA) are also supported.") (license license:gpl2+))) +(define-public r-spatstat-univar + (package + (name "r-spatstat-univar") + (version "3.0-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "spatstat.univar" version)) + (sha256 + (base32 "0wa7zys089sym8f16rg4dih81miv34rj8mph0w926cpckcfm1g00")))) + (properties `((upstream-name . "spatstat.univar"))) + (build-system r-build-system) + (propagated-inputs (list r-spatstat-utils)) + (home-page "https://www.spatstat.org/") + (synopsis + "One-dimensional probability distribution support for spatstat") + (description + "This is a package for estimation of one-dimensional probability +distributions including kernel density estimation, weighted empirical +cumulative distribution functions, Kaplan-Meier and reduced-sample estimators +for right-censored data, heat kernels, kernel properties, quantiles and +integration.") + (license license:gpl2+))) + (define-public r-spatstat-utils (package (name "r-spatstat-utils") @@ -35642,18 +35690,19 @@ package.") (define-public r-spatstat-geom (package (name "r-spatstat-geom") - (version "3.2-9") + (version "3.3-2") (source (origin (method url-fetch) (uri (cran-uri "spatstat.geom" version)) (sha256 (base32 - "05ymr4h6g5kp6kinm8qi6mcwi51d2rp671cm3hqgyrhk91k72cx7")))) + "03spxazgjspmsialvjy2sv5yxjh049dns4q4l4g0zgzd4ilqmh6b")))) (properties `((upstream-name . "spatstat.geom"))) (build-system r-build-system) (propagated-inputs - (list r-deldir r-polyclip r-spatstat-data r-spatstat-utils)) + (list r-deldir r-polyclip r-spatstat-data r-spatstat-univar + r-spatstat-utils)) (home-page "https://spatstat.org/") (synopsis "Geometrical functionality of the spatstat package") (description @@ -35698,14 +35747,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-5") + (version "3.2-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "18zp6dsddc9js4ck6iqh5li4hw5qbyvh16vsa9vqk4ccgc1krl57")))) + "1gqivj8lsqn67068ygjqjjbnl2wywq3zp6mpqqbhyrbj7h3diw0s")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) @@ -35717,6 +35766,7 @@ user-level code from spatstat, except for the code for linear networks.") r-spatstat-model r-spatstat-random r-spatstat-sparse + r-spatstat-univar r-spatstat-utils)) (home-page "https://spatstat.org/") (synopsis "Linear networks functionality of the spatstat package") @@ -35728,16 +35778,17 @@ for spatial data on a linear network.") (define-public r-spatstat-random (package (name "r-spatstat-random") - (version "3.2-3") + (version "3.3-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.random" version)) (sha256 - (base32 "19rl757lccr169fj00zmhb1a20bxw4kljzb81hbbr5xhj0za6lp0")))) + (base32 "1lxvi1wkbv6z0hcargcjb5b79vvrhaf0y2psxlil9q82i376n0l3")))) (properties `((upstream-name . "spatstat.random"))) (build-system r-build-system) - (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-utils)) + (propagated-inputs (list r-spatstat-data r-spatstat-geom r-spatstat-univar + r-spatstat-utils)) (home-page "https://spatstat.org/") (synopsis "Random Generation Functionality for the 'spatstat' Family") (description @@ -35756,19 +35807,24 @@ sampler).") (define-public r-spatstat (package (name "r-spatstat") - (version "3.0-8") + (version "3.1-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "0ghhj161n7bxd6hpk3hz6lq2gv8bwx5clrdp729lfyi9d1xjw162")))) + "04jmyngwzdb1v5yzcmnsj26kaaxxvhjnmdp7is5nrry632c30jan")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs - (list r-spatstat-data r-spatstat-explore r-spatstat-geom - r-spatstat-linnet r-spatstat-model r-spatstat-random + (list r-spatstat-data + r-spatstat-explore + r-spatstat-geom + r-spatstat-linnet + r-spatstat-model + r-spatstat-random + r-spatstat-univar r-spatstat-utils)) (home-page "https://www.spatstat.org") (synopsis "Spatial Point Pattern analysis, model-fitting, simulation, tests") @@ -36952,14 +37008,14 @@ prediction of kriging models.") (define-public r-dials (package (name "r-dials") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "dials" version)) (sha256 (base32 - "0xrvvz4pkzmjsizjqfcvpn6f1cl9yp56lyc2iw8vcvwa18gb6szf")))) + "08q18cl187n98q72hnx3ildd0jk7qmrcdpcrmz7z1l0rb5iyjjj2")))) (properties `((upstream-name . "dials"))) (build-system r-build-system) (propagated-inputs @@ -36973,6 +37029,7 @@ prediction of kriging models.") r-purrr r-rlang r-scales + r-sfd r-tibble r-vctrs r-withr)) @@ -38618,13 +38675,13 @@ black-box optimization in bbotk.") (define-public r-mlr3mbo (package (name "r-mlr3mbo") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "mlr3mbo" version)) (sha256 - (base32 "0qdd0g8qnfrafkqw79mhb652chf7lqmkcyra6afxamy7jardjr0g")))) + (base32 "1i97mqsxgdipl2gklp2h7d7s3jm977jzm6arxn6hvshw6a2ikzgm")))) (properties `((upstream-name . "mlr3mbo"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38654,13 +38711,13 @@ is straightforward via mlr3tuning.") (define-public r-mlr3measures (package (name "r-mlr3measures") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3measures" version)) (sha256 (base32 - "0k0i1xx63lds1870p2ljy1dlp2i376gdd0sq9s4xiqljqjb8va57")))) + "0vhqcfn3fijj2lwjrly2lyb9bs5msqvlwdv1asfkr9shkw61piik")))) (build-system r-build-system) (propagated-inputs (list r-checkmate r-prroc)) @@ -38854,13 +38911,13 @@ barplots, boxplots, histograms, ROC curves, and precision-recall curves.") (define-public r-paradox (package (name "r-paradox") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "paradox" version)) (sha256 (base32 - "0lll3sjyn0hmxfzg71zk53f3fddibvq7762ax7gxjgiy6zgi9mny")))) + "120ll8xrdg9s7ip0053m0i83gshxh3n79spsfwv6dzjwsj3mmpkj")))) (build-system r-build-system) (propagated-inputs (list r-backports r-checkmate r-data-table r-mlr3misc r-r6)) @@ -38876,13 +38933,13 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.20.0") + (version "0.20.2") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "1wqcvgqjwfp9lah6kpxcwsz5cpd57agxfjhhggfzp8lnva5p443v")))) + "0k3qyc2jyffdpnykn5ays5slgxzij803186xgwpjg38l9r13w9r1")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -38899,7 +38956,6 @@ implemented as @code{R6} classes.") r-paradox r-parallelly r-r6 - r-rhpcblasctl r-uuid)) (home-page "https://mlr3.mlr-org.com/") (synopsis "Machine Learning in R - Next Generation") @@ -38941,14 +38997,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "0w1f54lwhllf16iw9irgfv4nsn26ikw1m3wlrk5ilcs3z83zakk8")))) + "13kvqazlp3inxqzdm67q7hgjss8wib1hi3fbyx1zlm653zfc0sii")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs @@ -39327,14 +39383,14 @@ in output to the equivalent HTML.") (define-public r-pkgdown (package (name "r-pkgdown") - (version "2.0.9") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "pkgdown" version)) (sha256 (base32 - "186xzilh4079a6xjig3j4pdn99ipg4d5s5q1k75qclivq0b24m3f")))) + "1d4z4wv18yn00cj9wb4pizjjyvy4hqfc0mqynw6ycrldfcxxzlf4")))) (properties `((upstream-name . "pkgdown"))) (build-system r-build-system) (inputs (list pandoc)) @@ -39345,11 +39401,11 @@ in output to the equivalent HTML.") r-desc r-digest r-downlit + r-fontawesome r-fs - r-httr + r-httr2 r-jsonlite - r-magrittr - r-memoise + r-openssl r-purrr r-ragg r-rlang @@ -40015,14 +40071,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (define-public r-stars (package (name "r-stars") - (version "0.6-5") + (version "0.6-6") (source (origin (method url-fetch) (uri (cran-uri "stars" version)) (sha256 (base32 - "1b5gs0qa8097f2mvz4rgl46wrvk1rbbbi2a4s901hdg4bkr15jsg")))) + "1b679s25f9vpzrisyxs5xzc0dv47yn3prm0hi752fhpvml4kbjkh")))) (properties `((upstream-name . "stars"))) (build-system r-build-system) (propagated-inputs @@ -41277,14 +41333,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.7.3") + (version "0.7.4") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "1h7xsddwjhjx5n3fns16nhk249h6mypk80d3jp7lwpianhdll90m")))) + "0jrnliac0la9i9mlb95p07s3p7qkp3m79haz16bf8q3wdnc522i1")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs @@ -41944,14 +42000,14 @@ neighborhood graphs, and relatives.") (define-public r-crul (package (name "r-crul") - (version "1.4.2") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "crul" version)) (sha256 (base32 - "0is164bbdk5zy1gxrliiqzlmj47nvzsjym05ijzzs3zkj7qpfp20")))) + "17dx3qhdssk0zanp73g0d7h3imhwh9ydzs009fbrspw1s9w3fwyv")))) (properties `((upstream-name . "crul"))) (build-system r-build-system) (propagated-inputs @@ -42105,14 +42161,14 @@ configuration of status code, short description, and verbose message.") (define-public r-webmockr (package (name "r-webmockr") - (version "0.9.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "webmockr" version)) (sha256 (base32 - "1a590fyzmag1p6c9a82yp93wd1s4jdznk0416i0pv8r5jwarkdv7")))) + "09j6j5d60cz0sjzg7zacdk3pypip3hnhf2qq24nmvy9aiz0a4lkk")))) (properties `((upstream-name . "webmockr"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 22c6136852..3973ea472a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38780,6 +38780,64 @@ This package contains the protobuf logic.") (description "This package provides Rust bindings to libsensors.") (license license:miros))) +(define-public rust-libspa-sys-0.7 + (package + (name "rust-libspa-sys") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "libspa-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ifkg4k7azfqbz4i1lk31d77nhlc2w36s133yf78a3z7yfihrrxk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66) + ("rust-cc" ,rust-cc-1) + ("rust-system-deps" ,rust-system-deps-6)))) + (native-inputs + (list pkg-config clang)) + (inputs + (list pipewire)) + (home-page "https://pipewire.org") + (synopsis "Rust FFI bindings for libspa") + (description "This package provides Rust FFI bindings for libspa.") + (license license:expat))) + +(define-public rust-libspa-0.7 + (package + (name "rust-libspa") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "libspa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i58ayw50brjh1a7gzfs9ijwl42lqmq2k4b7c2w1ijnx41q62d04")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; NOTE: 1 fail, `async_seq_panic' test should panic. + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cc" ,rust-cc-1) + ("rust-convert-case" ,rust-convert-case-0.6) + ("rust-cookie-factory" ,rust-cookie-factory-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-libspa-sys" ,rust-libspa-sys-0.7) + ("rust-nix" ,rust-nix-0.26) + ("rust-nom" ,rust-nom-7) + ("rust-system-deps" ,rust-system-deps-6) + ("rust-pipewire" ,rust-pipewire-0.7)))) + (native-inputs + (list pkg-config clang)) + (inputs + (list pipewire)) + (home-page "https://pipewire.org") + (synopsis "Rust bindings for libspa") + (description "This package provides Rust bindings for libspa.") + (license license:expat))) + (define-public rust-libsqlite3-sys-0.28 (package (name "rust-libsqlite3-sys") @@ -53580,6 +53638,63 @@ along with strong support for variations and the core header tables.") #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3)))))) +(define-public rust-pipewire-sys-0.7 + (package + (name "rust-pipewire-sys") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pipewire-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r4z0farzflycgfp6x7z65h57np4l1qnpj4r8z5lcwkkgd70h349")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.66) + ("rust-libspa-sys" ,rust-libspa-sys-0.7) + ("rust-system-deps" ,rust-system-deps-6)))) + (native-inputs + (list pkg-config clang)) + (inputs + (list pipewire)) + (home-page "https://pipewire.org") + (synopsis "Rust FFI bindings for PipeWire") + (description + "This package provides Rust FFI bindings for @code{PipeWire}.") + (license license:expat))) + +(define-public rust-pipewire-0.7 + (package + (name "rust-pipewire") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pipewire" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sg9cbvhp0s07a337zwli0xm40f8wkvm06d72nsr1s35vp40kl52")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-libspa" ,rust-libspa-0.7) + ("rust-libspa-sys" ,rust-libspa-sys-0.7) + ("rust-nix" ,rust-nix-0.26) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pipewire-sys" ,rust-pipewire-sys-0.7) + ("rust-thiserror" ,rust-thiserror-1)))) + (native-inputs + (list pkg-config)) + (inputs + (list pipewire clang)) + (home-page "https://pipewire.org") + (synopsis "Rust bindings for PipeWire") + (description "This package provides Rust bindings for @code{PipeWire}.") + (license license:expat))) + (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index d5d32d72fb..b00dc8aa4c 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -504,7 +504,7 @@ total number of shares generated.") `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) ;; The "sudo" input is needed only to satisfy dependency checks in the ;; 'check' phase. The "sudo" used at runtime should come from the - ;; system's setuid-programs, so ensure no reference is kept. + ;; system's privileged-programs, so ensure no reference is kept. #:disallowed-references (,sudo) ;; TODO: Build and install gtk and qt trays #:phases diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2532586bc5..0063dd86de 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5443,7 +5443,7 @@ a Gtk.Grid Widget.") (define-public sqlitebrowser (package (name "sqlitebrowser") - (version "3.12.2") + (version "3.13.0") (source (origin (method git-fetch) @@ -5452,7 +5452,7 @@ a Gtk.Grid Widget.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ljqzcx388mmni8lv9jz5r58alhsjrrqi4nzjnbfki94rn4ray6z")) + (base32 "0v4a59lgqng9hqvbc2k504aclinpwpk8hi6ckirbr6m1pnf26kfr")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 415c1d515d..6f7b809fd2 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -725,8 +725,8 @@ handling the installation and removal of Debian software packages.") (lambda () (format #t "# A couple of presets to make this work more smoothly.~@ MIRRORSITE=\"http://deb.debian.org/debian\"~@ - if [ -r /run/setuid-programs/sudo ]; then~@ - PBUILDERROOTCMD=\"/run/setuid-programs/sudo -E\"~@ + if [ -r /run/privileged/bin/sudo ]; then~@ + PBUILDERROOTCMD=\"/run/privileged/bin/sudo -E\"~@ fi~@ PBUILDERSATISFYDEPENDSCMD=\"~a/lib/pbuilder/pbuilder-satisfydepends-apt\"~%" #$output))))) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ee76647475..d45da82276 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -212,10 +212,10 @@ and write-back caching.") ;; udevil expects these programs to be run with uid set as root. ;; user has to manually add these programs to setuid-programs. ;; mount and umount are default setuid-programs in guix system. - "--with-mount-prog=/run/setuid-programs/mount" - "--with-umount-prog=/run/setuid-programs/umount" - "--with-losetup-prog=/run/setuid-programs/losetup" - "--with-setfacl-prog=/run/setuid-programs/setfacl") + "--with-mount-prog=/run/privileged/bin/mount" + "--with-umount-prog=/run/privileged/bin/umount" + "--with-losetup-prog=/run/privileged/bin/losetup" + "--with-setfacl-prog=/run/privileged/bin/setfacl") #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-root-reference @@ -226,12 +226,12 @@ and write-back caching.") (add-after 'unpack 'patch-udevil-reference ;; udevil expects itself to be run with uid set as root. ;; devmon also expects udevil to be run with uid set as root. - ;; user has to manually add udevil to setuid-programs. + ;; user has to manually add udevil to privileged-programs. (lambda _ (substitute* "src/udevil.c" - (("/usr/bin/udevil") "/run/setuid-programs/udevil")) + (("/usr/bin/udevil") "/run/privileged/bin/udevil")) (substitute* "src/devmon" - (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil")) + (("`which udevil 2>/dev/null`") "/run/privileged/bin/udevil")) #t))))) (native-inputs (list intltool pkg-config)) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 6d0c6a6dca..b1eb4bdb4d 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Simon South <simon@simonsouth.net> -;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2024 John Kehayias <john.kehayias@protonmail.com> @@ -636,18 +636,18 @@ BIND and djbdns---whilst using relatively little memory.") (define-public unbound (package (name "unbound") - (version "1.19.1") + (version "1.21.0") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "1ad34jxprygjp7g84q1bgmvcc114f2mgyhfwk9rs0inq7mpmf7dw")))) + (base32 "08a5l5z0c99433pqg2i7x5d9m6as7c2z3sv4zakdy6zqn3bagp77")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs - (list flex swig)) + (list flex swig python-wrapper)) (inputs (list expat libevent diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2ff1ed4bf0..cb7269d6b9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -143,6 +143,9 @@ ;;; Copyright © 2024 Noé Lopez <noelopez@free.fr> ;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2024 Daniel Szmulewicz <daniel.szmulewicz@gmail.com> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2024 Spencer King <spencer.king@nursiapress.com> ;;; ;;; This file is part of GNU Guix. @@ -400,14 +403,14 @@ buffer, a file on your disk, or a string from the kill ring.") (define-public emacs-activities (package (name "emacs-activities") - (version "0.7") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/activities-" version ".tar")) (sha256 - (base32 "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi")))) + (base32 "1khhkfyy251mag5zqybsvfg3sak0aac1qlsdl1wyiin7f6sq9563")))) (build-system emacs-build-system) (propagated-inputs (list emacs-persist)) (home-page "https://github.com/alphapapa/activities.el") @@ -583,7 +586,7 @@ API key.") (define-public emacs-chatgpt-shell (package (name "emacs-chatgpt-shell") - (version "0.74.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -603,7 +606,7 @@ API key.") (define-public emacs-geiser-guile (package (name "emacs-geiser-guile") - (version "0.28.1") + (version "0.28.2") (source (origin (method git-fetch) @@ -612,7 +615,7 @@ API key.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f")))) + (base32 "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy")))) (build-system emacs-build-system) (arguments (list @@ -1503,7 +1506,7 @@ size.") (define-public emacs-git-modes (package (name "emacs-git-modes") - (version "1.4.3") + (version "1.4.4") (source (origin (method git-fetch) @@ -1512,7 +1515,7 @@ size.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i")))) + (base32 "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -1529,7 +1532,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (define-public emacs-with-editor (package (name "emacs-with-editor") - (version "3.3.4") + (version "3.4.1") (source (origin (method git-fetch) @@ -1538,7 +1541,7 @@ configuration files, such as @file{.gitattributes}, @file{.gitignore}, and (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b")))) + (base32 "1hnc0jbjdpjr7xzh8gmhxkcbpw6mbla9vg8vy6py6mdk7ap1zqj8")))) (build-system emacs-build-system) (arguments (list @@ -1654,18 +1657,45 @@ on stdout instead of using a socket as the Emacsclient does.") libgit2 bindings for Emacs, intended to boost the performance of Magit.") (license license:gpl2+)))) +(define-public emacs-llama + (package + (name "emacs-llama") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tarsius/llama") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rgm5jv9iv8b0xabdwicrpih2d3slchmv17xdjk705dqhfc18f4w")))) + (build-system emacs-build-system) + (arguments + (list #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-l" "llama.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://github.com/tarsius/llama") + (synopsis "Compact syntax for short lambda") + (description + "This package implements the macro @code{##}, which provides compact +syntax for short lambda.") + (license license:gpl3+))) + (define-public emacs-llm (package (name "emacs-llm") - (version "0.17.0") + (version "0.17.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/ahyatt/llm") (commit version))) (file-name (git-file-name name version)) - (sha256 (base32 - "1sds3gb5accmpkajc60cbly2imkvvb7a3afi8qdb67p5vkk5xvc2")))) + (sha256 + (base32 + "1c71p7a7lsq2xwg2jh021cfdgdp5q11sqb844flbf7pn2vdk6p07")))) (build-system emacs-build-system) (propagated-inputs (list emacs-plz)) (home-page "https://github.com/ahyatt/llm") @@ -1677,94 +1707,92 @@ before interacting with non-free LLMs.") (license license:gpl3+))) (define-public emacs-magit - (let ((commit "538cb2f90b5fdd04fcaacd537834f4f3c8c0720f") - (revision "8")) - (package - (name "emacs-magit") - (version (git-version "3.3.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/magit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1vzqy82ai8w0k283bij45k49pq4v3xy4yyy5gd24ba713y03327f")))) - (build-system emacs-build-system) - (arguments - (list - #:tests? #t - #:test-command #~(list "make" "test") - #:exclude #~(cons* "magit-libgit.el" - "magit-libgit-pkg.el" - %default-exclude) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (invoke "make" "info") - ;; Copy info files to the lisp directory, which acts as - ;; the root of the project for the emacs-build-system. - (for-each (lambda (f) - (install-file f "lisp")) - (find-files "docs" "\\.info$")))) - (add-after 'build-info-manual 'set-magit-version - (lambda _ - (make-file-writable "lisp/magit.el") - (emacs-substitute-variables "lisp/magit.el" - ("magit-version" #$version)))) - (add-after 'set-magit-version 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (for-each make-file-writable - (list "lisp/magit-git.el" "lisp/magit-sequence.el")) - (emacs-substitute-variables "lisp/magit-git.el" - ("magit-git-executable" - (search-input-file inputs "/bin/git"))) - (emacs-substitute-variables "lisp/magit-sequence.el" - ("magit-perl-executable" - (search-input-file inputs "/bin/perl"))))) - (add-before 'check 'configure-git - (lambda _ - ;; Otherwise some tests fail with error "unable to auto-detect - ;; email address". - (setenv "HOME" (getcwd)) - (invoke "git" "config" "--global" "user.name" "toto") - (invoke "git" "config" "--global" "user.email" - "toto@toto.com"))) - (replace 'expand-load-path - (lambda args - (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'expand-load-path) args)))) - (replace 'make-autoloads - (lambda args - (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'make-autoloads) args)))) - (replace 'install - (lambda args - (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'install) args)))) - (replace 'build - (lambda args - (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'build) args))))))) - (native-inputs - (list texinfo)) - (inputs - (list git perl)) - (propagated-inputs - ;; Note: the 'git-commit' and 'magit-section' dependencies are part of - ;; magit itself. - (list emacs-compat emacs-dash emacs-transient emacs-with-editor)) - (home-page "https://magit.vc/") - (synopsis "Emacs interface for the Git version control system") - (description - "With Magit, you can inspect and modify your Git repositories + (package + (name "emacs-magit") + (version "4.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #t + #:test-command #~(list "make" "test") + #:exclude #~(cons* "magit-libgit.el" + "magit-libgit-pkg.el" + %default-exclude) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Copy info files to the lisp directory, which acts as + ;; the root of the project for the emacs-build-system. + (for-each (lambda (f) + (install-file f "lisp")) + (find-files "docs" "\\.info$")))) + (add-after 'build-info-manual 'set-magit-version + (lambda _ + (make-file-writable "lisp/magit.el") + (emacs-substitute-variables "lisp/magit.el" + ("magit-version" #$version)))) + (add-after 'set-magit-version 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (for-each make-file-writable + (list "lisp/magit-git.el" "lisp/magit-sequence.el")) + (emacs-substitute-variables "lisp/magit-git.el" + ("magit-git-executable" + (search-input-file inputs "/bin/git"))) + (emacs-substitute-variables "lisp/magit-sequence.el" + ("magit-perl-executable" + (search-input-file inputs "/bin/perl"))))) + (add-before 'check 'configure-git + (lambda _ + ;; Otherwise some tests fail with error "unable to auto-detect + ;; email address". + (setenv "HOME" (getcwd)) + (invoke "git" "config" "--global" "user.name" "toto") + (invoke "git" "config" "--global" "user.email" + "toto@toto.com"))) + (replace 'expand-load-path + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'expand-load-path) args)))) + (replace 'make-autoloads + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'make-autoloads) args)))) + (replace 'install + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'install) args)))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args))))))) + (native-inputs + (list texinfo)) + (inputs + (list git perl)) + (propagated-inputs + ;; Note: the 'git-commit' and 'magit-section' dependencies are part of + ;; magit itself. + (list emacs-compat emacs-dash emacs-transient emacs-with-editor)) + (home-page "https://magit.vc/") + (synopsis "Emacs interface for the Git version control system") + (description + "With Magit, you can inspect and modify your Git repositories with Emacs. You can review and commit the changes you have made to the tracked files, for example, and you can browse the history of past changes. There is support for cherry picking, reverting, merging, rebasing, and other common Git operations.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-magit-svn (package @@ -1824,7 +1852,7 @@ process, passing on the arguments as command line arguments.") (define-public emacs-magit-annex (package (name "emacs-magit-annex") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -1833,7 +1861,7 @@ process, passing on the arguments as command line arguments.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk")))) + (base32 "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc")))) (build-system emacs-build-system) (propagated-inputs (list emacs-magit)) (home-page "https://github.com/magit/magit-annex/") @@ -1902,10 +1930,10 @@ leveraging built-in functionality.") license:fdl1.3+)))) ; GFDLv1.3+ for the manual (define-public emacs-meyvn - (let ((commit "f2b809da1d1bf66f1a215a0e5c64f95d10118b76")) ;version bump + (let ((commit "62802ab42ee021f89f980bd3de3e1336ad760944")) ;version bump (package (name "emacs-meyvn") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) @@ -1914,7 +1942,7 @@ leveraging built-in functionality.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk")))) + (base32 "0821sk0mq1602mk3hp7igcafp8fpfg586nk41iz9syc06xbh0if7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-cider emacs-dash @@ -2007,7 +2035,7 @@ bottom, or top, of the buffer, or to a trash file.") (define-public emacs-minions (package (name "emacs-minions") - (version "1.0.1") + (version "1.0.2") (source (origin (method git-fetch) @@ -2016,7 +2044,7 @@ bottom, or top, of the buffer, or to a trash file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g")))) + (base32 "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash)) @@ -2061,7 +2089,7 @@ displayed at the bottom or at the top.") (define-public emacs-moody (package (name "emacs-moody") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -2070,7 +2098,7 @@ displayed at the bottom or at the top.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03")))) + (base32 "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -2426,7 +2454,7 @@ organizing remote Go repository clones.") (define-public emacs-ghub (package (name "emacs-ghub") - (version "3.6.0") + (version "4.0.0") (source (origin (method git-fetch) @@ -2435,7 +2463,7 @@ organizing remote Go repository clones.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11nrh2lr5179r0brd9vl7r0i0dpjxdr5frplxq6j2ca7l2vzwqyr")))) + (base32 "1dnl4idvc96jv73gdsrp377m1782i5n0cq0y4s0mp4i1vqd5drj2")))) (build-system emacs-build-system) (arguments (list @@ -3284,13 +3312,13 @@ and ease-of-key score. Most frequently used commands have most easy keys.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.25") + (version "2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 "0w4gaxypl76d1jw9vcq0zhj7ksj44wyfb148l1fb0vl7h6wpv0pg")))) + (base32 "1y5pcrph6v8q06mipv3l49qhw55yvvb1nnq0817bzm25k0s3z70v")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") @@ -3384,6 +3412,26 @@ on the eyes during night and day. They only support GUI and 256 colour terminals.") (license license:gpl3+)))) +(define-public emacs-rbs-mode + (package + (name "emacs-rbs-mode") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ybiquitous/rbs-mode") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h")))) + (build-system emacs-build-system) + (home-page "https://github.com/ybiquitous/rbs-mode") + (synopsis "Major mode for Ruby type signature") + (description + "RBS mode is a major mode for Ruby type signature language (RBS). It +provides basic supports for syntax highlighting and indentation.") + (license license:gpl3+))) + (define-public emacs-reformatter (package (name "emacs-reformatter") @@ -3492,14 +3540,14 @@ project root.") (define-public emacs-relint (package (name "emacs-relint") - (version "1.24") + (version "2.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "relint-" version ".tar")) (sha256 - (base32 "0wc7jzapzc4s7v7yqwp315ymbs6xighy2clx1ylvf60zs49y2bwm")))) + (base32 "0r89b5yk5lp92k4gnr0sx6ccilqzpv6kd5csqhxydk0xmqh8rsff")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xr)) (home-page "https://github.com/mattiase/relint") @@ -3838,7 +3886,7 @@ Selectrum.") (define-public emacs-empv (package (name "emacs-empv") - (version "4.4.0") + (version "4.5.0") (source (origin (method git-fetch) @@ -3848,7 +3896,7 @@ Selectrum.") (file-name (git-file-name name version)) (sha256 (base32 - "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1")))) + "1qwbxhdcl2vvdf0sjgl1iafh47rgbabzmjjwg6jq32p7q64pw6dr")))) (build-system emacs-build-system) (arguments (list @@ -3996,7 +4044,7 @@ code completion and project management support.") (define-public emacs-auto-compile (package (name "emacs-auto-compile") - (version "2.0.2") + (version "2.0.3") (source (origin (method git-fetch) (uri (git-reference @@ -4005,7 +4053,7 @@ code completion and project management support.") (file-name (git-file-name name version)) (sha256 (base32 - "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl")))) + "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-packed)) (home-page "https://github.com/emacscollective/auto-compile") @@ -4979,7 +5027,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -4988,7 +5036,7 @@ of bibliographic references.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04vsy5dv3zlid914igyi6ya9hf08ph0hc4c09pbja0z1if4mjrqh")))) + (base32 "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0")))) (build-system emacs-build-system) (arguments (list @@ -5073,7 +5121,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (define-public emacs-cape (package (name "emacs-cape") - (version "1.5") + (version "1.6") (source (origin (method git-fetch) @@ -5082,7 +5130,7 @@ be regarded as @code{emacs-company-quickhelp} for @code{emacs-corfu}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw")))) + (base32 "0bkkb4fpga7r0rmyj8i621xmn5s0l7w49xyj1byy8z4rgl73zlhb")))) (build-system emacs-build-system) (arguments (list @@ -5173,7 +5221,7 @@ that the binary uses instead of the actual binary contents.") (define-public emacs-ellama (package (name "emacs-ellama") - (version "0.11.12") + (version "0.11.13") (source (origin (method git-fetch) (uri (git-reference @@ -5181,7 +5229,7 @@ that the binary uses instead of the actual binary contents.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "16hhzb38qcrj7irf0h1h2yr8j02v0lkgxn89ysapabh9ppf6amx8")))) + "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-dash emacs-llm emacs-spinner)) (home-page "https://github.com/s-kostyaev/ellama") @@ -5934,7 +5982,7 @@ and stored in memory.") (define-public emacs-saveplace-pdf-view (package (name "emacs-saveplace-pdf-view") - (version "1.0.6") + (version "1.0.7") (source (origin (method git-fetch) @@ -5943,7 +5991,7 @@ and stored in memory.") (commit (string-append "saveplace-pdf-view-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00cqk1qvmdw07vmmyxc843m2qgx1n9ivwzp73r27v4jxx1i38vx2")))) + (base32 "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc")))) (build-system emacs-build-system) (home-page "https://github.com/nicolaisingh/saveplace-pdf-view") (synopsis "Save place in pdf-view buffers for Emacs") @@ -5980,10 +6028,11 @@ inspired by the Deep Purple.") (define-public emacs-pdfgrep ;; XXX: Upstream does not tag releases. The commit below matches latest ;; version bump. - (let ((commit "e250376d97fc5240e07d81108bbca9b5a9ab50f4")) + (let ((commit "a4ca0a1e6521de93f28bb6736a5344b4974d144c") + (revision "1")) (package (name "emacs-pdfgrep") - (version "1.4") + (version (git-version "1.4" revision commit)) (source (origin (method git-fetch) @@ -5992,7 +6041,7 @@ inspired by the Deep Purple.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk")))) + (base32 "093sm3ywa338lhhz2ib3ylcgklsbxcsqck2qsaq26i2qxr0r7lq2")))) (build-system emacs-build-system) (arguments (list #:phases @@ -6329,7 +6378,7 @@ kmonad's configuration files (@file{.kbd}).") (define-public emacs-keycast (package (name "emacs-keycast") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) @@ -6338,7 +6387,7 @@ kmonad's configuration files (@file{.kbd}).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml")))) + (base32 "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -6398,7 +6447,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.5") + (version "2.0.6") (source (origin (method git-fetch) @@ -6407,7 +6456,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 "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1")))) + (base32 "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1")))) (build-system emacs-build-system) (home-page "https://github.com/rnkn/olivetti") (synopsis "Emacs minor mode for a nice writing environment") @@ -6964,7 +7013,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (define-public emacs-apheleia (package (name "emacs-apheleia") - (version "4.1") + (version "4.2") (source (origin (method git-fetch) @@ -6973,7 +7022,7 @@ This mode supports Apache HTTP Server 2.4 and major modules.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb")))) + (base32 "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/apheleia") (synopsis "Reformat buffer stably") @@ -7625,7 +7674,7 @@ Lisp.") (define-public emacs-paren-face (package (name "emacs-paren-face") - (version "1.1.1") + (version "1.1.2") (source (origin (method git-fetch) @@ -7634,7 +7683,7 @@ Lisp.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v")))) + (base32 "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -11213,7 +11262,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.9") + (version "1.10") (source (origin (method git-fetch) @@ -11223,7 +11272,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8")))) + (base32 "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm")))) (build-system emacs-build-system) (arguments (list @@ -11419,7 +11468,7 @@ Cucumber tool) user stories. Also known by the name @code{cucumber.el}.") (define-public emacs-org-appear (package (name "emacs-org-appear") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -11428,7 +11477,7 @@ Cucumber tool) user stories. Also known by the name @code{cucumber.el}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6")))) + (base32 "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4")))) (build-system emacs-build-system) (home-page "https://github.com/awth13/org-appear") (synopsis "Make invisible parts of Org fragments appear visible") @@ -11515,7 +11564,7 @@ cards created in Org mode.") (define-public emacs-org-mime (package (name "emacs-org-mime") - (version "0.3.2") + (version "0.3.3") (source (origin (method git-fetch) @@ -11524,7 +11573,7 @@ cards created in Org mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1w5z9irzk918mj75z5m0j2h8mms8v27x50kp7r3b01wblf0jd2zc")))) + (base32 "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp")))) (build-system emacs-build-system) (home-page "https://github.com/org-mime/org-mime") (synopsis "Send HTML email using Org mode HTML export") @@ -12364,7 +12413,7 @@ include installing, removing or visiting the homepage.") (define-public emacs-prescient (package (name "emacs-prescient") - (version "6.3") + (version "6.3.1") (source (origin (method git-fetch) @@ -12373,7 +12422,7 @@ include installing, removing or visiting the homepage.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4")))) + (base32 "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j")))) (build-system emacs-build-system) (propagated-inputs (list emacs-company emacs-corfu emacs-ivy emacs-selectrum emacs-vertico)) @@ -12447,7 +12496,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "1.7") + (version "1.8") (source (origin (method git-fetch) @@ -12455,7 +12504,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "1xvxqv21b0d1c129dc72iajrbyyfibcv8gmv643h388p5wb69msv")) + (base32 "06jckxwagpvp4w8hykc0wr90pba9ih8376562g1q93g0nbb3rhrg")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -12756,7 +12805,7 @@ expansion and overwriting the marked region with a new snippet completion.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) @@ -12765,7 +12814,7 @@ expansion and overwriting the marked region with a new snippet completion.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0")))) + (base32 "1y79fhki7wbfaw24n5n5w80yvchj1ncz74yvfbgf7sna2ngz4yih")))) (build-system emacs-build-system) (arguments (list @@ -12915,7 +12964,7 @@ between symbols.") (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "3.8.0") + (version "3.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -12924,7 +12973,7 @@ between symbols.") (file-name (git-file-name name version)) (sha256 (base32 - "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0")))) + "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -13056,7 +13105,7 @@ perspective only its buffers are available by default.") (define-public emacs-persp-mode (package (name "emacs-persp-mode") - (version "2.9.8") + (version "3.0.8") (source (origin (method git-fetch) @@ -13066,7 +13115,7 @@ perspective only its buffers are available by default.") (file-name (git-file-name name version)) (sha256 (base32 - "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g")))) + "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr")))) (build-system emacs-build-system) (home-page "https://github.com/Bad-ptr/persp-mode.el") (synopsis "Switch between named \"perspectives\" shared among frames") @@ -13307,6 +13356,27 @@ backends. It supports url.el which is shipped with Emacs and the curl command line program.") (license license:gpl3+)))) +(define-public emacs-ruby-electric + (package + (name "emacs-ruby-electric") + (version "2.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruby/elisp-ruby-electric") + (commit (string-append "v" version)))) + (sha256 + (base32 "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7")))) + (build-system emacs-build-system) + (home-page "https://github.com/ruby/elisp-ruby-electric") + (synopsis "Minor mode for electrically editing Ruby code") + (description + "Ruby Electric mode accelerates code writing in Ruby by making some keys +electric and automatically supplying with closing parentheses and @code{end} +as appropriate.") + (license license:ruby))) + (define-public emacs-rudel (package (name "emacs-rudel") @@ -14750,6 +14820,28 @@ provides the following features: @end itemize") (license license:gpl3+))) +(define-public emacs-tinysegmenter + (let ((commit "872134704bd25c13a4c59552433da4c6881b5230")) + (package + (name "emacs-tinysegmenter") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/myuhe/tinysegmenter.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j")))) + (build-system emacs-build-system) + (home-page "https://github.com/myuhe/tinysegmenter.el") + (synopsis "Compact Japanese tokenizer in Emacs Lisp") + (description + "This package provides functions for tokenizing Japanese text in +Emacs buffers.") + (license license:bsd-3)))) + (define-public emacs-markdown-mode (package (name "emacs-markdown-mode") @@ -14902,7 +14994,7 @@ and tooling.") (define-public emacs-elfeed (package (name "emacs-elfeed") - (version "3.4.1") + (version "3.4.2") (source (origin (method git-fetch) @@ -14911,7 +15003,7 @@ and tooling.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1")))) + (base32 "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z")))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -16683,7 +16775,7 @@ Lua programming language}.") (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.72") + (version "1.73") (source (origin (method url-fetch) @@ -16692,7 +16784,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "1xzkb2i5azws6wrvbsxh5jpd2lvh0h1kxsm7dyzcf01a6w3qxks8")))) + (base32 "02ggdah56dfs6qc4zpcwqs30mgymg7wif5sd0d1yhbxl97ricx7g")))) (build-system emacs-build-system) (arguments (list @@ -17371,7 +17463,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.7.8") + (version "9.7.10") (source (origin (method git-fetch) @@ -17380,7 +17472,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pkw47rkvyl3s2pisprh1l26c70n3n5b8vxw25mzkrz2nr94qn44")))) + (base32 "0wa9ah2mj6692zyycyhk3nks0q0qmwbz5765sr0a0cr7fbg2cgvq")))) (build-system emacs-build-system) (arguments (list @@ -17994,7 +18086,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "3.0.7") + (version "3.0.8") (source (origin (method git-fetch) @@ -18003,7 +18095,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dq0djv5baz6pab6vf5p52yywxz91smpb9fqlx1hyzl3cvgs8aml")))) + (base32 "1lmnb20pw7fh6mpw5jg11m8z550w0xci63pi92mfgwn0p10wn7h9")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") @@ -18019,14 +18111,14 @@ such files while providing facilities to link between them.") (define-public emacs-denote-menu (package (name "emacs-denote-menu") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "denote-menu-" version ".tar")) (sha256 - (base32 "1zm68bz6hya360g5zvs4r5naznykamgzqxhvfhpfyxb70hsnmx5w")))) + (base32 "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02")))) (build-system emacs-build-system) (propagated-inputs (list emacs-denote)) (home-page "https://www.scss.tcd.ie/~sulimanm/posts/denote-menu.html") @@ -18186,21 +18278,20 @@ are common in Chromium-derived projects.") (define-public emacs-gnosis (package (name "emacs-gnosis") - (version "0.3.2") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference (url "https://git.thanosapollo.org/gnosis") (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "03ydknrzl5xcmn5n2ybyxqmjfrqrpk0h0p6cp9xnpmra6r87xqkd")) - (file-name (git-file-name name version)))) + (base32 "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat emacs-emacsql)) (home-page "https://thanosapollo.org/projects/gnosis") - (synopsis "Spaced repetition system for GNU Emacs") + (synopsis "Spaced repetition system for GNU Emacs.") (description "Gnosis is a spaced repetition system for note-taking and self-testing where notes are formatted as Question/Answer/Explanation. Notes are reviewed @@ -18523,7 +18614,7 @@ been adapted to also work with mu4e.") (define-public emacs-tempel (package (name "emacs-tempel") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -18532,7 +18623,7 @@ been adapted to also work with mu4e.") (file-name (git-file-name name version)) (sha256 (base32 - "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5")))) + "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -19133,7 +19224,7 @@ actually changing the buffer's text.") (define-public emacs-diff-hl (package (name "emacs-diff-hl") - (version "1.9.2") + (version "1.10.0") (source (origin (method git-fetch) @@ -19142,7 +19233,7 @@ actually changing the buffer's text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s")))) + (base32 "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw")))) (build-system emacs-build-system) (home-page "https://github.com/dgutov/diff-hl") (synopsis "Highlight uncommitted changes using VC") @@ -20111,7 +20202,7 @@ It should enable you to implement low-level X11 applications.") ((not (featurep 'exwm)) (require 'exwm) (require 'exwm-config) - (exwm-config-default) + (exwm-config-example) (message (concat "exwm configuration not found. " "Falling back to default configuration..."))))))) (chmod exwm-executable #o555))))))) @@ -21341,7 +21432,7 @@ multiplexer.") (define-public emacs-plz (package (name "emacs-plz") - (version "0.9") + (version "0.9.1") (source (origin (method git-fetch) @@ -21350,7 +21441,7 @@ multiplexer.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1f3lsjhhp8v4whfy132zy479v2bhpy6ca1yaj4lx4jkm08sj0pcq")))) + (base32 "1xigrw84wbkr8ny6apfq1a8rws198my4ycr3grdwk5mvdx75h5qr")))) (build-system emacs-build-system) (inputs (list curl)) (arguments @@ -21889,7 +21980,7 @@ an elisp expression.") (define-public emacs-taxy (package (name "emacs-taxy") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) @@ -21897,7 +21988,7 @@ an elisp expression.") "https://elpa.gnu.org/packages/taxy-" version ".tar")) (sha256 (base32 - "05czw8fkifb25rwl99dmncr1g0rjfx1bqijl7igqs9j6h9ia2xvg")))) + "1nmlx2rvlgzvmz1h3s5yn3qnad12pn2a83gjzxf3ln79p8rv1mj6")))) (build-system emacs-build-system) (propagated-inputs (list emacs-magit)) @@ -21912,7 +22003,7 @@ groups.") (define-public emacs-taxy-magit-section (package (name "emacs-taxy-magit-section") - (version "0.13") + (version "0.14") (source (origin (method url-fetch) (uri (string-append @@ -21920,7 +22011,7 @@ groups.") ".tar")) (sha256 (base32 - "1712hbcna0ph9chaq28a6fanv4sccdiphd5z0hg34ig3g6pslgn9")))) + "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi")))) (build-system emacs-build-system) (propagated-inputs (list emacs-magit emacs-taxy)) (home-page "https://github.com/alphapapa/taxy.el") @@ -22303,14 +22394,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.25") + (version "1.27") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "csv-mode-" version ".tar")) (sha256 - (base32 "15yhhn742fqq7699i6jsimg3gpifrhhybiav1qwwzq4prmk9g984")))) + (base32 "0jxf4id5c9696nh666x0xbzqx3vskyv810km61y9nkg7sp4ln2qf")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") @@ -22400,7 +22491,7 @@ literate programming tools for exporting, weaving and tangling.") (define-public emacs-polymode-ansible (package (name "emacs-polymode-ansible") - (version "0.4.1") + (version "0.5.1") (source (origin (method git-fetch) @@ -22409,13 +22500,31 @@ literate programming tools for exporting, weaving and tangling.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8")))) + (base32 "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972")))) (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./lisp" ".*\\.el$"))) + (for-each (lambda (f) (copy-file f (basename f))) + el-files)))) + ;; Autoloads file include a reference to "systemd-autoload-regexp". + ;; Require `systemd' to load its definition and let + ;; `validate-compiled-autoloads' phase run peacefully. + (add-after 'make-autoloads 'require-systemd-mode + (lambda _ + (substitute* "polymode-ansible-autoloads.el" + ((";;; Code:" lead) + (string-append lead "\n(require 'systemd)")))))))) (propagated-inputs (list emacs-ansible emacs-ansible-doc emacs-jinja2-mode emacs-polymode + emacs-systemd-mode emacs-yaml-mode)) (properties '((upstream-name . "poly-ansible"))) (home-page "https://gitlab.com/mavit/poly-ansible/") @@ -23422,7 +23531,7 @@ match and total match information in the mode-line in various search modes.") (define-public emacs-pg (package (name "emacs-pg") - (version "0.36") + (version "0.39") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/emarsden/pg-el") @@ -23430,7 +23539,7 @@ match and total match information in the mode-line in various search modes.") (file-name (git-file-name name version)) (sha256 (base32 - "17ymqf6jf359l3hrl4ayqj8bfskhdh282j230bxqc3ihf5vkzl77")))) + "1b5dg04pd5s5pq71yc3isl312y1fw88pjvnk8bgjc1f06xhjlrj4")))) (build-system emacs-build-system) (propagated-inputs (list emacs-peg)) (home-page "https://github.com/emarsden/pg-el") @@ -23467,76 +23576,74 @@ object has been freed.") (license license:unlicense))) (define-public emacs-emacsql - (let ((commit "efddd69c5e69214dbbe921fbf90f938501414894") - (revision "2")) - (package - (name "emacs-emacsql") - (version (git-version "3.1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/emacsql") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg")))) - (build-system emacs-build-system) - (arguments - (list - #:tests? #true - #:test-command #~(list "emacs" "-Q" "--batch" - "-L" "tests" - "-L" "." - "-l" "tests/emacsql-tests.el" - "-f" "ert-run-tests-batch-and-exit") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-26)) - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'patch-elisp-shell-shebangs - (lambda _ - (substitute* (find-files "." "\\.el") - (("/bin/sh") (which "sh"))))) - (add-after 'patch-elisp-shell-shebangs 'setenv-shell - (lambda _ - (setenv "SHELL" "sh"))) - (add-after 'setenv-shell 'build-emacsql-sqlite - (lambda _ - (invoke "make" "binary" (string-append "CC=" #$(cc-for-target))))) - (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite - ;; This build phase installs emacs-emacsql binary. - (lambda _ - (install-file "sqlite/emacsql-sqlite" - (string-append #$output "/bin")))) - (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el - ;; This build phase removes interactive prompts - ;; and makes sure Emacs look for binaries in the right places. - (lambda _ - (emacs-substitute-variables "emacsql-sqlite.el" - ("emacsql-sqlite-executable" - (string-append #$output "/bin/emacsql-sqlite")) - ;; Make sure Emacs looks for ‘GCC’ binary in the right place. - ("emacsql-sqlite-c-compilers" - `(list ,(which "gcc"))))))))) - (inputs - (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) - (propagated-inputs - (list emacs-finalize emacs-pg emacs-sqlite3-api)) - (home-page "https://github.com/magit/emacsql") - (synopsis "Emacs high-level SQL database front-end") - (description "Any readable Lisp value can be stored as a value in EmacSQL, + (package + (name "emacs-emacsql") + (version "4.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/emacsql") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-L" "tests" + "-L" "." + "-l" "tests/emacsql-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-26)) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'patch-elisp-shell-shebangs + (lambda _ + (substitute* (find-files "." "\\.el") + (("/bin/sh") (which "sh"))))) + (add-after 'patch-elisp-shell-shebangs 'setenv-shell + (lambda _ + (setenv "SHELL" "sh"))) + (add-after 'setenv-shell 'build-emacsql-sqlite + (lambda _ + (invoke "make" "binary" (string-append "CC=" #$(cc-for-target))))) + (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite + ;; This build phase installs emacs-emacsql binary. + (lambda _ + (install-file "sqlite/emacsql-sqlite" + (string-append #$output "/bin")))) + (add-after 'install-emacsql-sqlite 'patch-emacsql-sqlite.el + ;; This build phase removes interactive prompts + ;; and makes sure Emacs look for binaries in the right places. + (lambda _ + (emacs-substitute-variables "emacsql-sqlite.el" + ("emacsql-sqlite-executable" + (string-append #$output "/bin/emacsql-sqlite")) + ;; Make sure Emacs looks for ‘GCC’ binary in the right place. + ("emacsql-sqlite-c-compilers" + `(list ,(which "gcc"))))))))) + (inputs + (list emacs-minimal `(,mariadb "dev") `(,mariadb "lib") postgresql)) + (propagated-inputs + (list emacs-finalize emacs-pg emacs-sqlite3-api)) + (home-page "https://github.com/magit/emacsql") + (synopsis "Emacs high-level SQL database front-end") + (description "Any readable Lisp value can be stored as a value in EmacSQL, including numbers, strings, symbols, lists, vectors, and closures. EmacSQL has no concept of @code{TEXT} values; it's all just Lisp objects. The Lisp object @code{nil} corresponds 1:1 with @code{NULL} in the database.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-closql (package (name "emacs-closql") - (version "1.2.1") + (version "2.0.0") (source (origin (method git-fetch) @@ -23546,10 +23653,10 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.") (file-name (git-file-name name version)) (sha256 (base32 - "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx")))) + "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw")))) (build-system emacs-build-system) (propagated-inputs - (list emacs-emacsql)) + (list emacs-compat emacs-emacsql)) (home-page "https://github.com/emacscollective/closql") (synopsis "Store EIEIO objects using EmacSQL") (description @@ -23583,7 +23690,7 @@ match your personal coding style.") (define-public emacs-epkg (package (name "emacs-epkg") - (version "3.3.3") + (version "4.0.0") (source (origin (method git-fetch) @@ -23592,7 +23699,7 @@ match your personal coding style.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7")))) + (base32 "0w06bpwbwsl3diypywfzrwp6l0kr3h34xja34xssym2bmdl11z8p")))) (build-system emacs-build-system) (arguments `(#:phases @@ -23618,7 +23725,7 @@ match your personal coding style.") (native-inputs (list texinfo)) (propagated-inputs - (list emacs-closql emacs-dash)) + (list emacs-closql emacs-dash emacs-llama)) (home-page "https://emacsmirror.net") (synopsis "Browse the Emacsmirror package database") (description "This package provides access to a local copy of the @@ -25901,7 +26008,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.29.1") + (version "3.32.0") (source (origin (method git-fetch) @@ -25910,7 +26017,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1ql684l6jny3r3c7xa5m3mfgv89j0jpjan6a05gfay6m1pgsg9iy")))) + (base32 "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) @@ -26013,7 +26120,7 @@ regions which @code{hideshow} can hide.") (define-public emacs-know-your-http-well (package (name "emacs-know-your-http-well") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -26022,7 +26129,7 @@ regions which @code{hideshow} can hide.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k")))) + (base32 "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5")))) (arguments `(#:phases (modify-phases %standard-phases @@ -26376,8 +26483,8 @@ browse the phrases by the paper section and fill-in the blanks if required.") (license license:gpl3+)))) (define-public emacs-auto-yasnippet - (let ((commit "624b0d9711222073a2a3f2186e2605eb99fc83c9") - (revision "2")) + (let ((commit "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e") + (revision "3")) (package (name "emacs-auto-yasnippet") (version (git-version "0.3.0" revision commit)) @@ -26389,7 +26496,7 @@ browse the phrases by the paper section and fill-in the blanks if required.") (file-name (git-file-name name version)) (sha256 (base32 - "15g8wi067f345xhpi0c12w0h04p4f4lpccwmdjdfj8hzfl4gyxy9")))) + "0ifzbwnm2axb8kmfp3jvg05wq02j121iwp2m64pi70c7mza0i886")))) (build-system emacs-build-system) (arguments '(#:tests? #t @@ -28667,7 +28774,7 @@ and @code{C++} files through the @code{ccls} language server.") (define-public emacs-cpreproc (package (name "emacs-cpreproc") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -28676,7 +28783,7 @@ and @code{C++} files through the @code{ccls} language server.") (commit version))) (sha256 (base32 - "0n4lhj9bbnkbzvifrj9q6z3j7z6jqzkaa36y239cfxdcc7i86c1c")) + "0y4zialcw46md14az08x75vnl4kg08shnhd8q4lxiqxnpl12da8c")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (home-page "https://sr.ht/~plattfot/cpreproc") @@ -31194,7 +31301,7 @@ recursively. The results are cached for speed.") (define-public emacs-orgit (package (name "emacs-orgit") - (version "1.9.0") + (version "2.0.0") (home-page "https://github.com/magit/orgit") (source (origin (method git-fetch) @@ -31204,7 +31311,7 @@ recursively. The results are cached for speed.") (file-name (git-file-name name version)) (sha256 (base32 - "00fkj88yddan80q8zbx0jy66d958srkm06jiy1nraamxqr15mmyz")))) + "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408")))) (build-system emacs-build-system) (propagated-inputs (list emacs-dash emacs-magit)) @@ -31324,7 +31431,6 @@ constant expressions.") (propagated-inputs (list emacs-aio emacs-dash - emacs-docker-tramp emacs-json-mode emacs-s emacs-tablist)) @@ -31608,7 +31714,7 @@ Debug server.") (define-public emacs-bfuture (package (name "emacs-bfuture") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) @@ -31617,7 +31723,7 @@ Debug server.") (commit (string-append "v" version)))) (sha256 (base32 - "1qflkyr7fafw84mksxs25mka133y8ak8nsga3al29014pshbvzxn")) + "0604xgwrcvqsmk1vky8wdivsl43p6jgs5zchqssdmf22f5chxbzr")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -32043,7 +32149,7 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.7.3") + (version "0.7.4") (source (origin (method git-fetch) (uri (git-reference @@ -32052,7 +32158,7 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "11yygh8h2ggslym3mly9dfgyml9srmcqkx1i9n190idv5a4gkjm7")))) + "0ad0qkcvc9w6ry8f4b6xrdy52vlxm8nrp67k2p97w6prhyfxbp7p")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite @@ -32082,7 +32188,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (define-public emacs-forge (package (name "emacs-forge") - (version "0.3.2") + (version "0.4.1") (source (origin (method git-fetch) @@ -32091,7 +32197,7 @@ commands (a prefix and a suffix) we prefer to call it just a \"transient\".") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0p1jlq169hpalhzmjm3h4q3x5xr9kdmz0qig8jwfvisyqay5vbih")))) + (base32 "1kn3n1a6gdsd0l2v831sh43cly4p8s1snn494gdd23cw4jkk3qsv")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no tests @@ -33309,7 +33415,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-calc (package (name "emacs-casual-calc") - (version "1.10.0") + (version "1.11.2") (source (origin (method git-fetch) @@ -33318,7 +33424,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw")))) + (base32 "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa")))) (build-system emacs-build-system) (arguments (list @@ -33336,7 +33442,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-dired (package (name "emacs-casual-dired") - (version "1.7.0") + (version "1.8.0") (source (origin (method git-fetch) @@ -33345,7 +33451,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lilb3gi8mmiiwdwr3xsy9pvm3nh5crzsvbh45dsk72wwgzjp94i")))) + (base32 "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c")))) (build-system emacs-build-system) (arguments (list @@ -33363,7 +33469,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-info (package (name "emacs-casual-info") - (version "1.3.0") + (version "1.3.1") (source (origin (method git-fetch) @@ -33372,7 +33478,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a74njjp7vqvl4jnmrzqjpgpvgy66p11a47hx51mydyxayp4nwmr")))) + (base32 "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz")))) (build-system emacs-build-system) (arguments (list @@ -33390,7 +33496,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-casual-lib (package (name "emacs-casual-lib") - (version "1.1.1") + (version "1.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -33399,7 +33505,7 @@ all of your projects, then override or add variables on a per-project basis.") (file-name (git-file-name name version)) (sha256 (base32 - "02pxnhp5idn6ypk5s5nl0df1s2pgmyy7g5p3hiyb52m972y1if35")))) + "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3")))) (build-system emacs-build-system) (arguments (list #:tests? #t @@ -33717,14 +33823,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.7.1") + (version "2.7.1.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8")))) + (base32 "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8")))) (build-system emacs-build-system) (arguments (list @@ -34754,7 +34860,7 @@ time.") (define-public emacs-mastodon (package (name "emacs-mastodon") - (version "1.0.24") + (version "1.0.25") (source (origin (method git-fetch) @@ -34763,7 +34869,7 @@ time.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8")))) + (base32 "02ykj4hyddd5p0idl8gvgl9q770vni69xsza99y3rpyilc2a8r66")))) (build-system emacs-build-system) (arguments (list @@ -35024,12 +35130,18 @@ count matches, etc.") (base32 "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq")))) (build-system emacs-build-system) - (arguments '(#:include '("\\.el$" "\\.txt$"))) + (arguments + (list #:include #~(cons* "\\.txt$" %default-include) + #:tests? #true + #:test-command #~(list "emacs" "-Q" "--batch" + "-L" "." + "-l" "test/systemd-tests.el" + "-f" "ert-run-tests-batch-and-exit"))) (home-page "https://github.com/holomorph/systemd-mode") - (synopsis - "Major mode for editing systemd units") + (synopsis "Major mode for editing Systemd units") (description - "Major mode for editing systemd units in GNU Emacs.") + "This package provides a major mode for editing Systemd unit files in GNU +Emacs.") (license license:gpl3+))) (define-public emacs-ssh-config-mode @@ -35088,6 +35200,28 @@ It can also be useful on Unix-like platforms to delay having to enter your passphrase until the first time you push to a remote.") (license license:gpl3+))) +(define-public emacs-ssh-deploy + (package + (name "emacs-ssh-deploy") + (version "3.1.16") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/ssh-deploy-" version + ".tar")) + (sha256 + (base32 "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p")))) + (build-system emacs-build-system) + (home-page "https://github.com/cjohansson/emacs-ssh-deploy") + (synopsis "Deployment via Tramp, global or per directory") + (description + "SSH Deploy enables automatic deploys on explicit-save actions, manual +uploads, renaming, deleting, downloads, file and directory differences, +launching remote terminals (Eshell, Shell), detection of remote changes, +remote directory browsing, remote SQL database sessions and running custom +deployment scripts via Tramp.") + (license license:gpl3+))) + (define-public emacs-super-save (package (name "emacs-super-save") @@ -36786,6 +36920,33 @@ Wordnet.") @code{xref} results.") (license license:gpl3+))) +(define-public emacs-helm-css-scss + (let ((commit "2169d83d8fdc661241df208cb3235112735d936e") + (revision "0")) + (package + (name "emacs-helm-css-scss") + (version (git-version "1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/helm-css-scss") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jjjw7fw2ngrpgvd599vjd291zr8zr1m7xnxfq2dpqc3mf0s397z")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-helm)) + (home-page "https://github.com/emacsorphanage/helm-css-scss") + (synopsis + "Helm interface for navigating CSS, SCSS, and LESS selectors in Emacs") + (description + "This package provides Helm integration for quickly navigating and + searching CSS, SCSS, and LESS selectors in Emacs. It enables you to view and + jump to selectors across multiple buffers, enhancing your workflow when + editing stylesheets.") + (license license:gpl3+)))) + (define-public emacs-metal-mercury-mode (let ((commit "99e2d8fb7177cae3bfa2dec2910fc28216d5f5a8") (revision "1") @@ -37040,7 +37201,7 @@ launching other commands/applications from within Emacs, similar to the (define-public emacs-no-littering (package (name "emacs-no-littering") - (version "1.7.0") + (version "1.7.1") (source (origin (method git-fetch) @@ -37049,7 +37210,7 @@ launching other commands/applications from within Emacs, similar to the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4")))) + (base32 "1ldsyzdnc79byg07j2fckh6m48iq8ffp19y6chhhi2dci35zard7")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -37638,8 +37799,8 @@ go directly to where they belong.") (license license:gpl3+)))) (define-public emacs-org-roam - (let ((commit "74422df546a515bc984c2f3d3a681c09d6f43916") - (revision "0")) + (let ((commit "0b9fcbc97b65b349826e63bad89ca121a08fd2be") + (revision "1")) (package (name "emacs-org-roam") (version (git-version "2.2.2" revision commit)) @@ -37651,7 +37812,7 @@ go directly to where they belong.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0vhl69y6yk2zzfixjdwr8vxl2k921h0syshk5123r1nm9jp3i1s9")))) + (base32 "04vqwrsb71jdb66fkahmxwvx8cssgqamrradbdgp3ygf8alwc7ml")))) (build-system emacs-build-system) (arguments (list @@ -37821,6 +37982,28 @@ ASCII UML sequence diagrams in Emacs, which can be embedded in source code, comments or emails.") (license license:gpl3+)))) +(define-public emacs-sv-kalender-namnsdagar + (let ((commit "31ef6ac82e448de3db1cf0c37df54581eb9b00f6")) ;versiom bump + (package + (name "emacs-sv-kalender-namnsdagar") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matsl/sv-kalender-namnsdagar") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sv5p2f0i4zhfrh8pv39p5aaa9wnbzxkb58p9qslw7qli1wax2l0")))) + (build-system emacs-build-system) + (home-page "https://github.com/matsl/sv-kalender-namnsdagar") + (synopsis "Swedish name day calendar") + (description + "This package provides the current day's name from the Swedish name +day calendar. It is integrated with the Emacs calendar and diary.") + (license license:gpl3+)))) + (define-public emacs-ukrainian-holidays ;; There is no proper release. ;; The base version is extracted from the source code. @@ -38320,7 +38503,7 @@ displayed for sharing.") (define-public emacs-orglink (package (name "emacs-orglink") - (version "1.2.3") + (version "1.2.4") (source (origin (method git-fetch) @@ -38329,7 +38512,7 @@ displayed for sharing.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j")))) + (base32 "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -39052,7 +39235,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "1.8") + (version "1.9") (source (origin (method git-fetch) @@ -39061,7 +39244,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr")))) + (base32 "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p")))) (build-system emacs-build-system) (arguments (list @@ -39758,7 +39941,7 @@ Fennel code within Emacs.") (define-public emacs-org-modern (package (name "emacs-org-modern") - (version "1.3") + (version "1.5") (source (origin (method git-fetch) @@ -39766,7 +39949,7 @@ Fennel code within Emacs.") (url "https://github.com/minad/org-modern") (commit version))) (sha256 - (base32 "0bk8mz3va5vwkkvgvq761bnm9id8sb70rnf3ydq62ap27k0ab967")) + (base32 "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -39906,7 +40089,7 @@ hacker.") (define-public emacs-osm (package (name "emacs-osm") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) (uri (git-reference @@ -39915,7 +40098,7 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx")))) + "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8")))) (build-system emacs-build-system) (arguments (list #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d5d72a0c85..8108b8f6d1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -33,13 +33,14 @@ ;;; Copyright © 2022 Malte Frank Gerdes <malte.f.gerdes@gmail.com> ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com> ;;; Copyright © 2022 Greg Hogan <code@greghogan.com> -;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2022, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; 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> ;;; Copyright © 2024 Juliana Sims <juli@incana.org> +;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,6 +163,7 @@ #:use-module (gnu packages text-editors) #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages toolkits) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -1926,6 +1928,64 @@ like relocation symbols. It is able to deal with malformed binaries, making it suitable for security research and analysis.") (license license:lgpl3))) +(define-public zycore + (package + (name "zycore") + (version "1.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zyantific/zycore-c") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s962pkqybh1xbs75y4jb4bqc9qnq0sviqd570mirqdhhq87agib")))) + (build-system cmake-build-system) + (native-inputs (list googletest)) + (arguments (list #:configure-flags + #~(list "-DZYCORE_BUILD_SHARED_LIB=ON" + #$(if (%current-target-system) + "-DZYCORE_BUILD_TESTS=OFF" + "-DZYCORE_BUILD_TESTS=ON")))) + (home-page "https://github.com/zyantific/zycore-c") + (synopsis "Internal library for Zydis") + (description + "This package provides platfrom-independent types, macros +and a fallback for environments without libc for Zydis.") + (license license:expat))) + +(define-public zydis + (package + (name "zydis") + (version "4.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zyantific/zydis") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15iw6wcg2van8pw54xs15zk5cniqm8d8vbd1w1br9azv8jxsqjva")))) + (build-system cmake-build-system) + (arguments (list #:configure-flags + #~(list "-DZYAN_SYSTEM_ZYCORE=ON" + "-DZYDIS_BUILD_SHARED_LIB=ON" + "-DZYDIS_BUILD_MAN=ON"))) + (native-inputs (list python-minimal ronn-ng)) + (inputs (list zycore)) + (home-page "https://zydis.re") + (synopsis "Disassembler and code generation library for x86 and AMD64") + (description + "Zydis is a decoder and disassembler library with the following features: +@itemize +@item Support for all x86 and AMD64 instructions and extensions +@item Optimization for high performance +@item No dynamic memory allocation +@item Thread-safe by design +@item Smaller file-size overhead compared to other common disassembler libraries +@end itemize") + (license license:expat))) + (define-public asco (package (name "asco") @@ -3612,7 +3672,7 @@ perform various useful functions such as: (define-public libigl (package (name "libigl") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) @@ -3622,90 +3682,162 @@ perform various useful functions such as: (file-name (git-file-name name version)) (sha256 (base32 - "004a22ifq2vibgkgvrlyihqimpsfizvq5l448204kwfg3lkycajj")))) + "0qlnpp8nxbahcky4d67dzn0ynbv3v037nbx1akq6h5rzhvkzq40x")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DLIBIGL_USE_STATIC_LIBRARY=OFF" - "-DLIBIGL_BUILD_TESTS=ON" - "-DLIBIGL_BUILD_TUTORIALS=OFF" - "-DLIBIGL_EXPORT_TARGETS=ON" - ;; The following options disable tests for the corresponding libraries. - ;; The options do not affect whether the libraries are linked to - ;; libigl or not, they are used for tests. - "-DLIBIGL_WITH_COMISO=OFF" - "-DLIBIGL_WITH_CORK=OFF" - "-DLIBIGL_WITH_MATLAB=OFF" - "-DLIBIGL_WITH_MOSEK=OFF" - "-DLIBIGL_WITH_TRIANGLE=OFF" ;; Undefined reference to "triangulate". - "-DLIBIGL_WITH_OPENGL_GLFW_IMGUI=OFF") + (list #:configure-flags + #~(list "-DLIBIGL_USE_STATIC_LIBRARY=OFF" + "-DLIBIGL_BUILD_TESTS=ON" + "-DLIBIGL_BUILD_TUTORIALS=OFF" + "-DLIBIGL_INSTALL=ON" + "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" + (format #f "-DCatch2_DIR=~a/lib/cmake/catch2/" + #$(this-package-input "catch2")) + (format #f "-DSpectra_DIR=~a/share/pectra/cmake/" + #$(this-package-input "spectra")) + ;; The following options disable tests for the corresponding + ;; libraries. The options do not affect whether the libraries are + ;; linked to libigl or not, they are used for tests. + "-DLIBIGL_WITH_COMISO=OFF" + "-DLIBIGL_WITH_CORK=OFF" + "-DLIBIGL_MATLAB=OFF" + "-DLIBIGL_MOSEK=OFF" + ;; XXX: GLFW tests are failing with SEGFAULT. See + ;; <https://github.com/libigl/libigl/issues/2313> + "-DLIBIGL_GLFW_TESTS=OFF") + #:build-type "Release" #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'unpack-external (lambda _ (setenv "HOME" (getcwd)) ;; cmake needs this to export modules (mkdir "external") - (copy-recursively (assoc-ref %build-inputs "libigl-glad") "external/glad") - (copy-recursively (assoc-ref %build-inputs "libigl-stb") "external/stb") - (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") "external/tetgen") - (copy-recursively (assoc-ref %build-inputs "libigl-predicates") "external/predicates"))) + (copy-recursively (assoc-ref %build-inputs "libigl-glad") + "external/glad") + (copy-recursively (assoc-ref %build-inputs "libigl-test-data") + "external/test-data") + (copy-recursively (assoc-ref %build-inputs "libigl-comiso") + "external/comiso") + (copy-recursively (assoc-ref %build-inputs "libigl-tetgen") + "external/tetgen") + (copy-recursively (assoc-ref %build-inputs "libigl-predicates") + "external/predicates") + (copy-recursively (assoc-ref %build-inputs "imguizmo") + "external/imguizmo") + (copy-recursively (assoc-ref %build-inputs "eigen") + "external/eigen"))) (add-after 'unpack-external 'patch-cmake - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + (define (source-dir library-name) + (format #f "SOURCE_DIR \"~a\"" + (assoc-ref %build-inputs library-name))) + (define (fix-external-library cmake source) + (substitute* (format #f "cmake/recipes/external/~a.cmake" + cmake) + (("GIT_REPOSITORY.*") (source-dir source)) + (("GIT_TAG.*") ""))) ;; Fix references to external libraries - (substitute* "cmake/libigl.cmake" - (("if\\(NOT TARGET Eigen3::Eigen\\)" all) - (string-append "find_package(Eigen3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET CGAL::CGAL\\)" all) - (string-append "find_package(CGAL CONFIG COMPONENTS Core)\n" all)) - (("if\\(NOT TARGET tinyxml2\\)" all) - (string-append "find_package(tinyxml2 CONFIG REQUIRED)\n" - "if (NOT TARGET tinyxml2::tinyxml2)")) - (("if\\(NOT TARGET embree\\)" all) - (string-append "find_package(embree 3 CONFIG REQUIRED)\n" all)) - (("if\\(NOT TARGET glfw\\)" all) - (string-append "find_package(glfw3 CONFIG REQUIRED)\n" all)) - (("igl_download_glad\\(\\)" all) "") - (("igl_download_stb\\(\\)" all) "") - (("igl_download_tetgen\\(\\)" all) "") - (("igl_download_triangle\\(\\)" all) "") - (("igl_download_predicates\\(\\)" all) "")) - (substitute* "tests/CMakeLists.txt" - (("igl_download_test_data\\(\\)") "") - (("set\\(IGL_TEST_DATA.*") - (format #f "set(IGL_TEST_DATA ~a)\n" - (assoc-ref %build-inputs "libigl-test-data"))) - (("igl_download_catch2\\(\\)") "find_package(Catch2 CONFIG REQUIRED)") - (("list\\(APPEND CMAKE_MODULE_PATH \\$\\{LIBIGL_EXTERNAL\\}/catch2/contrib\\)") - "") - (("add_subdirectory\\(\\$\\{LIBIGL_EXTERNAL\\}/catch2 catch2\\)") "")) - ;; Install otherwise missing headers - (substitute* "cmake/libigl.cmake" - (("install_dir_files\\(copyleft\\)" all) - (string-join (list all - "install_dir_files(copyleft/cgal)" - "install_dir_files(copyleft/opengl)" - "install_dir_files(copyleft/tetgen)" - "install_dir_files(embree)" - "install_dir_files(opengl)" - "install_dir_files(png)" - "install_dir_files(predicates)" - "install_dir_files(xml)") - "\n")))))))) + (fix-external-library "comiso" "libigl-comiso") + (fix-external-library "tetgen" "libigl-tetgen") + (fix-external-library "triangle" "libigl-triangle") + (fix-external-library "predicates" "libigl-predicates") + (fix-external-library "glad" "libigl-glad") + (fix-external-library "libigl_tests_data" "libigl-test-data") + (fix-external-library "stb" "libigl-stb") + (substitute* "cmake/recipes/external/imguizmo.cmake" + (("if\\(TARGET imguizmo::imguizmo\\)") + "if(true)") + (("target_link_libraries.*") + (format #f "include_directories(~a/include/imgui/)" + (assoc-ref inputs "imgui")))) + + (substitute* "cmake/igl/igl_add_test.cmake" + (("include\\(\".*/contrib/Catch.cmake\"\\)") + (format #f + "include(\"~a/lib/cmake/Catch2/Catch.cmake\")" + (assoc-ref inputs "catch2")))) + (substitute* "cmake/recipes/external/cgal.cmake" + (("FetchContent_Populate\\(cgal\\)") + "find_package(CGAL CONFIG COMPONENTS Core)\nreturn()")) + (substitute* "cmake/recipes/external/eigen.cmake" + (("FetchContent_Populate\\(eigen\\)") + "find_package(Eigen3 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/catch2.cmake" + (("message.*") + "find_package(Catch2 CONFIG)\nreturn()")) + (substitute* "cmake/recipes/external/libigl_imgui_fonts.cmake" + (("if\\(TARGET igl::imgui_fonts\\)") + "if(true)")) + (substitute* "cmake/recipes/external/tinyxml2.cmake" + (("FetchContent_Populate\\(tinyxml2\\)") + "find_package(tinyxml2 CONFIG REQUIRED)\nreturn()")) + (substitute* "cmake/recipes/external/embree.cmake" + (("FetchContent_MakeAvailable\\(embree\\)") + (string-join (list "find_package(Embree 3 CONFIG)" + "add_library(embree::embree ALIAS embree)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/glfw.cmake" + (("FetchContent_MakeAvailable\\(glfw\\)") + (string-join + (list "find_package(glfw3 CONFIG REQUIRED)" + "add_library(glfw::glfw ALIAS glfw)" + "return()") + "\n"))) + (substitute* "cmake/recipes/external/imgui.cmake" + (("FetchContent_MakeAvailable\\(imgui\\)") + "return()")))) + + (add-after 'unpack-external 'fix-assertions + (lambda _ + ;; Current Tetgen version has a bug. + (substitute* "include/igl/copyleft/tetgen/tetgenio_to_tetmesh.cpp" + (("assert\\(out.numberofpoints == out.numberofpointmarkers\\);") + ";")) + ;; CGAL has a bug in assertion as well. + (substitute* "include/igl/copyleft/cgal/trim_with_solid.cpp" + (("assert\\(I.size\\(\\) == Vr.rows\\(\\)\\);") + ";")))) + + ;; XXX: Install modules as CMake fails to install them. + (add-after 'install 'install-includes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (include-dir (string-append out "/include/igl/"))) + (for-each (lambda (module) + (copy-recursively (format #f + "../source/include/igl/~a" + module) + (format #f + "~a/~a" + include-dir + module))) + (list "copyleft/cgal" + "copyleft/opengl2" + "copyleft/tetgen" + "embree" + "opengl" + "predicates" + "xml")))))))) + + (native-inputs (list catch2)) ;; XXX: Inputs are currently only used to build tests. ;; We would need to patch the CMake recipe to build a shared library ;; with all of these. (inputs `(("boost" ,boost) - ("catch2" ,catch2) ("cgal" ,cgal) ("eigen" ,eigen) ("embree" ,embree) - ("glfw" ,glfw) + ("glfw" ,glfw-3.4) ("gmp" ,gmp) ("mesa" ,mesa) ("mpfr" ,mpfr) ("tbb" ,tbb) ("tinyxml2" ,tinyxml2) + ("openblas" ,openblas) + ("imgui" ,imgui) + ("spectra" ,spectra) ;; When updating this package, update commit fields below according to ;; the hashes listed in "cmake/LibiglDownloadExternal.cmake". ("libigl-test-data" @@ -3715,15 +3847,20 @@ perform various useful functions such as: (url "https://github.com/libigl/libigl-tests-data") (commit "19cedf96d70702d8b3a83eb27934780c542356fe"))) (file-name (git-file-name "libigl-test-data" version)) - (sha256 (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) + (sha256 + (base32 "1wxglrxw74xw4a4jmmjpm8719f3mnlbxbwygjb4ddfixxxyya4i2")))) ("libigl-glad" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libigl/libigl-glad") - (commit "09b4969c56779f7ddf8e6176ec1873184aec890f"))) - (file-name (git-file-name "libigl-glad" version)) - (sha256 (base32 "0rwrs7513ylp6gxv7crjzflapcg9p7x04nzfvywgl665vl53rawk")))) + ,(let* ((commit "ead2d21fd1d9f566d8f9a9ce99ddf85829258c7a") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-glad") + (commit commit))) + (file-name (git-file-name "libigl-glad" version)) + (sha256 + (base32 "079fd5yrbd713nq7slhhgq79wns85pc564ydlkjl9gf43d3220ay"))))) ("libigl-stb" ,(origin (method git-fetch) @@ -3731,34 +3868,124 @@ perform various useful functions such as: (url "https://github.com/libigl/libigl-stb.git") (commit "cd0fa3fcd90325c83be4d697b00214e029f94ca3"))) (file-name (git-file-name "libigl-stb" version)) - (sha256 (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) + (sha256 + (base32 "0wwlb370z40y63ic3ny6q7lxibhixg2k1pjdkl4ymzv79zld28kj")))) ("libigl-predicates" + ,(let* ((commit "50c2149e7a520d13cd10e9aeff698bd68edd5a4f") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/libigl-predicates.git") + (commit commit))) + (file-name (git-file-name "libigl-predicates" version)) + (sha256 + (base32 "0yiqhzry2qhb1p0v9sldlnpqsn4y8cln8r6y08lafkc9kc4qy8jz"))))) + ;; TODO: Package tetgen separately from <http://www.tetgen.org> + ("libigl-tetgen" + ,(let* ((commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/tetgen.git") + (commit commit))) + (file-name (git-file-name "libigl-tetgen" version)) + (sha256 + (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg"))))) + ("libigl-comiso" + ,(let* ((commit "562efe333edc8e649dc101469614f43378b1eb55") + (revision "0") + (version (git-version "0.0.0" revision commit))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libigl/comiso.git") + (commit commit))) + (file-name (git-file-name "libigl-comiso" version)) + (sha256 + (base32 "048zryh9ydd1dqwzs14vj7r3fd6yyq6n4zl6d1b0yb1iwrqfy6ba"))))) + ("libigl-triangle" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/libigl-predicates.git") - (commit "488242fa2b1f98a9c5bd1441297fb4a99a6a9ae4"))) - (file-name (git-file-name "libigl-predicates" version)) - (sha256 (base32 "13bd98g8lgcq37i3crj66433z09grnb2xjrcqpwqmyn147rp5wyh")))) - ;; TODO: Package tetgen separately from <http://www.tetgen.org> - ("libigl-tetgen" + (url "https://github.com/libigl/triangle.git") + (commit "6bbd92c7ddd6c803c403e005e1132eadb38fbe68"))) + (file-name (git-file-name "libigl-triangle" version)) + (sha256 + (base32 "0d35mfqwdk99xn1lpjzz9w5axq016r6xy5vr00lb4mvb05limxl3")))) + + ;; XXX: This is a source-only library which is currently required only + ;; for libigl. + + ("imguizmo" ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/libigl/tetgen.git") - (commit "4f3bfba3997f20aa1f96cfaff604313a8c2c85b6"))) - (file-name (git-file-name "libigl-tetgen" version)) - (sha256 (base32 "1k724syssw37py7kwmibk3sfwkkgyjyy7qkijnhn6rjm91g8qxsg")))))) + (url "https://github.com/CedricGuillemet/ImGuizmo") + (commit "1.83"))) + (file-name (git-file-name "imguizmo" version)) + (sha256 + (base32 "14ywf96nvxf5c081pwypyzjwx9vyq78glbzinc81558v1sxiy2v0")))))) (home-page "https://libigl.github.io/") (synopsis "Simple C++ geometry processing library") (description "This library provides functionality for shape modelling, visualization, matrix manipulation.") (license (list license:gpl3 license:mpl2.0)))) +(define-public prusa-libbgcode + ;; Use the latest commit since there are no proper releases nor tags, see + ;; <https://github.com/prusa3d/libbgcode/issues/31>. + (let ((commit "8ae75bd0eea622f0e34cae311b3bd065b55eae9b") + (revision "0")) + (package + (name "prusa-libbgcode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prusa3d/libbgcode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fjx2ijz9zqpqs486lcrrrhqvmfzrpb8j6v57l0jiynavwv3kznw")))) + (native-inputs (list catch2)) + (propagated-inputs (list zlib boost heatshrink)) + (build-system cmake-build-system) + (home-page "https://github.com/prusa3d/libbgcode") + (synopsis "Prusa Block and Binary G-code reader/writer/converter") + (description + "Binary G-code is a new standard for encoding and compressing ASCII G-code +files. G-code files are easy to read and interpret, but their downside is that the +data is not saved efficiently, and the file size is often very large. Compression of +the file is problematic because the printers usually run on limited hardware and they +may not have enough memory and/or CPU power to decompress it. + +Block and Binary G-Code is a new G-code file format featuring the following +improvements over the legacy G-code: +@itemize +@item Block structure with distinct blocks for metadata vs. G-code. +@item Faster navigation. +@item Coding and compression for smaller file size. +@item Checksum for data validity. +@item Extensibility through new (custom) blocks. For example, a file signature block +may be welcome by corporate customers. +@end itemize + +The binary G-code format is flexible and the encoding and compression of individual +blocks is variable. @code{libbgcode} library contains the routines to convert ASCII +G-codes to binary and vice versa.") + ;; See + ;; <https://github.com/prusa3d/libbgcode/blob/main/pyproject.toml> + (license license:agpl3+)))) + (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.5.2") + (version "2.7.4") (source (origin (method git-fetch) @@ -3767,13 +3994,11 @@ visualization, matrix manipulation.") (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "02qcrw3fa0d8ldbp73hp14l1qxbp3f4608j4csc07ny00ra42151")) - (patches (search-patches "prusa-slicer-boost-fixes.patch" - "prusa-slicer-fix-tests.patch" - "prusa-slicer-with-cereal-1.3.1.patch")) + (sha256 (base32 "0s1cfvhfilyv0y98asr61c6rwlgyr1hf5v5hg8q9zwmzm2bkcql3")) + (patches (search-patches "prusa-slicer-fix-tests.patch")) (modules '((guix build utils))) (snippet - '(begin + `(begin ;; Prusa slicer bundles a lot of dependencies in src/ directory. ;; Most of them contain prusa-specific modifications (e.g. avrdude), ;; but others do not. Here we replace the latter with Guix packages. @@ -3781,10 +4006,12 @@ visualization, matrix manipulation.") (delete-file-recursively "src/hidapi") (delete-file-recursively "src/eigen") (delete-file-recursively "src/libigl/igl") + (substitute* "CMakeLists.txt" + (("add_library\\(libexpat INTERFACE\\)") + "")) + (substitute* "src/libigl/CMakeLists.txt" + (("target_link_libraries\\(libigl INTERFACE igl::core\\)") "")) (substitute* "src/CMakeLists.txt" - (("add_subdirectory\\(libigl\\)" all) - (string-append - all "\ninclude_directories(libigl INTERFACE libigl::core)")) (("add_subdirectory\\(hidapi\\)") "pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)") (("include_directories\\(hidapi/include\\)") @@ -3797,13 +4024,26 @@ visualization, matrix manipulation.") (("\\bhidapi\\b") "${HIDAPI_LIBRARIES}")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags - '("-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. - "-DSLIC3R_GTK=3" ;; Use GTK+ - ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. - "-DSLIC3R_WX_STABLE=1"))) + (list #:configure-flags + #~(list "-DSLIC3R_FHS=1" ;; Use The Filesystem Hierarchy Standard. + "-DSLIC3R_GTK=3" ;; Use GTK+ + ;; Use wxWidgets 3.0.x.x to prevent GUI crashes when adding support enforcers. + "-DSLIC3R_WX_STABLE=1" + (format #f "-Dlibigl_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/igl/")) + (format #f "-DCatch2_DIR=~a" + (search-input-directory %build-inputs + "lib/cmake/Catch2/"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-include-paths + (lambda _ + (substitute* "tests/libslic3r/test_quadric_edge_collapse.cpp" + (("#include <libigl/igl/qslim.h>") + "#include <igl/qslim.h>"))))))) (native-inputs - (list pkg-config)) + (list pkg-config catch2)) (inputs (list boost cereal @@ -3811,11 +4051,13 @@ visualization, matrix manipulation.") curl dbus eigen + eudev expat glew glib gmp gtk+ + heatshrink hidapi ilmbase libigl @@ -3823,15 +4065,17 @@ visualization, matrix manipulation.") libpng mesa mpfr + nanosvg nlopt opencascade-occt openvdb pango + prusa-libbgcode + ;; XXX: Using Prusa wxWidgets fork as PrusaSlicer segfaults when compiled + ;; with regular wxwidgets. + prusa-wxwidgets + qhull tbb - eudev - ;; prusa-slicer 2.5 segfaults on startup with wxwidgets 3.2 - ;; See https://github.com/prusa3d/PrusaSlicer/issues/8299 - wxwidgets-3.0 zlib)) (home-page "https://www.prusa3d.com/prusaslicer/") (synopsis "G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)") @@ -3845,16 +4089,17 @@ G-code instructions for FFF printers or PNG layers for mSLA 3D printers.") (define-public wireviz (package (name "wireviz") - (version "0.3.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "wireviz" version)) - (sha256 - (base32 - "1dgnlxxlna2m1fh0ybivw0psym0sa5cqsl72mjl79bwfspnif61h")))) + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wireviz" version)) + (sha256 + (base32 "1qbh0pknpymc42k4661b8ghbfk9him75xx57siyrl9is5s6as98f")))) (build-system python-build-system) - (propagated-inputs (list python-graphviz python-pillow python-pyyaml)) - (home-page "https://github.com/formatc1702/WireViz") + (propagated-inputs + (list python-click python-graphviz python-pillow python-pyyaml)) + (home-page "https://github.com/wireviz/WireViz") (synopsis "Easily document cables and wiring harnesses") (description "WireViz is a tool for easily documenting cables, wiring harnesses and diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 7860c43fef..cf9fe93b27 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -149,8 +149,8 @@ "-Dbuild-examples=false" "-Decore-imf-loaders-disabler=scim" "-Dglib=true" - "-Dmount-path=/run/setuid-programs/mount" - "-Dunmount-path=/run/setuid-programs/umount" + "-Dmount-path=/run/privileged/bin/mount" + "-Dunmount-path=/run/privileged/bin/umount" "-Dnetwork-backend=connman" ,,@(if (member (%current-system) (package-transitive-supported-systems luajit)) @@ -338,7 +338,7 @@ Libraries with some extra bells and whistles.") (substitute* '("src/bin/e_sys_main.c" "src/bin/e_util_suid.h") (("PATH=/bin:/usr/bin:/sbin:/usr/sbin") - (string-append "PATH=/run/setuid-programs:" + (string-append "PATH=/run/privileged/bin:" "/run/current-system/profile/bin:" "/run/current-system/profile/sbin"))) (substitute* "src/modules/everything/evry_plug_calc.c" @@ -347,8 +347,8 @@ Libraries with some extra bells and whistles.") (("libddcutil\\.so\\.?" libddcutil) (string-append ddcutil "/lib/" libddcutil))) (substitute* "data/etc/meson.build" - (("/bin/mount") "/run/setuid-programs/mount") - (("/bin/umount") "/run/setuid-programs/umount") + (("/bin/mount") "/run/privileged/bin/mount") + (("/bin/umount") "/run/privileged/bin/umount") (("/usr/bin/eject") "/run/current-system/profile/bin/eject")) (substitute* "src/bin/system/e_system_power.c" (("systemctl") "loginctl")))))))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 446df6c5ac..4cc570cfb4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com> -;;; Copyright © 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018-2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019-2024 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> @@ -2077,29 +2077,25 @@ software Beancount with a focus on features and usability.") (license license:expat))) (define-public emacs-beancount - ;; Note that upstream has not made any release since this project moved - ;; into its own repository (it was originally part of beancount itself) - (let ((commit "687775da63784d153a3c1cfee9801090c6b51842") - (revision "1")) - (package - (name "emacs-beancount") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/beancount/beancount-mode") - (commit commit))) - (sha256 - (base32 - "08383yqqanx29al1hg1r6ndx3gwjg6fj7kl340f1zz9m9cfiyvg3")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (home-page "https://github.com/beancount/beancount-mode") - (synopsis "Emacs mode for Beancount") - (description - "Emacs-beancount is an Emacs mode for the Beancount accounting tool.") - (license license:gpl3+)))) + (package + (name "emacs-beancount") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/beancount/beancount-mode") + (commit version))) + (sha256 + (base32 + "01ivxgv1g0pkr0xi43366pghc3j3mmhk5bshis6kkn04bq04cx7f")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/beancount/beancount-mode") + (synopsis "Emacs mode for Beancount") + (description + "Emacs-beancount is an Emacs mode for the Beancount accounting tool.") + (license license:gpl3+))) (define-public hledger-web (package diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 7908e1a3fc..4348612567 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -88,6 +88,7 @@ #:use-module (gnu packages xml) #:use-module (ice-9 format) #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:export (make-ergodox-firmware make-qmk-firmware)) @@ -1523,7 +1524,9 @@ upstream repository, provide a file-like object directory containing the whole keyboard definition in KEYBOARD-SOURCE-DIRECTORY." (package (name (string-append "qmk-firmware-" - (string-replace-substring keyboard "_" "-") "-" + (regexp-substitute/global #f "[_/]" keyboard + 'pre "-" 'post) + "-" (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. diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 8d9e5ff3d1..c269a32065 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -388,6 +388,30 @@ This package contains both the non-variable as well as the variable versions of the font.") (license license:silofl1.1)))) +(define-public font-atkinson-hyperlegible + (let ((commit "1cb311624b2ddf88e9e37873999d165a8cd28b46") + (revision "0")) + (package + (name "font-atkinson-hyperlegible") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/atkinson-hyperlegible") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qw0pr1dhmqrgmw1acyw8dv8kbm66xa1bq0mrn7yin4q1kk2dpj4")))) + (build-system font-build-system) + (home-page "https://github.com/googlefonts/atkinson-hyperlegible") + (synopsis "Typeface with greater legibility and readability for low vision readers") + (description + "Atkinson Hyperlegible is a freely available typeface built around a grotesque sans-serif core, +intended to be optimally legible for readers who are partially visually impaired, with +all characters maximally distinguishable from one another.") + (license license:silofl1.1)))) + (define-public font-lato (package (name "font-lato") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8e0c5f0cf3..f15c9d82dd 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -3170,14 +3170,14 @@ interfaces.") (define-public xdg-desktop-portal-kde (package (name "xdg-desktop-portal-kde") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1iiwl45gfj04hdzdk159chyj3f09sn92d09ah1zvx1ap0rxzwk42")))) + "1cm7vh179dvb4jrd70ifsgpkrnfk9imzb65cg76g5znmhvyibjiq")))) (build-system qt-build-system) (arguments (list #:tests? #f ;; colorschemetest test fail, because require dbus. diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 9e3ee2031c..ddef080e2a 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -778,14 +778,14 @@ It also includes runtime support libraries for these languages.") (define-public gcc-12 (package (inherit gcc-11) - (version "12.3.0") + (version "12.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-" version "/gcc-" version ".tar.xz")) (sha256 (base32 - "0fwcvbgpmjdfj5drfs8k6bkqsmxmz8pv4cmmjcd451p7k57mv6ll")) + "0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh")) (patches (search-patches "gcc-12-strmov-store-file-names.patch" "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 2100bb4872..8441f3ae65 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -924,7 +925,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.3.9") + (version "3.3.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -932,7 +933,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "023dn97n4h14n5lbjpzjv0y6a2plj254c0w3rr3wraf3z08189jm")))) + "1f5xs4cj1y5wk1jimv1mylk6n6vh7433js28mfd1kf7p2zw3whz8")))) (build-system cmake-build-system) (arguments (list @@ -994,6 +995,21 @@ desktop computers. It provides a simple API for creating windows, contexts and surfaces, receiving input and events.") (license license:zlib))) +(define-public glfw-3.4 + (package + (inherit glfw) + (version "3.4") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/glfw/glfw" + "/releases/download/" version + "/glfw-" version ".zip")) + (sha256 + (base32 + "1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m")))) + (native-inputs (modify-inputs (package-native-inputs glfw) + (prepend pkg-config))))) + (define-public nanovg-for-extempore (let ((version "0.7.1") (revision "0") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 88e647dd65..010bf2f275 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8984,7 +8984,7 @@ library.") "--localstatedir=/var" (string-append "-Ddefault-path=" - (string-join '("/run/setuid-programs" + (string-join '("/run/privileged/bin" "/run/current-system/profile/bin" "/run/current-system/profile/sbin") ":")) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 039b6de71c..85e26deea5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -508,6 +508,7 @@ variable defined below. It requires guile-json to be installed." ("0xndsph4v725q3xcpmxxjb9vxv19sssqnng82m9215cdsv9klgpb" "bf5f6e362f6f" "sco") ("0l70n8817mbmbc09fsnn2aqjj9k9dhad2gmzgphmiilf9mqm2dpf" "1f705c926a99" "si") ("19bqjazazww08chd1qc08dsnr2521088jq5jd4j3185yb1ypm3nr" "c1bd10d70325" "sk") + ("12q1nv6z4bk8yaw3vhl9xs41i7kpx1415mwg635v76fx8h94ycl3" "00eaf8d9e83b" "skr") ("11nmjmy2j249588ahg4mh9lxdqr476jbh28a07qxxibfa76j9vk3" "44be3cbf69b6" "sl") ("1ww35141nixg2s03kfmmq9fk6m3qiz2vg7p5a85shjp7i89pyj1d" "800576ff8ef9" "son") ("1q7nfybwc8mxdwi9fpvfhayq18mykzygkpakr5ngfz2316k8lf5r" "4de8638ac27f" "sq") @@ -1159,282 +1160,8 @@ testing.") "ru" "sc" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "tg" "th" "tl" "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) -(define all-mozilla-102-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1s59ihmj8x6z0ssq4xav689jb5azrpdnay8csgjm1b9pw7wmvcli" "a6940ae1a02f" "ach") - ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af") - ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an") - ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar") - ("11qqblqfffbmkdr5b6mxzq02i8rj1hjq3iy6xv5i5xxy311b3vpb" "f706d22e6910" "ast") - ("0q2p1a437qr2nshdd4934qkv2sblmykiwzir149c8p9m5sjk0dyw" "f5c2a9800add" "az") - ("0gxxm3lv18kj0922bw0g897azc4nkrszm5irgwdkgmkbyr97li83" "98ba7d51484f" "be") - ("10vrbbaabjns824ndya6c09znm815pak2xpvqgjydl3r5qvacx65" "5c79c77311cd" "bg") - ("1il7yyifx5xzj0v2lna315mppl5pk1vi4m9r66hdz1lzc485m1wp" "c80c87ef7193" "bn") - ("1p1ig4v9pczzrnnxzr20r61g7xk85k5lgnxhzgn1rx518p85xrkm" "6a1bcb9851b2" "br") - ("08q33bk9kdvbyc4ib58bsn2b67ki3d2yzskkf5r2n5zlglblksa2" "939779cb58d6" "bs") - ("1bdkywrqah85fh8kfnz163qnc02ffx0a4vlnx5pq1wg9j4f1gznf" "9a45ccf144f1" "ca") - ("0hhmp5dzc0rssykl0b2n9h0vfy4svwhxmhpsr3rcfpbg2s0r5h6l" "4f60e18fc248" "ca-valencia") - ("18phbl9raqsbys9wa8z0gq0h0pw3b55v6ngn67r4373lfc0s9cxv" "b4ef404c7de8" "cak") - ("0147qyw1y97mgqhkb46wblxv61lq2mvvm5n5ihwf49l5cyizi0jg" "f56ef18f05df" "cs") - ("08sbhnsxndlsaijnxndc367qcbrzb29m7bpkcawinz9fg6mz3573" "4f9d92f04f5e" "cy") - ("09cm5kk1sh2a6ws1fj185jrknhfa6n4bhj7nfnr4lsk339n0kvv9" "902503567e30" "da") - ("0r630bki5d4ylicq6lzh6s2mvsq225933szswmm0sap507rj75cm" "6000baf7a412" "de") - ("0749qjsfv3rn94rnci3ydgndw27qlr3w3w97kfwma2gmsf3m3r0p" "4a948952d1f4" "dsb") - ("0yc64i7mpxhs4qlyyh59i2aiz0vpap0bn8slcsk8b71wd1d7cy5m" "153a16a13733" "el") - ("0d4m5ji6ii10yap8y24cxx3fr60ba1jqi10hy3j1cq6ni7hzavga" "7ce17ae529ac" "en-CA") - ("12jzqcfbgdhfm8f2gqp15bdnin62li07jwicjc8ynn4cl9a19xiz" "a25d9eea7c23" "en-GB") - ("0gbb8hfc5yvjah63mapjxm53wxrf98srbrbg43b9g734zfi4n8y5" "4ed3471dad5d" "eo") - ("19lw7zmqx2irjmv5y6r7nncp6nysn06abf10n3dzj5nzgays6sln" "853fe7acb415" "es-AR") - ("0rq4pa380b77rkv6dq7sqx8a8i33jk3vs5rgcl8fv7slqvsw23kd" "921b67bf27a5" "es-CL") - ("1dyxzab9hln5spch66wmfagfzmfdiaxgpq7qlzvdfg98wkqdj25n" "c9a210ea496c" "es-ES") - ("1gwpmfl37wxl7rynqswgj41liljflgxydvljd4zdhk3jzqn605fb" "ddd35183d81c" "es-MX") - ("0c3blniddklapifnjbz03f2frw24jjgwgwn6swl5mwm2z0y6wa9f" "82d23ffaa7d3" "et") - ("05mq2df6n6fr8m5m2xwl0f6n1q3zgjrnk465ldx1nfr9agrhd36c" "13975626d549" "eu") - ("1l1jyqqiy551903j6yzh9ayg1pf26q2hr9h3jj4l51xzp7x4ms2q" "039e1fdb7c71" "fa") - ("091l05y9sggxznv0y11b9zy5qf146p0hb5faw4ix7yn5p5kca2f5" "7bd3722d82de" "ff") - ("1lllwjvmbl5dx44fcvsqg08fbflkc8dx5as9n6nf4xlkzydx6izm" "39808e88c9d1" "fi") - ("10ha955vvyf5vbciricm72kplj9j0s00g2333lmg46jiwi7aviiv" "426d373db6a7" "fr") - ("11zdfk8jvdy1k9z1q162cwapplcbz35l3dq4mv45brdin3v0x8kr" "96cd93d18389" "fy-NL") - ("1l5xr25gmssyachwmfprlnp2v2xj4b0hp8gxrf7fi5bvv9c2fynb" "de3daf7d3f9d" "ga-IE") - ("06h9ijfsn1cgz5fvxxbisk7fvqhgsw99id92575hgyg1p8xb1n69" "f04aea656d9e" "gd") - ("19913i5n8yyfhz9j21krlk7wqsyy89vggxc1m1swv94y2ix8rpaj" "1b8cdb87bf69" "gl") - ("0k5x31bfl2l0r9b5dkn03frm1gd8n6igai7ch2f1kj0skflynwww" "82df570c4241" "gn") - ("03rygnj9xhfvykark7dls117kwhid13ghvrsqiial0vp8m7ymx79" "e2e41d7beaa5" "gu-IN") - ("0vyraplj1x7b5im15anhzdaq03k2gqfyybgklrd4f9ry6msh5jhx" "de724e943805" "he") - ("1zqps586jrgxpf7xx2l3qw3ch3fr31r9a25y861fpxrpvh7ygw7g" "898598e1a5c6" "hi-IN") - ("0czq68l3qdhdc0mgazlrh8x83a6d5qrjwgjv8xvsmmzi7h68ww0l" "2711d1515af0" "hr") - ("1wwvrnm38gk2rnw4vmcranh8hk61gjcj9292pck3ckiv6mq7kd4s" "03e02f3d0676" "hsb") - ("0yvgdxlbyhhg3lk43hxx9gx66rcm7gaj02zzzx5zni8dhvlk2v6m" "d423ada9dc00" "hu") - ("1kjm7bg4990jhfbxwc38r4lqm2fbcxc82nc2d4qkqwikr4aah4b9" "06836af0bd6e" "hy-AM") - ("1dla7r3snvagb7m985xxqyi7gl498cr5xsz8msw0zpg6xmi05rlx" "299bd950d538" "ia") - ("0w8w9xn93akir7nqcp5iwr3kqvba5gbirg7gmzlzg7mgrhw8pcsa" "dee087477b99" "id") - ("10iakv1c1d20ihxg1s7c3zc1zfw18vr2kspcw7bk5k02rmrffgcn" "320095d063ed" "is") - ("1xn5pa3rc7l6k2migm3c0dx71q1hk7mjls045xpv9cy8gvirnj94" "4722680fb5bf" "it") - ("0va9zfj3wqh1yvbgh3x808yvdyxkg780vazjg887wbxpfk1n6hxa" "cb3cfe294621" "ja") - ("0qvjc3fhk6jg2c3g6mymmnslg1rkkxmv9gi3whf2bc5mzfgyc5zw" "7efe92bd7780" "ja-JP-mac") - ("0zfiwwz0axbd219ar32c7a6b8h816sf04ajx6jl74s5kyij79y82" "4c1fe3a18da9" "ka") - ("1aiik4758r5df76q2a132y5fjdjrsxshjylk7irwsr7yy0c7f63g" "acdf76048aa0" "kab") - ("0icxh4sgv6m1yykycb9d9c43k3r6w02f9c6jr04wm8hvqq5icfl5" "9b418ff7936b" "kk") - ("1cqlhggf46lr7w399k7qb7a1hc56f32w1dy26i2racpppzza5plc" "9771ada0b5f8" "km") - ("0p04irnb7x7y37m6lz388x9dynn8rnk000avpp296barajnhs5i8" "645aa37a2112" "kn") - ("1lbc1fxr5i0ccymlsd8axz3633cqggg5k8ak5yqwi704g7kvv9g2" "1cd68952d119" "ko") - ("11b55bxg73zqfdn5gy9nn5imab2mv0hxr603whggp7vymllgb7kb" "26bb83959bfe" "lij") - ("15jsijm6d26i0105gz0f7sh2yh2v4pmw4j95cwkdrb1d8m935jlz" "b9829891f153" "lt") - ("0liwwv13fgyw97nizhsyy53xrbf8jks5ics7qkkxfccawjrg5rlb" "e5f09d03d959" "lv") - ("0w420yf3hdnl7dp9mn9ghc20cq79k24fn9adn3syk723ppl6mkb0" "7884845e94f3" "mk") - ("13wkr7rgqsv9w3d9w7k8lnxdzgfixsq4bmc27zsyc770l6062ml6" "030db7412202" "mr") - ("06nsadcnxx0ssdp67x47dj9crihn1ycgd5mwvn5m7lkb97r4ch9f" "40a7703e875c" "ms") - ("0mlnjdzck6dp9p59ajj3sr63r36fn0qi8r9scrqrqcisgfclw9sg" "daca40056531" "my") - ("0z1hgx9d5i9w20f9k9azzng1y3lmm5d6hdjkj7rf6r5710bhhzh5" "664bd049e105" "nb-NO") - ("1466qvrs13g2iix1k35cknb2pia9b66li2ncvdyqf0jsd92z9k8x" "eaa6ae781ba0" "ne-NP") - ("0jgmz2lkzj0aspd9mabygzic6li5s2b25y0r6vjg8mv3jm5pi86j" "5ef8f1c9739e" "nl") - ("1m46x0h20vdfbzjxlz0ac43dbaq40xnyldr2yzbf7pk5di9pzxa6" "f08e15466d5d" "nn-NO") - ("0r3zvihqh6iya3z1qm7if0m3zfgf81s9qp7x7qc701h2q357wkgf" "6712c0e12ec2" "oc") - ("102j89jm28c223yhhkrj76xxj4kmy58hcs2r0jn15xa1qkqv1fdk" "8f36cc819e00" "pa-IN") - ("1j9za6s0i46abn8dsrlkpck3qxxw35rhfcg1xs1vp8sc4ckg8qwi" "c3b0c1c02b94" "pl") - ("1k9lbsvckpwl4xax8kxp5yxsfkspq2mhqm77jh5nl9aw88dsn55b" "cc32bf9630fe" "pt-BR") - ("0f0jyvbn2sa5m66wqdzh4607g4gd0270xq37ipd9ls52b4764bd8" "5478d7242086" "pt-PT") - ("19znkkialh1d4np7qcp80xkagrf1j2xah2s1xxzsh854p3d30zs7" "dd934a76fb01" "rm") - ("1xn26r8g8zzkb5myfgmnjbk8k4i0brkvbrvnhp7k5nkrnsin25di" "d57ab3dee73d" "ro") - ("04rhkxlmpp5pyzw85ldbfkmiigqr2p9y5cbns5dqs6sz1633ccxp" "7aea98f33a20" "ru") - ("1zzkkxl7ayxh5gx9snyvp5czflsvi77hp48li613h3c2fii4n9qk" "7c986f4b5044" "sco") - ("1219i0ghhqj3s1i0rm68jjkvivh6y40938wav7z4ifck527sq6r1" "bc9e55d4e3ea" "si") - ("05i5p3n3a6hgl6rf10yjs4vag7y3rn2jwgxsddcdcqiv6405zn81" "8814afd7f67e" "sk") - ("1wcqdbm1py1ldq6cj2g201m715nql79r6szr71jvrxacb711c62a" "20013dc06e96" "sl") - ("0g2izkaa4ipwgwyhy77ciyrxxpf4pxzj9mjqvxriy5prmkhm3zjs" "d86d5d2b6eef" "son") - ("1cc99m6srjg8698dkc3il70crby0mdv43v3ijwy069k4w50hyjjg" "49bb5fae5d9b" "sq") - ("13kfssq4fhq9mb36as6sxiaffl17qyg1wdw8kpz3ilqm86bsjrgl" "d6a0ab79b06f" "sr") - ("1wx9snbm0431q97i0q0nv4wbsqcv9nhllwfr88crlp7bfj5w8czw" "4bab04993da3" "sv-SE") - ("0laglkfl8ml0ip5vmm3z2q790hgwax9gfqwq3wm68a2nnsyck8fw" "4b3316c4aa48" "szl") - ("15pnlic4q7m48y0mc5yh8w5yscjwzx0mmfrbj3f2b9jxxa44nx4h" "48c7aab86db8" "ta") - ("16qar5y0wns75ryi8bfv7yln3mjsyn7qi4345zcniz3ydgkczh46" "7bbb3dac8f47" "te") - ("112g7x8h0qz16r5faam386x4a0rgwd4zy02d5agmg9m0kbficdfx" "009fd0852454" "th") - ("1l80kh9byqxnz5vkz357rb39g4y9sgn9pr0v29ywp6d009img1qg" "dad9caecd7a9" "tl") - ("1nalvjlxxsa9wldhhdb93bgfc7dl084xayh7i7mgg93yjgrym93x" "0c48082d37cd" "tr") - ("0wkxqcfgsra2ljws28kiwajv73w9aa8drsc4fqlg9krbicnjl2n8" "f6d105faedcc" "trs") - ("18jf4ysrfv3635fyxc1vwr970dr2r05bl3h8v599pwp2g7jzyjpm" "e1011388a55e" "uk") - ("1ihmksjsz54yii23qda5iv8cxrj9144afy75hzhvfi6m182kj4h8" "c4e927eab511" "ur") - ("0d42dhfa2vcw24wsvwf95pw20np0pz8c0is6p4307n981n8s207y" "7063df917cb3" "uz") - ("04khnkrg8css55hyna01jqay9c2ppxk5znbx2zj9i25knhvvx1lq" "1753054e6ab8" "vi") - ("0fi5kxn78xp7s15svkqlf4748j4pzxh941nm52n6kbbrhyi3qcqn" "93bc595dc32e" "xh") - ("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN") - ("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW"))) - -(define %icecat-102-base-version "102.15.1") -(define %icecat-102-version (string-append %icecat-102-base-version "-guix0-preview1")) - -;; 'icecat-source' is a "computed" origin that generates an IceCat tarball -;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' -;; script from the upstream IceCat project. -(define icecat-102-source - (let* ((major-version (first (string-split %icecat-102-base-version #\.))) - (minor-version (second (string-split %icecat-102-base-version #\.))) - (sub-version (third (string-split %icecat-102-base-version #\.))) - - (upstream-firefox-version (string-append %icecat-102-base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "04q1fjninm9lw721xgv0c2fknicc24s8iaimkabwcfwmcnvly689")))) - - ;; The upstream-icecat-base-version may be older than the - ;; %icecat-base-version. - (upstream-icecat-base-version "102.15.0") - (gnuzilla-commit "400fbfdbc0c1ac9c68c9f52fd2ab6899bc8e8bd0") - (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "1fqrf94a5vnjq56zyyxlc1zsvbblgmzcks760nj1szpws4y91m8r")))) - - ;; 'search-patch' returns either a valid file name or #f, so wrap it - ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. - (makeicecat-patch - (local-file (assume-valid-file-name - (search-patch "icecat-102-makeicecat.patch"))))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" %icecat-102-version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (let ((firefox-dir - (string-append "firefox-" #$%icecat-102-base-version)) - (icecat-dir - (string-append "icecat-" #$%icecat-102-version))) - - (set-path-environment-variable - "PATH" '("bin") - (list #+python - #+(canonical-package bash) - #+(canonical-package coreutils) - #+(canonical-package findutils) - #+(canonical-package patch) - #+(canonical-package xz) - #+(canonical-package sed) - #+(canonical-package grep) - #+(canonical-package bzip2) - #+(canonical-package gzip) - #+(canonical-package tar))) - - (set-path-environment-variable - "PYTHONPATH" - (list #+(format #f "lib/python~a/site-packages" - (version-major+minor - (package-version python)))) - '#+(cons python-jsonschema - (map second - (package-transitive-propagated-inputs - python-jsonschema)))) - - ;; We copy the gnuzilla source directory because it is - ;; read-only in 'gnuzilla-source', and the makeicecat script - ;; uses "cp -a" to copy parts of it and assumes that the - ;; copies will be writable. - (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" - #:log (%make-void-port "w")) - - (with-directory-excursion "/tmp/gnuzilla" - (make-file-writable "makeicecat") - (invoke "patch" "--force" "--no-backup-if-mismatch" - "-p1" "--input" #+makeicecat-patch) - (patch-shebang "makeicecat") - (substitute* "makeicecat" - (("^readonly FFMAJOR=(.*)" all ffmajor) - (unless (string=? #$major-version - (string-trim-both ffmajor)) - ;; The makeicecat script cannot be expected to work - ;; properly on a different version of Firefox, even if - ;; no errors occur during execution. - (error "makeicecat major version mismatch")) - (string-append "readonly FFMAJOR=" #$major-version "\n")) - (("^readonly FFMINOR=.*") - (string-append "readonly FFMINOR=" #$minor-version "\n")) - (("^readonly FFSUB=.*") - (string-append "readonly FFSUB=" #$sub-version "\n")) - (("^readonly DATADIR=.*") - "readonly DATADIR=/tmp/gnuzilla/data\n") - (("^readonly SOURCEDIR=.*") - (string-append "readonly SOURCEDIR=" icecat-dir "\n")) - (("/bin/sed") - #+(file-append (canonical-package sed) "/bin/sed")))) - - (format #t "Unpacking upstream firefox tarball...~%") - (force-output) - (invoke "tar" "xf" #+upstream-firefox-source) - (rename-file firefox-dir icecat-dir) - - (with-directory-excursion icecat-dir - (format #t "Populating l10n directory...~%") - (force-output) - (mkdir "l10n") - (with-directory-excursion "l10n" - (for-each - (lambda (locale-dir) - (let ((locale - (string-drop (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-locale-"))))) - (format #t " ~a~%" locale) - (force-output) - (copy-recursively locale-dir locale - #:log (%make-void-port "w")) - (for-each make-file-writable (find-files locale)) - (with-directory-excursion locale - (when (file-exists? ".hgtags") - (delete-file ".hgtags")) - (mkdir-p "browser/chrome/browser/preferences") - (call-with-output-file - "browser/chrome/browser/preferences/advanced-scripts.dtd" - (lambda (port) #f))))) - '#+all-mozilla-102-locales) - (copy-recursively #+mozilla-compare-locales - "compare-locales" - #:log (%make-void-port "w")) - (delete-file "compare-locales/.gitignore") - (delete-file "compare-locales/.hgignore") - (delete-file "compare-locales/.hgtags"))) - - (format #t "Running makeicecat script...~%") - (force-output) - (invoke "bash" "/tmp/gnuzilla/makeicecat") - - (format #t "Packing IceCat source tarball...~%") - (force-output) - (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - icecat-dir))))))))) - -(define %icedove-build-id "20230830000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.15.0") +(define %icedove-build-id "20240807000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "115.14.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1442,12 +1169,12 @@ testing.") (origin (method hg-fetch) (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "ac0b189e3bc07ee798d5ed84e99f874bc72204a6"))) + (url "https://hg.mozilla.org/releases/comm-esr115") + (changeset "99f915f469c83ab9f535e41cce590e44f6ccfa46"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "0705grqr906rw3ps32yiw4d5iaiwlql8a1ikhr43k546szypn3wg")))) + "0w6ckv6d95f4ildfbwv343zpgl3j4gnramc0vnjc1l3k72pcbjn2")))) (define (comm-source->locales+changeset source) "Given SOURCE, a checkout of the Thunderbird 'comm' component, return the @@ -1466,26 +1193,18 @@ list of languages supported as well as the currently used changeset." "pt-PT" "rm" "ro" "ru" "sk" "sl" "sq" "sr" "sv-SE" "th" "tr" "uk" "uz" "vi" "zh-CN" "zh-TW")) -;;; To find out which changeset to use for the comm-l10n repo, use the -;;; 'comm-source->locales+changeset' procedure on the thunderbird-comm-source -;;; checkout directory. The complete localization data should be released as -;;; a tarball in the next release (see: -;;; https://bugzilla.mozilla.org/show_bug.cgi?id=1817086). When this tarball -;;; is available, it should replace the complete 'l10n' directory at the root -;;; of the IceCat source, instead of only the 'calendar', chat and mail -;;; directories that it provides. (define thunderbird-comm-l10n - (let* ((changeset "95b46b8428d5") - (version (git-version %icedove-version "0" changeset))) - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.mozilla.org/projects/comm-l10n") - (changeset changeset))) - (file-name (git-file-name "comm-l10n" version)) - (sha256 - (base32 - "0hfsiv9p7s2ik6648gm1774d187vlm1i1c9xwyd8g8ihk2dzyn5i"))))) + (origin + (method url-fetch) + (uri (string-append + "https://ftp.mozilla.org/pub/thunderbird/releases/" + %icedove-version + "/source/thunderbird-" + %icedove-version + ".strings_all.tar.zst")) + (sha256 + (base32 + "0ymnxsdlnh56bjishs1i35yq96qng1apsp5yjgn9cvvmr7mr926b")))) (define icedove-source (let ((name (string-append "icedove-" %icedove-version))) @@ -1503,16 +1222,18 @@ list of languages supported as well as the currently used changeset." (set-path-environment-variable "PATH" '("bin") (list #+(canonical-package tar) - #+(canonical-package xz))) + #+(canonical-package xz) + #+(canonical-package zstd))) ;; Extract the base Icecat tarball, renaming its top-level ;; directory. (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") - "-xf" #$icecat-102-source) + "-xf" #$icecat-source) (chdir #$name) ;; Merge the Thunderdbird localization data. - (copy-recursively #$thunderbird-comm-l10n "l10n") + (invoke "tar" "--extract" "--file" #$thunderbird-comm-l10n + "--directory" "l10n/") ;; Add the Thunderbird-specific "comm" directory.. (mkdir "comm") @@ -1695,11 +1416,18 @@ ca495991b7852b855")) (setenv "CXX" "clang++") (setenv "MOZ_NOSPAM" "1") - (setenv "MACH_USE_SYSTEM_PYTHON" "1") + (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") (setenv "PYTHON" (search-input-file inputs "/bin/python")) + (setenv "GUIX_PYTHONPATH" + (string-append (getcwd) + "/obj-x86_64-pc-linux-gnu/_virtualenvs/build")) + (setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp (setenv "MOZ_APP_NAME" "icedove") + ;; WM_CLASS (default is "$MOZ_APP_NAME-$MOZ_UPDATE_CHANNEL"). + (setenv "MOZ_APP_REMOTINGNAME" "Icedove") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output "/lib/icedove")) (mkdir-p (string-append (getcwd) "/builddir")) @@ -1739,7 +1467,7 @@ ca495991b7852b855")) "ac_add_options --with-system-jpeg\n" "ac_add_options --with-system-libevent\n" "ac_add_options --with-system-nspr\n" - "ac_add_options --with-system-nss\n" + ; UNBUNDLE-ME! "ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" "ac_add_options --without-wasm-sandboxed-libraries\n" "mk_add_options MOZ_MAKE_FLAGS=-j" @@ -1772,6 +1500,7 @@ ca495991b7852b855")) MimeType=x-scheme-handler/mailto;~@ Type=Application~@ Actions=ComposeMessage;~@ + StartupWMClass=Icedove;~@ [Desktop Action ComposeMessage]~@ Name=Write new message~@ Exec=~@*~a/bin/icedove -compose~%" @@ -1819,7 +1548,7 @@ ca495991b7852b855")) gtk+ gtk+-2 hunspell - icu4c + icu4c-73 libcanberra libevent libffi @@ -1835,7 +1564,8 @@ ca495991b7852b855")) libxt mesa mit-krb5 - nss + nspr + ;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later) pango pixman pulseaudio @@ -1847,11 +1577,11 @@ ca495991b7852b855")) zlib)) (native-inputs (list `(,rust "cargo") - clang - llvm + clang-15 + llvm-15 m4 nasm - node + node-lts perl pkg-config python-wrapper @@ -1917,6 +1647,9 @@ their corresponding VERSION, SOURCE and LOCALES variables." (string-append (getcwd) "/mach_state")) (setenv "MOZCONFIG" (string-append (getcwd) "/.mozconfig")) (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") + (setenv "GUIX_PYTHONPATH" + (string-append (getcwd) + "/obj/_virtualenvs/build/lib/python3.10/site-packages")) (setenv "BUILD_BACKENDS" "FasterMake,RecursiveMake"))) (replace 'build ;build and install data files (lambda* (#:key outputs #:allow-other-keys) @@ -2059,7 +1792,7 @@ associated with their name.")) (define-public icedove/wayland (package - (inherit icedove) + (inherit icedove-minimal) (name "icedove-wayland") (build-system trivial-build-system) (arguments @@ -2075,14 +1808,14 @@ associated with their name.")) (format port "#!~a MOZ_ENABLE_WAYLAND=1 exec ~a \"$@\"" #$(file-append bash-minimal "/bin/bash") - #$(file-append icedove "/bin/icedove")))) + #$(file-append icedove-minimal "/bin/icedove")))) (chmod exe #o555) ;; Provide the manual and .desktop file. - (copy-recursively (string-append #$icedove "/share") + (copy-recursively (string-append #$icedove-minimal "/share") (string-append #$output "/share")) (substitute* (string-append #$output "/share/applications/icedove.desktop") - ((#$icedove) #$output)))))) + ((#$icedove-minimal) #$output)))))) (native-inputs '()) (inputs '()))) diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 5fbf2fe41a..28eba7f5d2 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 jgart via Guix-patches via <guix-patches@gnu.org> ;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022, 2023 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2023 Felix Lechner <felix.lechner@lease-up.com> ;;; Copyright © 2023 Filip Lajszczak <filip@lajszczak.dev> ;;; Copyright © 2023 Fries <fries1234@protonmail.com> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> @@ -656,6 +657,55 @@ and stop increasing when a certain threshold is met.") (description "This package provides a CSS parser and inliner.") (license license:expat))) +(define-public go-github-com-containerd-typeurl + (package + (name "go-github-com-containerd-typeurl") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/typeurl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wvfxlxgkln11d9s6rxay965c715bnpk203klbsq8m8qpjqrz620")))) + (build-system go-build-system) + (arguments + (list #:import-path "github.com/containerd/typeurl")) + (propagated-inputs + (list go-github-com-gogo-protobuf + go-github-com-pkg-errors)) + (home-page "https://github.com/containerd/typeurl") + (synopsis "Managing marshaled types to @code{protobuf.Any}") + (description + "This package implements a functionality of managing the registration, +marshaling, and unmarshaling of encoded types. It helps when types are sent +over a ttrpc/GRPC API and marshaled as a protobuf +@url{https://pkg.go.dev/google.golang.org/protobuf@@v1.27.1/types/known/anypb#Any, +Any}.") + (license license:asl2.0))) + +(define-public go-github-com-containerd-typeurl-v2 + (package + (inherit go-github-com-containerd-typeurl) + (name "go-github-com-containerd-typeurl-v2") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/typeurl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n43s8zqwwrvpzb0pczm73xx4w8yb96ax31cripzxmfhj43z21b5")))) + (arguments + (list #:import-path "github.com/containerd/typeurl/v2")) + (propagated-inputs + (list go-github-com-gogo-protobuf + go-google-golang-org-protobuf)))) + (define-public go-github-com-coreos-go-oidc (package (name "go-github-com-coreos-go-oidc") @@ -1008,6 +1058,34 @@ developers to use @code{http} methods explicitly and in a way that's consistent with the HTTP protocol definition.") (license license:expat))) +(define-public go-github-com-evanphx-json-patch + (package + (name "go-github-com-evanphx-json-patch") + (version "0.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/evanphx/json-patch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00sib9ba8j1h1n3r1cxx48zn8hs6sxwnrh78p6wbs28wcpz8nqxi")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/evanphx/json-patch")) + (propagated-inputs + (list go-github-com-jessevdk-go-flags go-github-com-pkg-errors)) + (home-page "https://github.com/evanphx/json-patch") + (synopsis "Apply and create JSON (RFC6902 and RFC7386) patches for Golang") + (description + "@code{jsonpatch} is a library which provides functionality for both +applying @url{http://tools.ietf.org/html/rfc6902,RFC6902 JSON patches} against +documents, as well as for calculating & applying +@url{https://tools.ietf.org/html/rfc7396,RFC7396 JSON merge patches}.") + (license license:bsd-3))) + (define-public go-github-com-felixge-httpsnoop (package (name "go-github-com-felixge-httpsnoop") @@ -1747,6 +1825,61 @@ user interface for humans, to read and edit before passing the JSON data to the machine.") (license license:expat))) +(define-public go-github-com-huin-goupnp + (package + (name "go-github-com-huin-goupnp") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/huin/goupnp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04j5rmrfawjxcimiqpyjm9gm5phdndjxrmydf9f1ylij6m360nwl")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Submodules with their own go.mod files and packed as separated + ;; packages: + ;; + ;; - github.com/huin/goupnp/v2alpha + (for-each delete-file-recursively + (list "v2alpha")))))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/huin/goupnp" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Run all tests, workaround for go-build-system's lack of Go + ;; modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://github.com/huin/goupnp") + (propagated-inputs + (list go-golang-org-x-sync)) + (synopsis "UPnP client library for Go") + (description + "@code{goupnp} is a @acronym{Universal Plug and Play, UPnP} client +library for Go. + +Core components: +@itemize +@item @code{goupnp}: core library - contains datastructures and utilities +typically used by the implemented DCPs +@item @code{httpu}: HTTPU implementation, underlies SSDP +@item @code{ssdp}: SSDP client implementation (simple service discovery +protocol) - used to discover UPnP services on a network +@item @code{soap}: SOAP client implementation (simple object access protocol) +- used to communicate with discovered services +@end itemize") + (license license:bsd-2))) + (define-public go-github-com-jackpal-gateway (package (name "go-github-com-jackpal-gateway") @@ -2020,6 +2153,119 @@ jsoniter and variable type declarations (if any). jsoniter interfaces gives router.") (license license:bsd-3))) +(define-public go-github-com-koron-go-ssdp + (package + (name "go-github-com-koron-go-ssdp") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/koron/go-ssdp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0agzxzlwvnhgwk6sxswjq7v1ghmf0l02gr7zpdih24i3g457af4f")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/koron/go-ssdp" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\_test.go$") + ;; Test requiring network setup. + (("TestAdvertise_Alive") "OffTestAdvertise_Alive") + (("TestAdvertise_Bye") "OffTestAdvertise_Bye") + (("TestAnnounceAlive") "OffTestAnnounceAlive") + (("TestAnnounceBye") "OffTestAnnounceBye") + (("TestInterfaces") "OffTestInterfaces") + (("TestSearch_Request") "OffTestSearch_Request") + (("TestSearch_Response") "OffTestSearch_Response") + (("TestSearch_ServiceRawHeader") "OffTestSearch_ServiceRawHeader"))))) + ;; XXX: Run all tests, workaround for go-build-system's lack of Go + ;; modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-golang-org-x-net)) + (home-page "https://github.com/koron/go-ssdp") + (synopsis "SSDP library for Golang") + (description + "@code{go-ssdp} is a @url{https://tools.ietf.org/html/draft-cai-ssdp-v1-03, +@acronym{Simple Service Discovery Protocol, SSDP}} library for Golang.") + (license license:expat))) + +(define-public go-github-com-libp2p-go-nat + (package + (name "go-github-com-libp2p-go-nat") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-nat") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yyb3knxvfr7fi759nh7mhh88ap1jpkb7nky7niqrh75737phgh0")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-nat")) + (propagated-inputs + (list go-github-com-huin-goupnp + go-github-com-jackpal-go-nat-pmp + go-github-com-koron-go-ssdp + go-github-com-libp2p-go-netroute)) + (home-page "https://github.com/libp2p/go-nat") + (synopsis "NAT port mapping library for Golang") + (description + "Package @code{go-nat} implements NAT handling facilities.") + (license license:asl2.0))) + +(define-public go-github-com-libp2p-go-netroute + (package + (name "go-github-com-libp2p-go-netroute") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-netroute") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06p68j63fd5nf2gf1fz2pnksmdmv735swpbpvnhb15vrgg3r528g")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-netroute" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (find-files "." "\\_test.go$") + ;; Test requiring network access: no route found for 8.8.8.8 + (("TestRoute") "OffTestRoute")))))))) + (propagated-inputs + (list go-github-com-google-gopacket + go-golang-org-x-net + go-golang-org-x-sys)) + (home-page "https://github.com/libp2p/go-netroute") + (synopsis "Routing table abstraction library for Golang") + (description + "@code{go-netroute} provides an implementation of the +@url{https://godoc.org/github.com/google/gopacket/routing#Router, +gopacket/routing.Router} interface for Golang.") + (license license:bsd-3))) + (define-public go-github-com-makeworld-the-better-one-go-gemini (package (name "go-github-com-makeworld-the-better-one-go-gemini") @@ -2074,6 +2320,38 @@ clients that speak the Gemini protocol.") @@url{https://github.com/makeworld-the-better-one/go-gemini,go-gemini}.") (license license:expat))) +(define-public go-github-com-mattbaird-jsonpatch + (package + (name "go-github-com-mattbaird-jsonpatch") + (version "0.0.0-20240118010651-0ba75a80ca38") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattbaird/jsonpatch") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nxbrpk8bvvmfgl4sfsbx82g0q44i2sakl7vigbsj3prx6nql5iv")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mattbaird/jsonpatch")) + (native-inputs + (list go-github-com-evanphx-json-patch go-github-com-stretchr-testify)) + (home-page "https://github.com/mattbaird/jsonpatch") + (synopsis "JSON Patch library for Go") + (description + "@url{http://jsonpatch.com/, JSON Patch} implementation for Go as +specified in @url{https://datatracker.ietf.org/doc/html/rfc6902/, RFC 6902} +from the IETF. + +JSON Patch allows you to generate JSON that describes changes you want to make +to a document, so you don't have to send the whole doc. JSON Patch format is +supported by HTTP PATCH method, allowing for standards based partial updates +via REST APIs.") + (license license:asl2.0))) + (define-public go-github-com-microcosm-cc-bluemonday (package (name "go-github-com-microcosm-cc-bluemonday") @@ -3647,6 +3925,53 @@ programming language, which supports draft-04, draft-06 and draft-07.") spec in Go.") (license license:bsd-3))) +(define-public go-golang-zx2c4-com-wireguard + (package + (name "go-golang-zx2c4-com-wireguard") + (version "0.0.0-20231211153847-12269c276173") + (source + (origin + (method git-fetch) + ;; NOTE: module URL is a redirect + ;; target: git.zx2c4.com/wireguard-go + ;; source: golang.zx2c4.com/wireguard + (uri (git-reference + (url "https://git.zx2c4.com/wireguard-go/") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fbc6m0ahifhrd6jdrpdxi8l3b2slpp8fmv20kpq2yzz19vzzgkf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.zx2c4.com/wireguard" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; "./tune/..." ; Requires gvisor.dev/gvisor, not packed yet + "./" + "./conn/..." + "./device/..." + "./ipc/..." + "./ratelimiter/..." + "./replay/..." + "./rwcancel/..." + "./tai64n/...")))))))) + (propagated-inputs + (list go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-sys)) + (home-page "https://git.zx2c4.com/wireguard") + (synopsis "Implementation of WireGuard in Go") + (description "This package is a Go Implementation of WireGuard.") + (license license:expat))) + ;; XXX: This repository has been archived by the owner on Feb 27, 2023. It is ;; now read-only and it is DEPRECATED. (define-public go-gopkg-in-square-go-jose-v2 diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index c0ead7d512..51b8ca9192 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1385,7 +1385,7 @@ tools.") (package (inherit go-github-com-cheggaaa-pb) (name "go-github-com-cheggaaa-pb-v3") - (version "3.0.8") + (version "3.1.5") (source (origin (method git-fetch) @@ -1394,7 +1394,7 @@ tools.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0d701s2niy39r650d1phjw19h4l27b1yfc2ih6s31f56b3zzqspx")))) + (base32 "1mf86iav69qpyg0nd54g0f50yigjkfzdhaqzkbn4yfb3fnb75n2z")))) (arguments (list #:import-path "github.com/cheggaaa/pb/v3" @@ -1458,6 +1458,33 @@ levels that works by wrapping the standard @code{log} library.") "Readline is a pure Go implementation of a GNU-Readline like library.") (license license:expat))) +(define-public go-github-com-containerd-fifo + (package + (name "go-github-com-containerd-fifo") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/fifo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ddb1spairbsjkvxqysa7pzb5za07dvv1aay3mqr160gh2za3kd4")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/containerd/fifo")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/containerd/fifo") + (synopsis "FIFO package for Golang") + (description + "This package implements a functionality of handling FIFOs in a sane +way.") + (license license:asl2.0))) + (define-public go-github-com-coocood-freecache (package (name "go-github-com-coocood-freecache") @@ -2623,6 +2650,59 @@ the library more lightweight.") @end itemize") (license license:expat))) +(define-public go-github-com-gofrs-flock + (package + (name "go-github-com-gofrs-flock") + (version "0.12.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gofrs/flock/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kfnbcahr9x61k40wsrqzxxr3ybix0jqsm4ibpjgnhfgrln7ag8v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/gofrs/flock")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-golang-org-x-sys)) + (home-page "https://github.com/gofrs/flock/") + (synopsis "Thread-safe file locking library in Go") + (description + "@code{flock} implements a thread-safe file lock. It also includes a +non-blocking @code{TryLock} function to allow locking without blocking +execution.") + (license license:bsd-3))) + +(define-public go-github-com-google-subcommands + (package + (name "go-github-com-google-subcommands") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/subcommands") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00w7fx92696z5p3isvpg71b4023g8f686xnhy56k08vc2q1r2hhw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/google/subcommands")) + (home-page "https://github.com/google/subcommands") + (synopsis "Go subcommand library") + (description + "@code{subcommands} implements a functionality for a single command to +have many subcommands, each of which takes arguments.") + (license license:asl2.0))) + (define-public go-github-com-gookit-color (package (name "go-github-com-gookit-color") @@ -3518,6 +3598,81 @@ pattern is called repeatedly.") database/sql package.") (license license:expat))) +(define-public go-github-com-libp2p-go-buffer-pool + (package + (name "go-github-com-libp2p-go-buffer-pool") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-buffer-pool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0514rsnin6wjqifpg66dp5nrwh40smqlkgs3kxyz9cansi78c2n1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-buffer-pool")) + (home-page "https://github.com/libp2p/go-buffer-pool") + (synopsis "Variable size buffer pool for Golang") + (description + "This package provides a variable size buffer pool for Golang. + +@code{go-buffer-pool} provides: +@itemize +@item @code{BufferPool}: A pool for re-using byte slices of varied sizes. +This pool will always return a slice with at least the size requested and a capacity +up to the next power of two. Each size class is pooled independently which makes the +@code{BufferPool} more space efficient than a plain @code{sync.Pool} when used in +situations where data size may vary over an arbitrary range. +@item @code{Buffer}: a buffer compatible with @code{bytes.Buffer} but backed by a +@code{BufferPool}. Unlike @code{bytes.Buffer}, @code{Buffer} will automatically +shrink on read, using the buffer pool to avoid causing too much work for the +allocator. This is primarily useful for long lived buffers that usually sit empty. +@end itemize") + ;; There are two license files provided by the project: LICENSE and + ;; LICENSE-BSD. + (license (list license:expat license:bsd-3)))) + +(define-public go-github-com-libp2p-go-msgio + (package + (name "go-github-com-libp2p-go-msgio") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-msgio") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "005cdmkcgsfqlf8478wxyzmy5iixqa8fhjrbig912n8ngnqx1029")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-msgio" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-github-com-gogo-protobuf + go-github-com-libp2p-go-buffer-pool + go-github-com-multiformats-go-varint + go-google-golang-org-protobuf)) + (home-page "https://github.com/libp2p/go-msgio") + (synopsis "Read and write length-delimited slices") + (description + "@code{go-msgio} implements functionality to read and write +length-delimited slices. It's helpful for building wire protocols.") + (license license:expat))) + (define-public go-github-com-logrusorgru-aurora (package (name "go-github-com-logrusorgru-aurora") @@ -4129,6 +4284,31 @@ explicit ownership.") without the runtime cost of the standard library reflect.Value.") (license license:asl2.0))) +(define-public go-github-com-mohae-deepcopy + (package + (name "go-github-com-mohae-deepcopy") + (version "0.0.0-20170308212314-bb9b5e7adda9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mohae/deepcopy") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "173j05wv4yy8jh9ccjw46xfy1knxwvv1ir6b8l6g9pc5j5damm1f")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mohae/deepcopy")) + (home-page "https://github.com/mohae/deepcopy") + (synopsis "Copy of pointers and values for Golang") + (description + "@code{deepcopy} implements a functionality of deep copies of things. A +standard @code{copy} will copy the pointers where @code{deepcopy} copies the +values pointed to. Unexported field values are not copied.") + (license license:expat))) + (define-public go-github-com-mreiferson-go-options (package (name "go-github-com-mreiferson-go-options") @@ -6191,6 +6371,18 @@ tool.")) Trace/Debug/Info/Warn/Error methods on @code{hclog.Logger} are used correctly."))) +(define-public go-msgio + (package + (inherit go-github-com-libp2p-go-msgio) + (name "go-msgio") + (arguments + (list + #:tests? #f ; no tests + #:install-source? #f + #:import-path "github.com/libp2p/go-msgio/msgio" + #:unpack-path "github.com/libp2p/go-msgio")) + (synopsis "CLI tool to wrap messages with msgio header."))) + (define-public go-numcpus (package (inherit go-github-com-tklauser-numcpus) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c776f78609..aaf60739dc 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7021,37 +7021,6 @@ is unchanged. This package contains a series of small enhancements and additions.") (license license:bsd-3)))) -(define-public go-golang-zx2c4-com-wireguard - (package - (name "go-golang-zx2c4-com-wireguard") - (version "0.0.20211016") - (source - (origin - (method git-fetch) - ;; NOTE: module URL is a redirect - ;; target: git.zx2c4.com/wireguard-go - ;; source: golang.zx2c4.com/wireguard - (uri (git-reference - (url "https://git.zx2c4.com/wireguard-go/") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0")))) - (build-system go-build-system) - (arguments - '(;; XXX: Failed on newer version of Golang, the recent release requires - ;; gvisor.dev/gvisor, which is huge to pack. - #:tests? #f - #:import-path "golang.zx2c4.com/wireguard")) - (propagated-inputs - (list go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-sys - go-golang-org-x-text)) - (home-page "https://git.zx2c4.com/wireguard") - (synopsis "Implementation of WireGuard in Go") - (description "This package is a Go Implementation of WireGuard.") - (license license:expat))) - (define-public go-github-com-kardianos-minwinsvc (package (name "go-github-com-kardianos-minwinsvc") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8eae1ed89d..6c9d6cded9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -775,7 +775,7 @@ materials, lights, displacement, and pattern generation.") (define-public cgal (package (name "cgal") - (version "5.2.2") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append @@ -783,7 +783,7 @@ materials, lights, displacement, and pattern generation.") "/CGAL-" version ".tar.xz")) (sha256 (base32 - "0yjzq12ivizp23y7zqm30x20psv9gzwbcdrhyd3f7h0ds94m1c40")))) + "0dsqvnyd2ic50pr28gfz34bpnyx3i2csf1rikmc661hywdz5xcfd")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 0759c399c3..b2ef31ebf7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -761,7 +761,7 @@ you send to a FIFO file.") (define-public guile-dsv (package (name "guile-dsv") - (version "0.7.1") + (version "0.7.2") (source (origin (method git-fetch) (uri (git-reference @@ -770,7 +770,7 @@ you send to a FIFO file.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "18v8snh45ibh13mvihhajs226yflxpl6v09wqndyfj1da8cdmkzk")))) + "1iavc1dg1899v519hvbzcmvdc16rahcwwvj68jycqdc5px5z285i")))) (build-system gnu-build-system) (native-inputs (list autoconf automake @@ -1053,27 +1053,6 @@ HTML (via SXML) or any other format for rendering.") (home-page "https://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) -;; gitile requires a more recent version than the latest release. -(define-public guile-syntax-highlight-for-gitile - (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") - (revision "0")) - (package - (inherit guile-syntax-highlight) - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.dthompson.us/guile-syntax-highlight.git") - (commit commit))) - (file-name (git-file-name "guile-syntax-highlight" version)) - (sha256 - (base32 - "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) - (native-inputs - (modify-inputs (package-native-inputs guile-syntax-highlight) - (prepend autoconf automake texinfo))) - (properties '((hidden? . #t)))))) - (define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) @@ -5793,6 +5772,41 @@ a Guile implementation of CBOR.") (home-page "https://inqlab.net/git/guile-cbor.git") (license license:gpl3+))) +(define-public guile-qr-code + (package + (name "guile-qr-code") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/artyom-poptsov/guile-qr-code") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pbsnkz8pw1x8n9mjq8rm37wmalzbcz98gk8mcfycyd896qdmf4w")))) + (build-system gnu-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (delete 'strip)))) + (native-inputs (list autoconf + automake + pkg-config + texinfo + ;; needed when cross-compiling. + guile-3.0 + guile-lib + guile-png)) + (inputs (list bash-minimal guile-3.0 guile-lib guile-png)) + (synopsis "Guile QR Code library") + (description + "GNU Guile QR code generator that can create QR codes from text and binary data. +The resulting QR codes can be rendered to ASCII art strings or to PNG images (using +@url{https://github.com/artyom-poptsov/guile-png, Guile-PNG} API.)") + (home-page "https://github.com/artyom-poptsov/guile-qr-code") + (license (list license:gpl3+ license:expat)))) + (define-public guile-quickcheck (package (name "guile-quickcheck") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e8705dc7d2..0373c06242 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -887,7 +887,7 @@ manipulate repositories of the Git version control system.") (define-public guile-zlib (package (name "guile-zlib") - (version "0.1.0") + (version "0.2.1") (source (origin ;; XXX: Do not use "git-fetch" method here that would create and @@ -899,13 +899,10 @@ manipulate repositories of the Git version control system.") version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - ;; content hash: 1ip18nzwnczqyhn9cpzxkm9vzpi5fz5sy96cgjhmp7cwhnkmv6zv + ;; content hash: 09zfka3js7dp39fnplxbp90x98s5nj0pc93p1l9cmgrbj8nyn2sv (base32 - "1safz7rrbdf1d98x3lgx5v74kivpyf9n1v6pdyy22vd0f2sjdir5")))) + "0wqva23zrxcsj9cp3xqmqpxqyd7a4nnja3dc7v7g0i9yfixi7xd5")))) (build-system gnu-build-system) - (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (native-inputs (list autoconf automake pkg-config guile-3.0)) (inputs (list guile-3.0 zlib)) (synopsis "Guile bindings to zlib") diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 9db7de848e..d8530f8705 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> -;;; Copyright © 2021, 2023 Evgeny Pisemsky <mail@pisemsky.site> +;;; Copyright © 2021, 2023, 2024 Evgeny Pisemsky <mail@pisemsky.site> ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2021 Denis Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com> @@ -1580,7 +1580,7 @@ modern instrumentation and data acquision systems using Ethernet.") (define-public usbrelay (package (name "usbrelay") - (version "1.2") + (version "1.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1589,19 +1589,31 @@ modern instrumentation and data acquision systems using Ethernet.") (file-name (git-file-name name version)) (sha256 (base32 - "0fr3wglr2c6myg4k6ai2p5z38prclcnk2ngik15sq16fnp6qg750")))) + "1xw2fqx4drmkvv587vkz3aicp6pw1mzxr8bjz8wad9j4c0r24cgn")))) (build-system gnu-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (delete 'configure)) ;no configure script + ;; No configure script. + (delete 'configure) + (add-after 'install 'install-manpage + (lambda _ + (install-file "usbrelay.1" + (string-append #$output "/share/man/man1")))) + (add-after 'install-manpage 'install-udev-rules + (lambda _ + (install-file "50-usbrelay.rules" + (string-append #$output "/lib/udev/rules.d"))))) #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) (string-append "PREFIX=" #$output) (string-append "LDFLAGS=-Wl,-rpath=" (string-append #$output "/lib")) "LDCONFIG=true" - "USBMAJOR=$(USBLIBVER)") - #:tests? #f)) ;no test suite + (string-append "USBMAJOR=" #$version) + (string-append "USBLIBVER=" #$version) + (string-append "VERSION=" #$version)) + ;; No test suite. + #:tests? #f)) (inputs (list hidapi)) (home-page "https://github.com/darrylb123/usbrelay") (synopsis "Control USB relay modules") diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 43c12fd71c..b89943a0e3 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2022 David Thompson <dthompson2@worcester.edu> +;;; Copyright © 2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -616,9 +617,9 @@ and mIRC chat codes.") (define-public kmonad ;; Project is active, but no new releases exist. Pick current master - ;; HEAD as of 2023-01-08. - (let ((commit "31c591b647d277fe34cb06fc70b0d053dd15f867") - (revision "0")) + ;; HEAD as of 2024-08-18. + (let ((commit "07cd1cb4fddb46a8d9de3bb9d06196d08b7a8ed2") + (revision "1")) (package (name "kmonad") (version (git-version "0.4.2" revision commit)) @@ -630,7 +631,7 @@ and mIRC chat codes.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0k1dfyy1q86l5yivv1jrclgvp9k48qm8pzk1j9wavq92li77y7r5")))) + (base32 "08ybif2lw0jy9h2hrlvx3469a3hkvih9gsg60kp9qnklzvqjdy5i")))) (build-system haskell-build-system) (arguments `(#:haddock? #f ; Haddock fails to generate docs @@ -921,30 +922,31 @@ too slow and you'll get wound up in the scroll and crushed.") (define-public shellcheck (package (name "shellcheck") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (hackage-uri "ShellCheck" version)) (sha256 - (base32 "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb")) + (base32 "08bdjcdl457xz2vh8y2w29bcwh1k7sfzyvszln3498vm5m1xn22d")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (arguments - '(#:haddock? #f ; TODO: Fails to build. - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-man-page - (lambda _ - (invoke "./manpage"))) - (add-after 'install 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (install-file "shellcheck.1" - (string-append (assoc-ref outputs "out") - "/share/man/man1/")))) - (add-after 'register 'remove-libraries - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) + (list #:haddock? #f ; TODO: Fails to build. + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-man-page + (lambda _ + (chmod "manpage" #o555) + (invoke "./manpage"))) + (add-after 'install 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (install-file "shellcheck.1" + (string-append #$output + "/share/man/man1/")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append #$output "/lib"))))))) (native-inputs (list pandoc)) (inputs diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 89d3e22c7e..efce86508b 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022, 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Benjamin <benjamin@uvy.fr> +;;; Copyright © 2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,7 +70,7 @@ (define-public haproxy (package (name "haproxy") - (version "2.9.0") + (version "3.0.3") (source (origin (method url-fetch) @@ -77,7 +78,7 @@ (version-major+minor version) "/src/haproxy-" version ".tar.gz")) (sha256 - (base32 "1aqfp1gslk4dfvrrzg51h0mn1j4n4in82z701bi7ycs63b6qm8gv")))) + (base32 "1pqrgndf5ciyq3l4ywrjj3q917dms59cmzxk5ihd400bg8c3r9rr")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index 4e043f5073..e228a844bf 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -266,6 +266,41 @@ spell-checking library.") (home-page "https://magyarispell.sourceforge.net/") (license (list license:gpl2 license:gpl3))))) +(define-public hunspell-dict-el + (let ((commit "8e799911aede4e2c340d1b5a67a07f8e22ab9c8e")) + (package + (name "hunspell-dict-el") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.thanosapollo.org/hunspell-dict-el") + (commit commit))) + (sha256 + (base32 "0z9nyfy50c0bjvvm42xwd3npjpp07a9slm3gfgvxanyqm7djrmb1")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'build) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "el_GR.aff" share) + (install-file "el_GR.dic" share) + #t)))) + #:tests? #f)) + (native-inputs + (list hunspell ispell perl)) + (synopsis "Hunspell Greek/Hellenic dictionary") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "https://git.thanosapollo.org/hunspell-dict-el/") + (license (list license:gpl2 license:gpl3))))) + (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page license) (package (name (string-append diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 2031d72768..6f09fae65c 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -126,8 +126,9 @@ C/C++ part.") (base32 "0iccpdvc0kvpww5a31k9gjkqigyz016i7v80r9zamd34w4fl6mx4")) (patches - (cons - (search-patch + (append + (search-patches + "icu4c-icu-22132-fix-vtimezone.patch" "icu4c-fix-TestHebrewCalendarInTemporalLeapYear.patch") (origin-patches (package-source icu4c)))))))) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index ccf5728e4f..3978ff394b 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -547,6 +547,40 @@ order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-fore and @code{go-ipld-format} legacy interface.") (license (list license:expat license:asl2.0)))) +;; XXX: This repository has been archived by the owner on Jun 20, 2023. It is +;; now read-only. We highly recommend switching to the maintained version at +;; https://github.com/ipfs/boxo/tree/main/verifcid. It's still in use by some +;; dependencies chain for unbundled inputs in Kubo. +(define-public go-github-com-ipfs-go-verifcid + (package + (name "go-github-com-ipfs-go-verifcid") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-verifcid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05i6wp2nln0mlr1pivmva7j6bwa09k7jl04acx1lw65h4d9nxsjm")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-verifcid")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-ipfs-go-cid go-github-com-multiformats-go-multihash)) + (home-page "https://github.com/ipfs/go-verifcid") + (synopsis "CID security code") + (description + "@code{go-verifcid} provides @url{https://github.com/ipld/cid, CID} security +code prior to it getting merged into @code{go-cid}.") + ;; This library is dual-licensed under Apache 2.0 and MIT terms: + ;; LICENSE-MIT and LICENSE-APACHE. + (license (list license:expat license:asl2.0)))) + (define-public go-github-com-ipld-go-codec-dagpb (package (name "go-github-com-ipld-go-codec-dagpb") @@ -969,6 +1003,7 @@ written in Go.") "vendor/github.com/google/uuid" "vendor/github.com/gorilla" "vendor/github.com/hashicorp" + "vendor/github.com/huin" "vendor/github.com/ipfs/go-block-format" "vendor/github.com/ipfs/go-cid" "vendor/github.com/ipfs/go-cidutil" @@ -982,12 +1017,18 @@ written in Go.") "vendor/github.com/ipfs/go-ipld-legacy" "vendor/github.com/ipfs/go-log" "vendor/github.com/ipfs/go-metrics-interface" + "vendor/github.com/ipfs/go-verifcid" "vendor/github.com/ipld/go-codec-dagpb" "vendor/github.com/ipld/go-ipld-prime" "vendor/github.com/jackpal" "vendor/github.com/jbenet" "vendor/github.com/julienschmidt" "vendor/github.com/klauspost" + "vendor/github.com/koron" + "vendor/github.com/libp2p/go-buffer-pool" + "vendor/github.com/libp2p/go-msgio" + "vendor/github.com/libp2p/go-nat" + "vendor/github.com/libp2p/go-netroute" "vendor/github.com/libp2p/go-socket-activation" "vendor/github.com/mattn" "vendor/github.com/mgutz" @@ -1014,6 +1055,7 @@ written in Go.") "vendor/github.com/whyrusleeping" "vendor/go.uber.org" "vendor/golang.org" + "vendor/google.golang.org/protobuf" "vendor/gopkg.in" "vendor/lukechampine.com"))))) (build-system go-build-system) @@ -1148,8 +1190,11 @@ written in Go.") go-github-com-gorilla-websocket ; github.com/libp2p/go-libp2p go-github-com-hashicorp-golang-lru ; github.com/libp2p/go-libp2p-kad-dht go-github-com-hashicorp-golang-lru-v2 ; github.com/ipfs/boxo - go-github-com-jackpal-go-nat-pmp ; github.com/libp2p/go-nat + go-github-com-ipfs-go-verifcid ; github.com/ipfs/go-blockservice go-github-com-klauspost-compress ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-buffer-pool ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-msgio ; github.com/libp2p/go-libp2p-kad-dht + go-github-com-libp2p-go-nat ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multiaddr-fmt ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multistream ; github.com/libp2p/go-libp2p go-github-com-quic-go-quic-go ; github.com/libp2p/go-libp2p diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index fd0271c5d6..a9f82ba957 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -367,14 +368,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.") (define-public weechat (package (name "weechat") - (version "4.3.5") + (version "4.4.1") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1qsbdg3c0787xs0vwbxsyylf5fvz4cazrzlnwj2mnp6s6b4c9nz6")))) + "0v4k4rrp2a5zaxl86wnwffajv3b4fb9w70rsh42samra9k8hppp5")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 43bef92fbb..80c5b28b84 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -104,7 +104,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -113,7 +113,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1pas55hqb03lgm0n4izq10jvlwci1l60la61blc29bfx843z5lyf")))) + "1ks9381yf7n9v80baydjrbri5yf0kwc0g1dnyclhd682wnhjqg4g")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too @@ -190,7 +190,7 @@ common build settings used in software produced by the KDE community.") (define-public kquickcharts (package (name "kquickcharts") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -198,7 +198,7 @@ common build settings used in software produced by the KDE community.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ph1ch629sxx739is10alargb428147rbh1rqw1wwxrqxz52j5m4")))) + "00lhiiyl8yv7cn06b2xjpcwgcxb5n60v1122hn32mpbg436abaf5")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules glslang pkg-config)) @@ -331,7 +331,7 @@ Phonon-VLC is a backend based on the VLC multimedia library.") (define-public attica (package (name "attica") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -340,7 +340,7 @@ Phonon-VLC is a backend based on the VLC multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0h2pzf9hhkkyrz8h95lcg3ygss9rmnybzapm82i3ycgg08n6xxn3")))) + "1rhhc0fxwpv5dq3j7jsys0k72sy43qb1fmj2ib2a59sjvhc0ds3c")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -387,7 +387,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (define-public bluez-qt (package (name "bluez-qt") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -396,7 +396,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "0sxi758ccmgwhq9r0vbqq3j8lq3wx3mw4r8mf401ql1byklsxl6j")))) + "0pm6dbn0za3pp078ri4rbfdb0xa163pnx26h103l3y8szik4f8zh")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules)) @@ -423,7 +423,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -431,7 +431,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "000s3yz7d2llaaq2h68qfvphjhiaa9v5j8xfxqx058mxw610qv3b")))) + "1i5h39asvjsbx4d5p3b78gvfa514yjchn394ph77b4a8z2p8yvna")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules @@ -462,7 +462,7 @@ It is the default icon theme for the KDE Plasma desktop.") (define-public kapidox (package (name "kapidox") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -471,7 +471,7 @@ It is the default icon theme for the KDE Plasma desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "08zvhhk208zszpx504mbq0nyjy1kffa0lmalnva7z32si8kx2q0w")))) + "18d3c2c9si71hic816gkdhayabi0sa5b874hk1wrhx0l44i2ym7j")))) (build-system python-build-system) (arguments (list #:tests? #f ; test need network @@ -502,7 +502,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -510,7 +510,7 @@ documentation.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "1fys0r43lc1055fg3ihn11hdh62csyr0hsf831y6q34nhiix1r5w")))) + "0yaf8h2b8x9i9a3qm6bx1ksjmw0mj57ib18rds929q0dqx9h4lz5")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -557,7 +557,7 @@ GZip format, via a subclass of QIODevice.") (define-public kcalendarcore (package (name "kcalendarcore") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -566,7 +566,7 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0mxapn2vjd5n2wrsplgpjxsq0fa9hkygzhwq0gzi6q9iscg9ndb0")))) + "08pm465rmy5va17kn86mw0pxskpnw9p04a7rq9acxxhmxpsrk9bd")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl tzdata-for-tests)) @@ -597,7 +597,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -606,7 +606,7 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "1m5zk3i7fm4yxlg51bhr3pm436fgjbh53i814v9ns4g86h3fg8rc")))) + "020yz5mf2rqrk6jw460br1wz3lp50d9fh0dvrld5jf8f8zsj4v79")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules gperf qttools)) (inputs (list qtbase)) @@ -673,7 +673,7 @@ which can be used to add custom colors to the popup menu.") (define-public kcolorscheme (package (name "kcolorscheme") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -683,7 +683,7 @@ which can be used to add custom colors to the popup menu.") (sha256 (base32 - "1342f70qynp711whgykpjbvq154vih7s6zyi8sr9kz1ndd3syx2w")))) + "0axlj37ayra5ds8pfajx6pwjidj6i9fcxwld2p68qh6w6zfmafrj")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kguiaddons ki18n @@ -703,7 +703,7 @@ KColorScheme.") (define-public kconfig (package (name "kconfig") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -712,7 +712,7 @@ KColorScheme.") name "-" version ".tar.xz")) (sha256 (base32 - "1p8nq66vikm6g971vx18qbw4d2p77p0cxjyvrxark8afvrpx1czv")))) + "04sxibd21mzc27s67yjpg0qsd1j8w6k29wdbg2wdy7a9scam73p4")))) (build-system qt-build-system) (native-inputs (list dbus extra-cmake-modules inetutils qttools)) @@ -802,7 +802,7 @@ kconfiggui-kstandardshortcutwatchertest)"))))))))) (define-public kcoreaddons (package (name "kcoreaddons") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -811,7 +811,7 @@ kconfiggui-kstandardshortcutwatchertest)"))))))))) name "-" version ".tar.xz")) (sha256 (base32 - "1f72ik6pylxanhvpcmrwl0mjm466f3g8wv781hyik8dwa09k5kf5")))) + "167gwmrj7vfi49bfx16vri3vvzz979ymgwadb1s4xq6lvhlis3jy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools shared-mime-info)) (inputs (list qtdeclarative)) @@ -884,7 +884,7 @@ many more.") (define-public kdbusaddons (package (name "kdbusaddons") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -893,7 +893,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "11y90ihhzsf7gplp6av126lnp12q5gywdws8zgq1ka4l86zacbr1")))) + "1zm8y0ganicalqq1s2apm5ikzpza6f6m0607aaad4bbsbpzzkb5g")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus qttools)) @@ -969,7 +969,7 @@ as well as an API to create KDED modules.") (define-public kdnssd (package (name "kdnssd") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -978,7 +978,7 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "04ncb1ahxglj00azk0imgqsjjkl6zxbsgjh0176xxviv3fj3kihb")))) + "1zdziswvkdycg4cr89y9fwqym812yd2w167qa8dwlvxn7562bz9p")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1045,7 +1045,7 @@ replace the other outdated Graphviz tools.") (define-public kguiaddons (package (name "kguiaddons") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1054,7 +1054,7 @@ replace the other outdated Graphviz tools.") name "-" version ".tar.xz")) (sha256 (base32 - "04fgc8rgx1j3swf5pxh7cxdggsj3r0fffh90gm4y4nq9p3q5vhp1")))) + "01s8mjpazvl4j1fhb00f24zcsbin5zjz319sv9znxyl51f9zm4vi")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, @@ -1092,7 +1092,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (define-public kholidays (package (name "kholidays") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1100,7 +1100,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1kddsb64b8xcxblb3sjfkncqz50cq7vfx5w5d0bg0ihmpnvgl00j")))) + (base32 "1jixchnfqpwbh5l187yj6y5zb526zsq588d3536hdaxgzy2k1844")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) (inputs (list qtbase qtdeclarative)) @@ -1113,7 +1113,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1122,7 +1122,7 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32 - "0mg299xqsslsk6xgkvrdfm9l4gjz5irpfv8kgybvy4d3wdcyasf0")))) + "1z57rym74w1sqsiwa7vwg0n67bky0vd7q3hhb1fp8lp4i9md6wvq")))) (build-system cmake-build-system) (propagated-inputs (list gettext-minimal)) @@ -1178,7 +1178,7 @@ translation scripting.") (define-public kidletime (package (name "kidletime") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -1186,7 +1186,7 @@ translation scripting.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0b2cm1c303m463r68y9gxpm5jlyrs80kfmsdwyzd5ph3m1ah8bjf")))) + (base32 "1xpa51v4lfc3iw7i7q4k39nappyjf9d1argi02028hmnmmp7vp5n")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config @@ -1230,7 +1230,7 @@ or user activity.") (define-public kirigami (package (name "kirigami") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1239,7 +1239,7 @@ or user activity.") "kirigami-" version ".tar.xz")) (sha256 (base32 - "0dwc329lm9wczcilqjmc293bp0qdyaaa7yymgfsyxl3jrvchr8pc")))) + "173m6h9wr8pl5l70s6wmasm8dimkq737qgn6mlzdm18w3qb3p9s3")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1286,7 +1286,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (define-public kitemmodels (package (name "kitemmodels") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1295,7 +1295,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "0q9dk2wipqv8li8wy5d90ild5cmzk3hznra99ii9n9v4aln3224n")))) + "0xjgk9gir8kgw0cf2922sps0xr62y8j8il6gx4f9l915znrh9v1n")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1356,7 +1356,7 @@ model to observers (define-public kitemviews (package (name "kitemviews") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1365,7 +1365,7 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "0h34sl46dpp2rind80fqizviz5bm5qajs4pdcjrpjyajvjybk022")))) + "175nrc2yirv6hpnj7d03qm795k9bp9yw96rwpjdmm6cp0n4b7wq7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1398,7 +1398,7 @@ to flat and hierarchical lists.") (define-public kplotting (package (name "kplotting") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1407,7 +1407,7 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "0xzwf4dfhkl2f5gahlgvfijl0big8nffrq0l3mxgjj27h467g72g")))) + "0hyrh3sw6znl79xxhqw7jqgyhh1b59aq7lmhkpagl0i0sk29f5h2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1424,7 +1424,7 @@ pixel units.") (define-public ksvg (package (name "ksvg") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1433,7 +1433,7 @@ pixel units.") name "-" version ".tar.xz")) (sha256 (base32 - "0c35v0r4nbh6frb1sqcpfdkdhp1vx402sqjr4vzyf9hmqd7wg49k")))) + "1k96rdharvagnacmfqwxfh0n2nymsp7dw92r5g4m0sby9nyj885f")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1462,7 +1462,7 @@ re-coloring and on-disk caching.") (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1471,7 +1471,7 @@ re-coloring and on-disk caching.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "018mqn4a5bgb841jj2ghrj5fadydnbk7ldcd3dzr7550gkx5m0hz")))) + "0y6330pzmm5p6f6x3kdfvgk5m8cl01i3ikisrmb7w9m3a7fq661y")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl qttools)) @@ -1548,7 +1548,7 @@ protocols used in KDE Plasma.") (define-public kwayland (package (name "kwayland") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1556,7 +1556,7 @@ protocols used in KDE Plasma.") version ".tar.xz")) (sha256 (base32 - "1g4sx9vx194ksqrsv1y31g2521dbfrq1vaqk79mdjhnhark4lrv9")))) + "0x4psmfn993lvha8cjw6w55gp7jp3490sb44wjfp6b5ccmpc14c6")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config @@ -1630,7 +1630,7 @@ represented by a QPoint or a QSize.") (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1639,7 +1639,7 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1gqd7wm60z18g64pfqhzq0ib5h3rj14r8ab5j6iz7p522glf59zx")))) + "02gys2sr03j5m85gw6n4qs9yanmnl1hwjpb2sk3q74b11b2bqfng")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -1697,7 +1697,7 @@ kwidgetsaddons-kcolumnresizertest)"))))))))) (define-public kwindowsystem (package (name "kwindowsystem") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1706,7 +1706,7 @@ kwidgetsaddons-kcolumnresizertest)"))))))))) name "-" version ".tar.xz")) (sha256 (base32 - "0naa057v40fc2wpj8imc6wh70q560cxsfrlxd1mdb56jpln79s64")))) + "1iivhw6p1g2r9bd461w7rrv7qkr2i1cfpy7x4akr2vpjdghqdbna")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules @@ -1787,7 +1787,7 @@ lower level classes for interaction with the X Windowing System.") (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1796,7 +1796,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "17gfvrigqavq640l1pbafpl2bnps6m69ivwdqdcfmqxw2sljmg7j")))) + "0yvismy20f8xv58f17gi4a9h4rp9mbz3384208v9qpawkj6b3hkn")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1823,7 +1823,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1832,7 +1832,7 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "164lbv8v15i2fvx6vxb8774csvqvvm30dkry0925qi67v5fr0b1x")))) + "0v0v6184q5zfb919mngn5ziipy4yz44mpix4yfffi3hpr0r2npxa")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1907,7 +1907,7 @@ which are used in DBus communication.") (define-public prison (package (name "prison") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -1915,7 +1915,7 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "13gaaxglyxc80jr0wqx68kjchhs0p8nqx7z6fsl3c9p082vb0vnx")))) + (base32 "1fk7n07j57wgh1rqzh28xpc1fgij6mk0n4bh3vs8m63izg67vhdv")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -1958,7 +1958,7 @@ libpulse.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -1967,7 +1967,7 @@ libpulse.") name "-" version ".tar.xz")) (sha256 (base32 - "1yzh13izscz7x2pbss2qf84qr1lf0zcz1pryi2cbj4cacdb304wv")))) + "08ckvbrpfan1aa6qgqx659gwg01qjbypis0h1vwbg2scb9vki1l8")))) (build-system qt-build-system) (arguments (list @@ -1999,7 +1999,7 @@ feel.") (define-public solid (package (name "solid") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2008,7 +2008,7 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "1hwm6pwv3w194jbgamzp3bfazk3yfwxjkycaxkw4m7zvsiqknyan")))) + "0p3af1p8137yij3m8ksxw6pmgjhpfjxn2i67byzz9ghpjrn7q8z8")))) (build-system cmake-build-system) (native-inputs (list bison dbus extra-cmake-modules flex qttools)) @@ -2054,7 +2054,7 @@ system.") (define-public sonnet (package (name "sonnet") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2063,7 +2063,7 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "1afx1jfwrfbg9n4i063ghgxyy8syw0qqnvr5zhxl9lx5knc0ahlm")))) + "1ap17mx4cfhmlq14y0nb9y40z2ksmydzfxga3klc6lbr5gwbd1ky")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs @@ -2104,7 +2104,7 @@ ASpell and HUNSPELL.") (define-public threadweaver (package (name "threadweaver") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2113,7 +2113,7 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "164mq99wgpyxpb6dbimfacp1rz7mycynl0lmzpkxxs0a9rdss5x3")))) + "1s5x42xpshylwl5bgna785d0plwwzf770akv7x5bz3j3dj9x0w5f")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list qtbase)) @@ -2229,7 +2229,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2238,7 +2238,7 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1kpi5yn9097wn01m1psmbsfjzns4188h5fkpl3rhlrywvq2y5605")))) + "156kb1in1jqdpr516k6c0wp5cldpjh447mr08kdms76s16jigx8s")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules qttools)) @@ -2298,7 +2298,7 @@ utilities.") (define-public kcompletion (package (name "kcompletion") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2307,7 +2307,7 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0lcx8nhxv69g887df52ywj1knjr90zqsjxg44jisayva0ksjm3ph")))) + "1ygd9s0gmd8n6b3hfbdivzss2rqiyl5iirnxw7hrrx0ma07gi2kp")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -2344,7 +2344,7 @@ integrated it into your application's other widgets.") (define-public kcontacts (package (name "kcontacts") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2355,7 +2355,7 @@ integrated it into your application's other widgets.") (search-patches "kcontacts-incorrect-country-name.patch")) (sha256 (base32 - "17fm5gjra3bhsscidwzs7792d0imazk7jbhjnwb00k56s4xjvdxr")))) + "1i7xlmgipgd414vgaz1l39rh9f0n196xg6zr9c222n4s8scf04dp")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules ;; for test @@ -2382,7 +2382,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2391,7 +2391,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32 - "15vnaq011pf6d5p131ld16lwjmvhmp6za2rv14fhqhrajny1a4h1")))) + "1wwv64jygx1hhiskn8xsk2v5dhnkbq94fd2rpi031k1ja7hnq347")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons kwindowsystem)) @@ -2425,7 +2425,7 @@ application crashes.") (define-public kdoctools (package (name "kdoctools") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2434,7 +2434,7 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "1hjds93czk201k8hah4skrzplmfk94qyps2cb3aaz30i0zwi5qb3")))) + "1p81c2m5svhdjv97097q9wf3xhz014vjqh8hcg6587pf4bi1l7kq")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2526,7 +2526,7 @@ from DocBook files.") (define-public kfilemetadata (package (name "kfilemetadata") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2535,7 +2535,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "1vf5qj4777wqpbgpinygm8rdcy867hvl5a1a9bqmwk5yahq47zs5")))) + "1x60zl20qg19d615r62vf6kavzaij451n55wqvgqkqvz7n11ji2p")))) (build-system cmake-build-system) (arguments (list @@ -2655,7 +2655,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2664,7 +2664,7 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "15hjaj770xzssg3z8zq51h8jr11mvzg2isvr70rwpk3viswdlyzx")))) + "08jhlxnbklq06xvv4qc10xxg3l4scazg0624rshghr3j8wvbfjn6")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -2733,7 +2733,7 @@ formats.") (define-public kjobwidgets (package (name "kjobwidgets") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2742,7 +2742,7 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "0rfm9l8m128h7h6sms9jhlxxs7dg4sfm9s67jma2llv9ri91lqi2")))) + "1n0aj4hc3hj2n25g2a22mzz386wrjiz7cl978l6q7rhs36qxmib7")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools)) @@ -2776,7 +2776,7 @@ asynchronous jobs.") (define-public knotifications (package (name "knotifications") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2785,7 +2785,7 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "1p15xgzy2h9ir8s5qz9jva6k41dszf8n5b13bs6rri3d0s0bdsbp")))) + "1rpflc2xjpjd588b5w8kfc4hfifxmzp58savk6x8q4vn45ldqwrx")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) @@ -2843,7 +2843,7 @@ covers feedback and persistent events.") (define-public kpackage (package (name "kpackage") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2852,7 +2852,7 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "0260mnqnmsx0b1vwy77hzc7zvf3qa4g66mrcs517qlmxnymicjms")))) + "0wxpim80hlw8ad1hlqpynjvag6z5w6r0ml1vk9zh84lif70m4d6g")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2962,7 +2962,7 @@ were traditional plugins.") (define-public kpty (package (name "kpty") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -2971,7 +2971,7 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "08s6r861j7azi907p3y6lidhhq3jfhb51id4ng8rz7dpvj4nfqk8")))) + "0hajvy7vyv1hj0hyxd86phkq7sjddpa7abvg6al4ifc39ax6b4yw")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2996,7 +2996,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3005,7 +3005,7 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "0x04cqm2flhx2hi804jqfx8mim7af49kirb3wabhrwmngi36ks9h")))) + "1r1gk4p8dlwdrsdv0wvw3jggln7zimp60bryh02x6hvl7i123mf7")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -3023,7 +3023,7 @@ gallons).") (define-public syndication (package (name "syndication") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3032,7 +3032,7 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "1jsdjm9wr2k9n32fdr0111b99j86p9dfvlk50w8kwkaw4nppwqym")))) + "0kk7dk4l96n53pv7m42nijygfh6hsr8g4fynp1803c3ij8fcbbyd")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -3055,7 +3055,7 @@ between feed formats.") (define-public baloo (package (name "baloo") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3064,7 +3064,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32 - "16a69hy2jh4gdnp1kfpq0kdsm2rym64har6j3jq4yyj05km4liq7")))) + "1bx68zd4pwd9iz890jvl0av7k0zcf7ff9m5f221mn7fzwyv6q16q")))) (build-system cmake-build-system) (propagated-inputs (list kcoreaddons kfilemetadata)) @@ -3110,7 +3110,7 @@ maintaining an index of the contents of your files.") (define-public plasma-activities (package (name "plasma-activities") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -3118,7 +3118,7 @@ maintaining an index of the contents of your files.") version ".tar.xz")) (sha256 (base32 - "147bvppqhq4sj9hkq85h4ap394ag2c2dg4bqa9d80gxzvdv30lv5")))) + "11i2ynw7gvlj164iq9bwz7q1dcwi82bd3dwaa67ypzsb4dwrbczc")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -3143,7 +3143,7 @@ with other frameworks.") (define-public plasma-activities-stats (package (name "plasma-activities-stats") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -3151,7 +3151,7 @@ with other frameworks.") version ".tar.xz")) (sha256 (base32 - "0sfni5mraa6m39w6gm26la28vhlwk43xh4n3bhpp2vqzj5fj7qpv")))) + "0xr0gzncb4sf6asdd5hgfs9bkfjv9z4nn215jvlmyk2r56zydylj")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -3168,7 +3168,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3177,7 +3177,7 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "101jmmlcla9jza4pgmbfvn1mq3wi55wayra61akascz38w62piqk")))) + "1v7vamf5541r28yvb6kc4jwjczcsglfhvia9gh8c3smhwpmbrnlp")))) (build-system cmake-build-system) (propagated-inputs (list kwidgetsaddons)) @@ -3240,7 +3240,7 @@ using the XBEL format.") (define-public kcmutils (package (name "kcmutils") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3249,7 +3249,7 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1giiizy0vpcbd1ax340cmn2lzic931scxdqglgmlq4v7zqzjkcar")))) + "14x9vjxfk2kxgv9053nzw9xq1ijaq4z1x5zgwrhy6876bbn7917b")))) (build-system cmake-build-system) (propagated-inputs (list kconfigwidgets @@ -3344,7 +3344,7 @@ KCModules can be created with the KConfigWidgets framework.") (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3353,7 +3353,7 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "10rr77abb44v8lhn9zvf65r8akybnjim443ib7dx3ljp2phykxwq")))) + "04jn7s044n5yl04ic8kd47y3z07j9cb48121bi8gnxq4zj1ld054")))) (build-system qt-build-system) (propagated-inputs (list kcodecs kconfig kcolorscheme kwidgetsaddons)) @@ -3435,7 +3435,7 @@ their settings.") (define-public kdeclarative (package (name "kdeclarative") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3444,7 +3444,7 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "11ba1zs6giwiplwrvn66k1jqh5fy63j6zm3qvsrzchy8lhhvaixv")))) + "10yg72mx4y6zd56nxdzcykxncnyfg1x7b20wbxj56g9fjwn1bi5k")))) (build-system cmake-build-system) (propagated-inputs (list kconfig qtdeclarative)) @@ -3524,7 +3524,7 @@ that offer bindings to some of the Frameworks.") (define-public kded (package (name "kded") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3533,7 +3533,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "177v7g9xdnnq6vj7xi016n0dr6cq4m8fg2ya97zfldmlz4ff4nmy")))) + "1c2lk418lazlynclw3zy79bzs21v962afpl98wzl9766mi0sjb19")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -3610,7 +3610,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3619,7 +3619,7 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "0nnbr850xdi6hh2d1nznjr7l099vnqzfw55lj0cbp4szxf3yaypj")))) + "14xkkbd7nq0hhlfk83fj363rxbcjj087pjg3xcig27ppph5qvh03")))) (build-system cmake-build-system) (propagated-inputs (list kpty)) @@ -3675,7 +3675,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3684,7 +3684,7 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "19m8rn8xz2cx9zsqhf1pnml6wnspr73iyg2yysnrq6w9wd5jfshd")))) + "191rlcwdyapv6m00vj99pq7w6sjlvmmkn54zmcicxf64izs1qfl8")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) @@ -3733,7 +3733,7 @@ window does not need focus for them to be activated.") (define-public kiconthemes (package (name "kiconthemes") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3742,7 +3742,7 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "0iqz2r5yx3n1jjkw9lhscm0g1gc8sq6q6ln5v0gakxy3iqrjr9fm")))) + "0c8kfbr0d9igxwjq1y3p4xs4qvj98cfxax54bbr8hgqbirwcbi6d")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules qttools shared-mime-info)) @@ -3894,7 +3894,7 @@ consumption.") (define-public kio (package (name "kio") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -3903,7 +3903,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0p87fj6js7gzl9mmlbfawivm8glzbricjhkwicifv5kyp7rk382z")) + "04wa36ybv38v3q22ykk28n5bmj0bfzcl3lik8qnk4yjp6hszi2ww")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -4108,7 +4108,7 @@ KIO enabled infrastructure.") (define-public knewstuff (package (name "knewstuff") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4117,7 +4117,7 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "0vqjv2fc6inqn6hygj3c4zwzfmjijf23hgq7kz01vhyyb84gbxmf")))) + "0yccff5rz5g00ja3q6gkyfv28qb32icvjs42q4gkm9drc2k8jmc1")))) (build-system cmake-build-system) (propagated-inputs (list attica @@ -4192,7 +4192,7 @@ specification.") (define-public knotifyconfig (package (name "knotifyconfig") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4201,7 +4201,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "0y7j7hy240nxhlzvnvxnjzjpr5h75ca2vm495ygn96n0d15l3vyq")))) + "1505xsrcn7zfaq5jkyj2dnj07fpagf4p3j2dmdgs1rjlzfzxcapv")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -4270,7 +4270,7 @@ notifications which can be embedded in your application.") (define-public kparts (package (name "kparts") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4279,7 +4279,7 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "13cr3q15nlmdasylr2ij6xcnnfmdc6d7rbzs41agjqvw7cfwac7z")))) + "07rp987bkzpvmb2735r3jm573dxmvyd92bs8hmnc2xvz4rxl3daf")))) (build-system qt-build-system) (arguments (list #:phases @@ -4350,7 +4350,7 @@ widgets with a user-interface defined in terms of actions.") (define-public kpeople (package (name "kpeople") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4359,7 +4359,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "0r198zxx67dzq5six0dzqycbl9asdjf1y4d0sx781ym2zjvqa4sa")))) + "1hm6f0rlsdnqcc0mi1ndqlja6vl2774300zcs85x3c306anxfb0h")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -4387,7 +4387,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4396,7 +4396,7 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1g3g65w36iswl0w4lx2sl4yl2l4cwqbpdx4g72lc3gqksgqrii5a")))) + "0c300cmn04nmh0h5slr4p9vhzr54add40v5hm2m4frzy4gpsyx2n")))) (build-system qt-build-system) (propagated-inputs (list kcoreaddons)) @@ -4491,7 +4491,7 @@ typed.") (define-public kservice (package (name "kservice") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4500,7 +4500,7 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "07waglza0bs5g75ppfggpm8q9vwmrcz7nfpkizdgg8zzqvixgffd")))) + "1ggq9i38p63i2imxnzalax015g3x9wvc5g5n6wn2ifczph2d5ka8")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kcoreaddons kdoctools)) @@ -4592,7 +4592,7 @@ types or handled by application specific code.") (define-public kstatusnotifieritem (package (name "kstatusnotifieritem") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4601,7 +4601,7 @@ types or handled by application specific code.") name "-" version ".tar.xz")) (sha256 (base32 - "1fc1p8f5r6kbrk715xv8mv1fyil3avdkf74hw55890hlfh8h2y9j")))) + "00w435q0dyyal5hx7q9z6nbzmy5wcwwrgwf44prx119dhqd5xvsx")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules qttools)) @@ -4615,7 +4615,7 @@ Items.") (define-public ktexteditor (package (name "ktexteditor") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4624,7 +4624,7 @@ Items.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "1m6nrknkdclrx31yicvndswlm8f8pggz2s88sl2g4rlxaiwilpl2")))) + "1hdqvfc5p7hlm4m3ng54w9q5bq8zz6rdmhlr75zn4swclrsqifwv")))) (build-system cmake-build-system) (propagated-inputs (list kparts @@ -4737,7 +4737,7 @@ library.") (define-public ktextwidgets (package (name "ktextwidgets") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4746,7 +4746,7 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0w6f7wfqvrb85bqjfrvcg96pf4skvnyzfmahbv9l96fy3936kg08")))) + "04h2fxamxxb09yvdb2i5lhs8643q2farq004yw0rs7l36k3g37d9")))) (build-system qt-build-system) (propagated-inputs (list ki18n sonnet)) @@ -4807,7 +4807,7 @@ It supports rich text as well as plain text.") (define-public ktexttemplate (package (name "ktexttemplate") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4816,7 +4816,7 @@ It supports rich text as well as plain text.") version ".tar.xz")) (sha256 (base32 - "145znvdb10jycpa0641lmr3izna5af48y79q9drfil6p1zl0yc3l")))) + "1ih4rdp7idjc3yz7jv26qv57p49lysrndzcn6kw1gbq8zy3kyni9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -4831,7 +4831,7 @@ to separate the structure of documents from the data they contain.") (define-public kwallet (package (name "kwallet") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4840,7 +4840,7 @@ to separate the structure of documents from the data they contain.") name "-" version ".tar.xz")) (sha256 (base32 - "0h4y3x4q6m796vy7ziyr75wns6jc8c5dn7fc252paw2ziq45m25j")))) + "0nl1blnpbvggv3r86m09skc46py0fsxhdayvipgsy683l58fzfcy")))) (build-system cmake-build-system) (arguments (list #:phases @@ -4919,7 +4919,7 @@ the passwords on KDE work spaces.") (define-public kxmlgui (package (name "kxmlgui") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -4928,7 +4928,7 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "02sbar2ydpvncl9cfgwdccgag8l8b3k7fbbnbjjwgvzaz73jp584")))) + "00yrbj66i7fydncbc8z2mnap2yfc5nz2xn6606zy1cz79barsm3m")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kconfigwidgets)) @@ -5021,7 +5021,7 @@ descriptions for integrating actions from plugins.") (define-public libplasma (package (name "libplasma") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -5029,7 +5029,7 @@ descriptions for integrating actions from plugins.") version ".tar.xz")) (sha256 (base32 - "1pj5lni2zsgw8qxl580jfpjz7p3l99aksx1bkhd1fvcvady6nass")))) + "0444dcm9dfikhmf9spadjgi5nrn50ilw5alr2w6nxs30k56k3zia")))) (build-system qt-build-system) (propagated-inputs (list kpackage kwindowsystem)) @@ -5157,7 +5157,7 @@ script engines.") (define-public purpose (package (name "purpose") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -5166,7 +5166,7 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32 - "03p5k6353jwzfkwwg4bz5n3m23xiv40fprkni8yam3jl07r6k09i")))) + "0x625b392wi5g52d1b9hpdb090jclpfapfl0k6fvgx9plw20my20")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules gettext-minimal)) @@ -5288,7 +5288,7 @@ applications.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append @@ -5297,7 +5297,7 @@ applications.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "0wggk50wcx23ahl95hxwlpv2zn1hbyg30v4gv9g7hj9f79fd30j6")))) + "1x0d3bhp8ak7fw6db3n6cjhx6xz0izl5h880r62jqbb05rs5ayy5")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -5546,7 +5546,7 @@ support.") (define-public kdav (package (name "kdav") - (version "6.4.0") + (version "6.5.0") (source (origin (method url-fetch) @@ -5554,7 +5554,7 @@ support.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1v1q21cfgny0chla9rkjdavnaw3i5v7m4qkkq0zl91492lsqjhng")))) + (base32 "1kzgds4w5awhg09l1yxmy58n2d070psn8vl2bv9nr51dcf5vn3wh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 1261467291..6451192d68 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -98,14 +98,14 @@ (define-public bluedevil (package (name "bluedevil") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0f9bd2i1kdpn90cmx4xvm6f5wfynrj3hirg9inynf68s6q6qi8mr")))) + "03ql1k0fcch14899mgw50ddrdqx98x094y1jh97214dmr5ffky3h")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules pkg-config qttools)) @@ -134,14 +134,14 @@ (define-public breeze (package (name "breeze") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1lbnspr3r6rhmam56ba6x3g0r6xcvfq7mpjn8r9raxfhvs6vlnzi")))) + "1981va061mrb3r01wm38xq55d7xnqdfwp7s02npbqg5h6zgjcrr2")))) (build-system qt-build-system) ;; TODO: Check whether is makes sence splitting into several outputs. (native-inputs @@ -186,7 +186,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") (define-public breeze-gtk (package (name "breeze-gtk") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -194,7 +194,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") "-" version ".tar.xz")) (sha256 (base32 - "1ny5k9968m2x7wfis760pfn4vq39wyqiw679vr26ijvwqk8z89x5")))) + "1jdf23bdigykjkf326ijg1hv46aq5q0fsx8p7xlxnpdwxpmgqnsy")))) (build-system qt-build-system) (arguments (list @@ -242,7 +242,7 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public discover (package (name "discover") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -254,7 +254,7 @@ Breeze is the default theme for the KDE Plasma desktop.") ".tar.xz")) (sha256 (base32 - "10sii3wsb0afi9p7ac9v0wkhnc4sv9wbw2ysinyalw4hrggrg8j5")))) + "116jarhrxxygl84k6ygwhp12fl0wnnz06pr42hk3mqgb1fckxrv4")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -267,6 +267,9 @@ Breeze is the default theme for the KDE Plasma desktop.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? + (setenv "XDG_DATA_DIRS" + (string-append (getcwd) + ":" (getenv "XDG_DATA_DIRS"))) (invoke "ctest" "-E" "knsbackendtest"))))))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list appstream-qt6 @@ -313,7 +316,7 @@ games, and tools.") (define-public drkonqi (package (name "drkonqi") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -321,7 +324,7 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1b90m22x5fzcwfns14rz5p7lj367wsa4sq1w7vkxvq2g8jgak8bv")))) + "0nrqw00ykqg0grbn54v0j0isxk94ill8ngxw815p343bn31ig5vb")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -388,7 +391,7 @@ games, and tools.") (define-public kactivitymanagerd (package (name "kactivitymanagerd") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -396,7 +399,7 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "0q3lac62crvjjnv66nylrd0639g3m51a9fngck23jw7ybbk9ii20")))) + "1h3hk1552yacalbwkyn17gyayv7lhw3b6qdip4z1r0dsf71m55lq")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) @@ -417,7 +420,7 @@ concept.") (define-public krdp (package (name "krdp") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -425,7 +428,7 @@ concept.") version ".tar.xz")) (sha256 (base32 - "1snk8srpa8ljccglrnd6sihffy678zfjn9wk5p3lhvz7kkxbk5wp")))) + "1jwiqmmwhcslj6zcjgm3jj3xkr3zkp3r8hbassykazg6bcc8xpkl")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:phases @@ -468,14 +471,14 @@ RDP server.") (define-public kde-gtk-config (package (name "kde-gtk-config") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kde-gtk-config-" version ".tar.xz")) (sha256 (base32 - "0ijf80c6cms29i98hrssw1x0ysfp7zz7g9jlskb8lgd9axazk90g")))) + "06c0z6ihgql7dapfijfrm6qz6z1sir38ayn74fyjax9fvb4fbm5k")))) (build-system qt-build-system) (arguments (list @@ -509,14 +512,14 @@ applications.") (define-public kdecoration (package (name "kdecoration") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "1yqd3f0prfy3nw2bxdadjp4swr11ljd15lwl4rsvcjpb8aglgp8m")))) + "1wdvnzjba239agrhpsd55d6nl79xnqnv8ahram4113h7d44f1w47")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs @@ -533,7 +536,7 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kde-cli-tools (package (name "kde-cli-tools") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -541,7 +544,7 @@ manager which re-parents a Client window to a window decoration frame.") (patches (search-patches "kde-cli-tools-delay-mime-db.patch")) (sha256 (base32 - "0yn89fqmh84nibpd9hy6pwy2ysp46i4268mw1sq6xjij50g0asfr")))) + "1qhsmsnyssf47hv5nd264b620jb9c6r36wx8bk2bxdmsf7y4mn6n")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -581,14 +584,14 @@ KDE Frameworks 5 to better interact with the system.") (define-public kdeplasma-addons (package (name "kdeplasma-addons") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ph5hdpm9z2bfq5wakfm2x6frb99hsm62gwz58ns11mwlqjpmxwx")))) + "04lspshznmfm75z32x4npids3wz7hdfi1bscs6iz7yf6a1z9lcwb")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -636,7 +639,7 @@ KDE Frameworks 5 to better interact with the system.") (define-public kgamma (package (name "kgamma") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -644,7 +647,7 @@ KDE Frameworks 5 to better interact with the system.") version ".tar.xz")) (sha256 (base32 - "0nskvsh4xagv55lv0wsm62m50y4hdjslhrzl2cb190ghaa245vdd")))) + "0z4af70xl8l5pldld98yhxwp5vsamdl46hkb4036m9vncqm8h85x")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) @@ -663,7 +666,7 @@ KDE Frameworks 5 to better interact with the system.") (define-public kglobalacceld (package (name "kglobalacceld") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -671,7 +674,7 @@ KDE Frameworks 5 to better interact with the system.") version ".tar.xz")) (sha256 (base32 - "0qm0lahlmksjd2q6qlp6h71chbfwwv8mwy76g9qz4j298prmb49m")))) + "1a5dhmh3l8i5x999lrh1vhpz1wcpk8lh4mkzx0bcjsiilfz97d3c")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:phases @@ -708,14 +711,14 @@ functionality") (define-public kinfocenter (package (name "kinfocenter") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0f2pqjzkgxa2sylcr560nw1ly998yvzyvpjpvb1q1af5jyzvxi39")))) + "1n904nn0jrrih9qk8cz2d2sp9pghr6qn0ra5jbbg2rpz4k1gv78p")))) (build-system cmake-build-system) (arguments (list @@ -800,7 +803,7 @@ computer's hardware.") (define-public kmenuedit (package (name "kmenuedit") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -808,7 +811,7 @@ computer's hardware.") ".tar.xz")) (sha256 (base32 - "11adzhl76ii7zd7ag2hh1xay92az2k465dlxizagml6aal7gn1lh")))) + "1l6z1bfcbnfk0xdymx0fv39f9mk2cgzkwqxw1bdl6a20wr2xg8n6")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) @@ -865,14 +868,14 @@ the schedule and venue information.") (define-public kpipewire (package (name "kpipewire") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ydf3f5v4hjr7yq3c0yj29wvk84cm2ys1fa8fmvs9wrv9q11f8pb")))) + "0d3i6d2lcykvlvf2brpqf78qwg9qyiy5jpsrdgd3cswazmb6s4db")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (propagated-inputs (list qtbase qtdeclarative @@ -902,7 +905,7 @@ PipeWire in Qt projects.") (define-public kscreen (package (name "kscreen") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -910,7 +913,7 @@ PipeWire in Qt projects.") ".tar.xz")) (sha256 (base32 - "0sq5wrx021yzwi0gmigl9y5mxqxhwf6kd38y2hjx9wbrb8q1j29h")))) + "1briwfqrif7lyx0vxz191mbckdgw08nj5lrbxj2q5z4pn3nn9zlr")))) (build-system cmake-build-system) (arguments ;; TODO: All tests fail @@ -945,14 +948,14 @@ KDE Plasma Workspaces.") (define-public ksshaskpass (package (name "ksshaskpass") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "0say4khh6lzl9zj7im4lrv3srsa6cic42zmc8y7niaf16bfm7agi")))) + "0335v6xky0s605q8178grp87dgar5yv3rgcjx1419a4sjdzk6wjv")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs @@ -970,7 +973,7 @@ call it if it is not associated to a terminal.") (define-public ksystemstats (package (name "ksystemstats") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -978,7 +981,7 @@ call it if it is not associated to a terminal.") version ".tar.xz")) (sha256 (base32 - "11af0fxpp22czgn6slbm6kq06nqjm0n4jv1av5k3ykyc8z6bbzf9")))) + "1743q0xyx1b465qhv7bg1xyblfwm515xfvifgzc3qxwhkyci64d4")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1053,14 +1056,14 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public layer-shell-qt (package (name "layer-shell-qt") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/layer-shell-qt-" version ".tar.xz")) (sha256 (base32 - "00pqbdjf42lvpp8xhx405vf79bw2gz0gxp3mmrnfjc3ihqybs0d2")))) + "0s1jzcfq3cqg87bw40krycimxxqq58h808gc92wqclzgdgfd4fb2")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs @@ -1079,14 +1082,14 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "0lz61kn9xp0afyb08f9ws4ayakwm5zdy0m57rcrsj4a1hq4hz762")))) + "0wzb79dwhwizlzvnjd62a2kdbbcrc2s36nlg3z23wp9nvvl0miqx")))) (build-system qt-build-system) (arguments (list #:tests? #f ;TODO: make tests pass @@ -1141,14 +1144,14 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public libkscreen (package (name "libkscreen") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "14xjncc9gfz441j8gmyggz2qwnhm3k0mj5xzp3vignf3drrz724r")))) + (base32 "0yv65jsfqynhhnrj54l8hgiv8immzsxky3gwdawp0qmwxjz640kk")))) (build-system qt-build-system) (arguments (list @@ -1228,14 +1231,14 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) (sha256 - (base32 "197zbddmykdfw6gh137fbpvnwv6f094932vzprgkvlv3m89n7s3a")))) + (base32 "1cf5ar63l81q41324g9h9712j66rl1s5n2brras83kkijnyax9yj")))) (native-inputs (list bash-minimal extra-cmake-modules pkg-config qttools)) (inputs @@ -1282,7 +1285,7 @@ with a ksysguardd daemon, which may also run on a remote system.") (define-public kwallet-pam (package (name "kwallet-pam") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1290,7 +1293,7 @@ with a ksysguardd daemon, which may also run on a remote system.") ".tar.xz")) (sha256 (base32 - "1nj00y67fpw5mk2nqx3gfqydddlzj9ysdnpp46cgl46873c7303b")))) + "0dif5y7qbayb2yfgl7940978ayyir948kpjavczvgkr70czb293k")))) (build-system qt-build-system) (arguments (list @@ -1307,7 +1310,7 @@ you login.") (define-public kwayland-integration (package (name "kwayland-integration") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1315,7 +1318,7 @@ you login.") version ".tar.xz")) (sha256 (base32 - "1k8ki5828x4y14k9sgjflcrj7cs89q69vqzhy576c3wnwp286hdl")))) + "0knfh2rr8xz1l7v54l1834qnvaryl73451lhxwfhdn11hq9jh7jw")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -1353,7 +1356,7 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1362,7 +1365,7 @@ KDE Frameworks components.") (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch")) (sha256 (base32 - "1gy61kfldrzrg1xrzjji75jsfdxihjhsrwykbi2sj6rqhp8bj8zv")))) + "0fpbmp6rshr3irmlzxcpsjchfp65ch91pb1kmlnaj8zaim3cxzzw")))) (build-system qt-build-system) (arguments (list @@ -1527,7 +1530,7 @@ conjunction with the KDE Plasma Desktop.") (define-public kwrited (package (name "kwrited") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1535,7 +1538,7 @@ conjunction with the KDE Plasma Desktop.") version ".tar.xz")) (sha256 (base32 - "08x0b3cxm9ynazanf6qq1hmyl86cqg8vh34k5zji6a4r19zdcj1l")))) + "0jw18m94cjjbcpn5xb3wrf6392yy52dz0rkdzvz7sjxpp6gadgng")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kpty knotifications)) @@ -1579,7 +1582,7 @@ and minimalistic.") (define-public milou (package (name "milou") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1587,7 +1590,7 @@ and minimalistic.") version ".tar.xz")) (sha256 (base32 - "127b16gcazpddnrx28iw8g1q8nym27iw3p2nnwvg75yjavf8lsfy")))) + "10h0f997lq2b9dp7c8symilgxg51hlnfpqcgb7j6x1574363r03j")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -1610,7 +1613,7 @@ on top of Baloo.") (define-public qqc2-breeze-style (package (name "qqc2-breeze-style") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1618,7 +1621,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "0s5ya52iixvps2vjq299qgs3q379c3dwdrmzz8yr50kj3qp32is9")))) + "0s2ibpavyf6yminw01z9a2v2xdxc9amazn5hcc695p7rar0vrfcg")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) @@ -1635,7 +1638,7 @@ on top of Baloo.") (define-public oxygen-sounds (package (name "oxygen-sounds") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1643,7 +1646,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "1m5slcxigcdcg9i10i3xnb0p2ji26lrnllr3p7b9kv39prlp29vz")))) + "1ja1lcm5hav1iyl115v6g250hnnq3znqwvlz37n7k7719jcfjxb8")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -1654,7 +1657,7 @@ on top of Baloo.") (define-public ocean-sound-theme (package (name "ocean-sound-theme") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1662,7 +1665,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "064s4ms3ga2985181gzzi4ky20g53c3djz1dblmjnq3i908npy86")))) + "0p3glpf2zhr9p2hs01vkxccgssz9brsjvdyywplxrc5qmk7h8052")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list qtbase)) @@ -1674,7 +1677,7 @@ on top of Baloo.") (define-public plasma (package (name "plasma") - (version "6.1.2") + (version (package-version breeze)) (source #f) (build-system trivial-build-system) (arguments @@ -1760,14 +1763,14 @@ on top of Baloo.") (define-public plasma5support (package (name "plasma5support") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0vgp3yjp44z17bdi9h2swxrvw7aqdhlixhww80xlc3cggzvpbn1p")))) + "1mj4vm1av582xq1ykxqacy06rkfb1dwpdqqi7l9czxwnch6xb7y9")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1891,14 +1894,14 @@ active window on Plasma Desktop.") (define-public plasma-browser-integration (package (name "plasma-browser-integration") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1h39nznvnfn3a9yvz8ml4kca5pzlrwj9n702nsa3srbqvr7nmwwy")))) + "0m9w9hnkxcx7sv3aipk19783c4n2s134iz0yrijhx2rwzvm9mgyn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) ;; TODO: Figure out how to integrate this package into web browsers @@ -1931,14 +1934,14 @@ the KDE Plasma 6 desktop.") (define-public plasma-desktop (package (name "plasma-desktop") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1b8zq81kdzqghp8ivm4zq5b645siayzldqddzpbrbhpi3bx68brn")))) + "1lc74i0pqhsj6yqc2czdvnl8n7ry63r2g34hf7avip7v0bv9gf43")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus @@ -2082,7 +2085,7 @@ activities effectively, without being distracting.") (define-public plasma-disks (package (name "plasma-disks") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2090,7 +2093,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1ipkgy6cfd9bdvwjis8ak4qfr313w1021sx7zm3pr25j26rxwvhi")))) + "0iscvysspd9x6g44hnrm1cm6pz6nqcgi2yb4hgapks9gpbd6npvr")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -2125,7 +2128,7 @@ activities effectively, without being distracting.") (define-public plasma-firewall (package (name "plasma-firewall") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2133,7 +2136,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "14yg8dwbja0dj26v14igvbb37si4m6bkdw50476k15ln057ag87j")))) + "0r5v6y5b96ajavmh6cg7y04l1gqfhr0j1j53ph59wr8cxnd1qgyb")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) @@ -2153,7 +2156,7 @@ activities effectively, without being distracting.") (define-public plasma-integration (package (name "plasma-integration") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2161,7 +2164,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "0nz5wczzpk28rmhsvilw94s30763zp04a9jn7i5lszazbdwp7vx3")))) + "0x5avhrd1c6lxzb3f4jnmdf57cbfxvsx279zw82bxrvqzliji888")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -2212,14 +2215,14 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nano (package (name "plasma-nano") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/plasma-nano-" version ".tar.xz")) (sha256 (base32 - "16482994pskvsnsvradcn6jcb1pvxn2mf4j248a2p8jirgfmsv13")))) + "1hl8v2wawhxclq9jmzvvjc1pbhj29p29kflpyc6jh6bqdc57skl4")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list qtbase @@ -2240,7 +2243,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nm (package (name "plasma-nm") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2248,7 +2251,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") ".tar.xz")) (sha256 (base32 - "0z0ij2mh04zwvvg7d43qy1sjavaqss2z8vh39gxb53l0gjnh4lav")))) + "1q85ynvgrz58bgpscmz0wa8llfvzcarnzknh026gcapkih84gbql")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -2379,7 +2382,7 @@ customizable platform for mobile devices.") (define-public plasma-pa (package (name "plasma-pa") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2387,7 +2390,7 @@ customizable platform for mobile devices.") version ".tar.xz")) (sha256 (base32 - "1xxdda41vj0afqr7byq1rmfzw5v04s2238y2liay903d0dgv04a2")))) + "0kbkwkrr3g3gysnabvf3n4x5rp5ikx2zc4zpxd2gzagnm1hd8jrl")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase ;; test require selenium-webdriver-at-spi-run @@ -2548,14 +2551,14 @@ Desktop.") (define-public plasma-vault (package (name "plasma-vault") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0w0v8jh2wd2v5srcgrm10jkwyg3ck62vcba1yn4n4v6f087z456h")))) + "1py8gcdcnbmrn24zrpkrj492a752mrfj5c7aqiszxxlvbd6gz91l")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list kio @@ -2610,14 +2613,14 @@ vaults.") (define-public plasma-systemmonitor (package (name "plasma-systemmonitor") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1yfqnby1b6231m918rvpd4lc9wq9w21sfdr5cln3skc4gbyy50pz")))) + "0mz49d61k69prvzsqh361gn2vg18916r093wm9vbqqd0kp94hai6")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n @@ -2649,7 +2652,7 @@ sensors, process information and other system resources.") (define-public plasma-welcome (package (name "plasma-welcome") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2658,7 +2661,7 @@ sensors, process information and other system resources.") version ".tar.xz")) (sha256 (base32 - "075l6j83p7zzx0hfska9bd1v44pr76xdym6p6m0z8adfvrl3ava1")))) + "0zivsp3kaaad0h6mj46x353lq6x114w339jka7fcsxcwzrwvdbd4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -2695,14 +2698,14 @@ sensors, process information and other system resources.") (define-public plasma-workspace (package (name "plasma-workspace") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1jnmqj16ivi2qv3q9i5fggknaw85drf216ml7ckvfvc5abxxx73r")))) + "0mlddkjxq7p01wgy8pzp65fhg1sihibzd32wn3s3zcn077frj86b")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg qttools @@ -2821,6 +2824,12 @@ sensors, process information and other system resources.") "/libexec/kglobalacceld")) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'add-span-header + (lambda _ + (substitute* "xembed-sni-proxy/sniproxy.cpp" + (("#include \"sniproxy.h\"") + (string-append "#include \"sniproxy.h\" +#include <span>"))))) (add-after 'unpack 'patch-workspace-bins (lambda* (#:key inputs #:allow-other-keys) (let ((xmessage (search-input-file inputs "/bin/xmessage")) @@ -2887,14 +2896,14 @@ hardware management, and a high degree of customizability.") (define-public plasma-workspace-wallpapers (package (name "plasma-workspace-wallpapers") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0cbnv28nf6130wrzsimlw9dfwblkc7p522mknqcphrqb3iql0jr1")))) + "1i23bfdfxvr0l0sd99hwl9hnxcnszppai7inrhbk6ycdc0imrxl8")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -2906,14 +2915,14 @@ hardware management, and a high degree of customizability.") (define-public print-manager (package (name "print-manager") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/print-manager-" version ".tar.xz")) (sha256 - (base32 "015vvl0q3fccjacszdzd78vsh1wykn6r9inxpvj660z2hsg4c1cm")))) + (base32 "1pqfs1v3ll8plb6950jn8s0fslkfvpzl89ix20hs2jw08kspnx65")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2943,14 +2952,14 @@ hardware management, and a high degree of customizability.") (define-public polkit-kde-agent (package (name "polkit-kde-agent") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-1-" version ".tar.xz")) (sha256 (base32 - "0vrry89icr1z30wf3lgz0gfyjhgsizy421mnlfn0f7bb0mjxmf97")))) + "1gyvbni0zhrw3bc5f1p5whyaqim0zpx0a37gznzcvaraf55rkykq")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) @@ -2974,14 +2983,14 @@ UI for Plasma") (define-public powerdevil (package (name "powerdevil") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1wqqk4imnhrmqwr1ynkgqcfh58hz70dacwmvcmq3qv85k2a8qkv2")))) + "1r8kj118vnjy3kcv16bhrdgja44dlvgjgvwp6gihb0s9wbi6dad1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list bluez-qt @@ -3028,14 +3037,14 @@ of a Plasma shell.") (define-public system-settings (package (name "system-settings") - (version "6.1.3") + (version "6.1.4") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/systemsettings-" version ".tar.xz")) (sha256 (base32 - "0c9130zvdrn7lm256adsx7knzmd95q5m8sx0r6wgxnxl5br09fk5")))) + "18vx02nwd7fq3r3smrq3yviz6x4n17b8kidrnfkmkdycfxi2dsn0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kauth diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index 3e46477724..c7487b1259 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz> ;;; Copyright © 2023 Ian Eure <ian@retrospec.tv> ;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net> +;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -116,9 +117,9 @@ (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define librewolf-source - (let* ((ff-src (firefox-source-origin "126.0.1" "0fr679rcwshwpfxidc55b2xsn4pmrr7p9ix4rr2mv2k7kwsjcc7n")) - (version "126.0.1-1") - (lw-src (librewolf-source-origin version "0cac80073vkzd85ai9rbnwixs1h9bpy4dj2ri6jxdlqsy5d663km"))) + (let* ((ff-src (firefox-source-origin "129.0.1" "0wy0fn0pavlhlkdybr59hhbn5ng0zn56mxa7gsknf8f2whiyipwx")) + (version "129.0.1-1") + (lw-src (librewolf-source-origin version "0pvv3v23q31hdjvqi1f3cqfyjrb8dbrrbfwxj2wacak1g0mzbxf4"))) (origin (method computed-origin-method) @@ -214,12 +215,12 @@ ;; Update this id with every update to its release date. ;; It's used for cache validation and therefore can lead to strange bugs. ;; ex: date '+%Y%m%d%H%M%S' -(define %librewolf-build-id "20240607212143") +(define %librewolf-build-id "20240817075827") (define-public librewolf (package (name "librewolf") - (version "126.0.1-1") + (version "129.0.1-1") (source librewolf-source) (build-system gnu-build-system) (arguments @@ -413,6 +414,7 @@ (setenv "CC" "clang") (setenv "CXX" "clang++") (setenv "MOZ_NOSPAM" "1") + (setenv "MOZ_APP_REMOTINGNAME" "LibreWolf") (setenv "MOZ_APP_NAME" "librewolf") (setenv "MOZBUILD_STATE_PATH" @@ -626,8 +628,7 @@ (("-NewPrivateWindow") "-new-private-window") (("StartupNotify=true") - "StartupNotify=true -StartupWMClass=Navigator")) + "StartupNotify=true\nStartupWMClass=LibreWolf")) (copy-file desktop-file "librewolf.desktop") (install-file "librewolf.desktop" applications)))) (add-after 'install-desktop-entry 'install-icons @@ -690,7 +691,7 @@ StartupWMClass=Navigator")) mesa mit-krb5 nspr - nss/fixed + nss-rapid pango pciutils pipewire diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8ca1df1185..a2a3601246 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5386,7 +5386,7 @@ thanks to the use of namespaces.") (substitute* (find-files "libexec/cli" "\\.exec$") (("\\$SINGULARITY_libexecdir/singularity/bin/([a-z]+)-suid" _ program) - (string-append "/run/setuid-programs/singularity-" + (string-append "/run/privileged/bin/singularity-" program "-helper"))) ;; These squashfs mount options are apparently no longer @@ -8933,7 +8933,13 @@ comparing system environments.") ((member (package-supported-systems psm)) `(("psm" ,psm))) (_ `())) + ("psm2" ,psm2) ("libnl" ,libnl))) + (arguments + (list #:configure-flags + #~(list "--enable-psm2" + "--enable-efa" + "--enable-verbs"))) (home-page "https://ofiwg.github.io/libfabric/") (synopsis "Open Fabric Interfaces") (description diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d85f83fbea..e2acf5712f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3116,6 +3116,9 @@ package.") (list sbcl-fiveam)) (inputs (list sbcl-bordeaux-threads)) + (arguments + ;; Disable flaky tests + (list #:tests? #f)) (synopsis "Portable channel-based concurrency for Common Lisp") (description "Common Lisp library for channel-based concurrency. In a nutshell, you create various threads sequentially executing tasks you need @@ -4796,8 +4799,8 @@ from/to strings, streams and files.") (sbcl-package->ecl-package sbcl-cl-csv)) (define-public sbcl-cl-data-structures - (let ((commit "25dd479377eb40ce54eed4ecc0d660aed32f3a78") - (revision "1")) + (let ((commit "ffab56830f3ed777450a065890484ef22147cd44") + (revision "2")) (package (name "sbcl-cl-data-structures") (version (git-version "1.4.1" revision commit)) @@ -4809,7 +4812,7 @@ from/to strings, streams and files.") (commit commit))) (file-name (git-file-name "cl-data-structures" version)) (sha256 - (base32 "1yhfahnsx56s9jzdk7jnqic5a3fiq29i1a9d0ay6fd1rg2wfa3k3")))) + (base32 "0h49h1x9dgr53imj0r4lgx0zvdsv3mnh7lyayzy9hlysy2ixp425")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-prove)) @@ -17681,7 +17684,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.60") + (version "0.61") (source (origin (method git-fetch) @@ -17689,7 +17692,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 "122ldxiddkscb3li5wjrppr7vyn77znyjfgs8pbflrskzyxlabdd")) + (base32 "1yszjy6a0q1jvdgd7fpmnvi9851s8ivp4plscw27lbnl7jlj1pmk")) (file-name (git-file-name "cl-ironclad" version)))) (build-system asdf-build-system/sbcl) (native-inputs diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 97f7dd357b..4f2e61733d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2023 Andrew Kravchuk <awkravchuk@gmail.com> ;;; Copyright © 2024 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2024 bigbug <bigbookofbug@proton.me> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) @@ -85,15 +87,19 @@ #:use-module (gnu packages libffcall) #:use-module (gnu packages libffi) #:use-module (gnu packages libsigsegv) + #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages m4) #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ninja) #:use-module (gnu packages notcurses) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages tcl) @@ -230,7 +236,7 @@ integration with code written in C.") (name "ccl") ;; XXX When updating this package, check whether we can simply append ;; VERSION to the ccl-bootstrap URL again, instead of per architecture. - (version "1.12.1") + (version "1.13") (source (origin (method git-fetch) (uri (git-reference @@ -239,7 +245,7 @@ integration with code written in C.") (file-name (git-file-name "ccl" version)) (sha256 (base32 - "1zz291lvsrr7pps8wfl2kdxsnzjngqi4v3mil14pga4r5zanmsi7")))) + "12cb3gp43bhl7nyms3a4lix8j1s3arnp124d3ahc2lhlrjirs0mr")))) (build-system gnu-build-system) ;; CCL consists of a "lisp kernel" and "heap image", both of which are ;; shipped in precompiled form in source tarballs. The former is a C @@ -253,18 +259,18 @@ integration with code written in C.") (uri (string-append "https://github.com/Clozure/ccl/releases/download/v" (match (%current-system) - ("armhf-linux" "1.12/linuxarm") + ("armhf-linux" "1.13/linuxarm") ;; XXX: This source only works on x86, but provide it as a ;; catch-all to prevent errors when querying this package ;; on unsupported platforms. - (_ "1.12.1/linuxx86")) + (_ "1.13/linuxx86")) ".tar.gz")) (sha256 (base32 (match (%current-system) ("armhf-linux" - "0x4bjx6cxsjvxyagijhlvmc7jkyxifdvz5q5zvz37028va65243c") - (_ "0ll017ajcfsyx8f7zsy4394y8xxvz40iz0gcsmznp0n3mf0xi67c")))))))) + "1mlj7lgn4p9bw1ki7gk00sj89cjv0cjpdmpp65brhx9q3fvkk9xf") + (_ "04ry8zwrcjjmzbxp43nkknchabk6i6mclrzg5biwfp1h64bcnzfx")))))))) (native-inputs (list cl-asdf m4)) (arguments @@ -367,6 +373,81 @@ generational, compacting garbage collector, and a convenient foreign-function interface.") (license license:asl2.0))) +(define-public clasp-cl + (package + (name "clasp-cl") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/clasp-developers/clasp/releases/download/" + version "/clasp-" version ".tar.gz")) + (sha256 + (base32 "10jjhcid6qp64gx29iyy5rqqijwy8hrvx66f0xabdj8w3007ky39")))) + (build-system gnu-build-system) + (inputs + (list boost clang-15 fmt `(,gcc "lib") gmp libelf libunwind llvm-15)) + (native-inputs + (list binutils-gold ninja pkg-config sbcl)) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'unpack 'patch-koga + (lambda* _ + (call-with-port (open-file "src/koga/units.lisp" "a") + (lambda (p) + (display "(defmethod configure-unit (c (u (eql :git))))\n" p))))) + (add-before 'configure 'set-configure-environment + (lambda* _ + (setenv "SOURCE_DATE_EPOCH" "1") + (setenv "ASDF_OUTPUT_TRANSLATIONS" + (string-append (getenv "PWD") + ":" + (getenv "PWD") + "/__fasls")))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (clang (assoc-ref inputs "clang")) + (ld-flags + (string-join + (apply append + (map (lambda (f) + (list "-L" f "-rpath" f)) + (string-split (getenv "LIBRARY_PATH") #\:))) + ","))) + (invoke "sbcl" + "--script" + "./koga" + "--skip-sync" + "--build-mode=bytecode-faso" + (string-append "--cc=" clang "/bin/clang") + (string-append "--cxx=" clang "/bin/clang++") + (string-append "--ldflags=-Wl," ld-flags) + "--reproducible-build" + "--package-path=/" + (string-append "--bin-path=" out "/bin") + (string-append "--lib-path=" out "/lib/clasp") + (string-append "--share-path=" out "/share/clasp"))))) + (replace 'build + (lambda* _ + (invoke "ninja" "-C" "build"))) + (replace 'install + (lambda* _ + (invoke "ninja" "-C" "build" "install")))))) + (home-page "https://clasp-developers.github.io/") + (synopsis "Common Lisp implementation based on LLVM and C++") + (description "Clasp is a new Common Lisp implementation that seamlessly + interoperates with C++ libraries and programs using LLVM for compilation to + native code. This allows Clasp to take advantage of a vast array of + preexisting libraries and programs, such as out of the scientific computing + ecosystem. Embedding them in a Common Lisp environment allows you to make use + of rapid prototyping, incremental development, and other capabilities that + make it a powerful language.") + (license license:lgpl2.1+))) + (define-public cl-asdf (package (name "cl-asdf") @@ -1272,14 +1353,14 @@ be built as a stand-alone REPL interpreter.") (define-public sbcl (package (name "sbcl") - (version "2.4.5") + (version "2.4.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1lbvb9rzlkl3h8s75i2js4dnmgxmvs41jxjb5dj0f603r688xxjd")) + (base32 "1lhia29g0byj7w3akd99sjb8kxp95adwqk2kbl0wsnk30cjlsm38")) (modules '((guix build utils))) (snippet '(begin @@ -1425,8 +1506,9 @@ be built as a stand-alone REPL interpreter.") `("clisp"))) (string-append "--prefix=" (assoc-ref outputs "out")) - ,@(if (target-ppc32?) - ;; 3072 is too much for this architecture. + ,@(if (or (target-ppc32?) + (target-x86-32?)) + ;; 3072 is too much for these architectures. `("--dynamic-space-size=2048") `("--dynamic-space-size=3072")) "--with-sb-core-compression" diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 0291f50302..1a969eb4b5 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -372,26 +372,23 @@ with freedesktop.org standard.") (substitute* '("mime-type/mime-type.c" "ptk/ptk-file-menu.c") (("/usr(/local)?/share/mime") mime))) #t))) - (add-after 'patch-mime-dirs 'patch-setuid-progs + (add-after 'patch-mime-dirs 'patch-privileged-programs (lambda _ - (let* ((su "/run/setuid-programs/su") - (mount "/run/setuid-programs/mount") - (umount "/run/setuid-programs/umount") - (udevil "/run/setuid-programs/udevil")) + (let ((privileged (lambda (command) + (string-append "/run/privileged/bin/" + command)))) (with-directory-excursion "src" (substitute* '("settings.c" "settings.h" "vfs/vfs-file-task.c" "vfs/vfs-volume-hal.c" "../data/ui/prefdlg.ui" "../data/ui/prefdlg2.ui") - (("(/usr)?/bin/su") su) - (("/(bin|sbin)/mount") mount) - (("/(bin|sbin)/umount") umount) - (("/usr/bin/udevil") udevil))) + (("(/usr)?/s?bin/(mount|umount|su|udevil)" _ _ command) + (privileged command)))) #t))) - (add-after 'patch-setuid-progs 'patch-spacefm-conf + (add-after 'patch-privileged-programs 'patch-spacefm.conf (lambda* (#:key inputs #:allow-other-keys) (substitute* "etc/spacefm.conf" (("#terminal_su=/bin/su") - "terminal_su=/run/setuid-programs/su") + "terminal_su=/run/privileged/bin/su") (("#graphical_su=/usr/bin/gksu") (string-append "graphical_su=" (search-input-file inputs "/bin/ktsuss"))))))) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ea7ae8c150..378cc91f93 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1262,14 +1262,14 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.12.5") + (version "1.12.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/download/v" version "/mu-" version ".tar.xz")) (sha256 - (base32 "1jwalqmvk5s4mf7bnz7gnzh6rii7n348bsflgdvyinia0zir42vp")))) + (base32 "0qdpag5skcwml4mrhz8205wfirayn55cqdydsy7ng6f9hyv3k9gq")))) (build-system meson-build-system) (native-inputs (list pkg-config @@ -2092,7 +2092,7 @@ facilities for checking incoming mail.") (package (name "dovecot") ;; Also update dovecot-pigeonhole when updating to a new minor version. - (version "2.3.21") + (version "2.3.21.1") (source (origin (method url-fetch) @@ -2100,7 +2100,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "0bah6rn5ihczai8q50p6pqxwj73j21smib89ycp7q8qwly9i1c85")) + (base32 "0zh9971d49dl5q1km31jnrd3vg53j9aaxnppic412xi9qiwa341d")) (patches (search-patches "dovecot-opensslv3.patch")))) (build-system gnu-build-system) @@ -2162,7 +2162,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") (let ((dovecot-version (version-major+minor (package-version dovecot)))) (package (name "dovecot-pigeonhole") - (version "0.5.21") + (version "0.5.21.1") (source (origin (method url-fetch) @@ -2170,7 +2170,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") "https://pigeonhole.dovecot.org/releases/" dovecot-version "/" "dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz")) (sha256 - (base32 "09zd7n6ljqaj3i3m6r1hn1vb1cjhy64040vji82i4rq7b4k1v9qw")) + (base32 "14j6bj9dc0c2f6pi251jyhfiwyg7n9gi2c840vg261v29cldnxq3")) (modules '((guix build utils))) (snippet '(begin @@ -2315,17 +2315,14 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (define-public isync (package (name "isync") - (version "1.4.4") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw")) - (patches - ;; Likely to be included in next version - (search-patches "isync-openssl3-fix.patch")))) + "13gpawspfpiw87wm2p6gzrm98xwy741k2ib1l6fjggw7jc81xj50")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3bb14a3c2..0a9f2ab7fb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1814,7 +1814,7 @@ extremely large and complex data collections.") (define-public hdf5-1.14 (package (inherit hdf5-1.8) - (version "1.14.0") + (version "1.14.3") (source (origin (method url-fetch) @@ -1828,8 +1828,19 @@ extremely large and complex data collections.") (take (string-split version #\.) 2)) "/src/hdf5-" version ".tar.bz2"))) (sha256 - (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4")) - (patches (search-patches "hdf5-config-date.patch")))))) + (base32 "05zr11y3bivfwrbvzbky1q2gjf6r7n92cvvdnh5jilbmxljg49cl")) + (patches (search-patches "hdf5-config-date.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments hdf5-1.8) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'configure 'skip-version-test + (lambda _ + ;; Skip test_check_version since the 'patch-settings' phase + ;; modifies the test reference. + (substitute* "test/test_check_version.sh.in" + (("TESTING\\(\\).*" all) + (string-append all "\nSKIP; exit 0\n"))))))))))) (define-public hdf5 ;; Default version of HDF5. @@ -2069,35 +2080,34 @@ Swath).") (license (license:non-copyleft home-page)))) (define-public hdf5-parallel-openmpi - (package/inherit hdf5-1.10 ;use the latest + (package/inherit hdf5-1.14 ;use the latest (name "hdf5-parallel-openmpi") (inputs `(("mpi" ,openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments (package-arguments hdf5) + (substitute-keyword-arguments (package-arguments hdf5-1.14) ((#:configure-flags flags) - ``("--enable-parallel" - ,@(delete "--enable-cxx" - (delete "--enable-threadsafe" ,flags)))) + #~(cons "--enable-parallel" + (delete "--enable-cxx" + (delete "--enable-threadsafe" #$flags)))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'build 'mpi-setup - ,%openmpi-setup) - (add-before 'check 'patch-tests - (lambda _ - ;; OpenMPI's mpirun will exit with non-zero status if it - ;; detects an "abnormal termination", i.e. any process not - ;; calling MPI_Finalize(). Since the test is explicitly - ;; avoiding MPI_Finalize so as not to have at_exit and thus - ;; H5C_flush_cache from being called, mpirun will always - ;; complain, so turn this test off. - (substitute* "testpar/Makefile" - (("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back) - (string-append front back "\n"))) - (substitute* "tools/test/h5diff/testph5diff.sh" - (("/bin/sh") (which "sh"))) - #t)))))) + #~(modify-phases #$phases + (add-after 'build 'mpi-setup + #$%openmpi-setup) + (add-before 'check 'patch-tests + (lambda _ + ;; OpenMPI's mpirun will exit with non-zero status if it + ;; detects an "abnormal termination", i.e. any process not + ;; calling MPI_Finalize(). Since the test is explicitly + ;; avoiding MPI_Finalize so as not to have at_exit and thus + ;; H5C_flush_cache from being called, mpirun will always + ;; complain, so turn this test off. + (substitute* "testpar/Makefile" + (("(^TEST_PROG_PARA.*)t_pflush1(.*)" front back) + (string-append front back "\n"))) + (substitute* "tools/test/h5diff/testph5diff.sh" + (("/bin/sh") (which "sh"))))))))) (synopsis "Management suite for data with parallel IO support"))) (define-public hdf5-blosc diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6e7d01ae34..fa74b50f26 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1490,12 +1490,12 @@ default.") (method url-fetch) (uri (string-append "mirror://kde/unstable/kaidan/" version "/kaidan-" version ".tar.xz")) - (modules '((guix build utils))) - (snippet - #~(begin - (delete-file-recursively "3rdparty"))) - (sha256 - (base32 "1waqv0fdkhvp3cqy2a2g6i2wc9s0zbvgzknymrwxy99mnx9ymw9g")))) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "3rdparty"))) + (sha256 + (base32 "1waqv0fdkhvp3cqy2a2g6i2wc9s0zbvgzknymrwxy99mnx9ymw9g")))) (build-system qt-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_TESTS=true"))) @@ -1503,8 +1503,8 @@ default.") perl pkg-config python-wrapper)) - (inputs (list kirigami - knotifications + (inputs (list kirigami-5 + knotifications-5 qtbase-5 qtdeclarative-5 qtgraphicaleffects diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index ad9af078eb..6325c9b96f 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -186,7 +186,7 @@ etc. via a Web interface. Features include: "src/zabbix_server/server.c") ;; 'fping' must be setuid, so look for it in the usual location. (("/usr/sbin/fping6?") - "/run/setuid-programs/fping"))))) + "/run/privileged/bin/fping"))))) (build-system gnu-build-system) (arguments (list #:configure-flags diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 4c18da30ef..bca215df47 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Paul Garlick <pgarlick@tourbillion-technology.com> ;;; Copyright © 2019, 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2024 Romain Garbage <romain.garbage@inria.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages pciutils) + #:use-module (gnu packages python) #:use-module (gnu packages xorg) #:use-module (gnu packages gtk) #:use-module (gnu packages xml) @@ -50,6 +52,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages parallel) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages valgrind) #:use-module (srfi srfi-1) #:use-module (ice-9 match)) @@ -185,7 +188,7 @@ bind processes, and much more.") ;; The latest stable series of hwloc. hwloc-2) -(define-public openmpi +(define-public openmpi-4 (package (name "openmpi") (version "4.1.6") @@ -309,6 +312,65 @@ software vendors, application developers and computer science researchers.") ;; See file://LICENSE (license license:bsd-2))) +(define-public openmpi openmpi-4) + +(define-public openmpi-5 + (package + (inherit openmpi) + (version "5.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.open-mpi.org/software/ompi/v" + (version-major+minor version) + "/downloads/openmpi-" version ".tar.bz2")) + (sha256 + (base32 "02x9xmpggw77mdpikjjx83j6i4v3gkqbncda73lk5axk0vr841cr")))) + + (inputs (modify-inputs (package-inputs openmpi) + ;; As of Open MPI 5.0.X, PMIx is used to communicate + ;; with SLURM, so SLURM'S PMI is no longer needed. + (delete "slurm") + (append ucx) ;for Infiniband support + (append openpmix) ;for PMI support (launching via "srun") + (append prrte))) ;for PMI support (launching via "srun") + (native-inputs (modify-inputs (package-native-inputs openmpi) + (append python))) + + (outputs '("out" "debug")) + (arguments + (substitute-keyword-arguments (package-arguments openmpi) + ((#:configure-flags _) + #~(list "--enable-mpi-ext=affinity" ;cr doesn't work + "--with-sge" + + #$@(if (package? (this-package-input "valgrind")) + #~("--enable-memchecker" + "--with-valgrind") + #~("--without-valgrind")) + + "--with-hwloc=external" + "--with-libevent" + + ;; This replaces --enable-mpirun-prefix-by-default wich is deprecated + ;; since 5.x. + "--enable-prte-prefix-by-default" + + ;; Enable support for the 'Process Management Interface for Exascale' + ;; (PMIx) used e.g. by Slurm for the management communication and + ;; coordination of MPI processes. + (string-append "--with-pmix=" #$(this-package-input "openpmix")) + (string-append "--with-prrte=" #$(this-package-input "prrte")) + + ;; Since 5.x, Infiniband support is provided by ucx. + ;; See https://docs.open-mpi.org/en/main/release-notes/networks.html#miscellaneous-network-notes + (string-append "--with-ucx=" #$(this-package-input "ucx")))) + + ((#:phases phases) + #~(modify-phases #$phases + (delete 'remove-absolute) + (delete 'scrub-timestamps))))))) + (define-public openmpi-c++ (package/inherit openmpi (name "openmpi-c++") @@ -450,14 +512,14 @@ arrays) that expose a buffer interface.") (define-public mpich (package (name "mpich") - (version "3.3.2") + (version "4.2.2") (source (origin (method url-fetch) (uri (string-append "http://www.mpich.org/static/downloads/" version "/mpich-" version ".tar.gz")) (sha256 (base32 - "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb")))) + "0h8xg1wi2d88hnfmj3xydf1hj78r7fh05jljhk5jgxmbmsrmngw8")))) (build-system gnu-build-system) (inputs `(,zlib @@ -468,7 +530,7 @@ arrays) that expose a buffer interface.") (list ucx) '()))) (native-inputs - (list perl which gfortran)) + (list perl which gfortran python-minimal)) (outputs '("out" "debug")) (arguments `(#:configure-flags @@ -547,3 +609,28 @@ Gigabit Ethernet, InfiniBand, Myrinet, Quadrics), and proprietary high-end computing systems (Blue Gene, Cray). It enables research in MPI through a modular framework for other derived implementations.") (license license:bsd-2))) + +(define-public mpich-ofi + (package/inherit mpich + (name "mpich-ofi") + (inputs (modify-inputs (package-inputs mpich) + (delete ucx) + (append libfabric) + (append rdma-core) + (append psm2))) + (arguments + (substitute-keyword-arguments (package-arguments mpich) + ((#:configure-flags flags) + #~(list "--disable-silent-rules" ;let's see what's happening + "--enable-debuginfo" + "--with-device=ch4:ofi" + + (string-append "--with-hwloc-prefix=" + #$(this-package-input "hwloc")) + + (string-append "--with-libfabric=" + #$(this-package-input "libfabric")))) + ((#:phases phases + '%standard-phases) + phases))) + (synopsis "Implementation of the Message Passing Interface (MPI) for OmniPath"))) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b22a755396..e5559ff46c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -371,12 +371,10 @@ local filesystem. It splits the file into blocks, hashes them, and compares them in order to efficiently transfer a minimal amount of data.") (license (list license:gpl2 license:gpl3)))) -;; This package does not have a release yet. -;; But this is required to provide a feature in PipeWire. (define-public libcamera (package (name "libcamera") - (version "0.1.0") + (version "0.3.1") (source (origin (method git-fetch) @@ -387,7 +385,7 @@ them in order to efficiently transfer a minimal amount of data.") (file-name (git-file-name name version)) (sha256 - (base32 "06dj3dpfbayj61015n5kffin2g3hyys11ra0px2g4hmrznvdkhc9")))) + (base32 "15wgy6dc56dwjyasw6w6x6d4j8475clbrxkgphc2zly6232ds7mw")))) (build-system meson-build-system) (outputs '("out" "doc" "gst" "tools")) (arguments @@ -395,6 +393,13 @@ them in order to efficiently transfer a minimal amount of data.") #:configure-flags #~(list (string-append "-Dbindir=" (assoc-ref %outputs "tools") "/bin") + + ;; In 0.3.1 release simple pipeline wasn't enabled for + ;; x86_64 by mistake, it's enabled a couple commits later. + ;; Remove this expression on the next release. + #$(if (target-x86-64?) + "-Dpipelines=ipu3,vimc,uvcvideo,simple" + "") "-Dtest=true" "-Dv4l2=true" ;; XXX: Requires bundled pybind11. "-Dpycamera=disabled") @@ -436,12 +441,13 @@ them in order to efficiently transfer a minimal amount of data.") glib gst-plugins-base gnutls + libevent libtiff libyaml openssl python-jinja2 python-ply - qtbase-5)) + qtbase)) (synopsis "Camera stack and framework") (description "LibCamera is a complex camera support library for GNU+Linux, Android, and ChromeOS.") @@ -1848,14 +1854,14 @@ network frames.") (define-public fping (package (name "fping") - (version "5.1") + (version "5.2") (source (origin (method url-fetch) (uri (string-append "https://fping.org/dist/fping-" version ".tar.gz")) (sha256 - (base32 "1zh9fkyn0bixgn77v9z6ayv446nqwx960hmly9m68xix0s62dr8y")))) + (base32 "0bz4n0c4p5v8yh1fzvfvbbydpg4vy6krligpw5vbpc1zsw82ssd7")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-ipv6"))) (home-page "https://fping.org/") @@ -4619,7 +4625,7 @@ QUIC protocol.") (define-public yggdrasil (package (name "yggdrasil") - (version "0.5.6") + (version "0.5.8") (source (origin (method git-fetch) @@ -4630,7 +4636,7 @@ QUIC protocol.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1wcvqk45p1k165bd32dc3hl73r0i6g14rxxkjxfr9x2d8410l91f")) + (base32 "0qcly06bljlilihrqrylhq53w3l4bfzmqqjq4cbn55nvsz2gbify")) (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments @@ -4676,7 +4682,8 @@ QUIC protocol.") go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text - go-golang-zx2c4-com-wireguard)) + go-golang-zx2c4-com-wireguard + go-nhooyr-io-websocket)) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 9224a8ed5a..1a684e6146 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -106,6 +106,8 @@ in the Mozilla clients.") (base32 "0v3zds1id71j5a5si42a658fjz8nv2f6zp6w4gqrqmdr6ksz8sxv")))))) +;; nss should track ESRs, but currently doesn't. 3.102.1 is the current ESR. + (define-public nss (package (name "nss") @@ -303,6 +305,71 @@ security standards.") (invoke "faketime" "2024-01-23" "./nss/tests/all.sh")) (format #t "test suite not run~%")))))))))))) +;; nss-rapid tracks the rapid release channel. Unless your package requires a +;; newer version, you should prefer the `nss' package, which tracks the ESR +;; channel. +;; +;; See https://wiki.mozilla.org/NSS:Release_Versions +;; and https://wiki.mozilla.org/Rapid_Release_Model + +(define-public nss-rapid + (package + (inherit nss) + (name "nss-rapid") + (version "3.103") + (source (origin + (inherit (package-source nss)) + (uri (let ((version-with-underscores + (string-join (string-split version #\.) "_"))) + (string-append + "https://ftp.mozilla.org/pub/mozilla.org/security/nss/" + "releases/NSS_" version-with-underscores "_RTM/src/" + "nss-" version ".tar.gz"))) + (sha256 + (base32 + "0qp9rs226rr6gh51b42cdbydr4mj80cli3bfqhh7bp3jyxbvcjkv")))) + (arguments + (substitute-keyword-arguments (package-arguments nss) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + ;; Use 127.0.0.1 instead of $HOST.$DOMSUF as HOSTADDR for + ;; testing. The latter requires a working DNS or /etc/hosts. + (setenv "DOMSUF" "localdomain") + (setenv "USE_IP" "TRUE") + (setenv "IP_ADDRESS" "127.0.0.1") + + ;; This specific test is looking at performance "now + ;; verify that we can quickly dump a database", and + ;; we're not testing performance here (especially + ;; since we're using faketime), so raise the + ;; threshold + (substitute* "nss/tests/dbtests/dbtests.sh" + ((" -lt 5") " -lt 50")) + + ;; Since the test suite is very lengthy, run the test + ;; suite once, not thrice as done by default, by + ;; selecting only the 'standard' cycle. + (setenv "NSS_CYCLES" "standard") + + ;; The "PayPalEE.cert" certificate expires every six months, + ;; leading to test failures: + ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To + ;; work around that, set the time to roughly the release date. + (invoke "faketime" "2024-08-17" "./nss/tests/all.sh")) + (format #t "test suite not run~%")))))))) + (synopsis "Network Security Services (Rapid Release)") + (description + "Network Security Services (@dfn{NSS}) is a set of libraries designed to +support cross-platform development of security-enabled client and server +applications. Applications built with NSS can support SSL v2 and v3, TLS, +PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other +security standards. + +This package tracks the Rapid Release channel, which updates frequently."))) (define-public nsncd (package (name "nsncd") diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 3b56580842..cb9fdaa09f 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -9,6 +9,8 @@ ;;; Copyright © 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,11 +31,13 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bison) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages tls) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -47,14 +51,16 @@ (define-public chrony (package (name "chrony") - (version "4.4") + (version "4.5") (source (origin - (method url-fetch) - (uri (string-append "https://download.tuxfamily.org/chrony/" - "chrony-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/chrony/chrony") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "123h2a9rpc6wbvnysvhl5pmckvynzrnqay7l00i18azrvbk0gyza")))) + (base32 "0w6wgpgvwidsfc4mmi5zb73y9lydzwgwxpj0q5r1m47gd1qxa24n")))) (build-system gnu-build-system) (arguments (list @@ -68,6 +74,9 @@ "--with-user=chrony") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-CC + (lambda _ + (setenv "CC" #$(cc-for-target)))) (add-after 'unpack 'stay-inside-out ;; Simply setting CHRONYVARDIR to something nonsensical at install ;; time would result in nonsense file names in man pages. @@ -79,23 +88,24 @@ (let* ((doc (string-append #$output "/share/doc/" #$name "-" #$version))) (for-each (cut install-file <> doc) - (list "README" "FAQ")) + (list "README")) (copy-recursively "examples" (string-append doc "/examples")))))))) (native-inputs - (list pkg-config)) + (list bison ruby-asciidoctor pkg-config)) (inputs (list gnutls libcap libseccomp nettle)) - (home-page "https://chrony.tuxfamily.org/") - (synopsis "System clock synchronisation service that speaks NTP") + (home-page "https://chrony-project.org/") + (synopsis "System clock synchronization service that speaks NTP") (description "Chrony keeps your system time accurate. It synchronises your computer's clock with @acronym{NTP, Network Time Protocol} servers, reference clocks such as GPS receivers, or even manual input of the correct time from a wristwatch. Chrony will determine the rate at which the computer gains or loses time, and -compensate for it. It can also operate as an NTPv4 (RFC 5905) server and peer -to tell time to other computers on the network. +compensate for it. It can also operate as an +NTPv4 (@url{https://www.rfc-editor.org/rfc/rfc5905, RFC 5905}) server and peer to +tell time to other computers on the network. It's designed to perform well even under adverse conditions: congested networks, unreliable clocks drifting with changes in temperature, and devices diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 1f252b21bf..6d09b1b1b8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1007,8 +1007,8 @@ transactions from C or Python.") (license license:gpl2+))) (define-public bffe - (let ((commit "7df2aa647d11342e3a446f44ef7626e58a1d5902") - (revision "6")) + (let ((commit "0fc06c7dad2904989fc8c48f5a20c46a60254e9b") + (revision "7")) (package (name "bffe") (version (git-version "0" revision commit)) @@ -1019,7 +1019,7 @@ transactions from C or Python.") (commit commit))) (sha256 (base32 - "04gg21rjl3c1l8i2wnq8w1w6zfh2qmp9ay839ll90c1jf9bc3sn4")) + "0wkszdlsxw335wwh3qi2g7hfyrrnmmqx0kr02yqb8vasmn3vm8jz")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs @@ -1548,8 +1548,8 @@ environments.") "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "406db8a8db53731de432c452902a098915e876c2") - (revision "109")) + (let ((commit "492d4628887ea726cedc1c2b55743acfe32dfe0c") + (revision "110")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1560,7 +1560,7 @@ environments.") (commit commit))) (sha256 (base32 - "0yi3xji5qm6r5h6nmfbxqgaipp4al08h2mn6sci85ikm80vvy66a")) + "0ssns2l4dl54igqrr874g6z32s9r9qdf7dzfrqar4mmjz343n8rp")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 2e00701582..e75e902a68 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net> +;;; Copyright © 2024 Romain Garbage <romain.garbage@inria.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages freeipmi) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) @@ -227,6 +229,7 @@ when jobs finish.") `(,hwloc-2 "lib") json-c linux-pam + openpmix munge numactl readline)) @@ -243,6 +246,14 @@ when jobs finish.") (string-append "--with-json=" #$(this-package-input "json-c")) (string-append "--with-munge=" #$(this-package-input "munge")) + ;; Use PMIx bundled with Open MPI (this is required for Open MPI 5.x). + ;; Note: Older versions that inherit from this package lack the + ;; 'openpmix' dependency. + #$(let ((openmpix (this-package-input "openpmix"))) + (if openmpix + #~(string-append "--with-pmix=" #$openmpix) + "--without-pmix")) + ;; 32-bit support is marked as deprecated and needs to be ;; explicitly enabled. #$@(if (target-64bit?) '() '("--enable-deprecated"))) @@ -304,10 +315,10 @@ by managing a queue of pending work.") (define-public slurm-21.08 (package - (inherit slurm) + (inherit slurm-22.05) (version "21.08.8") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-22.05)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -315,14 +326,19 @@ by managing a queue of pending work.") (patches '()) ;drop 'salloc' patch (sha256 (base32 - "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf")))))) + "1sjln54idc9rhg8f2nvm38sgs6fncncyzslas8ixy65pqz2hphbf")))) + + ;; This and older versions of slurm have PMIx support but they seem to + ;; require an older version of openpmix. Disable PMIx support. + (inputs (modify-inputs (package-inputs slurm-22.05) + (delete "openpmix"))))) (define-public slurm-20.11 (package - (inherit slurm) + (inherit slurm-21.08) (version "20.11.9") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-21.08)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -334,10 +350,10 @@ by managing a queue of pending work.") (define-public slurm-20.02 (package - (inherit slurm) + (inherit slurm-20.11) (version "20.02.6-1") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.11)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -347,7 +363,7 @@ by managing a queue of pending work.") (base32 "0qj4blfymrd2ry2qmb58l3jbr4jwygc3adcfw7my27rippcijlyc")))) (arguments - (substitute-keyword-arguments (package-arguments slurm) + (substitute-keyword-arguments (package-arguments slurm-20.11) ((#:configure-flags flags ''()) #~(append '("CFLAGS=-O2 -g -fcommon" "LDFLAGS=-fcommon") #$flags)))))) @@ -357,7 +373,7 @@ by managing a queue of pending work.") (inherit slurm-20.02) (version "19.05.8") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.02)) (method url-fetch) (uri (string-append "https://download.schedmd.com/slurm/slurm-" @@ -370,11 +386,11 @@ by managing a queue of pending work.") ;; Same as Debian 10 (define-public slurm-18.08 (package - (inherit slurm-20.02) + (inherit slurm-19.05) (version "18.08.9") (source (origin - (inherit (package-source slurm)) + (inherit (package-source slurm-20.02)) (uri (string-append "https://download.schedmd.com/slurm/slurm-" version ".tar.bz2")) @@ -612,3 +628,63 @@ debug information. "This header-only C++ library provides a portable interface to single-instruction multiple-data (SIMD) intrinsics.") (license license:expat)))) + +(define-public openpmix + (package + (name "openpmix") + (version "4.2.8") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openpmix/openpmix/releases/download/v" + version "/pmix-" version ".tar.bz2")) + (sha256 + (base32 + "1j9xlhqrrmgjdkwakamn78y5gj756adi53hn25zksgr3is3l5d09")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list (string-append "--with-hwloc=" + (ungexp (this-package-input "hwloc") "lib"))))) + (inputs (list libevent `(,hwloc "lib"))) + (native-inputs (list perl python)) + (synopsis "PMIx library") + (description + "PMIx is an application programming interface standard that provides +libraries and programming models with portable and well-defined access to +commonly needed services in distributed and parallel computing systems.") + (home-page "https://pmix.org/") + ;; The provided license is kind of BSD-style but specific. + (license (license:fsf-free "https://github.com/openpmix/openpmix?tab=License-1-ov-file#License-1-ov-file")))) + +(define-public prrte + (package + (name "prrte") + (version "3.0.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/openpmix/prrte/releases/download/v" + version "/prrte-" version ".tar.bz2")) + (sha256 + (base32 + "0wiy0vk37v4db1jgxza8bci0cczcvj34dalzsrlz05dk45zb7dl3")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags #~(list (string-append "--with-hwloc=" + (assoc-ref %build-inputs "hwloc")) + (string-append "--with-pmix=" #$(this-package-input "openpmix"))))) + (inputs (list libevent + `(,hwloc "lib") + openpmix)) + (native-inputs (list perl)) + (synopsis "PMIx Reference RunTime Environment (PRRTE)") + (description + "The PMIx Reference RunTime Environment is a runtime environment +containing the reference implementation and capable of operating +within a host SMS. The reference RTE therefore provides an easy way of +exploring PMIx capabilities and testing PMIx-based applications +outside of a PMIx-enabled environment.") + (home-page "https://openpmix.github.io/") + ;; The provided license is kind of BSD-style but specific. + (license (license:fsf-free "https://github.com/openpmix/prrte?tab=License-1-ov-file#License-1-ov-file")))) diff --git a/gnu/packages/patches/heatshrink-add-cmake.patch b/gnu/packages/patches/heatshrink-add-cmake.patch new file mode 100644 index 0000000000..f67f87126e --- /dev/null +++ b/gnu/packages/patches/heatshrink-add-cmake.patch @@ -0,0 +1,111 @@ +From 0886e9ca76552b8e325841e2b820b4563e5d5aba Mon Sep 17 00:00:00 2001 +From: tamasmeszaros <meszaros.q@gmail.com> +Date: Thu, 27 Jul 2023 23:11:25 +0200 +Subject: [PATCH] Add CMake build script + +--- + CMakeLists.txt | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ + Config.cmake.in | 5 +++ + 2 files changed, 87 insertions(+) + create mode 100644 CMakeLists.txt + create mode 100644 Config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..5b840eb +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,82 @@ ++cmake_minimum_required(VERSION 3.10) ++ ++project(heatshrink C) ++ ++add_library(${PROJECT_NAME} heatshrink_decoder.c heatshrink_encoder.c) ++add_library(${PROJECT_NAME}_dynalloc heatshrink_decoder.c heatshrink_encoder.c) ++ ++find_library(MATH_LIBRARY m) # Business as usual ++if(MATH_LIBRARY) ++ target_link_libraries(${PROJECT_NAME} PUBLIC ${MATH_LIBRARY}) ++endif() ++ ++target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>) ++target_include_directories(${PROJECT_NAME}_dynalloc PUBLIC $<INSTALL_INTERFACE:include>) ++ ++target_compile_definitions(${PROJECT_NAME} PUBLIC HEATSHRINK_DYNAMIC_ALLOC=0) ++target_compile_definitions(${PROJECT_NAME}_dynalloc PUBLIC HEATSHRINK_DYNAMIC_ALLOC=1) ++ ++if (UNIX) ++ add_executable(${PROJECT_NAME}_cmd heatshrink.c) ++ target_link_libraries(${PROJECT_NAME}_cmd ${PROJECT_NAME}_dynalloc) ++ set_target_properties(${PROJECT_NAME}_cmd PROPERTIES OUTPUT_NAME ${PROJECT_NAME}) ++endif () ++ ++# Installation and export: ++ ++include(CMakePackageConfigHelpers) ++ ++write_basic_package_version_file( ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ VERSION 0.4.1 ++ COMPATIBILITY AnyNewerVersion ++) ++ ++set(_exported_targets ${PROJECT_NAME} ${PROJECT_NAME}_dynalloc) ++if (UNIX) ++ list(APPEND _exported_targets ${PROJECT_NAME}_cmd) ++endif () ++ ++install(TARGETS ${_exported_targets} ++ EXPORT ${PROJECT_NAME}Targets ++) ++ ++export(EXPORT ${PROJECT_NAME}Targets ++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake" ++ NAMESPACE ${PROJECT_NAME}:: ++) ++ ++include(GNUInstallDirs) ++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) ++ ++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ INSTALL_DESTINATION ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ heatshrink_common.h ++ heatshrink_config.h ++ heatshrink_encoder.h ++ heatshrink_decoder.h ++ DESTINATION ++ include/${PROJECT_NAME} ++ ) ++ ++install(EXPORT ${PROJECT_NAME}Targets ++ FILE ++ ${PROJECT_NAME}Targets.cmake ++ NAMESPACE ++ ${PROJECT_NAME}:: ++ DESTINATION ++ ${ConfigPackageLocation} ++) ++ ++install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" ++ DESTINATION ++ ${ConfigPackageLocation} ++) +diff --git a/Config.cmake.in b/Config.cmake.in +new file mode 100644 +index 0000000..0809ba9 +--- /dev/null ++++ b/Config.cmake.in +@@ -0,0 +1,5 @@ ++@PACKAGE_INIT@ ++ ++if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) ++ include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") ++endif () diff --git a/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch new file mode 100644 index 0000000000..4fe520318a --- /dev/null +++ b/gnu/packages/patches/icu4c-icu-22132-fix-vtimezone.patch @@ -0,0 +1,31 @@ +Source: https://unicode-org.atlassian.net/browse/ICU-22132?focusedCommentId=166752 +Author: Sean Burke +License: +Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1843007 + +diff --git a/icu4c/source/i18n/vtzone.cpp b/icu4c/source/i18n/vtzone.cpp +index 3035106701..5e738e11fa 100644 +--- a/source/i18n/vtzone.cpp ++++ b/source/i18n/vtzone.cpp +@@ -1735,14 +1735,14 @@ VTimeZone::write(VTZWriter& writer, UErrorCode& status) const { + } + } + } else { +- UnicodeString icutzprop; +- UVector customProps(nullptr, uhash_compareUnicodeString, status); ++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status); + if (olsonzid.length() > 0 && icutzver.length() > 0) { +- icutzprop.append(olsonzid); +- icutzprop.append(u'['); +- icutzprop.append(icutzver); +- icutzprop.append(u']'); +- customProps.addElement(&icutzprop, status); ++ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status); ++ icutzprop->append(olsonzid); ++ icutzprop->append(u'['); ++ icutzprop->append(icutzver); ++ icutzprop->append(u']'); ++ customProps.adoptElement(icutzprop.orphan(), status); + } + writeZone(writer, *tz, &customProps, status); + } diff --git a/gnu/packages/patches/isync-openssl3-fix.patch b/gnu/packages/patches/isync-openssl3-fix.patch deleted file mode 100644 index 6a2363e972..0000000000 --- a/gnu/packages/patches/isync-openssl3-fix.patch +++ /dev/null @@ -1,81 +0,0 @@ -Upstream status: Taken from master branch. Likely included in versions > 1.4.4 - -Fixes issues with OpenSSL3. See related thread: -https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2jnr8hESp1PUW+6@bulldog/ - -From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <ossi@users.sf.net> -Date: Mon, 6 Jun 2022 11:55:37 +0200 -Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL - connections - -gmail apparently doesn't send a close notification (SSL_shutdown()) -before closing the TCP socket. ---- - src/drv_imap.c | 7 +++++-- - src/socket.c | 9 +++++++++ - src/socket.h | 1 + - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/src/drv_imap.c b/src/drv_imap.c -index fb8d165..6286045 100644 ---- a/src/drv_imap.c -+++ b/src/drv_imap.c -@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) - error( "IMAP error: unexpected BYE response: %s\n", cmd ); - /* We just wait for the server to close the connection now. */ - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); - } else { - /* We still need to wait for the LOGOUT's tagged OK. */ - } -@@ -1882,10 +1883,12 @@ static void - imap_cleanup_p2( imap_store_t *ctx, - imap_cmd_t *cmd ATTR_UNUSED, int response ) - { -- if (response == RESP_NO) -+ if (response == RESP_NO) { - imap_cancel_store( &ctx->gen ); -- else if (response == RESP_OK) -+ } else if (response == RESP_OK) { - ctx->expectEOF = 1; -+ socket_expect_eof( &ctx->conn ); -+ } - } - - /******************* imap_open_store *******************/ -diff --git a/src/socket.c b/src/socket.c -index ac3c847..892cece 100644 ---- a/src/socket.c -+++ b/src/socket.c -@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) - conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); - } - -+void -+socket_expect_eof( conn_t *sock ) -+{ -+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL -+ if (sock->ssl) -+ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); -+#endif -+} -+ - int - socket_read( conn_t *conn, char *buf, uint len ) - { -diff --git a/src/socket.h b/src/socket.h -index 5b1edd0..af679aa 100644 ---- a/src/socket.h -+++ b/src/socket.h -@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); - void socket_start_deflate( conn_t *conn ); - void socket_close( conn_t *sock ); - void socket_expect_activity( conn_t *sock, int expect ); -+void socket_expect_eof( conn_t *sock ); - int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ - char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ - typedef enum { KeepOwn = 0, GiveOwn } ownership_t; --- -2.39.2 - diff --git a/gnu/packages/patches/prusa-slicer-boost-fixes.patch b/gnu/packages/patches/prusa-slicer-boost-fixes.patch deleted file mode 100644 index 5bca271625..0000000000 --- a/gnu/packages/patches/prusa-slicer-boost-fixes.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fixes for Boost compatibility. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch - ---- a/src/hints/HintsToPot.cpp -+++ b/src/hints/HintsToPot.cpp -@@ -1,6 +1,7 @@ - #include <iostream> - #include <vector> - #include <string> -+#include <boost/nowide/fstream.hpp> - #include <boost/filesystem.hpp> - #include <boost/dll.hpp> - #include <boost/property_tree/ini_parser.hpp> -@@ -9,7 +10,7 @@ - - bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data) - { -- boost::filesystem::ofstream file(std::move(path), std::ios_base::app); -+ boost::nowide::ofstream file(std::move(path), std::ios_base::app); - for (const auto& element : data) - { - //Example of .pot element ---- a/src/libslic3r/Preset.cpp -+++ b/src/libslic3r/Preset.cpp -@@ -25,6 +25,7 @@ - #include <stdexcept> - #include <unordered_map> - #include <boost/format.hpp> -+#include <boost/nowide/fstream.hpp> - #include <boost/filesystem.hpp> - #include <boost/filesystem/fstream.hpp> - #include <boost/algorithm/string.hpp> -@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree) - VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all) - { - ptree tree; -- boost::filesystem::ifstream ifs(path); -+ boost::nowide::ifstream ifs(path); - boost::property_tree::read_ini(ifs, tree); - return VendorProfile::from_ini(tree, path, load_all); - } ---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp -+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp -@@ -10,6 +10,7 @@ - #include "libslic3r/Platform.hpp" - #include "libslic3r/Config.hpp" - -+#include <boost/nowide/fstream.hpp> - #include <boost/filesystem.hpp> - #include <boost/log/trivial.hpp> - #include <boost/dll/runtime_symbol_info.hpp> -@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog() - - } // namespace GUI - } // namespace Slic3r --#endif // __linux__ -\ No newline at end of file -+#endif // __linux__ ---- a/src/slic3r/GUI/GUI_App.cpp -+++ b/src/slic3r/GUI/GUI_App.cpp -@@ -13,6 +13,7 @@ - #include <cstdlib> - #include <regex> - #include <string_view> -+#include <boost/nowide/fstream.hpp> - #include <boost/algorithm/string/predicate.hpp> - #include <boost/algorithm/string.hpp> - #include <boost/format.hpp> ---- a/src/slic3r/GUI/HintNotification.cpp -+++ b/src/slic3r/GUI/HintNotification.cpp -@@ -15,6 +15,7 @@ - #include "libslic3r/PrintConfig.hpp" - - #include <boost/algorithm/string/replace.hpp> -+#include <boost/nowide/fstream.hpp> - #include <boost/filesystem.hpp> - #include <boost/nowide/fstream.hpp> - #include <boost/log/trivial.hpp> -@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f - - void write_used_binary(const std::vector<std::string>& ids) - { -- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); -+ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary); - cereal::BinaryOutputArchive archive(file); - HintsCerealData cd { ids }; - try -@@ -84,7 +85,7 @@ void read_used_binary(std::vector<std::string>& ids) - BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string(); - return; - } -- boost::filesystem::ifstream file(path); -+ boost::nowide::ifstream file(path); - cereal::BinaryInputArchive archive(file); - HintsCerealData cd; - try diff --git a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch b/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch deleted file mode 100644 index affa506b1c..0000000000 --- a/gnu/packages/patches/prusa-slicer-with-cereal-1.3.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix for building with cereal>=1.3.1. -This patch comes from Gentoo: - portage/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -127,7 +127,7 @@ - set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") - endif () - --target_link_libraries(PrusaSlicer libslic3r cereal) -+target_link_libraries(PrusaSlicer libslic3r libcereal) - - if (APPLE) - # add_compile_options(-stdlib=libc++) ---- a/src/slic3r/CMakeLists.txt -+++ b/src/slic3r/CMakeLists.txt -@@ -260,7 +260,7 @@ - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) -+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) - - if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) ---- a/src/libslic3r/CMakeLists.txt -+++ b/src/libslic3r/CMakeLists.txt -@@ -395,7 +395,7 @@ - target_link_libraries(libslic3r - libnest2d - admesh -- cereal -+ libcereal - libigl - miniz - boost_libs ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -446,6 +446,12 @@ - - # Find the Cereal serialization library - find_package(cereal REQUIRED) -+add_library(libcereal INTERFACE) -+if (NOT TARGET cereal::cereal) -+ target_link_libraries(libcereal INTERFACE cereal) -+else() -+ target_link_libraries(libcereal INTERFACE cereal::cereal) -+endif() - - # l10n - set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") diff --git a/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch new file mode 100644 index 0000000000..aadf976588 --- /dev/null +++ b/gnu/packages/patches/prusa-wxwidgets-makefile-fix.patch @@ -0,0 +1,112 @@ +diff --git a/Makefile.in b/Makefile.in +index 8f33aa2ff4..39928382da 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -4358,7 +4358,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS = \ + monodll_msw_utils.o \ + monodll_utilsexc.o \ + monodll_fswatcher.o \ +- monodll_msw_secretstore.o ++ monodll_msw_secretstore.o \ + monodll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \ +@@ -5284,7 +5284,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \ +@@ -6196,7 +6196,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ + monodll_uuid.o \ + monodll_msw_evtloop.o \ + monodll_access.o \ +- monodll_dark_mode.o ++ monodll_dark_mode.o \ + monodll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \ +@@ -6371,7 +6371,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 = \ + monolib_msw_utils.o \ + monolib_utilsexc.o \ + monolib_fswatcher.o \ +- monolib_msw_secretstore.o ++ monolib_msw_secretstore.o \ + monolib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \ +@@ -7297,7 +7297,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \ +@@ -8209,7 +8209,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ + monolib_uuid.o \ + monolib_msw_evtloop.o \ + monolib_access.o \ +- monolib_dark_mode.o ++ monolib_dark_mode.o \ + monolib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \ +@@ -8436,7 +8436,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 = \ + basedll_msw_utils.o \ + basedll_utilsexc.o \ + basedll_fswatcher.o \ +- basedll_msw_secretstore.o ++ basedll_msw_secretstore.o \ + basedll_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \ +@@ -8523,7 +8523,7 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 = \ + baselib_msw_utils.o \ + baselib_utilsexc.o \ + baselib_fswatcher.o \ +- baselib_msw_secretstore.o ++ baselib_msw_secretstore.o \ + baselib_msw_uilocale.o + @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3) + @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \ +@@ -9464,7 +9464,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \ +@@ -10376,7 +10376,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ + coredll_uuid.o \ + coredll_msw_evtloop.o \ + coredll_access.o \ +- coredll_dark_mode.o ++ coredll_dark_mode.o \ + coredll_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \ +@@ -11204,7 +11204,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \ +@@ -12116,7 +12116,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ + corelib_uuid.o \ + corelib_msw_evtloop.o \ + corelib_access.o \ +- corelib_dark_mode.o ++ corelib_dark_mode.o \ + corelib_msw_bmpbndl.o + @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7) + @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \ diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c22c4248bc..1cf2190371 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2024 dan <i@dan.games> ;;; Copyright © 2023 Benjamin Slade <slade@lambda-y.net> +;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1489,7 +1490,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") (define-public pdfgrep (package (name "pdfgrep") - (version "2.1.2") + (version "2.2.0") (source (origin (method url-fetch) @@ -1497,7 +1498,7 @@ PDF. Indeed @command{pdfposter} was inspired by @command{poster}.") name "-" version ".tar.gz")) (sha256 (base32 - "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf")))) + "1jr0qqvkcb3xz0ps111cqwwxp1b5g5rrf75ab5whkvy0whqyaq86")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a0eec2baed..816aca2d59 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -33,7 +33,7 @@ ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2022, 2023 Evgeny Pisemsky <mail@pisemsky.site> -;;; Copyright © 2022, 2023 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2022, 2023, 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Mădălin Ionel Patrașcu <madalinionel.patrascu@mdc-berlin.de> ;;; Copyright © 2023 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com> @@ -6877,6 +6877,46 @@ from various sources. For instance, it contains all IANA types and the knowledge of Apache.") (license (package-license perl)))) +(define-public perl-minimumversion + (package + (name "perl-minimumversion") + (version "1.40") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DB/DBOOK/Perl-MinimumVersion-" + version ".tar.gz")) + (sha256 + (base32 "145yl4qv14xcrr74w1qvdb6s0h5lj8smnfawfnj0rmv0rdwab2bm")))) + (build-system perl-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-programs + (lambda _ + (wrap-program (string-append #$output "/bin/perlver") + (list "PERL5LIB" ":" + 'prefix + (list (string-append (getenv "PERL5LIB") ":" + #$output + "/lib/perl5/site_perl"))))))))) + (inputs (list bash-minimal)) + (propagated-inputs (list perl-file-find-rule + perl-file-find-rule-perl + perl-params-util + perl-ppi + perl-ppix-regexp + perl-ppix-utils)) + (home-page "https://metacpan.org/release/Perl-MinimumVersion") + (synopsis "Find a minimum required version of perl for Perl code") + (description + "@samp{Perl::MinimumVersion} takes Perl source code and calculates the minimum +version of perl required to be able to run it. Because it is based on the @samp{PPI} +(Perl Parsing Interface), it can do this without loading the code. The distribution +comes with a script called @samp{perlver}.") + (license license:perl-license))) + (define-public perl-mixin-linewise (package (name "perl-mixin-linewise") @@ -9148,6 +9188,28 @@ replacing the \"@code{PPI}\" at the front of the module name with in @code{PPIx::Utilities::Node}.") (license license:perl-license))) +(define-public perl-ppix-utils + (package + (name "perl-ppix-utils") + (version "0.003") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/D/DB/DBOOK/PPIx-Utils-" + version ".tar.gz")) + (sha256 + (base32 "04dszlp7yas3yi7gm1l2g47h88i52n7gwj3jnq0vw0xdivycr6ra")))) + (build-system perl-build-system) + (propagated-inputs (list perl-b-keywords perl-ppi)) + (home-page "https://metacpan.org/release/PPIx-Utils") + (synopsis "Utility functions for Perl PPI") + (description + "@samp{PPIx::Utils} is a collection of utility functions for working +with @samp{PPI} documents. The functions are organized into +submodules, and may be imported from the appropriate submodules or via +this module.") + (license license:perl-license))) + (define-public perl-probe-perl (package (name "perl-probe-perl") diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 7d2d1708c7..bdef2f2d7f 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.55.15") + (version "2.55.22") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1n8dbr7d5xw2nq8pjvnp3hk1rdycn633qiib35ccirxppq635mcx")) + (base32 "1yb69gaiigyin520qnmvzr9g9n66f6chya1mgxvv2a49nj59bcxa")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 94a0406ea7..5bc57fe0e5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -45,7 +45,7 @@ ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Pradana Aumars <paumars@courrier.dev> ;;; Copyright © 2021, 2022, 2024 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2022, 2024 jgart <jgart@dismail.de> ;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> @@ -831,6 +831,24 @@ ASGI server.") way around. It depends only on the Python standard library.") (license license:asl2.0))) +(define-public python-httpauth + (package + (name "python-httpauth") + (version "0.4.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "httpauth" version)) + (sha256 + (base32 + "1m6rwvivg61l3h34hf6p6gkqmr69sb1c4k5ha379nxq0p8bfgahb")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/jonashaag/httpauth") + (synopsis "WSGI HTTP Digest Authentication middleware") + (description "@code{python-httpauth} is WSGI middleware that secures some/all +routes using HTTP Digest Authentication.") + (license license:bsd-2))) + (define-public python-css-html-js-minify (package (name "python-css-html-js-minify") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7daef3afa2..a5553007dd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6993,22 +6993,22 @@ via commands such as @command{rst2man}, as well as supporting Python code.") (define-public python-docx (package (name "python-docx") - (version "0.8.11") + (version "1.1.2") (source (origin (method url-fetch) - (uri (pypi-uri "python-docx" version)) + (uri (pypi-uri "python_docx" version)) (sha256 (base32 - "1i7bxghb7knlyjain101qg1jmmz2b6qj03bi3vfxhvcml0rx418i")))) + "1z9ffsvksaaxr90ijzq4k3adzb6p5ipy2j3rrbfjl05rjlpg5w8c")))) (build-system pyproject-build-system) (native-inputs (list behave - python-flake8 - python-mock python-pyparsing - python-pytest)) + python-pytest + python-pytest-cov + python-pytest-xdist)) (propagated-inputs - (list python-lxml)) + (list python-lxml python-typing-extensions)) (home-page "https://github.com/python-openxml/python-docx/") (synopsis "Python library to create and modify Microsoft Word documents") (description "This Python library can be used to create and update @@ -17156,7 +17156,7 @@ JSON Reference and JSON Pointer.") (define-public python-fastbencode (package (name "python-fastbencode") - (version "0.0.7") + (version "0.3.1") (source (origin (method url-fetch) @@ -17165,7 +17165,7 @@ JSON Reference and JSON Pointer.") ;; Delete pre-generated Cython C files. (snippet '(for-each delete-file (find-files "." "\\.c$"))) (sha256 - (base32 "1r66w3vpmvfmssshjpgqaj2m14c8p94nymr96mwn61idajz9mg5n")))) + (base32 "15x1in22gwam7wwga5lbj1pd8hc9jk741pia3pv1m29n2xywpq2z")))) (build-system python-build-system) (native-inputs (list python-cython)) (home-page "https://github.com/breezy-team/fastbencode") diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9547481caf..b47fea0391 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2022-2024 Remco van 't Veer <remco@remworks.net> ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> @@ -7810,6 +7810,26 @@ documentation for Ruby code.") (home-page "https://github.com/flori/tins") (license license:expat))) +(define-public ruby-gemtext + (package + (name "ruby-gemtext") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "gemtext" version)) + (sha256 + (base32 "1z559f5z0zvwnqgnny0zf4mppiary020ljxwpw3bdxi2hr9aj3gp")))) + (build-system ruby-build-system) + (synopsis "Gemtext parser for Ruby") + (description + "This package is a Ruby parser library for Gemtext (hypertext format +which is intended to serve as the native response format of the Gemini +file transfer protocol) and produces a document object of various +nodes.") + (home-page "https://github.com/exastencil/gemtext") + (license license:expat))) + (define-public ruby-gem-hadar (package (name "ruby-gem-hadar") diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm index fac00ee760..393c2941d5 100644 --- a/gnu/packages/rush.scm +++ b/gnu/packages/rush.scm @@ -27,14 +27,14 @@ (define-public rush (package (name "rush") - (version "2.2") + (version "2.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/rush/rush-" version ".tar.gz")) (sha256 (base32 - "1kcqilbcvxsh89196ryh3p9zh4b266517q9681mjmckvj5v57plm")))) + "1nqjjbamdn4lcysc2hji3i73jjl1ghivb24h12zh79xnka438vr6")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/rush/") (synopsis "Restricted user (login) shell") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7de25356c7..4ee49cdf97 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -50,6 +50,7 @@ (define-module (gnu packages rust-apps) #:use-module (guix build-system cargo) #:use-module (guix build-system pyproject) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) @@ -66,6 +67,7 @@ #:use-module (gnu packages crates-crypto) #:use-module (gnu packages crates-io) #:use-module (gnu packages crates-graphics) + #:use-module (gnu packages crates-gtk) #:use-module (gnu packages crates-tls) #:use-module (gnu packages crates-vcs) #:use-module (gnu packages crates-web) @@ -77,6 +79,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) @@ -855,6 +858,88 @@ defaults for 80% of the use cases.") (description "This package provides a fast Terminal UI for git.") (license license:expat))) +(define-public helvum + (package + (name "helvum") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/pipewire/helvum") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q8gkx7djrfdl8fykppsqkxiadsq47v0xhj612nxlrvjz8n77ygn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-glib" ,rust-glib-0.18) + ("rust-libadwaita" ,rust-libadwaita-0.5) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pipewire" ,rust-pipewire-0.7)) + #:imported-modules (,@%glib-or-gtk-build-system-modules + ,@%cargo-build-system-modules) + #:modules ((guix build cargo-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-before 'install 'install-extra + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (source (assoc-ref inputs "source")) + (share (string-append out "/share")) + (hicolor (string-append share "/icons/hicolor"))) + (mkdir-p hicolor) + (with-directory-excursion hicolor + (mkdir-p "scalable/apps") + (install-file + (string-append source "/data/icons/org.pipewire.Helvum.svg") + "scalable/apps") + (mkdir-p "symbolic/apps") + (install-file + (string-append + source "/data/icons/org.pipewire.Helvum-symbolic.svg") + "symbolic/apps")) + (with-directory-excursion share + (mkdir-p "applications") + (with-directory-excursion "applications" + (install-file + (string-append + source "/data/org.pipewire.Helvum.desktop.in") ".") + (substitute* "org.pipewire.Helvum.desktop.in" + (("@icon@") "org.pipewire.Helvum") + (("Exec=helvum") + (string-append "Exec=" + (string-append out "/bin/helvum")))) + (rename-file "org.pipewire.Helvum.desktop.in" + "org.pipewire.Helvum.desktop")) + (mkdir-p "metainfo") + (with-directory-excursion "metainfo" + (install-file + (string-append + source + "/data/org.pipewire.Helvum.metainfo.xml.in") ".") + (substitute* "org.pipewire.Helvum.metainfo.xml.in" + (("@app-id@") "org.pipewire.Helvum")) + (rename-file "org.pipewire.Helvum.metainfo.xml.in" + "org.pipewire.Helvum.metainfo.xml")))))) + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs (list pkg-config clang)) + (inputs (list glib gtk libadwaita pipewire)) + (home-page "https://gitlab.freedesktop.org/pipewire/helvum") + (synopsis "GTK patchbay for pipewire") + (description "This package provides a GTK patchbay for pipewire.") + (license license:gpl3))) + (define-public hexyl (package (name "hexyl") diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index da2957fe7a..655e34dab5 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -134,7 +134,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "5.1.11") + (version "5.1.19") (source (origin (method git-fetch) @@ -143,7 +143,7 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09mhpwvqsr3pd2by3jm5jzjhyfx0f80bii35zd81vbzy85z26igg")))) + (base32 "12hhr5v4shsg47wg10p7l03xhzpc1yk46h4bfxq5c224cbf4qrs8")))) (build-system glib-or-gtk-build-system) (native-inputs (list autoconf diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index a6a8bb0cd1..1eb77d03d9 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -538,7 +538,7 @@ Latin script and other languages.") (define-public direnv (package (name "direnv") - (version "2.32.3") + (version "2.34.0") (source (origin (method git-fetch) (uri (git-reference @@ -547,7 +547,7 @@ Latin script and other languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1hyl67n7na19zm3ksiiyva4228alx0jfh9l3v1mxszn9prwgcfjc")))) + "0g04yxsj78v664dhkfa6fhm0vi2gzx1agr3h47dnm2f55wnymz0j")))) (build-system go-build-system) (arguments '(#:import-path "github.com/direnv/direnv" diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9dde918e06..45621ded98 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -710,13 +710,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-165") + (version "3.1-166") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "16clxh0b8sr2k3vddfip3awimn17ffkd5kwgygi8n4y2jfjbndzw")))) + (base32 "0qlpj3hjnlvd7x3ayjhvvpxlc2z4bfwk9qpglw8mnxbqipp18yi3")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -1607,13 +1607,13 @@ syntax that can be converted to XHTML or other formats.") (define-public r-yaml (package (name "r-yaml") - (version "2.3.8") + (version "2.3.10") (source (origin (method url-fetch) (uri (cran-uri "yaml" version)) (sha256 (base32 - "1n1zlbnq3ldipnnm08whpvm8r21vxg4c9jzg7x7j3blw2pi7kl4y")))) + "0v9al1fh82vpjhml91j73sim7gfyc0154kxaam41sdkf6qnx8dp2")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/yaml/") (synopsis "Methods to convert R data to YAML and back") @@ -1625,13 +1625,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.47") + (version "1.48") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "1kx6g8ddbigwx3bmq771gwi3din3fxjn59l801904kjaz6dq9pgs")))) + "15zipywk2ayrmy0p7q4d18512c2cgr9kk1lmc7gyi8bxv8k5j6sh")))) (build-system r-build-system) (propagated-inputs (list r-evaluate r-highr r-xfun r-yaml)) @@ -2739,14 +2739,14 @@ R version.") (define-public r-checkmate (package (name "r-checkmate") - (version "2.3.1") + (version "2.3.2") (source (origin (method url-fetch) (uri (cran-uri "checkmate" version)) (sha256 (base32 - "1xl4313kav3fy32ff9mdlm03za1mrwlym6d5abrkf0a0r86bmrp7")))) + "1qw81bs3lhwr1m6wlbs0l0j669051n60x4ca2821599ddhnp6mbj")))) (build-system r-build-system) (propagated-inputs (list r-backports)) @@ -2937,14 +2937,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "1cyx2yv2l446xwf0a0im70zfd6jlpg8113ncgdydajyvx1mb9f0q")))) + "13gp6q8s0pdjvnd7mnmdqhmmsb0mf4m3snq99j6js8c4sll27895")))) (properties `((upstream-name . "openssl") (updater-extra-inputs . ("openssl")))) @@ -3090,13 +3090,13 @@ tools to simplify the devolpment of R packages.") (define-public r-withr (package (name "r-withr") - (version "3.0.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (cran-uri "withr" version)) (sha256 (base32 - "1rz0pgm1bg3cnc09s8q8yyg83lmf8bv9arlasciqqr0fdpgfwy4c")))) + "0h9qbaa4i63awk176i3pm7bia7wgssav9zk9jvc7sg3k5yng2wym")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -3227,13 +3227,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.12.8.4.0") + (version "14.0.0-1") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "0iihy2pbmc56s5s6x7ac1c1biqda60gyqkddvn2c211j0xjnigya")))) + "145sci5fkwzrngqx2ykpxvvy3wn5wjfjfl7wmw92gn9yvkxd9i40")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs @@ -3255,13 +3255,13 @@ the header files from the templated Armadillo library.") (define-public r-bitops (package (name "r-bitops") - (version "1.0-7") + (version "1.0-8") (source (origin (method url-fetch) (uri (cran-uri "bitops" version)) (sha256 (base32 - "1i0phmq5yynla5x0frqll1gbf5ww59p3sgz1s06a354zqf9grdg9")))) + "0f1744pi3qb1av41man6xp2xalwcjslz3qbk35gccpb4d6glp8bq")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/bitops") (synopsis "Bitwise operations") @@ -3471,13 +3471,13 @@ engine (version 3.8.8.2) is included.") (define-public r-rcurl (package (name "r-rcurl") - (version "1.98-1.14") + (version "1.98-1.16") (source (origin (method url-fetch) (uri (cran-uri "RCurl" version)) (sha256 (base32 - "1kq3ydvm7hvy8pxk9iy13pkq5mxyxqlx4mpjsadzl7a7jj32gbgf")))) + "19qddkyasfwa61mj0r0m4wk2xhpsqxf2dikih0s1fdjr207c938s")))) (properties `((upstream-name . "RCurl"))) (build-system r-build-system) (arguments @@ -3632,14 +3632,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "2.1-0") + (version "2.1-1") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "1whcch1lw9y5fgy205377hr69xdjmav57z63vzgj7ammihja0yvd")))) + "1p83g6qj8y4xblggm12bhr9zpsqbrrc7lbbigxcafhhi9c8v08v7")))) (build-system r-build-system) (propagated-inputs (list r-mass r-nlme)) (home-page "https://cran.r-project.org/web/packages/segmented") @@ -3674,13 +3674,13 @@ worker processes and collect and return the results on the master.") (define-public r-sparsem (package (name "r-sparsem") - (version "1.84") + (version "1.84-2") (source (origin (method url-fetch) (uri (cran-uri "SparseM" version)) (sha256 (base32 - "05pxj16l1d9smlsn9h3pxcnd49s8l7f6088xvn808pa1f3h9dybn")))) + "0rc6x466jhalb6baxxhffmmcpi03nndvvighp696rrvrhsxzv015")))) (properties `((upstream-name . "SparseM"))) (native-inputs @@ -5758,14 +5758,14 @@ regression methodology including model selections and multivariate statistics.") (define-public r-pcapp (package (name "r-pcapp") - (version "2.0-4") + (version "2.0-4-1") (source (origin (method url-fetch) (uri (cran-uri "pcaPP" version)) (sha256 (base32 - "0cw18pcbpsr5rc8fxbwnzfag5g76j4hscij7j08zlbyr2436gifn")))) + "04xqicm1c16ajhzvlg17w8y50qnbqjisj3xvgpi3k18idkmmf6xx")))) (properties `((upstream-name . "pcaPP"))) (build-system r-build-system) (propagated-inputs @@ -5975,14 +5975,14 @@ based on an interface to Fortran implementations by M. J. D. Powell.") (define-public r-rcppeigen (package (name "r-rcppeigen") - (version "0.3.4.0.0") + (version "0.3.4.0.1") (source (origin (method url-fetch) (uri (cran-uri "RcppEigen" version)) (sha256 (base32 - "0djiyimgka7g3kfakb6mfaq7cxna9kn6kgib59x9p7qj24ha1m18")))) + "09jf5bvz77qsx4m6draarm7an07yxvip6bbmjbfsl2mm93qliv95")))) (properties `((upstream-name . "RcppEigen"))) (build-system r-build-system) (propagated-inputs @@ -6100,14 +6100,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-35.4") + (version "1.1-35.5") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "1zwr0wyrxllysbm2ca7hawzh4kmyxk23hkvszvzddjgi7wkw76jq")))) + "0w2i2d3q19kbx3scd7p7dyfpfpcqb3d5h47y5rb2jr59gvdn8rkx")))) (build-system r-build-system) (propagated-inputs (list r-boot @@ -7508,13 +7508,13 @@ L-Moments and Distributional Least Absolutes.") (define-public r-exact (package (name "r-exact") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (cran-uri "Exact" version)) (sha256 - (base32 "0a33gbhzd580i31xxsjxigg0nl8ag1x4xz3jqmq5jqappc6f5d2k")))) + (base32 "0hikz8f19blywxs66xj6zf4krwyivsy3w165qvrnb0m2l6dx1l7v")))) (properties `((upstream-name . "Exact"))) (build-system r-build-system) (propagated-inputs (list r-rootsolve)) @@ -7537,13 +7537,13 @@ Calculates confidence intervals for the difference in proportion.") (define-public r-desctools (package (name "r-desctools") - (version "0.99.54") + (version "0.99.55") (source (origin (method url-fetch) (uri (cran-uri "DescTools" version)) (sha256 - (base32 "16qbm1l1281yj1cg6fp8xgd8xdshpz9a09f0b9cyimsjbm01c2j7")))) + (base32 "07dgif06kl2p2qzcg827y05al1k1qy21a5gkz24jbd6xds161mg5")))) (properties `((upstream-name . "DescTools"))) (build-system r-build-system) (arguments diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 5db070a72d..18b96041a5 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages game-development) #:use-module (gnu packages gettext) @@ -329,6 +330,23 @@ and metadata, and the journal with querying and full text search.") (substitute* "autogen.sh" (("^\"\\$srcdir/configure" m) (string-append "#" m))))) + (add-after 'unpack 'patch-references + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/sugar3/eggsmclient-xsmp.c" + (("/bin/rm") (search-input-file inputs "/bin/rm"))) + (substitute* "src/sugar3/mime.py" + (("'/usr/local/share/'" m) + (string-append m ", '/run/current-system/profile/share'"))) + (substitute* "src/sugar3/bundle/activitybundle.py" + (("'update-mime-database', mime_dir") + (string-append "'" + (search-input-file inputs "/bin/update-mime-database") + "', mime_dir"))) + (substitute* "src/sugar3/bundle/bundle.py" + (("'unzip', '-o'") + (string-append "'" + (search-input-file inputs "/bin/unzip") + "', '-o'"))))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/sugar-activity3") @@ -345,7 +363,9 @@ and metadata, and the journal with querying and full text search.") libx11 libxfixes libxi - python)) + python + shared-mime-info + unzip)) (propagated-inputs ;; The gi typelib files are needed by users of this library. (list gdk-pixbuf @@ -483,6 +503,64 @@ a Tetris-like game.") license:gpl2+ license:gpl3+)))) +(define-public sugar-cellgame-activity + (let ((commit "4a22fd177af224d2df588590eb835affacd5ca72") + (revision "1")) + (package + (name "sugar-cellgame-activity") + (version (git-version "5" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/cellgame") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09dxq06dr43i3g8im4j1xffl19rzr1pwbixwgb0kipnmbx8pln5c")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (add-after 'unpack 'inject-load-path + (lambda _ + (substitute* "activity.py" + (("^import pygame") + (string-append "\ +import sys +for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): + try: + sys.path.index(directory) + except ValueError: + sys.path.insert(1, directory) +import pygame +"))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list gtk+ + sugar-toolkit-gtk3)) + (inputs (list python-pygame)) + (native-inputs + (list gettext-minimal)) + (home-page "https://github.com/sugarlabs/cellgame") + (synopsis "Cell game for Sugar") + (description "This game for the Sugar desktop is based on the mechanisms +present in gene regulatory networks.") + (license license:gpl3+)))) + (define-public sugar-chat-activity ;; The last release was in 2019 and since then commits have been published ;; that include build fixes and translation updates. @@ -535,6 +613,119 @@ a Tetris-like game.") or classmates.") (license license:gpl2+)))) +(define-public sugar-classify-cats-activity + (let ((commit "83aa89788c65bfdd3f77e24ac5a32b37f9518e54") + (revision "1")) + (package + (name "sugar-classify-cats-activity") + (version (git-version "2" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/classify-cats") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "101drh1dqgr9qsz3r1fzkcn5h6z720zskaqnz2aixzp2ybvh17wk")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list gdk-pixbuf + gobject-introspection + gtk+ + python-pygobject + sugar-toolkit-gtk3)) + (native-inputs + (list gettext-minimal)) + (home-page "https://github.com/sugarlabs/classify-cats") + (synopsis "Classify cats based on various criteria") + (description "This is a Sugar activity where players classify cats based +on various criteria.") + (license license:gpl3+)))) + +(define-public sugar-commander-activity + (let ((commit "a018652903e1c52c86ebf23e3250e7b68327427f") + (revision "1")) + (package + (name "sugar-commander-activity") + (version (git-version "11" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/sugar-commander") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02n5wqh9cwr3jnjaxyd9kxcls4h3fdhhxdcyvvxmya08h20idvgd")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (add-after 'unpack 'inject-load-path + (lambda _ + (substitute* "sugarcommander.py" + (("^import logging") + (string-append "\ +import sys +for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): + try: + sys.path.index(directory) + except ValueError: + sys.path.insert(1, directory) +import logging +"))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list cairo + gdk-pixbuf + gobject-introspection + gtk+ + python-pygobject + sugar-toolkit-gtk3)) + (inputs (list python-pygame)) + (native-inputs + (list gettext-minimal)) + (home-page "https://github.com/sugarlabs/sugar-commander") + (synopsis "Manage your Sugar journal") + (description "Sugar-commander lets you import items from removeable +devices like USB drives and SD cards using a familiar hierarchical view of +files on these devices, as opposed to the flattened Journal view that the +Sugar Journal gives to these devices. It also enables you to see how much +disk space each Journal entry uses, generates thumbnails, and does other +things to enhance your use of the Journal.") + (license license:gpl2+)))) + (define-public sugar-help-activity (let ((commit "492531e95a4c60af9b85c79c59c24c06c2cd4bb3") (revision "1")) @@ -839,6 +1030,66 @@ handheld mode, with extremely low power consumption and simple navigation controls.") (license license:gpl2+)))) +(define-public sugar-river-crossing-activity + (let ((commit "0abbeb455363672ed29d734e6e48f50ef78ec48b") + (revision "1")) + (package + (name "sugar-river-crossing-activity") + (version (git-version "1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/river-crossing-activity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h7c3i288vwz249figw3jwyylwhlh9qlgjhlbs902ldpmib0k237")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + (add-after 'unpack 'inject-load-path + (lambda _ + (substitute* "activity.py" + (("^import pygame") + (string-append "\ +import sys +for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): + try: + sys.path.index(directory) + except ValueError: + sys.path.insert(1, directory) +import pygame +"))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; These libraries are accessed via gobject introspection. + (propagated-inputs + (list gtk+)) + (inputs + (list python-pygame + sugar-toolkit-gtk3 + gettext-minimal)) + (home-page "https://github.com/sugarlabs/river-crossing-activity") + (synopsis "Puzzle game for Sugar desktop") + (description "A farmer is to ferry across a river a goat, a cabbage, and +a wolf. The boat allows the farmer to carry only one of the three at a time. +Without supervision, the goat will gobble the cabbage whereas the wolf will +not hesitate to feast on the goat.") + (license license:gpl3+)))) + (define-public sugar-terminal-activity (let ((commit "a1f92b9da6121bc9a6fbba2c3f3b885dd26d4617") (revision "1")) @@ -970,6 +1221,72 @@ mathematics, and Computer Science features which will challenge the more adventurous student.") (license license:expat)))) +(define-public sugar-turtlepond-activity + (let ((commit "e460fc472d2f900c4c71659dbec07a715a3847a7") + (revision "1")) + (package + (name "sugar-turtlepond-activity") + (version (git-version "10" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/turtlepond") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0j7jzbwi2aph312f5dazmwgxqzh458b4yzz8mvrdxpr91ksxd4h4")))) + (build-system python-build-system) + (arguments + (list + #:test-target "check" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-launcher + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "activity/activity.info" + (("exec = sugar-activity3") + (string-append "exec = " + (search-input-file inputs "/bin/sugar-activity3")))))) + #; + (add-after 'unpack 'inject-load-path + (lambda _ + (substitute* "TurtlePondActivity.py" + (("^import logging") + (string-append "\ +import sys +for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): + try: + sys.path.index(directory) + except ValueError: + sys.path.insert(1, directory) +import logging +"))))) + (replace 'install + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "setup.py" "install" + (string-append "--prefix=" #$output))))))) + ;; All these libraries are accessed via gobject introspection. + (propagated-inputs + (list cairo + gdk-pixbuf + gobject-introspection + gtk+ + python-pygobject + sugar-toolkit-gtk3)) + (native-inputs + (list gettext-minimal)) + (home-page "https://github.com/sugarlabs/sugar-commander") + (synopsis "Manage your Sugar journal") + (description "Sugar-commander lets you import items from removeable +devices like USB drives and SD cards using a familiar hierarchical view of +files on these devices, as opposed to the flattened Journal view that the +Sugar Journal gives to these devices. It also enables you to see how much +disk space each Journal entry uses, generates thumbnails, and does other +things to enhance your use of the Journal.") + (license license:gpl2+)))) + (define-public sugar-typing-turtle-activity (package (name "sugar-typing-turtle-activity") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 2127a0279c..7b99b9672e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -849,7 +849,7 @@ eye-candy, customizable, and reasonably lightweight.") (define-public foot (package (name "foot") - (version "1.18.0") + (version "1.18.1") (home-page "https://codeberg.org/dnkl/foot") (source (origin @@ -859,7 +859,7 @@ eye-candy, customizable, and reasonably lightweight.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1znfk64kimm0vr3alvj66i1yn5glig3bw60n2lv9cn4jzi1b7qhb")))) + (base32 "15s7fbkibvq53flf5yy9ad37y53pl83rcnjwlnfh96a4s5mj6v5d")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 7deea364d8..b7ed686371 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -25,11 +25,13 @@ ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Bonface Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2022 Gabriel Wicki <gabriel@erlikon.ch> +;;; Copyright © 2022 Paul A. Patience <paul@apatience.com> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si>;; +;;; Copyright © 2024 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1254,6 +1256,60 @@ OpenDocument presentations (*.odp).") formats (e.g. Bibtex, RIS, ...) using a common XML intermediate.") (license license:gpl2))) +(define-public goawk + (package + (name "goawk") + (version "1.27.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/benhoyt/goawk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "003idgqj1g41y4sja9gzbds95fl3ba0l20wfgh7hp4kiivgls7r8")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/benhoyt/goawk" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + ;; Disable tests trying to setup up locale and requiring gawk + ;; executable. + (substitute* (find-files "." "\\_test.go$") + (("TestShellCommand") "OffTestShellCommand") + (("TestInterp") "OffTestInterp") + (("TestCommandLine") "OffTestCommandLine"))))) + (add-before 'check 'patch-paths + (lambda* (#:key tests? import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* (list "interp/interp.go" "goawk_test.go") + (("/bin/sh") (which "sh"))) + (substitute* "goawk_test.go" + ;; During tests goawk tries to write to existing files, + ;; point to an empty directory instead. + (("/testdata/output") "/testdata/output-tmp"))))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (mkdir "testdata/output-tmp") + (invoke "go" "test" "./...") + ;; Make sure we have not left any generated articfacts + ;; during tests and moved them to the store. + (delete-file-recursively "testdata/output-tmp")))))))) + (home-page "https://github.com/benhoyt/goawk") + (synopsis "AWK interpreter with CSV support") + (description + "GoAWK is a POSIX-compatible version of AWK that also has a CSV mode for +reading and writing CSV and TSV files.") + (license license:expat))) + (define-public opencc (package (name "opencc") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9f67237d5d..42bd4a5744 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2021 François J. <francois-oss@avalenn.eu> ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> -;;; Copyright © 2021 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2024 jgart <jgart@dismail.de> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be> @@ -717,6 +717,53 @@ everything from small to very large projects with speed and efficiency.") (base32 "0bqz401dyp8wnjj3k5ahrniwk4dalndysqazzwdvv25hqbkacm70")))))) +(define-public python-klaus + (package + (name "python-klaus") + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "klaus" version)) + (sha256 + (base32 + "1w6sl15llnkcg7kmnpn64awdiis061q2gijnhdx0ng7z4p1glapl")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ; TODO: https://github.com/jonashaag/klaus/issues/322 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'configure-git + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (file) + (substitute* file + (("\"git\"") + (string-append "\"" + (search-input-file inputs "/bin/git") "\"")))) + (list "klaus/ctagsutils.py" + "klaus/repo.py" + "klaus/utils.py" + "tests/test_contrib.py" + "tests/test_make_app.py"))))))) + (inputs (list git-minimal)) + (native-inputs + (list python-pytest)) + (propagated-inputs + (list python-dulwich python-flask python-httpauth + python-humanize python-pygments python-werkzeug)) + (home-page "https://github.com/jonashaag/klaus") + (synopsis "Simple git web viewer") + (description +"@code{klaus} is a simple, easy-to-set-up git web viewer. It features +@itemize +@item Super easy to set up -- no configuration required +@item Syntax highlighting +@item Markdown + RestructuredText rendering support +@item Pull + push support (Git Smart HTTP) +@item Code navigation using Exuberant ctags +@end itemize") + (license license:isc))) + (define-public git2cl (let ((commit "1d74d4c0d933fc69ed5cec838c73502584dead05")) (package @@ -1025,7 +1072,7 @@ write native speed custom Git applications in any language with bindings.") (define-public libgit2-1.8 (package (inherit libgit2-1.7) - (version "1.8.0") + (version "1.8.1") (source (origin (inherit (package-source libgit2-1.7)) (uri (git-reference @@ -1034,7 +1081,23 @@ write native speed custom Git applications in any language with bindings.") (file-name (git-file-name "libgit2" version)) (sha256 (base32 - "0f0vqml6fp94z07xkpim2sdj2xvpxnsrwbm1q1dibx4vqjd7mh3q")))))) + "1mh55804cvxl2cyl4clinajzgfn3zmlhacnv1pdvdj4w6z2w4si7")) + (snippet + '(begin + (for-each delete-file-recursively + '("deps/chromium-zlib" + "deps/llhttp" + "deps/ntlmclient" + "deps/pcre" + "deps/winhttp" + "deps/zlib")))))) + (arguments (substitute-keyword-arguments (package-arguments libgit2-1.7) + ((#:configure-flags flags #~(list)) + #~(map (lambda (arg) + (if (string= "-DUSE_HTTP_PARSER=system" arg) + "-DUSE_HTTP_PARSER=http-parser" + arg)) + #$flags)))))) (define-public libgit2-1.6 (package @@ -2069,7 +2132,7 @@ control to Git repositories.") guile-fibers guile-gcrypt guile-git - guile-syntax-highlight-for-gitile + guile-syntax-highlight guile-gnutls)) (home-page "https://git.lepiller.eu/gitile") (synopsis "Simple Git forge written in Guile") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f1087994fd..9cd67ba694 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3128,7 +3128,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package (name "yt-dlp") - (version "2024.07.09") + (version "2024.08.06") (source (origin (method git-fetch) @@ -3137,7 +3137,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1zw8zaihfx6fg1l9ynwm0d4zy6k30jwi7qbq9ylsl93yg1a73js9")))) + (base32 "0k44p1a9nckj7m6gxz7zggci0iihflivxvkh9l8wwbnsfvqhyfrn")))) (build-system pyproject-build-system) (arguments `(#:tests? ,(not (%current-target-system)) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 6932086b0d..8702a7390c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com> +;;; Copyright © 2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,6 +147,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system ruby) #:use-module (guix build-system trivial) @@ -844,7 +846,7 @@ firmware blobs. You can ;; hard coded PATH. Patch so it works on Guix System. (substitute* "src/Ganeti/Constants.hs" (("/sbin:/bin:/usr/sbin:/usr/bin") - "/run/setuid-programs:/run/current-system/profile/sbin:\ + "/run/privileged/bin:/run/current-system/profile/sbin:\ /run/current-system/profile/bin")))) (add-after 'bootstrap 'patch-sphinx-version-detection (lambda _ @@ -1661,15 +1663,15 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "8.6.0") + (version "10.6.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0wa86jliq71x60dd4vyzsj4lcrb82i5qsgxz9azvwgsgi9j9mx41")))) - (build-system python-build-system) + (base32 "1r3rvkgnc6j813mcdr7fdfnxx58imzl16azjkg54yy2gfayrq9g4")))) + (build-system pyproject-build-system) (inputs (list libvirt)) (propagated-inputs diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 8aee673653..753d8e246d 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com> ;;; Copyright © 2022, 2024 dan <i@dan.games> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module (guix gexp) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) @@ -246,6 +248,56 @@ interpretation of the specifications for these languages.") ;; include/SPIRV/{bitutils,hex_float}.h are Apache 2.0. license:asl2.0)))) +(define-public vkbasalt + (package + (name "vkbasalt") + (version "0.3.2.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DadSchoorse/vkBasalt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f3qmcmqnnh8i9qd2sd3p5w0akn8rkzfm5z0hc0wazgci4lqjbhq")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags + ;; Needed for giving full path to library. + #~(list "-Dappend_libdir_vkbasalt=TRUE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-libdir + (lambda _ + (substitute* "meson.build" + (("\\$LIB") "lib"))))))) + (native-inputs (list pkg-config + ;; for glslangValidator + glslang)) + (inputs (list libx11 spirv-headers vulkan-headers)) + (home-page "https://github.com/DadSchoorse/vkBasalt") + (synopsis "Vulkan post processing layer for GNU/Linux") + (description "vkBasalt is a Vulkan post processing layer to enhance the +visual graphics of games. + +Currently, the built-in effects are: + +@itemize @bullet +@item +Contrast Adaptive Sharpening +@item +Denoise Luma Sharpening +@item +Fast Approximate Anti-Aliasing +@item +Enhanced Subpixel Morphological Anti-Aliasing +@item +3D color LookUp Table +@end itemize") + (license (list license:bsd-3 ; src/reshade/LICENSE.md + license:zlib)))) ; LICENSE + (define-public vulkan-headers (package (name "vulkan-headers") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 242827c95c..b237143684 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5194,8 +5194,8 @@ Cloud.") (license license:expat))) (define-public guix-data-service - (let ((commit "b5fbde5ac832e34987a05b1445c1c465c19d5340") - (revision "52")) + (let ((commit "eeda1bf33b42a81a8a295c9e498f3bb44e95d6f1") + (revision "53")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -5207,7 +5207,7 @@ Cloud.") (file-name (git-file-name name version)) (sha256 (base32 - "1dp26bj14jaac9f5332pd6hasm3wr1hg9wrbjm9m8wb7cdll9h2p")))) + "1dvlzm359iq6dghr7q1prqlkngxcy1198nb0xbv5rpwjp69j2vg9")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 973e962fb1..11c2ac2154 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -265,6 +266,44 @@ and many other languages.") (("-Wall") "-Wall -Wno-narrowing")) #t))))))) +(define-public prusa-wxwidgets + ;; There is no proper tag/release, all patches are in separate branches based on + ;; the wxWidgets release (e.g. this commit is taken from "v3.2.0-patched" branch".) + (let ((commit "78aa2dc0ea7ce99dc19adc1140f74c3e2e3f3a26") + (revision "0")) + (package + (inherit wxwidgets) + (name "prusa-wxwidgets") + (version (git-version "3.2.0" revision commit)) + (home-page "https://github.com/prusa3d/wxWidgets") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + ;; The patch is taken from the NixOS nixpkgs repository (see + ;; <https://github.com/NixOS/nixpkgs/commit/0e724ac89f3dbf6ed31d647290a371b44a85e5ad>.) + (patches (search-patches "prusa-wxwidgets-makefile-fix.patch")) + (sha256 + (base32 + "1xk6w7q4xv4cj906xa5dwam5q51mc8bszbkkz7l8d3wjmsz73rwv")))) + (native-inputs (modify-inputs (package-native-inputs wxwidgets) + (prepend nanosvg))) + (arguments + (substitute-keyword-arguments (package-arguments wxwidgets) + ((#:configure-flags flags) + ;; To fix 3D rendering in PrusaSlicer, wxWidgets must be compiled with + ;; "--disable-glcanvasegl" flag (see + ;; <https://github.com/NixOS/nixpkgs/issues/193135>.) + #~(cons "--disable-glcanvasegl" #$flags)) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-nanosvg-source + (lambda _ + (copy-recursively #$(package-source nanosvg) "3rdparty/nanosvg/")))))))))) + (define-public python-wxpython (package (name "python-wxpython") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 4c12835b24..455f9170b2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -63,6 +63,7 @@ ;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2710,7 +2711,7 @@ temperature of the screen.") '(#:configure-flags '("--with-pam-service-name=login" "--with-xkb" - "--with-default-authproto-module=/run/setuid-programs/authproto_pam"))) + "--with-default-authproto-module=/run/privileged/bin/authproto_pam"))) (native-inputs (list pandoc pkg-config)) (inputs @@ -3375,6 +3376,30 @@ applications. The font and colors can be configured.") (license (list license:expat ;fuzzel license:zlib)))) ;; bundled nanosvg +(define-public fyi + (package + (name "fyi") + (version "1.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/dnkl/fyi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "112jczg0gfjgf7jkqlr97a9n5nv931dfdmwvnd5jivdh8ljajwfh")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + (inputs (list dbus)) + (home-page "https://codeberg.org/dnkl/fyi") + (synopsis "Lightweight alternative to @code{notify-send}") + (description + "@acronym{FYI, For Your Information} is a command line utility to send +desktop notifications to the user via a notification daemon implementing XDG +desktop notifications.") + (license license:expat))) + (define-public wofi (package (name "wofi") diff --git a/gnu/services.scm b/gnu/services.scm index 88593e8091..f0bbbb27a5 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com> ;;; Copyright © 2020 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2023 Brian Cully <bjc@spork.org> ;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr> ;;; @@ -45,7 +46,8 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages hurd) - #:use-module (gnu system setuid) + #:use-module (gnu packages linux) + #:use-module (gnu system privilege) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) @@ -119,7 +121,8 @@ extra-special-file etc-service-type etc-directory - setuid-program-service-type + privileged-program-service-type + setuid-program-service-type ; deprecated profile-service-type firmware-service-type gc-root-service-type @@ -888,41 +891,58 @@ directory." FILES must be a list of name/file-like object pairs." (service etc-service-type files)) -(define (setuid-program->activation-gexp programs) - "Return an activation gexp for setuid-program from PROGRAMS." +(define (privileged-program->activation-gexp programs) + "Return an activation gexp for privileged-program from PROGRAMS." (let ((programs (map (lambda (program) ;; FIXME This is really ugly, I didn't managed to use ;; "inherit" - (let ((program-name (setuid-program-program program)) - (setuid? (setuid-program-setuid? program)) - (setgid? (setuid-program-setgid? program)) - (user (setuid-program-user program)) - (group (setuid-program-group program)) ) - #~(setuid-program + (let ((program-name (privileged-program-program program)) + (setuid? (privileged-program-setuid? program)) + (setgid? (privileged-program-setgid? program)) + (user (privileged-program-user program)) + (group (privileged-program-group program)) + (capabilities (privileged-program-capabilities program))) + #~(privileged-program (setuid? #$setuid?) (setgid? #$setgid?) (user #$user) (group #$group) + (capabilities #$capabilities) (program #$program-name)))) programs))) (with-imported-modules (source-module-closure - '((gnu system setuid))) + '((gnu system privilege))) #~(begin - (use-modules (gnu system setuid)) + (use-modules (gnu system privilege)) - (activate-setuid-programs (list #$@programs)))))) + (let ((libcap #$(let-system (system target) + ;; When cross-compiling, assume libcap is + ;; available on GNU/Linux only. + (and (if target + (string-suffix? "linux-gnu" target) + (supported-package? libcap system)) + libcap)))) + (activate-privileged-programs (list #$@programs) libcap)))))) -(define setuid-program-service-type - (service-type (name 'setuid-program) +(define privileged-program-service-type + (service-type (name 'privileged-program) (extensions (list (service-extension activation-service-type - setuid-program->activation-gexp))) + privileged-program->activation-gexp))) (compose concatenate) (extend (lambda (config extensions) (append config extensions))) (description - "Populate @file{/run/setuid-programs} with the specified -executables, making them setuid and/or setgid."))) + "Copy the specified executables to @file{/run/privileged/bin} +and apply special privileges like setuid and/or setgid. + +The deprecated @file{/run/setuid-programs} directory is also populated with +symbolic links to their @file{/run/privileged/bin} counterpart. It will be +removed in a future Guix release."))) + +(define-deprecated/alias setuid-program-service-type + ;; Deprecated alias to ease transition. Will be removed! + privileged-program-service-type) (define (packages->profile-entry packages) "Return a system entry for the profile containing PACKAGES." diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 1e1380185a..2004c48452 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -115,7 +115,7 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in ;; failures such as <https://issues.guix.gnu.org/52051> on slow ;; computers with slow I/O. (limit (@ (name "auth_timeout")) "300000") - (servicehelper "/run/setuid-programs/dbus-daemon-launch-helper") + (servicehelper "/run/privileged/bin/dbus-daemon-launch-helper") ;; First, the '.service' files of services subject to activation. ;; We use a fixed location under /etc because the setuid helper diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 63e2011ce3..9c4d2a1822 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1080,7 +1080,11 @@ and many other) available for GIO applications.") (default '("disk"))) (hybrid-sleep-mode elogind-hybrid-sleep-mode (default - '("suspend" "platform" "shutdown")))) + '("suspend" "platform" "shutdown"))) + (hibernate-delay-seconds elogind-hibernate-delay-seconds + (default *unspecified*)) + (suspend-estimation-seconds elogind-suspend-estimation-seconds + (default *unspecified*))) (define (elogind-configuration-file config) (define (yesno x) @@ -1104,8 +1108,11 @@ and many other) available for GIO applications.") (unless (exact-integer? x) (error "not an integer" x)) (when (negative? x) (error "negative number not allowed" x)) (number->string x)) + (define (maybe-non-negative-integer x) + (or (and (unspecified? x) x) + (non-negative-integer x))) (define handle-actions - '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep lock)) + '(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep suspend-then-hibernate lock)) (define (handle-action x) (if (unspecified? x) x ;let the unspecified value go through @@ -1163,7 +1170,9 @@ and many other) available for GIO applications.") ("HibernateState" (sleep-list elogind-hibernate-state)) ("HibernateMode" (sleep-list elogind-hibernate-mode)) ("HybridSleepState" (sleep-list elogind-hybrid-sleep-state)) - ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)))) + ("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode)) + ("HibernateDelaySec" (maybe-non-negative-integer elogind-hibernate-delay-seconds)) + ("SuspendEstimationSec" (maybe-non-negative-integer elogind-suspend-estimation-seconds)))) (define (elogind-dbus-service config) "Return a @file{org.freedesktop.login1.service} file that tells D-Bus how to diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm index f4fec3833e..ee72946c88 100644 --- a/gnu/services/ganeti.scm +++ b/gnu/services/ganeti.scm @@ -182,7 +182,7 @@ ;; Ceph, Gluster, etc, without having to add absolute references to everything. (define %default-ganeti-environment-variables (list (string-append "PATH=" - (string-join '("/run/setuid-programs" + (string-join '("/run/privileged/bin" "/run/current-system/profile/sbin" "/run/current-system/profile/bin") ":")))) diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm index 0a93c907ee..59cf4710ea 100644 --- a/gnu/services/monitoring.scm +++ b/gnu/services/monitoring.scm @@ -1016,7 +1016,7 @@ configuration file.")) /etc/ssl/certs" "SSL_CERT_FILE=/run/current-system/profile\ /etc/ssl/certs/ca-certificates.crt" - "PATH=/run/setuid-programs:\ + "PATH=/run/privileged/bin:\ /run/current-system/profile/bin:/run/current-system/profile/sbin"))) (stop #~(make-kill-destructor))))) diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm index 9bb623186b..a7a9c6aadd 100644 --- a/gnu/services/syncthing.scm +++ b/gnu/services/syncthing.scm @@ -73,7 +73,15 @@ #:user #$(and (not home-service?) user) #:group #$(and (not home-service?) group) #:environment-variables - (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user)))) + (append + (list + (string-append "HOME=" + (or #$home + (passwd:dir + (getpw (if (and #$home-service? + (not #$user)) + (getuid) + #$user))))) "SSL_CERT_DIR=/etc/ssl/certs" "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt") (filter (negate ;XXX: 'remove' is not in (guile) diff --git a/gnu/system.scm b/gnu/system.scm index c76f4d7c50..44f93f91d1 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -77,6 +77,7 @@ #:use-module (gnu system locale) #:use-module (gnu system pam) #:use-module (gnu system linux-initrd) + #:use-module (gnu system privilege) #:use-module (gnu system setuid) #:use-module (gnu system uuid) #:use-module (gnu system file-systems) @@ -130,6 +131,7 @@ operating-system-keyboard-layout operating-system-name-service-switch operating-system-pam-services + operating-system-privileged-programs operating-system-setuid-programs operating-system-skeletons operating-system-sudoers-file @@ -174,6 +176,7 @@ local-host-aliases ;deprecated %root-account + %default-privileged-programs %setuid-programs %sudoers-specification %base-packages @@ -301,9 +304,11 @@ VERSION is the target version of the boot-parameters record." (pam-services operating-system-pam-services ; list of PAM services (default (base-pam-services))) + (privileged-programs operating-system-privileged-programs ; list of <privileged-program> + (default %default-privileged-programs)) (setuid-programs operating-system-setuid-programs - (default %setuid-programs) ; list of <setuid-program> - (sanitize ensure-setuid-program-list)) + ;; For backwards compatibility; will be removed. + (default %setuid-programs)) ; list of <setuid-program> (sudoers-file operating-system-sudoers-file ; file-like (default %sudoers-specification)) @@ -821,8 +826,9 @@ bookkeeping." (operating-system-environment-variables os)) (service host-name-service-type host-name) procs root-fs - (service setuid-program-service-type - (operating-system-setuid-programs os)) + (service privileged-program-service-type + (append (operating-system-privileged-programs os) + (operating-system-setuid-programs os))) (service profile-service-type (operating-system-packages os)) boot-fs non-boot-fs @@ -860,8 +866,9 @@ bookkeeping." (list `("hosts" ,hosts-file))) (service hosts-service-type (local-host-entries host-name))) - (service setuid-program-service-type - (operating-system-setuid-programs os)) + (service privileged-program-service-type + (append (operating-system-privileged-programs os) + (operating-system-setuid-programs os))) (service profile-service-type (operating-system-packages os))))) (define* (operating-system-services os) @@ -1023,10 +1030,10 @@ the /etc directory." (plain-file "login.defs" (string-append "# Default paths for non-login shells started by su(1).\n" - "ENV_PATH /run/setuid-programs:" + "ENV_PATH /run/privileged/bin:" "/run/current-system/profile/bin:" "/run/current-system/profile/sbin\n" - "ENV_SUPATH /run/setuid-programs:" + "ENV_SUPATH /run/privileged/bin:" "/run/current-system/profile/bin:" "/run/current-system/profile/sbin\n" @@ -1089,8 +1096,8 @@ do fi done -# Prepend setuid programs. -export PATH=/run/setuid-programs:$PATH +# Prepend privileged programs. +export PATH=/run/privileged/bin:$PATH # Arrange so that ~/.config/guix/current/share/info comes first. export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\" @@ -1240,33 +1247,7 @@ use 'plain-file' instead~%") ;; when /etc/machine-id is missing. Make sure these warnings are non-fatal. ("DBUS_FATAL_WARNINGS" . "0"))) -;; Ensure LST is a list of <setuid-program> records and warn otherwise. -(define-with-syntax-properties (ensure-setuid-program-list (lst properties)) - (%ensure-setuid-program-list lst properties)) - -;; We want to be able to use defines, so define a procedure. -(define (%ensure-setuid-program-list lst properties) - (define warned? #f) - - (define (warn-once) - (unless warned? - (warning (source-properties->location properties) - (G_ "representing setuid programs with file-like objects is \ -deprecated; use 'setuid-program' instead~%")) - (set! warned? #t))) - - (map (match-lambda - ((? setuid-program? program) - program) - (program - ;; PROGRAM is a file-like or a gexp like #~(string-append #$foo - ;; "/bin/bar"). - (warn-once) - (setuid-program (program program)))) - lst)) - -(define %setuid-programs - ;; Default set of setuid-root programs. +(define %default-privileged-programs (let ((shadow (@ (gnu packages admin) shadow))) (map file-like->setuid-program (list (file-append shadow "/bin/passwd") @@ -1288,6 +1269,12 @@ deprecated; use 'setuid-program' instead~%")) (file-append util-linux "/bin/mount") (file-append util-linux "/bin/umount"))))) +(define %setuid-programs + ;; Do not add to this list or use it in new code! It's defined only to ease + ;; transition to %default-privileged-programs and will be removed. Some rare + ;; use cases already break, such as the obvious (remove … %setuid-programs). + '()) + (define %sudoers-specification ;; Default /etc/sudoers contents: 'root' and all members of the 'wheel' ;; group can do anything. See diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index cbe0081382..6d6a20cf57 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2020-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -132,4 +132,5 @@ (locale-libcs (list glibc/hurd)) (name-service-switch #f) (essential-services (hurd-default-essential-services this-operating-system)) + (privileged-programs '()) (setuid-programs %setuid-programs/hurd))) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 0195a0804d..78a3cdaaec 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> @@ -27,7 +27,7 @@ (define-module (gnu system install) #:use-module (gnu) #:use-module (gnu system) - #:use-module (gnu system setuid) + #:use-module (gnu system privilege) #:use-module (gnu bootloader u-boot) #:use-module (guix gexp) #:use-module (guix store) @@ -540,8 +540,9 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; We don't need setuid programs, except for 'passwd', which can be handy ;; if one is to allow remote SSH login to the machine being installed. - (setuid-programs (list (setuid-program - (program (file-append shadow "/bin/passwd"))))) + (privileged-programs (list (privileged-program + (program (file-append shadow "/bin/passwd")) + (setuid? #t)))) (pam-services ;; Explicitly allow for empty passwords. diff --git a/gnu/system/privilege.scm b/gnu/system/privilege.scm new file mode 100644 index 0000000000..d89d5d5d1c --- /dev/null +++ b/gnu/system/privilege.scm @@ -0,0 +1,58 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> +;;; +;;; 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 system privilege) + #:use-module (guix records) + #:export (privileged-program + privileged-program? + privileged-program-program + privileged-program-setuid? + privileged-program-setgid? + privileged-program-user + privileged-program-group + privileged-program-capabilities)) + +;;; Commentary: +;;; +;;; Data structures representing privileged programs: binaries with additional +;;; permissions such as setuid/setgid, or POSIX capabilities. This is meant to +;;; be used both on the host side and at run time--e.g., in activation snippets. +;;; +;;; Code: + +(define-record-type* <privileged-program> + privileged-program make-privileged-program + privileged-program? + ;; File name of the program to assign elevated privileges. + (program privileged-program-program) ;file-like + ;; Whether to set the setuid (‘set user ID’) bit. + (setuid? privileged-program-setuid? ;boolean + (default #f)) + ;; Whether to set the setgid (‘set group ID’) bit. + (setgid? privileged-program-setgid? ;boolean + (default #f)) + ;; The user name or ID this should be set to (defaults to root's). + (user privileged-program-user ;integer or string + (default 0)) + ;; The group name or ID we want to set this to (defaults to root's). + (group privileged-program-group ;integer or string + (default 0)) + ;; POSIX capabilities in cap_from_text(3) form (defaults to #f: none). + (capabilities privileged-program-capabilities ;string or #f + (default #f))) diff --git a/gnu/system/setuid.scm b/gnu/system/setuid.scm index 83111d932c..4dd0cc8962 100644 --- a/gnu/system/setuid.scm +++ b/gnu/system/setuid.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +18,9 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu system setuid) - #:use-module (guix records) + #:use-module (gnu system privilege) + #:use-module (ice-9 match) + #:use-module (srfi srfi-1) #:export (setuid-program setuid-program? setuid-program-program @@ -30,28 +33,29 @@ ;;; Commentary: ;;; -;;; Data structures representing setuid/setgid programs. This is meant to be -;;; used both on the host side and at run time--e.g., in activation snippets. +;;; Do not use this module in new code. It used to define data structures +;;; representing setuid/setgid programs, but is now a mere compatibility shim +;;; wrapping a subset of (gnu system privilege). ;;; ;;; Code: -(define-record-type* <setuid-program> - setuid-program make-setuid-program - setuid-program? - ;; Path to program to link with setuid permissions - (program setuid-program-program) ;file-like - ;; Whether to set user setuid bit - (setuid? setuid-program-setuid? ;boolean - (default #t)) - ;; Whether to set group setgid bit - (setgid? setuid-program-setgid? ;boolean - (default #f)) - ;; The user this should be set to (defaults to root) - (user setuid-program-user ;integer or string - (default 0)) - ;; Group we want to set this to (defaults to root) - (group setuid-program-group ;integer or string - (default 0))) +(define-syntax setuid-program + (lambda (fields) + (syntax-case fields () + ((_ (field value) ...) + #`(privileged-program + (setuid? (match (assoc-ref '((field value) ...) 'setuid?) + ((#f) #f) + (_ #t))) + #,@(remove (match-lambda ((f _) (eq? (syntax->datum f) 'setuid?))) + #'((field value) ...))))))) + +(define setuid-program? privileged-program?) +(define setuid-program-program privileged-program-program) +(define setuid-program-setuid? privileged-program-setuid?) +(define setuid-program-setgid? privileged-program-setgid?) +(define setuid-program-user privileged-program-user) +(define setuid-program-group privileged-program-group) (define (file-like->setuid-program program) (setuid-program (program program))) diff --git a/gnu/tests/ldap.scm b/gnu/tests/ldap.scm index 47e77c0c53..d5ab6899cf 100644 --- a/gnu/tests/ldap.scm +++ b/gnu/tests/ldap.scm @@ -144,7 +144,7 @@ suffix = dc=example,dc=com"))) (test-assert "Can become LDAP user" (marionette-eval - '(zero? (system* "/run/setuid-programs/su" "eva" "-c" + '(zero? (system* "/run/privileged/bin/su" "eva" "-c" #$(file-append coreutils "/bin/true"))) marionette)) diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm index bbab1d8acf..a0c8c929b1 100644 --- a/gnu/tests/monitoring.scm +++ b/gnu/tests/monitoring.scm @@ -189,11 +189,11 @@ cat ~a | sudo -u zabbix psql zabbix; (start-service 'postgres)) marionette)) - ;; Add /run/setuid-programs to $PATH so that the scripts passed to + ;; Add privileged programs to $PATH so that the scripts passed to ;; 'system' can find 'sudo'. (marionette-eval '(setenv "PATH" - "/run/setuid-programs:/run/current-system/profile/bin") + "/run/privileged/bin:/run/current-system/profile/bin") marionette) (test-eq "postgres create zabbix user" diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm index 39bcffd516..2c20edf058 100644 --- a/guix/build/syscalls.scm +++ b/guix/build/syscalls.scm @@ -1398,14 +1398,18 @@ exception if it's already taken." ;; Presumably we got EAGAIN or so. (throw 'flock-error err)))))) -(define* (lock-file file #:key (wait? #t)) - "Wait and acquire an exclusive lock on FILE. Return an open port." - (let ((port (open-file file "w0"))) - (fcntl-flock port 'write-lock #:wait? wait?) +(define* (lock-file file #:optional (mode "w0") + #:key (wait? #t)) + "Wait and acquire an exclusive lock on FILE. Return an open port according +to MODE." + (let ((port (open-file file mode))) + (fcntl-flock port + (if (output-port? port) 'write-lock 'read-lock) + #:wait? wait?) port)) (define (unlock-file port) - "Unlock PORT, a port returned by 'lock-file'." + "Unlock PORT, a port returned by 'lock-file', and close it." (fcntl-flock port 'unlock) (close-port port) #t) diff --git a/guix/cache.scm b/guix/cache.scm index 6a91c7d3ef..8b12312c77 100644 --- a/guix/cache.scm +++ b/guix/cache.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2017, 2020-2021, 2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2017, 2020-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -19,6 +19,7 @@ (define-module (guix cache) #:use-module ((guix utils) #:select (with-atomic-file-output)) + #:autoload (guix build syscalls) (lock-file unlock-file) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (ice-9 match) @@ -93,13 +94,19 @@ CLEANUP-PERIOD denotes the minimum time between two cache cleanups." (define expiry-file (string-append cache "/last-expiry-cleanup")) + (define expiry-port + ;; Get exclusive access to EXPIRY-FILE to avoid "cleanup storms" where + ;; several processes would concurrently decide that time has come to clean + ;; up the same cache. 'lock-file' might throw to 'system-error' or to + ;; 'flock-error'; in either case, assume that we lost the race. + (false-if-exception + (lock-file expiry-file "a+0" #:wait? #f))) + (define last-expiry-date - (catch 'system-error - (lambda () - (or (string->number - (call-with-input-file expiry-file get-string-all)) - 0)) - (const 0))) + (if expiry-port + (or (string->number (get-string-all expiry-port)) + 0) + +inf.0)) (when (obsolete? last-expiry-date now cleanup-period) (remove-expired-cache-entries (cache-entries cache) @@ -108,8 +115,10 @@ CLEANUP-PERIOD denotes the minimum time between two cache cleanups." #:delete-entry delete-entry) (catch 'system-error (lambda () - (with-atomic-file-output expiry-file - (cute write (time-second now) <>))) + (seek expiry-port 0 SEEK_SET) + (truncate-file expiry-port 0) + (write (time-second now) expiry-port) + (unlock-file expiry-port)) (lambda args ;; ENOENT means CACHE does not exist. (unless (= ENOENT (system-error-errno args)) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 6719fde330..7b9f54a200 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -544,8 +544,9 @@ name))) 'native-inputs) (home-page ,(project-info-home-page info)) (synopsis ,(project-info-summary info)) - (description ,(beautify-description - (project-info-summary info))) + (description ,(and=> (non-empty-string-or-false + (project-info-summary info)) + beautify-description)) (license ,(license->symbol (string->license (project-info-license info))))) diff --git a/tests/cache.scm b/tests/cache.scm index d495ace2bd..e8ad083d40 100644 --- a/tests/cache.scm +++ b/tests/cache.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2020, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2022 Simon Tournier <zimon.toutoune@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -22,7 +22,9 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-19) #:use-module (srfi srfi-64) + #:use-module ((guix build syscalls) #:select (lock-file)) #:use-module ((guix utils) #:select (call-with-temporary-directory)) + #:use-module ((rnrs io ports) #:select (get-string-all)) #:use-module (ice-9 match)) (test-begin "cache") @@ -75,6 +77,32 @@ (lambda (port) (display 0 port))))) +(let ((pid #f)) + (test-equal "maybe-remove-expired-cache-entries, cleanup needed but lock taken" + '() + (test-cache-cleanup cache + (let ((in+out (pipe))) + (match (primitive-fork) + (0 (dynamic-wind + (const #t) + (lambda () + (close-port (car in+out)) + (let ((port (lock-file + (string-append cache "/last-expiry-cleanup")))) + (display 0 port) + (display "done!\n" (cdr in+out)) + (close-port (cdr in+out)) + (sleep 100))) + (lambda () + (primitive-exit 0)))) + (n + (set! pid n) + (close-port (cdr in+out)) + (pk 'chr (get-string-all (car in+out))) + (close-port (car in+out))))))) + + (when pid (kill pid SIGKILL))) + (test-equal "maybe-remove-expired-cache-entries, empty cache" '("a" "b" "c") (test-cache-cleanup cache diff --git a/tests/syscalls.scm b/tests/syscalls.scm index 7cf67c060d..13f4f11721 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -383,6 +383,19 @@ (close-port file) result))))))))) +(test-equal "lock-file + unlock-file" + 'hello + (call-with-temporary-directory + (lambda (directory) + (let* ((file (in-vicinity directory "lock")) + (out (lock-file file #:wait? #f))) + (display "hello" out) + (unlock-file out) + (let* ((in (lock-file file "r0")) + (content (read in))) + (unlock-file in) + content))))) + (test-equal "set-thread-name" "Syscall Test" (let ((name (thread-name))) |