guix-commits
[Top][All Lists]
Advanced

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

01/02: Merge branch 'master' into core-updates


From: guix-commits
Subject: 01/02: Merge branch 'master' into core-updates
Date: Mon, 27 Jun 2022 13:30:30 -0400 (EDT)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 2a7648774f1bba5bb443c00b8ab1a2ab75b7416f
Merge: 43519035f9 0bd1c4fbbc
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jun 27 19:23:48 2022 +0200

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |  75 ++-
 etc/news.scm                                       |  26 +
 gnu/bootloader/grub.scm                            |  32 +
 gnu/build/bootloader.scm                           |  37 +-
 gnu/build/image.scm                                |  14 +
 gnu/local.mk                                       |   3 +-
 gnu/packages/admin.scm                             |   7 +-
 gnu/packages/algebra.scm                           |   3 +-
 gnu/packages/astronomy.scm                         | 104 +++-
 gnu/packages/backup.scm                            |   1 +
 gnu/packages/benchmark.scm                         |  63 +-
 gnu/packages/bootloaders.scm                       |  13 +
 gnu/packages/c.scm                                 |  68 +--
 gnu/packages/calendar.scm                          |   1 +
 gnu/packages/check.scm                             |  24 +-
 gnu/packages/chromium.scm                          |  20 +-
 gnu/packages/cluster.scm                           | 132 +++--
 gnu/packages/cpp.scm                               |   8 +-
 gnu/packages/databases.scm                         |  13 +-
 gnu/packages/dav.scm                               |   1 +
 gnu/packages/dezyne.scm                            |   4 +-
 gnu/packages/diffoscope.scm                        |   4 +-
 gnu/packages/django.scm                            |   8 +-
 gnu/packages/dlang.scm                             | 401 ++++++-------
 gnu/packages/docker.scm                            | 657 ++++++++++-----------
 gnu/packages/education.scm                         |  27 +-
 gnu/packages/emacs-xyz.scm                         | 522 +++++++++++-----
 gnu/packages/emacs.scm                             |   2 +-
 gnu/packages/engineering.scm                       |  19 +-
 gnu/packages/erlang.scm                            |   6 +-
 gnu/packages/file-systems.scm                      |   4 +-
 gnu/packages/fonts.scm                             |  50 +-
 gnu/packages/fontutils.scm                         |  73 +++
 gnu/packages/freedesktop.scm                       |  27 +
 gnu/packages/ftp.scm                               |   8 +-
 gnu/packages/gcc.scm                               |  16 +
 gnu/packages/geo.scm                               |  45 +-
 gnu/packages/gnome-xyz.scm                         |  97 +++
 gnu/packages/graph.scm                             |   4 +-
 gnu/packages/graphics.scm                          |  66 +++
 gnu/packages/guile-xyz.scm                         |  98 ++-
 gnu/packages/guile.scm                             |   4 +-
 gnu/packages/hardware.scm                          | 206 ++++++-
 gnu/packages/ibus.scm                              |  47 +-
 gnu/packages/icu4c.scm                             |  16 +
 gnu/packages/image.scm                             | 100 ++--
 gnu/packages/java.scm                              |  34 ++
 gnu/packages/kde.scm                               |   4 +-
 gnu/packages/license.scm                           |   5 +-
 gnu/packages/linux.scm                             |  36 +-
 gnu/packages/lisp-xyz.scm                          |  75 +++
 gnu/packages/lisp.scm                              |   4 +-
 gnu/packages/llvm.scm                              |  17 +-
 gnu/packages/mail.scm                              | 158 ++---
 gnu/packages/maths.scm                             |   2 +
 gnu/packages/maven-parent-pom.scm                  |   5 +
 gnu/packages/maven.scm                             |  27 +
 gnu/packages/messaging.scm                         |  27 +-
 gnu/packages/monitoring.scm                        |  52 +-
 gnu/packages/music.scm                             |  58 ++
 gnu/packages/networking.scm                        |  84 ++-
 gnu/packages/openstack.scm                         |  12 +-
 gnu/packages/package-management.scm                |  15 +-
 gnu/packages/patches/cmh-support-fplll.patch       |  27 +
 gnu/packages/patches/docker-fix-tests.patch        |  28 -
 .../patches/phoronix-test-suite-fsdg.patch         | 308 ++++++++++
 gnu/packages/pep.scm                               |   1 +
 gnu/packages/presentation.scm                      |  10 +-
 gnu/packages/python-build.scm                      |  71 +++
 gnu/packages/python-check.scm                      |  31 +-
 gnu/packages/python-crypto.scm                     |  27 +
 gnu/packages/python-science.scm                    |   4 +-
 gnu/packages/python-web.scm                        |  97 ++-
 gnu/packages/python-xyz.scm                        | 418 +++++++++----
 gnu/packages/radio.scm                             |  36 ++
 gnu/packages/ruby.scm                              |  97 +++
 gnu/packages/samba.scm                             |  60 +-
 gnu/packages/search.scm                            |  40 +-
 gnu/packages/shellutils.scm                        |   5 +-
 gnu/packages/sphinx.scm                            |  10 +-
 gnu/packages/suckless.scm                          |  81 ++-
 gnu/packages/task-management.scm                   |   1 +
 gnu/packages/text-editors.scm                      |  51 ++
 gnu/packages/time.scm                              |   1 +
 gnu/packages/tls.scm                               |  24 +-
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/virtualization.scm                    |  13 +-
 gnu/packages/wm.scm                                | 152 ++---
 gnu/services/configuration.scm                     |  64 +-
 gnu/services/mail.scm                              |   6 +-
 gnu/services/vpn.scm                               |   5 +-
 gnu/system/image.scm                               |  19 +
 gnu/tests/docker.scm                               |   6 +-
 gnu/tests/ldap.scm                                 |   4 +-
 guix/build-system/dub.scm                          |   9 +
 guix/build/chicken-build-system.scm                |  12 +
 guix/build/dub-build-system.scm                    |  26 +-
 guix/scripts/refresh.scm                           |  22 +-
 guix/scripts/style.scm                             |   3 +-
 guix/scripts/substitute.scm                        | 102 ++--
 guix/scripts/system.scm                            |  11 +-
 guix/self.scm                                      |   5 +-
 guix/status.scm                                    |  16 +-
 guix/utils.scm                                     |   6 +
 po/guix/POTFILES.in                                |   1 +
 tests/services/configuration.scm                   |  13 +
 tests/status.scm                                   |  83 +--
 tests/style.scm                                    |  12 +
 108 files changed, 4070 insertions(+), 1723 deletions(-)

diff --cc gnu/packages/freedesktop.scm
index 36b792ccf0,4d06235771..adb2212610
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -29,8 -29,7 +29,9 @@@
  ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
  ;;; Copyright © 2021, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
  ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
 +;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
 +;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+ ;;; Copyright © 2022 muradm <mail@muradm.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/maths.scm
index 7259c046ef,5e8fd7ae2d..1289a3cbbf
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -5524,9 -5524,9 +5524,11 @@@ set."
                                       texlive-capt-of
                                       texlive-caption
                                       texlive-cm
+                                      texlive-courier
                                       texlive-etoolbox
 +                                     texlive-fancyhdr
 +                                     texlive-fancyvrb
+                                      texlive-helvetic
                                       texlive-jknappen
                                       texlive-sectsty
                                       texlive-tex-gyre
diff --cc gnu/packages/tls.scm
index bb05adb8b7,9e52225d52..7b2f43d993
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -350,7 -384,8 +350,8 @@@ OpenSSL for TARGET.
  (define-public openssl
    (package
      (name "openssl")
 -    (version "1.1.1l")
 +    (version "1.1.1n")
+     (replacement openssl/fixed)
      (source (origin
                (method url-fetch)
                (uri (list (string-append 
"https://www.openssl.org/source/openssl-";
diff --cc gnu/packages/wm.scm
index d946fa4d2f,8fef7de77b..9703f76031
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -1569,10 -1579,13 +1579,13 @@@ modules for building a Wayland composit
               (commit version)))
         (file-name (git-file-name name version))
         (sha256
 -        (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
 +        (base32 "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"))))
      (build-system meson-build-system)
      (arguments
-      `(#:phases
+      `(;; elogind is propagated by wlroots -> libseat
+        ;; and would otherwise shadow basu.
+        #:configure-flags '("-Dsd-bus-provider=basu")
+        #:phases
         (modify-phases %standard-phases
           (add-before 'configure 'hardcode-paths
             (lambda* (#:key inputs #:allow-other-keys)
@@@ -2565,14 -2578,14 +2583,14 @@@ read and write, and compatible with JSO
      (native-inputs
       (list bmake pkg-config wayland-protocols))
      (inputs
 -     `(("cairo" ,cairo)
 -       ("libinput" ,libinput-minimal)
 -       ("libucl" ,libucl)
 -       ("libxkbcommon" ,libxkbcommon)
 -       ("pam" ,linux-pam)
 -       ("pango" ,pango)
 -       ("wayland" ,wayland)
 -       ("wlroots" ,wlroots)))
 +     (list cairo
-            libinput
++           libinput-minimal
 +           libucl
 +           libxkbcommon
 +           linux-pam
 +           pango
 +           wayland
 +           wlroots))
      (arguments
       `(#:tests? #f                      ; no tests
         #:make-flags



reply via email to

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