From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbhwc-0004eu-3s for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbhwY-0001Gw-4h for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:56917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbhwY-0001GY-1W for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gbhwX-0006XD-IN for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:01 -0500 Subject: [bug#33753] [PATCH 1/3] gnu: Add stumpwm modules. References: <20181215020600.2713-1-namn@berkeley.edu> In-Reply-To: <20181215020600.2713-1-namn@berkeley.edu> Resent-Message-ID: From: Nam Nguyen Date: Tue, 25 Dec 2018 00:19:00 -0800 Message-Id: <20181225081901.19657-1-namn@berkeley.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 33753@debbugs.gnu.org * gnu/packages/lisp.scm (stumpwm-cpu, stumpwm-mem, stumpwm-hostname) (stumpwm-battery-portable, stumpwm-winner-mode, stumpwm-swm-gaps) (stumpwm-pinentry): New public variables. (stumpwm-contrib, stumpwm-module): New private variables. --- gnu/packages/lisp.scm | 104 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 261e720e2..4fb9a8a00 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2018 Nam Nguyen ;;; ;;; This file is part of GNU Guix. ;;; @@ -1032,6 +1033,109 @@ productive, customizable lisp based systems.") (inherit (sbcl-package->cl-source-package stumpwm)) (name "cl-stumpwm"))) +(define stumpwm-contrib + (let ((commit "bd47cec14f7299711ac29468d2e1364d38a81bee") + (revision "1")) + (package + (name "stumpwm-contrib") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stumpwm/stumpwm-contrib.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0kh9vpmxssjvxgvl6ihpn0qh4l660n64iq80ivhagdvr8s045ddj")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("stumpwm" ,stumpwm "lib"))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "Collection of StumpWM modules") + (description "Modules are a way to extend StumpWM using Lisp +code.") + (license (list license:gpl2+ ; TODO: swm-gaps Missing license? + license:gpl3+ ; cpu, mem, battery-portable, + ; winner-mode, pinentry + license:bsd-2))))) ; hostname + +(define* (stumpwm-module mod cat syn desc) + (package (inherit stumpwm-contrib) + (name (string-append "stumpwm-" mod)) + (arguments + `(#:tests? #f ; No tests exist. + #:asd-file (string-append ,cat "/" ,mod "/" ,mod ".asd") + #:asd-system-name ,mod + #:phases + (modify-phases %standard-phases + ;; Keep this module's sources and delete the rest. + (add-after 'check 'copy-module-sources + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (clisp (string-append out "/share/common-lisp")) + (sbcl-source (string-append clisp "/sbcl-source")) + (source (string-append sbcl-source "/" + ,mod "/" ,cat "/" ,mod)) + (tmp (string-append out "/" ,mod))) + (mkdir-p tmp) + (copy-recursively source tmp) + (delete-file-recursively sbcl-source) + (copy-recursively tmp + (string-append sbcl-source "/" ,mod)) + (delete-file-recursively tmp)) + #t))))) + (synopsis syn) + (description desc))) + +(define-public stumpwm-cpu + (stumpwm-module "cpu" "modeline" + "Display CPU info" + "Display CPU info in the StumpWM modeline.")) + +(define-public stumpwm-mem + (stumpwm-module "mem" "modeline" + "Display memory info" + "Display memory info in the StumpWM modeline.")) + +(define-public stumpwm-hostname + (stumpwm-module "hostname" "modeline" + "Display hostname" + "Display hostname in the StumpWM modeline.")) + +(define-public stumpwm-battery-portable + (stumpwm-module "battery-portable" "modeline" + "Display laptop battery info" + "Display laptop battery info in the StumpWM +modeline.")) + +(define-public stumpwm-winner-mode + (stumpwm-module "winner-mode" "util" + "Emacs' winner-mode for StumpWM" + "Winner mode records changes in the window +configuration so that changes can be undone. It hooks into StumpWM to +dump layouts. This only works per group.")) + +(define-public stumpwm-swm-gaps + (stumpwm-module "swm-gaps" "util" + "Pretty (useless) gaps for StumpWM" + "Add gaps to StumpWM running along various borders.")) + +(define-public stumpwm-pinentry + (let ((pinentry (stumpwm-module "pinentry" "util" + "Integrate GnuPG Agent with StumpWM" + "GnuPG Agent uses +@code{stumpwm-pinentry} to ask for your password."))) + (package (inherit pinentry) + (inputs + `(("sbcl-cffi" ,sbcl-cffi) + ("sbcl-usocket-server" ,sbcl-usocket-server) + ("sbcl-percent-encoding" ,sbcl-percent-encoding) + ,@(package-inputs stumpwm-contrib))) + (propagated-inputs + `(("netcat" ,netcat)))))) + ;; 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 ;; we expose the union of these as `sbcl-slynk'. The following variable -- 2.20.1