From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id OK2qFf0CX2cnSQEAqHPOHw:P1 (envelope-from ) for ; Sun, 15 Dec 2024 16:25:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id OK2qFf0CX2cnSQEAqHPOHw (envelope-from ) for ; Sun, 15 Dec 2024 17:25:33 +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=gB1wYyRp; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VdO5XmtP; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734279933; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=zs0cYmp5CDGsqhd9EFwH4AMP+242xUd9d+2pBfhEGGo=; b=Cd0fSt1XNiasC8pdCtuF51YmLYF0kIxDfMz8lrUXP9FYB3C0Iu8PbBNz2tdrskW57J8Old cqQEABdM9g1mCNF2ARH0tv2K5G8ioEvnmfC/MHFW07GmbJfvaP2JWAnXDRNrAIUoTFnIO+ P7SMWb+QzxpZkf+SzSMIfv4auyrSg3vZz421njNLROPif9vtaqFy+SLRUH2AQIwBnFelck B8hjSgdWf+EOVg65Awx6V/nwW+h4N9FlWANyPi5+4Hb6IhaBfb4fTWU9CXHiM9iooFWr0K 32kEBq5G9rNh9l5vH2Y6GEBcZyjVkjvMjcUqPURdwgVbE625I+qTVdOGDLR7Kw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=gB1wYyRp; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=VdO5XmtP; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734279933; a=rsa-sha256; cv=none; b=uc2tqpCrRf78J3gP9b93W5rHmb6P6VSUQOjiRbnPFFRYowNURl4S5JliwqYFCJeb1cy2Dv 2d1qazYb9qnGKg7NzRNKmkVIKFXICipl/oP77uxXULek8pGAyUSGuz92S3mFKHqigC6eJY Ub79FNtIHYOq1AHDPVJbtiPuWzKjRP14nCAd/083CSwVY8/HkCxYrrC3aUsQO7zl1m63mR 4ZP0O9/VKZDE2Hdh3Qkp/qM3RFbFregDffZlPglCKUCmkIwjcB3WzszLX3q3VjA9eGqBGe nIME7qYX5MqG40fMm05hM2etiPXnGTCbUNDREjFiYJVOhgwZseHnEfVwdWMnFg== 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 231265164D for ; Sun, 15 Dec 2024 17:25:33 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMrQZ-0003ek-6N; Sun, 15 Dec 2024 11:25: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 1tMrQW-0003cj-Lk for guix-patches@gnu.org; Sun, 15 Dec 2024 11:25:04 -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 1tMrQW-0006Kp-Cr for guix-patches@gnu.org; Sun, 15 Dec 2024 11:25:04 -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:Date:From:To:Subject; bh=zs0cYmp5CDGsqhd9EFwH4AMP+242xUd9d+2pBfhEGGo=; b=gB1wYyRpV38998MndUa9BlKkZR13ySwenvlfOplane16bEglD7HM9HjF/CX+cQ8xxz0XZ/AL8cDaC6mz33aqpUN0yPQJyX9O3T4T920gLMW+gvpsdQ9vNckGDzttc2DZacWNovAu2Yf7JqTZLGJov2wQpbdD1gQD7e8wA9F05z7rZLvoQYsjeMlowTrlMvMnjteCjUCzsm2oILvOQ2NXHcr9hWONkH5iNbBDeNKiaGr3j7kMptCE3wDwBMjIzH5+p2HLNi/Kvm8R2c6UfK6QbFEJRBzSbrH8zG1qMAPkTL8JDCP0+4rnPoi/CUauLx5hZf8te/3N9fjq0pZrEwFzgw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMrQU-0006HI-VY for guix-patches@gnu.org; Sun, 15 Dec 2024 11:25:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74888] [PATCH 0/3] Fixes to the 'security-updates' and 'ungraft' manifests 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:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173427987024065 (code B ref -1); Sun, 15 Dec 2024 16:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2024 16:24:30 +0000 Received: from localhost ([127.0.0.1]:51702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPy-0006G3-4w for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:54446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMrPv-0006Fr-9K for submit@debbugs.gnu.org; Sun, 15 Dec 2024 11:24:29 -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 1tMrPv-0003Xy-0R for guix-patches@gnu.org; Sun, 15 Dec 2024 11:24:27 -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 1tMrPt-0006D5-Ub; Sun, 15 Dec 2024 11:24:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=zs0cYmp5CDGsqhd9EFwH4AMP+242xUd9d+2pBfhEGGo=; b=VdO5XmtPdcNi8J Pe3mN3emn/rzyfVYLwcrZwNN6NYNRCpMTCyBkHmgN7Fcja2iYhnsrTg2DKKMJdF4l67rS3k2PEu86 /JlCvyZvsLNPBTBzJPqkNnh3apb5ewM+Gr+JMLo92Y7xk7ZKPAuRk6XigSMmbU0+CIgqyOpGEiSKY zOw4dG3477lCeRwrBUJ700vNNMFFL9vxWUGZ++CWG0qEdTbu+6feU5lm8bKIPWDzdN6svb+8DLLau cLuwbfjJjxr1GKmWgGqn5qFVN0q9XsPOfRQnGp5UUu0lqyUWEmNOiOTnjeNQdSXMzRLY4M3mJdt4L bRVdcOnZymh4f4Z7hnTg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 15 Dec 2024 17:24:14 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 231265164D X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -7.02 X-Spam-Score: -7.02 X-TUID: Q0VNFd1/eJOl Hi! This fixes mistakes I made in these two manifests and that led them to compute derivations that differ from what you’d get by changing the code manually. There’s still one discrepancy, which is due to the use of ‘computed-origin-method’: https://lists.gnu.org/archive/html/guix-devel/2024-12/msg00113.html Hopefully this will be addressed soon. Thanks, Ludo’. Ludovic Courtès (3): packages: Add #:recursive? to ‘package-input-rewriting’. etc: upgrade: Really compute joint upgrades. etc: ungraft: Use ‘package-mapping’ directly. doc/guix.texi | 6 +++++- etc/manifests/ungraft.scm | 13 +++++++------ etc/manifests/upgrade.scm | 3 ++- guix/packages.scm | 9 +++++++-- tests/packages.scm | 32 +++++++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 11 deletions(-) base-commit: 0787a180b3ca64d3958438920ca1b58a2a27fba4 -- 2.46.0