From patchwork Sat Feb 11 10:08:18 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: 46837 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 896E116615; Sat, 11 Feb 2023 10:17:33 +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 450A4165F0 for ; Sat, 11 Feb 2023 10:17:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmwK-0000L9-Jy; Sat, 11 Feb 2023 05:17:04 -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 1pQmwJ-0000KU-0k for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:03 -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 1pQmwI-0002K3-OF for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmwI-0004T2-JV for guix-patches@gnu.org; Sat, 11 Feb 2023 05:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 24/31] gnu: hledger: 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:17: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.167611061817152 (code B ref 61420); Sat, 11 Feb 2023 10:17:02 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:16:58 +0000 Received: from localhost ([127.0.0.1]:38952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwE-0004SZ-34 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:16:58 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:55806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmwC-0004SN-CP for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:16:56 -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-201.mailbox.org (Postfix) with ESMTPS id 4PDRBy2BX5z9sd9; Sat, 11 Feb 2023 11:08:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110122; 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=kQw6FCWTObduOlCz9HProApBD7ZU1ri+W8XCo7x7Qjw=; b=CkvWWcrcpgY1KDWeiCzOxH63xY+4JB3mMGh7AIbWq2h+ZAszWaoBHLWlDhyNiCZuSWNx29 5HpRcnmnvS+OelYsWv8uU1NEdYtYzalNJuFBn1APy/9fWPjzTbY/LoLgK2kbeCdkhXzgdb cHnfYivyeotZ1Wpnv1ik3CUTQNzK1+rnQ9Tm8goL3MR763bDT9sxyYRkHGqYK8T8TP3qa3 PPFC8bEXYdWxTt2oEXrMGZrrsXOVrrTX//yYDhkD3b1Wm2/M9un6oyqLRpQ+jsdZMBVkAR zwNC6WainmtoLgcjDW5jVLvjICV7hfI7vpLY8HSh/AtJMEwyv7JanCdoNMeHtg== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:18 +0100 Message-Id: <20230211100825.47971-21-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: 4PDRBy2BX5z9sd9 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/finance.scm (ghc-hledger): New variable. (hledger): Inherit from ghc-hledger and add 'remove-libraries phase and disable #:haddock?. --- gnu/packages/finance.scm | 48 ++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index d04cf465f4..28f9f67595 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -212,9 +212,9 @@ (define-public bitcoin-core-23.0 (define-public bitcoin-core bitcoin-core-23.0) -(define-public hledger +(define-public ghc-hledger (package - (name "hledger") + (name "ghc-hledger") (version "1.27.1") (source (origin (method url-fetch) @@ -223,14 +223,6 @@ (define-public hledger (base32 "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb")))) (build-system haskell-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda _ - (install-file "hledger.info" (string-append #$output "/share/info")) - (install-file "hledger.1" (string-append #$output "/man/man1"))))))) (properties '((upstream-name . "hledger"))) (inputs (list ghc-decimal ghc-diff @@ -273,6 +265,23 @@ (define-public hledger Accounting.") (license license:gpl3))) +(define-public hledger + (package + (inherit ghc-hledger) + (name "hledger") + (arguments + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda _ + (install-file "hledger.info" (string-append #$output "/share/info")) + (install-file "hledger.1" (string-append #$output "/man/man1")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))))) + (define-public homebank (package (name "homebank") @@ -1988,7 +1997,7 @@ (define-public hledger-web ghc-data-default ghc-extra ghc-hjsmin - hledger + ghc-hledger ghc-hledger-lib ghc-hspec ghc-http-client @@ -2012,12 +2021,17 @@ (define-public hledger-web ghc-yesod-static ghc-yesod-test)) (arguments - (list #:phases - #~(modify-phases %standard-phases - ;; Tests write to $HOME. - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:haddock? #f + #:phases + #~(modify-phases %standard-phases + ;; Tests write to $HOME. + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp"))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) (home-page "http://hledger.org") (synopsis "Web-based user interface for the hledger accounting system") (description