From patchwork Tue Dec 25 08:19:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nam Nguyen X-Patchwork-Id: 537 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 26BC3169DA; Tue, 25 Dec 2018 08:20:15 +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,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 79F891695C for ; Tue, 25 Dec 2018 08:20:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:40066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbhwj-0004gu-TW for patchwork@mira.cbaines.net; Tue, 25 Dec 2018 03:20:13 -0500 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 X-Loop: help-debbugs@gnu.org 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-From: Nam Nguyen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Dec 2018 08:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33753@debbugs.gnu.org Received: via spool by 33753-submit@debbugs.gnu.org id=B33753.154572596525055 (code B ref 33753); Tue, 25 Dec 2018 08:20:01 +0000 Received: (at 33753) by debbugs.gnu.org; 25 Dec 2018 08:19:25 +0000 Received: from localhost ([127.0.0.1]:35707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbhvw-0006W1-VJ for submit@debbugs.gnu.org; Tue, 25 Dec 2018 03:19:25 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:45040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbhvv-0006Vg-9m for 33753@debbugs.gnu.org; Tue, 25 Dec 2018 03:19:23 -0500 Received: by mail-ed1-f66.google.com with SMTP id y56so11280452edd.11 for <33753@debbugs.gnu.org>; Tue, 25 Dec 2018 00:19:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ndsaT1sLtYUCK/ksdMu1FzDpZGmN+2p1AO3KehTd4qw=; b=O7pkQtB9Pfh4nu//JpBw5fYFasbHAktVbSjWbl++TM4wT+BffN5p2lBKHBIioKO1c9 ZlCigAJ9ck4a1vOc5AuyO4AJjSdL0qso9QBuPNfPRFSTjBrgkGhgg8EFJXTm5xwtvX95 qGgY44DJFi5cyczZ64xMIjB5jjFfuWlyyXOVV2DvjW8XNE+ruz9cMOvf8RPov4m+xt/R YTlhWx5J42eqm7X5K630JuDqVd/Q2/I2gACKKoK32vaONPiYJZFQrUyoUUiRvg9wlXMz vboZHwEQyN5EuP71FdvvJQ6LnSH4sMfRjNTOGZBZXtevdM/StACKNiaYg1muBH/Fv46k 81BQ== X-Gm-Message-State: AA+aEWY0v5mJaI0pwacredN1ZO/Tc2gp47TUoMcNWYEd1M3sBhQvAyQW mlna+b1GmmtybzWmAUQXPRGL1Vxc+Rk= X-Google-Smtp-Source: AFSGD/XbVODX+k/UQnN3Agro3hAre9BsuudcAxuOoNiJaewvdXba8MH/wL1IK98ptXwz/4qlwUYFJw== X-Received: by 2002:a17:906:138d:: with SMTP id f13-v6mr10493136ejc.176.1545725957075; Tue, 25 Dec 2018 00:19:17 -0800 (PST) Received: from localhost.localdomain ([24.5.139.14]) by smtp.googlemail.com with ESMTPSA id x30sm9757805edd.30.2018.12.25.00.19.15 for <33753@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Dec 2018 00:19:16 -0800 (PST) From: Nam Nguyen Date: Tue, 25 Dec 2018 00:19:00 -0800 Message-Id: <20181225081901.19657-1-namn@berkeley.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 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 * 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 From patchwork Tue Dec 25 08:19:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nam Nguyen X-Patchwork-Id: 538 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 5149B16996; Tue, 25 Dec 2018 08:20:15 +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,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id E5F5E1696A for ; Tue, 25 Dec 2018 08:20:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:40069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbhwk-0004hF-F7 for patchwork@mira.cbaines.net; Tue, 25 Dec 2018 03:20:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbhwc-0004ev-9K 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-0001HA-BN for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:34660) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbhwY-0001H3-8E 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 1gbhwY-0006XL-2z for guix-patches@gnu.org; Tue, 25 Dec 2018 03:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33753] [PATCH 2/3] gnu: Add sbcl-percent-encoding. Resent-From: Nam Nguyen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 25 Dec 2018 08:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33753 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33753@debbugs.gnu.org Received: via spool by 33753-submit@debbugs.gnu.org id=B33753.154572596925065 (code B ref 33753); Tue, 25 Dec 2018 08:20:02 +0000 Received: (at 33753) by debbugs.gnu.org; 25 Dec 2018 08:19:29 +0000 Received: from localhost ([127.0.0.1]:35709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbhw0-0006WD-Cb for submit@debbugs.gnu.org; Tue, 25 Dec 2018 03:19:28 -0500 Received: from mail-ed1-f48.google.com ([209.85.208.48]:37120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbhvw-0006Vi-4z for 33753@debbugs.gnu.org; Tue, 25 Dec 2018 03:19:24 -0500 Received: by mail-ed1-f48.google.com with SMTP id h15so11316476edb.4 for <33753@debbugs.gnu.org>; Tue, 25 Dec 2018 00:19:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OwAlEkU1UvyOlYb7n1yPcjyUfO6kQ7SqOwEEksFOAWM=; b=OqgZvzIkiGtV2tr7K6m1cqF5ayH0UXKeXjvP9xMi6/EQMAbvzNPDURTNgyPDnuLQ/y ghi5gk37uX8bt0yXiDxiEL/OErRAV15toTZIugR3afygQxc4ZpoJ+9ZQIvLe+5qYOeO/ q2yWJWcA5qgpsRkqV+wScJZeFOmcBRjtDMEOxAWt7wQlMc0CHWc4RLIp+8jEY0buIHmZ gpFNFLkMtC/9fqgboiizCfegtyeKxHXwl44X1RElWKM/sNZVxv8JDcfwfq6jfzDJO6ob n8GhMNuD6Aspid4Dq5YC8imJUkEWuYKzyOoFnG89wXnswbI1HkZx2dPK6opmDeaXa/lD +ubg== X-Gm-Message-State: AA+aEWZYwDyRs1m6RpTFa5lYrjrBWyHU9Scg39yMuosl1JF+LitQtmck u3HwX80luSmo9YlzWLYGVO/XPEWNQMw= X-Google-Smtp-Source: AFSGD/W1jjLY9H+9xi11vvM2/LfNYW911rowe+M7XG8uXvIzIRSpvSW6dJcQIyk9JPo2mwQ9KBs8HA== X-Received: by 2002:a50:a741:: with SMTP id h59mr11875958edc.106.1545725958342; Tue, 25 Dec 2018 00:19:18 -0800 (PST) Received: from localhost.localdomain ([24.5.139.14]) by smtp.googlemail.com with ESMTPSA id x30sm9757805edd.30.2018.12.25.00.19.17 for <33753@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Dec 2018 00:19:17 -0800 (PST) From: Nam Nguyen Date: Tue, 25 Dec 2018 00:19:01 -0800 Message-Id: <20181225081901.19657-2-namn@berkeley.edu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181225081901.19657-1-namn@berkeley.edu> References: <20181225081901.19657-1-namn@berkeley.edu> MIME-Version: 1.0 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 * gnu/packages/lisp.scm (sbcl-percent-encoding): New variable. --- gnu/packages/lisp.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4fb9a8a00..5d99c7dfb 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1495,6 +1495,30 @@ the string into one of the standard Common Lisp number types, if possible, or else @code{parse-number} signals an error of type @code{invalid-number}.") (license license:bsd-3))) +(define-public sbcl-percent-encoding + (package + (name "sbcl-percent-encoding") + (version "20121013") + (source + (origin + (method url-fetch) + (uri (string-append "http://beta.quicklisp.org/archive/percent-encoding/" + "2012-10-13/percent-encoding-" + version "-git.tgz")) + (sha256 + (base32 + "1dlf77c1iha1d7h6fzmv090mf8p6w20fqjrd5zcbh2kiicyabhfb")))) + (inputs + `(("sbcl-anaphora" ,sbcl-anaphora) + ("sbcl-babel" ,sbcl-babel) + ("sbcl-fiveam" ,sbcl-fiveam))) + (build-system asdf-build-system/sbcl) + (home-page "https://common-lisp.net/project/percent-encoding/") + (synopsis "Library for percent-encoding (URI encoding) for Common Lisp") + (description "@code{percent-encoding} is a URI encoding library for +Common Lisp, as defined in RFC 3986.") + (license license:expat))) + (define-public sbcl-iterate (package (name "sbcl-iterate")