From patchwork Sat Jun 29 02:58:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominic Martinez X-Patchwork-Id: 65750 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 0A78227BBE9; Sat, 29 Jun 2024 14:05:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 993D627BBE2 for ; Sat, 29 Jun 2024 14:05:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNXky-0001Vo-81; Sat, 29 Jun 2024 09:04:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sNOIq-0002vU-RR for guix-patches@gnu.org; Fri, 28 Jun 2024 22:59:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sNOIq-0003XP-Iq for guix-patches@gnu.org; Fri, 28 Jun 2024 22:59:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sNOIo-0007Us-2c; Fri, 28 Jun 2024 22:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71831] [PATCH] gnu: kmonad: Update to 0.4.2. Resent-From: Dominic Martinez Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Sat, 29 Jun 2024 02:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71831 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71831@debbugs.gnu.org Cc: Dominic Martinez , Lars-Dominik Braun X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by submit@debbugs.gnu.org id=B.171962992728796 (code B ref -1); Sat, 29 Jun 2024 02:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jun 2024 02:58:47 +0000 Received: from localhost ([127.0.0.1]:36526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNOIY-0007UN-Os for submit@debbugs.gnu.org; Fri, 28 Jun 2024 22:58:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:34804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sNOIW-0007UF-4v for submit@debbugs.gnu.org; Fri, 28 Jun 2024 22:58:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sNOIV-0002tR-Rr for guix-patches@gnu.org; Fri, 28 Jun 2024 22:58:44 -0400 Received: from out-175.mta0.migadu.com ([2001:41d0:1004:224b::af]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sNOIT-0003Ul-GD for guix-patches@gnu.org; Fri, 28 Jun 2024 22:58:43 -0400 X-Envelope-To: guix-patches@gnu.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dominicm.dev; s=key1; t=1719629915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=HlaeFTuhYQaczYwZa3vcX6JdA3TJ1Gc1OdPAiHQXcqw=; b=i219wXEeKO7ssiJlinlKkS7VDLKLoi2WQ/YoVFtRGps+tu5LJZGJF9EfuBJ/q555oc8uLL aosGcFxtXvi4VWZLzSFTEzak0bLxxr+vZGMVgmodiXqM8qLiDPD/KsGnRzO6RnO6UBuQCM 8RJNPbRW0YO1SBZYFYVom0wNGh3IJ+q5eS5WT4IbtL9RQmPnKWuMdyEhcgzkPx9ZEhhbfI eHn5RyghbEY7JOmzorNUkB/6ygbH+3Z1X7EFuHeN3eTeIHHiITBllHC5zBB7z5wOZuFhSq 6y0I4cMTerDAo0V0hYEbXtKGiNAQo3q9gChY6ZYaJsXgf5jqO7GMd7Gg9d2NwA== X-Envelope-To: dom@dominicm.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. Date: Fri, 28 Jun 2024 22:58:29 -0400 Message-ID: <1aae9e186e6718988446dcac361ec1840b838967.1719629909.git.dom@dominicm.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=2001:41d0:1004:224b::af; envelope-from=dom@dominicm.dev; helo=out-175.mta0.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 29 Jun 2024 09:04:42 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Dominic Martinez X-ACL-Warn: , Dominic Martinez via Guix-patches X-Patchwork-Original-From: Dominic Martinez via Guix-patches via From: Dominic Martinez Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-apps.scm (kmonad): Update to 0.4.2. Change-Id: Ifbd162583e7838e8a986518434f5314ab3a32b56 --- gnu/packages/haskell-apps.scm | 122 ++++++++++++++++------------------ 1 file changed, 59 insertions(+), 63 deletions(-) base-commit: 385fb14f6482a955fbef4d4b21fccb3473beddd8 diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3fce4f803c..63f1a3bfe8 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -614,73 +614,69 @@ (define-public hscolour (license license:bsd-3))) (define-public kmonad - ;; Project is active, but no new releases exist. Pick current master - ;; HEAD as of 2023-01-08. - (let ((commit "a0af5b8b3f085adb2c09ca52374a53566c25194c") - (revision "1")) - (package - (name "kmonad") - (version (git-version "0.4.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/david-janssen/kmonad") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "00qmmk1lgadhh32dqi530xm18v79ndcm7rrxvdsf827vicv2nhw1")))) - (build-system haskell-build-system) - (arguments - `(#:haddock? #f ; Haddock fails to generate docs - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-git-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/KMonad/Args/TH.hs" - (("\"git\"") - (string-append "\"" (search-input-file inputs "/bin/git") "\""))))) - (add-after 'install 'install-udev-rules - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rules (string-append out "/lib/udev/rules.d"))) - (mkdir-p rules) - (call-with-output-file (string-append rules "/70-kmonad.rules") - (lambda (port) - (display - (string-append - "KERNEL==\"uinput\", MODE=\"0660\", " - "GROUP=\"input\", OPTIONS+=\"static_node=uinput\"\n") - port))) - #t))) - (add-after 'install-udev-rules 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/kmonad-" ,version))) - (install-file "README.md" doc) - (copy-recursively "doc" doc) - (copy-recursively "keymap" (string-append doc "/keymap")) - #t)))))) - (inputs - (list ghc-cereal - ghc-exceptions - ghc-lens - ghc-megaparsec - ghc-optparse-applicative - ghc-resourcet - ghc-rio - ghc-unliftio - ghc-unordered-containers - ghc-template-haskell)) - (native-inputs (list ghc-hspec hspec-discover git)) - (home-page "https://github.com/david-janssen/kmonad") - (synopsis "Advanced keyboard manager") - (description "KMonad is a keyboard remapping utility that supports + (package + (name "kmonad") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kmonad/kmonad") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q8hdw3ab34kwydzpz5hcy8xj16fwb3r6gqj3cldzmi6fcbzfd1i")))) + (build-system haskell-build-system) + (arguments + `(#:haddock? #f ; Haddock fails to generate docs + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-git-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/KMonad/Args/TH.hs" + (("\"git\"") + (string-append "\"" (search-input-file inputs "/bin/git") "\""))))) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rules (string-append out "/lib/udev/rules.d"))) + (mkdir-p rules) + (call-with-output-file (string-append rules "/70-kmonad.rules") + (lambda (port) + (display + (string-append + "KERNEL==\"uinput\", MODE=\"0660\", " + "GROUP=\"input\", OPTIONS+=\"static_node=uinput\"\n") + port))) + #t))) + (add-after 'install-udev-rules 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/kmonad-" ,version))) + (install-file "README.md" doc) + (copy-recursively "doc" doc) + (copy-recursively "keymap" (string-append doc "/keymap")) + #t)))))) + (inputs + (list ghc-cereal + ghc-exceptions + ghc-lens + ghc-megaparsec + ghc-optparse-applicative + ghc-resourcet + ghc-rio + ghc-unliftio + ghc-unordered-containers + ghc-template-haskell)) + (native-inputs (list ghc-hspec hspec-discover git)) + (home-page "https://github.com/david-janssen/kmonad") + (synopsis "Advanced keyboard manager") + (description "KMonad is a keyboard remapping utility that supports advanced functionality, such as custom keymap layers and modifiers, macros, and conditional mappings that send a different keycode when tapped or held. By operating at a lower level than most similar tools, it supports X11, Wayland, and Linux console environments alike.") - (license license:expat)))) + (license license:expat))) (define-public nixfmt (package