[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/153: gnu: xmonad: Patch for updated libraries.
From: |
Paul |
Subject: |
05/153: gnu: xmonad: Patch for updated libraries. |
Date: |
Thu, 22 Oct 2015 10:10:54 +0000 |
toothbrush pushed a commit to branch wip-haskell-platform-7.10.2-a
in repository guix.
commit 3d454d9b874549a85717654fc4735c55e55eb17f
Author: Paul van der Walt <address@hidden>
Date: Wed Oct 14 22:26:55 2015 +0200
gnu: xmonad: Patch for updated libraries.
* gnu/packages/wm.scm (xmonad): Fetch cabal patch to compile against GHC
7.10.2.
---
gnu/packages/wm.scm | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e0859cc..f48e913 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Siniša Biđin <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 xd1le <address@hidden>
+;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -190,7 +191,7 @@ 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"))))
@@ -203,6 +204,16 @@ developers.")
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-before
+ 'configure 'update-cabal
+ (lambda _
+ ;; 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"))))
(add-after
'install 'install-xsession
(lambda _
- branch wip-haskell-platform-7.10.2-a created (now c371bb8), Paul, 2015/10/22
- 01/153: gnu: ghc: Update to 7.10.2., Paul, 2015/10/22
- 02/153: gnu: ghc-mtl: Update to 2.2.1., Paul, 2015/10/22
- 03/153: gnu: ghc-utf8-string: Update to 1.0.1.1., Paul, 2015/10/22
- 04/153: gnu: Add ghc-old-locale., Paul, 2015/10/22
- 05/153: gnu: xmonad: Patch for updated libraries.,
Paul <=
- 11/153: gnu: ghc-hashable: Update to 1.2.3.3., Paul, 2015/10/22
- 16/153: gnu: ghc-network: Update to 2.6.2.1., Paul, 2015/10/22
- 08/153: gnu: ghc-dlist: Update to 0.7.1.2., Paul, 2015/10/22
- 06/153: gnu: Add ghc-old-time., Paul, 2015/10/22
- 17/153: gnu: ghc-http: Update to 4000.2.20., Paul, 2015/10/22
- 10/153: gnu: ghc-text: Update to 1.2.1.3., Paul, 2015/10/22
- 09/153: gnu: ghc-dlist: Enable tests., Paul, 2015/10/22
- 12/153: gnu: ghc-primitive: Update to 0.6.1.0., Paul, 2015/10/22
- 13/153: gnu: ghc-quickcheck: Update to 2.8.1., Paul, 2015/10/22
- 07/153: gnu: ghc-xmonad-contrib: Update to version 0.11.4., Paul, 2015/10/22