05/05: gnu: Add ghc-containers.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 7d4e377ff5dfb0b708255e30741f2d26407f1677
Author: Tonton <***@riseup.net>
Date: Fri May 11 22:34:05 2018 +0200

gnu: Add ghc-containers.

* gnu/packages/haskell.scm (ghc-containers): New variable.

Signed-off-by: Ludovic Courtès <***@gnu.org>
---
gnu/packages/haskell.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index c65df28..39c0c0a 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -9490,4 +9490,35 @@ within appropriate monads, as well as some instances of these classes.")
(home-page "https://hackage.haskell.org/package/array")
(license license:bsd-3)))

+(define-public ghc-containers
+ (package
+ (name "ghc-containers")
+ (version "0.5.11.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://hackage.haskell.org/package/containers-0.5.11.0/containers-"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0j29w09kvcn1c0yi4clmrdbgs2gqmpxs2m7q80ib2ix1smm25kaq"))))
+ (build-system haskell-build-system)
+ (inputs `(("ghc-array" ,ghc-array)
+ ("ghc-deepseq" ,ghc-deepseq-generics)
+ ("ghc-hunit" ,ghc-hunit)
+ ("ghc-chasingbottoms" ,ghc-chasingbottoms)
+ ("ghc-test-framework" ,ghc-test-framework)
+ ("ghc-test-framework-hunit" ,ghc-test-framework-hunit)
+ ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2)
+ ("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-ghc-prim" ,ghc-primitive)))
+ (synopsis "Haskell containers: Assorted concrete container types")
+ (description "This Haskell module provides efficient general-purpose
+implementations of various immutable container types including sets, maps,
+sequences, trees, and graphs.")
+ (home-page "https://hackage.haskell.org/package/containers")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 9e7b87ddc51c640c529d445e350c3d6ef43e301d
Author: Ludovic Courtès <***@gnu.org>
Date: Sun May 13 16:07:12 2018 +0200

build: 'test-env' does not 'guix download' non-existent files.

Reported by uniq10.

* build-aux/test-env.in: Check whether FILE exists before invoking 'guix
download'.
---
build-aux/test-env.in | 1 +
1 file changed, 1 insertion(+)

diff --git a/build-aux/test-env.in b/build-aux/test-env.in
index 52082c6..aaadcf2 100644
--- a/build-aux/test-env.in
+++ b/build-aux/test-env.in
@@ -132,6 +132,7 @@ then

for file in "$bootstrap_directory"/guile-*
do
+ [ -f "$file" ] && \
"@abs_top_builddir@/pre-inst-env" \
guix download "file://$file" > /dev/null
done

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 44cea5784128353f0449899ae4ca7fdb5259c024
Author: Tonton <***@riseup.net>
Date: Fri May 11 22:29:32 2018 +0200

gnu: Add ghc-quickcheck-2.9.

* gnu/packages/haskell-check.scm (ghc-quickcheck-2.9): New variable.

Signed-off-by: Ludovic Courtès <***@gnu.org>
---
gnu/packages/haskell-check.scm | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 6b1d769..7453f9f 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Danny Milosavljevic <***@scratchpost.org>
;;; Copyright © 2017 rsiddharth <***@ricketyspace.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <***@tobias.gr>
+;;; Copyright © 2018 Tonton <***@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -451,6 +452,19 @@ hold in a large number of randomly generated cases. Specifications are
expressed in Haskell, using combinators defined in the QuickCheck library.")
(license license:bsd-3)))

+(define-public ghc-quickcheck-2.9
+ (package
+ (inherit ghc-quickcheck)
+ (name "ghc-quickcheck")
+ (version "2.9.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/QuickCheck-2.9.2/QuickCheck-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "119np67qvx8hyp9vkg4gr2wv3lj3j6ay2vl4hxspkg43ymb1cp0m"))))))
+
(define-public ghc-quickcheck-latest
(package (inherit ghc-quickcheck)
(version "2.11.3")

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit e5d92c1ce197ec6da891f69565fe550f502f8e7c
Author: Tonton <***@riseup.net>
Date: Fri May 11 22:34:04 2018 +0200

gnu: Add ghc-array.

* gnu/packages/haskell.scm (ghc-array): New variable.

Signed-off-by: Ludovic Courtès <***@gnu.org>
---
gnu/packages/haskell.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 9b26ff5..c65df28 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2017, 2018 Alex Vong <***@gmail.com>
;;; Copyright © 2017 rsiddharth <***@ricketyspace.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <***@tobias.gr>
+;;; Copyright © 2018 Tonton <***@riseup.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -9466,4 +9467,27 @@ system dependencies.")
address string against RFC 5322.")
(license license:bsd-3)))

+(define-public ghc-array
+ (package
+ (name "ghc-array")
+ (version "0.5.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://hackage.haskell.org/package/array-0.5.2.0/array-"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"))))
+ (build-system haskell-build-system)
+ (synopsis "Haskell @code{Data.Array} module")
+ (description "In addition to providing the @code{Data.Array} module as
+specified in the Haskell 2010 Language Report, this package defines the
+classes @code{IArray} of immutable arrays and @code{MArray} of arrays mutable
+within appropriate monads, as well as some instances of these classes.")
+ (home-page "https://hackage.haskell.org/package/array")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 68fdb38f542d66d329778582c28bf7fad24324a9
Author: Ludovic Courtès <***@gnu.org>
Date: Sun May 13 22:40:33 2018 +0200

gnu: robocut: Remove unnecessary dependency on qttools.

Reported by Efraim Flashner.

* gnu/packages/printers.scm (robocut)[native-inputs]: Replace QTTOOLS
with QTBASE, which is where 'qmake' lives.
---
gnu/packages/printers.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 2e58018..f8890cb 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -60,7 +60,7 @@
("qtsvg" ,qtsvg)))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("qmake" ,qttools)))
+ ("qmake" ,qtbase)))
(synopsis "Graphical program to drive plotting cutters")
(description
"Robocut is a simple graphical program that allows you to cut graphics