TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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 <go.wigust@gmail.com>
This commit is contained in:
Pierre Langlois 2018-11-08 09:51:05 +00:00 committed by Oleg Pykhalov
parent f224ea365b
commit 4b193da3f9
No known key found for this signature in database
GPG key ID: 167F8EA5001AFA9C
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/lisp.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -928,9 +929,9 @@ (define-public sbcl-cl-ppcre-unicode
`(("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 @@ (define-public sbcl-stumpwm
("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 @@ (define-public sbcl-stumpwm
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 sbcl-stumpwm
(deprecated-package "sbcl-stumpwm" stumpwm))
(define-public cl-stumpwm
(sbcl-package->cl-source-package sbcl-stumpwm))
(define-public ecl-stumpwm
(let ((base (sbcl-package->ecl-package sbcl-stumpwm)))
(package
(inherit base)
(outputs '("out"))
(arguments '()))))
(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 @@ (define-public ecl-slynk
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 @@ (define-public sbcl-stumpwm+slynk
(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"))