toothbrush pushed a commit to branch master
in repository guix.
commit ca80b8ba158e714092827a28a201e4c4f4e50983
Author: Paul van der Walt <[email protected]>
Date: Wed Oct 14 22:26:55 2015 +0200
gnu: xmonad: Patch for updated libraries.
* gnu/packages/wm.scm (xmonad): Replicate patch from Hackage to compile
against GHC 7.10.2.
---
gnu/packages/wm.scm | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 58d7add..117088e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Siniša Biđin <[email protected]>
;;; Copyright © 2015 Eric Bavier <[email protected]>
;;; Copyright © 2015 xd1le <[email protected]>
+;;; Copyright © 2015 Paul van der Walt <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -191,10 +192,19 @@ developers.")
(source (origin
(method url-fetch)
(uri (string-append "http://hackage.haskell.org/package/xmonad/";
- "xmonad-" version ".tar.gz"))
+ name "-" version ".tar.gz"))
(sha256
(base32
- "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r"))))
+ "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")))))
(build-system haskell-build-system)
(inputs
`(("ghc-mtl" ,ghc-mtl)
