From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Bavier <ericbavier@openmailbox.org>
Subject: Re: [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
Date: Mon, 19 Oct 2015 08:36:08 -0500
Message-ID: <20151019083608.2115296f@openmailbox.org>
References: <1444911697-15515-1-git-send-email-paul@denknerd.org>
	<1444911697-15515-3-git-send-email-paul@denknerd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56600)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ericbavier@openmailbox.org>) id 1ZoFB8-0000NS-Fn
	for guix-devel@gnu.org; Mon, 19 Oct 2015 14:29:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ericbavier@openmailbox.org>) id 1ZoFB4-0001Yi-Ka
	for guix-devel@gnu.org; Mon, 19 Oct 2015 14:29:02 -0400
Received: from smtp20.openmailbox.org ([62.4.1.54]:44550)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ericbavier@openmailbox.org>) id 1ZoFB4-0001YU-Bv
	for guix-devel@gnu.org; Mon, 19 Oct 2015 14:28:58 -0400
In-Reply-To: <1444911697-15515-3-git-send-email-paul@denknerd.org>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Paul van der Walt <paul@denknerd.org>
Cc: guix-devel@gnu.org

On Thu, 15 Oct 2015 14:20:57 +0200
Paul van der Walt <paul@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(-)
>=20
> 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 =C2=A9 2015 Eric Dvorsak <eric@dvorsak.fr>
>  ;;; Copyright =C2=A9 2015 Sini=C5=A1a Bi=C4=91in <sinisa@bidin.eu>
>  ;;; Copyright =C2=A9 2015 Eric Bavier <bavier@member.fsf.org>
> +;;; Copyright =C2=A9 2015 Paul van der Walt <paul@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 _