From 91732735f6f4029281ed6917d57a97544bd95e19 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 9 Jul 2019 15:43:21 +0200 Subject: gnu: ghc-ansi-terminal: Downgrade to 0.8.0.4. This reverts commits cbff89d126bf5985cfa4884f543c0908c437ff41, 5a499d0f7d5b98443ed0b2c41f2651f66a84ab5e, and 4e3ebbfb1649063bcc0f350523868c667e6699dd. * gnu/packages/haskell.scm (ghc-ansi-terminal): Downgrade to 0.8.0.4. (ghc-ansi-terminal-0.8): Delete variable. (ghc-ansi-wl-pprint, ghc-concurrent-output)[inputs]: Replace 'ghc-ansi-terminal-0.8' with 'ghc-ansi-terminal'. * gnu/packages/haskell-check.scm (ghc-hedgehog)[inputs]: Likewise. --- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell.scm | 23 ++++------------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 2f0b842cae..589eee74d9 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -811,7 +811,7 @@ (define-public ghc-hedgehog "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) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 94480bbe0c..a15a899334 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -4038,7 +4038,7 @@ (define-public ghc-ansi-wl-pprint "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 @@ -4283,7 +4283,7 @@ (define-public ghc-network-uri (define-public ghc-ansi-terminal (package (name "ghc-ansi-terminal") - (version "0.9.1") + (version "0.8.0.4") (source (origin (method url-fetch) @@ -4293,7 +4293,7 @@ (define-public ghc-ansi-terminal ".tar.gz")) (sha256 (base32 - "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l")))) + "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b")))) (build-system haskell-build-system) (inputs `(("ghc-colour" ,ghc-colour))) @@ -4304,21 +4304,6 @@ (define-public ghc-ansi-terminal 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") @@ -11931,7 +11916,7 @@ (define-public ghc-concurrent-output (inputs `(("ghc-async" ,ghc-async) ("ghc-exceptions" ,ghc-exceptions) - ("ghc-ansi-terminal" ,ghc-ansi-terminal-0.8) + ("ghc-ansi-terminal" ,ghc-ansi-terminal) ("ghc-terminal-size" ,ghc-terminal-size))) (home-page "https://hackage.haskell.org/package/concurrent-output") -- cgit v1.2.3