From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKh9Y-0000au-0i for guix-patches@gnu.org; Thu, 08 Nov 2018 05:03:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKh9U-0003oy-O2 for guix-patches@gnu.org; Thu, 08 Nov 2018 05:03:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKh9U-0003o9-Fw for guix-patches@gnu.org; Thu, 08 Nov 2018 05:03:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gKh9U-0004A4-AQ for guix-patches@gnu.org; Thu, 08 Nov 2018 05:03:04 -0500 Subject: [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKh8f-0007vx-6M for guix-patches@gnu.org; Thu, 08 Nov 2018 05:02:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKh8Z-0002Ou-Tv for guix-patches@gnu.org; Thu, 08 Nov 2018 05:02:13 -0500 Received: from mout.gmx.net ([212.227.17.20]:58385) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKh8X-0002Je-RY for guix-patches@gnu.org; Thu, 08 Nov 2018 05:02:07 -0500 From: Pierre Langlois Date: Thu, 08 Nov 2018 10:01:59 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33311@debbugs.gnu.org --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Drop-non-sbcl-lisp-support-from-Stumpwm-2018.05.patch Content-Transfer-Encoding: quoted-printable >From 8180d03797ebd0c26adfc27276cc0682a04a0f8f Mon Sep 17 00:00:00 2001 From: Pierre Langlois 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" inst= ead 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 =C2=A9 2017, 2018 Efraim Flashner ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Benjamin Slade +;;; Copyright =C2=A9 2018 Pierre Langlois ;;; ;;; 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))))) =20 -(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 grow= ing 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)))))) =20 (define-public cl-stumpwm - (sbcl-package->cl-source-package sbcl-stumpwm)) + (package + (inherit (sbcl-package->cl-source-package stumpwm)) + (name "cl-stumpwm"))) =20 -(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 "1maxp98gh64az3d9vz9br6zdd6rc9fmj2imvax4by85g6kxvdz= 1i")) + (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")))) =20 ;; The slynk that users expect to install includes all of slynk's contrib ;; modules. Therefore, we build the base module and all contribs first; t= hen @@ -1292,16 +1309,16 @@ multiple inspectors with independent history.") paths) #t))))))) =20 -(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 --=20 2.19.1 --=-=-=--