doc: Document “standard” pull requests and AGit.

* doc/contributing.texi (Submitting Patches): Document “standard” pull
requests and AGit.

Change-Id: I8fe93e4dde0b9543f3bd99c66cf1fdb6ba69c449

doc/contributing.texi

@@ -1948,35 +1948,60 @@ keyword parameters for procedures that take more than four parameters.
 @node Submitting Patches
 @section Submitting Patches
 
+@cindex pull requests
+@cindex patch submission
 Development is done using the Git distributed version control system.
 Thus, access to the repository is not strictly necessary.  We welcome
-contributions in one of the following forms:
+contributions as @dfn{pull requests} (PR) at
+@url{https://codeberg.org/guix/guix/pulls/}@footnote{Before January 1st,
+2026, changes would be submitted by email to
+@email{guix-patches@@gnu.org} and could be
+@uref{https://issues.guix.gnu.org, browsed online}.  In accordance with
+@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
+Guix Consensus Document 002}, this method is no longer supported.}.
+
+There are two ways to create a pull request:
 
 @itemize
 @item
-@cindex pull request, for contributions
-As a @dfn{pull request} (PR) at
-@url{https://codeberg.org/guix/guix/pulls/}.  This is now the preferred
-form.
+By creating a personal ``fork'' of @uref{https://codeberg.org/guix/guix,
+the repository}, creating a branch with your changes, and
+@uref{https://docs.codeberg.org/collaborating/pull-requests-and-git-flow/,
+submitting a pull request for that branch}.
 
 @item
-Until December 31st, 2025@footnote{This date is the result of a decision
-made collectively in
-@uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002} in May 2025.}, you may also send patches as
-produced by @code{git format-patch} to the @email{guix-patches@@gnu.org}
-mailing list (@pxref{Submitting patches to a project,,, git, Git User
-Manual}).
+@cindex AGit workflow, for pull requests
+By following the @uref{https://forgejo.org/docs/next/user/agit-support/,
+@dfn{AGit workflow}}, which is somewhat more convenient and consumes
+less disk space at Codeberg since it removes the need to create a
+``fork''.
 
-This mailing list is backed by a Debbugs instance, which allows us to
-keep track of submissions (@pxref{Tracking Bugs and Changes}).
-Each message sent to that mailing list gets a new tracking number
-assigned; people can then follow up on the submission by sending email
-to @code{@var{ISSUE_NUMBER}@@debbugs.gnu.org}, where @var{ISSUE_NUMBER}
-is the tracking number (@pxref{Sending a Patch Series}).
+Assuming your local checkout is on the branch containing the changes you
+would like to submit for inclusion in the @code{master} branch, run:
+
+@example
+git push origin HEAD:refs/for/master \
+  -o topic=@var{topic} \
+  -o title=@var{title} -o description=@var{description}
+@end example
+
+@var{topic} must be an identifier without whitespace, similar to a
+branch name; @var{title} and @var{description} are arbitrary text that
+can be omitted, in which case the message of the last commit on the
+branch fills that role.
+
+To send an update to an AGit pull request of yours, run:
+
+@example
+git push origin HEAD:refs/for/master \
+  -o topic=@var{topic} -o force-push=yes
+@end example
+
+Codeberg automatically figures out which pull request @var{topic}
+corresponds to and updates the associated branch.
 @end itemize
 
-Either way, contributors are encouraged to take a moment to set some Git
+Contributors are encouraged to take a moment to set some Git
 repository options (@pxref{Configuring Git}) first, which can improve
 the readability of patches.  Seasoned Guix developers may also want to
 look at the section on commit access (@pxref{Commit Access}).
@@ -2143,36 +2168,13 @@ guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master --disable-auth
 
 @end enumerate
 
-When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
-a subject, if your patch is to be applied on a branch other than
-@code{master}, say @code{core-updates}, specify it in the subject like
-@samp{[PATCH core-updates] @dots{}}.
-
-You may use your email client, the @command{git send-email} command
-(@pxref{Sending a Patch Series}) or the @command{mumi send-email}
-command (@pxref{Debbugs User Interfaces}).  We prefer to get patches in
-plain text messages, either inline or as MIME attachments.  You are
-advised to pay attention if your email client changes anything like line
-breaks or indentation which could potentially break the patches.
-
-Expect some delay when you submit your very first patch to
-@email{guix-patches@@gnu.org}. You have to wait until you get an
-acknowledgement with the assigned tracking number. Future acknowledgements
-should not be delayed.
-
-When a bug is resolved, please close the thread by sending an email to
-@email{@var{ISSUE_NUMBER}-done@@debbugs.gnu.org}.
-
 @menu
 * Configuring Git::
-* Sending a Patch Series::
 @end menu
 
 @node Configuring Git
 @subsection Configuring Git
 @cindex git configuration
-@cindex @code{git format-patch}
-@cindex @code{git send-email}
 
 If you have not done so already, you may wish to set a name and email
 that will be associated with your commits (@pxref{telling git your name,
@@ -2192,166 +2194,6 @@ changes was already submitted for review.  If you have a
 @file{commit-msg} hook of your own you would like to use with Guix, you
 can place it under the @file{.git/hooks/commit-msg.d/} directory.
 
-@node Sending a Patch Series
-@subsection Sending a Patch Series
-@cindex patch series
-@cindex @code{git send-email}
-@cindex @code{git format-patch}
-
-@quotation Warning
-This section is about contributing code by sending patches by email.
-This option is supported until December 31st, 2025, but we recommend
-getting familiar with the @dfn{pull request} workflow, which will become
-the norm after that date.  @xref{Submitting Patches}, for more info.
-@end quotation
-
-@unnumberedsubsubsec Single Patches
-@anchor{Single Patches}
-The @command{git send-email} command is the best way to send both single
-patches and patch series (@pxref{Multiple Patches}) to the Guix mailing
-list.  Sending patches as email attachments may make them difficult to
-review in some mail clients, and @command{git diff} does not store commit
-metadata.
-
-@quotation Note
-The @command{git send-email} command is provided by the @code{send-email}
-output of the @code{git} package, i.e. @code{git:send-email}.
-@end quotation
-
-The following command will create a patch email from the latest commit,
-open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to
-the Guix mailing list to be reviewed and merged.  Assuming you have
-already configured Git according to @xref{Configuring Git}, you can
-simply use:
-
-@example
-$ git send-email --annotate -1
-@end example
-
-@quotation Tip
-To add a prefix to the subject of your patch, you may use the
-@option{--subject-prefix} option.  The Guix project uses this to
-specify that the patch is intended for a branch or repository
-other than the @code{master} branch of
-@url{https://codeberg.org/guix/guix.git}.
-
-@example
-git send-email --annotate --subject-prefix='PATCH core-updates' -1
-@end example
-@end quotation
-
-The patch email contains a three-dash separator line after the commit
-message.  You may ``annotate'' the patch with explanatory text by adding
-it under this line.  If you do not wish to annotate the email, you may
-drop the @option{--annotate} option.
-
-If you need to send a revised patch, don't resend it like this or send
-a ``fix'' patch to be applied on top of the last one; instead, use
-@command{git commit --amend} or @url{https://git-rebase.io,
-@command{git rebase}} to modify the commit, and use the
-@email{@var{ISSUE_NUMBER}@@debbugs.gnu.org} address and the @option{-v}
-flag with @command{git send-email}.
-
-@example
-$ git commit --amend
-$ git send-email --annotate -v@var{REVISION} \
-      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org -1
-@end example
-
-@quotation Note
-Due to an apparent bug in @command{git send-email},
-@option{-v @var{REVISION}} (with the space) will not work; you
-@emph{must} use @option{-v@var{REVISION}}.
-@end quotation
-
-You can find out @var{ISSUE_NUMBER} either by searching on the mumi
-interface at @url{https://issues.guix.gnu.org} for the name of your patch or
-reading the acknowledgement email sent automatically by Debbugs in
-reply to incoming bugs and patches, which contains the bug number.
-
-@unnumberedsubsubsec Notifying Teams
-@anchor{Notifying Teams}
-@cindex teams
-If your git checkout has been correctly configured (@pxref{Configuring
-Git}), the @command{git send-email} command will automatically notify
-the appropriate team members, based on the scope of your changes.  This
-relies on the @file{etc/teams.scm} script, which can also be invoked
-manually if you do not use the preferred @command{git send-email}
-command to submit patches.  To list the available actions of the script,
-you can invoke it via the @command{etc/teams.scm help} command.  For
-more information regarding teams, @pxref{Teams}.
-
-@quotation Note
-On foreign distros, you might have to use @command{./pre-inst-env git
-send-email} for @file{etc/teams.scm} to work.
-@end quotation
-
-@unnumberedsubsubsec Multiple Patches
-@anchor{Multiple Patches}
-@cindex cover letter
-While @command{git send-email} alone will suffice for a single
-patch, an unfortunate flaw in Debbugs means you need to be more
-careful when sending multiple patches: if you send them all to the
-@email{guix-patches@@gnu.org} address, a new issue will be created
-for each patch!
-
-When sending a series of patches, it's best to send a Git ``cover
-letter'' first, to give reviewers an overview of the patch series.
-We can create a directory called @file{outgoing} containing both
-our patch series and a cover letter called @file{0000-cover-letter.patch}
-with @command{git format-patch}.
-
-@example
-$ git format-patch -@var{NUMBER_COMMITS} -o outgoing \
-      --cover-letter
-@end example
-
-@quotation Note
-@code{git format-patch} accepts a wide range of
-@uref{https://git-scm.com/docs/gitrevisions, revision range} specifiers.
-For example, if you are working in a branch, you could select all commits
-in your branch starting at @code{master}.
-
-@example
-$ git format-patch master..@var{MY_BRANCH} -o outgoing \
-      --cover-letter
-@end example
-@end quotation
-
-We can now send @emph{just} the cover letter to the
-@email{guix-patches@@gnu.org} address, which will create an issue
-that we can send the rest of the patches to.
-
-@example
-$ git send-email outgoing/0000-cover-letter.patch --annotate
-$ rm outgoing/0000-cover-letter.patch # we don't want to resend it!
-@end example
-
-Ensure you edit the email to add an appropriate subject line and
-blurb before sending it.  Note the automatically generated shortlog
-and diffstat below the blurb.
-
-Once the Debbugs mailer has replied to your cover letter email, you
-can send the actual patches to the newly-created issue address.
-
-@example
-$ git send-email outgoing/*.patch --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
-$ rm -rf outgoing # we don't need these anymore
-@end example
-
-Thankfully, this @command{git format-patch} dance is not necessary
-to send an amended patch series, since an issue already exists for
-the patchset.
-
-@example
-$ git send-email -@var{NUMBER_COMMITS} -v@var{REVISION} \
-      --to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
-@end example
-
-If need be, you may use @option{--cover-letter --annotate} to send
-another cover letter, e.g. for explaining what's changed since the last
-revision, and why these changes are necessary.
-
 @node Tracking Bugs and Changes
 @section Tracking Bugs and Changes
 
@@ -2362,31 +2204,26 @@ patch submissions and topic branches.
 * The Issue Tracker::           The official bug and patch tracker.
 * Managing Patches and Branches::  How changes to Guix are managed.
 * Debbugs User Interfaces::     Ways to interact with Debbugs.
-* Debbugs Usertags::            Tag reports with custom labels.
 * Cuirass Build Notifications::  Be alerted of any breakage via RSS feeds.
 @end menu
 
 @node The Issue Tracker
 @subsection The Issue Tracker
 
-@cindex bug reports, tracking
-@cindex patch submissions, tracking
-@cindex issue tracking
+@cindex email workflow, deprecated
+@cindex issue tracker, for the email workflow
 @cindex Debbugs, issue tracking system
 Bug reports (@dfn{issues}) and patch submissions (@dfn{pull requests})
 are currently tracked at the @uref{https://codeberg.org/guix/guix,
 project's home at Codeberg}.
 
-Before May 25th, 2025, bug reports and patches were exclusively tracked
-using the Debbugs instance at @uref{https://bugs.gnu.org}; it may still
-be used for these purposes until December 31st, 2025, after which
-Codeberg will become the sole option to report new bugs and propose new
-changes@footnote{Check out
+Before January 1st, 2026, bug reports and patches were tracked using the
+Debbugs instance at @uref{https://bugs.gnu.org}, which can also be
+browsed at @uref{https://issues.guix.gnu.org}.  This has been
+discontinued and Codeberg is now the sole option to report new bugs and
+propose new changes@footnote{Check out
 @uref{https://codeberg.org/guix/guix-consensus-documents/src/branch/main/002-codeberg.md,
-Guix Consensus Document 002} for details on this decision.}.  With
-Debbugs, bug reports are sent by email to @email{bug-guix@@gnu.org} and
-patches are sent to @email{guix-patches@@gnu.org} (@pxref{Submitting
-Patches}).
+Guix Consensus Document 002} for details on this decision.}.
 
 @node Managing Patches and Branches
 @subsection Managing Patches and Branches
@@ -2498,11 +2335,10 @@ only then should the merge requests be created, as documented earlier.
 
 @quotation Warning
 This section is about bug reports and patches sent by email to
-@uref{https://issues.guix.gnu.org, Debbugs}.  This option is supported
-until December 31st, 2025, after which
-@uref{https://codeberg.org/guix/guix, Codeberg} will be the only
-interface for submitting bug reports and changes.  @xref{Submitting
-Patches}, for more info.
+@uref{https://issues.guix.gnu.org, Debbugs}, which is discontinued.
+Since January 1st, 2026, bug reports and patches are submitted as issues
+and pull requests on @uref{https://codeberg.org/guix/guix, Codeberg}.
+@xref{Submitting Patches}, for more info.
 @end quotation
 
 @subsubsection Web interface
@@ -2691,63 +2527,6 @@ used.
 @xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on
 this nifty tool!
 
-@node Debbugs Usertags
-@subsection Debbugs Usertags
-
-@cindex usertags, for debbugs
-@cindex Debbugs usertags
-Debbugs provides a feature called @dfn{usertags} that allows any user to
-tag any bug with an arbitrary label.  Bugs can be searched by usertag,
-so this is a handy way to organize bugs@footnote{The list of usertags is
-public information, and anyone can modify any user's list of usertags,
-so keep that in mind if you choose to use this feature.}.  If you use
-Emacs Debbugs, the entry-point to consult existing usertags is the
-@samp{C-u M-x debbugs-gnu-usertags} procedure.  To set a usertag, press
-@samp{C} while consulting a bug within the *Guix-Patches* buffer opened
-with @samp{C-u M-x debbugs-gnu-bugs} buffer, then select @code{usertag}
-and follow the instructions.
-
-For example, to view all the bug reports (or patches, in the case of
-@code{guix-patches}) tagged with the usertag @code{powerpc64le-linux}
-for the user @code{guix}, open a URL like the following in a web
-browser:
-@url{https://debbugs.gnu.org/cgi-bin/pkgreport.cgi?tag=powerpc64le-linux;users=guix}.
-
-For more information on how to use usertags, please refer to the
-documentation for Debbugs or the documentation for whatever tool you use
-to interact with Debbugs.
-
-In Guix, we are experimenting with usertags to keep track of
-architecture-specific issues, as well as reviewed ones.  To facilitate
-collaboration, all our usertags are associated with the single user
-@code{guix}.  The following usertags currently exist for that user:
-
-@table @code
-
-@item powerpc64le-linux
-The purpose of this usertag is to make it easy to find the issues that
-matter most for the @code{powerpc64le-linux} system type.  Please assign
-this usertag to bugs or patches that affect @code{powerpc64le-linux} but
-not other system types.  In addition, you may use it to identify issues
-that for some reason are particularly important for the
-@code{powerpc64le-linux} system type, even if the issue affects other
-system types, too.
-
-@item reproducibility
-For issues related to reproducibility.  For example, it would be
-appropriate to assign this usertag to a bug report for a package that
-fails to build reproducibly.
-
-@item reviewed-looks-good
-You have reviewed the series and it looks good to you (LGTM).
-
-@end table
-
-If you're a committer and you want to add a usertag, just start using it
-with the @code{guix} user.  If the usertag proves useful to you,
-consider updating this section of the manual so that others will know
-what your usertag means.
-
 @node Cuirass Build Notifications
 @subsection Cuirass Build Notifications
 
@@ -3249,7 +3028,7 @@ to that commit message.
 
 If you are not a committer, you can help others find a @emph{series} you
 have reviewed more easily by adding a @code{reviewed-looks-good} usertag
-for the @code{guix} user (@pxref{Debbugs Usertags}).
+for the @code{guix} user.
 
 @node Updating the Guix Package
 @section Updating the Guix Package

etc/news.scm

@@ -45,7 +45,8 @@
  (entry (commit "6d4cb99a15da7f4fd55f956c55f4f4aacfcc7742")
         (title
          (en "@code{%desktop-services} now includes GDM on AArch64")
-         (de "@code{%desktop-services} enthält jetzt GDM auf AArch64"))
+         (de "@code{%desktop-services} enthält jetzt GDM auf AArch64")
+         (pt "@code{%desktop-services} agora inclui GDM no AArch64"))
         (body
          (en "On Guix System in an operating system configuration, your value for the
 @code{services} field is based on @code{%desktop-services} for desktop
@@ -76,7 +77,22 @@ genug fortgeschritten sind, um die %desktop-services zu benutzen.
 
 Falls Sie auf AArch64 sind und die Anmeldeverwaltung geändert haben, müssen Sie
 Ihre Konfiguration ändern und dort @code{gdm-service-type} entfernen statt
-@code{sddm-service-type}.")))
+@code{sddm-service-type}.")
+         (pt "Em uma configuração de sistema operacional do Guix System, seu
+valor para o campo @code{services} é baseado em @code{%desktop-services} para
+máquinas desktop.
+
+@code{%desktop-services} contém um gerenciador de login dependente de
+arquitetura.  Anteriormente, GDM fora usado em x86_64 e SDDM nas demais.
+
+Agora, GDM é usado em todas as arquiteturas de 64 bits. Esta mudança afeta
+apenas a AArch64 no frigir dos ovos, dado que as demais arquiteturas de 64
+bits não são maduras o bastante para usar @code{%desktop-services}, por
+enquanto.
+
+No caso de você estar em um AArch64 e ter modificado o gerenciador de login,
+você terá que adaptar sua configuração para remover @code{gdm-service-type} em
+vez de @code{sddm-service-type}.")))
 
  (entry (commit "d3b79beaa806452dceaffb8b211b69dc4c346aba")
         (title

etc/teams.scm

@@ -1416,6 +1416,11 @@ the \"texlive\" importer."
                        "softwarelibre@urutau-ltd.org"
                        "FuncProgLinux")
   mate)
+
+(define-member (person "Reza Housseini"
+                       "reza@housseini.me"
+                       "rhou")
+  python science c++)
 
 (define (find-team name)
   (or (hash-ref %teams (string->symbol name))

gnu/packages/admin.scm

@@ -79,6 +79,7 @@
 ;;; Copyright © 2025 Simon Streit <simon@netpanic.org>
 ;;; Copyright © 2025 Luca Kredel <luca.kredel@web.de>
 ;;; Copyright © 2025 ROCKTAKEY <rocktakey@gmail.com>
+;;; Copyright © 2026 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5847,6 +5848,11 @@ This program allows you to view and manipulate this EEPROM list.")
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)
              (setenv "CONFIG_SHELL" (which "bash"))
+             (setenv "CFLAGS"
+               (string-append "-g -O2 "
+                              "-Wno-error=implicit-int "
+                              "-Wno-error=implicit-function-declaration "
+                              "-Wno-error=incompatible-pointer-types"))
              (invoke "./configure"
               (string-append "--prefix="
                              (assoc-ref outputs "out"))))))))

gnu/packages/apparmor.scm

@@ -41,7 +41,7 @@
 (define-public libapparmor
   (package
     (name "libapparmor")
-    (version "3.1.2")
+    (version "4.1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -50,7 +50,7 @@
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1h77a7ww0rxfv5nsi1iy4fffklxdr2vq6r7kdsqm15yysglhbjyi"))))
+                "0p3vq0awvn4ar6sblmhcs0i9m7zc9kbwm3f3zcggx4lqgmy8s18b"))))
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
@@ -84,6 +84,7 @@
                    (chdir "libraries/libapparmor"))))))
     (native-inputs
      (list autoconf
+           autoconf-archive
            automake
            bison
            dejagnu

gnu/packages/data-language.scm

@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
 ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop>
+;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
@@ -66,7 +68,6 @@
            glpk
            graphicsmagick
            gsl
-           hdf4-alt
            hdf5
            libgeotiff
            libjpeg-turbo
@@ -83,6 +84,9 @@
            udunits
            wxwidgets
            zlib))
+    (arguments
+      (list
+        #:configure-flags #~(list "-DHDF=OFF"))) ; keep default "-DHDF5=ON"
     (home-page "https://gnudatalanguage.github.io/")
     (synopsis "Compiler for GDL, an IDL-compatible programming language")
     (description

gnu/packages/datastructures.scm

@@ -27,6 +27,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -169,6 +170,78 @@ and time-efficient for good hash functions.")
     (home-page "https://github.com/sparsehash/sparsehash")
     (license license:bsd-3)))
 
+(define-public parallel-hashmap
+  (package
+    (name "parallel-hashmap")
+    (version "2.0.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/greg7mdp/parallel-hashmap")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "167pvbd3bwyn69i1s4vp3badcr97xy10sga63bbj7jqhj09f2816"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list
+      #:configure-flags
+      #~(list "-DPHMAP_BUILD_EXAMPLES=OFF")
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'respect-tests?
+            (lambda* (#:key tests? #:allow-other-keys)
+              ;; fix parallel-hashmap's build script not respecting #:tests?
+              (unless tests?
+                (substitute* "CMakeLists.txt"
+                  (("option\\(PHMAP_BUILD_TESTS.+$")
+                   "set(PHMAP_BUILD_TESTS OFF)\n")))))
+          (add-after 'unpack 'disable-gtest-download
+            (lambda _
+              ;; don't download googletest
+              (substitute* "CMakeLists.txt"
+                (("include\\(cmake/DownloadGTest.cmake\\)")
+                 (format #f
+                  "add_subdirectory(~a ./googletest-build EXCLUDE_FROM_ALL)"
+                  #+(package-source (this-package-native-input "googletest"))))))))))
+    ;; FIXME: specify that we depend on the gtest source, not the package itself
+    (native-inputs (list googletest))
+    (home-page "https://greg7mdp.github.io/parallel-hashmap/")
+    (synopsis "C++ implementation of efficient and concurrent hash maps")
+    (description
+     "parallel-hashmap provides a family of header-only, very fast and
+memory-friendly hashmap and btree containers for C++11 and above.
+
+It has the following characteristics:
+
+@itemize
+
+@item Drop-in replacement for std::unordered_map, std::unordered_set, std::map,
+and std::set with better performance.
+
+@item Requires C++11 compiler support and provides C++14 and C++17 APIs,
+including features like try_emplace.
+
+@item Highly efficent and faster than standard unordered containers,
+Boost implementations, or sparsepp alternatives.
+
+@item Memory-friendly: maintains low memory usage with a slight increase compared
+to sparsepp.
+
+@item Heterogeneous lookup support.
+
+@item Dump/load feature: for flat hash maps storing std::trivially_copyable data,
+the entire table can be dumped to disk and restored as a single array efficiently
+without hash computations. This is about 10 times faster than element-wise
+serialization but uses 10% to 60% extra disk space.
+
+@item Automatic support for boost::hash_value() and default hash functions for
+std::pair and std::tuple.
+
+@end itemize")
+    (license license:asl2.0)))
+
 (define-public ssdeep
   (package
     (name "ssdeep")

gnu/packages/electronics.scm

@@ -633,18 +633,10 @@ Simulator Trace} files.")
     (arguments
      (list
       #:bootstrap-scripts #~(list "autoconf.sh")
-      #:phases #~(modify-phases %standard-phases
-                   (add-after 'unpack 'ensure-native-baked-CC/CXX
-                     (lambda _
-                       ;; The compilers used to build are retained in
-                       ;; bin/iverilog-vpi, which is a Makefile
-                       ;; script. Normalize these to just 'gcc' and 'g++' to
-                       ;; avoid having these set to cross compilers.
-                       (substitute* "Makefile.in"
-                         (("s;@IVCC@;\\$\\(CC);")
-                          "s;@IVCC@;gcc;")
-                         (("s;@IVCXX@;\\$\\(CXX);")
-                          "s;@IVCXX@;g++;")))))))
+      #:make-flags
+      #~(list (string-append "CC=" #$(cc-for-target))
+              (string-append "CXX=" #$(cxx-for-target))
+              (string-append "PREFIX=" #$output))))
     (native-inputs (list autoconf bison flex gperf))
     (inputs (list zlib))
     (home-page "https://steveicarus.github.io/iverilog/")

gnu/packages/emacs-xyz.scm

@@ -5013,7 +5013,7 @@ podcasts) in Emacs.")
               (install-file "emms-print-metadata.1"
                             (string-append #$output "/share/man/man1")))))))
     (inputs
-     (list taglib))
+     (list taglib zlib))
     (home-page "https://www.gnu.org/software/emms/")
     (synopsis "The Emacs Multimedia System")
     (description
@@ -21488,28 +21488,31 @@ procedures for emacs-lisp-mode.")
       (license license:gpl3+))))
 
 (define-public emacs-ht
-  (package
-    (name "emacs-ht")
-    (version "2.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/Wilfred/ht.el")
-             (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0can9v336lgnq0q2ha3js0565jzp3dlwwqxhcbx5swk5kp148f07"))))
-    (build-system emacs-build-system)
-    (propagated-inputs (list emacs-dash))
-    (native-inputs
-     (list emacs-ert-runner))
-    (home-page "https://github.com/Wilfred/ht.el")
-    (synopsis "Hash table library for Emacs")
-    (description
-     "This package simplifies the use of hash tables in elisp.  It also
+  ;; Last release in 2021.
+  (let ((commit "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
+        (revision "0"))
+    (package
+      (name "emacs-ht")
+      (version (git-version "2.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+                (url "https://github.com/Wilfred/ht.el")
+                (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1vyk81xav1ghdb39fqi99yf6yvzsh6p007v7yhzk1bbqqffkvqdj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs (list emacs-dash))
+      (native-inputs
+       (list emacs-ert-runner))
+      (home-page "https://github.com/Wilfred/ht.el")
+      (synopsis "Hash table library for Emacs")
+      (description
+       "This package simplifies the use of hash tables in elisp.  It also
 provides functions to convert hash tables from and to alists and plists.")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-log4e
   (package

gnu/packages/guile-xyz.scm

@@ -957,59 +957,40 @@ variables from them.")
    (name "guile-dotenv-cli")
    (arguments
     (list
-     #:modules `((ice-9 match)
-                 (ice-9 ftw)
-                 ,@%default-gnu-imported-modules)
+     #:modules `(((guix build guile-build-system)
+                  #:select
+                  (target-guile-effective-version))
+                 ,@%default-gnu-modules)
      #:phases
-     #~(modify-phases %standard-phases
-         (replace 'install
-           (lambda _
-             (mkdir-p (string-append #$output "/bin"))
-             (install-file "./scripts/dotenv"
-                           (string-append #$output "/bin/"))))
-         (add-after 'install 'wrap-binaries
-           (lambda _
-             (let* ((inputs
-                     (list
-                      #$@(map (lambda (input)
-                                (this-package-input input))
-                              '("guile-config"
-                                "guile-dotenv"))))
-                    (compiled-dir
-                     (lambda (out version)
-                       (string-append out "/lib/guile/"
-                                      version "/site-ccache")))
-                    (uncompiled-dir
-                     (lambda (out version)
-                       (string-append out "/share/guile/site"
-                                      (if (string-null? version) "" "/")
-                                      version)))
-                    (dep-path
-                     (lambda (env modules path)
-                       (list env ":" 'prefix
-                             (cons modules
-                                    (map (lambda (input)
-                                           (string-append input path))
-                                         inputs)))))
-                    (bin (string-append #$output "/bin/"))
-                    (site
-                     (uncompiled-dir #$(this-package-input "guile-dotenv") "")))
-                (match (scandir site)
-                  (("." ".." version)
-                   (for-each
-                    (lambda (file)
-                      (wrap-program (string-append bin file)
-                        (dep-path
-                         "GUILE_LOAD_PATH"
-                         (uncompiled-dir
-                          #$(this-package-input "guile-dotenv") version)
-                         (uncompiled-dir "" version))
-                        (dep-path
-                         "GUILE_LOAD_COMPILED_PATH"
-                         (compiled-dir
-                          #$(this-package-input "guile-dotenv") version)
-                         (compiled-dir "" version))))
-                    '("dotenv"))))))))))
+     (with-imported-modules `((guix build guile-build-system)
+                              ,@%default-gnu-imported-modules)
+       #~(modify-phases %standard-phases
+           (replace 'install
+             (lambda _
+               (mkdir-p (string-append #$output "/bin"))
+               (install-file "./scripts/dotenv"
+                             (string-append #$output "/bin/"))))
+           (add-after 'install 'wrap-binaries
+             (lambda* (#:key inputs #:allow-other-keys)
+               (let* ((version (target-guile-effective-version))
+                      (site-ccache (string-append "/lib/guile/"
+                                                  version "/site-ccache"))
+                      (site (string-append "/share/guile/site/" version))
+                      (dep-path
+                       (lambda (env path)
+                         (list env ":" 'prefix
+                               (cons (string-append #$output path)
+                                     (map (lambda (input)
+                                            (string-append
+                                             (assoc-ref inputs input)
+                                             path))
+                                          (list "guile-config"
+                                                "guile-dotenv"
+                                                "nyacc"))))))
+                      (bin (string-append (ungexp output) "/bin/")))
+                 (wrap-program (string-append bin "dotenv")
+                   (dep-path "GUILE_LOAD_PATH" site)
+                   (dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
    (inputs
      (modify-inputs (package-inputs guile-dotenv)
        (append bash-minimal)))

gnu/packages/kde-frameworks.scm

@@ -2693,7 +2693,7 @@ covers feedback and persistent events.")
            kwindowsystem-5
            libcanberra
            libdbusmenu-qt
-           phonon
+           phonon-qt5
            qtdeclarative-5
            qtbase-5
            qtspeech-5
@@ -4570,7 +4570,7 @@ the passwords on KDE work spaces.")
            kwidgetsaddons-5
            kwindowsystem-5
            libgcrypt
-           phonon
+           phonon-qt5
            qgpgme
            qca
            qtbase-5))))
@@ -4727,7 +4727,7 @@ descriptions for integrating actions from plugins.")
                   kxmlgui-5
                   ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd,
                   libglvnd
-                  phonon
+                  phonon-qt5
                   qtbase-5
                   qtdeclarative-5
                   qtquickcontrols2-5

gnu/packages/kde-multimedia.scm

@@ -15,6 +15,7 @@
 ;;; Copyright © 2024 Maxim Cournoyer <maxim@guixotic.coop>
 ;;; Copyright © 2024, 2025 Sughosha <sughosha@disroot.org>
 ;;; Copyright © 2025 Sergio Pastor Pérez <sergio.pastorperez@gmail.com>
+;;; Copyright © 2025 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,10 +95,29 @@
     (build-system cmake-build-system)
     (native-inputs
      (list appstream extra-cmake-modules pkg-config qttools))
-    (inputs (list qtbase qt5compat glib qtbase-5 pulseaudio))
+    (inputs (list qtbase qt5compat glib pulseaudio))
     (arguments
      (list #:configure-flags
-           #~(list "-DCMAKE_CXX_FLAGS=-fPIC")))
+           #~(list "-DPHONON_BUILD_QT5=OFF"
+                   "-DPHONON_BUILD_QT6=ON"
+                   "-DCMAKE_CXX_FLAGS=-fPIC")))
+    (home-page "https://community.kde.org/Phonon")
+    (synopsis "KDE's multimedia library")
+    (description "KDE's multimedia library.")
+    (license license:lgpl2.1+)))
+
+(define-public phonon-qt5
+  (package
+    (inherit phonon)
+    (name "phonon-qt5")
+    (native-inputs
+     (list appstream extra-cmake-modules pkg-config qttools-5))
+    (inputs (list qtbase-5 glib pulseaudio))
+    (arguments
+     (list #:configure-flags
+           #~(list "-DPHONON_BUILD_QT5=ON"
+                   "-DPHONON_BUILD_QT6=OFF"
+                   "-DCMAKE_CXX_FLAGS=-fPIC")))
     (home-page "https://community.kde.org/Phonon")
     (synopsis "KDE's multimedia library")
     (description "KDE's multimedia library.")

gnu/packages/mp3.scm

@@ -245,7 +245,7 @@ a highly stable and efficient implementation.")
 (define-public taglib
   (package
     (name "taglib")
-    (version "1.12")
+    (version "2.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -254,23 +254,12 @@ a highly stable and efficient implementation.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0q7dkn5rh9v6b0scmcp2qmjv3iransafmpn6jvgid0yq75m2nqd2"))))
+                "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
     (build-system cmake-build-system)
     (arguments
-      '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on.
-        #:configure-flags (list "-DBUILD_SHARED_LIBS=ON")
-        #:phases (modify-phases %standard-phases
-                   (add-before 'configure 'adjust-zlib-ldflags
-                     (lambda* (#:key inputs #:allow-other-keys)
-                       ;; Make sure users of 'taglib-config --libs' get the -L
-                       ;; flag for zlib.
-                       (substitute* "CMakeLists.txt"
-                         (("set\\(ZLIB_LIBRARIES_FLAGS -lz\\)")
-                          (string-append "set(ZLIB_LIBRARIES_FLAGS \"-L"
-                                         (assoc-ref inputs "zlib")
-                                         "/lib -lz\")")))
-                       #t)))))
-    (inputs (list zlib))
+     (list #:configure-flags
+           #~(list "-DBUILD_SHARED_LIBS=ON")))
+    (inputs (list cppunit utfcpp zlib))
     (home-page "https://taglib.org")
     (synopsis "Library to access audio file meta-data")
     (description
@@ -282,23 +271,19 @@ Speex, WavPack TrueAudio, WAV, AIFF, MP4 and ASF files.")
     ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1.
     (license (list license:lgpl2.1 license:mpl1.1))))
 
-(define-public taglib-next
-  (package
-    (inherit taglib)
-    (name "taglib")
-    (version "2.1.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/taglib/taglib")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0m1xyjsg6a8p4prn1xr1g29zsxqr7606cv3cblgjgxkb1dk26fx7"))))
-    (inputs
-     (list utfcpp
-           zlib))))
+(define-public taglib-1
+  (package/inherit taglib
+    (name (package-name taglib))
+    (version "1.13.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/taglib/taglib")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0phliksg5r1n15prcbp391xk2z1fh2c7zlc7h0nabpwkf6j08za1"))))))
 
 (define-public minimp3
   ;; The latest commit is used as there is no release.
@@ -789,7 +774,7 @@ fingerprinting library and the Acoustid API.")
            python-pytest
            python-setuptools))
     (inputs
-     (list taglib-next))
+     (list taglib))
     (home-page "https://github.com/supermihi/pytaglib")
     (synopsis "Python bindings for taglib")
     (description

gnu/packages/music.scm

@@ -753,7 +753,7 @@ Winamp/XMMS skins.")
 (define-public strawberry
   (package
     (name "strawberry")
-    (version "1.0.21")
+    (version "1.2.14")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -762,32 +762,21 @@ Winamp/XMMS skins.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1ibs7x7i1zz2r13wg238c5bhr1j4x8vl7hvjg01vdl5hfrh2gk1i"))
-              (modules '((guix build utils)
-                         (ice-9 regex)))
+                "0sli0wm1l34ca8y6m3rfa604v1bbzbaiala13kzndcqqwnrsh66f"))
+              (modules '((guix build utils)))
+              ;; Unbundle and disable discord-rpc.
               (snippet
                '(begin
-                  (use-modules ((ice-9 regex)))
-                  (for-each
-                   (lambda (dir)
-                     ;; TODO: The following dependencies are still bundled:
-                     ;; - "singleapplication"
-                     (let ((bundled '("singleapplication")))
-                       (if (not
-                            (string-match
-                             (string-append ".?*(" (string-join bundled "|") ")")
-                             dir))
-                           (delete-file-recursively dir))))
-                   (find-files "3rdparty"
-                               (lambda (file stat)
-                                 (string-match "^3rdparty/[^/]*$" file))
-                               #:directories? #t))))))
+                  (delete-file-recursively "3rdparty")
+                  (substitute* "CMakeLists.txt"
+                    ((".*3rdparty\\/discord-rpc.*") "")
+                    ((".*src/discord.*") "")
+                    ((".*:discord-rpc.*") "")
+                    (("DISCORD_RPC ON") "DISCORD_RPC OFF"))))))
     (build-system qt-build-system)
     (arguments
      (list
       #:qtbase qtbase
-      #:configure-flags
-      #~(list "-DBUILD_WITH_QT6=ON")
       #:modules '((guix build qt-build-system)
                   ((guix build gnu-build-system) #:prefix gnu:)
                   (guix build utils))
@@ -829,13 +818,17 @@ Winamp/XMMS skins.")
            gst-plugins-base
            gst-plugins-good
            icu4c
+           kdsingleapplication
            libcdio
            libebur128
+           libgpod
            libmtp
            protobuf
            pulseaudio
            qtbase
            qtwayland
+           rapidjson
+           sparsehash
            sqlite
            taglib))
     (home-page "https://www.strawberrymusicplayer.org/")
@@ -845,8 +838,6 @@ It is a fork of Clementine aimed at music collectors and audiophiles.")
     (license (list
               ;; strawberry.
               license:gpl3+
-              ;; singleapplication
-              license:expat
               ;; icons.
               license:cc-by-sa3.0))))
 

gnu/packages/prolog.scm

@@ -201,10 +201,6 @@ it.")
         (base32 "0z3zx66v1qx80b97vmb8hhpb52jjbjs9rfz31myw6mf2fsgqb2b7"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
-    (native-inputs
-     (if (supported-package? valgrind/pinned)
-         (list valgrind/pinned)
-         '()))
     (inputs
      (list curl
            gsl
@@ -219,9 +215,7 @@ it.")
       #~(list (string-append "PREFIX=" #$output)
               (string-append "CC=" #$(cc-for-target))
               (string-append "HOST_CC=" #$(cc-for-target)))
-      #:test-target (if (this-package-native-input "valgrind")
-                        "check"
-                        "test")
+      #:test-target "test"
       #:phases
       #~(modify-phases %standard-phases
           ;; Upstream does not use a configure script.

gnu/packages/video.scm

@@ -2565,7 +2565,7 @@ media, 2D/3D graphics and ECMAScript.")
            speex
            speexdsp
            srt
-           taglib
+           taglib-1
            twolame
            unzip
            wayland

gnu/packages/vpn.scm

@@ -59,6 +59,7 @@
   #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages admin)
+  #:use-module (gnu packages authentication)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
@@ -66,6 +67,7 @@
   #:use-module (gnu packages dns)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages flex)
@@ -81,10 +83,13 @@
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
+  #:use-module (gnu packages hardware)
+  #:use-module (gnu packages kerberos)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages networking)
   #:use-module (gnu packages nss)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -761,32 +766,63 @@ the user specifically asks to proxy, so the @dfn{VPN} interface no longer
     (license license:bsd-3)))
 
 (define-public openconnect
-  (package
-    (name "openconnect")
-    (version "9.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "ftp://ftp.infradead.org/pub/openconnect/"
-                                  "openconnect-" version ".tar.gz"))
-              (sha256
-               (base32 "0gj1nba1pygvcjasqdakxxnx94dwx3l4hzj0dvipbzjdmbixrgm2"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list #:configure-flags
-           #~(list (string-append "--with-vpnc-script="
-                                  (search-input-file %build-inputs
-                                                     "etc/vpnc/vpnc-script")))))
-    (native-inputs (list gettext-minimal pkg-config))
-    (inputs (list lz4 vpnc-scripts))
-    (propagated-inputs (list libxml2 gnutls zlib))
-    (synopsis "Client for Cisco VPN")
-    (description
-     "OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
+  (let ((commit "0dcdff87db65daf692dc323732831391d595d98d")
+        (revision "0"))
+    (package
+      (name "openconnect")
+      (version (git-version "9.12" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                       (url "https://gitlab.com/openconnect/openconnect.git")
+                       (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0m8zwnnjkxik3sy67zm3ia6dkmz77fansja889zg8pp481831yh2"))))
+      (outputs '("out" "doc"))
+      (build-system gnu-build-system)
+      (arguments
+       (list
+        #:configure-flags
+        #~(list
+           (string-append
+            "--with-vpnc-script="
+            (search-input-file %build-inputs "etc/vpnc/vpnc-script")))))
+      (native-inputs
+       (list autoconf
+             automake
+             gettext-minimal
+             libtool
+             pkg-config
+             ;; To build documentation.
+             groff
+             python-minimal
+             ;; For unit tests.
+             socket-wrapper
+             uid-wrapper
+             python-flask))
+      (inputs
+       (list mit-krb5                   ;for gssapi
+             tpm2-tss
+             lz4
+             vpnc-scripts))
+      (propagated-inputs
+       (list gnutls
+             libproxy
+             oath-toolkit               ;for libpskc
+             pcsc-lite
+             stoken
+             libxml2
+             zlib))
+      (synopsis "Client for Cisco VPN")
+      (description
+       "OpenConnect is a client for Cisco's AnyConnect SSL VPN, which is
 supported by the ASA5500 Series, by IOS 12.4(9)T or later on Cisco SR500, 870,
 880, 1800, 2800, 3800, 7200 Series and Cisco 7301 Routers, and probably
 others.")
-    (license license:lgpl2.1)
-    (home-page "https://www.infradead.org/openconnect/")))
+      (license license:lgpl2.1)
+      (home-page "https://www.infradead.org/openconnect/"))))
 
 (define-public openfortivpn
   (package

gnu/packages/xorg.scm

@@ -6657,7 +6657,7 @@ X11 servers, Windows, or macOS.")
   (package
     (inherit xpra)
     (name "xpra")
-    (version "5.1.3")
+    (version "5.1.4")
     (source
      (origin
        (method git-fetch)
@@ -6666,7 +6666,7 @@ X11 servers, Windows, or macOS.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1046dqfh97l586gzbvcd1vb515na35147jm55i50kc9zkssfmygc"))
+        (base32 "1hb6pjixs85laarypkx6dvb8n9qyahy8v251f71h7qll9l2w8ak0"))
        (patches (search-patches "xpra-5.0-systemd-run.patch"
                                 "xpra-5.0-install_libs.patch"))))))
 

gnu/services/xorg.scm

@@ -44,7 +44,6 @@
   #:use-module (gnu system privilege)
   #:use-module (gnu services base)
   #:use-module (gnu services dbus)
-  #:use-module (gnu services desktop)
   #:use-module (gnu packages base)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xorg)