guix-commits
[Top][All Lists]
Advanced

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

06/09: gnu: sbcl-triva: Remove ASD component fix.


From: guix-commits
Subject: 06/09: gnu: sbcl-triva: Remove ASD component fix.
Date: Thu, 18 Jun 2020 11:19:46 -0400 (EDT)

ambrevar pushed a commit to branch master
in repository guix.

commit 797f43af75d61dcc91112f704c5c99c67f8b1fe7
Author: Pierre Neidhardt <mail@ambrevar.xyz>
AuthorDate: Thu Jun 18 16:48:37 2020 +0200

    gnu: sbcl-triva: Remove ASD component fix.
    
    * gnu/packages/lisp-xyz.scm (sbcl-triva)[arguments]: Remove 
'remove-component
    phase now that our build system supports component-less .asd files.
---
 gnu/packages/lisp-xyz.scm | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 0fcc5c0..7b08600 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -6293,24 +6293,7 @@ This system contains the CFFI foreign slot access 
extension.")))
        ("trivia.cffi" ,sbcl-trivia.cffi)
        ("optima" ,sbcl-optima)))
     (arguments
-     `(#:test-asd-file "trivia.test.asd"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'create-asd 'remove-component
-           ;; XXX: The original .asd has no components, but our build system
-           ;; creates an entry nonetheless.  We need to remove it for the
-           ;; generated .asd to load properly.  See trivia.trivial for a
-           ;; similar problem.
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (asd (string-append out "/lib/" (%lisp-type) 
"/trivia.asd")))
-               (substitute* asd
-                 (("  :components
-")
-                  ""))
-               (substitute* asd
-                 ((" *\\(\\(:compiled-file \"trivia--system\"\\)\\)")
-                  ""))))))))
+     `(#:test-asd-file "trivia.test.asd"))
     (description "Trivia is a pattern matching compiler that is compatible
 with Optima, another pattern matching library for Common Lisp.  It is meant to
 be faster and more extensible than Optima.")))



reply via email to

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