From patchwork Sat Feb 11 10:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 46839 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 818D616615; Sat, 11 Feb 2023 10:18:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 BCC4D165B0 for ; Sat, 11 Feb 2023 10:18:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmxP-00018T-Fx; Sat, 11 Feb 2023 05:18:12 -0500 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 1pQmxH-000176-2c for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmxG-0002Sp-GO for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmxG-0004Uy-Bz for guix-patches@gnu.org; Sat, 11 Feb 2023 05:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 28/31] gnu: pandoc: Drop Haskell libraries and documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611064517240 (code B ref 61420); Sat, 11 Feb 2023 10:18:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:17:25 +0000 Received: from localhost ([127.0.0.1]:38962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwe-0004Tt-Th for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:25 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:42976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwc-0004TZ-NP for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:17:23 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4PDRBz4gj2z9slW; Sat, 11 Feb 2023 11:08:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=83Brfhr0qs17FyY93NykLUeSj4gSxoATRCABNNcGJ9k=; b=IE0pDH+2ygh0/BGBpsIpeXO93X+4BJ3FC8W7dOjYRq7iDvHqs0PlKg+00XjLOWK1jAZ3aB aE+EVJQHnnlj5WzcsDiKejy9YVsI+zacmpywjS2p/3sjOvoXKxGkvFpCppteIH53tGfmNd CbDwpIT1B7/6do8ngsgaVTOPkWvz2wyiWvtLm2zlb575IK7Rt8qTWdf9H5cjMV/+f9j8R0 pCUMLSNuWJ8neshGhdZnL++cGgv0J1+rhWEMPG/NkbHtk7NZkt1Zys8PHEqiSfsGAMLcFE f1ZAgk8KmoNd+zNGIyE7DC8EqddX5ZgxLAoguHL5oI22LDWkHmA7nijy74IE9g== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:22 +0100 Message-Id: <20230211100825.47971-25-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4PDRBz4gj2z9slW 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 * gnu/packages/haskell-xyz.scm (ghc-pandoc): Renamed from pandoc. (pandoc) [arguments]: Add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/haskell-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0a6efedd29..7578065eb1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8188,9 +8188,9 @@ (define-public ghc-doclayout code. It was designed for use in @code{Pandoc}.") (license license:bsd-3))) -(define-public pandoc +(define-public ghc-pandoc (package - (name "pandoc") + (name "ghc-pandoc") (version "2.19.2") (source (origin (method url-fetch) @@ -8288,8 +8288,19 @@ (define-public pandoc provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) -(define-public ghc-pandoc - (deprecated-package "ghc-pandoc" pandoc)) +(define-public pandoc + (package + (inherit ghc-pandoc) + (name "pandoc") + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))) + ;; Haddock documentation is for the library. + #:haddock? #f)))) (define-public ghc-pandoc-types (package