From patchwork Sun May 10 23:40:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 21988 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 742B227BBE1; Mon, 11 May 2020 00:41:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5D1AB27BBE3 for ; Mon, 11 May 2020 00:41:15 +0100 (BST) Received: from localhost ([::1]:54624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXvZK-00086b-VB for patchwork@mira.cbaines.net; Sun, 10 May 2020 19:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXvZ8-00086F-2j for guix-patches@gnu.org; Sun, 10 May 2020 19:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXvZ7-0007I7-Pw for guix-patches@gnu.org; Sun, 10 May 2020 19:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jXvZ7-0007f4-OH for guix-patches@gnu.org; Sun, 10 May 2020 19:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41183] [PATCH] guix package, show: Support multiple queries. References: <20200510233747.13155-1-zimon.toutoune@gmail.com> In-Reply-To: <20200510233747.13155-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 May 2020 23:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41183 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41183@debbugs.gnu.org Cc: zimoun Received: via spool by 41183-submit@debbugs.gnu.org id=B41183.158915405629426 (code B ref 41183); Sun, 10 May 2020 23:41:01 +0000 Received: (at 41183) by debbugs.gnu.org; 10 May 2020 23:40:56 +0000 Received: from localhost ([127.0.0.1]:50692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXvZ1-0007eY-RI for submit@debbugs.gnu.org; Sun, 10 May 2020 19:40:56 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:36720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXvZ0-0007eF-AK for 41183@debbugs.gnu.org; Sun, 10 May 2020 19:40:54 -0400 Received: by mail-wm1-f53.google.com with SMTP id w19so2409177wmc.1 for <41183@debbugs.gnu.org>; Sun, 10 May 2020 16:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dGRipeoljf4yxBBNjrwW4OeS7HvRzcCGGcMsVUxgQSY=; b=KxVrHxGlHl49tBSI6vQ1WmqNO6L3TpWKQ6yDV/EMuWRrJRlM4J49jZsC5puHxLI4zy 0YLoxLeDc8oTb7aL9b6GIx39FrAxeqcbli6ktWI2PqwUgx+tOIIVTC0eMMEGQJ0RUSom q/aWUX27zDl9YxjsDiQwUcO7ylrdD/Kwzk/dNwF1nQynGjh6/ghmnbCJdNfExlklPcuJ RSzKoV4jsJZP+foBbCnOSk2xtl4NOHSBsI+GQqiwpEBg3QILqIdo6jptPbDfBoTP+/zg Efn1M23TLPsleaVuveOD/8SyrsWmNLqOtop1ugo80pJV/9VBHDGHFctYbVAAV3RIAegc 3/+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dGRipeoljf4yxBBNjrwW4OeS7HvRzcCGGcMsVUxgQSY=; b=jK8S/18JKjdATovxfKUXSAftZ+3n76Hl/x4v+iUqf5FZCbROVq4mOS4snOZ8mbt3oZ YHQND4VzUBwlD9N4lQTLGqlB8YONgmDfzP9VtG7njDgBP+xnbY9a/r2Lg6yrQdOVDguW 0EugAiKllWBmRZ74lG9gSs268xXQ4dlfv9GSFD+q4RX9uILhMK+P4dE61xViZIe1mUv5 WZ4V3hZ9zYR+1wZAlxxoEmQ21B9PC7PetjlQHQBm2rswEvqnprjz1i8xS1iFG23Qy1ep 25/IxgvTsp4xRr5ZkvUmXh0g0gruBbte3fSidiwCDGiq1wx8DRQ6XslcXozHgtGTZC4T kXpA== X-Gm-Message-State: AGi0PuZEvo11fsIM485NLhVEWNDuw+YnSC3ExK0B1uI1FXHJulN1SVZe NTDDSgZuoK380RtF8+llDwL5x67X X-Google-Smtp-Source: APiQypKIetumfJQ6wIP43CpI/cTE2isdkk4TsmivrOrsRrw5/a04M/sLoTwZQ5P/PD3SkaLgjAApSg== X-Received: by 2002:a1c:dc05:: with SMTP id t5mr11796wmg.112.1589154048122; Sun, 10 May 2020 16:40:48 -0700 (PDT) Received: from localhost.localdomain (57.246.195.77.rev.sfr.net. [77.195.246.57]) by smtp.gmail.com with ESMTPSA id n7sm5859990wro.94.2020.05.10.16.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 16:40:47 -0700 (PDT) From: zimoun Date: Mon, 11 May 2020 01:40:44 +0200 Message-Id: <20200510234044.14251-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/package.scm (process-query): Show multiple queries. * guix/scripts/show.scm (guix-show): Reverse to display in order. --- guix/scripts/package.scm | 33 +++++++++++++++++++++------------ guix/scripts/show.scm | 2 +- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index dce9256bf5..a69efa365e 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -787,18 +788,26 @@ processed, #f otherwise." (display-search-results matches (current-output-port))) #t)) - (('show requested-name) - (let-values (((name version) - (package-name->name+version requested-name))) - (match (remove package-superseded - (find-packages-by-name name version)) - (() - (leave (G_ "~a~@[@~a~]: package not found~%") name version)) - (packages - (leave-on-EPIPE - (for-each (cute package->recutils <> (current-output-port)) - packages)))) - #t)) + (('show _) + (let ((requested-names + (filter-map (match-lambda + (('query 'show requested-name) requested-name) + (_ #f)) + opts))) + (for-each + (lambda (requested-name) + (let-values (((name version) + (package-name->name+version requested-name))) + (match (remove package-superseded + (find-packages-by-name name version)) + (() + (leave (G_ "~a~@[@~a~]: package not found~%") name version)) + (packages + (leave-on-EPIPE + (for-each (cute package->recutils <> (current-output-port)) + packages)))))) + requested-names)) + #t) (('search-paths kind) (let* ((manifests (map profile-manifest profiles)) diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm index ef64b5755b..a2b0030a63 100644 --- a/guix/scripts/show.scm +++ b/guix/scripts/show.scm @@ -73,4 +73,4 @@ This is an alias for 'guix package --show='.\n")) (unless (assoc-ref opts 'query) (leave (G_ "missing arguments: no package to show~%"))) - (guix-package* opts)) + (guix-package* (reverse opts)))