nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: xmonad: Update to 0.12. 

* gnu/packages/wm.scm (xmonad): Update to 0.12.
[source](snippet, modules): Remove.
[inputs]: Add GHC-SETLOCALE and GHC-QUICKCHECK.
(ghc-xmonad-contrib): Update to 0.12.
This commit is contained in:
Mekeor Melire 2017-01-23 10:48:51 +01:00 committed by Ludovic Courtès
parent c7bdb4139d
commit 174b091fb7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/wm.scm
View File

@ -12,6 +12,7 @@
;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2016 doncatnip <gnopap@gmail.com> ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net> ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -320,7 +321,7 @@ prompt.")
(define-public xmonad (define-public xmonad
(package (package
(name "xmonad") (name "xmonad")
(version "0.11.1") (version "0.12")
(synopsis "Tiling window manager") (synopsis "Tiling window manager")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -328,22 +329,15 @@ prompt.")
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r")) "1mzx3p17ppgmi30q3phaj58x6kxn73pbbkn9v9gzgmd8skdlkxp8"))))
(modules '((guix build utils)))
(snippet
;; Here we update the constraints on the utf8-string package in
;; the Cabal file. We allow a newer version which is compatible
;; with GHC 7.10.2. The same change is applied on Hackage. See
;; <https://hackage.haskell.org/package/xmonad-0.11.1/revisions/>.
'(substitute* "xmonad.cabal"
(("utf8-string >= 0.3 && < 0.4")
"utf8-string >= 0.3 && < 1.1")))))
(build-system haskell-build-system) (build-system haskell-build-system)
(inputs (inputs
`(("ghc-mtl" ,ghc-mtl) `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
("ghc-utf8-string" ,ghc-utf8-string) ("ghc-mtl" ,ghc-mtl)
("ghc-extensible-exceptions" ,ghc-extensible-exceptions) ("ghc-quickcheck" ,ghc-quickcheck)
("ghc-x11" ,ghc-x11))) ("ghc-setlocale" ,ghc-setlocale)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-x11" ,ghc-x11)))
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -376,7 +370,7 @@ tiled on several screens.")
(define-public ghc-xmonad-contrib (define-public ghc-xmonad-contrib
(package (package
(name "ghc-xmonad-contrib") (name "ghc-xmonad-contrib")
(version "0.11.4") (version "0.12")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -384,7 +378,7 @@ tiled on several screens.")
"xmonad-contrib-" version ".tar.gz")) "xmonad-contrib-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3")))) "04gk449dxwmimmb6y2d2hvvmv91r91xlj879qzlyq0mcf723278k"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(propagated-inputs (propagated-inputs
`(("ghc-mtl" ,ghc-mtl) `(("ghc-mtl" ,ghc-mtl)