* [PATCH 02/43] gnu: ghc-old-locale: New package for updated GHC.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
@ 2015-10-15 12:20 ` Paul van der Walt
2015-10-15 17:18 ` Paul van der Walt
2015-10-15 12:20 ` [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform Paul van der Walt
` (22 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:20 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-old-locale): New variable.
* gnu/packages/haskell.scm (ghc-data-default-instances-old-locale):
Update dependencies.
* gnu/packages/haskell.scm (ghc-mtl): Update to version 2.2.1.
* gnu/packages/haskell.scm (ghc-utf8-string): Update to version 1.0.1.1.
---
gnu/packages/haskell.scm | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ba828d8..51c7a95 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -362,6 +362,30 @@ package.")
package.")
(license bsd-3)))
+(define-public ghc-old-locale
+ (package
+ (name "ghc-old-locale")
+ (version "1.0.0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/old-locale/old-locale-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32 "0l3viphiszvz5wqzg7a45zp40grwlab941q5ay29iyw8p3v8pbyv"))))
+ (build-system haskell-build-system)
+ (propagated-inputs
+ `())
+ (home-page "http://hackage.haskell.org/package/data-default") ;; TODO
+ (synopsis "Types with default values")
+ (description
+ "This package defines a class for types with a default value, and
+provides instances for types from the base, containers, dlist and old-locale
+packages.")
+ (license bsd-3)))
+
(define-public ghc-data-default-instances-old-locale
(package
(name "ghc-data-default-instances-old-locale")
@@ -377,7 +401,8 @@ package.")
(base32 "00h81i5phib741yj517p8mbnc48myvfj8axzsw44k34m48lv1lv0"))))
(build-system haskell-build-system)
(propagated-inputs
- `(("ghc-data-default-class" ,ghc-data-default-class)))
+ `(("ghc-data-default-class" ,ghc-data-default-class)
+ ("ghc-old-locale" ,ghc-old-locale)))
(home-page
"http://hackage.haskell.org/package/data-default-instances-old-locale")
(synopsis "Default instances for types in old-locale")
@@ -462,7 +487,7 @@ installation of Haskell libraries and programs.")
(define-public ghc-mtl
(package
(name "ghc-mtl")
- (version "2.1.3.1")
+ (version "2.2.1")
(outputs '("out" "doc"))
(source
(origin
@@ -473,7 +498,7 @@ installation of Haskell libraries and programs.")
".tar.gz"))
(sha256
(base32
- "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"))))
+ "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa"))))
(build-system haskell-build-system)
(home-page "http://github.com/ekmett/mtl")
(synopsis
@@ -512,7 +537,7 @@ http://web.cecs.pdx.edu/~mpj/pubs/springschool.html.")
(define-public ghc-utf8-string
(package
(name "ghc-utf8-string")
- (version "0.3.8")
+ (version "1.0.1.1")
(source
(origin
(method url-fetch)
@@ -521,7 +546,7 @@ http://web.cecs.pdx.edu/~mpj/pubs/springschool.html.")
version
".tar.gz"))
(sha256
- (base32 "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"))))
+ (base32 "0h7imvxkahiy8pzr8cpsimifdfvv18lizrb33k6mnq70rcx9w2zv"))))
(build-system haskell-build-system)
(home-page "http://github.com/glguy/utf8-string/")
(synopsis "Support for reading and writing UTF8 Strings")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
2015-10-15 12:20 ` [PATCH 02/43] gnu: ghc-old-locale: New package for updated GHC Paul van der Walt
@ 2015-10-15 12:20 ` Paul van der Walt
2015-10-19 13:36 ` Eric Bavier
2015-10-15 12:20 ` [PATCH 04/43] gnu: ghc-xmonad-contrib: Update to version 0.11.4 Paul van der Walt
` (21 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:20 UTC (permalink / raw)
To: guix-devel
* 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 <eric@dvorsak.fr>
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 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"))))))
(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 _
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
2015-10-15 12:20 ` [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform Paul van der Walt
@ 2015-10-19 13:36 ` Eric Bavier
2015-10-20 13:52 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 13:36 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
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(-)
>
> 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 <eric@dvorsak.fr>
> ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
> +;;; Copyright © 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 _
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
2015-10-19 13:36 ` Eric Bavier
@ 2015-10-20 13:52 ` Paul van der Walt
2015-10-21 22:08 ` Eric Bavier
0 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:52 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 15:36, quoth Eric Bavier:
>> + ("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.
It could, but since hackage provides this new Cabal file, it seemed
"cleanest" to not re-implement it as a patch. If you prefer, i could do
one of two things:
* Add a comment explaining that the patch simply changed the library
component's dependency on utf8-string from
>=0.3 && <0.4
to
>=0.3 && <1.1
or,
* Add that as a "(substitute ...)" type patch.
My thinking was that the fact that this new Cabal file comes from
Hackage lends it a certain "credibility", whereas otherwise it might
look like i'm arbitrarily modifying the Cabal file to make it compile.
I admit that this was also the easier approach, it seemed to me.
I'll make it into whatever you prefer, but before messing around i
thought i'd ask.
Cheers, and thanks for all the comments,
p.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
2015-10-20 13:52 ` Paul van der Walt
@ 2015-10-21 22:08 ` Eric Bavier
2015-10-22 10:13 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-21 22:08 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Tue, 20 Oct 2015 15:52:27 +0200
Paul van der Walt <paul@denknerd.org> wrote:
>
> On 2015-10-19 at 15:36, quoth Eric Bavier:
> >> + ("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.
>
> It could, but since hackage provides this new Cabal file, it seemed
> "cleanest" to not re-implement it as a patch. If you prefer, i could do
> one of two things:
>
> * Add a comment explaining that the patch simply changed the library
> component's dependency on utf8-string from
>
> >=0.3 && <0.4
>
> to
>
> >=0.3 && <1.1
>
> or,
>
> * Add that as a "(substitute ...)" type patch.
>
> My thinking was that the fact that this new Cabal file comes from
> Hackage lends it a certain "credibility", whereas otherwise it might
> look like i'm arbitrarily modifying the Cabal file to make it compile.
> I admit that this was also the easier approach, it seemed to me.
I think passing '#:configure-flags '("--allow-newer=utf8-string")' in
arguments might do the trick.
Otherwise, the "(substitute* ...)" approach, with a comment, seems
clearest to me.
WDYT?
Thanks for working on it,
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform
2015-10-21 22:08 ` Eric Bavier
@ 2015-10-22 10:13 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-22 10:13 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
Hi Eric,
On 2015-10-22 at 00:08, quoth Eric Bavier:
> I think passing '#:configure-flags '("--allow-newer=utf8-string")' in
> arguments might do the trick.
This argument doesn't seem to exist, unfortunately.
> Otherwise, the "(substitute* ...)" approach, with a comment, seems
> clearest to me.
I have indeed done that. In the end it's true that it makes the package
a lot more obvious to read, instead of many lines to download a file
which only changes 2 characters. I've pushed my latest attempt to the
usual wip- branch.
> Thanks for working on it,
No problem, thank you for putting up with my barrage of dubious patches!
:)
p.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 04/43] gnu: ghc-xmonad-contrib: Update to version 0.11.4.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
2015-10-15 12:20 ` [PATCH 02/43] gnu: ghc-old-locale: New package for updated GHC Paul van der Walt
2015-10-15 12:20 ` [PATCH 03/43] gnu: xmonad: Patch to work on new Haskell Platform Paul van der Walt
@ 2015-10-15 12:20 ` Paul van der Walt
2015-10-19 13:37 ` Eric Bavier
2015-10-15 12:20 ` [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2 Paul van der Walt
` (20 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:20 UTC (permalink / raw)
To: guix-devel
* gnu/packages/wm.scm (ghc-xmonad-contrib): Update to version 0.11.4.
---
gnu/packages/wm.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f2de576..2288b40 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -212,7 +212,7 @@ tiled on several screens.")
(define-public ghc-xmonad-contrib
(package
(name "ghc-xmonad-contrib")
- (version "0.11.3")
+ (version "0.11.4")
(source
(origin
(method url-fetch)
@@ -220,10 +220,11 @@ tiled on several screens.")
"xmonad-contrib-" version ".tar.gz"))
(sha256
(base32
- "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa"))))
+ "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3"))))
(build-system haskell-build-system)
(propagated-inputs
`(("ghc-mtl" ,ghc-mtl)
+ ("ghc-old-time" ,ghc-old-time)
("ghc-random" ,ghc-random)
("ghc-utf8-string" ,ghc-utf8-string)
("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 04/43] gnu: ghc-xmonad-contrib: Update to version 0.11.4.
2015-10-15 12:20 ` [PATCH 04/43] gnu: ghc-xmonad-contrib: Update to version 0.11.4 Paul van der Walt
@ 2015-10-19 13:37 ` Eric Bavier
2015-10-20 13:49 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 13:37 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:20:58 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/wm.scm (ghc-xmonad-contrib): Update to version 0.11.4.
> ---
> gnu/packages/wm.scm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index f2de576..2288b40 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
[...]
> (propagated-inputs
> `(("ghc-mtl" ,ghc-mtl)
> + ("ghc-old-time" ,ghc-old-time)
> ("ghc-random" ,ghc-random)
> ("ghc-utf8-string" ,ghc-utf8-string)
> ("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
Please mention this new input in the commit message.
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (2 preceding siblings ...)
2015-10-15 12:20 ` [PATCH 04/43] gnu: ghc-xmonad-contrib: Update to version 0.11.4 Paul van der Walt
@ 2015-10-15 12:20 ` Paul van der Walt
2015-10-15 18:23 ` Efraim Flashner
2015-10-15 12:21 ` [PATCH 06/43] gnu: ghc-text: Update to 1.2.1.3 Paul van der Walt
` (19 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:20 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-dlist): Update to version 0.7.1.2.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 51c7a95..482a19d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -413,7 +413,7 @@ packages.")
(define-public ghc-dlist
(package
(name "ghc-dlist")
- (version "0.7.1.1")
+ (version "0.7.1.2")
(source
(origin
(method url-fetch)
@@ -422,7 +422,7 @@ packages.")
version
".tar.gz"))
(sha256
- (base32 "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08"))))
+ (base32 "10rp96rryij7d8gz5kv8ygc6chm1624ck5mbnqs2a3fkdzqj2b9k"))))
(arguments `(#:tests? #f))
(build-system haskell-build-system)
(home-page "https://github.com/spl/dlist")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2.
2015-10-15 12:20 ` [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2 Paul van der Walt
@ 2015-10-15 18:23 ` Efraim Flashner
2015-10-15 19:22 ` Paul van der Walt
2015-10-15 19:30 ` Paul van der Walt
0 siblings, 2 replies; 59+ messages in thread
From: Efraim Flashner @ 2015-10-15 18:23 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]
On Thu, 15 Oct 2015 14:20:59 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-dlist): Update to version 0.7.1.2.
> ---
> gnu/packages/haskell.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 51c7a95..482a19d 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -413,7 +413,7 @@ packages.")
> (define-public ghc-dlist
> (package
> (name "ghc-dlist")
> - (version "0.7.1.1")
> + (version "0.7.1.2")
> (source
> (origin
> (method url-fetch)
> @@ -422,7 +422,7 @@ packages.")
> version
> ".tar.gz"))
> (sha256
> - (base32 "1zayvxvkan2s2ixajdr3f5rn1gzhprzv6cww4cbpwjhzw0l7zc08"))))
> + (base32 "10rp96rryij7d8gz5kv8ygc6chm1624ck5mbnqs2a3fkdzqj2b9k"))))
> (arguments `(#:tests? #f))
not related to your patch, but why no tests? some of the other haskell
packages say the required library isn't packed yet.
> (build-system haskell-build-system)
> (home-page "https://github.com/spl/dlist")
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2.
2015-10-15 18:23 ` Efraim Flashner
@ 2015-10-15 19:22 ` Paul van der Walt
2015-10-15 19:30 ` Paul van der Walt
1 sibling, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 19:22 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
Hey Efraim,
On 2015-10-15 at 20:23, quoth Efraim Flashner:
>> (arguments `(#:tests? #f))
>
> not related to your patch, but why no tests? some of the other haskell
> packages say the required library isn't packed yet.
You're right, i will double-check why they don't work, and add a
comment. Good catch; i'll grep haskell.scm to make sure all disabled
tests have justifications.
Thanks,
p.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2.
2015-10-15 18:23 ` Efraim Flashner
2015-10-15 19:22 ` Paul van der Walt
@ 2015-10-15 19:30 ` Paul van der Walt
1 sibling, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 19:30 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
On 2015-10-15 at 20:23, quoth Efraim Flashner:
> not related to your patch, but why no tests? some of the other haskell
> packages say the required library isn't packed yet.
It turns out that the tests work when i include ghc-quickcheck, but at
that point i hadn't yet packaged it. Somehow i thought there was a
circular dependency, but perhaps not.
Tests enabled now.
Thanks!
p.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 06/43] gnu: ghc-text: Update to 1.2.1.3.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (3 preceding siblings ...)
2015-10-15 12:20 ` [PATCH 05/43] gnu: ghc-dlist: Update to 0.7.1.2 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 07/43] gnu: ghc-hashable: Update to 1.2.3.3 Paul van der Walt
` (18 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-text): Update to 1.2.1.3.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 482a19d..67f5ebb 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -692,7 +692,7 @@ access to the full zlib feature set.")
(define-public ghc-text
(package
(name "ghc-text")
- (version "1.2.0.4")
+ (version "1.2.1.3")
(outputs '("out" "doc"))
(source
(origin
@@ -703,7 +703,7 @@ access to the full zlib feature set.")
".tar.gz"))
(sha256
(base32
- "004p1c74crs8wmjafwsmw3mmycspq1j8fpm1lvfpq6acha7bnpc6"))))
+ "0gzqx5cpkdhshbz9xss51mpyq23pnf8dwjz4h3irbv2ryaa4qdlq"))))
(build-system haskell-build-system)
(arguments
`(#:tests? #f)) ; FIXME: currently missing libraries used for tests.
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 07/43] gnu: ghc-hashable: Update to 1.2.3.3.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (4 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 06/43] gnu: ghc-text: Update to 1.2.1.3 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 08/43] gnu: ghc-primitive: Update to 0.6.1.0 Paul van der Walt
` (17 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-hashable): Update to 1.2.3.3.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 67f5ebb..f773b87 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -722,7 +722,7 @@ in terms of large data quantities and high speed.")
(define-public ghc-hashable
(package
(name "ghc-hashable")
- (version "1.2.3.2")
+ (version "1.2.3.3")
(outputs '("out" "doc"))
(source
(origin
@@ -733,7 +733,7 @@ in terms of large data quantities and high speed.")
".tar.gz"))
(sha256
(base32
- "0h9295pv2sgbaqlwpwbx2bap6nngm0jcdhkqham1wpjwyxqgqrlc"))))
+ "0kp4aj0x1iicz9qirpqxxqd8x5g1njbapxk1d90n406w3xykz4pw"))))
(build-system haskell-build-system)
(arguments
`(#:tests? #f)) ; FIXME: currently missing libraries used for tests.
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 08/43] gnu: ghc-primitive: Update to 0.6.1.0.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (5 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 07/43] gnu: ghc-hashable: Update to 1.2.3.3 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 09/43] gnu: ghc-quickcheck: Update to 2.8.1 Paul van der Walt
` (16 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-primitive): Update to 0.6.1.0.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index f773b87..f9729e1 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -797,7 +797,7 @@ library, including the ability to split random number generators.")
(define-public ghc-primitive
(package
(name "ghc-primitive")
- (version "0.5.4.0")
+ (version "0.6.1.0")
(outputs '("out" "doc"))
(source
(origin
@@ -808,7 +808,7 @@ library, including the ability to split random number generators.")
".tar.gz"))
(sha256
(base32
- "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"))))
+ "1j1q7l21rdm8kfs93vibr3xwkkhqis181w2k6klfhx5g5skiywwk"))))
(build-system haskell-build-system)
(home-page
"https://github.com/haskell/primitive")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 09/43] gnu: ghc-quickcheck: Update to 2.8.1.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (6 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 08/43] gnu: ghc-primitive: Update to 0.6.1.0 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 10/43] gnu: ghc-syb: Update to 0.6 Paul van der Walt
` (15 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-quickcheck): Update to 2.8.1.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index f9729e1..6ffeebc 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -848,7 +848,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.")
(define-public ghc-quickcheck
(package
(name "ghc-quickcheck")
- (version "2.8")
+ (version "2.8.1")
(outputs '("out" "doc"))
(source
(origin
@@ -859,7 +859,7 @@ Hashing\" by Claessen, Pałka for details and the rationale of the design.")
".tar.gz"))
(sha256
(base32
- "04xs6mq22bcnkpi616qrbm7jlivh9csnhmvjgp1ifq52an1wr4rx"))))
+ "0fvnfl30fxmj5q920l13641ar896d53z0z6z66m7c1366lvalwvh"))))
(build-system haskell-build-system)
(arguments
`(#:tests? #f ; FIXME: currently missing libraries used for tests.
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 10/43] gnu: ghc-syb: Update to 0.6.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (7 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 09/43] gnu: ghc-quickcheck: Update to 2.8.1 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 11/43] gnu: ghc-vector: Update to 0.11.0.0 Paul van der Walt
` (14 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-syb): Update to 0.6.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6ffeebc..2d71b49 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -912,7 +912,7 @@ to cases.")
(define-public ghc-syb
(package
(name "ghc-syb")
- (version "0.4.4")
+ (version "0.6")
(outputs '("out" "doc"))
(source
(origin
@@ -923,7 +923,7 @@ to cases.")
".tar.gz"))
(sha256
(base32
- "11sc9kmfvcn9bfxf227fgmny502z2h9xs3z0m9ak66lk0dw6f406"))))
+ "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 11/43] gnu: ghc-vector: Update to 0.11.0.0.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (8 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 10/43] gnu: ghc-syb: Update to 0.6 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 12/43] gnu: ghc-network: Update to 2.6.2.1 Paul van der Walt
` (13 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-vector): Update to 0.11.0.0.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 2d71b49..c262ac1 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1089,7 +1089,7 @@ is also parametric in the input stream type.")
(define-public ghc-vector
(package
(name "ghc-vector")
- (version "0.10.12.2")
+ (version "0.11.0.0")
(outputs '("out" "doc"))
(source
(origin
@@ -1100,7 +1100,7 @@ is also parametric in the input stream type.")
".tar.gz"))
(sha256
(base32
- "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"))))
+ "1r1jlksy7b0kb0fy00g64isk6nyd9wzzdq31gx5v1wn38knj0lqa"))))
(build-system haskell-build-system)
(inputs
`(("ghc-quickcheck" ,ghc-quickcheck)))
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 12/43] gnu: ghc-network: Update to 2.6.2.1.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (9 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 11/43] gnu: ghc-vector: Update to 0.11.0.0 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 13/43] gnu: ghc-old-time: Add variable Paul van der Walt
` (12 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-network): Update to 2.6.2.1.
* gnu/packages/haskell.scm (ghc-network-uri): Update to 2.6.0.3.
---
gnu/packages/haskell.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c262ac1..7950d7e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1118,7 +1118,7 @@ mutable and immutable), with a powerful loop optimisation framework.")
(define-public ghc-network
(package
(name "ghc-network")
- (version "2.6.0.2")
+ (version "2.6.2.1")
(outputs '("out" "doc"))
(source
(origin
@@ -1129,7 +1129,7 @@ mutable and immutable), with a powerful loop optimisation framework.")
".tar.gz"))
(sha256
(base32
- "12b7saam5ga6l4cplgkad49xa4vkynz2ri9jxidx1cxiqjcl0vc4"))))
+ "1yhvpd4wigz165jvyvw9zslx7lgqdj63jh3zv5s74b5ykdfa3zd3"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)))
@@ -1148,7 +1148,7 @@ mutable and immutable), with a powerful loop optimisation framework.")
(define-public ghc-network-uri
(package
(name "ghc-network-uri")
- (version "2.6.0.1")
+ (version "2.6.0.3")
(outputs '("out" "doc"))
(source
(origin
@@ -1159,7 +1159,7 @@ mutable and immutable), with a powerful loop optimisation framework.")
".tar.gz"))
(sha256
(base32
- "09ymamb128jgqghpda4nixncr73all8qc6q53976aricm6a27p37"))))
+ "1pwbqb2rk4rnvllvdch42p5368xcvpkanp7bxckdhxya8zzwvhhg"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 13/43] gnu: ghc-old-time: Add variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (10 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 12/43] gnu: ghc-network: Update to 2.6.2.1 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-16 13:29 ` Efraim Flashner
2015-10-19 13:46 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20 Paul van der Walt
` (11 subsequent siblings)
23 siblings, 2 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-old-time): New variable.
---
gnu/packages/haskell.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 7950d7e..2b607d1 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -386,6 +386,42 @@ provides instances for types from the base, containers, dlist and old-locale
packages.")
(license bsd-3)))
+(define-public ghc-old-time
+ (package
+ (name "ghc-old-time")
+ (version "1.1.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/old-time/old-time-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"))))
+ (build-system haskell-build-system)
+ (arguments
+ `(#:phases
+ (alist-cons-before
+ 'configure 'fix-/bin/sh
+ (lambda _
+ ;; Use `sh', not `/bin/sh'.
+ (substitute* (find-files "." "Makefile|configure")
+ (("/bin/sh")
+ "sh")))
+ %standard-phases)))
+ (propagated-inputs
+ `(("ghc-old-locale" ,ghc-old-locale)))
+ (home-page
+ "http://hackage.haskell.org/package/old-time")
+ (synopsis "Time library")
+ (description
+ "Package for backwards compatibility with the old time library. For new
+projects, the newer <http://hackage.haskell.org/package/time> time library is
+recommended.")
+ (license bsd-3)))
+
(define-public ghc-data-default-instances-old-locale
(package
(name "ghc-data-default-instances-old-locale")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 13/43] gnu: ghc-old-time: Add variable.
2015-10-15 12:21 ` [PATCH 13/43] gnu: ghc-old-time: Add variable Paul van der Walt
@ 2015-10-16 13:29 ` Efraim Flashner
2015-10-16 14:57 ` Paul van der Walt
2015-10-19 13:46 ` Eric Bavier
1 sibling, 1 reply; 59+ messages in thread
From: Efraim Flashner @ 2015-10-16 13:29 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 2275 bytes --]
On Thu, 15 Oct 2015 14:21:07 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-old-time): New variable.
> ---
> gnu/packages/haskell.scm | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 7950d7e..2b607d1 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -386,6 +386,42 @@ provides instances for types from the base,
> containers, dlist and old-locale packages.")
> (license bsd-3)))
>
> +(define-public ghc-old-time
> + (package
> + (name "ghc-old-time")
> + (version "1.1.0.3")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/old-time/old-time-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"))))
> + (build-system haskell-build-system)
> + (arguments
> + `(#:phases
> + (alist-cons-before
> + 'configure 'fix-/bin/sh
> + (lambda _
> + ;; Use `sh', not `/bin/sh'.
> + (substitute* (find-files "." "Makefile|configure")
> + (("/bin/sh")
> + "sh")))
> + %standard-phases)))
> + (propagated-inputs
> + `(("ghc-old-locale" ,ghc-old-locale)))
> + (home-page
> + "http://hackage.haskell.org/package/old-time")
> + (synopsis "Time library")
> + (description
> + "Package for backwards compatibility with the old time library. For new
> +projects, the newer <http://hackage.haskell.org/package/time> time library is
^^^
I think we have a new way of writing urls (and code) so they look all fancylike, but I'm not sure about the syntax.
> +recommended.")
> + (license bsd-3)))
> +
> (define-public ghc-data-default-instances-old-locale
> (package
> (name "ghc-data-default-instances-old-locale")
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 13/43] gnu: ghc-old-time: Add variable.
2015-10-15 12:21 ` [PATCH 13/43] gnu: ghc-old-time: Add variable Paul van der Walt
2015-10-16 13:29 ` Efraim Flashner
@ 2015-10-19 13:46 ` Eric Bavier
2015-10-20 13:48 ` Paul van der Walt
1 sibling, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 13:46 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
First line of commit message should rather be:
"gnu: Add ghc-old-time"
On Thu, 15 Oct 2015 14:21:07 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-old-time): New variable.
> ---
> gnu/packages/haskell.scm | 36 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 7950d7e..2b607d1 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -386,6 +386,42 @@ provides instances for types from the base, containers, dlist and old-locale
> packages.")
> (license bsd-3)))
>
> +(define-public ghc-old-time
> + (package
> + (name "ghc-old-time")
> + (version "1.1.0.3")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/old-time/old-time-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "1h9b26s3kfh2k0ih4383w90ibji6n0iwamxp6rfp2lbq1y5ibjqw"))))
> + (build-system haskell-build-system)
> + (arguments
> + `(#:phases
> + (alist-cons-before
> + 'configure 'fix-/bin/sh
> + (lambda _
> + ;; Use `sh', not `/bin/sh'.
> + (substitute* (find-files "." "Makefile|configure")
> + (("/bin/sh")
> + "sh")))
Is this not already handled by the 'patch-source-shebangs' and
'patch-generated-file-shebangs' phases?
This package is used in the "gnu: ghc-xmonad-contrib: Update to
version 0.11.4." patch, so it should be moved before it.
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 13/43] gnu: ghc-old-time: Add variable.
2015-10-19 13:46 ` Eric Bavier
@ 2015-10-20 13:48 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:48 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 15:46, quoth Eric Bavier:
> First line of commit message should rather be:
>
> "gnu: Add ghc-old-time"
Done.
>> + (arguments
>> + `(#:phases
>> + (alist-cons-before
>> + 'configure 'fix-/bin/sh
>> + (lambda _
>> + ;; Use `sh', not `/bin/sh'.
>> + (substitute* (find-files "." "Makefile|configure")
>> + (("/bin/sh")
>> + "sh")))
>
> Is this not already handled by the 'patch-source-shebangs' and
> 'patch-generated-file-shebangs' phases?
Nope, that didn't do the trick. There were one or two packages where i
encountered that issue.
> This package is used in the "gnu: ghc-xmonad-contrib: Update to
> version 0.11.4." patch, so it should be moved before it.
Done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (11 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 13/43] gnu: ghc-old-time: Add variable Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 13:49 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 15/43] gnu: cabal-install: Update to 1.22.6.0 Paul van der Walt
` (10 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-http): Update to 4000.2.20.
---
gnu/packages/haskell.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 2b607d1..43bac2c 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1215,7 +1215,7 @@ package into this package.")
(define-public ghc-http
(package
(name "ghc-http")
- (version "4000.2.19")
+ (version "4000.2.20")
(outputs '("out" "doc"))
(source
(origin
@@ -1226,12 +1226,13 @@ package into this package.")
".tar.gz"))
(sha256
(base32
- "1yzm8gimh8g0wwbixcbxg60v4l3vgi63w9v55ms0x9qnm6vrgysz"))))
+ "0nyqdxr5ls2dxkf4a1f3x15xzwdm46ppn99nkcbhswlr6s3cq1s4"))))
(build-system haskell-build-system)
(inputs
`(("ghc-hunit" ,ghc-hunit)))
(propagated-inputs
- `(("ghc-parsec" ,ghc-parsec)
+ `(("ghc-old-time" ,ghc-old-time)
+ ("ghc-parsec" ,ghc-parsec)
("ghc-mtl" ,ghc-mtl)
("ghc-network" ,ghc-network)
("ghc-network-uri" ,ghc-network-uri)))
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20.
2015-10-15 12:21 ` [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20 Paul van der Walt
@ 2015-10-19 13:49 ` Eric Bavier
2015-10-20 13:46 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 13:49 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:21:08 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-http): Update to 4000.2.20.
> ---
> gnu/packages/haskell.scm | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 2b607d1..43bac2c 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
[...]
> (propagated-inputs
> - `(("ghc-parsec" ,ghc-parsec)
> + `(("ghc-old-time" ,ghc-old-time)
> + ("ghc-parsec" ,ghc-parsec)
> ("ghc-mtl" ,ghc-mtl)
> ("ghc-network" ,ghc-network)
> ("ghc-network-uri" ,ghc-network-uri)))
Please mention this new input in the commit message.
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20.
2015-10-19 13:49 ` Eric Bavier
@ 2015-10-20 13:46 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:46 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 15:49, quoth Eric Bavier:
>> (propagated-inputs
>> - `(("ghc-parsec" ,ghc-parsec)
>> + `(("ghc-old-time" ,ghc-old-time)
>> + ("ghc-parsec" ,ghc-parsec)
>> ("ghc-mtl" ,ghc-mtl)
>> ("ghc-network" ,ghc-network)
>> ("ghc-network-uri" ,ghc-network-uri)))
>
> Please mention this new input in the commit message.
Done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 15/43] gnu: cabal-install: Update to 1.22.6.0.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (12 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 14/43] gnu: ghc-http: Update to 4000.2.20 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 16/43] gnu: ghc-ansi-terminal: New variable Paul van der Walt
` (9 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (cabal-install): Update to 1.22.6.0.
---
gnu/packages/haskell.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 43bac2c..6645a9d 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -492,7 +492,7 @@ versions of GHC (i.e., < 6.10).")
(define-public cabal-install
(package
(name "cabal-install")
- (version "1.18.1.0")
+ (version "1.22.6.0")
(source
(origin
(method url-fetch)
@@ -501,7 +501,7 @@ versions of GHC (i.e., < 6.10).")
version
".tar.gz"))
(sha256
- (base32 "1r1shhvnpgxf91rmbv3wa1rkd24plbgr6bpz3aj80ir0z3zbdayn"))))
+ (base32 "1d5h7h2wjwc2s3dvsvzjgmmfrfl2312ym2h6kyjgm9wnaqw9w8wx"))))
(arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
(build-system haskell-build-system)
(propagated-inputs
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 16/43] gnu: ghc-ansi-terminal: New variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (13 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 15/43] gnu: cabal-install: Update to 1.22.6.0 Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 13:53 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 17/43] gnu: ghc-containers: Remove variable Paul van der Walt
` (8 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/package/haskell.scm (ghc-ansi-terminal): New variable.
---
gnu/packages/haskell.scm | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6645a9d..4ec4971 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1212,6 +1212,29 @@ mutable and immutable), with a powerful loop optimisation framework.")
package into this package.")
(license bsd-3)))
+(define-public ghc-ansi-terminal
+ (package
+ (name "ghc-ansi-terminal")
+ (version "0.6.2.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/ansi-terminal/ansi-terminal-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0hpfw0k025y681m9ml1c712skrb1p4vh7z5x1f0ci9ww7ssjrh2d"))))
+ (build-system haskell-build-system)
+ (home-page "https://github.com/feuerbach/ansi-terminal")
+ (synopsis "Simple ANSI terminal support, with Windows compatibility")
+ (description "ANSI terminal support for Haskell: allows cursor movement,
+screen clearing, color output showing or hiding the cursor, and changing the
+title. Compatible with Windows and those Unixes with ANSI terminals, but only
+GHC is supported as a compiler.")
+ (license bsd-3)))
+
(define-public ghc-http
(package
(name "ghc-http")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 16/43] gnu: ghc-ansi-terminal: New variable.
2015-10-15 12:21 ` [PATCH 16/43] gnu: ghc-ansi-terminal: New variable Paul van der Walt
@ 2015-10-19 13:53 ` Eric Bavier
2015-10-20 13:45 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 13:53 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:21:10 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/package/haskell.scm (ghc-ansi-terminal): New variable.
> ---
> gnu/packages/haskell.scm | 23 +++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 6645a9d..4ec4971 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -1212,6 +1212,29 @@ mutable and immutable), with a powerful loop optimisation framework.")
> package into this package.")
> (license bsd-3)))
>
> +(define-public ghc-ansi-terminal
> + (package
> + (name "ghc-ansi-terminal")
> + (version "0.6.2.3")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/ansi-terminal/ansi-terminal-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "0hpfw0k025y681m9ml1c712skrb1p4vh7z5x1f0ci9ww7ssjrh2d"))))
> + (build-system haskell-build-system)
> + (home-page "https://github.com/feuerbach/ansi-terminal")
> + (synopsis "Simple ANSI terminal support, with Windows compatibility")
We don't really care about Winblows compatibility, and "simple" is
subjective. How about: " ANSI terminal support for Haskell"
> + (description "ANSI terminal support for Haskell: allows cursor movement,
> +screen clearing, color output showing or hiding the cursor, and changing the
> +title. Compatible with Windows and those Unixes with ANSI terminals, but only
> +GHC is supported as a compiler.")
> + (license bsd-3)))
Ditto here. I think we can leave off the last sentence entirely.
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 16/43] gnu: ghc-ansi-terminal: New variable.
2015-10-19 13:53 ` Eric Bavier
@ 2015-10-20 13:45 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:45 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 15:53, quoth Eric Bavier:
>> + (synopsis "Simple ANSI terminal support, with Windows compatibility")
>
> We don't really care about Winblows compatibility, and "simple" is
> subjective. How about: " ANSI terminal support for Haskell"
Done, and
>> + (description "ANSI terminal support for Haskell: allows cursor movement,
>> +screen clearing, color output showing or hiding the cursor, and changing the
>> +title. Compatible with Windows and those Unixes with ANSI terminals, but only
>> +GHC is supported as a compiler.")
>> + (license bsd-3)))
>
> Ditto here. I think we can leave off the last sentence entirely.
done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 17/43] gnu: ghc-containers: Remove variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (14 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 16/43] gnu: ghc-ansi-terminal: New variable Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 14:01 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 18/43] gnu: ghc-async: New variable Paul van der Walt
` (7 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-containers): Remove variable, package
provided by GHC 7.10.2.
---
gnu/packages/haskell.scm | 30 ------------------------------
1 file changed, 30 deletions(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 4ec4971..e7476e4 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -976,36 +976,6 @@ of constructor applications, instances of this class for primitive
types, and a variety of traversals.")
(license bsd-3)))
-(define-public ghc-containers
- (package
- (name "ghc-containers")
- (version "0.5.6.3")
- (outputs '("out" "doc"))
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "http://hackage.haskell.org/package/containers/containers-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "1kcd55nl0vzi99i8sr8fmc5j25fv7m0a9hd3nihnq1pd64pfciqn"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-hunit" ,ghc-hunit)
- ("ghc-quickcheck" ,ghc-quickcheck)))
- (arguments
- `(#:tests? #f)) ; FIXME: currently missing libraries used for tests.
- (home-page "http://hackage.haskell.org/package/containers")
- (synopsis "Assorted concrete container types")
- (description
- "This package contains efficient general-purpose implementations of
-various basic immutable container types. The declared cost of each operation
-is either worst-case or amortized, but remains valid even if structures are
-shared.")
- (license bsd-3)))
-
(define-public ghc-fgl
(package
(name "ghc-fgl")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 18/43] gnu: ghc-async: New variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (15 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 17/43] gnu: ghc-containers: Remove variable Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 14:08 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 19/43] gnu: ghc-setenv: " Paul van der Walt
` (6 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-async): New variable.
---
gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index e7476e4..cb2af0a 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1239,4 +1239,31 @@ lets you set up HTTP connections, transmitting requests and processing the
responses coming back.")
(license bsd-3)))
+(define-public ghc-async
+ (package
+ (name "ghc-async")
+ (version "2.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/async/async-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0azx4qk65a9a2gvqsfmz3w89m6shzr2iz0i5lly2zvly4n2d6m6v"))))
+ (build-system haskell-build-system)
+ (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
+ (propagated-inputs
+ `(("ghc-stm" ,ghc-stm)))
+ (inputs
+ `(("ghc-hunit" ,ghc-hunit)))
+ (home-page "https://github.com/simonmar/async")
+ (synopsis "Run IO operations asynchronously and wait for their results")
+ (description "Higher-level interface over threads in Haskell, in which
+Async a is a concurrent thread that will eventually deliver a value of type
+a.")
+ (license bsd-3)))
+
;;; haskell.scm ends here
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 18/43] gnu: ghc-async: New variable.
2015-10-15 12:21 ` [PATCH 18/43] gnu: ghc-async: New variable Paul van der Walt
@ 2015-10-19 14:08 ` Eric Bavier
2015-10-20 13:42 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 14:08 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:21:12 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-async): New variable.
> ---
> gnu/packages/haskell.scm | 27 +++++++++++++++++++++++++++
> 1 file changed, 27 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index e7476e4..cb2af0a 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -1239,4 +1239,31 @@ lets you set up HTTP connections, transmitting requests and processing the
> responses coming back.")
> (license bsd-3)))
>
> +(define-public ghc-async
> + (package
> + (name "ghc-async")
> + (version "2.0.2")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/async/async-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "0azx4qk65a9a2gvqsfmz3w89m6shzr2iz0i5lly2zvly4n2d6m6v"))))
> + (build-system haskell-build-system)
> + (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
If this is the case, can the "ghc-hunit" input be left out?
> + (propagated-inputs
> + `(("ghc-stm" ,ghc-stm)))
> + (inputs
> + `(("ghc-hunit" ,ghc-hunit)))
> + (home-page "https://github.com/simonmar/async")
> + (synopsis "Run IO operations asynchronously and wait for their results")
> + (description "Higher-level interface over threads in Haskell, in which
> +Async a is a concurrent thread that will eventually deliver a value of type
> +a.")
The first sentence here is a fragment. Also, I believe our new texinfo
support could come in handy here (and in other haskell packages, as
they seem to like including code fragments):
"This package provides a higher-level interface over threads in
Haskell, in which @code{Async a} is a concurrent thread that will
eventually deliver a value of type @code{a}."
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 18/43] gnu: ghc-async: New variable.
2015-10-19 14:08 ` Eric Bavier
@ 2015-10-20 13:42 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:42 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 16:08, quoth Eric Bavier:
>> + (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
>
> If this is the case, can the "ghc-hunit" input be left out?
It seems so. It compiles without. Fixed.
>> + (home-page "https://github.com/simonmar/async")
>> + (synopsis "Run IO operations asynchronously and wait for their results")
>> + (description "Higher-level interface over threads in Haskell, in which
>> +Async a is a concurrent thread that will eventually deliver a value of type
>> +a.")
>
> The first sentence here is a fragment. Also, I believe our new texinfo
> support could come in handy here (and in other haskell packages, as
> they seem to like including code fragments):
>
> "This package provides a higher-level interface over threads in
> Haskell, in which @code{Async a} is a concurrent thread that will
> eventually deliver a value of type @code{a}."
All fixed.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 19/43] gnu: ghc-setenv: New variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (16 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 18/43] gnu: ghc-async: New variable Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 14:14 ` Eric Bavier
2015-10-19 14:20 ` [PATCH 19/43] gnu: Add ghc-stringbuilder Eric Bavier
2015-10-15 12:21 ` [PATCH 20/43] gnu: ghc-quickcheck-io: Add variable Paul van der Walt
` (5 subsequent siblings)
23 siblings, 2 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-setenv): New variable.
* gnu/packages/haskell.scm (ghc-stringbuilder): New variable.
---
gnu/packages/haskell.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index cb2af0a..ad6547b 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -20,7 +20,7 @@
(define-module (gnu packages haskell)
#:use-module (ice-9 regex)
- #:use-module ((guix licenses) #:select (bsd-3 lgpl2.1))
+ #:use-module ((guix licenses) #:select (bsd-3 lgpl2.1 expat))
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix utils)
@@ -592,6 +592,29 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing
UTF8 without truncation.")
(license bsd-3)))
+(define-public ghc-setenv
+ (package
+ (name "ghc-setenv")
+ (version "0.1.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/setenv/setenv-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"))))
+ (build-system haskell-build-system)
+ (home-page
+ "http://hackage.haskell.org/package/setenv")
+ (synopsis
+ "A cross-platform library for setting environment variables")
+ (description
+ "A cross-platform library for setting environment variables.")
+ (license expat)))
+
(define-public ghc-x11
(package
(name "ghc-x11")
@@ -652,6 +675,29 @@ bindings are a direct translation of the C bindings.")
parts.")
(license lgpl2.1)))
+(define-public ghc-stringbuilder
+ (package
+ (name "ghc-stringbuilder")
+ (version "0.5.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/stringbuilder/stringbuilder-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"))))
+ (build-system haskell-build-system)
+ (arguments `(#:tests? #f)) ; circular dependencies with tests enabled
+ (inputs
+ `(("ghc-quickcheck" ,ghc-quickcheck)))
+ (home-page "http://hackage.haskell.org/package/stringbuilder")
+ (synopsis "A writer monad for multi-line string literals")
+ (description "A writer monad for multi-line string literals")
+ (license expat)))
+
(define-public ghc-zlib
(package
(name "ghc-zlib")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 19/43] gnu: ghc-setenv: New variable.
2015-10-15 12:21 ` [PATCH 19/43] gnu: ghc-setenv: " Paul van der Walt
@ 2015-10-19 14:14 ` Eric Bavier
2015-10-20 13:38 ` Paul van der Walt
2015-10-19 14:20 ` [PATCH 19/43] gnu: Add ghc-stringbuilder Eric Bavier
1 sibling, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 14:14 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:21:13 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-setenv): New variable.
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index cb2af0a..ad6547b 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -20,7 +20,7 @@
>
> (define-module (gnu packages haskell)
> #:use-module (ice-9 regex)
> - #:use-module ((guix licenses) #:select (bsd-3 lgpl2.1))
> + #:use-module ((guix licenses) #:select (bsd-3 lgpl2.1 expat))
> #:use-module (guix packages)
> #:use-module (guix download)
> #:use-module (guix utils)
> @@ -592,6 +592,29 @@ for encoding UTF8 strings to Word8 lists and back, and for reading and writing
> UTF8 without truncation.")
> (license bsd-3)))
>
> +(define-public ghc-setenv
> + (package
> + (name "ghc-setenv")
> + (version "0.1.1.3")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/setenv/setenv-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"))))
> + (build-system haskell-build-system)
> + (home-page
> + "http://hackage.haskell.org/package/setenv")
Please put the string on the same line as a field name.
> + (synopsis
> + "A cross-platform library for setting environment variables")
Ditto. (Note: A realize the patch on the wip-haskell-platform-7.10.2-a
is slightly different, but the same issues are there)
> + (description
> + "A cross-platform library for setting environment variables.")
In both the synopsis and the description, we don't really care about
the "cross-platform" nature of this package. Could you adjust the
wording a bit?
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 19/43] gnu: ghc-setenv: New variable.
2015-10-19 14:14 ` Eric Bavier
@ 2015-10-20 13:38 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:38 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 16:14, quoth Eric Bavier:
>> + (home-page
>> + "http://hackage.haskell.org/package/setenv")
>
> Please put the string on the same line as a field name.
Done.
>> + (synopsis
>> + "A cross-platform library for setting environment variables")
>
> Ditto. (Note: A realize the patch on the wip-haskell-platform-7.10.2-a
> is slightly different, but the same issues are there)
Done.
>> + (description
>> + "A cross-platform library for setting environment variables.")
>
> In both the synopsis and the description, we don't really care about
> the "cross-platform" nature of this package. Could you adjust the
> wording a bit?
Done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 19/43] gnu: Add ghc-stringbuilder.
2015-10-15 12:21 ` [PATCH 19/43] gnu: ghc-setenv: " Paul van der Walt
2015-10-19 14:14 ` Eric Bavier
@ 2015-10-19 14:20 ` Eric Bavier
2015-10-20 13:33 ` Paul van der Walt
1 sibling, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 14:20 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Thu, 15 Oct 2015 14:21:13 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-stringbuilder): New variable.
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index cb2af0a..ad6547b 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -652,6 +675,29 @@ bindings are a direct translation of the C bindings.")
> parts.")
> (license lgpl2.1)))
>
> +(define-public ghc-stringbuilder
> + (package
> + (name "ghc-stringbuilder")
> + (version "0.5.0")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/stringbuilder/stringbuilder-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "1ap95xphqnrhv64c2a137wqslkdmb2jjd9ldb17gs1pw48k8hrl9"))))
> + (build-system haskell-build-system)
> + (arguments `(#:tests? #f)) ; circular dependencies with tests enabled
> + (inputs
> + `(("ghc-quickcheck" ,ghc-quickcheck)))
Is this input still necessary with tests disabled?
> + (home-page "http://hackage.haskell.org/package/stringbuilder")
> + (synopsis "A writer monad for multi-line string literals")
> + (description "A writer monad for multi-line string literals")
> + (license expat)))
> +
> (define-public ghc-zlib
> (package
> (name "ghc-zlib")
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 20/43] gnu: ghc-quickcheck-io: Add variable.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (17 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 19/43] gnu: ghc-setenv: " Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 21/43] gnu: ghc-transformers-compat: New variables Paul van der Walt
` (4 subsequent siblings)
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-quickcheck-io): Add variable.
---
gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ad6547b..2585c81 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -927,6 +927,31 @@ the paper \"Splittable Pseudorandom Number Generators Using Cryptographic
Hashing\" by Claessen, Pałka for details and the rationale of the design.")
(license bsd-3)))
+(define-public ghc-quickcheck-io
+ (package
+ (name "ghc-quickcheck-io")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/quickcheck-io/quickcheck-io-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1kf1kfw9fsmly0rvzvdf6jvdw10qhkmikyj0wcwciw6wad95w9sh"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-hunit" ,ghc-hunit)))
+ (home-page
+ "https://github.com/hspec/quickcheck-io#readme")
+ (synopsis "Use HUnit assertions as QuickCheck properties")
+ (description "This package provides an orphan instance that allows you to
+use HUnit assertions as QuickCheck properties.")
+ (license expat)))
+
(define-public ghc-quickcheck
(package
(name "ghc-quickcheck")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 21/43] gnu: ghc-transformers-compat: New variables.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (18 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 20/43] gnu: ghc-quickcheck-io: Add variable Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 14:37 ` Eric Bavier
2015-10-15 12:21 ` [PATCH 22/43] gnu: ghc-hspec: " Paul van der Walt
` (3 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-transformers-compat): New variable.
* gnu/packages/haskell.scm (ghc-exceptions): New variable.
* gnu/packages/haskell.scm (ghc-temporary): New variable.
* gnu/packages/haskell.scm (ghc-silently): New variable.
---
gnu/packages/haskell.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 106 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 2585c81..adc9d82 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -927,6 +927,112 @@ the paper \"Splittable Pseudorandom Number Generators Using Cryptographic
Hashing\" by Claessen, Pałka for details and the rationale of the design.")
(license bsd-3)))
+(define-public ghc-transformers-compat
+ (package
+ (name "ghc-transformers-compat")
+ (version "0.4.0.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/transformers-compat"
+ "/transformers-compat-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym"))))
+ (build-system haskell-build-system)
+ (home-page "http://github.com/ekmett/transformers-compat/")
+ (synopsis "A small compatibility shim exposing the new types from
+transformers 0.3 and 0.4 to older Haskell platforms.")
+ (description "This package includes backported versions of types that were
+added to transformers in transformers 0.3 and 0.4 for users who need strict
+transformers 0.2 or 0.3 compatibility to run on old versions of the platform,
+but also need those types.")
+ (license bsd-3)))
+
+(define-public ghc-exceptions
+ (package
+ (name "ghc-exceptions")
+ (version "0.8.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/exceptions/exceptions-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"))))
+ (build-system haskell-build-system)
+ (arguments `(#:tests? #f))
+ (propagated-inputs
+ `(("ghc-stm" ,ghc-stm)
+ ("ghc-mtl" ,ghc-mtl)
+ ("ghc-transformers-compat" ,ghc-transformers-compat)))
+ (inputs
+ `(("ghc-quickcheck" ,ghc-quickcheck)))
+ (home-page
+ "http://github.com/ekmett/exceptions/")
+ (synopsis
+ "Extensible optionally-pure exceptions")
+ (description
+ "Extensible optionally-pure exceptions")
+ (license bsd-3)))
+
+(define-public ghc-temporary
+ (package
+ (name "ghc-temporary")
+ (version "1.2.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/temporary/temporary-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a"))))
+ (build-system haskell-build-system)
+ (propagated-inputs `(("ghc-exceptions" ,ghc-exceptions)))
+ (home-page
+ "http://www.github.com/batterseapower/temporary")
+ (synopsis "Portable temporary file and directory support for Windows and
+Unix, based on code from Cabal")
+ (description "The functions for creating temporary files and directories
+in the base library are quite limited. The unixutils package contains some
+good ones, but they aren't portable to Windows. This library just repackages
+the Cabal implementations of its own temporary file and folder functions so
+that you can use them without linking against Cabal or depending on it being
+installed.")
+ (license bsd-3)))
+
+(define-public ghc-silently
+ (package
+ (name "ghc-silently")
+ (version "1.2.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/silently/silently-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf"))))
+ (build-system haskell-build-system)
+ (arguments `(#:tests? #f)) ;; circular dependency with nanospec
+ (inputs
+ `(("ghc-temporary" ,ghc-temporary)))
+ (home-page "https://github.com/hspec/silently")
+ (synopsis
+ "Prevent or capture writing to stdout and other handles.")
+ (description
+ "Prevent or capture writing to stdout and other handles.")
+ (license bsd-3)))
+
(define-public ghc-quickcheck-io
(package
(name "ghc-quickcheck-io")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 21/43] gnu: ghc-transformers-compat: New variables.
2015-10-15 12:21 ` [PATCH 21/43] gnu: ghc-transformers-compat: New variables Paul van der Walt
@ 2015-10-19 14:37 ` Eric Bavier
2015-10-20 14:12 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: Eric Bavier @ 2015-10-19 14:37 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
You've split these packages into separate commits on the
wip-haskell-platform-7.10.2-a branch, but it's easier for me to comment
here on all.
On Thu, 15 Oct 2015 14:21:15 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> * gnu/packages/haskell.scm (ghc-transformers-compat): New variable.
> * gnu/packages/haskell.scm (ghc-exceptions): New variable.
> * gnu/packages/haskell.scm (ghc-temporary): New variable.
> * gnu/packages/haskell.scm (ghc-silently): New variable.
> ---
> gnu/packages/haskell.scm | 106 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 106 insertions(+)
>
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 2585c81..adc9d82 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
[...]
> +(define-public ghc-exceptions
> + (package
> + (name "ghc-exceptions")
> + (version "0.8.0.2")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/exceptions/exceptions-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "1x1bk1jf42k1gigiqqmkkh38z2ffhx8rsqiszdq3f94m2h6kw2h7"))))
> + (build-system haskell-build-system)
> + (arguments `(#:tests? #f))
> + (propagated-inputs
> + `(("ghc-stm" ,ghc-stm)
> + ("ghc-mtl" ,ghc-mtl)
> + ("ghc-transformers-compat" ,ghc-transformers-compat)))
> + (inputs
> + `(("ghc-quickcheck" ,ghc-quickcheck)))
Is this still required even with '#:tests? #f'?
> + (home-page
> + "http://github.com/ekmett/exceptions/")
> + (synopsis
> + "Extensible optionally-pure exceptions")
> + (description
> + "Extensible optionally-pure exceptions")
This is a fragment. In general, I notice that the formatting style
varies a bit accross packages. Could you make sure that formatting, at
least within gnu/packages/haskell.scm is mostly consistent?
> + (license bsd-3)))
> +
> +(define-public ghc-temporary
> + (package
> + (name "ghc-temporary")
> + (version "1.2.0.3")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/temporary/temporary-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "0is67bmsjmbbw6wymhis8wyq9gax3sszm573p5719fx2c9z9r24a"))))
> + (build-system haskell-build-system)
> + (propagated-inputs `(("ghc-exceptions" ,ghc-exceptions)))
> + (home-page
> + "http://www.github.com/batterseapower/temporary")
> + (synopsis "Portable temporary file and directory support for Windows and
> +Unix, based on code from Cabal")
> + (description "The functions for creating temporary files and directories
> +in the base library are quite limited. The unixutils package contains some
> +good ones, but they aren't portable to Windows. This library just repackages
> +the Cabal implementations of its own temporary file and folder functions so
> +that you can use them without linking against Cabal or depending on it being
> +installed.")
> + (license bsd-3)))
Again, we don't really need to mantion portability aspects.
> +
> +(define-public ghc-silently
> + (package
> + (name "ghc-silently")
> + (version "1.2.5")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append
> + "http://hackage.haskell.org/package/silently/silently-"
> + version
> + ".tar.gz"))
> + (sha256
> + (base32
> + "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf"))))
> + (build-system haskell-build-system)
> + (arguments `(#:tests? #f)) ;; circular dependency with nanospec
> + (inputs
> + `(("ghc-temporary" ,ghc-temporary)))
Is this required with '#:tests? #f', and if so, does it need to be
propagated?
> + (home-page "https://github.com/hspec/silently")
> + (synopsis
> + "Prevent or capture writing to stdout and other handles.")
I notice you fixed this in the wip branch. Thanks.
> + (description
> + "Prevent or capture writing to stdout and other handles.")
Could you expand this so it's not a fragment?
Thanks,
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 21/43] gnu: ghc-transformers-compat: New variables.
2015-10-19 14:37 ` Eric Bavier
@ 2015-10-20 14:12 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 14:12 UTC (permalink / raw)
To: Eric Bavier; +Cc: guix-devel
On 2015-10-19 at 16:37, quoth Eric Bavier:
>> + (package
>> + (name "ghc-exceptions")
>> .....
>> + (inputs
>> + `(("ghc-quickcheck" ,ghc-quickcheck)))
>
> Is this still required even with '#:tests? #f'?
Turns out it's not. Fixed.
>> + (description
>> + "Extensible optionally-pure exceptions")
>
> This is a fragment. In general, I notice that the formatting style
> varies a bit accross packages. Could you make sure that formatting, at
> least within gnu/packages/haskell.scm is mostly consistent?
Fixed in this package, will look at the rest before pushing.
>> + (package
>> + (name "ghc-temporary")
>> .....
>> + (synopsis "Portable temporary file and directory support for Windows and
>> +Unix, based on code from Cabal")
>> + (description "The functions for creating temporary files and directories
>> +in the base library are quite limited. The unixutils package contains some
>> +good ones, but they aren't portable to Windows. This library just repackages
>> +the Cabal implementations of its own temporary file and folder functions so
>> +that you can use them without linking against Cabal or depending on it being
>> +installed.")
>> + (license bsd-3)))
>
> Again, we don't really need to mantion portability aspects.
Fixed.
>> + (package
>> + (name "ghc-silently")
>> + (arguments `(#:tests? #f)) ;; circular dependency with nanospec
>> + (inputs
>> + `(("ghc-temporary" ,ghc-temporary)))
>
> Is this required with '#:tests? #f', and if so, does it need to be
> propagated?
You're right, it seems it was only necessary for the tests. Removed
entirely.
>> + (description
>> + "Prevent or capture writing to stdout and other handles.")
>
> Could you expand this so it's not a fragment?
Done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 22/43] gnu: ghc-hspec: New variables.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (19 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 21/43] gnu: ghc-transformers-compat: New variables Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-19 14:56 ` [PATCH 032/151] gnu: Add ghc-hspec-discover ericbavier
2015-10-15 12:21 ` [PATCH 23/43] gnu: ghc-regex-base: New variables Paul van der Walt
` (2 subsequent siblings)
23 siblings, 1 reply; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-hspec): New variable.
* gnu/packages/haskell.scm (ghc-hspec-expectations): New variable.
* gnu/packages/haskell.scm (ghc-hspec-discover): New variable.
* gnu/packages/haskell.scm (ghc-hspec-core): New variable.
* gnu/packages/haskell.scm (ghc-hspec-meta): New variable.
---
gnu/packages/haskell.scm | 137 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 137 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index adc9d82..6ffdf11 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1416,6 +1416,143 @@ lets you set up HTTP connections, transmitting requests and processing the
responses coming back.")
(license bsd-3)))
+(define-public ghc-hspec
+ (package
+ (name "ghc-hspec")
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec/hspec-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0zqisxznlbszivsgy3irvf566zhcr6ipqqj3x9i7pj5hy913jwqf"))))
+ (build-system haskell-build-system)
+ (propagated-inputs
+ `(("ghc-hspec-core" ,ghc-hspec-core)
+ ("ghc-hspec-discover" ,ghc-hspec-discover)
+ ("ghc-hspec-expectations" ,ghc-hspec-expectations)
+ ("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-hunit" ,ghc-hunit)))
+ (inputs
+ `(("ghc-stringbuilder" ,ghc-stringbuilder)
+ ("ghc-hspec-meta" ,ghc-hspec-meta)))
+ (home-page "http://hspec.github.io/")
+ (synopsis "Testing Framework for Haskell")
+ (description "Testing framework for Haskell, inspired by the Ruby library
+RSpec.")
+ (license expat)))
+
+(define-public ghc-hspec-expectations
+ (package
+ (name "ghc-hspec-expectations")
+ (version "0.7.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec-expectations/hspec-expectations-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1w56jiqfyl237sr207gh3b0l8sr9layy0mdsgd5wknzb49mif6ip"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-hunit" ,ghc-hunit)))
+ (home-page
+ "https://github.com/sol/hspec-expectations#readme")
+ (synopsis "Catchy combinators for HUnit")
+ (description "Catchy combinators for HUnit:
+<https://github.com/sol/hspec-expectations#readme>.")
+ (license expat)))
+
+(define-public ghc-hspec-discover
+ (package
+ (name "ghc-hspec-discover")
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec-discover/hspec-discover-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0w3awzbljf4hqhxrjrxqa1lfcclg92bhmq641gz2q80vycspapzx"))))
+ (build-system haskell-build-system)
+ (arguments `(#:haddock? #f))
+ (inputs `(("ghc-hspec-meta" ,ghc-hspec-meta)))
+ (home-page "http://hspec.github.io/")
+ (synopsis "Automatically discover and run Hspec tests")
+ (description "Automatically discover and run Hspec tests.")
+ (license expat)))
+
+(define-public ghc-hspec-core
+ (package
+ (name "ghc-hspec-core")
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec-core/hspec-core-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1wgd55k652jaf81nkvciyqi67ycj7zamr4nd9z1cqf8nr9fc3sa4"))))
+ (build-system haskell-build-system)
+ (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
+ (propagated-inputs
+ `(("ghc-setenv" ,ghc-setenv)
+ ("ghc-ansi-terminal" ,ghc-ansi-terminal)
+ ("ghc-async" ,ghc-async)
+ ("ghc-quickcheck-io" ,ghc-quickcheck-io)))
+ (inputs
+ `(("ghc-hunit" ,ghc-hunit)
+ ("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-hspec-expectations" ,ghc-hspec-expectations)
+ ("ghc-silently" ,ghc-silently)))
+ (home-page "http://hspec.github.io/")
+ (synopsis "A Testing Framework for Haskell")
+ (description "Exposes internal types and functions that can be used to
+extend Hspec's functionality.")
+ (license expat)))
+
+(define-public ghc-hspec-meta
+ (package
+ (name "ghc-hspec-meta")
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec-meta/hspec-meta-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1fmqmgrzp135cxhmxxbaswkk4bqbpgfml00cmcz0d39n11vzpa5z"))))
+ (build-system haskell-build-system)
+ (propagated-inputs
+ `(("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-hunit" ,ghc-hunit)
+ ("ghc-ansi-terminal" ,ghc-ansi-terminal)
+ ("ghc-async" ,ghc-async)
+ ("ghc-hspec-expectations" ,ghc-hspec-expectations)
+ ("ghc-setenv" ,ghc-setenv)
+ ("ghc-random" ,ghc-random)
+ ("ghc-quickcheck-io" ,ghc-quickcheck-io)))
+ (home-page "http://hspec.github.io/")
+ (synopsis "A version of Hspec which is used to test Hspec itself")
+ (description "A stable version of Hspec which is used to test the
+in-development version of Hspec.")
+ (license expat)))
+
(define-public ghc-async
(package
(name "ghc-async")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-15 12:21 ` [PATCH 22/43] gnu: ghc-hspec: " Paul van der Walt
@ 2015-10-19 14:56 ` ericbavier
2015-10-20 13:30 ` Paul van der Walt
0 siblings, 1 reply; 59+ messages in thread
From: ericbavier @ 2015-10-19 14:56 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
From: Paul van der Walt <paul@denknerd.org>
* gnu/packages/haskell.scm (ghc-hspec-discover): New variable.
---
gnu/packages/haskell.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 307fa64..1a8b321 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1435,6 +1435,28 @@ responses coming back.")
@uref{https://github.com/sol/hspec-expectations#readme, the README}.")
(license expat)))
+(define-public ghc-hspec-discover
+ (package
+ (name "ghc-hspec-discover")
IMHO the name should be "hspec-discover" as this is a standalone program,
rather than a haskell library.
+ (version "2.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/hspec-discover/hspec-discover-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0w3awzbljf4hqhxrjrxqa1lfcclg92bhmq641gz2q80vycspapzx"))))
+ (build-system haskell-build-system)
+ (arguments `(#:haddock? #f))
Add a comment here noting how there are no documentation files.
+ (inputs `(("ghc-hspec-meta" ,ghc-hspec-meta)))
+ (home-page "http://hspec.github.io/")
+ (synopsis "Automatically discover and run Hspec tests")
+ (description "Automatically discover and run Hspec tests.")
Expand this to a full sentence.
`~Eric
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-19 14:56 ` [PATCH 032/151] gnu: Add ghc-hspec-discover ericbavier
@ 2015-10-20 13:30 ` Paul van der Walt
2015-10-20 9:59 ` Eric Bavier
` (2 more replies)
0 siblings, 3 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 13:30 UTC (permalink / raw)
To: ericbavier; +Cc: guix-devel
Hi Eric,
I'm starting to fix up your comments.
When i'm done, should i git push -f to the wip-haskell-platform-7.10.2-a
branch, or should i drop that one and create a new one?
On 2015-10-19 at 16:56, quoth ericbavier@openmailbox.org:
> +(define-public ghc-hspec-discover
> + (package
> + (name "ghc-hspec-discover")
>
> IMHO the name should be "hspec-discover" as this is a standalone program,
> rather than a haskell library.
Changed.
> + (arguments `(#:haddock? #f))
>
> Add a comment here noting how there are no documentation files.
Done.
> + (description "Automatically discover and run Hspec tests.")
>
> Expand this to a full sentence.
Done.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-20 13:30 ` Paul van der Walt
@ 2015-10-20 9:59 ` Eric Bavier
2015-10-20 14:57 ` Ludovic Courtès
2015-10-20 15:18 ` Thompson, David
2 siblings, 0 replies; 59+ messages in thread
From: Eric Bavier @ 2015-10-20 9:59 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Tue, 20 Oct 2015 15:30:12 +0200
Paul van der Walt <paul@denknerd.org> wrote:
> Hi Eric,
>
> I'm starting to fix up your comments.
Thanks! I'll have another chance to look through more patches later
today.
> When i'm done, should i git push -f to the wip-haskell-platform-7.10.2-a
> branch, or should i drop that one and create a new one?
I think force pushing is fine. I'll make sure to do a 'git pull'
before continuing to review.
`~Eric
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-20 13:30 ` Paul van der Walt
2015-10-20 9:59 ` Eric Bavier
@ 2015-10-20 14:57 ` Ludovic Courtès
2015-10-20 15:31 ` Paul van der Walt
2015-10-20 15:18 ` Thompson, David
2 siblings, 1 reply; 59+ messages in thread
From: Ludovic Courtès @ 2015-10-20 14:57 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
Paul van der Walt <paul@denknerd.org> skribis:
> I'm starting to fix up your comments.
>
> When i'm done, should i git push -f to the wip-haskell-platform-7.10.2-a
> branch, or should i drop that one and create a new one?
‘push -f’ is fine. The convention is that ‘wip-’ branches may be
rebased/modified any time.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-20 14:57 ` Ludovic Courtès
@ 2015-10-20 15:31 ` Paul van der Walt
0 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-20 15:31 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hello Eric, Ludo',
On 2015-10-20 at 16:57, quoth Ludovic Courtès:
> ‘push -f’ is fine. The convention is that ‘wip-’ branches may be
> rebased/modified any time.
Eric: Thanks for the comments, i've gone over the descriptions and tried
to make them all better (no sentence fragments, etc.). Thanks for your
patience, it's a huge amount of work :(.
Ludo: As Dave mentioned, i've killed and recreated the remote branch.
Ready for review again, at `wip-haskell-platform-7.10.2-a`.
Thanks,
p.
^ permalink raw reply [flat|nested] 59+ messages in thread
* Re: [PATCH 032/151] gnu: Add ghc-hspec-discover.
2015-10-20 13:30 ` Paul van der Walt
2015-10-20 9:59 ` Eric Bavier
2015-10-20 14:57 ` Ludovic Courtès
@ 2015-10-20 15:18 ` Thompson, David
2 siblings, 0 replies; 59+ messages in thread
From: Thompson, David @ 2015-10-20 15:18 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
On Tue, Oct 20, 2015 at 9:30 AM, Paul van der Walt <paul@denknerd.org> wrote:
> Hi Eric,
>
> I'm starting to fix up your comments.
>
> When i'm done, should i git push -f to the wip-haskell-platform-7.10.2-a
> branch, or should i drop that one and create a new one?
You cannot force push to the Savannah repo. Instead, do the latter
option: Delete the branch from the remote and re-create it.
Thanks,
- Dave
^ permalink raw reply [flat|nested] 59+ messages in thread
* [PATCH 23/43] gnu: ghc-regex-base: New variables.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (20 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 22/43] gnu: ghc-hspec: " Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:21 ` [PATCH 24/43] gnu: ghc-split: Update dependencies Paul van der Walt
2015-10-15 12:33 ` [PATCH 01/43] gnu: ghc: Update to 7.10.2 Mathieu Lirzin
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-regex-base): New variable.
* gnu/packages/haskell.scm (ghc-appar): New variable.
* gnu/packages/haskell.scm (ghc-safe): New variable.
* gnu/packages/haskell.scm (ghc-generic-deriving): New variable.
* gnu/packages/haskell.scm (ghc-pcre-light): New variable.
* gnu/packages/haskell.scm (ghc-logict): New variable.
* gnu/packages/haskell.scm (ghc-xml): New variable.
* gnu/packages/haskell.scm (ghc-quickcheck-unicode): New variable.
---
gnu/packages/haskell.scm | 190 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 190 insertions(+)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6ffdf11..328d06e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -37,6 +37,7 @@
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages python)
+ #:use-module (gnu packages pcre)
#:use-module (gnu packages xorg))
(define ghc-bootstrap-x86_64-7.8.4
@@ -950,6 +951,171 @@ transformers 0.2 or 0.3 compatibility to run on old versions of the platform,
but also need those types.")
(license bsd-3)))
+(define-public ghc-regex-base
+ (package
+ (name "ghc-regex-base")
+ (version "0.93.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/regex-base/regex-base-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-mtl" ,ghc-mtl)))
+ (home-page
+ "http://sourceforge.net/projects/lazy-regex")
+ (synopsis "Replaces/Enhances Text.Regex")
+ (description
+ "Interface API for regex-posix, pcre, parsec, tdfa, dfa.")
+ (license bsd-3)))
+
+(define-public ghc-appar
+ (package
+ (name "ghc-appar")
+ (version "0.1.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/appar/appar-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "09jb9ij78fdkz2qk66rw99q19qnm504dpv0yq0pjsl6xwjmndsjq"))))
+ (build-system haskell-build-system)
+ (home-page
+ "http://hackage.haskell.org/package/appar")
+ (synopsis "A simple applicative parser")
+ (description
+ "A simple applicative parser in Parsec style.")
+ (license bsd-3)))
+
+(define-public ghc-safe
+ (package
+ (name "ghc-safe")
+ (version "0.3.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/safe/safe-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1jdnp5zhvalf1xy8i872n29nljfjz6lnl9ghj80ffisrnnkrwcfh"))))
+ (build-system haskell-build-system)
+ (home-page
+ "https://github.com/ndmitchell/safe#readme")
+ (synopsis
+ "Library of safe (exception free) functions")
+ (description
+ "A library wrapping Prelude/Data.List functions that can throw
+exceptions, such as head and !!.")
+ (license bsd-3)))
+
+(define-public ghc-generic-deriving
+ (package
+ (name "ghc-generic-deriving")
+ (version "1.8.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/generic-deriving/generic-deriving-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1kc6lhdanls6kgpk8xv5xi14lz1sngcd8xn930hkf7ilq4kxkcr6"))))
+ (build-system haskell-build-system)
+ (home-page "https://hackage.haskell.org/package/generic-deriving")
+ (synopsis "Functionality for generalising the deriving mechanism in
+Haskell to arbitrary classes.")
+ (description "Functionality for generalising the deriving mechanism in
+Haskell to arbitrary classes.")
+ (license bsd-3)))
+
+(define-public ghc-pcre-light
+ (package
+ (name "ghc-pcre-light")
+ (version "0.4.0.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/pcre-light/pcre-light-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0l1df2sk5qwf424bvb8mbdkr2xjg43fi92n5r22yd7vm1zz0jqvf"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("pcre" ,pcre)))
+ (home-page
+ "https://github.com/Daniel-Diaz/pcre-light")
+ (synopsis
+ "A small, efficient and portable regex library for Perl 5 compatible
+regular expressions")
+ (description
+ "A small, efficient and portable regex library for Perl 5 compatible
+regular expressions. The PCRE library is a set of functions that implement
+regular expression pattern matching using the same syntax and semantics as
+Perl 5.")
+ (license bsd-3)))
+
+(define-public ghc-logict
+ (package
+ (name "ghc-logict")
+ (version "0.6.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/logict/logict-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-mtl" ,ghc-mtl)))
+ (home-page "http://code.haskell.org/~dolio/")
+ (synopsis "A backtracking logic-programming monad.")
+ (description "A continuation-based, backtracking, logic programming
+monad. An adaptation of the two-continuation implementation found in the paper
+\"Backtracking, Interleaving, and Terminating Monad Transformers\" available
+here: <http://okmij.org/ftp/papers/LogicT.pdf>.")
+ (license bsd-3)))
+
+(define-public ghc-xml
+ (package
+ (name "ghc-xml")
+ (version "1.3.14")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/xml/xml-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-text" ,ghc-text)))
+ (home-page "http://code.galois.com")
+ (synopsis "A simple XML library.")
+ (description "A simple XML library.")
+ (license bsd-3)))
+
(define-public ghc-exceptions
(package
(name "ghc-exceptions")
@@ -1033,6 +1199,30 @@ installed.")
"Prevent or capture writing to stdout and other handles.")
(license bsd-3)))
+(define-public ghc-quickcheck-unicode
+ (package
+ (name "ghc-quickcheck-unicode")
+ (version "1.0.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://hackage.haskell.org/package/quickcheck-unicode/quickcheck-unicode-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-quickcheck" ,ghc-quickcheck)))
+ (home-page
+ "https://github.com/bos/quickcheck-unicode")
+ (synopsis "Generator and shrink functions for testing Unicode-related
+software.")
+ (description "Generator and shrink functions for testing Unicode-related
+software.")
+ (license bsd-3)))
+
(define-public ghc-quickcheck-io
(package
(name "ghc-quickcheck-io")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* [PATCH 24/43] gnu: ghc-split: Update dependencies.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (21 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 23/43] gnu: ghc-regex-base: New variables Paul van der Walt
@ 2015-10-15 12:21 ` Paul van der Walt
2015-10-15 12:33 ` [PATCH 01/43] gnu: ghc: Update to 7.10.2 Mathieu Lirzin
23 siblings, 0 replies; 59+ messages in thread
From: Paul van der Walt @ 2015-10-15 12:21 UTC (permalink / raw)
To: guix-devel
* gnu/packages/haskell.scm (ghc-split): Update package dependencies for
compatibility with new GHC.
---
gnu/packages/haskell.scm | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 328d06e..e0fdf1f 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1418,8 +1418,27 @@ and high speed.")
(base32
"0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"))))
(build-system haskell-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before
+ 'configure 'update-cabal
+ ;; the cabal file on hackage is updated, but the tar.gz does not
+ ;; include it.
+ (lambda* _
+ (copy-file (assoc-ref %build-inputs "ghc-split-cabal-update")
+ "split.cabal"))))))
(inputs
- `(("ghc-quickcheck" ,ghc-quickcheck)))
+ `(("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-split-cabal-update"
+ ,(origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/split-"
+ version "/revision/1.cabal"))
+ (sha256
+ (base32
+ "1i1h5v1zqvganhzy1wdd9r648yjpir078n0g8051njg82h2f964h"))))))
(home-page "http://hackage.haskell.org/package/split")
(synopsis
"Combinator library for splitting lists")
--
2.6.1
^ permalink raw reply related [flat|nested] 59+ messages in thread
* Re: [PATCH 01/43] gnu: ghc: Update to 7.10.2.
2015-10-15 12:20 [PATCH 01/43] gnu: ghc: Update to 7.10.2 Paul van der Walt
` (22 preceding siblings ...)
2015-10-15 12:21 ` [PATCH 24/43] gnu: ghc-split: Update dependencies Paul van der Walt
@ 2015-10-15 12:33 ` Mathieu Lirzin
23 siblings, 0 replies; 59+ messages in thread
From: Mathieu Lirzin @ 2015-10-15 12:33 UTC (permalink / raw)
To: Paul van der Walt; +Cc: guix-devel
> [PATCH 01/43] gnu: ghc: Update to 7.10.2.
^^
O mijn God... :)
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 59+ messages in thread