[bug#36249] [PATCH] gnu: ghc-clock: Break test dependency cycle differently.

[bug#36249] [PATCH] gnu: ghc-clock: Break test dependency cycle differently.

[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)

[bug#36249] [PATCH] gnu: ghc-clock: Break test dependency cycle differently.

[Robert Vollmert]

> On 16. Jun 2019, at 18:29, Robert Vollmert <rob@vllmrt.net> wrote:
> 
> 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.
> —

[…]

> @@ -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))

Is this an appropriate thing to do? Or should I export ghc-clock-bootstrap and mark it
hidden?

>        ("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>

Oops, that must be introduced in some other patch of mine. (Bad keyboard :-( )

> +(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"))))

I missed adding the patch, see below.

> +    (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)
> 

diff --git a/gnu/packages/patches/ghc-clock-disable-library.patch b/gnu/packages/patches/ghc-clock-disable-library.patch
new file mode 100644
index 0000000000..4bf83cfaf1
--- /dev/null
+++ b/gnu/packages/patches/ghc-clock-disable-library.patch
@@ -0,0 +1,13 @@
+
+diff -u a/clock.cabal b/clock.cabal
+--- a/clock.cabal      2019-06-16 17:36:19.212000000 +0200
++++ b/clock.cabal      2019-06-16 17:36:37.804000000 +0200
+@@ -61,6 +61,7 @@
+ 
+ 
+-library
++library disabled
++    buildable: False
+     if impl (ghc < 7.6)
+       build-depends:       base >= 4.4 && <= 5, ghc-prim
+     build-depends:       base >= 2 && <= 5

The library needs to be renamed because it conflicts with the existing clock library otherwise.
This feels a bit hacky, but I don’t currently see a more elegant way to handle this. Ideas?

[bug#36249] [PATCH v2] gnu: ghc-clock: Align version of bootstrap and real package

[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 with tests.
---
 gnu/packages/haskell-check.scm | 26 +-------------------------
 gnu/packages/haskell.scm       | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm
index d275b5f525..294665478b 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 7c910e56cb..65d8d75950 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -4785,9 +4785,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
@@ -4799,15 +4801,23 @@ 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")
+    (inputs
+     `(("ghc-tasty" ,ghc-tasty)
+       ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)))
+    (arguments `(#:tests? #t))))
+
 (define-public ghc-charset
   (package
     (name "ghc-charset")
-- 
2.20.1 (Apple Git-117)

bug#36249: [PATCH v2] gnu: ghc-clock: Align version of bootstrap and real package

[Timothy Sample]

Hi Robert,

Robert Vollmert <rob@vllmrt.net> writes:

> 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 with tests.
> ---
>  gnu/packages/haskell-check.scm | 26 +-------------------------
>  gnu/packages/haskell.scm       | 20 +++++++++++++++-----
>  2 files changed, 16 insertions(+), 30 deletions(-)
>
> [...]

I ended up turning this around, and basing “ghc-clock-bootstrap” on
“ghc-clock”.  It turns out we already have a bunch of packages that do
the same thing, so all that was needed was to follow those examples.

I committed a similar patch as 71e5d425c9b9e108ebdd06d13de45b56dddd9ef5,
with you as the co-author.  Thanks!


-- Tim