From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id WDwHMrGSY2MFbQAAbAwnHQ (envelope-from ) for ; Thu, 03 Nov 2022 11:06:41 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IPnwMbGSY2N61AAAauVa8A (envelope-from ) for ; Thu, 03 Nov 2022 11:06:41 +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 68F612FB2C for ; Thu, 3 Nov 2022 11:06:40 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqX6m-00089v-5A; Thu, 03 Nov 2022 06:06:02 -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 1oqX5s-0007hA-Fq for guix-patches@gnu.org; Thu, 03 Nov 2022 06:05:14 -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 1oqX5s-0000Gy-9I for guix-patches@gnu.org; Thu, 03 Nov 2022 06:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oqX5s-000253-5c for guix-patches@gnu.org; Thu, 03 Nov 2022 06:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58972] [PATCH 1/3] guix: ui: Handle single outputs. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Nov 2022 10:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58972 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 58972@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Leo Famulari Received: via spool by 58972-submit@debbugs.gnu.org id=B58972.16674698877832 (code B ref 58972); Thu, 03 Nov 2022 10:05:04 +0000 Received: (at 58972) by debbugs.gnu.org; 3 Nov 2022 10:04:47 +0000 Received: from localhost ([127.0.0.1]:48043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqX5b-00022A-9z for submit@debbugs.gnu.org; Thu, 03 Nov 2022 06:04:47 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:45972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oqX5Z-00021e-8w for 58972@debbugs.gnu.org; Thu, 03 Nov 2022 06:04:45 -0400 Received: by mail-wm1-f46.google.com with SMTP id l16-20020a05600c4f1000b003c6c0d2a445so791788wmq.4 for <58972@debbugs.gnu.org>; Thu, 03 Nov 2022 03:04:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=B8FS3dxr1AHMdB5sse8TZyen7faE2Nme5b3+uBtU9pM=; b=UI0ZwXxIChaEvfOPjm7zHiyLPU6RtBwwMLnD1lPrqxRH2Nr5aXx2ZmuzUB7M8VASD5 oXV1vN10NFYJIhnha/iXaNUDi3gKmcbo7IFLLvMQkdMtL1JAOhCOx+wbFhxV/6Qdlgb5 iQOLwpNSqm9QX5U3FR42B0gk6Q99nSBJGoaDmQqXCbhyFqXm0pYj2i9CYYC/2SumNLj3 5+h7K1lgPKEHAdJ9oGBMJ0ALeymL3n+LC+8OUn9ITvNSyS/rTHJUAtfCTIqJGpzA9pAv yKTDIOTn/u6YcE7dFV7XRY4Clk3egtnZBJu0qUNb4BvD6A+SW9FpjOkyhtaXmy3Mhfrg y4kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B8FS3dxr1AHMdB5sse8TZyen7faE2Nme5b3+uBtU9pM=; b=t23I5fkWUoxbrH8xWZ8nQ743qIJhbXT+Cwd+WJmC6u83QDabFTEe3sGARG3jpCY9uj ++6HX7qYvNFskBoVF/bD43nm7YPcKoOfxAHIZF/2flwbB8bQS9qrykDYOBSXZehM5yZL +OdVTTYDv9HNwShez8ZAe5LWgwKy7L6vg9H7ikMOCD0TllXmv76mhg6/+jdxRsgzfy3w o+oBqMGp/zYo4EHgrWK2aQtVtcskQtpwqhZsupSJwCNeI8ofAqsY2pFWl5QykQEYoKNZ QpfNHP+qqbGEwdmt4c8/g818Ar9P9DALPoH2zrwjlM2ogOMogu/LGgMyIuiLpYv2IYqi Wmqw== X-Gm-Message-State: ACrzQf3xWJWKuilewvGaP0Z+Vbuh6S7qikiFEeG9lCr5pdYSg9I5XHq+ H2ExfbFTUl1CYmdWLR2MBPM= X-Google-Smtp-Source: AMsMyM4MHopdrtU8YyOh6XMmE+QWpL1RBOZ5sdoHYk4+SgXfOiszJ7BjSuWFvOYjl8y6kwCB1xijkw== X-Received: by 2002:a05:600c:4ed2:b0:3c6:c1ff:222 with SMTP id g18-20020a05600c4ed200b003c6c1ff0222mr18402618wmq.163.1667469879540; Thu, 03 Nov 2022 03:04:39 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id y16-20020adff6d0000000b0023647841c5bsm415089wrp.60.2022.11.03.03.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 03:04:39 -0700 (PDT) From: zimoun In-Reply-To: <27e3e24474785ec4cf75607b4cdec9631a081bcd.camel@gmail.com> References: <27e3e24474785ec4cf75607b4cdec9631a081bcd.camel@gmail.com> Date: Thu, 03 Nov 2022 10:01:09 +0100 Message-ID: <86r0ykcsyy.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1667470001; 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=B8FS3dxr1AHMdB5sse8TZyen7faE2Nme5b3+uBtU9pM=; b=ksIMT9yGt9hm2/KMaTKrGutgH5EyREJlw81Ekxcw9Wj6QO9gY4wX0tfPFoBT2f3ZDg4ku7 ezaej2+RpZJaPvb26aEUBC2CE53DRF8oJDMk0LziX0AXfp9NskfHSKFiS++RIIK2aujb5+ CuaFv0OzILQKDO+oIdXhu6wVzGhChusrnvbuc2lJbbyFlY7Uos/KHu5cjTKjx7bt6DJSD4 lEY/93d1aKskfHHdWaZOz6EQ/55nArl2PjaS5lPHUVilwo2vaQfSnh513i0rInOHcVYRQR ryZNvBIuMcKuLAjBzcLTDIzUNgPRexAZyacahgOoqv9BvFo3Sd7HARJ1A5zM6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1667470001; a=rsa-sha256; cv=none; b=HREfwAqJf/ogu0mWBUqeVjXV7ljexS6lUNW3i70jCg4uAZMC7VepiM2bv6Xgd45qWQIudJ xGZDSi6VMYF6g02XsBHDdTo2d3TGlz3ml7lzKQ63uhAVlSphiC1ldaYp8dYErkF7oKpj42 QsiJltJBhMmFFMHr/6DZWHpni04ykjTXDpQOZpwqfzfbByJ+YPYx77sTbv+ps6vaTRVm9i wiPgS11pOep3LpDcerakvcd54N1HOjDAn6boyx1mO+2xagssWTTG7AVrpU3S14V1VFLho2 K4UeuZ0gB1g1HT+HTCT9hF8xQaf4en2pC+dkI+YBYU8w7pVJ15dpC4bQ/Ka5tA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=UI0ZwXxI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Spam-Score: 6.71 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=UI0ZwXxI; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Queue-Id: 68F612FB2C X-Spam-Score: 6.71 X-Migadu-Scanner: scn0.migadu.com X-TUID: SrZsR+Z6VxHW Hi, On Wed, 02 Nov 2022 at 21:01, Liliana Marie Prikler wrote: > The current code says "out" contains "everything else", even if there's no > other output to contain anything. > > * guix/ui.scm (package->recutils)[default-output-synopses]: New variable. > [output->recutils]: Take default synopses as argument. > ["outputs"]: Distinguish single and multiple outputs. > --- > guix/ui.scm | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) LGTM. > + (define %default-output-synopses [...] > + ("out" . ,(G_ "everything else")))) > + > + (define* (output->recutils package output #:optional > + (default-synopses %default-output-synopses)) [...] > + (assoc-ref default-synopses output) Out of curiosity=E2=80=A6 > + (match (package-outputs/out-last p) > + (("out") ; one output has everything > + (format port "outputs:~%~a~%" > + (output->recutils p "out" > + (cons `("out" . ,(G_ "everything")) > + %default-output-synopses)))) =E2=80=A6is this =E2=80=99cons=E2=80=99 instead of deletion because of perf= ormance? Cheers, simon