[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: |
Sun, 20 Nov 2022 01:55:04 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 7d5e045a691fcdbbfb1e75e4f4660396403c1d8d
Merge: b187864f36 8cef05bab6
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Nov 20 07:49:11 2022 +0100
Merge branch 'master' into staging
doc/guix.texi | 52 +-
doc/local.mk | 12 +
gnu/home/services/desktop.scm | 3 +-
gnu/home/services/shepherd.scm | 3 +-
gnu/local.mk | 9 +-
gnu/machine/ssh.scm | 30 +-
gnu/packages/admin.scm | 46 ++
gnu/packages/chez.scm | 21 +-
gnu/packages/cran.scm | 2 +-
gnu/packages/databases.scm | 7 +-
gnu/packages/emacs-xyz.scm | 168 +++---
gnu/packages/engineering.scm | 5 +
gnu/packages/fonts.scm | 13 +-
gnu/packages/golang.scm | 24 +
gnu/packages/graphics.scm | 123 ++---
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/image-processing.scm | 18 +-
gnu/packages/irc.scm | 5 +-
gnu/packages/linux.scm | 18 +-
gnu/packages/lisp-xyz.scm | 280 +++++++++-
gnu/packages/lisp.scm | 3 +
gnu/packages/llvm.scm | 10 +-
gnu/packages/moreutils.scm | 49 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/patches/mia-vtk-version.patch | 15 +
gnu/packages/patches/mia-vtk92.patch | 14 +
.../racket-backport-8.6-cross-install.patch | 126 -----
.../racket-backport-8.6-docindex-write.patch | 36 --
.../patches/racket-backport-8.6-hurd.patch | 609 ---------------------
gnu/packages/patches/racket-backport-8.6-zuo.patch | 481 ----------------
.../patches/racket-backport-8.7-pkg-strip.patch | 90 +++
...bcl-fix-build-on-arm64-with-clisp-as-host.patch | 27 +
gnu/packages/patches/tbb-fix-test-on-aarch64.patch | 35 --
gnu/packages/patches/tbb-other-arches.patch | 8 +-
gnu/packages/patches/timescaledb-flaky-test.patch | 107 ----
.../vtk-fix-freetypetools-build-failure.patch | 32 --
gnu/packages/python-xyz.scm | 48 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/racket.scm | 60 +-
gnu/packages/ratpoison.scm | 5 +-
gnu/packages/speech.scm | 4 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/tbb.scm | 10 +-
gnu/packages/wm.scm | 34 ++
gnu/packages/xdisorg.scm | 30 +-
gnu/services/avahi.scm | 5 +-
gnu/services/base.scm | 5 +-
gnu/services/desktop.scm | 12 +-
gnu/services/dict.scm | 3 +-
gnu/services/getmail.scm | 64 ++-
gnu/services/lightdm.scm | 20 +-
gnu/services/networking.scm | 40 +-
gnu/services/shepherd.scm | 12 +
gnu/services/ssh.scm | 6 +-
gnu/services/web.scm | 7 +-
gnu/services/xorg.scm | 10 +-
gnu/system/linux-initrd.scm | 7 +-
gnu/tests/base.scm | 6 +
gnu/tests/lightdm.scm | 7 +-
guix/import/utils.scm | 260 +++++----
guix/scripts/describe.scm | 3 +
guix/scripts/pack.scm | 14 +-
tests/import-utils.scm | 5 +
63 files changed, 1202 insertions(+), 1968 deletions(-)
diff --cc gnu/packages/lisp.scm
index cd9d6762a9,0749a02cd7..800bba21a0
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@@ -429,14 -429,11 +429,17 @@@ 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 "0cq8x4svkawirxq5s5gs4qxkl23m4q5p722a2kpss8qjfslc7hwc"))
+ (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