From patchwork Wed Dec 20 07:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57922 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 32BCB27BBEA; Wed, 20 Dec 2023 07:15:19 +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=-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 AFE6427BBE9 for ; Wed, 20 Dec 2023 07:15:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFqnL-0005Ng-5E; Wed, 20 Dec 2023 02:15:07 -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 1rFqnF-0005LM-CC for guix-patches@gnu.org; Wed, 20 Dec 2023 02:15:02 -0500 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 1rFqnD-0002gH-C8 for guix-patches@gnu.org; Wed, 20 Dec 2023 02:15:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFqnG-0007PU-7O; Wed, 20 Dec 2023 02:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67921] [PATCH haskell-team 3/3] guix: haskell-build-system: Hide dependecies from ghc's package db Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Wed, 20 Dec 2023 07:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67921 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67921@debbugs.gnu.org Cc: Saku Laesvuori , Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 67921-submit@debbugs.gnu.org id=B67921.170305647028310 (code B ref 67921); Wed, 20 Dec 2023 07:15:02 +0000 Received: (at 67921) by debbugs.gnu.org; 20 Dec 2023 07:14:30 +0000 Received: from localhost ([127.0.0.1]:38508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFqmV-0007MH-C0 for submit@debbugs.gnu.org; Wed, 20 Dec 2023 02:14:30 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34516 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFqmT-0007M9-ON for 67921@debbugs.gnu.org; Wed, 20 Dec 2023 02:14:14 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.71]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 97009342FF8; Wed, 20 Dec 2023 08:14:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1703056457; bh=5xtjy1kM0SzasnRjhA7wh6YdwKtdVavX9Tdb7hhWJmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vxfxZ2zA9JKlIrnA8bm2z+3EwgRlrHekFM7kwsxLxt97llIf9wXbSzv4VIIeGje/z s7ha5iJk+wjgI54jllBj25f+XKAgkn8eyAYoQixsFnxkzwF8X/G50XB668w2xo5D8s 9XCbt9HfFVoRMFmf7it9TosH8dCk5uUNwCht2u5c= Date: Wed, 20 Dec 2023 09:13:49 +0200 Message-ID: <6030eebe203e81a45acda76c95bcbfb064ff5e74.1703056111.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@laesvuori.fi> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@laesvuori.fi> 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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 A Haskell package P contains information about all other haskell packages P_n it depends on. This commit hides the packages P_n in the package database stored in P, which enables being explicit about which haskell packages one wants to be visible in their profile. * guix/build/haskell-build-system.scm (register)[install-transitive-deps]: Set the 'exposed' field to False in the dependencies' .conf files. Remove a comment about symlinking because the copied files are now modified. Fixes: https://issues.guix.gnu.org/66347 Change-Id: I66332cd49e6036689873d9435036c9f876216f1b --- guix/build/haskell-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/haskell-build-system.scm b/guix/build/haskell-build-system.scm index 0e94cf59a5..83c742427a 100644 --- a/guix/build/haskell-build-system.scm +++ b/guix/build/haskell-build-system.scm @@ -214,7 +214,10 @@ (define* (register #:key name system inputs outputs #:allow-other-keys) (unless dep-conf*-exists? (unless dep-conf-exists? (error (format #f "File ~a does not exist. This usually means the dependency ~a is missing. Was checking conf-file ~a." dep-conf id conf-file))) - (copy-file dep-conf dep-conf*)) ;XXX: maybe symlink instead? + (copy-file dep-conf dep-conf*) + (substitute* dep-conf* + (("(exposed:[ \t]*)True" _ field) + (string-append field "False")))) (loop (vhash-cons id #t seen) next-tail)) (loop seen tail))))))