On Thu, 15 Oct 2015 14:20:57 +0200 Paul van der Walt <p...@denknerd.org> wrote:
> * gnu/packages/wm.scm (xmonad): Fetch cabal patch to compile against GHC > 7.10.2. > --- > gnu/packages/wm.scm | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index 9ca5b96..f2de576 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -2,6 +2,7 @@ > ;;; Copyright © 2015 Eric Dvorsak <e...@dvorsak.fr> > ;;; Copyright © 2015 Siniša Biđin <sin...@bidin.eu> > ;;; Copyright © 2015 Eric Bavier <bav...@member.fsf.org> > +;;; Copyright © 2015 Paul van der Walt <p...@denknerd.org> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -165,10 +166,23 @@ developers.") > `(("ghc-mtl" ,ghc-mtl) > ("ghc-utf8-string" ,ghc-utf8-string) > ("ghc-extensible-exceptions" ,ghc-extensible-exceptions) > - ("ghc-x11" ,ghc-x11))) > + ("ghc-x11" ,ghc-x11) > + ("xmonad-cabal-patch" > + ,(origin > + (method url-fetch) > + (uri (string-append > + "https://hackage.haskell.org/package/xmonad-" version > "/revision/1.cabal")) > + (sha256 > + (base32 > + "0gdzsn2mv45i67wzmcjxyljr2w9fccc19n0i0f69mwvwcgi9v10j")))))) Could this instead be formulated as a patch, rather than a complete file overwrite? A diff would help in understanding the rationale for the change. > (arguments > `(#:phases > (modify-phases %standard-phases > + (add-before > + 'configure 'update-cabal > + (lambda* _ > + (copy-file (assoc-ref %build-inputs "xmonad-cabal-patch") > + "xmonad.cabal"))) > (add-after > 'install 'install-xsession > (lambda _