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 ms9.migadu.com with LMTPS id SL6tI0fwWWSiPQEASxT56A (envelope-from ) for ; Tue, 09 May 2023 09:03:35 +0200 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 SKXGI0fwWWTWOAEA9RJhRA (envelope-from ) for ; Tue, 09 May 2023 09:03:35 +0200 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 5A03628615 for ; Tue, 9 May 2023 09:03:31 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwHMy-0005R9-Gq; Tue, 09 May 2023 03:02:44 -0400 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 1pw7YZ-0004Ev-HR for bug-guix@gnu.org; Mon, 08 May 2023 16:34:03 -0400 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 1pw7YZ-0005KO-6A for bug-guix@gnu.org; Mon, 08 May 2023 16:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pw7YY-0006Tu-FY for bug-guix@gnu.org; Mon, 08 May 2023 16:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63319: [PATCH 0/3] References: <87v8h6r024.fsf@tilde.club> In-Reply-To: <87v8h6r024.fsf@tilde.club> Resent-From: Ulf Herrman Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 08 May 2023 20:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63319 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 63319@debbugs.gnu.org Received: via spool by 63319-submit@debbugs.gnu.org id=B63319.168357803124872 (code B ref 63319); Mon, 08 May 2023 20:34:02 +0000 Received: (at 63319) by debbugs.gnu.org; 8 May 2023 20:33:51 +0000 Received: from localhost ([127.0.0.1]:41783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pw7YN-0006T5-HE for submit@debbugs.gnu.org; Mon, 08 May 2023 16:33:51 -0400 Received: from tilde.club ([142.44.150.184]:42434 ident=postfix) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pw7YL-0006Sk-1O for 63319@debbugs.gnu.org; Mon, 08 May 2023 16:33:50 -0400 Received: by tilde.club (Postfix, from userid 5378) id E63AA22301A5E; Mon, 8 May 2023 20:33:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 tilde.club E63AA22301A5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tilde.club; s=mail; t=1683578023; bh=ILlIb1rpxymEunJt3JVPh5olt+IwoEMmkwvnlEMcDdM=; h=From:To:Subject:Date:From; b=Geq1ezFVQ07f3IKLvg/2n1vFPYWcRxeymOi8foPc8ohJS8STJFd9NnlYP51gRMObO IUAguoS56/bJkWfxdvnDvpWgpe/YAAIN5hqR4OmtQpXI0fc/pipOmS7CQJFTY7qQO4 SaPB9TJ+tBLcTB7+3JxIbNb9me4IlBJYwM+QjhR4= From: Ulf Herrman Date: Mon, 8 May 2023 15:33:32 -0500 Message-Id: <20230508203335.30659-1-striness@tilde.club> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 09 May 2023 03:02:40 -0400 X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683615811; a=rsa-sha256; cv=none; b=tQgG3QqY5Jr0lEdbhHXunegGawU+8vPn+JxmWJXRX5XuZG71496uphUftsgMDhacUrAR4q 5QURLy8l5I8jBhFb0iW5A9Qh4TTQq8oFJ7VRq0Hj8BADXQimZXZazXT/saphyByll2PtuV cRGxAPGrKA7zLO6WFiNlvPYbQY76x63P6D/Gqq81FzGczz1Pau9IVI8OnbPVHzY8MhUd03 Nc0fWCLjc8fiO96BuZBmi6WrTpQO139bc4rmd5KcIaKFighRlEv0oFSYb5sjz2d7w7rQy9 y8GP/XvVlWip8PEAR5H4ldAi6KMnlk/SKn4gptBfzgLMVtepI7iMKOQsFngm9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tilde.club header.s=mail header.b=Geq1ezFV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tilde.club (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683615811; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=sc05gymhrXTm9UM9RK9SO+3BoAV1cwyV/FSBSrbjRNI=; b=TjYOh90gynsjqehOA3SiXRpFC0KDUNXF6+yjDNMiQ6oxPTj3nps/9F9uts+EP/WELcYjv+ TQrxR2HdkH5ipfsQPyRP9l66aFOZ/8TbDtATIqjUvgOsdltVtTNE4eZIwbaWXjXgKW2O1x k9eye/qx+ZclTPpZ1v4iDOP3TRlV7fGg68P8D6L3BULX/g49Ew6DEKyj+k5VFbDhl/6O5F UrRPXJUIW4Jjtz7nxB6f2KBMQV9sxEEBJEZAeb4m+qEPAXIyJEi0swgzbXX8tizNsDrRMV wGFZs5Y0UL+k0PtnPOxbthqRYicmMpli8mLHgksQzIDOgW2SRPOz6dUwiQOfKQ== X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tilde.club header.s=mail header.b=Geq1ezFV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tilde.club (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Spam: Yes X-Migadu-Spam-Score: 9.32 X-Spam-Score: 9.32 X-Migadu-Queue-Id: 5A03628615 X-TUID: XJTnND4jD+5C This patch series fixes issue #63319, making propagation chains leading to profile collisions be reported properly. It does this by having 'check-for-collisions' fill in the &profile-collision-error with the manifest and the lowered versions of the entries in question, and (guix ui) derive parent information from the manifest. It then removes the now-unused 'parent' field of . Ulf Herrman (3): profiles: include non-lowered entries and manifest in collision error. ui: derive parents of profile collision entries from manifest. profiles: remove `parent' field. guix/inferior.scm | 36 ++++----- guix/profiles.scm | 183 +++++++++++++++++++++++++--------------------- guix/ui.scm | 32 ++++++-- 3 files changed, 142 insertions(+), 109 deletions(-) -- 2.39.1