From patchwork Wed Feb 8 07:46:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 1248 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 1643C16D3C; Wed, 8 Feb 2023 07:49:18 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 85ABF16D0A for ; Wed, 8 Feb 2023 07:49:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPfCY-0007zq-QD; Wed, 08 Feb 2023 02:49:10 -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 1pPfCS-0007uA-M4 for guix-patches@gnu.org; Wed, 08 Feb 2023 02:49:06 -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 1pPfCR-0001Y1-0X for guix-patches@gnu.org; Wed, 08 Feb 2023 02:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pPfCQ-0008SQ-G0 for guix-patches@gnu.org; Wed, 08 Feb 2023 02:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61363] [PATCH 0/2] self: Apply grafts to the outputs of the guix derivation. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Feb 2023 07:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61363 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61363@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167584249732415 (code B ref -1); Wed, 08 Feb 2023 07:49:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Feb 2023 07:48:17 +0000 Received: from localhost ([127.0.0.1]:54677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPfBh-0008Qj-HS for submit@debbugs.gnu.org; Wed, 08 Feb 2023 02:48:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:39608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pPfBg-0008QW-5p for submit@debbugs.gnu.org; Wed, 08 Feb 2023 02:48:16 -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 1pPfBf-0007dW-3N for guix-patches@gnu.org; Wed, 08 Feb 2023 02:48:15 -0500 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPfBd-0001UM-Dj for guix-patches@gnu.org; Wed, 08 Feb 2023 02:48:14 -0500 Received: from localhost (unknown [IPv6:2a02:1808:280:f63d:f055:17e:cfb4:3]) by mira.cbaines.net (Postfix) with ESMTPSA id 05A9A16D09 for ; Wed, 8 Feb 2023 07:48:11 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id b1670436 for ; Wed, 8 Feb 2023 07:48:10 +0000 (UTC) User-agent: mu4e 1.8.11; emacs 28.2 From: Christopher Baines Date: Wed, 08 Feb 2023 08:46:17 +0100 Message-ID: <871qn08uo7.fsf@cbaines.net> MIME-Version: 1.0 Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 These patches mean that grafts apply to the outputs of the guix derivation, rather than having grafts apply to the derivation itself. This moves grafting here to work like grafting for packages, where you can think of the grafted outputs as a transformed variant of the ungrafted outputs. I'm looking at this as it'll allow the Guix Data Service to compute the derivations without grafts, and for these to be useful for substitutes regardless of whether users are using grafts. Christopher Baines (2): packages: Add explicit-grafting record type to assist with grafts. self: Apply grafts to the outputs of the guix derivation. build-aux/build-self.scm | 4 ++- guix/packages.scm | 45 +++++++++++++++++++++++++++- guix/self.scm | 65 ++++++++++++++++++++++++++-------------- 3 files changed, 89 insertions(+), 25 deletions(-)