guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/12: Merge branch 'master' into 'gnome-team'.


From: guix-commits
Subject: 11/12: Merge branch 'master' into 'gnome-team'.
Date: Fri, 13 Dec 2024 07:09:44 -0500 (EST)

lilyp pushed a commit to branch gnome-team
in repository guix.

commit 41e90167d71ba756fac676bf3085ee3accc3dc1c
Merge: 904755012f 98aca7a2b6
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Fri Dec 13 08:31:44 2024 +0100

    Merge branch 'master' into 'gnome-team'.

 .dir-locals.el                                     |     1 +
 .guix-authorizations                               |     2 +
 Makefile.am                                        |    28 +-
 config-daemon.ac                                   |    21 +-
 doc/contributing.texi                              |   222 +-
 doc/guix-cookbook.texi                             |   103 +
 doc/guix.texi                                      |   283 +-
 .../disarchive.scm}                                |     2 +-
 etc/{hurd-manifest.scm => manifests/hurd.scm}      |     0
 .../kernels.scm}                                   |     0
 .../release.scm}                                   |     0
 etc/{source-manifest.scm => manifests/source.scm}  |    13 +-
 etc/{ => manifests}/system-tests.scm               |     0
 .../time-travel.scm}                               |     0
 etc/manifests/ungraft.scm                          |    49 +
 etc/manifests/upgrade.scm                          |   140 +
 etc/news.scm                                       |    38 +
 etc/teams.scm                                      |    15 +-
 etc/teams/rust/rusty-packages.scm                  |    46 +
 gnu/bootloader/grub.scm                            |    83 +-
 gnu/bootloader/u-boot.scm                          |    47 +-
 gnu/home/services/desktop.scm                      |    16 +-
 gnu/home/services/pm.scm                           |     8 +-
 gnu/home/services/shepherd.scm                     |    20 +-
 gnu/installer.scm                                  |     2 +-
 gnu/installer/newt/locale.scm                      |    16 +-
 gnu/local.mk                                       |    39 +-
 gnu/packages.scm                                   |    28 +-
 gnu/packages/admin.scm                             |   157 +-
 gnu/packages/appimage.scm                          |    97 +
 gnu/packages/astronomy.scm                         |  1718 +-
 gnu/packages/audio.scm                             |    69 +-
 gnu/packages/authentication.scm                    |    10 +-
 gnu/packages/aux-files/guile-launcher.c            |    19 +-
 gnu/packages/base.scm                              |   122 +-
 gnu/packages/bash.scm                              |    22 +
 gnu/packages/bioconductor.scm                      |  5663 ++-
 gnu/packages/bioinformatics.scm                    |   574 +-
 gnu/packages/bittorrent.scm                        |    17 +-
 gnu/packages/bootloaders.scm                       |    19 +-
 gnu/packages/bootstrap.scm                         |    97 +-
 gnu/packages/browser-extensions.scm                |    20 +-
 gnu/packages/build-tools.scm                       |    17 +-
 gnu/packages/c.scm                                 |     2 +-
 gnu/packages/cdrom.scm                             |    65 +-
 gnu/packages/check.scm                             |     7 +-
 gnu/packages/chez.scm                              |    11 +-
 gnu/packages/clifm.scm                             |    18 +-
 gnu/packages/code.scm                              |     3 +
 gnu/packages/commencement.scm                      |   107 +-
 gnu/packages/compression.scm                       |    55 +-
 gnu/packages/containers.scm                        |    12 +-
 gnu/packages/coq.scm                               |    28 +-
 gnu/packages/cpp.scm                               |   111 +-
 gnu/packages/cran.scm                              |  5045 ++-
 gnu/packages/crates-apple.scm                      |   514 +-
 gnu/packages/crates-crypto.scm                     |    85 +-
 gnu/packages/crates-graphics.scm                   |  1176 +-
 gnu/packages/crates-gtk.scm                        |  2038 +-
 gnu/packages/crates-io.scm                         |  7956 +++-
 gnu/packages/crates-tls.scm                        |   631 +-
 gnu/packages/crates-vcs.scm                        |  2601 +-
 gnu/packages/crates-web.scm                        |    88 +-
 gnu/packages/crates-windows.scm                    |   580 +-
 gnu/packages/cross-base.scm                        |    27 +-
 gnu/packages/crypto.scm                            |    13 +
 gnu/packages/databases.scm                         |    77 +-
 gnu/packages/debug.scm                             |     6 +-
 gnu/packages/dictd.scm                             |   100 +
 gnu/packages/dictionaries.scm                      |   103 +-
 gnu/packages/diffoscope.scm                        |     4 +-
 gnu/packages/docbook.scm                           |     2 +-
 gnu/packages/education.scm                         |     2 +-
 gnu/packages/elf.scm                               |     6 +-
 gnu/packages/emacs-xyz.scm                         |   223 +-
 gnu/packages/emacs.scm                             |    93 +-
 gnu/packages/embedded.scm                          |    34 +-
 gnu/packages/engineering.scm                       |    82 +-
 gnu/packages/erlang.scm                            |     6 +-
 gnu/packages/fabric-management.scm                 |    17 +-
 gnu/packages/fediverse.scm                         |     4 +-
 gnu/packages/file-systems.scm                      |    23 +-
 gnu/packages/finance.scm                           |     2 +-
 gnu/packages/firmware.scm                          |     8 +-
 gnu/packages/flex.scm                              |     8 +
 gnu/packages/fonts.scm                             |    19 +
 gnu/packages/freedesktop.scm                       |    97 +
 gnu/packages/ftp.scm                               |    75 +-
 gnu/packages/games.scm                             |    94 +-
 gnu/packages/gawk.scm                              |     2 +-
 gnu/packages/gcc.scm                               |    18 +-
 gnu/packages/gdb.scm                               |    54 +-
 gnu/packages/geo.scm                               |     8 +-
 gnu/packages/gettext.scm                           |    16 +-
 gnu/packages/gimp.scm                              |    14 +-
 gnu/packages/gl.scm                                |     3 +-
 gnu/packages/gnome.scm                             |    47 +-
 gnu/packages/gnunet.scm                            |    13 +-
 gnu/packages/gnupg.scm                             |    62 +-
 gnu/packages/gnuzilla.scm                          |    33 +-
 gnu/packages/golang-check.scm                      |    27 +-
 gnu/packages/golang-crypto.scm                     |    60 +-
 gnu/packages/golang-web.scm                        |   259 +-
 gnu/packages/golang-xyz.scm                        |   361 +-
 gnu/packages/golang.scm                            |   187 +-
 gnu/packages/graphics.scm                          |    29 +-
 gnu/packages/gtk.scm                               |    82 +-
 gnu/packages/guile-xyz.scm                         |    45 +-
 gnu/packages/guile.scm                             |    51 +-
 gnu/packages/haskell-apps.scm                      |     8 +-
 gnu/packages/haskell-crypto.scm                    |     2 +-
 gnu/packages/haskell-xyz.scm                       |   153 +-
 gnu/packages/haxe.scm                              |     2 +-
 gnu/packages/heads.scm                             |     8 +-
 gnu/packages/hunspell.scm                          |     7 +-
 gnu/packages/hurd.scm                              |   212 +-
 gnu/packages/icu4c.scm                             |    18 +
 gnu/packages/ipfs.scm                              |     3 +-
 gnu/packages/irc.scm                               |    69 +-
 gnu/packages/java-xml.scm                          |     4 +
 gnu/packages/julia-jll.scm                         |    16 +-
 gnu/packages/julia-xyz.scm                         |    24 +
 gnu/packages/kde-pim.scm                           |     2 +-
 gnu/packages/kde-plasma.scm                        |    10 +-
 gnu/packages/kde-utils.scm                         |     4 +-
 gnu/packages/lesstif.scm                           |     2 +-
 gnu/packages/libedit.scm                           |     8 +
 gnu/packages/libffi.scm                            |     8 +-
 gnu/packages/libreoffice.scm                       |    57 +-
 gnu/packages/librewolf.scm                         |    10 +-
 gnu/packages/linux.scm                             |   218 +-
 gnu/packages/lisp-xyz.scm                          |   338 +-
 gnu/packages/lisp.scm                              |   220 +-
 gnu/packages/llvm.scm                              |    69 +-
 gnu/packages/m4.scm                                |    15 +-
 gnu/packages/machine-learning.scm                  |    54 +-
 gnu/packages/mail.scm                              |     2 +-
 gnu/packages/make-bootstrap.scm                    |    48 +-
 gnu/packages/maths.scm                             |   306 +-
 gnu/packages/messaging.scm                         |   232 +-
 gnu/packages/minetest.scm                          |    80 +-
 gnu/packages/mold.scm                              |     4 +-
 gnu/packages/mpd.scm                               |    34 +-
 gnu/packages/mpi.scm                               |    11 +-
 gnu/packages/music.scm                             |    45 +-
 gnu/packages/networking.scm                        |    12 +-
 gnu/packages/nss.scm                               |    24 +-
 gnu/packages/ocaml.scm                             |    96 +-
 gnu/packages/package-management.scm                |    18 +-
 gnu/packages/parallel.scm                          |   103 +-
 gnu/packages/pascal.scm                            |     2 +-
 gnu/packages/password-utils.scm                    |     4 +-
 .../patches/chez-scheme-backport-configure.patch   |   463 -
 .../patches/chez-scheme-backport-signal.patch      |    87 -
 .../dune-grid-add-missing-include-cassert.patch    |    24 -
 .../patches/dune-istl-fix-solver-playground.patch  |    61 -
 gnu/packages/patches/freecad-vtk-9.3.patch         |    43 -
 .../patches/freedict-tools-fix-determinism.patch   |    22 +
 gnu/packages/patches/gdb-hurd64.patch              |   923 +
 gnu/packages/patches/geoclue-config.patch          |    70 +-
 .../glibc-hurd-pthread_setcancelstate.patch        |    92 +
 gnu/packages/patches/glibc-hurd64-fault.patch      |    32 +
 .../patches/glibc-hurd64-gcc-14.2-tls-bug.patch    |    28 +
 .../patches/glibc-hurd64-intr-msg-clobber.patch    |    62 +
 .../patches/glibc-hurd64-sgms-context.patch        |   505 +
 gnu/packages/patches/gnumach-version.patch         |    23 +
 gnu/packages/patches/grub-hurd64.patch             |    32 +
 gnu/packages/patches/guile-emacs-build-fixes.patch |   100 +
 .../patches/guile-emacs-fix-configure.patch        |   211 -
 gnu/packages/patches/guile-lzlib-hurd64.patch      |    32 +
 gnu/packages/patches/guile-ssh-rename-bool.patch   |    40 -
 gnu/packages/patches/hurd-64bit.patch              |    56 +
 gnu/packages/patches/hurd-refcounts-assert.patch   |    26 +
 gnu/packages/patches/inetutils-hurd64.patch        |    65 +
 gnu/packages/patches/libgpg-error-hurd64.patch     |    78 +
 gnu/packages/patches/libpciaccess-hurd64.patch     |    58 +
 gnu/packages/patches/libvpx-CVE-2023-44488.patch   |   107 -
 gnu/packages/patches/libvpx-CVE-2023-5217.patch    |    99 -
 gnu/packages/patches/libxcrypt-hurd64.patch        |    38 +
 gnu/packages/patches/netdde-csum.patch             |    18 +
 gnu/packages/patches/openssl-hurd64.patch          |    99 +
 gnu/packages/patches/pciutils-hurd64.patch         |    31 +
 .../patches/python-debugpy-unbundle-pydevd.patch   |   185 +-
 .../python-sphobjinv-defer-ssl-import.patch        |    34 +
 gnu/packages/patches/rust-1.78-unwinding-fix.patch |    29 +
 .../patches/rust-1.81-fix-riscv64-bootstrap.patch  |    40 +
 gnu/packages/patches/texmacs-wayland-hidpi.patch   |    22 +
 .../patches/torbrowser-compare-paths.patch         |    24 +
 .../patches/u-boot-calloc-visibility.patch         |    18 +
 gnu/packages/patches/ucx-tcp-iface-ioctl.patch     |    22 +-
 gnu/packages/pciutils.scm                          |    25 +-
 gnu/packages/pdf.scm                               |    61 +-
 gnu/packages/perl-maths.scm                        |    61 +
 gnu/packages/perl-web.scm                          |    19 +
 gnu/packages/perl.scm                              |   112 +-
 gnu/packages/pkg-config.scm                        |     4 +-
 gnu/packages/potassco.scm                          |    44 +-
 gnu/packages/protobuf.scm                          |    33 +
 gnu/packages/pure.scm                              |     2 +-
 gnu/packages/python-build.scm                      |    32 +
 gnu/packages/python-check.scm                      |    20 +
 gnu/packages/python-compression.scm                |     2 +-
 gnu/packages/python-crypto.scm                     |    21 +
 gnu/packages/python-graphics.scm                   |    74 +-
 gnu/packages/python-science.scm                    |    79 +-
 gnu/packages/python-web.scm                        |   378 +-
 gnu/packages/python-xyz.scm                        |   528 +-
 gnu/packages/qt.scm                                |   461 +-
 gnu/packages/radio.scm                             |    23 +-
 gnu/packages/rdesktop.scm                          |    54 +-
 gnu/packages/regex.scm                             |    29 +-
 gnu/packages/rpc.scm                               |     2 +-
 gnu/packages/ruby.scm                              |    26 +
 gnu/packages/rust-apps.scm                         |   836 +-
 gnu/packages/rust.scm                              |   244 +-
 gnu/packages/search.scm                            |     4 +-
 gnu/packages/sequoia.scm                           |   473 +-
 gnu/packages/shells.scm                            |     6 +-
 gnu/packages/shellutils.scm                        |    20 +-
 gnu/packages/simulation.scm                        |     2 +-
 gnu/packages/smalltalk.scm                         |     2 +-
 gnu/packages/sphinx.scm                            |    20 +-
 gnu/packages/ssh.scm                               |   168 +-
 gnu/packages/statistics.scm                        |   659 +-
 gnu/packages/sugar.scm                             |     2 +-
 gnu/packages/syndication.scm                       |     6 +-
 gnu/packages/terminals.scm                         |    53 +-
 gnu/packages/tex.scm                               |    59 +-
 gnu/packages/texinfo.scm                           |    58 +-
 gnu/packages/text-editors.scm                      |    52 +-
 gnu/packages/tls.scm                               |    27 +-
 gnu/packages/tor-browsers.scm                      |    50 +-
 gnu/packages/tor.scm                               |     4 +-
 gnu/packages/toys.scm                              |    76 +-
 gnu/packages/valgrind.scm                          |     4 +-
 gnu/packages/version-control.scm                   |    71 +-
 gnu/packages/video.scm                             |    63 +-
 gnu/packages/vim.scm                               |     8 +-
 gnu/packages/virtualization.scm                    |    10 +-
 gnu/packages/vpn.scm                               |     2 +-
 gnu/packages/web.scm                               |    71 +-
 gnu/packages/wget.scm                              |    27 +-
 gnu/packages/wm.scm                                |   194 +-
 gnu/packages/xdisorg.scm                           |   107 +
 gnu/packages/xorg.scm                              |    52 +-
 gnu/services/admin.scm                             |    10 +-
 gnu/services/cuirass.scm                           |     3 +-
 gnu/services/pm.scm                                |    61 +-
 gnu/services/shepherd.scm                          |    16 +-
 gnu/services/virtualization.scm                    |     1 +
 gnu/services/vpn.scm                               |   135 +-
 gnu/services/web.scm                               |    16 +-
 gnu/system.scm                                     |     1 -
 gnu/system/examples/bare-hurd.tmpl                 |    21 +-
 .../examples/{bare-hurd.tmpl => bare-hurd64.tmpl}  |    33 +-
 gnu/system/examples/devel-hurd.tmpl                |    70 +-
 gnu/system/examples/devel-hurd64.tmpl              |    65 +
 gnu/system/hurd.scm                                |    19 +-
 gnu/system/images/hurd.scm                         |    72 +-
 gnu/system/install.scm                             |    29 +-
 gnu/system/linux-initrd.scm                        |     1 +
 gnu/tests/databases.scm                            |     4 +-
 gnu/tests/docker.scm                               |    14 +-
 gnu/tests/guix.scm                                 |    10 +-
 gnu/tests/ldap.scm                                 |     2 +-
 gnu/tests/monitoring.scm                           |     2 +-
 gnu/tests/sddm.scm                                 |     4 +-
 gnu/tests/ssh.scm                                  |    23 +-
 gnu/tests/virtualization.scm                       |     6 +-
 gnu/tests/web.scm                                  |    10 +-
 guix/build-system/cargo.scm                        |    12 +-
 guix/build-system/meson.scm                        |     2 +-
 guix/build-system/r.scm                            |     6 +-
 guix/build/r-build-system.scm                      |    37 +-
 guix/build/svn.scm                                 |     3 +-
 guix/download.scm                                  |     3 +-
 guix/gnu-maintenance.scm                           |    90 +-
 guix/import/cpan.scm                               |    61 +-
 guix/import/cran.scm                               |   188 +-
 guix/import/crate.scm                              |     2 +-
 guix/import/egg.scm                                |     8 +-
 guix/import/gnome.scm                              |    13 +-
 guix/import/utils.scm                              |    19 +-
 guix/licenses.scm                                  |     6 +
 guix/lint.scm                                      |    62 +-
 guix/packages.scm                                  |    17 +-
 guix/platforms/x86.scm                             |    11 +-
 guix/records.scm                                   |    18 +-
 guix/remote.scm                                    |     5 +-
 guix/scripts/build.scm                             |   185 +-
 guix/scripts/graph.scm                             |    10 -
 guix/scripts/import/cpan.scm                       |    24 +-
 guix/scripts/pack.scm                              |   115 +-
 guix/scripts/refresh.scm                           |    10 -
 guix/scripts/system.scm                            |     7 +-
 guix/scripts/system/installer.scm                  |    70 +
 guix/scripts/weather.scm                           |    15 -
 guix/transformations.scm                           |    45 +-
 guix/ui.scm                                        |     2 +-
 guix/utils.scm                                     |    34 +-
 m4/guix.m4                                         |    14 +-
 nix/libstore/store-api.cc                          |     2 +-
 nix/local.mk                                       |     8 +-
 po/doc/guix-cookbook.pt_BR.po                      |    20 +-
 po/doc/guix-cookbook.sk.po                         |     8 +-
 po/doc/guix-manual.de.po                           | 33071 ++++++++---------
 po/doc/guix-manual.es.po                           | 33065 ++++++++---------
 po/doc/guix-manual.fr.po                           | 33172 ++++++++---------
 po/doc/guix-manual.pt_BR.po                        | 36927 ++++++++++---------
 po/doc/guix-manual.ru.po                           | 33070 ++++++++---------
 po/doc/guix-manual.zh_CN.po                        | 33004 +++++++++--------
 po/guix/fr.po                                      |    13 +-
 po/guix/pt_BR.po                                   |    24 +-
 po/guix/sk.po                                      |     6 +-
 po/guix/uk.po                                      |    12 +-
 po/guix/vi.po                                      |  2213 +-
 po/guix/zh_CN.po                                   |    33 +-
 po/packages/pt_BR.po                               |  2681 +-
 tests/guix-build.sh                                |    11 +
 tests/import-utils.scm                             |     6 +-
 tests/lint.scm                                     |    62 +-
 tests/pack.scm                                     |    40 +-
 tests/packages.scm                                 |    15 +
 tests/transformations.scm                          |    31 +-
 324 files changed, 141632 insertions(+), 113037 deletions(-)

diff --cc gnu/local.mk
index 30dca28a3b,39b142af5a..edc68364d3
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1373,7 -1374,9 +1373,8 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/gcolor3-update-libportal-usage.patch   \
    %D%/packages/patches/gd-fix-tests-on-i686.patch             \
    %D%/packages/patches/gd-brect-bounds.patch                  \
+   %D%/packages/patches/gdb-hurd64.patch                               \
    %D%/packages/patches/gdm-default-session.patch              \
 -  %D%/packages/patches/gdm-elogind-support.patch              \
    %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch       \
    %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch     \
    %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch   \
diff --cc gnu/packages/gnome.scm
index d204db5325,b4016a2fbc..45e4f40e56
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -2641,7 -2625,7 +2640,7 @@@ GNOME Desktop."
  (define-public gnome-keyring
    (package
      (name "gnome-keyring")
-     (version "46.2")
 -    (version "42.1")
++    (version "46.1")
      (source (origin
                (method url-fetch)
                (uri (string-append "mirror://gnome/sources/" name "/"
@@@ -2649,7 -2633,7 +2648,7 @@@
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
-                 "098ryv7xsnf5r58w8kdr6nahzhmrczjb72ycbqlg7dx8p1kcj9mz"))))
 -                "1rp38v4s9116ivycp27w806wihqid48gk3p0czzbg9knri0d1x67"))))
++                "1xp31iashi7n81z4halmrw53v3lnj847k4514lzqnbzz6a8sxlxi"))))
      (build-system gnu-build-system)
      (arguments
       (list
@@@ -2659,7 -2643,7 +2658,7 @@@
                          #$output "/share/p11-kit/modules/")
           (string-append "--with-pkcs11-modules="
                          #$output "/share/p11-kit/modules/"))
-       #:parallel-tests? #f              ; XXX: concurrency in dbus tests
 -      #:parallel-tests? #f
++      #:parallel-tests? (not (target-riscv64?))
        #:phases
        #~(modify-phases %standard-phases
            (add-after 'unpack 'fix-/bin/sh-reference
@@@ -14296,40 -14189,3 +14298,39 @@@ Protocol} for @acronym{VoIP, Voice ove
  real or virtual machines, using @acronym{VNC, Virtual Network Computing}
  or @acronym{RDP, Remote Desktop Protocol}.")
      (license license:gpl3+)))
 +
 +(define-public lock
 +  (package
 +    (name "lock")
 +    (version "1.1.3")
 +    (source (origin
 +              (method git-fetch)
 +              (uri (git-reference
 +                    (url "https://github.com/konstantintutsch/Lock";)
 +                    (commit (string-append "v" version))))
 +              (file-name (git-file-name name version))
 +              (sha256
 +               (base32 
"18xyh7g4qqm2nx9wfd5bxf293dk0ahwr1acj4ypwswasv0isxdf9"))))
 +    (build-system meson-build-system)
 +    (arguments
 +     (list
-       #:meson meson-1.5
 +      #:phases
 +      #~(modify-phases %standard-phases
 +          (add-after 'unpack 'disable-gtk-update-icon-cache
 +            (lambda _
 +              (substitute* "meson.build"
 +                (("(gtk_update_icon_cache|update_desktop_database): true" _ 
key)
 +                 (string-append key ": false"))))))))
 +    (inputs (list gpgme-1.23
 +                  glib
 +                  libadwaita))
 +    (native-inputs (list blueprint-compiler
 +                         gettext-minimal
 +                         gobject-introspection
 +                         `(,glib "bin")
 +                         pkg-config))
 +    (home-page "https://konstantintutsch.com/Lock";)
 +    (synopsis "Graphical front-end for GNU Privacy Guard")
 +    (description "This package provides a graphical frontend for
 +GNU Privacy Guard built with libadwaita.")
 +    (license license:expat)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]