From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:48574) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnQ8W-0001HZ-CZ for guix-patches@gnu.org; Tue, 16 Jul 2019 12:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnQ8U-00019D-2S for guix-patches@gnu.org; Tue, 16 Jul 2019 12:17:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnQ8T-000196-V3 for guix-patches@gnu.org; Tue, 16 Jul 2019 12:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hnQ8T-0005Re-O7 for guix-patches@gnu.org; Tue, 16 Jul 2019 12:17:01 -0400 Subject: [bug#36249] [PATCH v2] gnu: ghc-clock: Align version of bootstrap and real package References: <20190616162902.28977-1-rob@vllmrt.net> In-Reply-To: <20190616162902.28977-1-rob@vllmrt.net> Resent-Message-ID: From: Robert Vollmert Date: Tue, 16 Jul 2019 18:16:06 +0200 Message-Id: <20190716161605.22764-1-rob@vllmrt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36249@debbugs.gnu.org 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 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)