From f8bfa4d8ce6b831058935c793e9d9180a46e4171 Mon Sep 17 00:00:00 2001
From: ajberkley <ajberkley@gmail.com>
Date: Mon, 27 May 2024 14:21:22 -0700
Subject: [PATCH 1/2] Fix to work with SBCL 2.4.0 and later

---
 code/expand-effective-method-body.lisp | 54 +++++++++++++-------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/code/expand-effective-method-body.lisp b/code/expand-effective-method-body.lisp
index c00c1b0..68c0b08 100644
--- a/code/expand-effective-method-body.lisp
+++ b/code/expand-effective-method-body.lisp
@@ -2,35 +2,37 @@
 
 (defun expand-effective-method-body
     (effective-method generic-function lambda-list)
-  (trivial-macroexpand-all:macroexpand-all
-   `(let ((.gf. #',(generic-function-name generic-function)))
-      (declare (ignorable .gf.))
-      #+sbcl(declare (sb-ext:disable-package-locks common-lisp:call-method))
-      #+sbcl(declare (sb-ext:disable-package-locks common-lisp:make-method))
-      #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::check-applicable-keywords))
-      #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::%no-primary-method))
-      (macrolet
-          (;; SBCL introduces explicit keyword argument checking into
-           ;; the effective method.  Since we do our own checking, we
-           ;; can safely disable it.  However, we touch the relevant
-           ;; variables to prevent unused variable warnings.
-           #+sbcl
-           (sb-pcl::check-applicable-keywords (&rest args)
-             (declare (ignore args))
-             `(progn sb-pcl::.valid-keys. sb-pcl::.keyargs-start. (values)))
-           ;; SBCL introduces a magic form to report when there are no
-           ;; primary methods.  The problem is that this form contains a
-           ;; reference to the literal generic function, which is not an
-           ;; externalizable object.  Our solution is to replace it with
-           ;; something portable.
-           #+sbcl
-           (sb-pcl::%no-primary-method (&rest args)
-             (declare (ignore args))
-             `(apply #'no-primary-method .gf. ,@',(lambda-list-apply-arguments lambda-list))))
+  (let ((%no-primary-method (find-symbol "%NO-PRIMARY-METHOD" :sb-pcl)))
+    (trivial-macroexpand-all:macroexpand-all
+     `(let ((.gf. #',(generic-function-name generic-function)))
+        (declare (ignorable .gf.))
+        #+sbcl(declare (sb-ext:disable-package-locks common-lisp:call-method))
+        #+sbcl(declare (sb-ext:disable-package-locks common-lisp:make-method))
+        #+sbcl(declare (sb-ext:disable-package-locks sb-pcl::check-applicable-keywords))
+        #+sbcl(declare (sb-ext:disable-package-locks ,%no-primary-method))
+        (macrolet
+            (;; SBCL introduces explicit keyword argument checking into
+             ;; the effective method.  Since we do our own checking, we
+             ;; can safely disable it.  However, we touch the relevant
+             ;; variables to prevent unused variable warnings.
+             #+sbcl
+             (sb-pcl::check-applicable-keywords (&rest <tr><td><span title='2023-12-22 00:31:41 +0100'>2023-12-22</span></td><td><a href='/guix/commit/gnu/services/web.scm?id=3d6583727ec90732ad7bd97808fd4fca8f6d8bdc'>services: Remove unnecessary references to (gnu build shepherd).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-12-14 23:12:24 +0100'>2023-12-14</span></td><td><a href='/guix/commit/gnu/services/web.scm?id=401755536787c4ae50dec5733a162b6e4ae1a569'>services: hpcguix-web: Add ‘configuration’ action.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/web.scm (hpcguix-web-shepherd-service): Define
‘config-file’ and use it.  Add ‘actions’ field.

Change-Id: I085df403270039ede3c13f21a5d60682c7510e2e
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-12-03 23:55:09 +0100'>2023-12-03</span></td><td><a href='/guix/commit/gnu/services/web.scm?id=4d934786c0882bb7e79d57396b6b2c8bdb2589b8'>gnu: gmnisrv: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/web.scm (gmnisrv-service-type): Change the service name to gmnisrv

Change-Id: I1ca46c312db851486313c431fe0454786f0a673e
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Michal Atlas</td></tr>
<tr><td><span title='2023-12-02 12:25:45 +0100'>2023-12-02</span></td><td><a href='/guix/commit/gnu/services/web.scm?id=b0715d7cd2a74bc231751f8afc