guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging
Date: Fri, 2 Dec 2022 13:23:23 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit f2b6350a507158b2a0ed28ada69d8ca3f544d5e5
Merge: c5e15ef4dd 365b0b5533
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Dec 2 19:13:45 2022 +0100

    Merge branch 'master' into staging

 Makefile.am                                        |    3 +
 doc/contributing.texi                              |    7 +-
 doc/guix.texi                                      |   77 +-
 .../guix-vc-commit-message-add-package             |    9 +
 .../guix-vc-commit-message-remove-package          |    9 +
 .../guix-vc-commit-message-rename-package          |   14 +
 .../guix-vc-commit-message-update-package          |   12 +
 .../guix-vc-commit-message-use-https-home-page     |    9 +
 etc/teams.scm.in                                   |    3 +-
 gnu/bootloader.scm                                 |  105 +-
 gnu/bootloader/grub.scm                            |  220 +-
 gnu/build/hurd-boot.scm                            |   50 +-
 gnu/home/services/mcron.scm                        |   58 +-
 gnu/home/services/shells.scm                       |   50 +-
 gnu/home/services/xdg.scm                          |   54 +-
 gnu/local.mk                                       |    4 +-
 gnu/packages/admin.scm                             |    4 +-
 gnu/packages/assembly.scm                          |    6 +-
 gnu/packages/astronomy.scm                         |   54 +-
 gnu/packages/audio.scm                             |    2 +-
 gnu/packages/backup.scm                            |    4 +-
 gnu/packages/bioconductor.scm                      |   89 +-
 gnu/packages/bioinformatics.scm                    |   97 +
 gnu/packages/bootloaders.scm                       |  817 +++---
 gnu/packages/build-tools.scm                       |   89 +-
 gnu/packages/cdrom.scm                             |    2 +-
 gnu/packages/chromium.scm                          |   42 +-
 gnu/packages/code.scm                              |    4 +-
 gnu/packages/compression.scm                       |    8 +-
 gnu/packages/cook.scm                              |    4 +-
 gnu/packages/cran.scm                              |  672 +++--
 gnu/packages/crates-io.scm                         | 2793 ++++++++++++--------
 gnu/packages/cups.scm                              |   10 +-
 gnu/packages/curl.scm                              |    5 +-
 gnu/packages/digest.scm                            |   12 +-
 gnu/packages/disk.scm                              |    7 +-
 gnu/packages/dns.scm                               |    4 +-
 gnu/packages/ebook.scm                             |    1 +
 gnu/packages/emacs-xyz.scm                         |  139 +-
 gnu/packages/engineering.scm                       |   45 +-
 gnu/packages/finance.scm                           |    4 +-
 gnu/packages/freedesktop.scm                       |    4 +-
 gnu/packages/ftp.scm                               |    2 +-
 gnu/packages/games.scm                             |   24 +-
 gnu/packages/geo.scm                               |    2 +-
 gnu/packages/gnome.scm                             |    2 +-
 gnu/packages/gnupg.scm                             |    4 +-
 gnu/packages/gnuzilla.scm                          |  149 +-
 gnu/packages/golang.scm                            |   15 +
 gnu/packages/gstreamer.scm                         |    2 +-
 gnu/packages/gtk.scm                               |   14 +
 gnu/packages/hardware.scm                          |   23 +-
 gnu/packages/jami.scm                              |    1 +
 gnu/packages/libreoffice.scm                       |   22 +-
 gnu/packages/linux.scm                             |  171 +-
 gnu/packages/lisp-xyz.scm                          |   66 +-
 gnu/packages/lisp.scm                              |    7 +-
 gnu/packages/mail.scm                              |  136 +-
 gnu/packages/mpd.scm                               |    4 +-
 gnu/packages/music.scm                             |   62 +-
 gnu/packages/patches/jami-sip-contacts.patch       |   38 +
 .../patches/rust-1.64-fix-riscv64-bootstrap.patch  |  565 ++++
 ...bcl-fix-build-on-arm64-with-clisp-as-host.patch |   27 -
 gnu/packages/patches/sssd-optional-systemd.patch   |   45 -
 gnu/packages/python-check.scm                      |   29 +
 gnu/packages/python-science.scm                    |    4 +-
 gnu/packages/python-xyz.scm                        |  115 +
 gnu/packages/qt.scm                                |  235 +-
 gnu/packages/raspberry-pi.scm                      |  136 +-
 gnu/packages/rust-apps.scm                         |  303 ++-
 gnu/packages/rust.scm                              |   17 +-
 gnu/packages/sssd.scm                              |    9 +-
 gnu/packages/statistics.scm                        |  813 +++---
 gnu/packages/texinfo.scm                           |   12 +-
 gnu/packages/text-editors.scm                      |    6 +-
 gnu/packages/video.scm                             |   33 +-
 gnu/packages/web.scm                               |   63 +
 gnu/packages/wm.scm                                |   50 +-
 gnu/packages/wxwidgets.scm                         |  232 +-
 gnu/services/base.scm                              |  922 ++++---
 gnu/services/cuirass.scm                           |    4 +-
 gnu/services/getmail.scm                           |   22 +-
 gnu/services/networking.scm                        |  684 +++--
 gnu/system/examples/raspberry-pi-64-nfs-root.tmpl  |   75 +
 gnu/system/examples/raspberry-pi-64.tmpl           |   79 +
 gnu/system/hurd.scm                                |   44 +-
 gnu/system/linux-container.scm                     |   28 +-
 guix/build-system/linux-module.scm                 |    4 +-
 guix/build/kconfig.scm                             |  183 ++
 guix/import/cran.scm                               |    1 +
 guix/records.scm                                   |   87 +-
 tests/records.scm                                  |   33 +
 92 files changed, 7318 insertions(+), 3888 deletions(-)

diff --cc gnu/packages/lisp.scm
index 800bba21a0,339368f363..62eeb1faab
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@@ -429,17 -429,8 +429,14 @@@ an interpreter, a compiler, a debugger
         (method url-fetch)
         (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
                             version "-source.tar.bz2"))
-        (patches
-         ;; TODO: remove this patch when updating to sbcl > 2.2.10.
-         (search-patches "sbcl-fix-build-on-arm64-with-clisp-as-host.patch"))
         (sha256
-         (base32 "0cq8x4svkawirxq5s5gs4qxkl23m4q5p722a2kpss8qjfslc7hwc"))
 -        (base32 "1pwnhjp0fmkcgq11a6hj36gw8k05qramspgdbj28063k2s0dc1rn"))))
++        (base32 "1pwnhjp0fmkcgq11a6hj36gw8k05qramspgdbj28063k2s0dc1rn"))
 +       (modules '((guix build utils)))
 +       (snippet
 +        '(begin
 +           ;; Don't force ARMv5.
 +           (substitute* "src/runtime/Config.arm-linux"
 +             (("-march=armv5") ""))))))
      (build-system gnu-build-system)
      (outputs '("out" "doc"))
      (native-inputs



reply via email to

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