[bug#64066] [PATCH 00/19] Add Plunder

[bug#64066] [PATCH 00/19] Add Plunder

[zamfofex]

This patch set adds Plunder, a work-in-progress game, alongside various Haskell packages that it depends on.

zamfofex (19):
  gnu: Add ghc-proctest
  gnu: Add ghc-hscolour
  gnu: Add ghc-constraints-extras
  gnu: Add ghc-indexed-profunctors
  gnu: Add ghc-generic-lens-core
  gnu: Add ghc-generic-lens
  gnu: Add ghc-these-lens
  gnu: Add ghc-sdl2-ttf
  gnu: Add ghc-sdl2-gfx
  gnu: Add ghc-exception-transformers
  gnu: Add ghc-commutative-semigroup
  gnu: Add ghc-dependent-sum
  gnu: Add ghc-dependent-map
  gnu: Add ghc-prim-uniq
  gnu: Add ghc-patch
  gnu: Add ghc-ref-tf
  gnu: Add ghc-reflex
  gnu: Add ghc-reflex-sdl2
  gnu: Add Plunder

 gnu/packages/games.scm         |  42 +++-
 gnu/packages/haskell-check.scm |  23 ++
 gnu/packages/haskell-xyz.scm   | 446 +++++++++++++++++++++++++++++++++
 3 files changed, 510 insertions(+), 1 deletion(-)


base-commit: f598f5b870462afbb5a5770c1b16071bca63fc52
-- 
2.40.1

[bug#64066] [PATCH 01/19] gnu: Add ghc-proctest

[zamfofex]

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

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index da05582400..43c654b24f 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1180,3 +1181,25 @@ (define-public ghc-tasty-inspection-testing
      "Integrate @@inspection-testing@@ into @@tasty@@ test suites.")
     (license license:expat)))
 
+(define-public ghc-proctest
+  (package
+    (name "ghc-proctest")
+    (version "0.1.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "proctest" version))
+              (sha256
+               (base32
+                "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "proctest")))
+    (inputs (list ghc-hunit ghc-hspec ghc-quickcheck))
+    (home-page "https://github.com/nh2/proctest")
+    (synopsis "An IO library for testing interactive command line programs")
+    (description
+     "An IO library for testing interactive command line programs.  Proctest aims to
+simplify interacting with and testing terminal programs, providing convenience
+functions for starting programs and reading their output.  All blocking operations
+support timeouts so that misbehaving programs cannot block your test pipeline. Find
+more examples and contribute at <https://github.com/nh2/proctest>.")
+    (license license:expat)))
-- 
2.40.1

[bug#64066] [PATCH 02/19] gnu: Add ghc-hscolour

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index a819698710..2a4def30ff 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 jgart <jgart@dismail.de>
 ;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
+;;; Copyright © 2023 zamfofex <zamfofex@twdb.moe>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2047,6 +2048,27 @@ (define-public ghc-colour
 supported.  A module of colour names (\"Data.Colour.Names\") is provided.")
     (license license:expat)))
 
+(define-public ghc-hscolour
+  (package
+    (name "ghc-hscolour")
+    (version "1.24.4")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hscolour" version))
+              (sha256
+               (base32
+                "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "hscolour")))
+    (home-page "http://code.haskell.org/~malcolm/hscolour/")
+    (synopsis "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:lgpl2.1)))
+
 (define-public ghc-comonad
   (package
     (name "ghc-comonad")
-- 
2.40.1

[bug#64066] [PATCH 03/19] gnu: Add ghc-constraints-extras

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 2a4def30ff..e3f620137a 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -2468,6 +2468,30 @@ (define-public ghc-constraints
 a vocabulary for working with them.")
     (license license:bsd-2)))
 
+(define-public ghc-constraints-extras
+  (package
+    (name "ghc-constraints-extras")
+    (version "0.4.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "constraints-extras" version))
+              (sha256
+               (base32
+                "1irf4kd7a5h1glczbc73c3590m58azn4s68nfrjfg1h96i7mjfgn"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "constraints-extras")))
+    (inputs (list ghc-constraints ghc-aeson))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1fdabah3ilq9yf94916ml3c3rxgcgab1jhzl4mk1zgzsw78j53qf")))
+    (home-page "https://github.com/obsidiansystems/constraints-extras")
+    (synopsis "Utility package for constraints")
+    (description
+     "Convenience functions and TH for working with constraints.  See
+<https://github.com/obsidiansystems/constraints-extras/blob/develop/README.md
+README.md> for example usage.")
+    (license license:bsd-3)))
+
 (define-public ghc-contravariant
   (package
     (name "ghc-contravariant")
-- 
2.40.1

[bug#64066] [PATCH 04/19] gnu: Add ghc-indexed-profunctors

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-indexed-profunctors): New variable.
---
 gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index e3f620137a..7ecb677125 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -9233,6 +9233,26 @@ (define-public ghc-profunctors
     (description "This library provides profunctors for Haskell.")
     (license license:bsd-3)))
 
+(define-public ghc-indexed-profunctors
+  (package
+    (name "ghc-indexed-profunctors")
+    (version "0.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "indexed-profunctors" version))
+              (sha256
+               (base32
+                "1cbccbvrx73drr1jf3yyw0rp1mcfv3jc1rvdcby5xxx4ja543fjs"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "indexed-profunctors")))
+    (home-page "http://hackage.haskell.org/package/indexed-profunctors")
+    (synopsis "Utilities for indexed profunctors")
+    (description
+     "This package contains basic definitions related to indexed profunctors.  These
+are primarily intended as internal utilities to support the @@optics@@ and
+@@generic-lens@@ package families.")
+    (license license:bsd-3)))
+
 (define-public ghc-project-template
   (package
     (name "ghc-project-template")
-- 
2.40.1

[bug#64066] [PATCH 05/19] gnu: Add ghc-generic-lens-core

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-generic-lens-core): New variable.
---
 gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 7ecb677125..091b437243 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6361,6 +6361,33 @@ (define-public ghc-lens-family-core
 lenses and traversals for those who require Haskell 98.")
     (license license:bsd-3)))
 
+(define-public ghc-generic-lens-core
+  (package
+    (name "ghc-generic-lens-core")
+    (version "2.2.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "generic-lens-core" version))
+              (sha256
+               (base32
+                "08i4c9yb6z84iknrnl9f3f343121j7ilp0a679v81nsjm9xz3rlf"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "generic-lens-core")))
+    (inputs (list ghc-indexed-profunctors))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1dbjhd6k7ypqa9f4h9v2xndgb4mjhfli3n1vjm8r8ga0kfndbqfn")))
+    (home-page "https://github.com/kcsongor/generic-lens")
+    (synopsis "Generically derive traversals, lenses and prisms.")
+    (description
+     "This library uses GHC.Generics to derive efficient optics (traversals, lenses
+and prisms) for algebraic data types in a type-directed way, with a focus on
+good type inference and error messages when possible.  This package is the
+shared internal logic of the @@<https://hackage.haskell.org/package/generic-lens
+generic-lens>@@ and @@<https://hackage.haskell.org/package/generic-optics
+generic-optics>@@ libraries.")
+    (license license:bsd-3)))
+
 (define-public ghc-libffi
   (package
     (name "ghc-libffi")
-- 
2.40.1

[bug#64066] [PATCH 06/19] gnu: Add ghc-generic-lens

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 091b437243..4724348b44 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6388,6 +6388,31 @@ (define-public ghc-generic-lens-core
 generic-optics>@@ libraries.")
     (license license:bsd-3)))
 
+(define-public ghc-generic-lens
+  (package
+    (name "ghc-generic-lens")
+    (version "2.2.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "generic-lens" version))
+              (sha256
+               (base32
+                "0s4b51s11ssmndmx9m9zbwgv9rb27ajwihsrk10hn582rp4ck3c6"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "generic-lens")))
+    (inputs (list ghc-generic-lens-core ghc-profunctors))
+    (native-inputs (list ghc-lens ghc-inspection-testing ghc-hunit ghc-doctest))
+    (home-page "https://github.com/kcsongor/generic-lens")
+    (synopsis "Generically derive traversals, lenses and prisms.")
+    (description
+     "This library uses GHC.Generics to derive efficient optics (traversals, lenses
+and prisms) for algebraic data types in a type-directed way, with a focus on
+good type inference and error messages when possible.  The library exposes a
+van Laarhoven interface.  For an alternative interface, supporting an opaque
+optic type, see @@<https://hackage.haskell.org/package/generic-optics
+generic-optics>@@.")
+    (license license:bsd-3)))
+
 (define-public ghc-libffi
   (package
     (name "ghc-libffi")
-- 
2.40.1

[bug#64066] [PATCH 07/19] gnu: Add ghc-these-lens

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 4724348b44..97c2888c3b 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -6413,6 +6413,27 @@ (define-public ghc-generic-lens
 generic-optics>@@.")
     (license license:bsd-3)))
 
+(define-public ghc-these-lens
+  (package
+    (name "ghc-these-lens")
+    (version "1.0.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "these-lens" version))
+              (sha256
+               (base32
+                "1v3kj7j4bkywbmdbblwqs5gsj5s23d59sb3s27jf3bwdzf9d21p6"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "these-lens")))
+    (inputs (list ghc-these ghc-lens))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1mncy6mcwqxy4fwibrsfc3jcx183wfjfvfvbj030y86pfihvbwg3")))
+    (home-page "https://github.com/haskellari/these")
+    (synopsis "Lenses for These")
+    (description "This package provides Prism and Traversals for @@These@@.")
+    (license license:bsd-3)))
+
 (define-public ghc-libffi
   (package
     (name "ghc-libffi")
-- 
2.40.1

[bug#64066] [PATCH 08/19] gnu: Add ghc-sdl2-ttf

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-sdl2-ttf): New variable.
---
 gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 97c2888c3b..3c88d769e1 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -10427,6 +10427,26 @@ (define-public ghc-sdl2-mixer
 @code{SDL2_mixer}.")
     (license license:bsd-3)))
 
+(define-public ghc-sdl2-ttf
+  (package
+    (name "ghc-sdl2-ttf")
+    (version "2.1.3")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "sdl2-ttf" version))
+              (sha256
+               (base32
+                "0sm5lrdif5wmz3iah1658zlr7yr45d1hfihb2hdxdia4h7z1j0mn"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "sdl2-ttf")))
+    (inputs (list ghc-sdl2 ghc-th-abstraction sdl2-ttf))
+    (native-inputs (list pkg-config))
+    (home-page "http://hackage.haskell.org/package/sdl2-ttf")
+    (synopsis "Bindings to SDL2_ttf.")
+    (description "Haskell bindings to SDL2_ttf C++ library
+<https://github.com/libsdl-org/SDL_ttf>.")
+    (license license:bsd-3)))
+
 (define-public ghc-sdl-image
   (package
     (name "ghc-sdl-image")
-- 
2.40.1

[bug#64066] [PATCH 09/19] gnu: Add ghc-sdl2-gfx

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-sdl2-gfx): New variable.
---
 gnu/packages/haskell-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 3c88d769e1..9c68a3b63a 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -10447,6 +10447,25 @@ (define-public ghc-sdl2-ttf
 <https://github.com/libsdl-org/SDL_ttf>.")
     (license license:bsd-3)))
 
+(define-public ghc-sdl2-gfx
+  (package
+    (name "ghc-sdl2-gfx")
+    (version "0.3.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "sdl2-gfx" version))
+              (sha256
+               (base32
+                "0r9m54ffkp1dv2ffz9i9318qhvpinc76iih7vg1dwq3siwgpxaxw"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "sdl2-gfx")))
+    (inputs (list ghc-lifted-base ghc-monad-control ghc-sdl2 ghc-vector sdl2-gfx))
+    (native-inputs (list pkg-config))
+    (home-page "http://hackage.haskell.org/package/sdl2-gfx")
+    (synopsis "Haskell bindings to SDL2_gfx")
+    (description "")
+    (license license:expat)))
+
 (define-public ghc-sdl-image
   (package
     (name "ghc-sdl-image")
-- 
2.40.1

[bug#64066] [PATCH 10/19] gnu: Add ghc-exception-transformers

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-exception-transformers): New
variable.
---
 gnu/packages/haskell-xyz.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 9c68a3b63a..bd6a999357 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -12635,6 +12635,28 @@ (define-public ghc-transformers-compat
 but also need those types.")
     (license license:bsd-3)))
 
+(define-public ghc-exception-transformers
+  (package
+    (name "ghc-exception-transformers")
+    (version "0.4.0.11")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "exception-transformers" version))
+              (sha256
+               (base32
+                "1zmd2s40m86c9mhv32l5bvvf5r52cgpxvb4v5phyc3pjwlr7m8g5"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "exception-transformers")))
+    (inputs (list ghc-fail ghc-transformers-compat))
+    (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
+    (home-page "http://hackage.haskell.org/package/exception-transformers")
+    (synopsis "Type classes and monads for unchecked extensible exceptions.")
+    (description
+     "This package provides type classes, a monad and a monad transformer that support
+unchecked extensible exceptions as well as asynchronous exceptions.  It is
+compatible with the transformers package.")
+    (license license:bsd-3)))
+
 (define-public ghc-tree-diff
   (package
     (name "ghc-tree-diff")
-- 
2.40.1

[bug#64066] [PATCH 11/19] gnu: Add ghc-commutative-semigroup

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-commutative-semigroup): New
variable.
---
 gnu/packages/haskell-xyz.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index bd6a999357..7f9380d959 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -13147,6 +13147,25 @@ (define-public ghc-unordered-containers-bootstrap
     (native-inputs '())
     (properties '((hidden? #t)))))
 
+(define-public ghc-commutative-semigroups
+  (package
+    (name "ghc-commutative-semigroups")
+    (version "0.1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "commutative-semigroups" version))
+              (sha256
+               (base32
+                "1bmafx363gfsd9wwrf3xyrw9mnw6anmc1zdfv0p8597y4lxxach7"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "commutative-semigroups")))
+    (home-page "http://hackage.haskell.org/package/commutative-semigroups")
+    (synopsis "Commutative semigroups")
+    (description
+     "This package provides a commutative semigroup is a semigroup where the order of
+arguments to mappend does not matter.")
+    (license license:bsd-3)))
+
 (define-public ghc-unsafe
   (package
     (name "ghc-unsafe")
-- 
2.40.1

[bug#64066] [PATCH 12/19] gnu: Add ghc-dependent-sum

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-dependent-sum): New variable.
---
 gnu/packages/haskell-xyz.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 7f9380d959..06e7199c9c 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -13166,6 +13166,33 @@ (define-public ghc-commutative-semigroups
 arguments to mappend does not matter.")
     (license license:bsd-3)))
 
+(define-public ghc-dependent-sum
+  (package
+    (name "ghc-dependent-sum")
+    (version "0.7.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "dependent-sum" version))
+              (sha256
+               (base32
+                "1frw5965v8i6xqdgs95gg8asgdqcqnmfahz0pmbwiaw5ybn62rc2"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "dependent-sum")))
+    (inputs (list ghc-constraints-extras ghc-some))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0qybk8x6gyvg8pgf84mywlfajlcvg9pp4rs1wfn9fa7ns6sms88n")))
+    (home-page "https://github.com/obsidiansystems/dependent-sum")
+    (synopsis "Dependent sum type")
+    (description
+     "This package provides a dependent sum is a generalization of a particular way of
+thinking about the @@Either@@ type. @@Either a b@@ can be thought of as a
+2-tuple @@(tag, value)@@, where the value of the tag determines the type of the
+value.  In particular, either @@tag = Left@@ and @@value :: a@@ or @@tag =
+Right@@ and @@value :: b@@. .  This package allows you to define your own
+dependent sum types by using your own \\\"tag\\\" types.")
+    (license license:public-domain)))
+
 (define-public ghc-unsafe
   (package
     (name "ghc-unsafe")
-- 
2.40.1

[bug#64066] [PATCH 13/19] gnu: Add ghc-dependent-map

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-dependent-map): New variable.
---
 gnu/packages/haskell-xyz.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 06e7199c9c..48b259b41e 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -13193,6 +13193,29 @@ (define-public ghc-dependent-sum
 dependent sum types by using your own \\\"tag\\\" types.")
     (license license:public-domain)))
 
+(define-public ghc-dependent-map
+  (package
+    (name "ghc-dependent-map")
+    (version "0.4.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "dependent-map" version))
+              (sha256
+               (base32
+                "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "dependent-map")))
+    (inputs (list ghc-dependent-sum ghc-constraints-extras))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "160p9crvlx1sn60inkwxa6mv1h2d4fgqnpsb2km67zrkpdfyd2s2")))
+    (home-page "https://github.com/obsidiansystems/dependent-map")
+    (synopsis "Dependent finite maps (partial dependent products)")
+    (description
+     "This package provides a type called @@DMap@@ which generalizes @@Data.Map.Map@@,
+allowing keys to specify the type of value that can be associated with them.")
+    (license #f)))
+
 (define-public ghc-unsafe
   (package
     (name "ghc-unsafe")
-- 
2.40.1

[bug#64066] [PATCH 14/19] gnu: Add ghc-prim-uniq

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-prim-uniq): New variable.
---
 gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 48b259b41e..e21e32bae4 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -16560,6 +16560,26 @@ (define-public ghc-test-framework-leancheck
 to incorporate LeanCheck tests into test-framework test suites.")
     (license license:bsd-3)))
 
+(define-public ghc-prim-uniq
+  (package
+    (name "ghc-prim-uniq")
+    (version "0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "prim-uniq" version))
+              (sha256
+               (base32
+                "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "prim-uniq")))
+    (inputs (list ghc-dependent-sum ghc-primitive))
+    (home-page "https://github.com/obsidiansystems/prim-uniq")
+    (synopsis "Opaque unique identifiers in primitive state monads")
+    (description
+     "Opaque unique identifiers in primitive state monads and a GADT-like type using
+them as witnesses of type equality.")
+    (license license:public-domain)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.40.1

[bug#64066] [PATCH 15/19] gnu: Add ghc-patch

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index e21e32bae4..78cb1ccd39 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -16580,6 +16580,40 @@ (define-public ghc-prim-uniq
 them as witnesses of type equality.")
     (license license:public-domain)))
 
+(define-public ghc-patch
+  (package
+    (name "ghc-patch")
+    (version "0.0.8.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "patch" version))
+              (sha256
+               (base32
+                "15r2sjlpvp22iwd7qa1lqdq7n8nvqv2klvzrlm3phqq3j5n5x5y5"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "patch")))
+    (inputs (list ghc-constraints-extras
+                  ghc-commutative-semigroups
+                  ghc-dependent-map
+                  ghc-dependent-sum
+                  ghc-lens
+                  ghc-indexed-traversable
+                  ghc-semigroupoids
+                  ghc-witherable
+                  ghc-these
+                  ghc-semialign
+                  ghc-monoidal-containers))
+    (native-inputs (list ghc-hedgehog ghc-hunit ghc-filemanip hlint))
+    (home-page "https://obsidian.systems")
+    (synopsis
+     "Data structures for describing changes to other data structures.")
+    (description
+     "Data structures for describing changes to other data structures. .  In this
+library, a patch is something which can be applied, analogous to a function, and
+which distinguishes returning the argument it was provided from returning
+something else.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.40.1

[bug#64066] [PATCH 16/19] gnu: Add ghc-ref-tf

[zamfofex]

* gnu/packages/haskell-xyz.scm (ghc-ref-tf): New variable.
---
 gnu/packages/haskell-xyz.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 78cb1ccd39..c8b41baa37 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -16614,6 +16614,26 @@ (define-public ghc-patch
 something else.")
     (license license:bsd-3)))
 
+(define-public ghc-ref-tf
+  (package
+    (name "ghc-ref-tf")
+    (version "0.5.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "ref-tf" version))
+              (sha256
+               (base32
+                "0isilgcbw12zyh8s2liaj5r9r5m3yg1xskyhag6f36qi60y29hx5"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "ref-tf")))
+    (home-page "http://hackage.haskell.org/package/ref-tf")
+    (synopsis "A type class for monads with references using type families.")
+    (description
+     "This package contains a MonadRef type class that abstracts over the details of
+manipulating references, allowing one to write code that can operate in either
+the ST monad or the IO monad.")
+    (license license:bsd-3)))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
-- 
2.40.1

[bug#64066] [PATCH 17/19] gnu: Add ghc-reflex

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index c8b41baa37..9e0137cd8c 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -9713,6 +9713,72 @@ (define-public ghc-reflection
 @code{System.IO.Unsafe.unsafePerformIO}.")
     (license license:bsd-3)))
 
+(define-public ghc-reflex
+  (package
+    (name "ghc-reflex")
+    (version "0.8.2.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "reflex" version))
+              (sha256
+               (base32
+                "1add5bcsyq2k02w2q0ifbyfcvcic1hmjdbgxg8ajd5riam0lhb16"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "reflex")))
+    (inputs (list ghc-memotrie
+                  ghc-bifunctors
+                  ghc-comonad
+                  ghc-commutative-semigroups
+                  ghc-constraints
+                  ghc-constraints-extras
+                  ghc-data-default
+                  ghc-dependent-map
+                  ghc-exception-transformers
+                  ghc-lens
+                  ghc-mmorph
+                  ghc-monad-control
+                  ghc-patch
+                  ghc-prim-uniq
+                  ghc-primitive
+                  ghc-profunctors
+                  ghc-random
+                  ghc-ref-tf
+                  ghc-reflection
+                  ghc-semigroupoids
+                  ghc-syb
+                  ghc-unbounded-delays
+                  ghc-witherable
+                  ghc-these
+                  ghc-semialign
+                  ghc-monoidal-containers
+                  ghc-dependent-sum
+                  ghc-haskell-src-exts
+                  ghc-haskell-src-meta))
+    (native-inputs (list hlint
+                         ghc-split
+                         ghc-filemanip
+                         ghc-these-lens
+                         ghc-hspec
+                         ghc-proctest))
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'update-constraints
+           (lambda _
+             (substitute* "reflex.cabal"
+               (("\\bmmorph >= 1\\.0 && < 1\\.2,") "mmorph,")))))))
+    (home-page "https://reflex-frp.org")
+    (synopsis "Higher-order Functional Reactive Programming")
+    (description
+     "Interactive programs without callbacks or side-effects.  Functional Reactive
+Programming (FRP) uses composable events and time-varying values to describe
+interactive systems as pure functions.  Just like other pure functional code,
+functional reactive code is easier to get right on the first try, maintain, and
+reuse. .  Reflex is a fully-deterministic, higher-order Functional Reactive
+Programming interface and an engine that efficiently implements that interface.
+. <https://reflex-frp.org>")
+    (license license:bsd-3)))
+
 (define-public ghc-regex
   (package
     (name "ghc-regex")
-- 
2.40.1

[bug#64066] [PATCH 18/19] gnu: Add ghc-reflex-sdl2

[zamfofex]

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

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index 9e0137cd8c..7065fd6bb2 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -9779,6 +9779,43 @@ (define-public ghc-reflex
 . <https://reflex-frp.org>")
     (license license:bsd-3)))
 
+(define-public ghc-reflex-sdl2
+  (let ((commit "6dadf2c4f383b8a58fcd73616996b219c4f93972")
+        (revision "1"))
+    (package
+      (name "ghc-reflex-sdl2")
+      (version (git-version "0.3.0.2" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/schell/reflex-sdl2")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "06lxfgp18l1car6wd07mbjn4yblnp89acf1i67nd815p2hx0ihbz"))))
+      (build-system haskell-build-system)
+      (properties '((upstream-name . "reflex-sdl2")))
+      (inputs (list ghc-async
+                    ghc-dependent-sum
+                    ghc-exception-transformers
+                    ghc-ref-tf
+                    ghc-primitive
+                    ghc-reflex
+                    ghc-sdl2))
+      (arguments
+       '(#:phases
+         (modify-phases %standard-phases
+           (add-before 'configure 'update-constraints
+             (lambda _
+               (substitute* "reflex-sdl2.cabal"
+                 (("\\bref-tf +>= 0\\.4 +&& < 0\\.5\\b") "ref-tf")))))))
+      (home-page "https://github.com/schell/reflex-sdl2")
+      (synopsis "SDL2 and reflex FRP")
+      (description
+       "This package provides a minimal host for sdl2 based reflex apps.")
+      (license license:expat))))
+
 (define-public ghc-regex
   (package
     (name "ghc-regex")
-- 
2.40.1

[bug#64066] [PATCH 19/19] gnu: Add Plunder

[zamfofex]

* gnu/packages/games.scm (plunder): New variable.
---
 gnu/packages/games.scm | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 862aa26805..fa5bdfde9a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -70,7 +70,7 @@
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
 ;;; Copyright © 2022, 2023 Yovan Naumovski <yovan@gorski.stream>
 ;;; Copyright © 2022 Roman Riabenko <roman@riabenko.com>
-;;; Copyright © 2022 zamfofex <zamfofex@twdb.moe>
+;;; Copyright © 2022, 2023 zamfofex <zamfofex@twdb.moe>
 ;;; Copyright © 2022 Gabriel Arazas <foo.dogsquared@gmail.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2022 Hendursaga <hendursaga@aol.com>
@@ -154,6 +154,7 @@ (define-module (gnu packages games)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages haskell)
+  #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-crypto)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages icu4c)
@@ -222,6 +223,7 @@ (define-module (gnu packages games)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
+  #:use-module (guix build-system haskell)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
@@ -11253,6 +11255,44 @@ (define-public liquidwar6
     (home-page "https://www.gnu.org/software/liquidwar6/")
     (license license:gpl3+)))
 
+(define-public plunder
+  (let ((commit "026ded7083df5134bdf05b1ec7e5a0099ac9b9d2")
+        (revision "1"))
+    (package
+      (name "plunder")
+      (version (git-version "1.0.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/jappeace/plunder")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0m0v8x6q9iq4zihwmysbxjwkq18nar6xhq4g18p2g8c6azj2mgd6"))))
+      (build-system haskell-build-system)
+      (inputs (list ghc-monadrandom
+                    ghc-quickcheck
+                    ghc-file-embed
+                    ghc-generic-lens
+                    ghc-lens
+                    ghc-random
+                    ghc-reflex
+                    ghc-reflex-sdl2
+                    ghc-sdl2
+                    ghc-sdl2-gfx
+                    ghc-sdl2-image
+                    ghc-sdl2-ttf
+                    ghc-vector
+                    ghc-witherable))
+      (native-inputs (list ghc-hspec ghc-hspec-core hspec-discover))
+      (home-page "https://github.com/jappeace/plunder")
+      (synopsis "Game about looting a hexagonal-tile world")
+      (description
+       "A work-in-progress game where you control a viking and your objective
+is to loot all of the occupied hexagonal tiles in the map.")
+      (license license:expat))))
+
 (define-public freerct
   (package
     (name "freerct")
-- 
2.40.1

[bug#64066] [PATCH 00/19] Add Plunder

[Liliana Marie Prikler]

Am Mittwoch, dem 14.06.2023 um 09:46 -0300 schrieb zamfofex:
> This patch set adds Plunder, a work-in-progress game, alongside
> various Haskell packages that it depends on.
> 
> zamfofex (19):
>   gnu: Add ghc-proctest
>   gnu: Add ghc-hscolour
>   gnu: Add ghc-constraints-extras
>   gnu: Add ghc-indexed-profunctors
>   gnu: Add ghc-generic-lens-core
>   gnu: Add ghc-generic-lens
>   gnu: Add ghc-these-lens
>   gnu: Add ghc-sdl2-ttf
>   gnu: Add ghc-sdl2-gfx
>   gnu: Add ghc-exception-transformers
>   gnu: Add ghc-commutative-semigroup
>   gnu: Add ghc-dependent-sum
>   gnu: Add ghc-dependent-map
>   gnu: Add ghc-prim-uniq
>   gnu: Add ghc-patch
>   gnu: Add ghc-ref-tf
>   gnu: Add ghc-reflex
>   gnu: Add ghc-reflex-sdl2
We prefer full sentences, including the period at the end. 
/etc/committer.scm and the included snippets ought to do the right
thing.
>   gnu: Add Plunder
Use the package name :)

I haven't looked at the packages themselves, but provided that CI
builds them fine, they're probably good to go.

Cheers

bug#64066: [PATCH 00/19] Add Plunder

[Ludovic Courtès]

Hello!

zamfofex <zamfofex@twdb.moe> skribis:

>   gnu: Add ghc-proctest
>   gnu: Add ghc-hscolour
>   gnu: Add ghc-constraints-extras
>   gnu: Add ghc-indexed-profunctors
>   gnu: Add ghc-generic-lens-core
>   gnu: Add ghc-generic-lens
>   gnu: Add ghc-these-lens
>   gnu: Add ghc-sdl2-ttf
>   gnu: Add ghc-sdl2-gfx
>   gnu: Add ghc-exception-transformers
>   gnu: Add ghc-commutative-semigroup
>   gnu: Add ghc-dependent-sum
>   gnu: Add ghc-dependent-map
>   gnu: Add ghc-prim-uniq
>   gnu: Add ghc-patch
>   gnu: Add ghc-ref-tf
>   gnu: Add ghc-reflex
>   gnu: Add ghc-reflex-sdl2
>   gnu: Add Plunder

I pushed the series as commit 849f31d5746f5633f9f2a768b76739afc257ae99.

I manually edited synopses and descriptions to follow the guidelines at
<https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>
(‘guix lint’ would report most of the issues.)  In particular, many
would read “@@xyz@@” instead of “@code{xyz}”, maybe something to fix in
the importer?

There was also one package with (license #f) that I fixed.

In the future please make sure to check these things beforehand to
make the review process smoother!

Thanks,
Ludo’.