From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KLpCF7ek4mHlvgAAgWs5BA (envelope-from ) for ; Sat, 15 Jan 2022 11:40:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id SCHXD7ek4mFrZwAAG6o9tA (envelope-from ) for ; Sat, 15 Jan 2022 11:40:55 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B59D8163C2 for ; Sat, 15 Jan 2022 11:40:54 +0100 (CET) Received: from localhost ([::1]:60176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8gUP-0006bu-Dy for larch@yhetil.org; Sat, 15 Jan 2022 05:40:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8gTa-0006aF-W7 for guix-patches@gnu.org; Sat, 15 Jan 2022 05:40:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8gTa-0001yZ-Mr for guix-patches@gnu.org; Sat, 15 Jan 2022 05:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8gTa-0001y7-Fj for guix-patches@gnu.org; Sat, 15 Jan 2022 05:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 4/5 v2] Add xmonad-next and ghc-xmonad-contrib-next. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52784 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: 52784@debbugs.gnu.org Received: via spool by 52784-submit@debbugs.gnu.org id=B52784.16422431547494 (code B ref 52784); Sat, 15 Jan 2022 10:40:02 +0000 Received: (at 52784) by debbugs.gnu.org; 15 Jan 2022 10:39:14 +0000 Received: from localhost ([127.0.0.1]:39180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8gSo-0001wo-86 for submit@debbugs.gnu.org; Sat, 15 Jan 2022 05:39:14 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:11218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8gSj-0001wY-QM for 52784@debbugs.gnu.org; Sat, 15 Jan 2022 05:39:12 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4JbZQv35PFzQjcN; Sat, 15 Jan 2022 11:39:03 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1642243141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sbNTIUuV67xptoeFeNsCIPVulIYBArlxszJ6d7sqnPo=; b=plD6H9Fq/eNRqHyO+6zRunH0EA58In9gr9qLM33M/fl2hDNJfkhdMUlDqH9NIneYkrRwuy POVTEzosGaw/rm2aUgwwFKGX5oUDt5ywL+ZckUfmTS8KoKPFGS7OWAg8WoOMYAe6WRs2aI xSzkIX1Tj8+JQ96I+K1RqtT9+AMJvm8Q/KInY+tvgG0O8iZliBF/QQxsQYBY1hwtyBxgNm 1J7w79zQ9qDYAxJX42AadqmWfPjtPq5D/XLZAmug1GBJDw6RztcCShF9mCBtBWewOgrMSY rkUlL4RxVbGg91SE0D5RfDD6e4wswT6qSw+RfPXeud/arCbTfIabPIqrZe54pQ== Date: Sat, 15 Jan 2022 11:38:57 +0100 From: Lars-Dominik Braun Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="9BAZVEOvAa//l1w+" Content-Disposition: inline In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642243254; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=sbNTIUuV67xptoeFeNsCIPVulIYBArlxszJ6d7sqnPo=; b=q9yfgkPzYOJgJDwGYoKAJPc9kDIP+iL3wLNdYE79IRfUbucSUWkzd2Ts0RK+iZSLKoGFqk ZONeC33ibv2RDJG1yHlY7qN+Npy6DRI7MNiVAnmFGh2pEzrECwcHFjaCYF36jZz4jMKRFN fgPjnETAr3I0qxZZdTEijtTzACi8ge8gmBsTqpwWcoXRo1J5fiLv/sawQfL5PjabbHDs7Y WzxsV8WTAbpPyZ9z/uhKWXZVnlFcKHJyYb5V9AfKsiOcF+SHLT/Hs/G7179aQtsn/xieFV 1DNjefCKQWnlRVnK4uf2q+rx0bsrV8bt/tPqmNAFms236lztBtW5XojBsS62Rw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642243254; a=rsa-sha256; cv=none; b=ttfDm7Tm/zAEI6np4E/a+miNLcX+2RfwoYrB+oGrqPik0vci2+XESZGOM3JB/nHJi7l0ZB QwkwcIUqKu6/s9WZJEJUZpv+AK9Ab7j2uFowa4EXhTIICHyOorkEQ5kC4jn4D1b/Or21A+ Kozk9/CUodu/nok8NBWD0+k5fcWVn8spfZseCblBHjVJXwWY3h0w+wS23TtArsu1golDKi DB2p33NIclKpwMByF2osGXh4cOMHEIEJtWuXOWVIjDcG76xQdwO/KWnTFOWH01y9O5+jMu sGPkMchN/ra/w+dgzfchH38CebNn/0GxtiJYu5sbO8UyP1h45eO35Slh9Muzog== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=plD6H9Fq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b=plD6H9Fq; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B59D8163C2 X-Spam-Score: -3.12 X-Migadu-Scanner: scn0.migadu.com X-TUID: gv9/hf/Lhm1o --9BAZVEOvAa//l1w+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, > Here is version two of the patch (number 4/5) this time adding the updated xmonad and xmonad-contrib versions as new variables. I kept in the previous commit message of the changes relative to the current version (0.16), but wasn't sure if that was appropriate. The xmonad compile patch was added as a new patch and added to local.mk. It would be nice if we could use inheritance to avoid duplicated metadata. I implemented that on top of your changes in the attached patch, so when the time comes we can just delete xmonad and rename xmonad-next to xmonad. What do you think? > I don't use xmobar and wasn't sure about that, doesn't seem to have explicit dependencies on xmonad or xmonad-contrib. So I've left it as is, though I'm guessing would need to be rebased due to the line changes? I tested it and the new version works fine for me. Cheers, Lars --9BAZVEOvAa//l1w+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="xmonad-inherit.patch" diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 7a62dbeacb..67e113aaa2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -737,10 +737,10 @@ (define-public i3lock-fancy desktop environment.") (license license:expat))) -(define-public xmonad +(define-public xmonad-next (package - (name "xmonad") - (version "0.15") + (name "xmonad-next") + (version "0.17.0") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -748,21 +748,13 @@ (define-public xmonad "xmonad-" version ".tar.gz")) (sha256 (base32 - "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) - (patches (search-patches "xmonad-dynamic-linking.patch")))) + "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) + (patches (search-patches "xmonad-next-dynamic-linking.patch")))) (build-system haskell-build-system) - (inputs - (list ghc-extensible-exceptions - ghc-data-default - ghc-quickcheck - ghc-semigroups - ghc-setlocale - ghc-utf8-string - ghc-x11)) + (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) + (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) (arguments - `(#:cabal-revision - ("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'install 'install-xsession @@ -790,50 +782,32 @@ (define-public xmonad tiled on several screens.") (license license:bsd-3))) -(define-public xmonad-next +(define-public xmonad (package - (name "xmonad-next") - (version "0.17.0") - (synopsis "Tiling window manager") + (inherit xmonad-next) + (name "xmonad") + (version "0.15") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad/" "xmonad-" version ".tar.gz")) (sha256 (base32 - "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) - (patches (search-patches "xmonad-next-dynamic-linking.patch")))) - (build-system haskell-build-system) - (inputs (list ghc-data-default-class ghc-setlocale ghc-x11)) - (native-inputs (list ghc-quickcheck ghc-quickcheck-classes)) + "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) + (patches (search-patches "xmonad-dynamic-linking.patch")))) + (inputs + (list ghc-extensible-exceptions + ghc-data-default + ghc-quickcheck + ghc-semigroups + ghc-setlocale + ghc-utf8-string + ghc-x11)) + (native-inputs '()) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after - 'install 'install-xsession - (lambda _ - (let* ((xsessions (string-append %output "/share/xsessions"))) - (mkdir-p xsessions) - (call-with-output-file - (string-append xsessions "/xmonad.desktop") - (lambda (port) - (format port "~ - [Desktop Entry]~@ - Name=~a~@ - Comment=~a~@ - Exec=~a/bin/xmonad~@ - Type=Application~%" ,name ,synopsis %output))))))))) - (home-page "https://xmonad.org") - (description - "Xmonad is a tiling window manager for X. Windows are arranged -automatically to tile the screen without gaps or overlap, maximising screen -use. All features of the window manager are accessible from the keyboard: a -mouse is strictly optional. Xmonad is written and extensible in Haskell. -Custom layout algorithms, and other extensions, may be written by the user in -config files. Layouts are applied dynamically, and different layouts may be -used on each workspace. Xinerama is fully supported, allowing windows to be -tiled on several screens.") - (license license:bsd-3))) + `(#:cabal-revision + ("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd") + ,@(package-arguments xmonad-next))))) (define-public xmobar (package @@ -908,30 +882,20 @@ (define-public yeganesh particular, it displays commonly-chosen options before uncommon ones.") (license license:bsd-3))) -(define-public ghc-xmonad-contrib +(define-public ghc-xmonad-contrib-next (package - (name "ghc-xmonad-contrib") - (version "0.16") + (name "ghc-xmonad-contrib-next") + (version "0.17.0") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad-contrib/" "xmonad-contrib-" version ".tar.gz")) (sha256 - (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) + (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011"))) - (propagated-inputs - (list ghc-old-time - ghc-random - ghc-utf8-string - ghc-extensible-exceptions - ghc-semigroups - ghc-x11 - ghc-x11-xft - xmonad)) + (propagated-inputs (list ghc-random ghc-x11 ghc-utf8-string ghc-x11-xft xmonad-next)) + (native-inputs (list ghc-quickcheck ghc-hspec)) (home-page "https://xmonad.org") (synopsis "Third party extensions for xmonad") (description @@ -939,26 +903,32 @@ (define-public ghc-xmonad-contrib tiling window manager for X.") (license license:bsd-3))) -(define-public ghc-xmonad-contrib-next +(define-public ghc-xmonad-contrib (package - (name "ghc-xmonad-contrib-next") - (version "0.17.0") + (inherit ghc-xmonad-contrib-next) + (name "ghc-xmonad-contrib") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "mirror://hackage/package/xmonad-contrib/" "xmonad-contrib-" version ".tar.gz")) (sha256 - (base32 "11g1cyfgfvcmz35qhgi9wzxrk3br8m8b7qy3jvph4nnf6aj13wvy")))) - (build-system haskell-build-system) - (propagated-inputs (list ghc-random ghc-x11 ghc-utf8-string ghc-x11-xft xmonad-next)) - (native-inputs (list ghc-quickcheck ghc-hspec)) - (home-page "https://xmonad.org") - (synopsis "Third party extensions for xmonad") - (description - "Third party tiling algorithms, configurations, and scripts to Xmonad, a -tiling window manager for X.") - (license license:bsd-3))) + (base32 "1pddgkvnbww28wykncc7j0yb0lv15bk7xnnhdcbrwkxzw66w6wmd")))) + (arguments + `(#:cabal-revision + ("1" "0vimkby2gq6sgzxzbvz67caba609xqlv2ii2gi8a1cjrnn6ib011") + ,@(package-arguments ghc-xmonad-contrib-next))) + (native-inputs '()) + (propagated-inputs + (list ghc-old-time + ghc-random + ghc-utf8-string + ghc-extensible-exceptions + ghc-semigroups + ghc-x11 + ghc-x11-xft + xmonad)))) (define-public evilwm (package --9BAZVEOvAa//l1w+--