Package: guix-patches;
Reported by: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Tue, 28 Aug 2018 05:40:02 UTC
Severity: normal
Done: Arun Isaac <arunisaac <at> systemreboot.net>
Bug is archived. No further changes may be made.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Arun Isaac <arunisaac <at> systemreboot.net> To: guix-patches <at> gnu.org Subject: Update ghc-tasty Date: Sun, 26 Aug 2018 11:59:21 +0530
[Message part 1 (text/plain, inline)]
I have updated ghc-tasty and added ghc-wcwidth, a new dependency required by ghc-tasty. Please find attached patches.
[0001-gnu-Add-ghc-wcwidth.patch (text/x-patch, inline)]
From 77120a31c823c2c726fe2d3dcda30cf5ef565c1e Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Fri, 24 Aug 2018 00:36:15 +0530
Subject: [PATCH 1/2] gnu: Add ghc-wcwidth.
* gnu/packages/haskell.scm (ghc-wcwidth): 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 7d7d85f95..120706edd 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -10027,4 +10027,29 @@ tools are not needed to actually run Gtk2Hs programs.")
backends provided by the @code{Cairo} and @code{Diagrams} libraries.")
(license license:bsd-3)))
+(define-public ghc-wcwidth
+ (package
+ (name "ghc-wcwidth")
+ (version "0.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://hackage.haskell.org/package/wcwidth/wcwidth-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1n1fq7v64b59ajf5g50iqj9sa34wm7s2j3viay0kxpmvlcv8gipz"))))
+ (build-system haskell-build-system)
+ (inputs
+ `(("ghc-setlocale" ,ghc-setlocale)
+ ("ghc-utf8-string" ,ghc-utf8-string)
+ ("ghc-attoparsec" ,ghc-attoparsec)))
+ (home-page "https://github.com/solidsnack/wcwidth/")
+ (synopsis "Haskell bindings to wcwidth")
+ (description "This package provides Haskell bindings to your system's
+native wcwidth and a command line tool to examine the widths assigned by it.
+The command line tool can compile a width table to Haskell code that assigns
+widths to the Char type.")
+ (license license:bsd-3)))
+
;;; haskell.scm ends here
--
2.18.0
[0002-gnu-ghc-tasty-Update-to-1.1.0.3.patch (text/x-patch, inline)]
From 801c484623d790439b2c127c9c9a7f425876b682 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac <at> systemreboot.net>
Date: Fri, 24 Aug 2018 12:14:17 +0530
Subject: [PATCH 2/2] gnu: ghc-tasty: Update to 1.1.0.3.
* gnu/packages/haskell-check.scm (ghc-tasty): Update to 1.1.0.3.
[inputs]: Add ghc-wcwidth.
(ghc-attoparsec-bootstrap, ghc-integer-logarithms-bootstrap,
ghc-scientific-bootstrap): New variables.
(ghc-wcwidth)[inputs]: Replace ghc-attoparsec with ghc-attoparsec-bootstrap.
(ghc-scientific)[inputs]: Replace ghc-integer-logarithms with
ghc-integer-logarithms-bootstrap.
(ghc-attoparsec)[inputs]: Replace ghc-scientific with
ghc-scientific-bootstrap.
---
gnu/packages/haskell-check.scm | 7 ++++---
gnu/packages/haskell.scm | 27 ++++++++++++++++++++++++---
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index c3ef85f3f..1064872fe 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -183,7 +183,7 @@ timer functions of different operating systems via a unified API.")
(define-public ghc-tasty
(package
(name "ghc-tasty")
- (version "0.11.0.4")
+ (version "1.1.0.3")
(source
(origin
(method url-fetch)
@@ -193,7 +193,7 @@ timer functions of different operating systems via a unified API.")
".tar.gz"))
(sha256
(base32
- "05pxjzgbgjdn7477xry0ssjrnmnsydqiq6nm6ck8n2da1baliqp0"))))
+ "14riid753hjqr6lca1kgxpnvq0wykf0k3qc5jpag42hh8bszav22"))))
(build-system haskell-build-system)
(inputs
`(("ghc-stm" ,ghc-stm)
@@ -205,7 +205,8 @@ timer functions of different operating systems via a unified API.")
("ghc-unbounded-delays" ,ghc-unbounded-delays)
("ghc-async" ,ghc-async)
("ghc-ansi-terminal" ,ghc-ansi-terminal)
- ("ghc-clock-bootstrap" ,ghc-clock-bootstrap)))
+ ("ghc-clock-bootstrap" ,ghc-clock-bootstrap)
+ ("ghc-wcwidth" ,ghc-wcwidth)))
(home-page "http://documentup.com/feuerbach/tasty")
(synopsis "Modern and extensible testing framework")
(description "Tasty is a modern testing framework for Haskell. It lets
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 120706edd..3d6da0063 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -2741,7 +2741,7 @@ with slicing and Clang-style colored diagnostics.")
;; re-enable them.
(arguments `(#:tests? #f))
(inputs
- `(("ghc-scientific" ,ghc-scientific)
+ `(("ghc-scientific-bootstrap" ,ghc-scientific-bootstrap)
("ghc-text" ,ghc-text)))
(native-inputs
`(("ghc-tasty" ,ghc-tasty)
@@ -2756,6 +2756,13 @@ aimed particularly at dealing efficiently with network protocols and
complicated text/binary file formats.")
(license license:bsd-3)))
+(define ghc-attoparsec-bootstrap
+ (package
+ (inherit ghc-attoparsec)
+ (name "ghc-attoparsec-bootstrap")
+ (arguments '(#:tests? #f))
+ (native-inputs '())))
+
(define-public ghc-zip-archive
(package
(name "ghc-zip-archive")
@@ -5083,6 +5090,13 @@ occurrences of a substring (the first in case of overlaps) with another.")
in migrated modules.")
(license license:expat)))
+(define ghc-integer-logarithms-bootstrap
+ (package
+ (inherit ghc-integer-logarithms)
+ (name "ghc-integer-logarithms-bootstrap")
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ghc-scientific
(package
(name "ghc-scientific")
@@ -5099,7 +5113,7 @@ in migrated modules.")
"03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397"))))
(build-system haskell-build-system)
(inputs
- `(("ghc-integer-logarithms" ,ghc-integer-logarithms)
+ `(("ghc-integer-logarithms-bootstrap" ,ghc-integer-logarithms-bootstrap)
("ghc-text" ,ghc-text)
("ghc-hashable" ,ghc-hashable)
("ghc-primitive" ,ghc-primitive)))
@@ -5120,6 +5134,13 @@ and space efficient. They are represented using
notation}.")
(license license:bsd-3)))
+(define ghc-scientific-bootstrap
+ (package
+ (inherit ghc-scientific)
+ (name "ghc-scientific-bootstrap")
+ (arguments `(#:tests? #f))
+ (native-inputs '())))
+
(define-public ghc-boxes
(package
(name "ghc-boxes")
@@ -10043,7 +10064,7 @@ backends provided by the @code{Cairo} and @code{Diagrams} libraries.")
(inputs
`(("ghc-setlocale" ,ghc-setlocale)
("ghc-utf8-string" ,ghc-utf8-string)
- ("ghc-attoparsec" ,ghc-attoparsec)))
+ ("ghc-attoparsec-bootstrap" ,ghc-attoparsec-bootstrap)))
(home-page "https://github.com/solidsnack/wcwidth/")
(synopsis "Haskell bindings to wcwidth")
(description "This package provides Haskell bindings to your system's
--
2.18.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.