From patchwork Mon Jul 24 20:23:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Distopico X-Patchwork-Id: 52178 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 C9E5027BBE2; Mon, 24 Jul 2023 21:27:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A81A827BBE9 for ; Mon, 24 Jul 2023 21:27:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qO29E-0001n0-6Y; Mon, 24 Jul 2023 16:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qO294-0001l5-FQ for guix-patches@gnu.org; Mon, 24 Jul 2023 16:27:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qO294-00009J-77 for guix-patches@gnu.org; Mon, 24 Jul 2023 16:27:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qO294-00055b-2y for guix-patches@gnu.org; Mon, 24 Jul 2023 16:27:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64840] [PATCH 11/12] gnu: Fix missing required ghc-text dependency. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 20:27:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64840 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64840@debbugs.gnu.org Cc: Distopico Received: via spool by 64840-submit@debbugs.gnu.org id=B64840.169023039319451 (code B ref 64840); Mon, 24 Jul 2023 20:27:06 +0000 Received: (at 64840) by debbugs.gnu.org; 24 Jul 2023 20:26:33 +0000 Received: from localhost ([127.0.0.1]:44227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO28W-00053Z-NH for submit@debbugs.gnu.org; Mon, 24 Jul 2023 16:26:33 -0400 Received: from mx1.riseup.net ([198.252.153.129]:55478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO28Q-00051s-EZ for 64840@debbugs.gnu.org; Mon, 24 Jul 2023 16:26:26 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R8sBP0XqvzDqch for <64840@debbugs.gnu.org>; Mon, 24 Jul 2023 20:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690230381; bh=Pbt3YrL/uhVfRWA94IqhgIUYodkrzGcUemZ8VH2ITZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nQrfhm4jC8242+AiiQ9+pRPUWcX6XyP1i/G46oq6IwTanaiOFqBUjlKfEmihkGoY1 3tXTZEAIRLnn+GcyYgXMwdTF5S/JOxdt5GTFhjWA6plV9E54yozbptgRZtIjFt+Jo6 X9FygqDiTQs3e20Z2fcBgHRjAYKXLJ0Pt1WIXrC4= X-Riseup-User-ID: 61C21C031A34B5FF845D198D996588CB5646F3839A97B236A35C2BE09BE1DC65 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R8sBN2V3ZzJntF; Mon, 24 Jul 2023 20:26:20 +0000 (UTC) From: Distopico Date: Mon, 24 Jul 2023 15:23:13 -0500 Message-ID: <20230724202532.8993-11-distopico@riseup.net> In-Reply-To: <20230724202532.8993-1-distopico@riseup.net> References: <20230724202532.8993-1-distopico@riseup.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Several package require `text` haskell library as dependency but those are using the internal haskell type creation a mismatch of types An example of this is https://hackage.haskell.org/package/pretty-show-1.10/dependencies * gnu/packages/haskell-xyz.scm. --- gnu/packages/haskell-xyz.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 337dcac4d8..f1955dd1c2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -425,7 +425,7 @@ (define-public ghc-ansi-wl-pprint `(#:cabal-revision ("2" "1xrv66v5hqchjhj8a0g3awy1qpsswk2jqb4w4yh3mm1py5s0dlr0"))) (inputs - (list ghc-ansi-terminal)) + (list ghc-text ghc-ansi-terminal)) (home-page "https://github.com/ekmett/ansi-wl-pprint") (synopsis "Wadler/Leijen Pretty Printer for colored ANSI terminal output") (description "This is a pretty printing library based on Wadler's paper @@ -1494,7 +1494,7 @@ (define-public ghc-cassava @item Customizable record-conversion instance derivation via GHC generics @item -Low-level @url{https://hackage.haskell.org/package/bytestring), bytestring} +Low-level @url{https://hackage.haskell.org/package/bytestring, bytestring} builders (see @url{https://hackage.haskell.org/package/cassava-0.5.2.0/docs/ Data-Csv-Builder.html, Data.Csv.Builder}) @item @@ -4904,6 +4904,7 @@ (define-public ghc-hashable (build-system haskell-build-system) (properties '((upstream-name . "hashable"))) (native-inputs (list ghc-hunit + ghc-text ghc-quickcheck ghc-random ghc-test-framework @@ -8207,7 +8208,7 @@ (define-public ghc-optparse-applicative "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2")))) (build-system haskell-build-system) (properties '((upstream-name . "optparse-applicative"))) - (inputs (list ghc-transformers-compat ghc-ansi-wl-pprint)) + (inputs (list ghc-text ghc-transformers-compat ghc-ansi-wl-pprint)) (native-inputs (list ghc-quickcheck)) (home-page "https://github.com/pcapriotti/optparse-applicative") (synopsis "Utilities and combinators for parsing command line options") @@ -9232,7 +9233,7 @@ (define-public ghc-pretty-show (build-system haskell-build-system) (properties '((upstream-name . "pretty-show"))) (inputs - (list ghc-haskell-lexer ghc-happy)) + (list ghc-text ghc-haskell-lexer ghc-happy)) (home-page "https://wiki.github.com/yav/pretty-show") (synopsis "Tools for working with derived `Show` instances") (description @@ -9947,6 +9948,7 @@ (define-public ghc-regex-base "1w9fxad1dwi040r3db9i2cjhhrl86p3hngj13ixbcnqgb27l16bv")))) (build-system haskell-build-system) (properties '((upstream-name . "regex-base"))) + (inputs (list ghc-text)) (arguments `(#:cabal-revision ("1" "1k2gzjm7xz69f7zr08wh2wzb5dhb659cvimsvx0g9p8cf5f45x2g"))) @@ -10816,7 +10818,7 @@ (define-public ghc-semigroups "1qbk6scp1rzb69dy8mz26p6az5vi16g2lzwmwnfshh3br4rjwbch")))) (build-system haskell-build-system) (properties '((upstream-name . "semigroups"))) - (inputs (list ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers + (inputs (list ghc-text ghc-nats ghc-tagged ghc-hashable ghc-unordered-containers ghc-transformers-compat)) (home-page "http://github.com/ekmett/semigroups/") (synopsis "Semigroup operations for Haskell") @@ -14053,6 +14055,7 @@ (define-public ghc-wl-pprint-annotated "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb")))) (build-system haskell-build-system) (properties '((upstream-name . "wl-pprint-annotated"))) + (inputs (list ghc-text)) (native-inputs (list ghc-tasty ghc-tasty-hunit)) (home-page @@ -14224,6 +14227,7 @@ (define-public ghc-xml "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j")))) (build-system haskell-build-system) (properties '((upstream-name . "xml"))) + (inputs (list ghc-text)) (home-page "https://github.com/GaloisInc/xml") (synopsis "Simple XML library for Haskell") (description "This package provides a simple XML library for Haskell.") @@ -16909,4 +16913,3 @@ (define-public ghc-ref-tf ;;; of a merge conflict, place them above by existing packages with similar ;;; functionality or similar names. ;;; -