[PATCH 1/3] gnu: sbcl-cmd: Remove dead code.

DoneSubmitted by Matthew Kraai.
Details
2 participants
  • Guillaume Le Vaillant
  • Matthew Kraai
Owner
unassigned
Severity
normal
M
M
Matthew Kraai wrote on 23 Jan 2021 11:16
(address . guix-patches@gnu.org)(name . Matthew Kraai)(address . kraai@ftbfs.org)
20210123101635.19672-1-kraai@ftbfs.org
* gnu/packages/lisp-xyz.scm (sbcl-cmd): Remove dead code.
---
gnu/packages/lisp-xyz.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 57d40dad07..7f5dfaddbc 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2020, 2021 Adam Kandur <rndd@tuta.io>
 ;;; Copyright © 2020, 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 Aurora <rind38@disroot.org>
+;;; Copyright © 2021 Matthew Kraai <kraai@ftbfs.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -13224,9 +13225,8 @@ standard library.")
          (modify-phases %standard-phases
            (add-after 'unpack 'fix-paths
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((source (assoc-ref inputs "source"))
-                     (bin (string-append (assoc-ref inputs "coreutils") "/bin")))
-                 (substitute* (string-append "cmd.lisp")
+               (let ((bin (string-append (assoc-ref inputs "coreutils") "/bin")))
+                 (substitute* "cmd.lisp"
                    (("\"env\"") (format #f "\"~a/env\"" bin))
                    (("\"pwd\"") (format #f "\"~a/pwd\"" bin)))))))))
       (home-page "https://github.com/ruricolist/cmd")
-- 
2.30.0
M
M
Matthew Kraai wrote on 23 Jan 2021 11:19
[PATCH 2/3] gnu: cl-cmd: Use sbcl-package->cl-source-package.
(address . 46050@debbugs.gnu.org)(name . Matthew Kraai)(address . kraai@ftbfs.org)
20210123101909.19791-1-kraai@ftbfs.org
* gnu/packages/lisp-xyz.scm (cl-cmd): Use sbcl-package->cl-source-package.
---
gnu/packages/lisp-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 7f5dfaddbc..d2e08883db 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -13241,7 +13241,7 @@ be usable from multi-threaded programs.")
   (sbcl-package->ecl-package sbcl-cmd))
 
 (define-public cl-cmd
-  (sbcl-package->ecl-package sbcl-cmd))
+  (sbcl-package->cl-source-package sbcl-cmd))
 
 (define-public sbcl-ppath
   (let ((commit "eb1a8173b4d1d691ea9a7699412123462f58c3ce"))
-- 
2.30.0
M
M
Matthew Kraai wrote on 23 Jan 2021 11:19
[PATCH 3/3] gnu: cl-ppath: Use sbcl-package->cl-source-package.
(address . 46050@debbugs.gnu.org)(name . Matthew Kraai)(address . kraai@ftbfs.org)
20210123101909.19791-2-kraai@ftbfs.org
* gnu/packages/lisp-xyz.scm (cl-ppath): Use sbcl-package->cl-source-package.
---
gnu/packages/lisp-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (12 lines)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index d2e08883db..88e946efae 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -13284,4 +13284,4 @@ corresponding OS system functions are called.")
   (sbcl-package->ecl-package sbcl-ppath))
 
 (define-public cl-ppath
-  (sbcl-package->ecl-package sbcl-ppath))
+  (sbcl-package->cl-source-package sbcl-ppath))
-- 
2.30.0
G
G
Guillaume Le Vaillant wrote on 23 Jan 2021 14:28
Re: [bug#46050] [PATCH 1/3] gnu: sbcl-cmd: Remove dead code.
(name . Matthew Kraai)(address . kraai@ftbfs.org)(address . 46050-done@debbugs.gnu.org)
87bldfdbot.fsf@yamatai
Patches pushed as 60528f9ba729f7a22180d3a93d18bbdb3cfb2783 and
following.
Thanks.
-----BEGIN PGP SIGNATURE-----

iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYAwkkg8cZ2x2QHBvc3Rl
by5uZXQACgkQa+ggit8h/j8UBwEAo4V9wHfGNEEiC/uJl9+tNuaJKRQDHyT1xJC8
s/H6nFEA/jj5aQqjmGdWXENfMYJVPPkRb/w/nfYmcxP4OW10H8fB
=MkcW
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 46050@debbugs.gnu.org