commit d0e39d8316f6c935a8710482db617253c8824e6c Author: Mekeor Melire <mekeor.mel...@gmail.com> Date: Sat Jan 21 21:08:11 2017 +0100
gnu: xmonad: Update to version 0.12. * gnu/packages/wm.scm (xmonad): Update to 0.12. * gnu/packages/wm.scm (ghc-xmonad-contrib): Update to 0.12. * gnu/packages/haskell.scm (ghc-setlocale): Added 1.0.0.4 which was required by xmonad 0.12. diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index f28009f17..d0651b963 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1607,6 +1607,23 @@ UTF8 without truncation.") environment variables.") (license license:expat))) +(define-public ghc-setlocale + (package + (name "ghc-setlocale") + (version "1.0.0.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/setlocale-" + version "/setlocale-" version ".tar.gz")) + (sha256 (base32 + "1sd73zgpijr9xjdj5p562cmlcxmx5iff5k8xh9b6rpcgrgnnlf9j")))) + (build-system haskell-build-system) + (home-page "https://hackage.haskell.org/package/setlocale") + (synopsis "Haskell bindings to setlocale") + (description "Haskell bindings to setlocale") + (license license:bsd-3))) + (define-public ghc-x11 (package (name "ghc-x11") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5b761e81b..f16bf151e 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -320,30 +320,22 @@ prompt.") (define-public xmonad (package (name "xmonad") - (version "0.11.1") + (version "0.12") (synopsis "Tiling window manager") (source (origin - (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r")) - (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"))))) + (method url-fetch) + (uri (string-append + "mirror://hackage/package/xmonad/xmonad-" version ".tar.gz")) + (sha256 (base32 + "1mzx3p17ppgmi30q3phaj58x6kxn73pbbkn9v9gzgmd8skdlkxp8")))) (build-system haskell-build-system) (inputs - `(("ghc-mtl" ,ghc-mtl) - ("ghc-utf8-string" ,ghc-utf8-string) - ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) - ("ghc-x11" ,ghc-x11))) + `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions) + ("ghc-mtl" ,ghc-mtl) + ("ghc-quickcheck" ,ghc-quickcheck) + ("ghc-setlocale" ,ghc-setlocale) + ("ghc-utf8-string" ,ghc-utf8-string) + ("ghc-x11" ,ghc-x11))) (arguments `(#:phases (modify-phases %standard-phases @@ -376,15 +368,15 @@ tiled on several screens.") (define-public ghc-xmonad-contrib (package (name "ghc-xmonad-contrib") - (version "0.11.4") + (version "0.12") (source (origin (method url-fetch) - (uri (string-append "mirror://hackage/package/xmonad-contrib/" - "xmonad-contrib-" version ".tar.gz")) + (uri (string-append + "mirror://hackage/package/xmonad-contrib/xmonad-contrib-" version ".tar.gz")) (sha256 (base32 - "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3")))) + "04gk449dxwmimmb6y2d2hvvmv91r91xlj879qzlyq0mcf723278k")))) (build-system haskell-build-system) (propagated-inputs `(("ghc-mtl" ,ghc-mtl)