01/01: gnu: sbcl-stumpwm: Drop ECL lisp support and rename to 'stumpwm'.

[guix-commits]

wigust pushed a commit to branch master
in repository guix.

commit 4b193da3f959244112a85f996d630aa1ed6d0902
Author: Pierre Langlois <address@hidden>
Date:   Thu Nov 8 09:51:05 2018 +0000

    gnu: sbcl-stumpwm: Drop ECL lisp support and rename to 'stumpwm'.
    
    StumpWM version 1.0.0 was the last version to support lisps other than SBCL.
    This patch renames the current version of Stumpwm to simply 'stumpwm' 
instead
    of 'sbcl-stumpwm' since it's redundant, and removes the unmaintained
    'ecl-stumpwm' package.
    
    * gnu/packages/lisp.scm (sbcl-stumpwm): Deprecate in favor of 'stumpwm'.
    [name]: Rename to 'stumpwm'.
    [arguments]: Set '#:asd-system-name' to 'stumpwm'.
    [properties]: Replace ecl-variant with cl-source-variant.
    (ecl-stumpwm): Remove variable.
    (cl-stumpwm): Replace 'sbcl-stumpwm' with 'stumpwm' and adapt.
    (sbcl-stumpwm+slynk): Deprecate in favor of 'stumpwm+slynk'.
    [name]: Rename to 'stumpwm-with-slynk'.
    [inherit, inputs, arguments]: Replace 'sbcl-stumpwm' with 'stumpwm'.
    
    Signed-off-by: Oleg Pykhalov <address@hidden>
---
 gnu/packages/lisp.scm | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 5e8b6fd..120d0d5 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Benjamin Slade <address@hidden>
 ;;; Copyright © 2018 Alex Vong <address@hidden>
 ;;; Copyright © 2018 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2018 Pierre Langlois <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -928,9 +929,9 @@ from other CLXes around the net.")
      `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre)
        ("sbcl-cl-unicode" ,sbcl-cl-unicode)))))
 
-(define-public sbcl-stumpwm
+(define-public stumpwm
   (package
-    (name "sbcl-stumpwm")
+    (name "stumpwm")
     (version "18.05")
     (source (origin
               (method url-fetch)
@@ -946,7 +947,8 @@ from other CLXes around the net.")
               ("alexandria" ,sbcl-alexandria)))
     (outputs '("out" "lib"))
     (arguments
-     '(#:phases
+     '(#:asd-system-name "stumpwm"
+       #:phases
        (modify-phases %standard-phases
          (add-after 'create-symlinks 'build-program
            (lambda* (#:key outputs #:allow-other-keys)
@@ -979,17 +981,15 @@ for input.  These design decisions reflect the growing 
popularity of
 productive, customizable lisp based systems.")
     (home-page "https://github.com/stumpwm/stumpwm";)
     (license license:gpl2+)
-    (properties `((ecl-variant . ,(delay ecl-stumpwm))))))
+    (properties `((cl-source-variant . ,(delay cl-stumpwm))))))
 
-(define-public cl-stumpwm
-  (sbcl-package->cl-source-package sbcl-stumpwm))
+(define-public sbcl-stumpwm
+  (deprecated-package "sbcl-stumpwm" stumpwm))
 
-(define-public ecl-stumpwm
-  (let ((base (sbcl-package->ecl-package sbcl-stumpwm)))
-    (package
-      (inherit base)
-      (outputs '("out"))
-      (arguments '()))))
+(define-public cl-stumpwm
+  (package
+    (inherit (sbcl-package->cl-source-package stumpwm))
+    (name "cl-stumpwm")))
 
 ;; The slynk that users expect to install includes all of slynk's contrib
 ;; modules.  Therefore, we build the base module and all contribs first; then
@@ -1268,16 +1268,16 @@ multiple inspectors with independent history.")
                          paths)
             #t)))))))
 
-(define-public sbcl-stumpwm+slynk
+(define-public stumpwm+slynk
   (package
-    (inherit sbcl-stumpwm)
-    (name "sbcl-stumpwm-with-slynk")
+    (inherit stumpwm)
+    (name "stumpwm-with-slynk")
     (outputs '("out"))
     (inputs
-     `(("stumpwm" ,sbcl-stumpwm "lib")
+     `(("stumpwm" ,stumpwm "lib")
        ("slynk" ,sbcl-slynk)))
     (arguments
-     (substitute-keyword-arguments (package-arguments sbcl-stumpwm)
+     (substitute-keyword-arguments (package-arguments stumpwm)
        ((#:phases phases)
         `(modify-phases ,phases
            (replace 'build-program
@@ -1301,6 +1301,9 @@ multiple inspectors with independent history.")
            (delete 'cleanup)
            (delete 'create-symlinks)))))))
 
+(define-public sbcl-stumpwm+slynk
+  (deprecated-package "sbcl-stumpwm-with-slynk" stumpwm+slynk))
+
 (define-public sbcl-parse-js
   (let ((commit "fbadc6029bec7039602abfc06c73bb52970998f6")
         (revision "1"))