[bug#36562] downgrading ghc-ansi-terminal

[bug#36562] downgrading ghc-ansi-terminal

[Robert Vollmert]

A patch set to downgrade ghc-ansi-terminal to the stackage LTS
version, to have a consistent package set. This also downgrades
the recently added ghc-validation to version 1 from version 1.1.

The problem with the current situation is that we have some
packages depending on the updated ghc-ansi-terminal 0.9, and
some depending on ghc-ansi-terminal 0.8. By themselves, they
compile, but it’s now impossible to package modules that depend
directly on packages from both sets.

@Jacob: Would ghc-validation version 1 be sufficient for you
purposes?

Cheers
Robert

[bug#36562] [PATCH 1/6] Revert "gnu: Add ghc-ansi-terminal-0.8."

[Robert Vollmert]

This reverts commit cbff89d126bf5985cfa4884f543c0908c437ff41.
---
 gnu/packages/haskell.scm | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ad6d8d4661..ed045cab83 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4256,21 +4256,6 @@ allows cursor movement, screen clearing, color output showing or hiding the
 cursor, and changing the title.")
     (license license:bsd-3)))
 
-(define-public ghc-ansi-terminal-0.8
-  (package (inherit ghc-ansi-terminal)
-           (name "ghc-ansi-terminal")
-           (version "0.8.0.4")
-           (source
-            (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://hackage.haskell.org/package/ansi-terminal/ansi-terminal-"
-                    version
-                    ".tar.gz"))
-              (sha256
-               (base32
-                "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b"))))))
-
 (define-public ghc-vault
   (package
     (name "ghc-vault")
-- 
2.20.1 (Apple Git-117)

[bug#36562] [PATCH 2/6] Revert "gnu: ghc-ansi-wl-pprint: Use ghc-ansi-terminal-0.8."

[Robert Vollmert]

This reverts commit 5a499d0f7d5b98443ed0b2c41f2651f66a84ab5e.
---
 gnu/packages/haskell.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index ed045cab83..cca7209f69 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -3990,7 +3990,7 @@ instances of the @code{Pretty} class.")
          "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"))))
     (build-system haskell-build-system)
     (inputs
-     `(("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8)))
+     `(("ghc-ansi-terminal" ,ghc-ansi-terminal)))
     (home-page "https://github.com/ekmett/ansi-wl-pprint")
     (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output")
     (description "This is a pretty printing library based on Wadler's paper
-- 
2.20.1 (Apple Git-117)

[bug#36562] [PATCH 3/6] gnu: ghc-hedgehog: Use ghc-ansi-terminal.

[Robert Vollmert]

* gnu/packages/haskell-check.scm (ghc-hedgehog)[inputs]: Use ghc-ansi-terminal.
---
 gnu/packages/haskell-check.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index f9c39c0a5c..294665478b 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -811,7 +811,7 @@ implementations of cryptographic ciphers.")
          "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj"))))
     (build-system haskell-build-system)
     (inputs
-     `(("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8)
+     `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
        ("ghc-async" ,ghc-async)
        ("ghc-concurrent-output" ,ghc-concurrent-output)
        ("ghc-exceptions" ,ghc-exceptions)
-- 
2.20.1 (Apple Git-117)

[bug#36562] [PATCH 4/6] Revert "gnu: ghc-ansi-terminal: Update to 0.9.1."

[Robert Vollmert]

This reverts commit 4e3ebbfb1649063bcc0f350523868c667e6699dd.
---
 gnu/packages/haskell.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index cca7209f69..21e002f730 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4235,7 +4235,7 @@ interface.")
 (define-public ghc-ansi-terminal
   (package
     (name "ghc-ansi-terminal")
-    (version "0.9.1")
+    (version "0.8.0.4")
     (source
      (origin
        (method url-fetch)
@@ -4245,7 +4245,7 @@ interface.")
              ".tar.gz"))
        (sha256
         (base32
-         "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l"))))
+         "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b"))))
     (build-system haskell-build-system)
     (inputs
      `(("ghc-colour" ,ghc-colour)))
-- 
2.20.1 (Apple Git-117)

[bug#36562] [PATCH 5/6] gnu: ghc-concurrent-output: Downgrade to 1.10.9.

[Robert Vollmert]

Stackage LTS version, compatible with ansi-terminal-0.8.

* gnu/packages/haskell.scm (ghc-concurrent-output): Downgrade to 1.10.9.
---
 gnu/packages/haskell.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 21e002f730..39ccbe8501 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -11466,7 +11466,7 @@ example of, \"An applicative functor that is not a monad.\"")
 (define-public ghc-concurrent-output
   (package
     (name "ghc-concurrent-output")
-    (version "1.10.10")
+    (version "1.10.9")
     (source
      (origin
        (method url-fetch)
@@ -11476,7 +11476,7 @@ example of, \"An applicative functor that is not a monad.\"")
              ".tar.gz"))
        (sha256
         (base32
-         "1wnjxnwbc3l853kiiijagzjyb6fmhz3lmkwls24plbximl1qrr22"))))
+         "0mwf155w89nbbkjln7hhbn8k3f8p0ylcvgrg31cm7ijpx4499i4c"))))
     (build-system haskell-build-system)
     (inputs
      `(("ghc-async" ,ghc-async)
-- 
2.20.1 (Apple Git-117)

[bug#36562] [PATCH 6/6] gnu: ghc-validation: Downgrade to 1.

[Robert Vollmert]

This is the latest stackage LTS version, compatible with
ansi-terminal 0.8.

* gnu/packages/haskell.scm (ghc-validation): Downgrade to 1.
---
 gnu/packages/haskell.scm | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 39ccbe8501..a5c1aa27da 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -11412,7 +11412,7 @@ default)
 (define-public ghc-validation
   (package
     (name "ghc-validation")
-    (version "1.1")
+    (version "1")
     (source
      (origin
        (method url-fetch)
@@ -11422,18 +11422,11 @@ default)
              ".tar.gz"))
        (sha256
         (base32
-         "1acj7mh3581ks405xswxw6667z7y1y0slisg6jvp6chc191ji9l5"))))
+         "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"))))
     (build-system haskell-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'add-setup-script
-           (lambda _
-             ;; The usual "Setup.hs" script is missing from the source.
-             (with-output-to-file "Setup.hs"
-               (lambda ()
-                 (format #t "import Distribution.Simple~%")
-                 (format #t "main = defaultMain~%"))))))))
+     `(#:cabal-revision
+       ("1" "1x1g4nannz81j1h64l1m3ancc96zc57d1bjhj1wk7bwn1xxbi5h3")))
     (inputs
      `(("ghc-semigroups" ,ghc-semigroups)
        ("ghc-semigroupoids" ,ghc-semigroupoids)
-- 
2.20.1 (Apple Git-117)

[bug#36562] downgrading ghc-ansi-terminal

[Timothy Sample]

Hi Robert and Jacob,

Robert Vollmert <rob@vllmrt.net> writes:

> A patch set to downgrade ghc-ansi-terminal to the stackage LTS
> version, to have a consistent package set. This also downgrades
> the recently added ghc-validation to version 1 from version 1.1.
>
> The problem with the current situation is that we have some
> packages depending on the updated ghc-ansi-terminal 0.9, and
> some depending on ghc-ansi-terminal 0.8. By themselves, they
> compile, but it’s now impossible to package modules that depend
> directly on packages from both sets.

I agree.  Thanks for keeping an eye on this.

> @Jacob: Would ghc-validation version 1 be sufficient for you
> purposes?

I’ve CC’ed Jacob on this message since they may not be subscribed to the
list.  Jacob, are you okay with this?


-- Tim

[bug#36562] downgrading ghc-ansi-terminal

[Jacob MacDonald]

> I’ve CC’ed Jacob on this message since they may not be subscribed to the
> list.

That is indeed the case.

>> @Jacob: Would ghc-validation version 1 be sufficient for you
>> purposes?

Glancing at the changelog, it should be. If not, I'll use a custom
package definition. My use-case is low severity anyway.

Best,

Jacob.

bug#36562: downgrading ghc-ansi-terminal

[Timothy Sample]

Hi,

Jacob MacDonald <jaccarmac@gmail.com> writes:

>> I’ve CC’ed Jacob on this message since they may not be subscribed to the
>> list.
>
> That is indeed the case.
>
>>> @Jacob: Would ghc-validation version 1 be sufficient for you
>>> purposes?
>
> Glancing at the changelog, it should be. If not, I'll use a custom
> package definition. My use-case is low severity anyway.

Okay.  Thanks Jacob!

I reordered these a bit so that ansi-terminal and its dependencies get
changed in a single commit.  I also split off the removal of the
“Setup.hs” generating phase into its own commit.

They are (finally!) pushed as 1c54c30d9c–91732735f6.


-- Tim