From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: "52784@debbugs.gnu.org" <52784@debbugs.gnu.org>
Subject: [bug#52784] [PATCH 4/5] Update XMonad (and add new dependencies)
Date: Fri, 24 Dec 2021 19:29:44 +0000 [thread overview]
Message-ID: <o8sa3Dy9BpHvdiUNX2bS3mCKYBMHVEdtWebUO2VuLjCXALBqeFBvMnCteh6M60Y8ncEVLaGI__lRdQgXivA6nW-4JDxSF1tPwRvLFfZf0jc=@protonmail.com> (raw)
In-Reply-To: <Za9d3f8yx-cBVXBqMap5HWIudwcVR6SvNkO_m2pQ5pPNM9UE4C4pqLBuUJpUOG8AoCVwVztLo84Rtt-kXRU5dq8qYZ4P8g5Uj1K1_C3AwJU=@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 13 bytes --]
Empty Message
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-xmonad-Update-to-0.17.0.patch --]
[-- Type: text/x-patch; name=0004-gnu-xmonad-Update-to-0.17.0.patch, Size: 5150 bytes --]
From f48d7d5c2ff1b65a0a95b33acfae17d3fb540ddb Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 24 Dec 2021 13:55:37 -0500
Subject: [PATCH 4/5] gnu: xmonad: Update to 0.17.0.
* gnu/packages/wm.scm (xmonad): Update to 0.17.0.
[inputs]: Add GHC-DATA-DEFAULT-CLASS, remove GHC-EXTENSIBLE-EXCEPTIONS,
GHC-DATA-DEFAULT, GHC-SEMIGROUPS, and GHC-UTF8-STRING.
[native-inputs]: Add GHC-QUICKCHECK and GHC-QUICKCHECK-CLASSES.
(ghc-xmonad-contrib): Update to 0.17.0.
[propagated-inputs]: Remove GHC-OLD-TIME, GHC-EXTENSIBLE-EXCEPTIONS,
GHC-SEMIGROUPS.
[native-inputs]: Add GHC-QUICKCHECK and GHC-HSPEC.
* gnu/packages/patches/xmonad-dynamic-linking.patch: Update patch.
---
.../patches/xmonad-dynamic-linking.patch | 24 ++++++------
gnu/packages/wm.scm | 37 +++++--------------
2 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/patches/xmonad-dynamic-linking.patch b/gnu/packages/patches/xmonad-dynamic-linking.patch
index 4f3386e53a..a1d71825b6 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"
+index 46a0939..5ad4f8f 100644
+--- a/src/XMonad/Core.hs
++++ b/src/XMonad/Core.hs
+@@ -664,6 +664,8 @@ compile dirs method =
+ 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..2aa7309027 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -48,6 +48,7 @@
;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Disseminate Dissent <disseminatedissent@protonmail.com>
+;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -739,7 +740,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,21 +748,13 @@ (define-public xmonad
"xmonad-" version ".tar.gz"))
(sha256
(base32
- "0a7rh21k9y6g8fwkggxdxjns2grvvsd5hi2ls4klmqz5xvk4hyaa"))
+ "04qspdz9w6xpw1npcmx2zx0595wc68q985pv4i0hvp32zillvdqy"))
(patches (search-patches "xmonad-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
@@ -865,27 +858,17 @@ (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
- 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))
+ (native-inputs (list ghc-quickcheck ghc-hspec))
(home-page "https://xmonad.org")
(synopsis "Third party extensions for xmonad")
(description
--
2.34.1
next prev parent reply other threads:[~2021-12-24 19:30 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 ` John Kehayias via Guix-patches via [this message]
2021-12-24 19:30 ` [bug#52784] [PATCH 5/5] " John Kehayias via Guix-patches via
2021-12-28 10:24 ` [bug#52784] [PATCH 0/5] " Lars-Dominik Braun
2021-12-28 19:15 ` 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='o8sa3Dy9BpHvdiUNX2bS3mCKYBMHVEdtWebUO2VuLjCXALBqeFBvMnCteh6M60Y8ncEVLaGI__lRdQgXivA6nW-4JDxSF1tPwRvLFfZf0jc=@protonmail.com' \
--to=guix-patches@gnu.org \
--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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).