From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id OLjsIr5N2WWGOAAA62LTzQ:P1 (envelope-from ) for ; Sat, 24 Feb 2024 03:00:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id OLjsIr5N2WWGOAAA62LTzQ (envelope-from ) for ; Sat, 24 Feb 2024 03:00:30 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=pPrEKyCA; 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=1708740030; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=nlMprHY9L0M9N21nnoHAQDqAba7pMK8iCfZvt4zhnAM=; b=lcctEVLh0xbU3AMaj3tJfSIdNpfNCgzLoAXklgNvDrUxYIefG1qqXFeJn+eIaVtKvOolV+ oecvQU2ggNYXAnpOdSZWz8yvz4NJ/hD/BOdePU1GUWs96p4quF1SnoCFgUBYx/Ohd8MKwE Nbq3S19oAKEBH8mgoS6EFls1BZkKI+a5D2tW5mjqAZRhVq+ZsfR3VZ2pKLKtgzjfcYVlZA QEMi6ibgjl7KYeTQkUlfmto+F8fJG5AszQ9HIxgWrQWOcB0LFQmOEgTb1wRPnkWi46IW74 D9O2dN1ZXMkE8P3nTQhVp2XOSv1FUWvMK+hIgKTQqRjLHfa6UXXNiT8L6/xULA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=pPrEKyCA; 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=1708740030; a=rsa-sha256; cv=none; b=TI8yVBMOWa9DXo4OtB5cvnrzZI0Cz+/IAkqaOxyrUaH2OECJ1zwMFENsIPwRWOJEzIWVez MwRDa9SvrmCHwSynRXixpHVfrSR8jR3aw7UTaGHugL9QVH0d1rRs/de/tLJQDgjx0x5ErU 4S2fnM8XtnDy7C3M3geG7oluANG/CQzUwrTM9BN7s6lTexTTG7lPtaI7h2WfjRHmPLjg5S 8rGZD6GT1smJxoKuaLnlnpQvCEMYdm6JVlIOvOKoIu5b+kJ5cie2FU0JNWQi7AbVRYXyyy S7zKnrBaCCAjFyR85v3LloMpFDwITlA0AUvxI3hso4DfAnva/0ktfnfVOk9o/A== 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 6EB86CF36 for ; Sat, 24 Feb 2024 03:00:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdhKR-0004Sv-4g; Fri, 23 Feb 2024 20:59:51 -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 1rdhKM-0004Rw-Qm for guix-patches@gnu.org; Fri, 23 Feb 2024 20:59:47 -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 1rdhKM-0006mb-J3; Fri, 23 Feb 2024 20:59:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdhKj-0003fv-4m; Fri, 23 Feb 2024 21:00:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69343] [PATCH 10/12] Simplify profile->boot-alternatives. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 02:00:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69343 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69343@debbugs.gnu.org Cc: Felix Lechner , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 69343-submit@debbugs.gnu.org id=B69343.170873997913894 (code B ref 69343); Sat, 24 Feb 2024 02:00:09 +0000 Received: (at 69343) by debbugs.gnu.org; 24 Feb 2024 01:59:39 +0000 Received: from localhost ([127.0.0.1]:36584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhKE-0003bv-HU for submit@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:38 -0500 Received: from sail-ipv4.us-core.com ([208.82.101.137]:41020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdhJn-0003ZN-23 for 69343@debbugs.gnu.org; Fri, 23 Feb 2024 20:59:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=5FUNxGMiszupQFC uJkwVx3EeqqPXt+UZpqA0uAybdpM=; h=references:in-reply-to:date:subject: cc:to:from; d=lease-up.com; b=pPrEKyCAmkW7QrXA2n/TFUyvZsLJYQdoApoAIHwJ M9N83ldUM9WSW/KRqg9Pr+AJHYMQ8W2I4RsnC5lzJsRdR0WWjiN3esfTVAA+qcwckXNqNm sexLs/CTcKhuHZ6X5gvOFsp/dw+iWlxR9IoNye8qZxnVvFBovetnv7eyL2RC4= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id fcde3106 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 24 Feb 2024 01:51:57 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a0f668d3; Sat, 24 Feb 2024 01:51:56 +0000 (UTC) Date: Fri, 23 Feb 2024 17:51:43 -0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches From: Felix Lechner via Guix-patches via 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-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -2.91 X-Spam-Score: -2.91 X-Migadu-Queue-Id: 6EB86CF36 X-TUID: xOHPy3xc3BDe Change-Id: If31eeb4cef4f5a107a0ee5ad3f117bf38629ac38 --- guix/scripts/system.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index fd9f0727ee..3df37e5510 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -329,20 +329,16 @@ (define* (profile->boot-alternatives #:optional (profile %system-profile) "Return a list of 'boot-parameters' for the generations of PROFILE specified by NUMBERS, which is a list of generation numbers. The list is ordered from the most recent to the oldest profiles." - (define (system->boot-parameters system number epoch) + (define (generation->boot-parameters number) (unless-file-not-found - (let* ((params (read-boot-parameters-file system)) + (let* ((system (generation-file-name profile number)) + (params (read-boot-parameters-file system)) + (epoch (stat:mtime (lstat system))) (text (boot-parameters-label params))) (boot-parameters (inherit params) (label (decorated-boot-label text number epoch)))))) - (let* ((systems (map (cut generation-file-name profile <>) - numbers)) - (times (map (lambda (system) - (unless-file-not-found - (stat:mtime (lstat system)))) - systems))) - (filter-map system->boot-parameters systems numbers times))) + (filter-map generation->boot-parameters numbers)) ;;; -- 2.41.0