From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:36427)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hTnlL-0006gA-B9
	for guix-patches@gnu.org; Thu, 23 May 2019 09:28:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hTnlK-0008S4-C8
	for guix-patches@gnu.org; Thu, 23 May 2019 09:28:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:58785)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1hTnlK-0008Ro-8r
	for guix-patches@gnu.org; Thu, 23 May 2019 09:28:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hTnlK-0001mS-3T
	for guix-patches@gnu.org; Thu, 23 May 2019 09:28:02 -0400
Subject: [bug#35859] fixed patch set, including test fixes
References: <72F268CC-5FB7-421C-B6F7-B47EAAB823C1@vllmrt.net>
In-Reply-To: <72F268CC-5FB7-421C-B6F7-B47EAAB823C1@vllmrt.net>
Resent-Message-ID: <handler.35859.B35859.15586180576809@debbugs.gnu.org>
From: Robert Vollmert <rob@vllmrt.net>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0"
Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\))
Message-Id: <87D104D2-375D-4F1E-B32D-AAE5B6A2A442@vllmrt.net>
Date: Thu, 23 May 2019 15:27:04 +0200
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 35859@debbugs.gnu.org


--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

The previous version of this patch caused some test failures due
to conflict with the hackage-fetch mocking in tests/hackage.scm.

This set reworks the tests to not mock, and incorporates updated
versions of the previous patch sets

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35812
 (fix cabal tests)

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=35846
 (braced properties)


--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0001-tests-fix-cabal-tests-to-test-and-pass.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0001-tests-fix-cabal-tests-to-test-and-pass.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=208b6dac85a9f6c4e851c1a75a4958dff7915fb2f1=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2010:48:42=20+0200=0ASubject:=20[PATCH=2001/11]=20=
tests:=20fix=20cabal=20tests=20to=20test=20and=20pass=0A=0A*=20=
guix/import/hackage.scm:=20export=20unmemoized=20import=20function=0A*=20=
tests/hackage.scm:=20use=20unmemoized=20import=20function=20to=20make=20=
tests=20independent=0A*=20tests/hackage.scm:=20fix=20failing=20=
test-cabal-6=20by=20providing=20expected=20output=0A---=0A=20=
guix/import/hackage.scm=20|=2031=20+++++++++++++++++--------------=0A=20=
tests/hackage.scm=20=20=20=20=20=20=20|=2039=20=
++++++++++++++++++++++++++++++++++++---=0A=202=20files=20changed,=2053=20=
insertions(+),=2017=20deletions(-)=0A=0Adiff=20--git=20=
a/guix/import/hackage.scm=20b/guix/import/hackage.scm=0Aindex=20=
2a51420d14..5b80a7ea1d=20100644=0A---=20a/guix/import/hackage.scm=0A+++=20=
b/guix/import/hackage.scm=0A@@=20-40,6=20+40,7=20@@=0A=20=20=20=
#:use-module=20(guix=20packages)=0A=20=20=20#:use-module=20((guix=20=
utils)=20#:select=20(call-with-temporary-output-file))=0A=20=20=20=
#:export=20(hackage->guix-package=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
hackage->guix-package-impl=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
hackage-recursive-import=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
%hackage-updater=0A=20=0A@@=20-277,13=20+278,12=20@@=20representation=20=
of=20a=20Cabal=20file=20as=20produced=20by=20'read-cabal'."=0A=20=20=20=20=
=20=20=20=20=20(license=20,(string->license=20(cabal-package-license=20=
cabal))))=0A=20=20=20=20=20=20(append=20hackage-dependencies=20=
hackage-native-dependencies))))=0A=20=0A-(define=20hackage->guix-package=0A=
-=20=20(memoize=0A-=20=20=20(lambda*=20(package-name=20#:key=0A-=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(include-test-dependencies?=20#t)=0A-=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20(port=20#f)=0A-=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(cabal-environment=20'()))=0A-=20=20=20=20=20"Fetch=20the=20Cabal=20file=20=
for=20PACKAGE-NAME=20from=20hackage.haskell.org,=20or,=20if=20the=0A=
+(define=20hackage->guix-package-impl=0A+=20=20(lambda*=20(package-name=20=
#:key=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(include-test-dependencies?=20#t)=0A+=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(port=20#f)=0A+=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(cabal-environment=20'()))=0A+=20=20=20"Fetch=20the=20Cabal=20file=20for=20=
PACKAGE-NAME=20from=20hackage.haskell.org,=20or,=20if=20the=0A=20called=20=
with=20keyword=20parameter=20PORT,=20from=20PORT.=20=20Return=20the=20=
`package'=0A=20S-expression=20corresponding=20to=20that=20package,=20or=20=
#f=20on=20failure.=0A=20CABAL-ENVIRONMENT=20is=20an=20alist=20defining=20=
the=20environment=20in=20which=20the=20Cabal=0A@@=20-293,13=20+293,16=20=
@@=20symbol=20'true'=20or=20'false'.=20=20The=20value=20associated=20=
with=20other=20keys=20has=20to=20conform=0A=20to=20the=20Cabal=20file=20=
format=20definition.=20=20The=20default=20value=20associated=20with=20=
the=0A=20keys=20\"os\",=20\"arch\"=20and=20\"impl\"=20is=20\"linux\",=20=
\"x86_64\"=20and=20\"ghc\"=0A=20respectively."=0A-=20=20=20=20=20(let=20=
((cabal-meta=20(if=20port=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(read-cabal=20=
(canonical-newline-port=20port))=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20(hackage-fetch=20=
package-name))))=0A-=20=20=20=20=20=20=20(and=3D>=20cabal-meta=20=
(compose=20(cut=20hackage-module->sexp=20<>=0A-=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20#:include-test-dependencies?=0A-=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20include-test-dependencies?)=0A-=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(cut=20eval-cabal=20<>=20cabal-environment)))))))=0A+=20=20=20(let=20=
((cabal-meta=20(if=20port=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(read-cabal=20(canonical-newline-port=20=
port))=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20(hackage-fetch=20package-name))))=0A+=20=20=20=20=20(and=3D>=20=
cabal-meta=20(compose=20(cut=20hackage-module->sexp=20<>=0A+=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20#:include-test-dependencies?=0A+=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20include-test-dependencies?)=0A+=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(cut=20eval-cabal=20<>=20cabal-environment))))))=0A+=0A+(define=20=
hackage->guix-package=0A+=20=20(memoize=20hackage->guix-package-impl))=0A=
=20=0A=20(define*=20(hackage-recursive-import=20package-name=20.=20args)=0A=
=20=20=20(recursive-import=20package-name=20#f=0Adiff=20--git=20=
a/tests/hackage.scm=20b/tests/hackage.scm=0Aindex=20=
e17851a213..e56aa996d6=20100644=0A---=20a/tests/hackage.scm=0A+++=20=
b/tests/hackage.scm=0A@@=20-161,7=20+161,7=20@@=20library=0A=20=20=20=20=20=
(lambda=20(name-version)=0A=20=20=20=20=20=20=20(call-with-input-string=20=
test-cabal=0A=20=20=20=20=20=20=20=20=20read-cabal)))=0A-=20=20=20(match=20=
(hackage->guix-package=20"foo"=20#:cabal-environment=20=
cabal-environment)=0A+=20=20=20(match=20(hackage->guix-package-impl=20=
"foo"=20#:cabal-environment=20cabal-environment)=0A=20=20=20=20=20=20=
(('package=0A=20=20=20=20=20=20=20=20=20('name=20"ghc-foo")=0A=20=20=20=20=
=20=20=20=20=20('version=20"1.0.0")=0A@@=20-207,8=20+207,41=20@@=20=
library=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20#:cabal-environment=20'(("impl"=20.=20"ghc-7.8"))))=0A=20=0A=20=
(test-assert=20"hackage->guix-package=20test=206"=0A-=20=20=
(eval-test-with-cabal=20test-cabal-6=0A-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20#:cabal-environment=20'(("impl"=20=
.=20"ghc-7.8"))))=0A+=20=20(mock=0A+=20=20=20((guix=20import=20hackage)=20=
hackage-fetch=0A+=20=20=20=20(lambda=20(name-version)=0A+=20=20=20=20=20=20=
(call-with-input-string=20test-cabal-6=0A+=20=20=20=20=20=20=20=20=
read-cabal)))=0A+=20=20=20(match=20(hackage->guix-package-impl=20"foo")=0A=
+=20=20=20=20=20(('package=0A+=20=20=20=20=20=20=20=20('name=20=
"ghc-foo")=0A+=20=20=20=20=20=20=20=20('version=20"1.0.0")=0A+=20=20=20=20=
=20=20=20=20('source=0A+=20=20=20=20=20=20=20=20=20('origin=0A+=20=20=20=20=
=20=20=20=20=20=20=20('method=20'url-fetch)=0A+=20=20=20=20=20=20=20=20=20=
=20=20('uri=20('string-append=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20"https://hackage.haskell.org/package/foo/foo-"=0A+=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20'version=0A+=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20".tar.gz"))=0A+=20=20=20=20=20=20=20=20=20=
=20=20('sha256=0A+=20=20=20=20=20=20=20=20=20=20=20=20('base32=0A+=20=20=20=
=20=20=20=20=20=20=20=20=20=20(?=20string?=20hash)))))=0A+=20=20=20=20=20=
=20=20=20('build-system=20'haskell-build-system)=0A+=20=20=20=20=20=20=20=
=20('inputs=0A+=20=20=20=20=20=20=20=20=20('quasiquote=0A+=20=20=20=20=20=
=20=20=20=20=20(("ghc-b"=20('unquote=20'ghc-b))=0A+=20=20=20=20=20=20=20=20=
=20=20=20("ghc-http"=20('unquote=20'ghc-http))=0A+=20=20=20=20=20=20=20=20=
=20=20=20("ghc-mtl"=20('unquote=20'ghc-mtl)))))=0A+=20=20=20=20=20=20=20=20=
('native-inputs=0A+=20=20=20=20=20=20=20=20=20('quasiquote=0A+=20=20=20=20=
=20=20=20=20=20=20(("ghc-haskell-gi"=20('unquote=20'ghc-haskell-gi)))))=0A=
+=20=20=20=20=20=20=20=20('home-page=20"http://test.org")=0A+=20=20=20=20=
=20=20=20=20('synopsis=20(?=20string?))=0A+=20=20=20=20=20=20=20=20=
('description=20(?=20string?))=0A+=20=20=20=20=20=20=20=20('license=20=
'bsd-3))=0A+=20=20=20=20=20=20#t)=0A+=20=20=20=20=20(x=0A+=20=20=20=20=20=
=20(pk=20'fail=20x=20#f)))))=0A=20=0A=20(test-assert=20"read-cabal=20=
test=201"=0A=20=20=20(match=20(call-with-input-string=20=
test-read-cabal-1=20read-cabal)=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0002-tests-hackage-test-multiline-cabal-description.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0002-tests-hackage-test-multiline-cabal-description.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=201a001cd80d8f5c3e763f8632e10f959775aa7887=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Sat,=2018=20May=202019=2003:37:43=20+0200=0ASubject:=20[PATCH=2002/11]=20=
tests:=20hackage:=20test=20multiline=20cabal=20description=0A=0A*=20=
tests/hackage.scm:=20Add=20test=20case=20with=20multi-line=20=
description.=0A---=0A=20tests/hackage.scm=20|=2019=20+++++++++++++++++++=0A=
=201=20file=20changed,=2019=20insertions(+)=0A=0Adiff=20--git=20=
a/tests/hackage.scm=20b/tests/hackage.scm=0Aindex=20=
e56aa996d6..41cea73fe7=20100644=0A---=20a/tests/hackage.scm=0A+++=20=
b/tests/hackage.scm=0A@@=20-128,6=20+128,21=20@@=20library=0A=20=20=20=20=
=20=20=20mtl=20=20=20=20=20=20=20=20>=3D=202.0=20=20=20=20=20=20&&=20<=20=
3=0A=20")=0A=20=0A+;;=20Check=20multi-line=20layouted=20description=0A=
+(define=20test-cabal-7=0A+=20=20"name:=20foo=0A+version:=201.0.0=0A=
+homepage:=20http://test.org=0A+synopsis:=20synopsis=0A+description:=20=20=
=20first=20line=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20second=20=
line=0A+license:=20BSD3=0A+executable=20cabal=0A+=20=20build-depends:=0A=
+=20=20=20=20HTTP=20=20=20=20=20=20=20>=3D=204000.2.5=20&&=20<=204000.3,=0A=
+=20=20=20=20mtl=20=20=20=20=20=20=20=20>=3D=202.0=20=20=20=20=20=20&&=20=
<=203=0A+")=0A+=0A=20;;=20A=20fragment=20of=20a=20real=20Cabal=20file=20=
with=20minor=20modification=20to=20check=20precedence=0A=20;;=20of=20=
'and'=20over=20'or',=20missing=20final=20newline,=20spaces=20between=20=
keywords=20and=0A=20;;=20parentheses=20and=20between=20key=20and=20=
column.=0A@@=20-243,6=20+258,10=20@@=20library=0A=20=20=20=20=20=20(x=0A=20=
=20=20=20=20=20=20(pk=20'fail=20x=20#f)))))=0A=20=0A+(test-assert=20=
"hackage->guix-package=20test=207"=0A+=20=20(eval-test-with-cabal=20=
test-cabal-7=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20#:cabal-environment=20'(("impl"=20.=20"ghc-7.8"))))=0A+=0A=
=20(test-assert=20"read-cabal=20test=201"=0A=20=20=20(match=20=
(call-with-input-string=20test-read-cabal-1=20read-cabal)=0A=20=20=20=20=20=
((("name"=20("test-me"))=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0003-guix-import-cabal-parse-braced-description-propertie.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0003-guix-import-cabal-parse-braced-description-propertie.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2059ab5435e3cb77831a97831d82f5ab419345719b=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2014:26:36=20+0200=0ASubject:=20[PATCH=2003/11]=20=
guix:=20import:=20cabal:=20parse=20braced=20description=0A=20properties=0A=
=0A*=20guix/import/cabal.scm:=20generalize=20property=20bracing=20to=20=
both=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20layouted=20and=20simple=20braced=20blocks=0A*=20=
guix/tests/hackage.scm:=20test=20braced=20description=20import=0A---=0A=20=
guix/import/cabal.scm=20|=2035=20++++++++++++++++++++++++++++-------=0A=20=
tests/hackage.scm=20=20=20=20=20|=2022=20++++++++++++++++++++++=0A=202=20=
files=20changed,=2050=20insertions(+),=207=20deletions(-)=0A=0Adiff=20=
--git=20a/guix/import/cabal.scm=20b/guix/import/cabal.scm=0Aindex=20=
13c2f3f48c..3028ed2882=20100644=0A---=20a/guix/import/cabal.scm=0A+++=20=
b/guix/import/cabal.scm=0A@@=20-270,6=20+270,10=20@@=20following=20lines=20=
with=20indentation=20larger=20than=20MIN-INDENT."=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(peek-next-line-indent=20port)))=0A=20=20=20=
=20=20=20=20=20=20val)))=0A=20=0A+(define*=20(read-braced-value=20port)=0A=
+=20=20"Read=20up=20to=20a=20closing=20brace."=0A+=20=20=
(string-trim-both=20(read-delimited=20"}"=20port=20'trim)))=0A+=0A=20=
(define=20(lex-white-space=20port=20bol)=0A=20=20=20"Consume=20white=20=
spaces=20and=20comment=20lines=20on=20PORT.=20=20If=20a=20new=20line=20=
is=20started=20return=20#t,=0A=20otherwise=20return=20BOL=20=
(beginning-of-line)."=0A@@=20-343,8=20+347,11=20@@=20matching=20a=20=
string=20against=20the=20created=20regexp."=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20(make-regexp=20pat))))=0A=20=20=20=20=20(cut=20=
regexp-exec=20rx=20<>)))=0A=20=0A-(define=20is-property=20=
(make-rx-matcher=20"([a-z0-9-]+)[=20\t]*:[=20\t]*(\\w?.*)$"=0A-=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20regexp/icase))=0A+(define=20is-layout-property=20=
(make-rx-matcher=20"([a-z0-9-]+)[=20\t]*:[=20\t]*(\\w?[^\\{\\}]*)$"=0A+=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20regexp/icase))=0A+=0A=
+(define=20is-braced-property=20(make-rx-matcher=20"([a-z0-9-]+)[=20=
\t]*:[=20\t]*\\{[=20\t]*$"=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20regexp/icase))=0A=20=0A=20(define=20is-flag=20=
(make-rx-matcher=20"^flag=20+([a-z0-9_-]+)"=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
regexp/icase))=0A@@=20-435,13=20+442,19=20@@=20string=20with=20the=20=
read=20characters."=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20(begin=20(unread-char=20c)=20(list->string=20res)))))=0A=20=20=20=20=20=
=20=20=20=20=20=20(else=20(list->string=20res)))))=0A=20=0A-(define=20=
(lex-property=20k-v-rx-res=20loc=20port)=0A+(define=20=
(lex-layout-property=20k-v-rx-res=20loc=20port)=0A=20=20=20(let=20((key=20=
(string-downcase=20(match:substring=20k-v-rx-res=201)))=0A=20=20=20=20=20=
=20=20=20=20(value=20(match:substring=20k-v-rx-res=202)))=0A=20=20=20=20=20=
(make-lexical-token=0A=20=20=20=20=20=20'PROPERTY=20loc=0A=20=20=20=20=20=
=20(list=20key=20`(,(read-value=20port=20value=20=
(current-indentation)))))))=0A=20=0A+(define=20(lex-braced-property=20=
k-rx-res=20loc=20port)=0A+=20=20(let=20((key=20(string-downcase=20=
(match:substring=20k-rx-res=201))))=0A+=20=20=20=20(make-lexical-token=0A=
+=20=20=20=20=20'PROPERTY=20loc=0A+=20=20=20=20=20(list=20key=20=
`(,(read-braced-value=20port))))))=0A+=0A=20(define=20(lex-rx-res=20=
rx-res=20token=20loc)=0A=20=20=20(let=20((name=20(string-downcase=20=
(match:substring=20rx-res=201))))=0A=20=20=20=20=20(make-lexical-token=20=
token=20loc=20name)))=0A@@=20-552,7=20+565,6=20@@=20LOC=20is=20the=20=
current=20port=20location."=0A=20the=20current=20port=20location."=0A=20=20=
=20(let*=20((s=20(read-delimited=20"\n{}"=20port=20'peek)))=0A=20=20=20=20=
=20(cond=0A-=20=20=20=20=20((is-property=20s)=20=3D>=20(cut=20=
lex-property=20<>=20loc=20port))=0A=20=20=20=20=20=20((is-flag=20s)=20=3D>=
=20(cut=20lex-flag=20<>=20loc))=0A=20=20=20=20=20=20((is-src-repo=20s)=20=
=3D>=20(cut=20lex-src-repo=20<>=20loc))=0A=20=20=20=20=20=20((is-exec=20=
s)=20=3D>=20(cut=20lex-exec=20<>=20loc))=0A@@=20-561,13=20+573,22=20@@=20=
the=20current=20port=20location."=0A=20=20=20=20=20=20((is-benchmark=20=
s)=20=3D>=20(cut=20lex-benchmark=20<>=20loc))=0A=20=20=20=20=20=20=
((is-lib=20s)=20(lex-lib=20loc))=0A=20=20=20=20=20=20((is-else=20s)=20=
(lex-else=20loc))=0A-=20=20=20=20=20(else=0A-=20=20=20=20=20=20#f))))=0A=
+=20=20=20=20=20(else=20(unread-string=20s=20port)=20#f))))=0A+=0A=
+(define=20(lex-property=20port=20loc)=0A+=20=20(let*=20((s=20=
(read-delimited=20"\n"=20port=20'peek)))=0A+=20=20=20=20(cond=0A+=20=20=20=
=20=20=20((is-braced-property=20s)=20=3D>=20(cut=20lex-braced-property=20=
<>=20loc=20port))=0A+=20=20=20=20=20=20((is-layout-property=20s)=20=3D>=20=
(cut=20lex-layout-property=20<>=20loc=20port))=0A+=20=20=20=20=20=20=
(else=20#f))))=0A=20=0A=20(define=20(lex-token=20port)=0A=20=20=20(let*=20=
((loc=20(make-source-location=20(cabal-file-name)=20(port-line=20port)=0A=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(port-column=20port)=20-1=20-1)))=0A=
-=20=20=20=20(or=20(lex-single-char=20port=20loc)=20(lex-word=20port=20=
loc)=20(lex-line=20port=20loc))))=0A+=20=20=20=20(or=20(lex-single-char=20=
port=20loc)=0A+=20=20=20=20=20=20=20=20(lex-word=20port=20loc)=0A+=20=20=20=
=20=20=20=20=20(lex-line=20port=20loc)=0A+=20=20=20=20=20=20=20=20=
(lex-property=20port=20loc))))=0A=20=0A=20;;=20Lexer-=20and=20=
error-function=20generators=0A=20=0Adiff=20--git=20a/tests/hackage.scm=20=
b/tests/hackage.scm=0Aindex=2041cea73fe7..733d540c20=20100644=0A---=20=
a/tests/hackage.scm=0A+++=20b/tests/hackage.scm=0A@@=20-143,6=20+143,24=20=
@@=20executable=20cabal=0A=20=20=20=20=20mtl=20=20=20=20=20=20=20=20>=3D=20=
2.0=20=20=20=20=20=20&&=20<=203=0A=20")=0A=20=0A+;;=20Check=20braces=20=
instead=20of=20layout=0A+(define=20test-cabal-8=0A+=20=20"name:=20foo=0A=
+version:=201.0.0=0A+homepage:=20http://test.org=0A+synopsis:=20synopsis=0A=
+description:=20{=0A+first=20line=0A+second=20line=0A+}=0A+license:=20=
BSD3=0A+executable=20cabal=0A+=20=20build-depends:=0A+=20=20=20=20HTTP=20=
=20=20=20=20=20=20>=3D=204000.2.5=20&&=20<=204000.3,=0A+=20=20=20=20mtl=20=
=20=20=20=20=20=20=20>=3D=202.0=20=20=20=20=20=20&&=20<=203=0A+")=0A+=0A=
+=0A=20;;=20A=20fragment=20of=20a=20real=20Cabal=20file=20with=20minor=20=
modification=20to=20check=20precedence=0A=20;;=20of=20'and'=20over=20=
'or',=20missing=20final=20newline,=20spaces=20between=20keywords=20and=0A=
=20;;=20parentheses=20and=20between=20key=20and=20column.=0A@@=20-262,6=20=
+280,10=20@@=20library=0A=20=20=20(eval-test-with-cabal=20test-cabal-7=0A=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
#:cabal-environment=20'(("impl"=20.=20"ghc-7.8"))))=0A=20=0A=
+(test-assert=20"hackage->guix-package=20test=208"=0A+=20=20=
(eval-test-with-cabal=20test-cabal-8=0A+=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20#:cabal-environment=20'(("impl"=20=
.=20"ghc-7.8"))))=0A+=0A=20(test-assert=20"read-cabal=20test=201"=0A=20=20=
=20(match=20(call-with-input-string=20test-read-cabal-1=20read-cabal)=0A=20=
=20=20=20=20((("name"=20("test-me"))=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0004-tests-hackage-avoid-mock-and-extract-test-data.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0004-tests-hackage-avoid-mock-and-extract-test-data.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20716761b051b27d78bf1f374ac287a94b14cc2bca=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Sat,=2018=20May=202019=2004:58:18=20+0200=0ASubject:=20[PATCH=2004/11]=20=
tests:=20hackage:=20avoid=20mock,=20and=20extract=20test=20data=0A=0A=
This=20is=20partially=20in=20order=20to=20make=20tests=20depend=20less=20=
on=20the=0Aimplementation=20of=20`hackage-fetch`,=20in=20preparation=20=
for=20hackage=0Arevision=20import.=0A=0A*=20tests/hackage.scm:=20Provide=20=
cabal=20input=20port=20directly,=20instead=0Aof=20mocking=20=
hackage-fetch.=20And=20make=20cabal=20tests=20more=20explicit=20and=0A=
consistent=20by=20defining=20package=20pattern=20per=20test.=0A---=0A=20=
tests/hackage.scm=20|=20141=20=
+++++++++++++++++++++-------------------------=0A=201=20file=20changed,=20=
65=20insertions(+),=2076=20deletions(-)=0A=0Adiff=20--git=20=
a/tests/hackage.scm=20b/tests/hackage.scm=0Aindex=20=
733d540c20..5f47e909c6=20100644=0A---=20a/tests/hackage.scm=0A+++=20=
b/tests/hackage.scm=0A@@=20-188,101=20+188,90=20@@=20library=0A=20=0A=20=
(test-begin=20"hackage")=0A=20=0A-(define*=20(eval-test-with-cabal=20=
test-cabal=20#:key=20(cabal-environment=20'()))=0A-=20=20(mock=0A-=20=20=20=
((guix=20import=20hackage)=20hackage-fetch=0A-=20=20=20=20(lambda=20=
(name-version)=0A-=20=20=20=20=20=20(call-with-input-string=20test-cabal=0A=
-=20=20=20=20=20=20=20=20read-cabal)))=0A-=20=20=20(match=20=
(hackage->guix-package-impl=20"foo"=20#:cabal-environment=20=
cabal-environment)=0A-=20=20=20=20=20(('package=0A-=20=20=20=20=20=20=20=20=
('name=20"ghc-foo")=0A-=20=20=20=20=20=20=20=20('version=20"1.0.0")=0A-=20=
=20=20=20=20=20=20=20('source=0A-=20=20=20=20=20=20=20=20=20('origin=0A-=20=
=20=20=20=20=20=20=20=20=20=20('method=20'url-fetch)=0A-=20=20=20=20=20=20=
=20=20=20=20=20('uri=20('string-append=0A-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20"https://hackage.haskell.org/package/foo/foo-"=0A-=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20'version=0A-=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20".tar.gz"))=0A-=20=20=20=20=20=20=
=20=20=20=20=20('sha256=0A-=20=20=20=20=20=20=20=20=20=20=20=20('base32=0A=
-=20=20=20=20=20=20=20=20=20=20=20=20=20(?=20string?=20hash)))))=0A-=20=20=
=20=20=20=20=20=20('build-system=20'haskell-build-system)=0A-=20=20=20=20=
=20=20=20=20('inputs=0A-=20=20=20=20=20=20=20=20=20('quasiquote=0A-=20=20=
=20=20=20=20=20=20=20=20(("ghc-http"=20('unquote=20'ghc-http))=0A-=20=20=20=
=20=20=20=20=20=20=20=20("ghc-mtl"=20('unquote=20'ghc-mtl)))))=0A-=20=20=20=
=20=20=20=20=20('home-page=20"http://test.org")=0A-=20=20=20=20=20=20=20=20=
('synopsis=20(?=20string?))=0A-=20=20=20=20=20=20=20=20('description=20=
(?=20string?))=0A-=20=20=20=20=20=20=20=20('license=20'bsd-3))=0A-=20=20=20=
=20=20=20#t)=0A-=20=20=20=20=20(x=0A-=20=20=20=20=20=20(pk=20'fail=20x=20=
#f)))))=0A+(define=20ghc-foo-pattern=0A+=20'('package=0A+=20=20=20=20=
('name=20"ghc-foo")=0A+=20=20=20=20('version=20"1.0.0")=0A+=20=20=20=20=
('source=0A+=20=20=20=20=20('origin=0A+=20=20=20=20=20=20('method=20=
'url-fetch)=0A+=20=20=20=20=20=20=20('uri=20('string-append=0A+=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=
"https://hackage.haskell.org/package/foo/foo-"=0A+=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20'version=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
".tar.gz"))=0A+=20=20=20=20=20=20=20('sha256=0A+=20=20=20=20=20=20=20=20=
('base32=0A+=20=20=20=20=20=20=20=20=20(?=20string?=20hash)))))=0A+=20=20=
=20=20('build-system=20'haskell-build-system)=0A+=20=20=20=20('inputs=0A=
+=20=20=20=20=20('quasiquote=0A+=20=20=20=20=20=20(("ghc-http"=20=
('unquote=20'ghc-http))=0A+=20=20=20=20=20=20=20("ghc-mtl"=20('unquote=20=
'ghc-mtl)))))=0A+=20=20=20=20('home-page=20"http://test.org")=0A+=20=20=20=
=20('synopsis=20(?=20string?))=0A+=20=20=20=20('description=20(?=20=
string?))=0A+=20=20=20=20('license=20'bsd-3)))=0A+=0A+(define*=20=
(eval-test-with-cabal=20test-cabal=20package-pattern=20#:key=20=
(cabal-environment=20'()))=0A+=20=20(define=20port=20(open-input-string=20=
test-cabal))=0A+=20=20(match=20(hackage->guix-package-impl=20"foo"=20=
#:port=20port=20#:cabal-environment=20cabal-environment)=0A+=20=20=20=20=
(package-pattern=20#t)=0A+=20=20=20=20(x=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20(pk=20'fail=20x=20#f))))=0A=20=0A=20(test-assert=20=
"hackage->guix-package=20test=201"=0A-=20=20(eval-test-with-cabal=20=
test-cabal-1))=0A+=20=20(eval-test-with-cabal=20test-cabal-1=20=
ghc-foo-pattern))=0A=20=0A=20(test-assert=20"hackage->guix-package=20=
test=202"=0A-=20=20(eval-test-with-cabal=20test-cabal-2))=0A+=20=20=
(eval-test-with-cabal=20test-cabal-2=20ghc-foo-pattern))=0A=20=0A=20=
(test-assert=20"hackage->guix-package=20test=203"=0A-=20=20=
(eval-test-with-cabal=20test-cabal-3=0A+=20=20(eval-test-with-cabal=20=
test-cabal-3=20ghc-foo-pattern=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20#:cabal-environment=20'(("impl"=20.=20=
"ghc-7.8"))))=0A=20=0A=20(test-assert=20"hackage->guix-package=20test=20=
4"=0A-=20=20(eval-test-with-cabal=20test-cabal-4=0A+=20=20=
(eval-test-with-cabal=20test-cabal-4=20ghc-foo-pattern=0A=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
#:cabal-environment=20'(("impl"=20.=20"ghc-7.8"))))=0A=20=0A=20=
(test-assert=20"hackage->guix-package=20test=205"=0A-=20=20=
(eval-test-with-cabal=20test-cabal-5=0A+=20=20(eval-test-with-cabal=20=
test-cabal-5=20ghc-foo-pattern=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20#:cabal-environment=20'(("impl"=20.=20=
"ghc-7.8"))))=0A=20=0A+(define=20ghc-foo-pattern-6=0A+=20'('package=0A+=20=
=20=20=20('name=20"ghc-foo")=0A+=20=20=20=20('version=20"1.0.0")=0A+=20=20=
=20=20('source=0A+=20=20=20=20=20('origin=0A+=20=20=20=20=20=20('method=20=
'url-fetch)=0A+=20=20=20=20=20=20=20('uri=20('string-append=0A+=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=
"https://hackage.haskell.org/package/foo/foo-"=0A+=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20'version=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
".tar.gz"))=0A+=20=20=20=20=20=20=20('sha256=0A+=20=20=20=20=20=20=20=20=
('base32=0A+=20=20=20=20=20=20=20=20=20(?=20string?=20hash)))))=0A+=20=20=
=20=20('build-system=20'haskell-build-system)=0A+=20=20=20=20('inputs=0A=
+=20=20=20=20=20('quasiquote=0A+=20=20=20=20=20=20(("ghc-b"=20('unquote=20=
'ghc-b))=0A+=20=20=20=20=20=20=20("ghc-http"=20('unquote=20'ghc-http))=0A=
+=20=20=20=20=20=20=20("ghc-mtl"=20('unquote=20'ghc-mtl)))))=0A+=20=20=20=
=20('native-inputs=0A+=20=20=20=20=20('quasiquote=0A+=20=20=20=20=20=20=
(("ghc-haskell-gi"=20('unquote=20'ghc-haskell-gi)))))=0A+=20=20=20=20=
('home-page=20"http://test.org")=0A+=20=20=20=20('synopsis=20(?=20=
string?))=0A+=20=20=20=20('description=20(?=20string?))=0A+=20=20=20=20=
('license=20'bsd-3)))=0A+=0A=20(test-assert=20"hackage->guix-package=20=
test=206"=0A-=20=20(mock=0A-=20=20=20((guix=20import=20hackage)=20=
hackage-fetch=0A-=20=20=20=20(lambda=20(name-version)=0A-=20=20=20=20=20=20=
(call-with-input-string=20test-cabal-6=0A-=20=20=20=20=20=20=20=20=
read-cabal)))=0A-=20=20=20(match=20(hackage->guix-package-impl=20"foo")=0A=
-=20=20=20=20=20(('package=0A-=20=20=20=20=20=20=20=20('name=20=
"ghc-foo")=0A-=20=20=20=20=20=20=20=20('version=20"1.0.0")=0A-=20=20=20=20=
=20=20=20=20('source=0A-=20=20=20=20=20=20=20=20=20('origin=0A-=20=20=20=20=
=20=20=20=20=20=20=20('method=20'url-fetch)=0A-=20=20=20=20=20=20=20=20=20=
=20=20('uri=20('string-append=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20"https://hackage.haskell.org/package/foo/foo-"=0A-=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20'version=0A-=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20".tar.gz"))=0A-=20=20=20=20=20=20=20=20=20=
=20=20('sha256=0A-=20=20=20=20=20=20=20=20=20=20=20=20('base32=0A-=20=20=20=
=20=20=20=20=20=20=20=20=20=20(?=20string?=20hash)))))=0A-=20=20=20=20=20=
=20=20=20('build-system=20'haskell-build-system)=0A-=20=20=20=20=20=20=20=
=20('inputs=0A-=20=20=20=20=20=20=20=20=20('quasiquote=0A-=20=20=20=20=20=
=20=20=20=20=20(("ghc-b"=20('unquote=20'ghc-b))=0A-=20=20=20=20=20=20=20=20=
=20=20=20("ghc-http"=20('unquote=20'ghc-http))=0A-=20=20=20=20=20=20=20=20=
=20=20=20("ghc-mtl"=20('unquote=20'ghc-mtl)))))=0A-=20=20=20=20=20=20=20=20=
('native-inputs=0A-=20=20=20=20=20=20=20=20=20('quasiquote=0A-=20=20=20=20=
=20=20=20=20=20=20(("ghc-haskell-gi"=20('unquote=20'ghc-haskell-gi)))))=0A=
-=20=20=20=20=20=20=20=20('home-page=20"http://test.org")=0A-=20=20=20=20=
=20=20=20=20('synopsis=20(?=20string?))=0A-=20=20=20=20=20=20=20=20=
('description=20(?=20string?))=0A-=20=20=20=20=20=20=20=20('license=20=
'bsd-3))=0A-=20=20=20=20=20=20#t)=0A-=20=20=20=20=20(x=0A-=20=20=20=20=20=
=20(pk=20'fail=20x=20#f)))))=0A+=20=20(eval-test-with-cabal=20=
test-cabal-6=20ghc-foo-pattern-6))=0A=20=0A=20(test-assert=20=
"hackage->guix-package=20test=207"=0A-=20=20(eval-test-with-cabal=20=
test-cabal-7=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20#:cabal-environment=20'(("impl"=20.=20"ghc-7.8"))))=0A+=20=
=20(eval-test-with-cabal=20test-cabal-7=20ghc-foo-pattern))=0A=20=0A=20=
(test-assert=20"hackage->guix-package=20test=208"=0A-=20=20=
(eval-test-with-cabal=20test-cabal-8=0A-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20#:cabal-environment=20'(("impl"=20=
.=20"ghc-7.8"))))=0A+=20=20(eval-test-with-cabal=20test-cabal-8=20=
ghc-foo-pattern))=0A=20=0A=20(test-assert=20"read-cabal=20test=201"=0A=20=
=20=20(match=20(call-with-input-string=20test-read-cabal-1=20read-cabal)=0A=
--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0005-gnu-ghc-easy-plot-remove-superfluous-Setup.hs-rename.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0005-gnu-ghc-easy-plot-remove-superfluous-Setup.hs-rename.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2003d28f656160a541cbc33c9b8dc693d2b9b4774c=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2016:28:44=20+0200=0ASubject:=20[PATCH=2005/11]=20=
gnu:=20ghc-easy-plot:=20remove=20superfluous=20Setup.hs=20rename=0A=20=
step=0A=0Ahaskell-build-system=20already=20uses=20whichever=20of=20=
Setup.hs=20and=0ASetup.lhs=20exists.=0A=0A*=20gnu/packages/haskell.scm=20=
(ghc-easy-plot):=20don't=20rename=0ASetup.lhs=20to=20Setup.hs=0A---=0A=20=
gnu/packages/haskell.scm=20|=204=20----=0A=201=20file=20changed,=204=20=
deletions(-)=0A=0Adiff=20--git=20a/gnu/packages/haskell.scm=20=
b/gnu/packages/haskell.scm=0Aindex=2061c6119322..c40581a8cd=20100644=0A=
---=20a/gnu/packages/haskell.scm=0A+++=20b/gnu/packages/haskell.scm=0A@@=20=
-8063,10=20+8063,6=20@@=20interface=20for=20statistics=20based=20on=20=
hmatrix=20and=20GSL.")=0A=20=20=20=20=20=20=20=20=20(base32=20=
"18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk"))))=0A=20=20=20=20=
=20(build-system=20haskell-build-system)=0A=20=20=20=20=20=
(propagated-inputs=20`(("gnuplot"=20,gnuplot)))=0A-=20=20=20=20=
(arguments=0A-=20=20=20=20=20`(#:phases=20(modify-phases=20=
%standard-phases=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(add-after=20'unpack=20'fix-setup-suffix=0A-=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(lambda=20_=20(rename-file=20"Setup.lhs"=20=
"Setup.hs")=20#t)))))=0A=20=20=20=20=20(home-page=20=
"https://hub.darcs.net/scravy/easyplot")=0A=20=20=20=20=20(synopsis=20=
"Haskell=20plotting=20library=20based=20on=20gnuplot")=0A=20=20=20=20=20=
(description=20"This=20package=20provides=20a=20plotting=20library=20for=0A=
--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0006-guix-haskell-build-system-correct-haddock-phase-docu.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0006-guix-haskell-build-system-correct-haddock-phase-docu.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2097d51b39acb8d08a63f39256c0c763b948085d01=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2018:58:55=20+0200=0ASubject:=20[PATCH=2006/11]=20=
guix:=20haskell-build-system:=20correct=20haddock=20phase=0A=20=
documentation=0A=0A*=20guix/build/haskell-build-system.scm=20(haddock):=20=
Correct=20docstring=0A---=0A=20guix/build/haskell-build-system.scm=20|=20=
2=20+-=0A=201=20file=20changed,=201=20insertion(+),=201=20deletion(-)=0A=0A=
diff=20--git=20a/guix/build/haskell-build-system.scm=20=
b/guix/build/haskell-build-system.scm=0Aindex=2023d97e6602..5c5b32322b=20=
100644=0A---=20a/guix/build/haskell-build-system.scm=0A+++=20=
b/guix/build/haskell-build-system.scm=0A@@=20-260,7=20+260,7=20@@=20=
given=20Haskell=20package."=0A=20=20=20#t)=0A=20=0A=20(define*=20=
(haddock=20#:key=20outputs=20haddock?=20haddock-flags=20=
#:allow-other-keys)=0A-=20=20"Run=20the=20test=20suite=20of=20a=20given=20=
Haskell=20package."=0A+=20=20"Generate=20haddock=20documentation=20of=20=
a=20given=20Haskell=20package."=0A=20=20=20(when=20haddock?=0A=20=20=20=20=
=20(run-setuphs=20"haddock"=20haddock-flags))=0A=20=20=20#t)=0A--=20=0A=
2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0007-guix-haskell-build-system-generate-Setup.hs-if-not-e.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0007-guix-haskell-build-system-generate-Setup.hs-if-not-e.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20a502063aa4c26f171f081fdcab30a2b157534de8=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2016:26:31=20+0200=0ASubject:=20[PATCH=2007/11]=20=
guix:=20haskell-build-system:=20generate=20Setup.hs=20if=20not=0A=20=
exists=0A=0AThe=20default=20Setup.hs=20is=20boilerplate=20that=20is=20=
frequently=20left=20out=20of=0Asource=20packages,=20causing=20build=20=
failure=20for=20package=20definitions=20as=0Agenerated=20by=20`guix=20=
import=20hackage`.=20Compare=0A=
<https://github.com/phadej/time-compat/issues/4>=0A=0A*=20=
guix/build/haskell-build-system.scm:=20Generate=20Setup.hs=20if=20=
missing,=0Aafter=20unpack=20phase.=0A---=0A=20=
guix/build/haskell-build-system.scm=20|=2012=20++++++++++++=0A=201=20=
file=20changed,=2012=20insertions(+)=0A=0Adiff=20--git=20=
a/guix/build/haskell-build-system.scm=20=
b/guix/build/haskell-build-system.scm=0Aindex=205c5b32322b..0c648e510f=20=
100644=0A---=20a/guix/build/haskell-build-system.scm=0A+++=20=
b/guix/build/haskell-build-system.scm=0A@@=20-275,9=20+275,21=20@@=20=
given=20Haskell=20package."=0A=20=20=20=20=20=20=20(_=20(error=20"Could=20=
not=20find=20a=20Cabal=20file=20to=20patch."))))=0A=20=20=20#t)=0A=20=0A=
+(define*=20(generate-setup=20#:rest=20empty)=0A+=20=20"Generate=20=
boilerplate=20Setup.hs=20if=20missing."=0A+=20=20(when=20(not=20(or=20=
(file-exists?=20"Setup.hs")=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(file-exists?=20"Setup.lhs")))=0A+=20=20=20=20(format=20#t=20=
"generating=20missing=20Setup.hs~%")=0A+=20=20=20=20(with-output-to-file=20=
"Setup.hs"=0A+=20=20=20=20=20=20(lambda=20()=0A+=20=20=20=20=20=20=20=20=
(format=20#t=20"import=20Distribution.Simple~%")=0A+=20=20=20=20=20=20=20=
=20(format=20#t=20"main=20=3D=20defaultMain~%"))))=0A+=20=20#t)=0A+=0A=20=
(define=20%standard-phases=0A=20=20=20(modify-phases=20=
gnu:%standard-phases=0A=20=20=20=20=20(add-after=20'unpack=20=
'patch-cabal-file=20patch-cabal-file)=0A+=20=20=20=20(add-after=20=
'unpack=20'generate-setup=20generate-setup)=0A=20=20=20=20=20(delete=20=
'bootstrap)=0A=20=20=20=20=20(add-before=20'configure=20'setup-compiler=20=
setup-compiler)=0A=20=20=20=20=20(add-before=20'install=20'haddock=20=
haddock)=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0008-gnu-haskell-leave-Setup.hs-generation-to-build-syste.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0008-gnu-haskell-leave-Setup.hs-generation-to-build-syste.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20f013a4894022606d526020eb64fb5301832096d7=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2016:29:08=20+0200=0ASubject:=20[PATCH=2008/11]=20=
gnu:=20haskell:=20leave=20Setup.hs=20generation=20to=20build=20system=0A=0A=
Remove=20explicit=20Setup.hs=20generation=20from=20the=20configure=20=
step=0Anow=20that=20haskell-build-system=20does=20it.=0A=0A*=20=
gnu/packages/haskell.scm=20(ghc-foundation,=20ghc-inline-c,=0A=
ghc-inline-c-cpp,=20ghc-rio):=20Don't=20generate=20Setup.hs=0A---=0A=20=
gnu/packages/haskell.scm=20|=2042=20=
----------------------------------------=0A=201=20file=20changed,=2042=20=
deletions(-)=0A=0Adiff=20--git=20a/gnu/packages/haskell.scm=20=
b/gnu/packages/haskell.scm=0Aindex=20c40581a8cd..f12371f3ce=20100644=0A=
---=20a/gnu/packages/haskell.scm=0A+++=20b/gnu/packages/haskell.scm=0A@@=20=
-9688,16=20+9688,6=20@@=20packages.")=0A=20=20=20=20=20=20=20=20=20=
(base32=0A=20=20=20=20=20=20=20=20=20=20=
"1q43y8wfj0wf9gdq2kzphwjwq6m5pvryy1lqgk954aq5z3ks1lsf"))))=0A=20=20=20=20=
=20(build-system=20haskell-build-system)=0A-=20=20=20=20(arguments=0A-=20=
=20=20=20=20`(#:phases=0A-=20=20=20=20=20=20=20(modify-phases=20=
%standard-phases=0A-=20=20=20=20=20=20=20=20=20(add-after=20'unpack=20=
'add-setup-script=0A-=20=20=20=20=20=20=20=20=20=20=20(lambda=20_=0A-=20=20=
=20=20=20=20=20=20=20=20=20=20=20;;=20The=20usual=20"Setup.hs"=20script=20=
is=20missing=20from=20the=20source.=0A-=20=20=20=20=20=20=20=20=20=20=20=20=
=20(with-output-to-file=20"Setup.hs"=0A-=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20(lambda=20()=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20(format=20#t=20"import=20Distribution.Simple~%")=0A-=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(format=20#t=20"main=20=3D=20=
defaultMain~%"))))))))=0A=20=20=20=20=20(inputs=20`(("ghc-basement"=20=
,ghc-basement)))=0A=20=20=20=20=20(home-page=20=
"https://github.com/haskell-foundation/foundation")=0A=20=20=20=20=20=
(synopsis=20"Alternative=20prelude=20with=20batteries=20and=20no=20=
dependencies")=0A@@=20-10575,16=20+10565,6=20@@=20widths=20to=20the=20=
Char=20type.")=0A=20=20=20=20=20=20=20=20=20(base32=0A=20=20=20=20=20=20=20=
=20=20=20"064h8a4hp53a479d3ak0vmqbx8hi0cpg7zn4wp23rjy26dka8p7g"))))=0A=20=
=20=20=20=20(build-system=20haskell-build-system)=0A-=20=20=20=20=
(arguments=0A-=20=20=20=20=20`(#:phases=0A-=20=20=20=20=20=20=20=
(modify-phases=20%standard-phases=0A-=20=20=20=20=20=20=20=20=20=
(add-after=20'unpack=20'add-setup-script=0A-=20=20=20=20=20=20=20=20=20=20=
=20(lambda=20_=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20;;=20The=20=
usual=20"Setup.hs"=20script=20is=20missing=20from=20the=20source.=0A-=20=20=
=20=20=20=20=20=20=20=20=20=20=20(with-output-to-file=20"Setup.hs"=0A-=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20(lambda=20()=0A-=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(format=20#t=20"import=20=
Distribution.Simple~%")=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20(format=20#t=20"main=20=3D=20defaultMain~%"))))))))=0A=20=20=20=20=20=
(inputs=0A=20=20=20=20=20=20`(("ghc-exceptions"=20,ghc-exceptions)=0A=20=20=
=20=20=20=20=20=20("ghc-hashable"=20,ghc-hashable)=0A@@=20-11107,17=20=
+11087,6=20@@=20DOS/Windows=20paths=20and=20markup=20languages=20(such=20=
as=20XML).")=0A=20=20=20=20=20=20=20=20=20(base32=0A=20=20=20=20=20=20=20=
=20=20=20"0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h"))))=0A=20=
=20=20=20=20(build-system=20haskell-build-system)=0A-=20=20=20=20=
(arguments=0A-=20=20=20=20=20`(#:phases=0A-=20=20=20=20=20=20=20=
(modify-phases=20%standard-phases=0A-=20=20=20=20=20=20=20=20=20=
(add-after=20'unpack=20'create-Setup.hs=0A-=20=20=20=20=20=20=20=20=20=20=
=20(lambda=20_=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=
(with-output-to-file=20"Setup.hs"=0A-=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(lambda=20_=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(display=20"\=0A-import=20Distribution.Simple=0A-main=20=3D=20=
defaultMain")))=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20#t)))))=0A=20=20=
=20=20=20(inputs=0A=20=20=20=20=20=20`(("ghc-ansi-wl-pprint"=20=
,ghc-ansi-wl-pprint)=0A=20=20=20=20=20=20=20=20("ghc-cryptohash"=20=
,ghc-cryptohash)=0A@@=20-11251,17=20+11220,6=20@@=20handling=20wrong.")=0A=
=20=20=20=20=20=20=20=20=20(base32=0A=20=20=20=20=20=20=20=20=20=20=
"1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci"))))=0A=20=20=20=20=
=20(build-system=20haskell-build-system)=0A-=20=20=20=20(arguments=0A-=20=
=20=20=20=20`(#:phases=0A-=20=20=20=20=20=20=20(modify-phases=20=
%standard-phases=0A-=20=20=20=20=20=20=20=20=20(add-after=20'unpack=20=
'create-Setup.hs=0A-=20=20=20=20=20=20=20=20=20=20=20(lambda=20_=0A-=20=20=
=20=20=20=20=20=20=20=20=20=20=20(with-output-to-file=20"Setup.hs"=0A-=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20(lambda=20_=0A-=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20(display=20"\=0A-import=20=
Distribution.Simple=0A-main=20=3D=20defaultMain")))=0A-=20=20=20=20=20=20=
=20=20=20=20=20=20=20#t)))))=0A=20=20=20=20=20(inputs=0A=20=20=20=20=20=20=
`(("ghc-inline-c"=20,ghc-inline-c)=0A=20=20=20=20=20=20=20=20=
("ghc-safe-exceptions"=20,ghc-safe-exceptions)))=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0009-guix-import-hackage-handle-hackage-revisions.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0009-guix-import-hackage-handle-hackage-revisions.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20649804c95c3946aac9ea146889dcbafdd300bb22=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Fri,=2017=20May=202019=2022:52:24=20+0200=0ASubject:=20[PATCH=2009/11]=20=
guix:=20import:=20hackage:=20handle=20hackage=20revisions=0A=0AHackage=20=
packages=20can=20have=20metadata=20revision=20(cabal-file=20only)=0Athat=20=
aren't=20reflected=20in=20the=20source=20archive.=20haskell-build-system=0A=
has=20support=20for=20this,=20but=20previously=20`guix=20import=20=
hackage`=20would=0Acreate=20a=20definition=20based=20on=20the=20new=20=
cabal=20file=20but=20building=20using=0Athe=20old=20cabal=20file.=0A=0A=
Compare=20https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D35750.=0A=0A*=20=
guix/import/cabal.scm:=20Parse=20`x-revision:`=20property.=0A*=20=
guix/import/hackage.scm:=20Compute=20hash=20of=20cabal=20file,=20and=20=
write=0Acabal-revision=20build=20system=20arguments.=0A---=0A=20=
guix/import/cabal.scm=20=20=20|=20=207=20+++--=0A=20=
guix/import/hackage.scm=20|=2061=20=
++++++++++++++++++++++++++++++-----------=0A=202=20files=20changed,=2050=20=
insertions(+),=2018=20deletions(-)=0A=0Adiff=20--git=20=
a/guix/import/cabal.scm=20b/guix/import/cabal.scm=0Aindex=20=
3028ed2882..312927a573=20100644=0A---=20a/guix/import/cabal.scm=0A+++=20=
b/guix/import/cabal.scm=0A@@=20-40,6=20+40,7=20@@=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20cabal-package?=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-name=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-version=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-revision=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-license=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-home-page=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=
cabal-package-source-repository=0A@@=20-638,13=20+639,14=20@@=20If=20#f=20=
use=20the=20function=20'port-filename'=20to=20obtain=20it."=0A=20;;=20=
information=20of=20the=20Cabal=20file,=20but=20only=20the=20ones=20we=20=
currently=20are=0A=20;;=20interested=20in.=0A=20(define-record-type=20=
<cabal-package>=0A-=20=20(make-cabal-package=20name=20version=20license=20=
home-page=20source-repository=0A+=20=20(make-cabal-package=20name=20=
version=20revision=20license=20home-page=20source-repository=0A=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20synopsis=20=
description=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20executables=20lib=20test-suites=0A=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20flags=20eval-environment=20=
custom-setup)=0A=20=20=20cabal-package?=0A=20=20=20(name=20=20=20=
cabal-package-name)=0A=20=20=20(version=20cabal-package-version)=0A+=20=20=
(revision=20cabal-package-revision)=0A=20=20=20(license=20=
cabal-package-license)=0A=20=20=20(home-page=20cabal-package-home-page)=0A=
=20=20=20(source-repository=20cabal-package-source-repository)=0A@@=20=
-838,6=20+840,7=20@@=20See=20the=20manual=20for=20limitations.")))))))=0A=
=20=20=20(define=20(cabal-evaluated-sexp->package=20evaluated-sexp)=0A=20=
=20=20=20=20(let*=20((name=20(lookup-join=20evaluated-sexp=20"name"))=0A=20=
=20=20=20=20=20=20=20=20=20=20=20(version=20(lookup-join=20=
evaluated-sexp=20"version"))=0A+=20=20=20=20=20=20=20=20=20=20=20=
(revision=20(lookup-join=20evaluated-sexp=20"x-revision"))=0A=20=20=20=20=
=20=20=20=20=20=20=20=20(license=20(lookup-join=20evaluated-sexp=20=
"license"))=0A=20=20=20=20=20=20=20=20=20=20=20=20(home-page=20=
(lookup-join=20evaluated-sexp=20"homepage"))=0A=20=20=20=20=20=20=20=20=20=
=20=20=20(home-page-or-hackage=0A@@=20-856,7=20+859,7=20@@=20See=20the=20=
manual=20for=20limitations.")))))))=0A=20=20=20=20=20=20=20=20=20=20=20=20=
(custom-setup=20(match=20(make-cabal-section=20evaluated-sexp=20=
'custom-setup)=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20((x)=20x)=0A=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(_=20#f))))=0A-=20=20=20=20=
=20=20(make-cabal-package=20name=20version=20license=20=
home-page-or-hackage=0A+=20=20=20=20=20=20(make-cabal-package=20name=20=
version=20revision=20license=20home-page-or-hackage=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
source-repository=20synopsis=20description=20executables=20lib=0A=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
test-suites=20flags=20eval-environment=20custom-setup)))=0A=20=0Adiff=20=
--git=20a/guix/import/hackage.scm=20b/guix/import/hackage.scm=0Aindex=20=
5b80a7ea1d..0bd9034087=20100644=0A---=20a/guix/import/hackage.scm=0A+++=20=
b/guix/import/hackage.scm=0A@@=20-117,9=20+117,15=20@@=20version=20is=20=
returned."=0A=20=20=20=20=20=20=20=20=20=20=20(#f=20name)=0A=20=20=20=20=20=
=20=20=20=20=20=20(m=20(match:substring=20m=201)))))))=0A=20=0A-(define=20=
(hackage-fetch=20name-version)=0A-=20=20"Return=20the=20Cabal=20file=20=
for=20the=20package=20NAME-VERSION,=20or=20#f=20on=20failure.=20=20If=0A=
-the=20version=20part=20is=20omitted=20from=20the=20package=20name,=20=
then=20return=20the=20latest=0A+(define=20(read-cabal-and-hash=20port)=0A=
+=20=20(let-values=20(((port=20get-hash)=20(open-sha256-input-port=20=
port)))=0A+=20=20=20=20(cons=0A+=20=20=20=20=20=20(read-cabal=20=
(canonical-newline-port=20port))=0A+=20=20=20=20=20=20=
(bytevector->nix-base32-string=20(get-hash)))))=0A+=0A+(define=20=
(hackage-fetch-and-hash=20name-version)=0A+=20=20"Return=20the=20Cabal=20=
file=20and=20hash=20for=20the=20package=20NAME-VERSION,=20or=20#f=20on=20=
failure.=0A+If=20the=20version=20part=20is=20omitted=20from=20the=20=
package=20name,=20then=20return=20the=20latest=0A=20version."=0A=20=20=20=
(guard=20(c=20((and=20(http-get-error?=20c)=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(=3D=20404=20(http-get-error-code=20c)))=0A=
@@=20-127,10=20+133,18=20@@=20version."=0A=20=20=20=20=20(let-values=20=
(((name=20version)=20(package-name->name+version=20name-version)))=0A=20=20=
=20=20=20=20=20(let*=20((url=20(hackage-cabal-url=20name=20version))=0A=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20(port=20(http-fetch=20url))=0A-=20=
=20=20=20=20=20=20=20=20=20=20=20=20(result=20(read-cabal=20=
(canonical-newline-port=20port))))=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
=20(result=20(read-cabal-and-hash=20port)))=0A=20=20=20=20=20=20=20=20=20=
(close-port=20port)=0A=20=20=20=20=20=20=20=20=20result))))=0A=20=0A=
+(define=20(hackage-fetch=20name-version)=0A+=20=20"Return=20the=20Cabal=20=
file=20for=20the=20package=20NAME-VERSION,=20or=20#f=20on=20failure.=20=20=
If=0A+the=20version=20part=20is=20omitted=20from=20the=20package=20name,=20=
then=20return=20the=20latest=0A+version."=0A+=20=20(match=20=
(hackage-fetch-and-hash=20name-version)=0A+=20=20=20=20=20=20=20=20=20=
((cabal=20.=20hash)=20cabal)=0A+=20=20=20=20=20=20=20=20=20(_=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20#f)))=0A+=0A=20(define=20string->license=0A=
=20=20=20;;=20List=20of=20valid=20values=20from=0A=20=20=20;;=20=
https://www.haskell.org=0A@@=20-196,15=20+210,19=20@@=20package=20being=20=
processed=20and=20is=20used=20to=20filter=20references=20to=20itself."=0A=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20(cons=20own-name=20=
ghc-standard-libraries))))=0A=20=20=20=20=20=20=20=20=20=20=20=
dependencies))=0A=20=0A-(define*=20(hackage-module->sexp=20cabal=20#:key=20=
(include-test-dependencies?=20#t))=0A+(define*=20(hackage-module->sexp=20=
cabal=20cabal-hash=20#:key=20(include-test-dependencies?=20#t))=0A=20=20=20=
"Return=20the=20`package'=20S-expression=20for=20a=20Cabal=20package.=20=20=
CABAL=20is=20the=0A-representation=20of=20a=20Cabal=20file=20as=20=
produced=20by=20'read-cabal'."=0A+representation=20of=20a=20Cabal=20file=20=
as=20produced=20by=20'read-cabal'.=20CABAL-HASH=20is=0A+the=20hash=20of=20=
the=20Cabal=20file."=0A=20=0A=20=20=20(define=20name=0A=20=20=20=20=20=
(cabal-package-name=20cabal))=0A=20=0A=20=20=20(define=20version=0A=20=20=
=20=20=20(cabal-package-version=20cabal))=0A+=0A+=20=20(define=20=
revision=0A+=20=20=20=20(cabal-package-revision=20cabal))=0A=20=20=20=0A=20=
=20=20(define=20source-url=0A=20=20=20=20=20(hackage-source-url=20name=20=
version))=0A@@=20-250,9=20+268,17=20@@=20representation=20of=20a=20Cabal=20=
file=20as=20produced=20by=20'read-cabal'."=0A=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20(list=20'quasiquote=20inputs))))))=0A=20=20=
=20=0A=20=20=20(define=20(maybe-arguments)=0A-=20=20=20=20(if=20(not=20=
include-test-dependencies?)=0A-=20=20=20=20=20=20=20=20'((arguments=20=
`(#:tests?=20#f)))=0A-=20=20=20=20=20=20=20=20'()))=0A+=20=20=20=20=
(define=20testargs=20(if=20(not=20include-test-dependencies?)=0A+=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20'(#:tests?=20=
#f)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20'()))=0A+=20=20=20=20(define=20revargs=20=20(if=20(not=20=
(string-null?=20revision))=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20`(#:cabal-revision=20(,revision=20,cabal-hash))=0A=
+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
'()))=0A+=20=20=20=20(define=20args=20(append=20testargs=20revargs))=0A+=20=
=20=20=20(if=20(not=20(nil?=20args))=0A+=20=20=20=20=20=20(let=20((qargs=20=
`(,'quasiquote=20,args)))=0A+=20=20=20=20=20=20=20=20`((arguments=20=
,qargs)))=0A+=20=20=20=20=20=20'()))=0A=20=0A=20=20=20(let=20((tarball=20=
(with-store=20store=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(download-to-store=20store=20source-url))))=0A@@=20-293,13=20=
+319,16=20@@=20symbol=20'true'=20or=20'false'.=20=20The=20value=20=
associated=20with=20other=20keys=20has=20to=20conform=0A=20to=20the=20=
Cabal=20file=20format=20definition.=20=20The=20default=20value=20=
associated=20with=20the=0A=20keys=20\"os\",=20\"arch\"=20and=20\"impl\"=20=
is=20\"linux\",=20\"x86_64\"=20and=20\"ghc\"=0A=20respectively."=0A-=20=20=
=20(let=20((cabal-meta=20(if=20port=0A-=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20(read-cabal=20=
(canonical-newline-port=20port))=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20(hackage-fetch=20package-name))))=0A=
-=20=20=20=20=20(and=3D>=20cabal-meta=20(compose=20(cut=20=
hackage-module->sexp=20<>=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
#:include-test-dependencies?=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
include-test-dependencies?)=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(cut=20eval-cabal=20=
<>=20cabal-environment))))))=0A+=20=20=20(match=0A+=20=20=20=20=20(if=20=
port=20(read-cabal-and-hash=20port)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20(hackage-fetch-and-hash=20package-name))=0A+=20=20=20=20=20=
((cabal-meta=20.=20cabal-hash)=0A+=20=20=20=20=20=20(and=3D>=20=
cabal-meta=20(compose=20(cut=20hackage-module->sexp=20<>=0A+=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20cabal-hash=0A+=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20#:include-test-dependencies?=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
include-test-dependencies?)=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(cut=20=
eval-cabal=20<>=20cabal-environment))))=0A+=20=20=20=20=20(_=20#f))))=0A=20=
=0A=20(define=20hackage->guix-package=0A=20=20=20(memoize=20=
hackage->guix-package-impl))=0A--=20=0A2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0
Content-Disposition: attachment;
	filename=0010-guix-import-hackage-log-when-we-start-with-a-file.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0010-guix-import-hackage-log-when-we-start-with-a-file.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=20742b3db4c60e052e65c21dae1d5771f32cf01963=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Robert=20Vollmert=20<rob@vllmrt.net>=0ADate:=20=
Sat,=2018=20May=202019=2003:37:27=20+0200=0ASubject:=20[PATCH=2010/11]=20=
guix:=20import:=20hackage:=20log=20when=20we=20start=20with=20a=20file=0A=
=0AThis=20helps=20figuring=20out=20what=20errors=20are=20in=20relation=20=
to,=20particularly=0Aduring=20recursive=20import.=0A=0A*=20=
guix/import/hackage.scm:=20Log=20before=20fetching/parsing=20a=20cabal=20=
file.=0A---=0A=20guix/import/hackage.scm=20|=201=20+=0A=201=20file=20=
changed,=201=20insertion(+)=0A=0Adiff=20--git=20=
a/guix/import/hackage.scm=20b/guix/import/hackage.scm=0Aindex=20=
0bd9034087..d8baac0850=20100644=0A---=20a/guix/import/hackage.scm=0A+++=20=
b/guix/import/hackage.scm=0A@@=20-319,6=20+319,7=20@@=20symbol=20'true'=20=
or=20'false'.=20=20The=20value=20associated=20with=20other=20keys=20has=20=
to=20conform=0A=20to=20the=20Cabal=20file=20format=20definition.=20=20=
The=20default=20value=20associated=20with=20the=0A=20keys=20\"os\",=20=
\"arch\"=20and=20\"impl\"=20is=20\"linux\",=20\"x86_64\"=20and=20\"ghc\"=0A=
=20respectively."=0A+=20=20=20(format=20(current-error-port)=20"reading=20=
cabal=20file=20for=20~a~%"=20package-name)=0A=20=20=20=20(match=0A=20=20=20=
=20=20=20(if=20port=20(read-cabal-and-hash=20port)=0A=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20(hackage-fetch-and-hash=20package-name))=0A--=20=0A=
2.21.0=0A=0A=

--Apple-Mail=_3CA86B19-9C14-4901-8571-7F34868FF2C0--