unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#36249] [PATCH] gnu: ghc-clock: Break test dependency cycle differently.
@ 2019-06-16 16:29 Robert Vollmert
  2019-06-16 16:42 ` Robert Vollmert
  2019-07-16 16:16 ` [bug#36249] [PATCH v2] gnu: ghc-clock: Align version of bootstrap and real package Robert Vollmert
  0 siblings, 2 replies; 4+ messages in thread
From: Robert Vollmert @ 2019-06-16 16:29 UTC (permalink / raw)
  To: 36249; +Cc: Robert Vollmert

Fixes https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36084.

* gnu/packages/haskell-check.scm (ghc-tasty): Import ghc-clock-bootstrap
directly from (gnu packages haskell).
(ghc-clock-bootstrap): Move to...
* gnu/packages/haskell.scm (ghc-clock-bootstrap): Here and update to 0.7.2.
(ghc-clock): Inherit ghc-clock-bootstrap and build as test-only package that
builds tests against ghc-clock-bootstrap and copies its result.
---
 gnu/packages/haskell-check.scm | 26 +--------------------
 gnu/packages/haskell.scm       | 42 +++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index cfd986ed5e..21ea365aab 100644
--- a/gnu/packages/haskell-check.scm
+++ b/gnu/packages/haskell-check.scm
@@ -153,30 +153,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")
@@ -199,7 +175,7 @@ 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" ,(@@ (gnu packages haskell) ghc-clock-bootstrap))
        ("ghc-wcwidth" ,ghc-wcwidth-bootstrap)))
     (home-page "http://documentup.com/feuerbach/tasty")
     (synopsis "Modern and extensible testing framework")
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index b9745b9661..35e89bb15c 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -1,4 +1,3 @@
-
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015, 2016 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
@@ -4757,9 +4756,11 @@ or timeout period.  This package provides alternative functions which use the
 unbounded @code{Integer} type.")
     (license license:bsd-3)))
 
-(define-public ghc-clock
+;; 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")
+    (name "ghc-clock-bootstrap")
     (version "0.7.2")
     (source
      (origin
@@ -4771,15 +4772,44 @@ unbounded @code{Integer} type.")
        (sha256
         (base32 "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8"))))
     (build-system haskell-build-system)
-    (inputs
-     `(("ghc-tasty" ,ghc-tasty)
-       ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
+    (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-clock
+  (package
+    (inherit ghc-clock-bootstrap)
+    (name "ghc-clock")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://hackage.haskell.org/package/"
+             "clock/"
+             "clock-" version ".tar.gz"))
+       (sha256
+        (base32 "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8"))
+       (patches
+        (search-patches
+         "ghc-clock-disable-library.patch"))))
+    (inputs
+     `(("ghc-clock-bootstrap" ,ghc-clock-bootstrap)
+       ("ghc-tasty" ,ghc-tasty)
+       ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
+    (arguments
+     `(#:tests? #t
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((bootstrap (assoc-ref inputs "ghc-clock-bootstrap")))
+               (copy-recursively bootstrap (assoc-ref outputs "out"))))))))))
+
 (define-public ghc-charset
   (package
     (name "ghc-charset")
-- 
2.20.1 (Apple Git-117)

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-16 19:10 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-16 16:29 [bug#36249] [PATCH] gnu: ghc-clock: Break test dependency cycle differently Robert Vollmert
2019-06-16 16:42 ` Robert Vollmert
2019-07-16 16:16 ` [bug#36249] [PATCH v2] gnu: ghc-clock: Align version of bootstrap and real package Robert Vollmert
2019-07-16 19:09   ` bug#36249: " Timothy Sample

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).