[PATCH 01/21] gnu: Add ghc-haddock-library.

[PATCH 01/21] gnu: Add ghc-haddock-library.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-haddock-library): New variable.
---
 gnu/packages/haskell.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 5af933d..95c1e31 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -389,6 +389,36 @@ package.")
 package.")
     (license bsd-3)))
 
+(define-public ghc-haddock-library
+  (package
+    (name "ghc-haddock-library")
+    (version "1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/haddock-library/haddock-library-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0mhh2ppfhrvvi9485ipwbkv2fbgj35jvz3la02y3jlvg5ffs1c8g"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-base-compat" ,ghc-base-compat)
+       ("ghc-hspec" ,ghc-hspec)
+       ("ghc-quickcheck" ,ghc-quickcheck)))
+    (home-page "http://www.haskell.org/haddock/")
+    (synopsis
+     "Library exposing some functionality of Haddock")
+    (description
+     "Haddock is a documentation-generation tool for Haskell libraries.  These
+modules expose some functionality of it without pulling in the GHC dependency.
+Please note that the API is likely to change so specify upper bounds in your
+project if you can't release often.  For interacting with Haddock itself, see
+the ‘haddock’ package.")
+    (license bsd-3)))
+
 (define-public ghc-simple-reflect
   (package
     (name "ghc-simple-reflect")
-- 
2.6.1

[PATCH 02/21] gnu: Add ghc-haddock-api.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-haddock-api): New variable.
---
 gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 95c1e31..6e683ca 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -419,6 +419,31 @@ project if you can't release often.  For interacting with Haddock itself, see
 the ‘haddock’ package.")
     (license bsd-3)))
 
+(define-public ghc-haddock-api
+  (package
+    (name "ghc-haddock-api")
+    (version "2.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/haddock-api/haddock-api-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1spd5axg1pdjv4dkdb5gcwjsc8gg37qi4mr2k2db6ayywdkis1p2"))))
+    (build-system haskell-build-system)
+    (propagated-inputs
+     `(("ghc-paths" ,ghc-paths)
+       ("ghc-haddock-library" ,ghc-haddock-library)))
+    (home-page "http://www.haskell.org/haddock/")
+    (synopsis
+     "A documentation-generation tool for Haskell libraries")
+    (description
+     "Haddock is a documentation-generation tool for Haskell libraries.")
+    (license bsd-3)))
+
 (define-public ghc-simple-reflect
   (package
     (name "ghc-simple-reflect")
-- 
2.6.1

[PATCH 03/21] gnu: Add ghc-haddock.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-haddock): New variable.
---
 gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6e683ca..60bbb41 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -444,6 +444,32 @@ the ‘haddock’ package.")
      "Haddock is a documentation-generation tool for Haskell libraries.")
     (license bsd-3)))
 
+(define-public ghc-haddock
+  (package
+    (name "ghc-haddock")
+    (version "2.16.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/haddock/haddock-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1mnnvc5jqp6n6rj7xw8wdm0z2xp9fndkz11c8p3vbljsrcqd3v26"))))
+    (build-system haskell-build-system)
+    (arguments `(#:tests? #f)) ; FIXME: Tests break with GHC 7.10.2, fixed
+                               ; upstream.  See
+                               ; <https://github.com/haskell/haddock/issues/427>
+    (inputs `(("ghc-haddock-api" ,ghc-haddock-api)))
+    (home-page "http://www.haskell.org/haddock/")
+    (synopsis
+     "A documentation-generation tool for Haskell libraries")
+    (description
+     "Haddock is a documentation-generation tool for Haskell libraries.")
+    (license bsd-3)))
+
 (define-public ghc-simple-reflect
   (package
     (name "ghc-simple-reflect")
-- 
2.6.1

[PATCH 04/21] gnu: Add ghc-alex.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-alex): New variable.
---
 gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 60bbb41..6c5833c 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -497,6 +497,35 @@ are no options for manipulating the reflected expressions beyond showing
 them.")
     (license bsd-3)))
 
+(define-public ghc-alex
+  (package
+    (name "ghc-alex")
+    (version "3.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/alex/alex-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "17x13nbbr79xgdlzywjqw19vcl6iygjnssjnxnajgijkv764wknn"))))
+    (build-system haskell-build-system)
+    (arguments `(#:tests? #f)) ; FIXME: Tests broken for GHC 7.10.  Fixed
+                               ; upstream, see
+                               ; <https://github.com/simonmar/alex/issues/62>
+    (inputs `(("ghc-quickcheck" ,ghc-quickcheck)))
+    (home-page "http://www.haskell.org/alex/")
+    (synopsis
+     "Tool for generating lexical analysers in Haskell")
+    (description
+     "Alex is a tool for generating lexical analysers in Haskell.  It takes a
+description of tokens based on regular expressions and generates a Haskell
+module containing code for scanning text efficiently.  It is similar to the
+tool lex or flex for C/C++.")
+    (license bsd-3)))
+
 (define-public ghc-cmdargs
   (package
     (name "ghc-cmdargs")
-- 
2.6.1

[PATCH 05/21] gnu: Add ghc-multipart.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-multipart): New variable.
---
 gnu/packages/haskell.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 6c5833c..908a87c 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -497,6 +497,30 @@ are no options for manipulating the reflected expressions beyond showing
 them.")
     (license bsd-3)))
 
+(define-public ghc-multipart
+  (package
+    (name "ghc-multipart")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/multipart/multipart-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5"))))
+    (build-system haskell-build-system)
+    (inputs `(("ghc-parsec" ,ghc-parsec)))
+    (home-page
+     "http://www.github.com/silkapp/multipart")
+    (synopsis
+     "HTTP multipart library")
+    (description
+     "HTTP multipart split out of the cgi package, for Haskell.")
+    (license bsd-3)))
+
 (define-public ghc-alex
   (package
     (name "ghc-alex")
-- 
2.6.1

[PATCH 06/21] gnu: Add ghc-cgi.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-cgi): New variable.
---
 gnu/packages/haskell.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 908a87c..72ab311 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -550,6 +550,37 @@ module containing code for scanning text efficiently.  It is similar to the
 tool lex or flex for C/C++.")
     (license bsd-3)))
 
+(define-public ghc-cgi
+  (package
+    (name "ghc-cgi")
+    (version "3001.2.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/cgi/cgi-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-parsec" ,ghc-parsec)
+       ("ghc-old-locale" ,ghc-old-locale)
+       ("ghc-old-time" ,ghc-old-time)
+       ("ghc-exceptions" ,ghc-exceptions)
+       ("ghc-multipart" ,ghc-multipart)
+       ("ghc-network-uri" ,ghc-network-uri)
+       ("ghc-network" ,ghc-network)
+       ("ghc-mtl" ,ghc-mtl)))
+    (home-page
+     "https://github.com/cheecheeo/haskell-cgi")
+    (synopsis "A library for writing CGI programs")
+    (description
+     "This is a Haskell library for writing CGI programs.")
+    (license bsd-3)))
+
 (define-public ghc-cmdargs
   (package
     (name "ghc-cmdargs")
-- 
2.6.1

[PATCH 07/21] gnu: Add ghc-html.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-html): 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 72ab311..7623ea9 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -521,6 +521,29 @@ them.")
      "HTTP multipart split out of the cgi package, for Haskell.")
     (license bsd-3)))
 
+(define-public ghc-html
+  (package
+    (name "ghc-html")
+    (version "1.0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/html/html-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0q9hmfii62kc82ijlg238fxrzxhsivn42x5wd6ffcr9xldg4jd8c"))))
+    (build-system haskell-build-system)
+    (home-page
+     "http://hackage.haskell.org/package/html")
+    (synopsis "HTML combinator library")
+    (description
+     "This package contains a combinator library for constructing HTML
+documents.")
+    (license bsd-3)))
+
 (define-public ghc-alex
   (package
     (name "ghc-alex")
-- 
2.6.1

[PATCH 08/21] gnu: Add ghc-haskell-src.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-haskell-src): New variable.
---
 gnu/packages/haskell.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 7623ea9..acaccd0 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -544,6 +544,35 @@ them.")
 documents.")
     (license bsd-3)))
 
+(define-public ghc-haskell-src
+  (package
+    (name "ghc-haskell-src")
+    (version "1.0.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/haskell-src/haskell-src-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-happy" ,ghc-happy)
+       ("ghc-syb" ,ghc-syb)))
+    (home-page
+     "http://hackage.haskell.org/package/haskell-src")
+    (synopsis
+     "Support for manipulating Haskell source code")
+    (description
+     "The 'haskell-src' package provides support for manipulating Haskell
+source code.  The package provides a lexer, parser and pretty-printer, and a
+definition of a Haskell abstract syntax tree (AST).  Common uses of this
+package are to parse or generate Haskell 98 code.")
+    (license bsd-3)))
+
 (define-public ghc-alex
   (package
     (name "ghc-alex")
-- 
2.6.1

[PATCH 09/21] gnu: Add ghc-xhtml.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-xhtml): 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 acaccd0..e6c2b54 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -544,6 +544,28 @@ them.")
 documents.")
     (license bsd-3)))
 
+(define-public ghc-xhtml
+  (package
+    (name "ghc-xhtml")
+    (version "3000.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/xhtml/xhtml-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik"))))
+    (build-system haskell-build-system)
+    (home-page "https://github.com/haskell/xhtml")
+    (synopsis "An XHTML combinator library")
+    (description
+     "This package provides combinators for producing XHTML 1.0, including the
+Strict, Transitional and Frameset variants.")
+    (license bsd-3)))
+
 (define-public ghc-haskell-src
   (package
     (name "ghc-haskell-src")
-- 
2.6.1

[PATCH 10/21] gnu: Add ghc-regex-posix.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-regex-posix): 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 e6c2b54..e75af99 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1706,6 +1706,29 @@ IPv4 and IPv6 are supported.")
      "Interface API for regex-posix, pcre, parsec, tdfa, dfa.")
     (license bsd-3)))
 
+(define-public ghc-regex-posix
+  (package
+    (name "ghc-regex-posix")
+    (version "0.95.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/regex-posix/regex-posix-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an"))))
+    (build-system haskell-build-system)
+    (inputs `(("ghc-regex-base" ,ghc-regex-base)))
+    (home-page
+     "http://sourceforge.net/projects/lazy-regex")
+    (synopsis "Replaces/Enhances Text.Regex")
+    (description
+     "The posix regex backend for regex-base.")
+    (license bsd-3)))
+
 (define-public ghc-regex-tdfa-rc
   (package
     (name "ghc-regex-tdfa-rc")
-- 
2.6.1

[PATCH 11/21] gnu: Add ghc-regex-compat.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-regex-compat): New variable.
---
 gnu/packages/haskell.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index e75af99..1032133 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1729,6 +1729,31 @@ IPv4 and IPv6 are supported.")
      "The posix regex backend for regex-base.")
     (license bsd-3)))
 
+(define-public ghc-regex-compat
+  (package
+    (name "ghc-regex-compat")
+    (version "0.95.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/regex-compat/regex-compat-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-regex-base" ,ghc-regex-base)
+       ("ghc-regex-posix" ,ghc-regex-posix)))
+    (home-page
+     "http://sourceforge.net/projects/lazy-regex")
+    (synopsis "Replaces/Enhances Text.Regex")
+    (description
+     "One module layer over regex-posix to replace Text.Regex.")
+    (license bsd-3)))
+
 (define-public ghc-regex-tdfa-rc
   (package
     (name "ghc-regex-tdfa-rc")
-- 
2.6.1

[PATCH 12/21] gnu: Add ghc-half.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-half): New variable.
---
 gnu/packages/haskell.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 1032133..4987777 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -838,6 +838,27 @@ you can safely allocate resources.")
 XSS attacks.")
     (license bsd-3)))
 
+(define-public ghc-half
+  (package
+    (name "ghc-half")
+    (version "0.2.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/half/half-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0zhwc6ps5w4ccnxl8sy623z4rjsafmnry69jpkw4hrbq11l402f1"))))
+    (build-system haskell-build-system)
+    (home-page "http://github.com/ekmett/half")
+    (synopsis "Half-precision floating-point")
+    (description "Half-precision floating-point computation library for
+Haskell.")
+    (license bsd-3)))
+
 (define-public ghc-streaming-commons
   (package
     (name "ghc-streaming-commons")
-- 
2.6.1

[PATCH 13/21] gnu: Add ghc-openglraw.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-openglraw): New variable.
---
 gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 4987777..3877398 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -30,6 +30,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages zip)
   #:use-module (gnu packages gcc)
@@ -859,6 +860,42 @@ XSS attacks.")
 Haskell.")
     (license bsd-3)))
 
+(define-public ghc-openglraw
+  (package
+    (name "ghc-openglraw")
+    (version "2.5.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-half" ,ghc-half)
+       ("glu" ,glu)
+       ("ghc-text" ,ghc-text)))
+    (home-page
+     "http://www.haskell.org/haskellwiki/Opengl")
+    (synopsis
+     "A raw binding for the OpenGL graphics system")
+    (description
+     "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system
+and lots of OpenGL extensions.  It is basically a 1:1 mapping of OpenGL's C
+API, intended as a basis for a nicer interface. OpenGLRaw offers access to all
+necessary functions, tokens and types plus a general facility for loading
+extension entries.  The module hierarchy closely mirrors the naming structure
+of the OpenGL extensions, making it easy to find the right module to import.
+All API entries are loaded dynamically, so no special C header files are
+needed for building this package.  If an API entry is not found at runtime, a
+userError is thrown.")
+    (license bsd-3)))
+    (license bsd-3)))
+
 (define-public ghc-streaming-commons
   (package
     (name "ghc-streaming-commons")
-- 
2.6.1

Re: [PATCH 13/21] gnu: Add ghc-openglraw.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]

On Fri, 16 Oct 2015 15:11:57 +0200
Paul van der Walt <paul@denknerd.org> wrote:

> * gnu/packages/haskell.scm (ghc-openglraw): New variable.
> ---
>  gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
> 
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 4987777..3877398 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -30,6 +30,7 @@
>    #:use-module (gnu packages perl)
>    #:use-module (gnu packages compression)
>    #:use-module (gnu packages elf)
> +  #:use-module (gnu packages gl)
>    #:use-module (gnu packages bootstrap)
>    #:use-module (gnu packages zip)
>    #:use-module (gnu packages gcc)
> @@ -859,6 +860,42 @@ XSS attacks.")
>  Haskell.")
>      (license bsd-3)))
>  
> +(define-public ghc-openglraw
> +  (package
> +    (name "ghc-openglraw")
> +    (version "2.5.1.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "http://hackage.haskell.org/package/OpenGLRaw/OpenGLRaw-"
> +             version
> +             ".tar.gz"))
> +       (sha256
> +        (base32
> +         "1kfq24mxg922ml3kkmym2qfpc56jbmrfbiix4rc2cxlwv05i191k"))))
> +    (build-system haskell-build-system)
> +    (inputs
> +     `(("ghc-half" ,ghc-half)
> +       ("glu" ,glu)
> +       ("ghc-text" ,ghc-text)))
> +    (home-page
> +     "http://www.haskell.org/haskellwiki/Opengl")
> +    (synopsis
> +     "A raw binding for the OpenGL graphics system")
> +    (description
> +     "OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system
> +and lots of OpenGL extensions.  It is basically a 1:1 mapping of OpenGL's C
> +API, intended as a basis for a nicer interface. OpenGLRaw offers access to all
Two spaces between sentences			 ^^^
> +necessary functions, tokens and types plus a general facility for loading
> +extension entries.  The module hierarchy closely mirrors the naming structure
> +of the OpenGL extensions, making it easy to find the right module to import. 
> +All API entries are loaded dynamically, so no special C header files are
> +needed for building this package.  If an API entry is not found at runtime, a 
> +userError is thrown.")
> +    (license bsd-3)))
> +    (license bsd-3)))
       ^^^ Only need this line once :)
> +
>  (define-public ghc-streaming-commons
>    (package
>      (name "ghc-streaming-commons")



-- 
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 --]

Re: [PATCH 13/21] gnu: Add ghc-openglraw.

[Paul van der Walt]

Hey Efraim!

On 2015-10-18 at 20:44, quoth Efraim Flashner:
>> +API, intended as a basis for a nicer interface. OpenGLRaw offers access to all
> Two spaces between sentences			 ^^^

Correct!  I've run `guix lint` on all my new packages (should have done
that first, sorry!) and all these errors have been resolved.

>> +    (license bsd-3)))
>> +    (license bsd-3)))
>        ^^^ Only need this line once :)

Indeed, i made a mistake when adding the separate git hunks, this has
been fixed on my local patches.  Good catch, and sorry!

Good evening!
p.

[PATCH 14/21] gnu: Add ghc-gluraw.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-gluraw): New variable.
---
 gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 3877398..e196278 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -894,6 +894,32 @@ All API entries are loaded dynamically, so no special C header files are
 needed for building this package.  If an API entry is not found at runtime, a
 userError is thrown.")
     (license bsd-3)))
+
+(define-public ghc-gluraw
+  (package
+    (name "ghc-gluraw")
+    (version "1.5.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/GLURaw/GLURaw-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0gscd9lhp9mb10q8s716nx26m8qng9xbb4h6b3f48zzgkc1sy96x"))))
+    (build-system haskell-build-system)
+    (propagated-inputs
+     `(("ghc-openglraw" ,ghc-openglraw)))
+    (home-page
+     "http://www.haskell.org/haskellwiki/Opengl")
+    (synopsis
+     "A raw binding for the OpenGL graphics system")
+    (description
+     "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library.
+It is basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
+interface.")
     (license bsd-3)))
 
 (define-public ghc-streaming-commons
-- 
2.6.1

Re: [PATCH 14/21] gnu: Add ghc-gluraw.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1893 bytes --]

On Fri, 16 Oct 2015 15:11:58 +0200
Paul van der Walt <paul@denknerd.org> wrote:

> * gnu/packages/haskell.scm (ghc-gluraw): New variable.
> ---
>  gnu/packages/haskell.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
> index 3877398..e196278 100644
> --- a/gnu/packages/haskell.scm
> +++ b/gnu/packages/haskell.scm
> @@ -894,6 +894,32 @@ All API entries are loaded dynamically, so no special
> C header files are needed for building this package.  If an API entry is
> not found at runtime, a userError is thrown.")
>      (license bsd-3)))
> +
> +(define-public ghc-gluraw
> +  (package
> +    (name "ghc-gluraw")
> +    (version "1.5.0.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "http://hackage.haskell.org/package/GLURaw/GLURaw-"
> +             version
> +             ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0gscd9lhp9mb10q8s716nx26m8qng9xbb4h6b3f48zzgkc1sy96x"))))
> +    (build-system haskell-build-system)
> +    (propagated-inputs
> +     `(("ghc-openglraw" ,ghc-openglraw)))
> +    (home-page
> +     "http://www.haskell.org/haskellwiki/Opengl")
> +    (synopsis
> +     "A raw binding for the OpenGL graphics system")
> +    (description
> +     "GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library.
> +It is basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
> +interface.")
>      (license bsd-3)))
I see now what happened with the extra license line
>  
>  (define-public ghc-streaming-commons



-- 
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 --]

Re: [PATCH 14/21] gnu: Add ghc-gluraw.

[Paul van der Walt]

On 2015-10-18 at 20:46, quoth Efraim Flashner:
>> +interface.")
>>      (license bsd-3)))
> I see now what happened with the extra license line

Confirmed.  I've fixed that in my local branch.

Do you think it'd be worthwhile to push my local patches to a new
branch, so that everyone can review the newest changes, since i've fixed
up a lot of little errors?

p.

[PATCH 15/21] gnu: Add ghc-objectname.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-objectname): 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 e196278..21366e2 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -839,6 +839,29 @@ you can safely allocate resources.")
 XSS attacks.")
     (license bsd-3)))
 
+(define-public ghc-objectname
+  (package
+    (name "ghc-objectname")
+    (version "1.1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/ObjectName/ObjectName-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0kh5fb9ykag6rfsm3f0bx3w323s18w2cyry34w5xgli5ncqimadg"))))
+    (build-system haskell-build-system)
+    (home-page "https://hackage.haskell.org/package/ObjectName")
+    (synopsis "Helper library for Haskell OpenGL")
+    (description "This tiny package contains the class ObjectName, which
+corresponds to the general notion of explicitly handled identifiers for API
+objects, e.g. a texture object name in OpenGL or a buffer object name in
+OpenAL.")
+    (license bsd-3)))
+
 (define-public ghc-half
   (package
     (name "ghc-half")
-- 
2.6.1

[PATCH 16/21] gnu: Add ghc-opengl.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-opengl): New variable.
---
 gnu/packages/haskell.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 21366e2..9aa6593 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -945,6 +945,36 @@ It is basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
 interface.")
     (license bsd-3)))
 
+(define-public ghc-opengl
+  (package
+    (name "ghc-opengl")
+    (version "2.12.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/OpenGL/OpenGL-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1mcfb167jl75qc2hgylh83vf2jqizvyvkvhhb72adi2crc3zqz4b"))))
+    (build-system haskell-build-system)
+    (propagated-inputs
+     `(("ghc-text" ,ghc-text)
+       ("ghc-objectname" ,ghc-objectname)
+       ("ghc-gluraw" ,ghc-gluraw)
+       ("ghc-statevar" ,ghc-statevar)
+       ("ghc-openglraw" ,ghc-openglraw)))
+    (home-page
+     "http://www.haskell.org/haskellwiki/Opengl")
+    (synopsis
+     "A binding for the OpenGL graphics system")
+    (description
+     "A Haskell binding for the OpenGL graphics system (GL, version 4.5) and
+its accompanying utility library (GLU, version 1.3).")
+    (license bsd-3)))
+
 (define-public ghc-streaming-commons
   (package
     (name "ghc-streaming-commons")
-- 
2.6.1

[PATCH 17/21] gnu: Add ghc-glut.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-glut): New variable.
---
 gnu/packages/haskell.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 9aa6593..97b518e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -918,6 +918,36 @@ needed for building this package.  If an API entry is not found at runtime, a
 userError is thrown.")
     (license bsd-3)))
 
+(define-public ghc-glut
+  (package
+    (name "ghc-glut")
+    (version "2.7.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/GLUT/GLUT-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1qfilpc10jm47anan44c20y8mh76f2dv09m5d22gk0f7am7hg4k2"))))
+    (build-system haskell-build-system)
+    (propagated-inputs
+     `(("ghc-statevar" ,ghc-statevar)
+       ("ghc-openglraw" ,ghc-openglraw)))
+    (inputs
+     `(("ghc-opengl" ,ghc-opengl)
+       ("freeglut" ,freeglut)))
+    (home-page
+     "http://www.haskell.org/haskellwiki/Opengl")
+    (synopsis
+     "A binding for the OpenGL Utility Toolkit")
+    (description
+     "A Haskell binding for the OpenGL Utility Toolkit, a window system
+independent toolkit for writing OpenGL programs.")
+    (license bsd-3)))
+
 (define-public ghc-gluraw
   (package
     (name "ghc-gluraw")
-- 
2.6.1

[PATCH 18/21] gnu: Add ghc-sdl.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-sdl): New variable.
---
 gnu/packages/haskell.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 97b518e..e8e4e8e 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages elf)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages bootstrap)
   #:use-module (gnu packages zip)
   #:use-module (gnu packages gcc)
@@ -862,6 +863,42 @@ objects, e.g. a texture object name in OpenGL or a buffer object name in
 OpenAL.")
     (license bsd-3)))
 
+(define-public ghc-sdl
+  (package
+    (name "ghc-sdl")
+    (version "0.6.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/SDL/SDL-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"))))
+    (build-system haskell-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before
+          'configure 'fix-/bin/sh
+          (lambda _
+            ;; Use `sh', not `/bin/sh'.
+            (substitute* (find-files "." "Makefile|configure")
+              (("/bin/sh")
+               "sh")))))))
+    (inputs
+     `(("sdl" ,sdl)))
+    (home-page "https://hackage.haskell.org/package/SDL")
+    (synopsis "LibSDL for Haskell")
+    (description "Simple DirectMedia Layer (libSDL) is a cross-platform
+multimedia library designed to provide low level access to audio, keyboard,
+mouse, joystick, 3D hardware via OpenGL, and 2D video framebuffer.  It is used
+by MPEG playback software, emulators, and many popular games, including the
+award winning Linux port of \"Civilization: Call To Power.\"")
+    (license bsd-3)))
+
 (define-public ghc-half
   (package
     (name "ghc-half")
-- 
2.6.1

[PATCH 19/21] gnu: Add ghc-sdl-mixer.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-sdl-mixer): New variable.
---
 gnu/packages/haskell.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index e8e4e8e..d21f151 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -899,6 +899,48 @@ by MPEG playback software, emulators, and many popular games, including the
 award winning Linux port of \"Civilization: Call To Power.\"")
     (license bsd-3)))
 
+(define-public ghc-sdl-mixer
+  (package
+    (name "ghc-sdl-mixer")
+    (version "0.6.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/SDL-mixer/SDL-mixer-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z"))))
+    (build-system haskell-build-system)
+    (arguments
+     `(#:configure-flags
+       (let* ((sdl-mixer (assoc-ref %build-inputs "sdl-mixer"))
+              (sdl-mixer-lib (string-append sdl-mixer "/lib"))
+              (sdl-mixer-include (string-append sdl-mixer "/include/SDL")))
+         (list (string-append "--extra-include-dirs=" sdl-mixer-include)
+               (string-append "--extra-lib-dirs=" sdl-mixer-lib)))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before
+          'configure 'fix-/bin/sh
+          (lambda _
+            ;; Use `sh', not `/bin/sh'.
+            (substitute* (find-files "." "Makefile|configure")
+              (("/bin/sh") "sh")))))))
+    (propagated-inputs
+     `(("sdl-mixer" ,sdl-mixer)
+       ("ghc-sdl" ,ghc-sdl)))
+    (home-page
+     "http://hackage.haskell.org/package/SDL-mixer")
+    (synopsis "Binding to libSDL_mixer")
+    (description "SDL_mixer is a sample multi-channel audio mixer library.  It
+supports any number of simultaneously playing channels of 16 bit stereo audio,
+plus a single channel of music, mixed by the popular MikMod MOD, Timidity
+MIDI, Ogg Vorbis, and SMPEG MP3 libraries.")
+    (license bsd-3)))
+
 (define-public ghc-half
   (package
     (name "ghc-half")
-- 
2.6.1

[PATCH 20/21] gnu: Add ghc-sdl-image.

[Paul van der Walt]

* gnu/packages/haskell.scm (ghc-sdl-image): New variable.
---
 gnu/packages/haskell.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index d21f151..c8d64f6 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -941,6 +941,47 @@ plus a single channel of music, mixed by the popular MikMod MOD, Timidity
 MIDI, Ogg Vorbis, and SMPEG MP3 libraries.")
     (license bsd-3)))
 
+(define-public ghc-sdl-image
+  (package
+    (name "ghc-sdl-image")
+    (version "0.6.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/SDL-image/SDL-image-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq"))))
+    (build-system haskell-build-system)
+    (arguments
+     `(#:configure-flags
+       (let* ((sdl-image (assoc-ref %build-inputs "sdl-image"))
+              (sdl-image-lib (string-append sdl-image "/lib"))
+              (sdl-image-include (string-append sdl-image "/include/SDL")))
+         (list (string-append "--extra-include-dirs=" sdl-image-include)
+               (string-append "--extra-lib-dirs=" sdl-image-lib)))
+       #:phases
+       (modify-phases %standard-phases
+         (add-before
+          'configure 'fix-/bin/sh
+          (lambda _
+            ;; Use `sh', not `/bin/sh'.
+            (substitute* (find-files "." "Makefile|configure")
+              (("/bin/sh") "sh")))))))
+    (propagated-inputs
+     `(("sdl-image" ,sdl-image)
+       ("ghc-sdl" ,ghc-sdl)))
+    (home-page
+     "http://hackage.haskell.org/package/SDL-image")
+    (synopsis "Binding to libSDL_image")
+    (description "SDL_image is an image file loading library.  It loads images
+as SDL surfaces, and supports the following formats: BMP, GIF, JPEG, LBM, PCX,
+PNG, PNM, TGA, TIFF, XCF, XPM, XV.")
+    (license bsd-3)))
+
 (define-public ghc-half
   (package
     (name "ghc-half")
-- 
2.6.1

[PATCH 21/21] gnu: Add raincat platform game.

[Paul van der Walt]

* gnu/packages/games.scm (raincat): New variable.
---
 gnu/packages/games.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index dfaf838..1b1cda6 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,6 +50,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libunwind)
+  #:use-module (gnu packages haskell)
   #:use-module (gnu packages mp3)
   #:use-module (gnu packages image)
   #:use-module (gnu packages ncurses)
@@ -78,6 +80,7 @@
   #:use-module (gnu packages fribidi)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system haskell)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system trivial))
 
@@ -1094,6 +1097,41 @@ on the screen and keyboard to display letters.")
     ;; Most files under gpl2+ or gpl3+, but eat.wav under gpl3
     (license license:gpl3)))
 
+(define-public raincat
+  (package
+    (name "raincat")
+    (version "1.1.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://hackage.haskell.org/package/Raincat/Raincat-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1aalh68h6799mv4vyg30zpskl5jkn6x2j1jza7p4lrflyifxzar8"))))
+    (build-system haskell-build-system)
+    (inputs
+     `(("ghc-extensible-exceptions" ,ghc-extensible-exceptions)
+       ("ghc-mtl" ,ghc-mtl)
+       ("ghc-random" ,ghc-random)
+       ("ghc-glut" ,ghc-glut)
+       ("ghc-opengl" ,ghc-opengl)
+       ("ghc-sdl" ,ghc-sdl)
+       ("ghc-sdl-image" ,ghc-sdl-image)
+       ("ghc-sdl-mixer" ,ghc-sdl-mixer)))
+    (home-page "http://raincat.bysusanlin.com/")
+    (synopsis
+     "Puzzle game written in Haskell with a cat in lead role")
+    (description
+     "Project Raincat is a game developed by Carnegie Mellon students through
+GCS during the Fall 2008 semester.  Raincat features game play inspired from
+classics Lemmings and The Incredible Machine.  The project proved to be an
+excellent learning experience for the programmers.  Everything is programmed
+in Haskell.")
+    (license license:bsd-3)))
+
 (define-public manaplus
   (package
     (name "manaplus")
-- 
2.6.1