From patchwork Thu Nov 8 10:01:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 145 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 664C4167D2; Thu, 8 Nov 2018 10:04:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id AFFAF16761 for ; Thu, 8 Nov 2018 10:04:28 +0000 (GMT) Received: from localhost ([::1]:55526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKhAp-0003L5-V7 for patchwork@mira.cbaines.net; Thu, 08 Nov 2018 05:04:27 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33311] [PATCH] gnu: Drop non-sbcl lisp support from Stumpwm 2018.05. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Nov 2018 10:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33311 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33311@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154167135915963 (code B ref -1); Thu, 08 Nov 2018 10:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Nov 2018 10:02:39 +0000 Received: from localhost ([127.0.0.1]:40324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gKh90-00049K-60 for submit@debbugs.gnu.org; Thu, 08 Nov 2018 05:02:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gKh8y-000497-6b for submit@debbugs.gnu.org; Thu, 08 Nov 2018 05:02:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKh8n-0002ql-Bl for submit@debbugs.gnu.org; Thu, 08 Nov 2018 05:02:26 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:42015) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKh8h-0002cS-Mk for submit@debbugs.gnu.org; Thu, 08 Nov 2018 05:02:16 -0500 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 Received: from labiere ([92.6.237.153]) by mail.gmx.com (mrgmx103 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LrevR-1fMi040VA5-013K4K; Thu, 08 Nov 2018 11:02:01 +0100 User-agent: mu4e 1.1.0; emacs 26.1 From: Pierre Langlois Date: Thu, 08 Nov 2018 10:01:59 +0000 Message-ID: MIME-Version: 1.0 X-Provags-ID: V03:K1:Hmc4poXoKihMj+4DouGblRT84MPyIErWg4KTFDaUzpLMnnxIP7L nEOKHyorRtpqz1aFu4dIapJWJOZa2XWT5WqnfpXT60k7ZKOBllzgrQejAUu/hNvk8Fu+iVj kdlV41DZxOb6Fn+Zbqe8X6OgCBC+UUmkX9ht5o/9Y6kokS+CNyeimwPY+QuDpiDvqLQuUIe jv8OaDpuKUppopgQ+Q7JA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Uzzjs2FRf5w=:/+QKYQbVtXWHdOmi95X+5r aTg5ApFvGRsSmH7OgDTkUAqagZGwm4yibppaKH0Cw1R+knhdJ/mtQd2QXPYGnX/OkZbRvq2M8 pNXOcssSERhAThbSKGnVX+QVPbyDNJoranssFq294JeOM0+IKXTCfMvfTTQCEjHr4EGTjq0mo PdBDu6SVhBlc9vtRpKafBXeICVNZwDOGpHmp2qDVy1cm3e1pJPSz+2862aTo1A7xGYLurPaHS grUuMHyBFbm48pRRjTgrVNYC70t7oXkJqvZ0QUPEe6F/9feVitPQQ8JzWGzI8esy/OJzWLjhn gBiQmjLGkFy8OFDMMhIpWLoX/sVMmHzrw5bcW/tV20HQBq+d5MHK8niM+sT3dWt1UZrJvqtuK w2BcqGJlv1dvC2pfB8qitcen4VB+JsvapraxsRfYJOmkI1aAPDni6yIXEH4wJq3fMjLbUAktr bzbe1DDacocLPBDiqoWbyFDyunC+s07uI10MMS4fnKsjlZ031sccy2GXCfV4jNN3kj0U7zUge MvvC98EzApdIcIfYjBSRsOTU/n6ShoVIsdHFniBmGIiSlkmjZdmA6T8MtsmqVatCwXTCMM0pU a1l2vnsItXZ8lK4ZWsOVqpdzxz+GhRNzeeU/v78py5s0R7bTIdjIuaJ0MI9Omyt9yf1SNaPj8 bwzJxVAJYd3ER/Ki475ZSlkREflJM+MdXM5A15z63/3jrQ1b1+zW5AVnLUPRcEx1wViJiMDoS qHcC0c+UD1WJr8KX0BfS2dR2ZNCpXjbLYOiPevG9CeQXkz0iG4+hoFHIZ0lTP+FsP+aEE/wCX 8+J0hSfjbCdnT7Kxt/ykYNyLw9YSoFOF93JnOdJ6UTF+KV+otAICiU2+uKK5CEiIHmFhqxdAD kRWaJWUDv4jikZjYSoeEIIR3mECXY8oe39OS3uILJoFTsdpPYeJ03BUvZaj+eM X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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" 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 ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade +;;; Copyright © 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))))) -(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