unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
@ 2018-11-08 10:01 Pierre Langlois
  2018-11-25 22:05 ` Pierre Langlois
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Pierre Langlois @ 2018-11-08 10:01 UTC (permalink / raw)
  To: 33311

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

Hello Guix!

I'm in the process of switching back to StumpWM as my main window
manager, and when taking a look at the package, I realised we still
supported non-sbcl builds while upstream dropped them after version
1.0.0 [0].  So since StumpWM now only supports sbcl, I thought we should
just rename it to "stumpwm" instead of "sbcl-stumpwm", as that's
redundant.  And then we can keep the ecl-stumpwm variant, but downgraded
to 1.0.0

WDYT?

Thanks,
Pierre

[0]: http://lists.nongnu.org/archive/html/stumpwm-devel/2017-01/msg00007.html


[-- Attachment #2: 0001-gnu-Drop-non-sbcl-lisp-support-from-Stumpwm-2018.05.patch --]
[-- Type: text/x-patch, Size: 4753 bytes --]

From 8180d03797ebd0c26adfc27276cc0682a04a0f8f Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 8 Nov 2018 09:51:05 +0000
Subject: [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.

StumpWM version 1.0.0 was the last version to support lisps other than
sbcl.  This renames the current version of Stumpwm to simply "stumpwm" instead
of "sbcl-stumpwm" since it's redundant.  However, we can keep version 1.0.0
around if somebody wants a version with ecl.

* gnu/packages/lisp.scm (sbcl-stumpwm): Rename to ...
(stumpwm): ... this.
[name]: Rename to "stumpwm".
[arguments]: Set #:asd-system-name to "stumpwm".
[properties]: Replace ecl-variant with cl-source-variant.
(cl-stumpwm): Inherit from stumpwm but override the name.
(ecl-stumpwm): Remove.
(ecl-stumpwm-1.0.0): New variable.
(sbcl-stumpwm+slynk): Rename to ...
(stumpwm+slynk): ... this.
[name]: Rename to "stumpwm-with-slynk".
[inherit]: Replace sbcl-stumpwm with stumpwm.
[inputs]: Ditto.
[arguments]: Ditto.
---
 gnu/packages/lisp.scm | 49 +++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 9fb25a15a2..b8cfa9c7ed 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
+;;; Copyright © 2018 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -952,9 +953,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)
@@ -970,7 +971,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)
@@ -1003,17 +1005,32 @@ 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))
+  (package
+    (inherit (sbcl-package->cl-source-package stumpwm))
+    (name "cl-stumpwm")))
 
-(define-public ecl-stumpwm
-  (let ((base (sbcl-package->ecl-package sbcl-stumpwm)))
-    (package
-      (inherit base)
-      (outputs '("out"))
-      (arguments '()))))
+;; The last StumpWM release to support multiple lisps was 1.0.0.
+(define-public ecl-stumpwm-1.0.0
+  (package
+    (inherit stumpwm)
+    (name "ecl-stumpwm")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/stumpwm/stumpwm/archive/"
+                    version ".tar.gz"))
+              (sha256
+               (base32 "1maxp98gh64az3d9vz9br6zdd6rc9fmj2imvax4by85g6kxvdz1i"))
+              (file-name (string-append "stumpwm-" version ".tar.gz"))))
+    (build-system asdf-build-system/ecl)
+    (inputs `(("cl-ppcre" ,ecl-cl-ppcre)
+              ("clx" ,ecl-clx)))
+    (arguments '())
+    (outputs '("out"))))
 
 ;; 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
@@ -1292,16 +1309,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
-- 
2.19.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-11-08 10:01 [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05 Pierre Langlois
@ 2018-11-25 22:05 ` Pierre Langlois
  2018-11-26 13:37 ` Pierre Neidhardt
  2018-11-28 16:25 ` Oleg Pykhalov
  2 siblings, 0 replies; 7+ messages in thread
From: Pierre Langlois @ 2018-11-25 22:05 UTC (permalink / raw)
  To: 33311

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

Hello Guix!

Pierre Langlois writes:

> Hello Guix!
>
> I'm in the process of switching back to StumpWM as my main window
> manager, and when taking a look at the package, I realised we still
> supported non-sbcl builds while upstream dropped them after version
> 1.0.0 [0].  So since StumpWM now only supports sbcl, I thought we should
> just rename it to "stumpwm" instead of "sbcl-stumpwm", as that's
> redundant.  And then we can keep the ecl-stumpwm variant, but downgraded
> to 1.0.0
>
> WDYT?
>
> Thanks,
> Pierre
>
> [0]: http://lists.nongnu.org/archive/html/stumpwm-devel/2017-01/msg00007.html

Ping! Does anyone have any thoughts about renaming "sbcl-stumpwm" to
just "stumpwm" now that sbcl is required?

BTW, attached is a new version of the patch that resolves a conflict on
the copyright header.

Thanks,
Pierre


[-- Attachment #2: 0001-gnu-Drop-non-sbcl-lisp-support-from-Stumpwm-2018.05.patch --]
[-- Type: text/x-patch, Size: 4745 bytes --]

From 2f103b44c720e40703d1cd07429ea0df1060c1a3 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 8 Nov 2018 09:51:05 +0000
Subject: [PATCH v2] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.

StumpWM version 1.0.0 was the last version to support lisps other than
sbcl.  This renames the current version of Stumpwm to simply "stumpwm" instead
of "sbcl-stumpwm" since it's redundant.  However, we can keep version 1.0.0
around if somebody wants a version with ecl.

* gnu/packages/lisp.scm (sbcl-stumpwm): Rename to ...
(stumpwm): ... this.
[name]: Rename to "stumpwm".
[arguments]: Set #:asd-system-name to "stumpwm".
[properties]: Replace ecl-variant with cl-source-variant.
(cl-stumpwm): Inherit from stumpwm but override the name.
(ecl-stumpwm): Remove.
(ecl-stumpwm-1.0.0): New variable.
(sbcl-stumpwm+slynk): Rename to ...
(stumpwm+slynk): ... this.
[name]: Rename to "stumpwm-with-slynk".
[inherit]: Replace sbcl-stumpwm with stumpwm.
[inputs]: Ditto.
[arguments]: Ditto.
---
 gnu/packages/lisp.scm | 49 +++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 87ba39b986..7dbfbbdb4b 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -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.
 ;;;
@@ -920,9 +921,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)
@@ -938,7 +939,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)
@@ -971,17 +973,32 @@ 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))
+  (package
+    (inherit (sbcl-package->cl-source-package stumpwm))
+    (name "cl-stumpwm")))
 
-(define-public ecl-stumpwm
-  (let ((base (sbcl-package->ecl-package sbcl-stumpwm)))
-    (package
-      (inherit base)
-      (outputs '("out"))
-      (arguments '()))))
+;; The last StumpWM release to support multiple lisps was 1.0.0.
+(define-public ecl-stumpwm-1.0.0
+  (package
+    (inherit stumpwm)
+    (name "ecl-stumpwm")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/stumpwm/stumpwm/archive/"
+                    version ".tar.gz"))
+              (sha256
+               (base32 "1maxp98gh64az3d9vz9br6zdd6rc9fmj2imvax4by85g6kxvdz1i"))
+              (file-name (string-append "stumpwm-" version ".tar.gz"))))
+    (build-system asdf-build-system/ecl)
+    (inputs `(("cl-ppcre" ,ecl-cl-ppcre)
+              ("clx" ,ecl-clx)))
+    (arguments '())
+    (outputs '("out"))))
 
 ;; 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
@@ -1260,16 +1277,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
-- 
2.19.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-11-08 10:01 [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05 Pierre Langlois
  2018-11-25 22:05 ` Pierre Langlois
@ 2018-11-26 13:37 ` Pierre Neidhardt
  2018-11-28 16:25 ` Oleg Pykhalov
  2 siblings, 0 replies; 7+ messages in thread
From: Pierre Neidhardt @ 2018-11-26 13:37 UTC (permalink / raw)
  To: 33311

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

(Sending a second time, looks like my first mail did not go through.)

I agree with your suggestion, and your patch looks good to me.

I haven't tested as I don't use StumpWM.
Could any other StumpWM user try this out?

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-11-08 10:01 [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05 Pierre Langlois
  2018-11-25 22:05 ` Pierre Langlois
  2018-11-26 13:37 ` Pierre Neidhardt
@ 2018-11-28 16:25 ` Oleg Pykhalov
  2018-11-28 17:01   ` Pierre Langlois
  2 siblings, 1 reply; 7+ messages in thread
From: Oleg Pykhalov @ 2018-11-28 16:25 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 33311

[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]

Hello Pierre,

Apologies for not getting attention to this patch for a long time.  Also
thank you for working on StumpWM package!  I've succeeded to build and
run it. Please, take a look onto my notes about your patch below.

Pierre Langlois <pierre.langlois@gmx.com> writes:

> I'm in the process of switching back to StumpWM as my main window
> manager, and when taking a look at the package, I realised we still
> supported non-sbcl builds while upstream dropped them after version
> 1.0.0 [0].  So since StumpWM now only supports sbcl, I thought we should
> just rename it to "stumpwm" instead of "sbcl-stumpwm", as that's
> redundant.  And then we can keep the ecl-stumpwm variant, but downgraded
> to 1.0.0

[…]

> [0]: http://lists.nongnu.org/archive/html/stumpwm-devel/2017-01/msg00007.html

Is there a reason to preserve an unmaintained ECL variant of StumpWM? My
guess is StumpWM users will stick to SBCL upstream version. Also
according to ‘M-x build-farm b =j ecl-stumpwm-18.05.x86_64-linux’
package is failed to build for a long time.  WDYT?

Please, add the following for Guix users with sbcl-stumpwm installed:
--8<---------------cut here---------------start------------->8---
(define-public sbcl-stumpwm
  (deprecated-package "sbcl-stumpwm" stumpwm))
--8<---------------cut here---------------end--------------->8---

[…]

>>From 8180d03797ebd0c26adfc27276cc0682a04a0f8f Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@gmx.com>
> Date: Thu, 8 Nov 2018 09:51:05 +0000
> Subject: [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
>
> StumpWM version 1.0.0 was the last version to support lisps other than
> sbcl.  This renames the current version of Stumpwm to simply "stumpwm" instead
> of "sbcl-stumpwm" since it's redundant.  However, we can keep version 1.0.0
> around if somebody wants a version with ecl.
>
> * gnu/packages/lisp.scm (sbcl-stumpwm): Rename to ...

I think “Rename to stumpwm” and delete line “(stumpwm): ... this.” is
better, but no strict opinion on that.

> (stumpwm): ... this.
> [name]: Rename to "stumpwm".
> [arguments]: Set #:asd-system-name to "stumpwm".
> [properties]: Replace ecl-variant with cl-source-variant.
> (cl-stumpwm): Inherit from stumpwm but override the name.
> (ecl-stumpwm): Remove.
> (ecl-stumpwm-1.0.0): New variable.
> (sbcl-stumpwm+slynk): Rename to ...
> (stumpwm+slynk): ... this.

Same.

> [name]: Rename to "stumpwm-with-slynk".
> [inherit]: Replace sbcl-stumpwm with stumpwm.
> [inputs]: Ditto.
> [arguments]: Ditto.

Rather “[inherit, inputs, arguments]: Replace sbcl-stumpwm with
stumpwm.”.

[…]

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-11-28 16:25 ` Oleg Pykhalov
@ 2018-11-28 17:01   ` Pierre Langlois
  2018-12-02 12:06     ` Pierre Langlois
  0 siblings, 1 reply; 7+ messages in thread
From: Pierre Langlois @ 2018-11-28 17:01 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 33311

Hi Oleg,

Oleg Pykhalov writes:

> Hello Pierre,
>
> Apologies for not getting attention to this patch for a long time.  Also
> thank you for working on StumpWM package!  I've succeeded to build and
> run it. Please, take a look onto my notes about your patch below.

Oh that's no problem at all, there's no rush :-). Thanks for taking a
look!

>
> Pierre Langlois <pierre.langlois@gmx.com> writes:
>
>> I'm in the process of switching back to StumpWM as my main window
>> manager, and when taking a look at the package, I realised we still
>> supported non-sbcl builds while upstream dropped them after version
>> 1.0.0 [0].  So since StumpWM now only supports sbcl, I thought we should
>> just rename it to "stumpwm" instead of "sbcl-stumpwm", as that's
>> redundant.  And then we can keep the ecl-stumpwm variant, but downgraded
>> to 1.0.0
>
> […]
>
>> [0]: http://lists.nongnu.org/archive/html/stumpwm-devel/2017-01/msg00007.html
>
> Is there a reason to preserve an unmaintained ECL variant of StumpWM? My
> guess is StumpWM users will stick to SBCL upstream version. Also
> according to ‘M-x build-farm b =j ecl-stumpwm-18.05.x86_64-linux’
> package is failed to build for a long time.  WDYT?

The only reason I kept it around is I assumed some people cared since it
was there to begin with, I'm happy to remove it.  What about the pure CL
source version, should I remove that one too? I guess it doesn't hurt to
keep it.

By the way, I need to take a look at the emacs build-farm package, I
hadn't realised you could do that, that's pretty cool!

I'll update the patch.

Thanks,
Pierre

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-11-28 17:01   ` Pierre Langlois
@ 2018-12-02 12:06     ` Pierre Langlois
  2018-12-05  4:34       ` Oleg Pykhalov
  0 siblings, 1 reply; 7+ messages in thread
From: Pierre Langlois @ 2018-12-02 12:06 UTC (permalink / raw)
  To: Oleg Pykhalov; +Cc: 33311

[-- Attachment #1: Type: text/plain, Size: 122 bytes --]

Hello,

Here's the updated patch.  I've removed ecl-stumpwm but kept the pure
source cl-stumpwm variant.

Thanks!
Pierre


[-- Attachment #2: 0001-gnu-stumpwm-Drop-non-sbcl-lisp-support.patch --]
[-- Type: text/x-patch, Size: 4449 bytes --]

From bb230935bebbeaae5e8effe0383c121f2e69a3dc Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Thu, 8 Nov 2018 09:51:05 +0000
Subject: [PATCH] gnu: stumpwm: Drop non-sbcl lisp support.

StumpWM version 1.0.0 was the last version to support lisps other than
sbcl.  This 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): Rename to stumpwm.  Introduce a
deprecated package for sbcl-stumpwm.
[name]: Rename to "stumpwm".
[arguments]: Set #:asd-system-name to "stumpwm".
[properties]: Replace ecl-variant with cl-source-variant.
(ecl-stumpwm): Remove.
(cl-stumpwm): Replace sbcl-stumpwm with stumpwm and adapt.
(sbcl-stumpwm+slynk): Rename to stumpwm+slynk.  Introduce a deprecated package
for sbcl-stumpwm+slynk.
[name]: Rename to "stumpwm-with-slynk".
[inherit, inputs, arguments]: Replace sbcl-stumpwm with stumpwm.
---
 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 5e8b6fdd3d..120d0d5e17 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -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 @@ 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"))
-- 
2.19.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05.
  2018-12-02 12:06     ` Pierre Langlois
@ 2018-12-05  4:34       ` Oleg Pykhalov
  0 siblings, 0 replies; 7+ messages in thread
From: Oleg Pykhalov @ 2018-12-05  4:34 UTC (permalink / raw)
  To: Pierre Langlois; +Cc: 33311, 33311-done

[-- Attachment #1: Type: text/plain, Size: 899 bytes --]

Hello Pierre,

Pierre Langlois <pierre.langlois@gmx.com> writes:

> What about the pure CL source version, should I remove that one too? I
> guess it doesn't hurt to keep it.

I'm not agree to remove it because I don't understand a build system.
The build farm succeeds to “build” it as I am.  According to a build
system documentation:

     Additionally, the corresponding source package should be labeled
     using the same convention as python packages (see *note Python
     Modules::), using the ‘cl-’ prefix.

https://www.gnu.org/software/guix/manual/en/html_node/Build-Systems.html

I think you might want to start a discussion on guix-devel.

> Here's the updated patch.  I've removed ecl-stumpwm but kept the pure
> source cl-stumpwm variant.

LGTM with minor changes in commit message,
pushed as 4b193da3f959244112a85f996d630aa1ed6d0902

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-12-05  4:41 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-08 10:01 [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05 Pierre Langlois
2018-11-25 22:05 ` Pierre Langlois
2018-11-26 13:37 ` Pierre Neidhardt
2018-11-28 16:25 ` Oleg Pykhalov
2018-11-28 17:01   ` Pierre Langlois
2018-12-02 12:06     ` Pierre Langlois
2018-12-05  4:34       ` Oleg Pykhalov

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).