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

commit 02f07bcd3b8bae67aa3d6d0db237b741e9ed4313
Merge: 7f30aeb9f8 dc8fb56724
Author: Josselin Poiret <d...@jpoiret.xyz>
AuthorDate: Sun May 26 16:12:56 2024 +0200

    Merge remote-tracking branch 'origin/master' into core-updates
    
    Change-Id: Ica650fe5e55efe8e1397b92181780b2de6210c8a

 Makefile.am                                        |    34 +-
 configure.ac                                       |     8 +-
 doc/contributing.texi                              |   113 +-
 doc/guix-cookbook.texi                             |    69 +-
 doc/guix.texi                                      |   273 +-
 etc/git/post-merge                                 |     3 +
 etc/git/pre-push                                   |     4 +-
 etc/teams.scm                                      |     2 +-
 gnu/bootloader/u-boot.scm                          |    29 +
 gnu/local.mk                                       |     8 +-
 gnu/packages/accessibility.scm                     |    56 +-
 gnu/packages/admin.scm                             |    40 +-
 gnu/packages/augeas.scm                            |    51 +-
 gnu/packages/aux-files/linux-libre/6.8-riscv.conf  |  7681 ++++
 gnu/packages/bioinformatics.scm                    |    24 +-
 gnu/packages/bootloaders.scm                       |    25 +
 gnu/packages/ci.scm                                |    13 +-
 gnu/packages/containers.scm                        |   321 +-
 gnu/packages/cpp.scm                               |    17 +-
 gnu/packages/cran.scm                              |   335 +
 gnu/packages/databases.scm                         |    41 +-
 gnu/packages/emacs-xyz.scm                         |    18 +-
 gnu/packages/firmware.scm                          |    14 +
 gnu/packages/flashing-tools.scm                    |    22 +-
 gnu/packages/freedesktop.scm                       |    10 +-
 gnu/packages/games.scm                             |     6 +-
 gnu/packages/gcc.scm                               |     4 +-
 gnu/packages/gnome.scm                             |    54 +-
 gnu/packages/golang-check.scm                      |   129 +-
 gnu/packages/golang-crypto.scm                     |    25 +-
 gnu/packages/golang-web.scm                        |   291 +-
 gnu/packages/golang-xyz.scm                        |   109 +
 gnu/packages/golang.scm                            |    55 -
 gnu/packages/graphics.scm                          |    16 +-
 gnu/packages/graphviz.scm                          |     3 +
 gnu/packages/guile-xyz.scm                         |     8 +-
 gnu/packages/hexedit.scm                           |     5 +-
 gnu/packages/image-processing.scm                  |     4 +-
 gnu/packages/inklingreader.scm                     |     2 +-
 gnu/packages/ipfs.scm                              |    50 +-
 gnu/packages/julia-xyz.scm                         |    53 +-
 gnu/packages/linux.scm                             |    39 +-
 gnu/packages/lisp-xyz.scm                          | 45631 ++++++++++---------
 gnu/packages/llvm.scm                              |     8 +-
 gnu/packages/lua.scm                               |   123 +-
 gnu/packages/messaging.scm                         |     6 +-
 gnu/packages/networking.scm                        |    10 +-
 gnu/packages/ocaml.scm                             |     4 +-
 gnu/packages/package-management.scm                |    12 +-
 .../abseil-cpp-20200923.3-adjust-sysinfo.patch     |    60 +
 .../abseil-cpp-20200923.3-duration-test.patch      |    86 +
 .../abseil-cpp-20220623.1-no-kepsilon-i686.patch   |    23 +
 .../go-github-com-warpfork-go-wish-fix-tests.patch |    85 +
 gnu/packages/patches/lvm2-no-systemd.patch         |    18 +
 gnu/packages/patches/podman-program-lookup.patch   |   120 -
 gnu/packages/photo.scm                             |     4 +-
 gnu/packages/python-science.scm                    |     9 +-
 gnu/packages/python-xyz.scm                        |    33 +-
 gnu/packages/ruby.scm                              |     2 +-
 gnu/packages/security-token.scm                    |    25 +
 gnu/packages/shellutils.scm                        |    50 +
 gnu/packages/specifications.scm                    |    31 +
 gnu/packages/terminals.scm                         |     5 +-
 gnu/packages/virtualization.scm                    |     4 +-
 gnu/packages/web.scm                               |    59 +
 gnu/packages/wm.scm                                |    18 +-
 gnu/packages/xdisorg.scm                           |     6 +-
 gnu/packages/xorg.scm                              |    12 +-
 gnu/services/backup.scm                            |   236 +
 gnu/services/docker.scm                            |   323 +-
 gnu/services/shepherd.scm                          |    35 +-
 gnu/system.scm                                     |     8 +-
 gnu/system/image.scm                               |     6 +-
 gnu/system/images/visionfive2.scm                  |   122 +
 gnu/tests/docker.scm                               |   131 +-
 guix/import/elpa.scm                               |     1 +
 guix/import/npm-binary.scm                         |   279 +
 guix/scripts/environment.scm                       |     4 +-
 guix/scripts/import.scm                            |     2 +-
 guix/scripts/import/npm-binary.scm                 |   121 +
 guix/store/deduplication.scm                       |    79 +-
 tests/npm-binary.scm                               |   146 +
 tests/store-deduplication.scm                      |    58 +-
 83 files changed, 34548 insertions(+), 23511 deletions(-)

diff --cc gnu/packages/gcc.scm
index d89c881b2a,c08c6521d6..422eee8d7c
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -788,10 -803,9 +788,10 @@@ It also includes runtime support librar
                                    version "/gcc-" version ".tar.xz"))
                (sha256
                 (base32
-                 "1nj3qyswcgc650sl3h0480a171ixp33ca13zl90p61m689jffxg2"))
+                 "10y0l1hx1haz4cj4d4g9f2ci5h7z9555i52f90zs2hwm3iifji88"))
                (patches (search-patches "gcc-12-strmov-store-file-names.patch"
 -                                       "gcc-5.0-libvtv-runpath.patch"))
 +                                       "gcc-5.0-libvtv-runpath.patch"
 +                                       "gcc-13-libsanitizer-no-crypt.patch"))
                (modules '((guix build utils)))
                (snippet gcc-canadian-cross-objdump-snippet)))
      (properties
diff --cc gnu/packages/lisp-xyz.scm
index 06ebe816e7,c667b997c2..87a78a0701
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@@ -20660,28 -20766,55 +20766,55 @@@ library for Ruby, which is itself base
                 (commit commit)))
           (file-name (git-file-name name version))
           (sha256
-           (base32 "0ggv0h2n4mvwnggjr1b40gw667gnyykzki2zadaczi38ydzyzlp1"))))
+           (base32 "1q12bqjbj47lx98yim1kfnnhgfhkl80102fkgp9pdqxg0fp6g5fc"))))
        (build-system asdf-build-system/sbcl)
-       (home-page "https://github.com/wmannis/simple-rgb";)
-       (synopsis "Manipulate colors in RGB format")
+       (inputs
+        `(("closer-mop" ,sbcl-closer-mop)))
+       (native-inputs
+        (list sbcl-lift))
+       (arguments
+        `(#:phases
+          (modify-phases %standard-phases
+            (add-after 'unpack 'fix-tests
+              (lambda _
+                (substitute* "lift-standard.config"
+                  ((":relative-to lift-test")
+                   ":relative-to moptilities-test"))
+                #t))
 -           (add-after 'install 'remove-test-results
++           (add-after 'check 'remove-test-results
+              ;; Otherwise the drag the SBCL package into the closure of the CL
+              ;; package.
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let* ((out (assoc-ref outputs "out"))
+                       (source-path (string-append out "/share/common-lisp/"
+                                                   (%lisp-type) 
"/moptilities/")))
+                  (delete-file-recursively
+                   (string-append source-path "/test-results")))
+                #t)))))
+       (synopsis "Compatibility layer for Common Lisp MOP implementation 
differences")
        (description
-        "This Common Lisp library focuses on the small set of basic color
- manipulations (lightening, compliments, etc.) you might use to generate a
- color palette for a GUI or web page.")
-       (license license:bsd-2))))
+        "MOP utilities provide a common interface between Lisps and make the
+ MOP easier to use.")
+       (license license:expat))))
  
- (define-public ecl-simple-rgb
-   (sbcl-package->ecl-package sbcl-simple-rgb))
+ (define-public cl-moptilities
+   (sbcl-package->cl-source-package sbcl-moptilities))
  
- (define-public cl-simple-rgb
-   (sbcl-package->cl-source-package sbcl-simple-rgb))
+ (define-public ecl-moptilities
+   (let ((pkg (sbcl-package->ecl-package sbcl-moptilities)))
+     (package
+       (inherit pkg)
+       (arguments
+        ;; Tests fail with "The function LIFT::GET-BACKTRACE-AS-STRING is
+        ;; undefined" on ECL.
+        '(#:tests? #f)))))
  
- (define-public sbcl-cl-qprint
-   (let ((commit "bfe398551cbfb7ca84a9ba59a26a1116ac5c06eb")
+ (define-public sbcl-mssql
+   (let ((commit "045602a19a32254108f2b75871049293f49731eb")
          (revision "1"))
      (package
-       (name "sbcl-cl-qprint")
-       (version (git-version "0.9.0" revision commit))
+       (name "sbcl-mssql")
+       (version (git-version "0.0.3" revision commit))
        (source
         (origin
           (method git-fetch)
diff --cc gnu/packages/llvm.scm
index 98d64be57f,55acb8f87b..0c5fd51d4c
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -540,19 -551,15 +540,19 @@@ output), and Binutils."
      ("15.0.7" . "12sggw15sxq1krh1mfk3c1f07h895jlxbcifpwk3pznh4m1rjfy2")
      ("16.0.6" . "0jxmapg7shwkl88m4mqgfjv4ziqdmnppxhjz6vz51ycp2x4nmjky")
      ("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")
-     ("18.1.4" . "1kddjysa6qj1qlb88a4m7lqni6922drgb37kj2hnspj9hrph891g")))
+     ("18.1.6" . "14p7f82x5qp1dv0y4d6pz42z0dsmpxz393prhi2acbzk5hksz9mb")))
  
  (define %llvm-patches
 -  '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
 -    ("15.0.7" . ("clang-15.0-libc-search-path.patch"))
 -    ("16.0.6" . ("clang-16.0-libc-search-path.patch"))
 +  '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
 +                 "clang-runtime-14-glibc-2.36-compat.patch"
 +                 "clang-14-remove-crypt-interceptors.patch"))
 +    ("15.0.7" . ("clang-15.0-libc-search-path.patch"
 +                 "clang-16-remove-crypt-interceptors.patch"))
 +    ("16.0.6" . ("clang-16.0-libc-search-path.patch"
 +                 "clang-16-remove-crypt-interceptors.patch"))
      ("17.0.6" . ("clang-17.0-libc-search-path.patch"
                   "clang-17.0-link-dsymutil-latomic.patch"))
-     ("18.1.4" . ("clang-18.0-libc-search-path.patch"
+     ("18.1.6" . ("clang-18.0-libc-search-path.patch"
                   "clang-17.0-link-dsymutil-latomic.patch"))))
  
  (define (llvm-monorepo version)
diff --cc gnu/packages/lua.scm
index 17d3c044cf,62415f58f0..58d8e741f9
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@@ -20,7 -20,7 +20,8 @@@
  ;;; Copyright © 2022 Leo Nikkilä <he...@lnikki.la>
  ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
  ;;; Copyright © 2023 Valter Nazianzeno <manipuladordeda...@gmail.com>
 +;;; Copyright © 2024 Maxim Cournoyer <maxim.courno...@gmail.com>
+ ;;; Copyright © 2023 Timo Wilken <g...@twilken.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -49,14 -49,17 +50,19 @@@
    #:use-module (guix build-system meson)
    #:use-module (guix build-system trivial)
    #:use-module (gnu packages)
 +  #:use-module (gnu packages autotools)
+   #:use-module (gnu packages base)
    #:use-module (gnu packages bash)
    #:use-module (gnu packages boost)
+   #:use-module (gnu packages curl)
    #:use-module (gnu packages build-tools)
 +  #:use-module (gnu packages check)
    #:use-module (gnu packages gcc)
+   #:use-module (gnu packages compression)
+   #:use-module (gnu packages gcc)
    #:use-module (gnu packages glib)
    #:use-module (gnu packages gperf)
+   #:use-module (gnu packages gnupg)
    #:use-module (gnu packages gtk)
    #:use-module (gnu packages libevent)
    #:use-module (gnu packages libffi)

Reply via email to