From patchwork Wed Feb 26 11:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20434 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB0AF27BBEA; Wed, 26 Feb 2020 11:48:07 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id AF80227BBE4 for ; Wed, 26 Feb 2020 11:48:07 +0000 (GMT) Received: from localhost ([::1]:42992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vAd-0007V7-57 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:48:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33757) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9i-0006jB-CH for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9c-00039d-Kf for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9c-00038o-GX for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9c-0004gz-F8 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 11/13] gnu: ghc-haddock-library: Update to 1.8.0. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759017905 (code B ref 39798); Wed, 26 Feb 2020 11:47:04 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:30 +0000 Received: from localhost ([127.0.0.1]:56510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v94-0004ed-Do for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:30 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:38667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v90-0004dF-Ob for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:27 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 0F94D200016 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:25 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:03 +0100 Message-Id: <20200226114605.15106-11-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-haddock-library): Update to 1.8.0. --- gnu/packages/haskell-xyz.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0d766ebe75..b80e19deef 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4841,7 +4841,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -4851,23 +4851,12 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7")))) + "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Since there is no revised Cabal file upstream, we have to - ;; patch it manually. - (add-before 'configure 'relax-test-suite-dependencies - (lambda _ - (substitute* "haddock-library.cabal" - (("hspec\\s*>= 2.4.4 && < 2.6") "hspec") - (("QuickCheck\\s*\\^>= 2.11") "QuickCheck")) - #t))))) (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) + `(("ghc-base-compat" ,ghc-base-compat-0.11) ("ghc-hspec" ,ghc-hspec) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-optparse-applicative" ,ghc-optparse-applicative-0.15) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tree-diff" ,ghc-tree-diff) ("hspec-discover" ,hspec-discover)))