From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id UBw7IWYDX2ckaQAAqHPOHw:P1 (envelope-from ) for ; Sun, 15 Dec 2024 16:27:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id UBw7IWYDX2ckaQAAqHPOHw (envelope-from ) for ; Sun, 15 Dec 2024 17:27:18 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PWYXnjm+; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pux2RXXD; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734280038; a=rsa-sha256; cv=none; b=FUIB0tgovCNkOykkYzmUeHJ59ZZrCicdTgAs18VtHB+y31wwTbkW27AVFe14IUy2GlTObE NZm1EnwHdYMTVZ+09JPl8+Zhzy3mdKT4qXmgalDVFY2houelWm+r+hWwWLFAvKkv0JrQdf 21MfB5rCK/rm8BtXPOWN8F2BGayyZFM7730lSnVh3tqR0qWCTq/AYhnKtT9tLtrR24QPRG 2mgN5WLUzs6/XkVAolce3YES++nibhZgAwQUmlZpNzTZC9Ti5t5WXQAvjSOr1IATEm5q4X t8FkA8lxw+F5ixWzzdJYSrciyK50Q71DrLKf5zOGE5+qqbBNcOGUzQCwy0I+ww== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=PWYXnjm+; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=pux2RXXD; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734280038; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JYEqRbW8cyQ4ooK/Bz9hF3chXobiY3G9WwFYJodSqwg=; b=KKDpGhY6Td9Y1G5NvSSY7hckwHF/GvvoGYKnyUmO8/CR22n40lLWQb+U3J1/ACxshub4fv FfkmS+q1VqS9Q/tdrxTP/B4bkHFBIT6GewQDjVNNLtH3PCcH8cDfG1wMDRR9Nu63rm/lF4 i0/AE3QpTyiDtZzqZ+7tdZzVIcT/NjgeJJbMJEMX116d3coqAOfOObrM6Riau77pOLK/EV w0OgHjMmUvjAhLdZYaFD2FyGskJ2p66W+pUwwiuHgfXPK3QCRptH5Vu5ANMeZYc63yn6wW MpocHSv9/8ia/L21RU2r5frnDVyA53s12lEAtILO0V2iTNFzPDaVq67y1OWOhg== 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 7417895CEB for ; Sun, 15 Dec 2024 17:27:18 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMrSS-0003vB-Tl; Sun, 15 Dec 2024 11:27: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 1tMrSR-0003ur-RX for guix-patches@gnu.org; Sun, 15 Dec 2024 11:27:03 -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 1tMrSR-0006aC-Ik for guix-patches@gnu.org; Sun, 15 Dec 2024 11:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=JYEqRbW8cyQ4ooK/Bz9hF3chXobiY3G9WwFYJodSqwg=; b=PWYXnjm+K52fz3lk+Q7ZxMO9+9GfgOsm290tWx3wXhQuRSgG4Nc4yAEST0PSYTa5l1yDVMRqKM8rD5s4d5Hr08iNACLN+SZGM+Db80shz0T/XtWcZxSGjyzTG0df0mkMQBZ2yQgJUWcW+ZsH1OeIXsalWr4KTfJJOwY9Ig6NyN+YTyQsluogM6DS3EkgBntFvhjGCi+UQmaoelxDjGG+LhybeCDpW8QuREiGZ945RiMqWprmI4m0AORvqeCsO2joutMtZYCpFW460o9Q8qdYYm7WT/vYe9+13AtbxdylMT5EX1o13IBRHYC4hE6FPVv0UOeeNe7wlXXFY75feoXrUw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMrSR-0006S4-AX for guix-patches@gnu.org; Sun, 15 Dec 2024 11:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 3/3] etc: ungraft: Use =?UTF-8?Q?=E2=80=98package-mapping=E2=80=99?= directly. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 16:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74888@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74888-submit@debbugs.gnu.org id=B74888.173427998024715 (code B ref 74888); Sun, 15 Dec 2024 16:27:03 +0000 Received: (at 74888) by debbugs.gnu.org; 15 Dec 2024 16:26:20 +0000 Received: from localhost ([127.0.0.1]:51723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRj-0006QX-Es for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrRh-0006Q0-SE for 74888@debbugs.gnu.org; Sun, 15 Dec 2024 11:26:18 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tMrRc-0006Un-Lv; Sun, 15 Dec 2024 11:26:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=JYEqRbW8cyQ4ooK/Bz9hF3chXobiY3G9WwFYJodSqwg=; b=pux2RXXDy8Q9UBSvSfuk t8QG4fh7wbe2iiM3ZhRQMZij0bHty8eBeidJ7zJBS1hVA0Ja9Hr6JHN8/U0ll17PuSLBNhrUQsLcq qdBkxbjp8kBlXEwf+HVkTtUuYQvjEKJe797xhh3F3Lz4KdAqgusBtFPpyPMM1RpkbReqla/fgBpDU 0C1KyfrAZ0yo2FtVzfWXxWhA2nYcbu4WHQhXHZarx3Dp0zdwaqEEf8cTGgc1cJARFXsJgofXbiqHl 6pAbo5gCOv1WaOr5/qX/eSlgRTK63cPlQz1/+coYWms/+9TrMEV6oP4Pa/n+z6PfgbuAzkj0alpm+ pWiA2RTF/sFP4Q==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:25:42 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Migadu-Spam-Score: -7.39 X-Spam-Score: -7.39 X-Migadu-Queue-Id: 7417895CEB X-Migadu-Scanner: mx10.migadu.com X-TUID: I5YMwzbUpcDl * etc/manifests/ungraft.scm (ungraft): New procedure. : Use it. Remove ‘ungraft-all’. Change-Id: I6f1badf06dad9116d4242c7d1fff5ca53e6522f8 --- etc/manifests/ungraft.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/etc/manifests/ungraft.scm b/etc/manifests/ungraft.scm index 3e42b98ece..5caef65d4c 100644 --- a/etc/manifests/ungraft.scm +++ b/etc/manifests/ungraft.scm @@ -35,15 +35,16 @@ (define (grafted-packages) (length result) (map package-full-name result)) result)) +(define ungraft + (package-mapping (lambda (p) + (or (package-replacement p) p)) + #:deep? #t)) + (manifest (with-store store - (let* ((grafted (grafted-packages)) - (ungraft-all (package-input-rewriting - (map (lambda (package) - `(,package . ,(package-replacement package))) - grafted)))) + (let ((grafted (grafted-packages))) (map (lambda (package) (manifest-entry - (inherit (package->manifest-entry (ungraft-all package))) + (inherit (package->manifest-entry (ungraft package))) (name (string-append (package-name package) "-ungrafted")))) (dependents store grafted))))) -- 2.46.0