From patchwork Tue Dec 28 10:24:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 35747 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 87BA827BBEA; Tue, 28 Dec 2021 10:25:19 +0000 (GMT) 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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 F226027BBE9 for ; Tue, 28 Dec 2021 10:25:18 +0000 (GMT) Received: from localhost ([::1]:33092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n29fR-0002gr-TX for patchwork@mira.cbaines.net; Tue, 28 Dec 2021 05:25:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n29fC-0002dm-7t for guix-patches@gnu.org; Tue, 28 Dec 2021 05:25:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n29fB-0007Xk-P5 for guix-patches@gnu.org; Tue, 28 Dec 2021 05:25:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n29fB-0006XE-MS for guix-patches@gnu.org; Tue, 28 Dec 2021 05:25:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52784] [PATCH 0/5] Update XMonad (and add new dependencies) Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Dec 2021 10:25:01 +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.164068708925094 (code B ref 52784); Tue, 28 Dec 2021 10:25:01 +0000 Received: (at 52784) by debbugs.gnu.org; 28 Dec 2021 10:24:49 +0000 Received: from localhost ([127.0.0.1]:45163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n29ey-0006We-LX for submit@debbugs.gnu.org; Tue, 28 Dec 2021 05:24:49 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:32704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n29eu-0006WJ-Th for 52784@debbugs.gnu.org; Tue, 28 Dec 2021 05:24:47 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:105:465:1:3: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-102.mailbox.org (Postfix) with ESMTPS id 4JNVyZ4jv4zQkcj; Tue, 28 Dec 2021 11:24:38 +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=1640687076; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HG7CKjv1EH2DQBu7fMf5n+wP3xAiHML7kUt+2N8qMz8=; b=pKXo9N32RXrYxngB5IyxkRAvq2gQS5ANbqubKVN6VmoBRKSaoFuHMaK3rt2ukW2Mfwn1uG hd/moutVUlVOuxp2+mpvuJxYsC7ziOl1H2Hht5m8HTcbXtnMBKmcWaNqjaAwZLh/DCaGvB miHkqVl13fjhkmfJ2B9d9pk0YsqDdjj4Ea+EcFdTTCVFpErnx0GlaY8rYBkSO4A3YWhErg rfUFvoOAwLM4pny4YT7l8yvIYdcoIIAwYynWpkej1N4aMPjcA3aksRTVCtAdl/tcqC+qff WNGB+I+l7mqX5Pd30eyB00+hKOn2xOFxYkmw1/lC/VkGXOz0nSdObUfRSVMF3w== Date: Tue, 28 Dec 2021 11:24:33 +0100 From: Lars-Dominik Braun Message-ID: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi John, thanks for your patches. I also upgraded xmonad locally (see attached patch), but I didn’t need the version bumps/new packages (i.e. xmonad’s test suite builds and runs fine). Are they really necessary? > Note that this new version has breaking configuration changes, detailed in their announcement: https://xmonad.org/news/2021/10/27/xmonad-0-17-0.html Is that worth a news entry for guix pull? It has been a long time since xmonad released a new version, for those that stay on the stable release. I was also hesitant to push the new version for this reason. Additionally xmonad is part of Stackage, which we use where possible. How about adding a xmonad-next package instead and make the switch when Stackage includes the new version? Cheers, Lars commit 0b099048a1f4c8aaf9a7830e089ff2e085a7ca92 Author: Lars-Dominik Braun Date: Thu Nov 18 09:30:48 2021 +0100 dirty: xmonad upgrade diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch b/gnu/packages/patches/xmonad-dynamic-linking.patch index 4f3386e53a..0aa91954ee 100644 --- a/gnu/packages/patches/xmonad-dynamic-linking.patch +++ b/gnu/packages/patches/xmonad-dynamic-linking.patch @@ -2,15 +2,15 @@ This patch is required for xmonad to make use of shared libraries. Without it, xmonad will not work since we do not (by default) use statically linked Haskell libraries. -diff -ruN xmonad-0.15-a/src/XMonad/Core.hs xmonad-0.15-b/src/XMonad/Core.hs ---- xmonad-0.15-a/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -+++ xmonad-0.15-b/src/XMonad/Core.hs 1969-12-31 19:00:00.000000000 -0500 -@@ -681,6 +681,8 @@ - compileGHC bin dir errHandle = - runProcess "ghc" ["--make" - , "xmonad.hs" -+ , "-dynamic" -+ , "-fPIC" - , "-i" - , "-ilib" - , "-fforce-recomp" +diff -Naur xmonad-0.17.0.orig/src/XMonad/Core.hs xmonad-0.17.0/src/XMonad/Core.hs +--- xmonad-0.17.0.orig/src/XMonad/Core.hs 2001-09-09 03:46:40.000000000 +0200 ++++ xmonad-0.17.0/src/XMonad/Core.hs 2021-11-13 10:40:17.840524866 +0100 +@@ -664,6 +664,8 @@ + where + ghcArgs = [ "--make" + , "xmonad.hs" ++ , "-dynamic" ++ , "-fPIC" + , "-i" -- only look in @lib@ + , "-ilib" + , "-fforce-recomp" diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index c6881154fe..d661307c4f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -739,7 +739,7 @@ (define-public i3lock-fancy (define-public xmonad (package (name "xmonad") - (version "0.15") + (version "0.17.0") (synopsis "Tiling window manager") (source (origin (method url-fetch) @@ -747,7 +747,7 @@ (define-public xmonad "xmonad-" version ".tar.gz")) (sha256 (base32 - "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa")) + "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy")) (patches (search-patches "xmonad-dynamic-linking.patch")))) (build-system haskell-build-system) (inputs @@ -759,9 +759,7 @@ (define-public xmonad ghc-utf8-string ghc-x11)) (arguments - `(#:cabal-revision - ("1" "0yqh96qqphllr0zyz5j93cij5w2qvf39xxnrb52pz0qz3pywz9wd") - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'install 'install-xsession @@ -865,18 +863,15 @@ (define-public yeganesh (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.16") + (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 @@ -886,6 +881,8 @@ (define-public ghc-xmonad-contrib ghc-x11 ghc-x11-xft xmonad)) + (native-inputs + (list ghc-quickcheck ghc-hspec hspec-discover)) (home-page "https://xmonad.org") (synopsis "Third party extensions for xmonad") (description