From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4MaZBf5T42OCKwEAbAwnHQ (envelope-from ) for ; Wed, 08 Feb 2023 08:49:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OMSeBf5T42PbewAA9RJhRA (envelope-from ) for ; Wed, 08 Feb 2023 08:49:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C9683C92A for ; Wed, 8 Feb 2023 08:49:17 +0100 (CET) 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 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675842557; a=rsa-sha256; cv=none; b=amVPl9LlYmJZfrhiK9mJtpVZoupEx1uPDKEPVp/lR+hP3QgU2uC5Qt0JpYAt0L2lRIIe9X yNbz7x4Ms5Dh5Ibx7N1nE7fJWkIcCmJs+sawoTKUeo+Bh41oTvCO5CpXe/DRQOGh/A/jEW eeg/a5CkFSzCgC8nQ6wNL7yXhE64NE0XIXaBn87INnxNVQid2ep+TMcF5lSQh3vt0loi/K pKzlVnYiQ86TScn81kzme+j0m76Wv+HdT4xDEJd/NwVuA/9B6Hf/sB//WmzZfpCirIfZAG d+vO0fda/CQSmyVYZ1G+l2lqGv7FOrnQ9cSBtdGH6Xov+OxejBim1X8ymKqM6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675842557; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post; bh=qHz0+nhPp6FMxZOpqaWj63rVGvTnS/YhmrhGkrt2DqU=; b=rk8UdGcBKVaxHm3tWc9AtC2hazIvLF6slEM+L+9TSa6NQzJdJjlyCBenSk6SbNTUcr5yZm oywndEEJx509XvpoeGJy/Bit2YKe8rU2ypfuhL8mL2WvJOOKPhiIY0IJKxrQDeReSlClPI FdwdO99rzkIlWaPE+dFZOr2U9TpPpz39vlxON4K2G8VUZZ0TlLWozqMvmAWwqamQUPMMFh bttmq5nsptrgqxkb4qL7bjoD6Mt7OAAIrzmZfihND5qQYInv2+XHoVnBpXx4IyGmNeWxM4 ZoWooj6kBfY4HB4Cm8iuNN2KcA/yT7VvvKLi3EJoEYkJ0++uOesbf2kVZ4vLIA== X-Migadu-Queue-Id: C9683C92A X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Spam-Score: -6.19 X-Spam-Score: -6.19 X-TUID: lRZbWzck6zku --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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(-) =2D-=20 2.38.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPjU7hfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcgJw//bYzgsMxFE0DJYm1QniQG6g+NI11p6Yes JYdFHEAzYUWGXXyjosqG9o83956yfrNLIpXykHOejthOd8u64pv4KpetZq60aak4 QVu40WXHgeXeYySflnPzQoc7L27fQFE7uaDPXTei3Re/B73A+f6DYyCuiEfkc62f iqxfk9ImY/5sXQWoIU+ebk+ZyVByGBr4HhaSb9IGM79yWKjht+FS+Vl7+wmysgLg GvAz9MmRvGubwv3I6uFks7jHR0x+z6hcOiZvMneQSTq0uVhmq3zYcLNGW/oc/e/6 VfqDkNF0NZs/HV9iPgQgYIX0FO/9PAWeXsroHrv8bBqP0n/RCrJUbUjv569RF94n e4tPEbWluGtGYxq8fc8KGkgQvJ29WqF+mCweYdPlGSOtVQvP+Cuq38KDnQ+Z1IwO kDgTryb/OmC6+y78k0TUEizEA3IBQFdvxC/yVT4Sv5tjRVtOJreDhIp0LtV1Ajbk 9gv/N1m8RviWRfh6neNvrLAk9SytXlJn7JpbUTbOnkbKlOFDFFlOUGmPVf2wyWF2 7bl616qm/jatiBXjChYkRCxuTeM5HcF35onHh92tn93LygdkIGWsHb2E6Z/zYJcs /j2BsG61oNEKBntptu7+/zQhyjIfhuzwaucFpTu/kEIhrrVEDlIYbrXvp7a1DZ7I eRetV7hjFpY= =EhSi -----END PGP SIGNATURE----- --=-=-=--