Subject: [PATCH] gnu: sbcl-envy: Update to 26a7faa.
From: jgart <[email-masked]>
To: [email-masked]
Cc: jgart <[email-masked]>
Date: Mon, 14 Mar 2022 16:16:28 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/music.scm (sbcl-envy): Update to 26a7faa.
[arguments]: Add note regarding tests, link to open GitHub issue, and
fill in asd keywords.
[native-inputs]: Uncomment test inputs.
---
 gnu/packages/lisp-xyz.scm | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index b95466d93b..d72d84d225 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -12135,8 +12135,8 @@ (define-public ecl-livesupport
   (sbcl-package->ecl-package sbcl-livesupport))
 
 (define-public sbcl-envy
-  (let ((commit "956321b2852d58ba71c6fe621f5c2924178e9f88")
-	(revision "1"))
+  (let ((commit "26a7faadc981f2a047daa36f715a44faec5dd00c")
+	(revision "2"))
     (package
       (name "sbcl-envy")
       (version (git-version "0.1" revision commit))
@@ -12149,23 +12149,30 @@ (define-public sbcl-envy
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "17iwrfxcdinjbb2h6l09qf40s7xkbhrpmnljlwpjy8l8rll8h3vg"))))
+          (base32 "1r0wgimd7z57x8cv69sw76w3y5l70hq50882a9nq5l4v64lg55fq"))))
       (build-system asdf-build-system/sbcl)
-      ;; (native-inputs ; Only for tests.
-      ;;  `(("prove" ,sbcl-prove)
-      ;;    ("osicat" ,sbcl-osicat)))
+      (native-inputs
+       `(("prove" ,sbcl-prove)
+         ("osicat" ,sbcl-osicat)))
       (arguments
-       '(#:phases
-         (modify-phases %standard-phases
-           (add-after 'unpack 'fix-tests
-             (lambda _
-               (substitute* "envy-test.asd"
-                 (("cl-test-more") "prove"))
-               #t)))
-         ;; Tests fail with
-         ;;   Component ENVY-ASD::ENVY-TEST not found, required by #<SYSTEM "envy">
-         ;; like xsubseq.  Why?
-         #:tests? #f))
+       `(#:asd-files '("envy.asd" "envy-test.asd")
+         #:test-asd-file "envy-test.asd"
+         #:asd-systems '("envy" "envy-test")
+         #:tests? #f)) ; https://github.com/fukamachi/envy/issues/10
+         ;; error: in phase 'check': uncaught exception:
+         ;; %exception #<&invoke-error program: "/gnu/store/129g8pcc2ybs1p81ak28lj44i0wkyiqj-sbcl-2.2.2/bin/sbcl"
+         ;; 2wk4qr24a36sjz-sbcl-envy-0.1-2.26a7faa/share/common-lisp/sbcl/envy/envy.asd\"))" "--eval" "(asdf:load-
+         ;; \"))" "--eval" "(asdf:load-asd (truename \"/gnu/store/m197992pzwdllxd03f2wk4qr24a36sjz-sbcl-envy-0.1-2
+         ;; f stop-signal: #f>
+         ;; phase `check' failed after 1.0 seconds
+         ;; command "/gnu/store/129g8pcc2ybs1p81ak28lj44i0wkyiqj-sbcl-2.2.2/bin/sbcl" "--non-interactive" "--eval"
+         ;; hare/common-lisp/sbcl/envy/envy.asd\"))" "--eval" "(asdf:load-asd (truename \"/gnu/store/m197992pzwdll
+         ;; \"/gnu/store/m197992pzwdllxd03f2wk4qr24a36sjz-sbcl-envy-0.1-2.26a7faa/share/common-lisp/sbcl/envy/env
+         ;; note: keeping build directory `/tmp/guix-build-sbcl-envy-0.1-2.26a7faa.drv-0'
+         ;; builder for `/gnu/store/dz7037nlyj3ymhajc59gyy5s23rfwzd5-sbcl-envy-0.1-2.26a7faa.drv' failed with exit
+         ;; build of /gnu/store/dz7037nlyj3ymhajc59gyy5s23rfwzd5-sbcl-envy-0.1-2.26a7faa.drv failed
+         ;; Could not find build log for '/gnu/store/dz7037nlyj3ymhajc59gyy5s23rfwzd5-sbcl-envy-0.1-2.26a7faa.drv'
+         ;; guix build: error: build of `/gnu/store/dz7037nlyj3ymhajc59gyy5s23rfwzd5-sbcl-envy-0.1-2.26a7faa.drv'
       (synopsis "Common Lisp configuration switcher inspired by Perl's Config::ENV")
       (description "Envy is a configuration manager for various applications.
 Envy uses an environment variable to determine a configuration to use.  This
-- 
2.35.1