From: Lars-Dominik Braun <lars@6xq.net>
To: John Kehayias <john.kehayias@protonmail.com>
Cc: 52784@debbugs.gnu.org
Subject: [bug#52784] [PATCH 0/5] Update XMonad (and add new dependencies)
Date: Tue, 28 Dec 2021 11:24:33 +0100 [thread overview]
Message-ID: <Ycrl4T40hbpOuqc6@noor.fritz.box> (raw)
In-Reply-To: <Za9d3f8yx-cBVXBqMap5HWIudwcVR6SvNkO_m2pQ5pPNM9UE4C4pqLBuUJpUOG8AoCVwVztLo84Rtt-kXRU5dq8qYZ4P8g5Uj1K1_C3AwJU=@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 769 bytes --]
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
[-- Attachment #2: xmonad-0.17-dirty.patch --]
[-- Type: text/x-diff, Size: 3873 bytes --]
commit 0b099048a1f4c8aaf9a7830e089ff2e085a7ca92
Author: Lars-Dominik Braun <lars@6xq.net>
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
next prev parent reply other threads:[~2021-12-28 10:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-24 19:22 [bug#52784] [PATCH 0/5] Update XMonad (and add new dependencies) John Kehayias via Guix-patches via
2021-12-24 19:28 ` [bug#52784] [PATCH 1/5] " John Kehayias via Guix-patches via
2021-12-24 19:29 ` [bug#52784] [PATCH 2/5] " John Kehayias via Guix-patches via
2021-12-24 19:29 ` [bug#52784] [PATCH 3/5] " John Kehayias via Guix-patches via
2021-12-24 19:29 ` [bug#52784] [PATCH 4/5] " John Kehayias via Guix-patches via
2021-12-24 19:30 ` [bug#52784] [PATCH 5/5] " John Kehayias via Guix-patches via
2021-12-28 10:24 ` Lars-Dominik Braun [this message]
2021-12-28 19:15 ` [bug#52784] [PATCH 0/5] " John Kehayias via Guix-patches via
2022-01-10 1:54 ` [bug#52784] [PATCH 4/5 v2] Add xmonad-next and ghc-xmonad-contrib-next John Kehayias via Guix-patches via
2022-01-15 10:38 ` Lars-Dominik Braun
2022-01-15 18:49 ` John Kehayias via Guix-patches via
2022-01-17 19:32 ` bug#52784: " Lars-Dominik Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Ycrl4T40hbpOuqc6@noor.fritz.box \
--to=lars@6xq.net \
--cc=52784@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.