From: Lars-Dominik Braun <lars@6xq.net>
To: John Kehayias <john.kehayias@protonmail.com>
Cc: 52784@debbugs.gnu.org
Subject: [bug#52784] [PATCH 4/5 v2] Add xmonad-next and ghc-xmonad-contrib-next.
Date: Sat, 15 Jan 2022 11:38:57 +0100 [thread overview]
Message-ID: <YeKkQRi9Xa3ucwx3@noor.fritz.box> (raw)
In-Reply-To: <bzkz_nwtjgQCFbilnKcQWQDhKNY1tuWNmZJsSmoI5nicxtAypsQqEMeaYhyxjtd0Qiu3ZuyHafzS1lkD7A2NrToJm8ipDlzJq8VJ5JQc858=@protonmail.com>
[-- Attachment #1: Type: text/plain, Size: 866 bytes --]
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
[-- Attachment #2: xmonad-inherit.patch --]
[-- Type: text/plain, Size: 7311 bytes --]
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
next prev parent reply other threads:[~2022-01-15 10:40 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 ` [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 [this message]
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=YeKkQRi9Xa3ucwx3@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 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).