From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oA3yMiZVuGI99wAAbAwnHQ (envelope-from ) for ; Sun, 26 Jun 2022 14:46:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yJfMMiZVuGLSbwEAauVa8A (envelope-from ) for ; Sun, 26 Jun 2022 14:46:30 +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 4B9913DA3C for ; Sun, 26 Jun 2022 14:46:30 +0200 (CEST) Received: from localhost ([::1]:44318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5Ren-0003iJ-AO for larch@yhetil.org; Sun, 26 Jun 2022 08:46:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5ReN-0003i5-VH for guix-patches@gnu.org; Sun, 26 Jun 2022 08:46:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o5ReM-0000xI-7F for guix-patches@gnu.org; Sun, 26 Jun 2022 08:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o5ReM-0007UT-4U for guix-patches@gnu.org; Sun, 26 Jun 2022 08:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54454] [PATCH v2] ui: Describe package outputs. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Jun 2022 12:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54454@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxime Devos , Leo Famulari Received: via spool by 54454-submit@debbugs.gnu.org id=B54454.165624755228152 (code B ref 54454); Sun, 26 Jun 2022 12:46:02 +0000 Received: (at 54454) by debbugs.gnu.org; 26 Jun 2022 12:45:52 +0000 Received: from localhost ([127.0.0.1]:46905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5ReB-0007Jc-Au for submit@debbugs.gnu.org; Sun, 26 Jun 2022 08:45:51 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o5Re6-00077l-2T for 54454@debbugs.gnu.org; Sun, 26 Jun 2022 08:45:49 -0400 Received: by mail-ej1-f68.google.com with SMTP id ay16so13697946ejb.6 for <54454@debbugs.gnu.org>; Sun, 26 Jun 2022 05:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:cc:content-transfer-encoding :message-id; bh=SHThOdeNMSU3+RE9OTAcwleGUM3ifLt8tdt6jfKDK6s=; b=PyinymbzMFsE+ySS5Ukz1c30Lf/7NYeqisWY/1tlZ5AjUitbJ2XazWIC6JyHzp9YoW 1swsSwZ7hgovFwEP7Y9fUkbQCBjY0QR4DfIuj8Hhh8qAslEd1TtB7ms6sYz1e/Wb7hzT jduPqYI2fSRIqSK++mPw5mpi1P1P3rIcFV7QwLjThrPViYoK9gKVae9pLjkQkYIgPnuo Y2OnlebjN7BzjF9Vk3rfWk+D6Rgo2gVuB0qgsoNRSDA/p6shUYiwIDjbmnj6Ow8bA7vA kYuFJ9kadrYpfof8iriiq3OhSsNaSU5KG9EF7xw34Zy5RlZyWd4Usv56pLRRRz3+R1ez IP4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to:cc :content-transfer-encoding:message-id; bh=SHThOdeNMSU3+RE9OTAcwleGUM3ifLt8tdt6jfKDK6s=; b=Lb69K85DLrpp57vb1Hi+n4V9S3epx0nm302I92x630DTnVHYXwLZYgjZCX0T3Mfdh5 SU7oT+/F7CJ7tRoLaIqDaKPn6LlwWH6imQMvy2L50QB76vhDF0ziMIcoXifmw7AOfBHK fRP6eXZJY0zNwPzFx9pHDEA4+SNTyealrQfnACkoNAVSD+btU+/PHmVg96f81BEKQOg6 mdGpLsPUeHRsyYsgX7ZQ4CCvj57Vtl+Xa9m3FZpBpkScXvCxJJfBVkT+xHGs7Lvwcqtl lZZNBkxmWGkizD4csiPgfDNbNwHvwC5TeDWyoGxS4gOzXPG9zgD04VN0s82TzyYZcpdG /jiw== X-Gm-Message-State: AJIora90BYz0FHviNu7dvlwaNBv9nayFeTimEdLhyIfSpS0n0cvDOfTb PcnGxXeUZucusaWz1ziiVNxqa7m6WUYZyg== X-Google-Smtp-Source: AGRyM1vSkZL/wITiwwKElld4Ad2Wx4uvLAlicfuVvEDngSk+pMyE4kiK6COta/EqmM0rWtDuA56qFw== X-Received: by 2002:a17:907:3e20:b0:726:2c09:3fa4 with SMTP id hp32-20020a1709073e2000b007262c093fa4mr8019749ejc.101.1656247539980; Sun, 26 Jun 2022 05:45:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h15-20020a170906718f00b00722f9c3577asm3709335ejk.56.2022.06.26.05.45.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jun 2022 05:45:39 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Jun 2022 14:37:56 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656247590; 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=SHThOdeNMSU3+RE9OTAcwleGUM3ifLt8tdt6jfKDK6s=; b=uACGVIeoCnY1XKI3t631pS03Q14fZ2Y6FWN5YjtO/6pixp9WiH0gAw71DdlN6KpD+ydZQv ocHIHq1++yabtC+ZhMaVDNz4IReaAIdnIdqnKqNaDpd/b/4vNdQWlrvgn3XGjv2OS/QF6C LnatOrJlMFmQyJLf0oJc4oAzi56N8lVbCYxNmf5CAzsOgIc7lN7WrIGXWMW8Xku+tNBxnP Gs+yWOtfuGhfRqvoOvNMwKXJsNW7KR4oCX0mZBJn8dIOpHx4djsXJT4QKpjfAhvwo63u/G lUwjwKejkeGlRj2EBazFoJaEV9SnLWXIHy9ldM9OIjsQS49Y+K9/iPMkL8VkZw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656247590; a=rsa-sha256; cv=none; b=j+EUfm6OYpCxSmy8tPsGb6y4MOWqD6jML/OaobcTgX5Ogz1DdHSEofC5yuXKjZGzZz1/tu Y+KGwwaWbAYrMNoZ+10zTDXH/JU8W4VanCCOQHSBFP13I6oqrzEFQgA8byhdLH9kQLWOdi 3O7dN3pOhiBqbOeem1Af/Cq6KORuqgI32IxrWrsVoRBRheyt8pwh2vWOyrFDzEdYYJtaFU MTp2LtRr1/XPGcZ/MjT3EialCNZqtwndU4kPbV0HYLwyML/akcpXeun4RS09w7vee6AlHP cAPJvLsTxL2QVSKrRKusRvyP95X/U/Ky8stygf9nQj9RONdBuVmJ0eAnfJpT5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Pyinymbz; 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.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Pyinymbz; 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: 4B9913DA3C X-Spam-Score: 6.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: AIWjC0E2/ppm * guix/ui.scm (package->recutils): Output outputs with their descriptions, one per line. * po/packages/Makevars (XGETTEXT_OPTIONS): Add ‘output-synopsis’ as keyword. --- guix/ui.scm | 27 ++++++++++++++++++++++++++- po/packages/Makevars | 3 ++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/guix/ui.scm b/guix/ui.scm index a7acd41440..dad2b853ac 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2018 Steve Sprang ;;; Copyright © 2022 Taiju HIGASHI +;;; Copyright © 2022 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -1511,6 +1512,29 @@ (define (dependencies->recutils packages) (sort packages packagerecutils package output) + (string-append + "+ " output ": " + (or + (any + (match-lambda + (('output-synopsis key synopsis) + (and (string=? key output) (P_ synopsis))) + (_ #f)) + (package-properties package)) + (assoc-ref `(("bin" . ,(G_ "executable programs and scripts")) + ("debug" . ,(G_ "debug information")) + ("lib" . ,(G_ "shared libraries")) + ("static" . ,(G_ "static libraries")) + ("out" . ,(G_ "everything else"))) + output) + (G_ "see Appendix H")))) + + (define (package-outputs/out-last package) + ((compose append partition) + (negate (cut string=? "out" <>)) + (package-outputs package))) + (define (packagerecutils p <>) (package-outputs/out-last p))) (format port "systems: ~a~%" (split-lines (string-join (package-transitive-supported-systems p)) (string-length "systems: "))) diff --git a/po/packages/Makevars b/po/packages/Makevars index 4cdb98d8fe..65912786d8 100644 --- a/po/packages/Makevars +++ b/po/packages/Makevars @@ -10,7 +10,8 @@ top_builddir = ../.. # synopses and descriptions. XGETTEXT_OPTIONS = \ --language=Scheme --from-code=UTF-8 \ - --keyword=synopsis --keyword=description + --keyword=synopsis --keyword=description \ + --keyword=output-synopsis:2 COPYRIGHT_HOLDER = the authors of Guix (msgids) -- 2.36.1