01/01: gnu: ghc-clock-bootstrap: Move and inherit from ghc-clock.

[guix-commits]

samplet pushed a commit to branch master
in repository guix.

commit 71e5d425c9b9e108ebdd06d13de45b56dddd9ef5
Author: Timothy Sample <address@hidden>
Date:   Tue Jul 16 14:43:03 2019 -0400

    gnu: ghc-clock-bootstrap: Move and inherit from ghc-clock.
    
    Fixes <https://bugs.gnu.org/36084>.
    
    * gnu/packages/haskell-check.scm (ghc-clock-bootstrap): Move this...
    * gnu/packages/haskell.scm (ghc-clock-bootstrap): ...here and inherit
    from ghc-clock (which implies updating to version 0.7.2).
    
    Co-authored-by: Robert Vollmert <address@hidden>
---
 gnu/packages/haskell-check.scm | 24 ------------------------
 gnu/packages/haskell.scm       | 10 ++++++++++
 2 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index 9b010fd..3c10a52 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -154,30 +154,6 @@ output file should be identical to the corresponding 
@code{golden} file, which
 contains the correct result for the test.")
     (license license:expat)))
 
-;; This package builds `clock` without tests, since the tests rely on tasty
-;; and tasty-quickcheck, which in turn require clock to build.
-(define ghc-clock-bootstrap
-  (package
-    (name "ghc-clock-bootstrap")
-    (version "0.5.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://hackage.haskell.org/package/";
-             "clock/"
-             "clock-" version ".tar.gz"))
-       (sha256
-        (base32 "1ncph7vi2q6ywwc8ysxl1ibw6i5dwfvln88ssfazk8jgpj4iyykw"))))
-    (build-system haskell-build-system)
-    (arguments `(#:tests? #f)) ;; Testing suite depends on tasty and
-                               ;; tasty-quickcheck, which need clock to build.
-    (home-page "https://hackage.haskell.org/package/clock";)
-    (synopsis "High-resolution clock for Haskell")
-    (description "A package for convenient access to high-resolution clock and
-timer functions of different operating systems via a unified API.")
-    (license license:bsd-3)))
-
 (define-public ghc-tasty
   (package
     (name "ghc-tasty")
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 17fddc1..a30b437 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4928,6 +4928,16 @@ unbounded @code{Integer} type.")
 timer functions of different operating systems via a unified API.")
     (license license:bsd-3)))
 
+;; This package builds `clock` without tests, since the tests rely on tasty
+;; and tasty-quickcheck, which in turn require clock to build.
+(define-public ghc-clock-bootstrap
+  (package
+    (inherit ghc-clock)
+    (name "ghc-clock-bootstrap")
+    (arguments '(#:tests? #f))
+    (inputs '())
+    (properties '((hidden? #t)))))
+
 (define-public ghc-charset
   (package
     (name "ghc-charset")