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

Previous Next

Full log

Message #8 received at 36249 <at> debbugs.gnu.org (full text, mbox):

From: Robert Vollmert <rob <at> vllmrt.net>
To: 36249 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: ghc-clock: Break test dependency cycle differently.
Date: Sun, 16 Jun 2019 18:42:15 +0200

> On 16. Jun 2019, at 18:29, Robert Vollmert <rob <at> 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 <at> fbengineering.ch>
> ;;; Copyright © 2015 Siniša Biđin <sinisa <at> 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?

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.