From patchwork Sat Feb 11 10:08:20 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: 46810 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 0FCB61661A; Sat, 11 Feb 2023 10:09:26 +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=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 DBA54165B0 for ; Sat, 11 Feb 2023 10:09:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004tO-Ve; Sat, 11 Feb 2023 05:09:19 -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 1pQmol-0004pZ-FJ for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:15 -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 1pQmog-0000AN-9C for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmog-0004EG-5b for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 26/31] gnu: git-annex: Drop Haskell documentation. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:10 +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.167611014016086 (code B ref 61420); Sat, 11 Feb 2023 10:09:10 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:09:00 +0000 Received: from localhost ([127.0.0.1]:38896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoW-0004BI-An for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:09:00 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:59356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoM-00046s-CC for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:51 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.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-101.mailbox.org (Postfix) with ESMTPS id 4PDRBy6bCtz9scW; 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=2a2TadFSi5sGlwmWUokLhDGAn0eoJzYmXMHXUf8Q8lU=; b=W2WVanP9ZG2Z1draRnkoFIGPG9+hwyQR5eg4/w1iAVl9j5+GMppYJ6YZSagLbLnl2qtd5v wBy1XgLGqEItFz968xyL26h5Zd2hsylYKEfCSQHFf8q7p49AJGMeeE+0Pyaet85i73YaBF uHXcFZZZZi++K+lgWVTCDghDX38ZVs70yTLhDmnfvMtvk0Z0VacgOK2dfnX9hc20OPL9UF lUueO/8zBrJmJzwT3sgbo5MZv4M65co0/zSBQ1i77Amj60TnPI7rFz0mENRrVlaFbrCVTw 09SMkq8/pXFI4h/sTCEgKpAkaeZVA9AY7u061uHNndJS05lsXWBCddMRMradaw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:20 +0100 Message-Id: <20230211100825.47971-23-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.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 * gnu/packages/haskell-apps.scm (git-annex)[arguments]: Disable #:haddock?. --- gnu/packages/haskell-apps.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 7189d82ec1..80abc99cb1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -306,6 +306,7 @@ (define-public git-annex (arguments `(#:configure-flags '("--flags=-Android -Webapp") + #:haddock? #f #:phases (modify-phases %standard-phases (add-before 'configure 'patch-shell-for-tests @@ -386,17 +387,7 @@ (define-public git-annex (symlink (string-append bin "/git-annex") (string-append bin "/git-annex-shell")) (symlink (string-append bin "/git-annex") - (string-append bin "/git-remote-tor-annex"))))) - (add-after 'install 'touch-static-output - (lambda* (#:key outputs #:allow-other-keys) - ;; The Haskell build system adds a "static" output by - ;; default, and there is no way to override this until - ;; is fixed. Without - ;; this phase, the daemon complains because we do not - ;; create the "static" output. - (with-output-to-file (assoc-ref outputs "static") - (lambda () - (display "static output not used\n")))))))) + (string-append bin "/git-remote-tor-annex")))))))) (inputs (list curl ghc-aeson