* [bug#37227] [PATCH 0/4] Move Haskell packages to “haskell-xyz”
@ 2019-08-30 4:16 Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm Timothy Sample
2019-08-31 14:34 ` bug#37227: [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
0 siblings, 2 replies; 5+ messages in thread
From: Timothy Sample @ 2019-08-30 4:16 UTC (permalink / raw)
To: 37227
Hi Guix,
This is Robert’s patch that moves all of the Haskell libraries and
applications out of “haskell.scm” and leaves only Haskell compilers. I
factored it out into four commits to make it a little easier to follow.
It’s all pretty straight forward package moving, and it has already been
examined by Robert and myself. Nevertheless, I want to confirm that we
are all still on board with the move to “haskell-xyz” and that the
commits are clear enough. (I’m pretty confident, so if no one pipes up
I’ll push it in a few days.)
Here’s the summary:
Robert Vollmert (4):
gnu: Move application packages out of haskell.scm.
gnu: cabal-doctest: Move to haskell-check.scm.
gnu: Move non-compilers out of haskell.scm.
gnu: Move Haskell SDL 2 packages to haskell-xyz.scm.
gnu/packages/agda.scm | 2 +-
gnu/packages/bioconductor.scm | 2 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/cran.scm | 2 +-
gnu/packages/emacs-xyz.scm | 2 +-
gnu/packages/games.scm | 1 +
gnu/packages/graphics.scm | 2 +-
gnu/packages/haskell-apps.scm | 246 +-
gnu/packages/haskell-check.scm | 27 +-
gnu/packages/haskell-xyz.scm | 11459 +++++++++++++++++++++++++++++-
gnu/packages/haskell.scm | 11292 +----------------------------
gnu/packages/idris.scm | 2 +-
gnu/packages/statistics.scm | 2 +-
gnu/packages/wm.scm | 2 +-
14 files changed, 11535 insertions(+), 11508 deletions(-)
--
2.22.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm.
2019-08-30 4:16 [bug#37227] [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
@ 2019-08-30 4:27 ` Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 2/4] gnu: cabal-doctest: Move to haskell-check.scm Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 4/4] gnu: Move Haskell SDL 2 packages to haskell-xyz.scm Timothy Sample
2019-08-31 14:34 ` bug#37227: [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
1 sibling, 2 replies; 5+ messages in thread
From: Timothy Sample @ 2019-08-30 4:27 UTC (permalink / raw)
To: 37227
From: Robert Vollmert <rob@vllmrt.net>
* gnu/packages/haskell.scm (cabal-install, corrode, cpphs, hlint,
hscolour, shellcheck): Move variables from here...
* gnu/packages/haskell-apps.scm: ...to here.
Co-authored-by: Timothy Sample <samplet@ngyro.com>
---
gnu/packages/haskell-apps.scm | 196 ++++++++++++++++++++++++++++++++++
gnu/packages/haskell.scm | 193 +--------------------------------
2 files changed, 197 insertions(+), 192 deletions(-)
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index e77f6d113b..ecc097ceb6 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -1,6 +1,9 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
+;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2017, 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -25,6 +28,7 @@
(define-module (gnu packages haskell-apps)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix packages)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system haskell)
@@ -42,6 +46,103 @@
#:use-module (gnu packages sdl)
#:use-module (gnu packages version-control))
+(define-public cabal-install
+ (package
+ (name "cabal-install")
+ (version "2.2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/cabal-install/cabal-install-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"))))
+ (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-async" ,ghc-async)
+ ("ghc-base16-bytestring" ,ghc-base16-bytestring)
+ ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256)
+ ("ghc-echo" ,ghc-echo)
+ ("ghc-edit-distance" ,ghc-edit-distance)
+ ("ghc-hackage-security" ,ghc-hackage-security)
+ ("ghc-hashable" ,ghc-hashable)
+ ("ghc-http" ,ghc-http)
+ ("ghc-network-uri" ,ghc-network-uri)
+ ("ghc-network" ,ghc-network)
+ ("ghc-random" ,ghc-random)
+ ("ghc-resolv" ,ghc-resolv)
+ ("ghc-tar" ,ghc-tar)
+ ("ghc-zlib" ,ghc-zlib)))
+ (home-page "https://www.haskell.org/cabal/")
+ (synopsis "Command-line interface for Cabal and Hackage")
+ (description
+ "The cabal command-line program simplifies the process of managing
+Haskell software by automating the fetching, configuration, compilation and
+installation of Haskell libraries and programs.")
+ (license license:bsd-3)))
+
+(define-public corrode
+ (let ((commit "b6699fb2fa552a07c6091276285a44133e5c9789"))
+ (package
+ (name "corrode")
+ (version (string-append "0.0.1-" (string-take commit 7)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jameysharp/corrode.git")
+ (commit "b6699fb2fa552a07c6091276285a44133e5c9789")))
+ (file-name
+ (string-append name "-" version "-checkout"))
+ (sha256
+ (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-language-c" ,ghc-language-c)
+ ("ghc-markdown-unlit" ,ghc-markdown-unlit)))
+ (home-page "https://github.com/jameysharp/corrode")
+ (synopsis "Automatic semantics-preserving translation from C to Rust")
+ (description
+ "This program reads a C source file and prints an equivalent module in
+Rust syntax. It is intended to be useful for two different purposes:
+
+@enumerate
+@item Partial automation for migrating legacy code that was implemented in C.
+@item A new, complementary approach to static analysis for C programs.
+@end enumerate\n")
+ (license license:gpl2+))))
+
+(define-public cpphs
+ (package
+ (name "cpphs")
+ (version "1.20.8")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/" name "/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-polyparse" ,ghc-polyparse)
+ ("ghc-old-locale" ,ghc-old-locale)
+ ("ghc-old-time" ,ghc-old-time)))
+ (home-page "http://projects.haskell.org/cpphs/")
+ (synopsis "Liberalised re-implementation of cpp, the C pre-processor")
+ (description "Cpphs is a re-implementation of the C pre-processor that is
+both more compatible with Haskell, and itself written in Haskell so that it
+can be distributed with compilers. This version of the C pre-processor is
+pretty-much feature-complete and compatible with traditional (K&R)
+pre-processors. Additional features include: a plain-text mode; an option to
+unlit literate code files; and an option to turn off macro-expansion.")
+ (license (list license:lgpl2.1+ license:gpl3+))))
+
;; Darcs has no https support: http://irclog.perlgeek.de/darcs/2016-09-17
;; http://darcs.net/manual/Configuring_darcs.html#SECTION00440070000000000000
;; and results of search engines will show that if the protocol is http, https
@@ -364,6 +465,66 @@ programming.")
@code{SDL2_image}.")
(license license:expat)))
+(define-public hlint
+ (package
+ (name "hlint")
+ (version "2.1.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/" name
+ "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("cpphs" ,cpphs)
+ ("ghc-unordered-containers" ,ghc-unordered-containers)
+ ("ghc-yaml" ,ghc-yaml)
+ ("ghc-vector" ,ghc-vector)
+ ("ghc-data-default" ,ghc-data-default)
+ ("ghc-cmdargs" ,ghc-cmdargs)
+ ("ghc-haskell-src-exts" ,ghc-haskell-src-exts)
+ ("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util)
+ ("ghc-uniplate" ,ghc-uniplate)
+ ("ghc-ansi-terminal" ,ghc-ansi-terminal)
+ ("ghc-extra" ,ghc-extra)
+ ("ghc-refact" ,ghc-refact)
+ ("ghc-aeson" ,ghc-aeson)
+ ("hscolour" ,hscolour)))
+ (home-page "http://community.haskell.org/~ndm/hlint/")
+ (synopsis "Suggest improvements for Haskell source code")
+ (description "HLint reads Haskell programs and suggests changes that
+hopefully make them easier to read. HLint also makes it easy to disable
+unwanted suggestions, and to add your own custom suggestions.")
+ (license license:bsd-3)))
+
+(define-public hscolour
+ (package
+ (name "hscolour")
+ (version "1.24.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/hscolour/hscolour-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
+ (build-system haskell-build-system)
+ (home-page "https://hackage.haskell.org/package/hscolour")
+ (synopsis "Script to colourise Haskell code")
+ (description "HSColour is a small Haskell script to colourise Haskell
+code. It currently has six output formats: ANSI terminal codes (optionally
+XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01
+with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX,
+and mIRC chat codes.")
+ (license license:bsd-3)))
+
(define-public raincat
(package
(name "raincat")
@@ -405,3 +566,38 @@ 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 shellcheck
+ (package
+ (name "shellcheck")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://hackage.haskell.org/package/ShellCheck/ShellCheck-"
+ version ".tar.gz"))
+ (sha256
+ (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s"))
+ (file-name (string-append name "-" version ".tar.gz"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-aeson" ,ghc-aeson)
+ ("ghc-diff" ,ghc-diff)
+ ("ghc-quickcheck" ,ghc-quickcheck)
+ ("ghc-regex-tdfa" ,ghc-regex-tdfa)))
+ (home-page "https://github.com/koalaman/shellcheck")
+ (synopsis "Static analysis for shell scripts")
+ (description "@code{shellcheck} provides static analysis for
+@command{bash} and @command{sh} shell scripts.
+It gives warnings and suggestions in order to:
+
+@enumerate
+@item Point out and clarify typical beginner's syntax issues that cause
+a shell to give cryptic error messages.
+@item Point out and clarify typical intermediate level semantic problems
+that cause a shell to behave strangely and counter-intuitively.
+@item Point out subtle caveats, corner cases and pitfalls that may cause an
+advanced user's otherwise working script to fail under future circumstances.
+@end enumerate")
+ (license license:gpl3+)))
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index b544190895..06d3d8afd7 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -48,6 +48,7 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages haskell-apps)
#:use-module (gnu packages haskell-check)
#:use-module (gnu packages haskell-crypto)
#:use-module (gnu packages haskell-web)
@@ -1493,42 +1494,6 @@ patterns as per the HaRP extension as well as HSX-style embedded XML syntax.")
specify refactorings without depending on GHC.")
(license license:bsd-3)))
-(define-public hlint
- (package
- (name "hlint")
- (version "2.1.10")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/" name
- "/" name "-" version ".tar.gz"))
- (sha256
- (base32
- "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w"))))
- (build-system haskell-build-system)
- (inputs
- `(("cpphs" ,cpphs)
- ("ghc-unordered-containers" ,ghc-unordered-containers)
- ("ghc-yaml" ,ghc-yaml)
- ("ghc-vector" ,ghc-vector)
- ("ghc-data-default" ,ghc-data-default)
- ("ghc-cmdargs" ,ghc-cmdargs)
- ("ghc-haskell-src-exts" ,ghc-haskell-src-exts)
- ("ghc-haskell-src-exts-util" ,ghc-haskell-src-exts-util)
- ("ghc-uniplate" ,ghc-uniplate)
- ("ghc-ansi-terminal" ,ghc-ansi-terminal)
- ("ghc-extra" ,ghc-extra)
- ("ghc-refact" ,ghc-refact)
- ("ghc-aeson" ,ghc-aeson)
- ("hscolour" ,hscolour)))
- (home-page "http://community.haskell.org/~ndm/hlint/")
- (synopsis "Suggest improvements for Haskell source code")
- (description "HLint reads Haskell programs and suggests changes that
-hopefully make them easier to read. HLint also makes it easy to disable
-unwanted suggestions, and to add your own custom suggestions.")
- (license license:bsd-3)))
-
(define-public ghc-resourcet
(package
(name "ghc-resourcet")
@@ -1852,34 +1817,6 @@ needed by various Haskell streaming data libraries, such as @code{conduit} and
@code{pipe}s.")
(license license:expat)))
-(define-public cpphs
- (package
- (name "cpphs")
- (version "1.20.8")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/" name "/"
- name "-" version ".tar.gz"))
- (sha256
- (base32
- "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-polyparse" ,ghc-polyparse)
- ("ghc-old-locale" ,ghc-old-locale)
- ("ghc-old-time" ,ghc-old-time)))
- (home-page "http://projects.haskell.org/cpphs/")
- (synopsis "Liberalised re-implementation of cpp, the C pre-processor")
- (description "Cpphs is a re-implementation of the C pre-processor that is
-both more compatible with Haskell, and itself written in Haskell so that it
-can be distributed with compilers. This version of the C pre-processor is
-pretty-much feature-complete and compatible with traditional (K&R)
-pre-processors. Additional features include: a plain-text mode; an option to
-unlit literate code files; and an option to turn off macro-expansion.")
- (license (list license:lgpl2.1+ license:gpl3+))))
-
(define-public ghc-reflection
(package
(name "ghc-reflection")
@@ -2124,44 +2061,6 @@ API is often available directly via the standard @code{libc} C library) on
Unix systems.")
(license license:gpl3)))
-(define-public cabal-install
- (package
- (name "cabal-install")
- (version "2.2.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/cabal-install/cabal-install-"
- version
- ".tar.gz"))
- (sha256
- (base32 "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"))))
- (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing.
- (build-system haskell-build-system)
- (inputs
- `(("ghc-async" ,ghc-async)
- ("ghc-base16-bytestring" ,ghc-base16-bytestring)
- ("ghc-cryptohash-sha256" ,ghc-cryptohash-sha256)
- ("ghc-echo" ,ghc-echo)
- ("ghc-edit-distance" ,ghc-edit-distance)
- ("ghc-hackage-security" ,ghc-hackage-security)
- ("ghc-hashable" ,ghc-hashable)
- ("ghc-http" ,ghc-http)
- ("ghc-network-uri" ,ghc-network-uri)
- ("ghc-network" ,ghc-network)
- ("ghc-random" ,ghc-random)
- ("ghc-resolv" ,ghc-resolv)
- ("ghc-tar" ,ghc-tar)
- ("ghc-zlib" ,ghc-zlib)))
- (home-page "https://www.haskell.org/cabal/")
- (synopsis "Command-line interface for Cabal and Hackage")
- (description
- "The cabal command-line program simplifies the process of managing
-Haskell software by automating the fetching, configuration, compilation and
-installation of Haskell libraries and programs.")
- (license license:bsd-3)))
-
(define-public cabal-doctest
(package
(name "cabal-doctest")
@@ -3264,30 +3163,6 @@ parser isolation, and labeled blocks for better error messages.")
(description "This library provides @code{Comonad}s for Haskell.")
(license license:bsd-3)))
-(define-public hscolour
- (package
- (name "hscolour")
- (version "1.24.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/hscolour/hscolour-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
- (build-system haskell-build-system)
- (home-page "https://hackage.haskell.org/package/hscolour")
- (synopsis "Script to colourise Haskell code")
- (description "HSColour is a small Haskell script to colourise Haskell
-code. It currently has six output formats: ANSI terminal codes (optionally
-XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS, HTML 4.01
-with CSS and mouseover annotations, XHTML 1.0 with inline CSS styling, LaTeX,
-and mIRC chat codes.")
- (license license:bsd-3)))
-
(define-public ghc-polyparse
(package
(name "ghc-polyparse")
@@ -8159,37 +8034,6 @@ and a large set of GNU extensions.")
same time is a literate Haskell program.")
(license license:expat)))
-(define-public corrode
- (let ((commit "b6699fb2fa552a07c6091276285a44133e5c9789"))
- (package
- (name "corrode")
- (version (string-append "0.0.1-" (string-take commit 7)))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/jameysharp/corrode.git")
- (commit "b6699fb2fa552a07c6091276285a44133e5c9789")))
- (file-name
- (string-append name "-" version "-checkout"))
- (sha256
- (base32 "02v0yyj6sk4gpg2222wzsdqjxn8w66scbnf6b20x0kbmc69qcz4r"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-language-c" ,ghc-language-c)
- ("ghc-markdown-unlit" ,ghc-markdown-unlit)))
- (home-page "https://github.com/jameysharp/corrode")
- (synopsis "Automatic semantics-preserving translation from C to Rust")
- (description
- "This program reads a C source file and prints an equivalent module in
-Rust syntax. It is intended to be useful for two different purposes:
-
-@enumerate
-@item Partial automation for migrating legacy code that was implemented in C.
-@item A new, complementary approach to static analysis for C programs.
-@end enumerate\n")
- (license license:gpl2+))))
-
(define-public ghc-wave
(package
(name "ghc-wave")
@@ -8358,41 +8202,6 @@ to learn new concepts, just new syntax, and it's fairly easy to predict the
generated SQL and optimize it for your backend.")
(license license:bsd-3))))
-(define-public shellcheck
- (package
- (name "shellcheck")
- (version "0.7.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://hackage.haskell.org/package/ShellCheck/ShellCheck-"
- version ".tar.gz"))
- (sha256
- (base32 "1vx895cp5k5h0680xfwj74lk97m9y627n965x6srds0gfnbkzy9s"))
- (file-name (string-append name "-" version ".tar.gz"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-aeson" ,ghc-aeson)
- ("ghc-diff" ,ghc-diff)
- ("ghc-quickcheck" ,ghc-quickcheck)
- ("ghc-regex-tdfa" ,ghc-regex-tdfa)))
- (home-page "https://github.com/koalaman/shellcheck")
- (synopsis "Static analysis for shell scripts")
- (description "@code{shellcheck} provides static analysis for
-@command{bash} and @command{sh} shell scripts.
-It gives warnings and suggestions in order to:
-
-@enumerate
-@item Point out and clarify typical beginner's syntax issues that cause
-a shell to give cryptic error messages.
-@item Point out and clarify typical intermediate level semantic problems
-that cause a shell to behave strangely and counter-intuitively.
-@item Point out subtle caveats, corner cases and pitfalls that may cause an
-advanced user's otherwise working script to fail under future circumstances.
-@end enumerate")
- (license license:gpl3+)))
-
(define-public ghc-simple-sendfile
(package
(name "ghc-simple-sendfile")
--
2.22.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#37227] [PATCH 2/4] gnu: cabal-doctest: Move to haskell-check.scm.
2019-08-30 4:27 ` [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm Timothy Sample
@ 2019-08-30 4:27 ` Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 4/4] gnu: Move Haskell SDL 2 packages to haskell-xyz.scm Timothy Sample
1 sibling, 0 replies; 5+ messages in thread
From: Timothy Sample @ 2019-08-30 4:27 UTC (permalink / raw)
To: 37227
From: Robert Vollmert <rob@vllmrt.net>
* gnu/packages/haskell.scm (cabal-doctest): Move variable from here...
* gnu/packages/haskell-check.scm: ...to here.
Co-authored-by: Timothy Sample <samplet@ngyro.com>
---
gnu/packages/haskell-check.scm | 25 +++++++++++++++++++++++++
gnu/packages/haskell.scm | 25 -------------------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 589eee74d9..1a32382281 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -837,3 +837,28 @@ of generated values by construction.
To get started quickly, see the examples:
@uref{https://github.com/hedgehogqa/haskell-hedgehog/tree/master/hedgehog-example}")
(license license:bsd-3)))
+
+(define-public cabal-doctest
+ (package
+ (name "cabal-doctest")
+ (version "1.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/"
+ "cabal-doctest/cabal-doctest-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"))))
+ (build-system haskell-build-system)
+ (arguments
+ `(#:cabal-revision
+ ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld")))
+ (home-page "https://github.com/phadej/cabal-doctest")
+ (synopsis "Setup.hs helper for running doctests")
+ (description
+ "To properly work, the @code{doctest} package needs plenty of
+configuration. This library provides the common bits for writing custom
+@file{Setup.hs} files.")
+ (license license:bsd-3)))
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 06d3d8afd7..cffa7e8ed7 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2061,31 +2061,6 @@ API is often available directly via the standard @code{libc} C library) on
Unix systems.")
(license license:gpl3)))
-(define-public cabal-doctest
- (package
- (name "cabal-doctest")
- (version "1.0.6")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://hackage.haskell.org/package/"
- "cabal-doctest/cabal-doctest-"
- version ".tar.gz"))
- (sha256
- (base32
- "0bgd4jdmzxq5y465r4sf4jv2ix73yvblnr4c9wyazazafddamjny"))))
- (build-system haskell-build-system)
- (arguments
- `(#:cabal-revision
- ("1" "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld")))
- (home-page "https://github.com/phadej/cabal-doctest")
- (synopsis "Setup.hs helper for running doctests")
- (description
- "To properly work, the @code{doctest} package needs plenty of
-configuration. This library provides the common bits for writing custom
-@file{Setup.hs} files.")
- (license license:bsd-3)))
-
(define-public ghc-parsec-numbers
(package
(name "ghc-parsec-numbers")
--
2.22.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#37227] [PATCH 4/4] gnu: Move Haskell SDL 2 packages to haskell-xyz.scm.
2019-08-30 4:27 ` [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 2/4] gnu: cabal-doctest: Move to haskell-check.scm Timothy Sample
@ 2019-08-30 4:27 ` Timothy Sample
1 sibling, 0 replies; 5+ messages in thread
From: Timothy Sample @ 2019-08-30 4:27 UTC (permalink / raw)
To: 37227
From: Robert Vollmert <rob@vllmrt.net>
* gnu/packages/haskell-apps.scm (ghc-sdl2, ghc-sdl2-image,
ghc-sdl2-mixer): Move variables from here...
* gnu/packages/haskell-xyz.scm: ...to here.
Co-authored-by: Timothy Sample <samplet@ngyro.com>
---
gnu/packages/haskell-apps.scm | 89 -----------------------------------
gnu/packages/haskell-xyz.scm | 88 ++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 89 deletions(-)
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index df8417ce3f..28502eb87f 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -44,7 +44,6 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages rsync)
- #:use-module (gnu packages sdl)
#:use-module (gnu packages version-control))
(define-public cabal-install
@@ -378,94 +377,6 @@ used to keep a folder in sync between computers.")
(license (list license:gpl3+
license:agpl3+))))
-(define-public ghc-sdl2
- (package
- (name "ghc-sdl2")
- (version "2.4.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://hackage.haskell.org/package/"
- "sdl2/sdl2-" version ".tar.gz"))
- (sha256
- (base32
- "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991"))))
- (build-system haskell-build-system)
- (arguments '(#:tests? #f)) ; tests require graphical environment
- (inputs
- `(("ghc-exceptions" ,ghc-exceptions)
- ("ghc-linear" ,ghc-linear)
- ("ghc-statevar" ,ghc-statevar)
- ("ghc-vector" ,ghc-vector)
- ("sdl2" ,sdl2)))
- (native-inputs
- `(("ghc-weigh" ,ghc-weigh)
- ("pkg-config" ,pkg-config)))
- (home-page "http://hackage.haskell.org/package/sdl2")
- (synopsis "High- and low-level bindings to the SDL library")
- (description
- "This package contains bindings to the SDL 2 library, in both high- and
-low-level forms. The @code{SDL} namespace contains high-level bindings, where
-enumerations are split into sum types, and we perform automatic
-error-checking. The @code{SDL.Raw} namespace contains an almost 1-1
-translation of the C API into Haskell FFI calls. As such, this does not
-contain sum types nor error checking. Thus this namespace is suitable for
-building your own abstraction over SDL, but is not recommended for day-to-day
-programming.")
- (license license:bsd-3)))
-
-(define-public ghc-sdl2-mixer
- (package
- (name "ghc-sdl2-mixer")
- (version "1.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/"
- "sdl2-mixer-" version ".tar.gz"))
- (sha256
- (base32
- "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-data-default-class" ,ghc-data-default-class)
- ("ghc-lifted-base" ,ghc-lifted-base)
- ("ghc-monad-control" ,ghc-monad-control)
- ("ghc-sdl2" ,ghc-sdl2)
- ("ghc-vector" ,ghc-vector)
- ("sdl2-mixer" ,sdl2-mixer)))
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (home-page "http://hackage.haskell.org/package/sdl2-mixer")
- (synopsis "Bindings to SDL2 mixer")
- (description "This package provides Haskell bindings to
-@code{SDL2_mixer}.")
- (license license:bsd-3)))
-
-(define-public ghc-sdl2-image
- (package
- (name "ghc-sdl2-image")
- (version "2.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://hackage.haskell.org/package/sdl2-image/"
- "sdl2-image-" version ".tar.gz"))
- (sha256
- (base32
- "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr"))))
- (build-system haskell-build-system)
- (inputs
- `(("ghc-sdl2" ,ghc-sdl2)
- ("sdl2-image" ,sdl2-image)))
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (home-page "http://hackage.haskell.org/package/sdl2-image")
- (synopsis "Bindings to SDL2_image")
- (description "This package provides Haskell bindings to
-@code{SDL2_image}.")
- (license license:expat)))
-
(define-public hlint
(package
(name "hlint")
diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 46e5153906..91d009dc22 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -8578,6 +8578,94 @@ by MPEG playback software, emulators, and many popular games, including the
award winning Linux port of \"Civilization: Call To Power.\"")
(license license:bsd-3)))
+(define-public ghc-sdl2
+ (package
+ (name "ghc-sdl2")
+ (version "2.4.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/"
+ "sdl2/sdl2-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0p4b12fmxps0sbnkqdfy0qw19s355yrkw7fgw6xz53wzq706k991"))))
+ (build-system haskell-build-system)
+ (arguments '(#:tests? #f)) ; tests require graphical environment
+ (inputs
+ `(("ghc-exceptions" ,ghc-exceptions)
+ ("ghc-linear" ,ghc-linear)
+ ("ghc-statevar" ,ghc-statevar)
+ ("ghc-vector" ,ghc-vector)
+ ("sdl2" ,sdl2)))
+ (native-inputs
+ `(("ghc-weigh" ,ghc-weigh)
+ ("pkg-config" ,pkg-config)))
+ (home-page "http://hackage.haskell.org/package/sdl2")
+ (synopsis "High- and low-level bindings to the SDL library")
+ (description
+ "This package contains bindings to the SDL 2 library, in both high- and
+low-level forms. The @code{SDL} namespace contains high-level bindings, where
+enumerations are split into sum types, and we perform automatic
+error-checking. The @code{SDL.Raw} namespace contains an almost 1-1
+translation of the C API into Haskell FFI calls. As such, this does not
+contain sum types nor error checking. Thus this namespace is suitable for
+building your own abstraction over SDL, but is not recommended for day-to-day
+programming.")
+ (license license:bsd-3)))
+
+(define-public ghc-sdl2-image
+ (package
+ (name "ghc-sdl2-image")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/sdl2-image/"
+ "sdl2-image-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1pr6dkg73cy9z0w54lrkj9c5bhxj56nl92lxikjy8kz6nyr455rr"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-sdl2" ,ghc-sdl2)
+ ("sdl2-image" ,sdl2-image)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "http://hackage.haskell.org/package/sdl2-image")
+ (synopsis "Bindings to SDL2_image")
+ (description "This package provides Haskell bindings to
+@code{SDL2_image}.")
+ (license license:expat)))
+
+(define-public ghc-sdl2-mixer
+ (package
+ (name "ghc-sdl2-mixer")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/sdl2-mixer/"
+ "sdl2-mixer-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1k8avyccq5l9z7bwxigim312yaancxl1sr3q6a96bcm7pnhiak0g"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-data-default-class" ,ghc-data-default-class)
+ ("ghc-lifted-base" ,ghc-lifted-base)
+ ("ghc-monad-control" ,ghc-monad-control)
+ ("ghc-sdl2" ,ghc-sdl2)
+ ("ghc-vector" ,ghc-vector)
+ ("sdl2-mixer" ,sdl2-mixer)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "http://hackage.haskell.org/package/sdl2-mixer")
+ (synopsis "Bindings to SDL2 mixer")
+ (description "This package provides Haskell bindings to
+@code{SDL2_mixer}.")
+ (license license:bsd-3)))
+
(define-public ghc-sdl-image
(package
(name "ghc-sdl-image")
--
2.22.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#37227: [PATCH 0/4] Move Haskell packages to “haskell-xyz”
2019-08-30 4:16 [bug#37227] [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm Timothy Sample
@ 2019-08-31 14:34 ` Timothy Sample
1 sibling, 0 replies; 5+ messages in thread
From: Timothy Sample @ 2019-08-31 14:34 UTC (permalink / raw)
To: 37227-done
Hi again,
Timothy Sample <samplet@ngyro.com> writes:
> Hi Guix,
>
> This is Robert’s patch that moves all of the Haskell libraries and
> applications out of “haskell.scm” and leaves only Haskell compilers. I
> factored it out into four commits to make it a little easier to follow.
>
> It’s all pretty straight forward package moving, and it has already been
> examined by Robert and myself. Nevertheless, I want to confirm that we
> are all still on board with the move to “haskell-xyz” and that the
> commits are clear enough. (I’m pretty confident, so if no one pipes up
> I’ll push it in a few days.)
After a few days, I’m still pretty confident, so I pushed these
commits. :)
-- Tim
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-31 14:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-30 4:16 [bug#37227] [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 1/4] gnu: Move application packages out of haskell.scm Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 2/4] gnu: cabal-doctest: Move to haskell-check.scm Timothy Sample
2019-08-30 4:27 ` [bug#37227] [PATCH 4/4] gnu: Move Haskell SDL 2 packages to haskell-xyz.scm Timothy Sample
2019-08-31 14:34 ` bug#37227: [PATCH 0/4] Move Haskell packages to “haskell-xyz” Timothy Sample
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).