From patchwork Thu May 14 14:17:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 22075 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 C493F27BBE3; Thu, 14 May 2020 15:27:56 +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,T_DKIM_INVALID 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 9606427BBE1 for ; Thu, 14 May 2020 15:27:56 +0100 (BST) Received: from localhost ([::1]:35734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZEq4-0005ia-2h for patchwork@mira.cbaines.net; Thu, 14 May 2020 10:27:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZEhS-0006Nc-Rr for guix-patches@gnu.org; Thu, 14 May 2020 10:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZEhS-0004Uo-G8 for guix-patches@gnu.org; Thu, 14 May 2020 10:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jZEhS-00056B-CQ for guix-patches@gnu.org; Thu, 14 May 2020 10:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41260] [PATCH 1/1] guix package: Support multiple profiles with '--list-installed'. References: <20200514141350.4867-1-zimon.toutoune@gmail.com> In-Reply-To: <20200514141350.4867-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 May 2020 14:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41260@debbugs.gnu.org Cc: zimoun Received: via spool by 41260-submit@debbugs.gnu.org id=B41260.158946589619528 (code B ref 41260); Thu, 14 May 2020 14:19:02 +0000 Received: (at 41260) by debbugs.gnu.org; 14 May 2020 14:18:16 +0000 Received: from localhost ([127.0.0.1]:34311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZEgi-00054u-C1 for submit@debbugs.gnu.org; Thu, 14 May 2020 10:18:16 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:34358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jZEgc-00054Y-PN for 41260@debbugs.gnu.org; Thu, 14 May 2020 10:18:14 -0400 Received: by mail-wm1-f49.google.com with SMTP id g14so14448700wme.1 for <41260@debbugs.gnu.org>; Thu, 14 May 2020 07:18:10 -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=1+cxZObX1ldanveCB+7N0Sz9donPWYWzEF+iP0rX+tk=; b=FaNwDmTXyqz7Q8lnpY1/fvQ3IXwWfDTDqmlT+pxxxPd6Jr2OlrfWr7+7mWfWWMo1zO coxgIVwVqjHR5S+RCybz6pYOli3TbsbK+zbTFe3bQ065QIOR4eyi3xa8LbImS7d/XE7D wedHh2l/C9B9uOhEOto/sRqUvAk4rY6KZKCOb0OcLFFNfHLwaa0B38hL+6CvA3BJOuwp VDS4lVaEodGfvgq0Yo2/PjEnTdBzYqjoaMyPLdvOZVUtu1ELdzn0MnyDJDPkGwnwxff3 AJQBlSODimFacU0KJf/p6E7Q6nn/qMAsMfTXOEIYjdQTJBGkWTrmUpJ9hT9woS3PdXia eheg== 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=1+cxZObX1ldanveCB+7N0Sz9donPWYWzEF+iP0rX+tk=; b=ttax8jKuq542RFqeYUp2GeSjlt2cl61q0VrUSWkxrObbF4LrWmesDh6xa+Hiz8MKIP bLorUBf3+yGMOPiNG8lYi367T4hRVn81vI2CThob8QJ6zAlLAjlZxXTsNBlbZkQFaGAQ ovGJ3FSr3nbvk4YHM8W42ifaE2Qn/YqBly9/21ObgFia6AivhDuXtD2PitAs4gK/sNBw 7+9iR3J34BAUtzDjNBakDnD5dkRmWeN4fiLyETC4WrtDt73E8MEYeGG96RfB0v46/n3Q bXKlKymQWlxl9ivvLg+0zCZjGHTTATiR6UOcyLcW1yjxTaKCMvdtGw9LDb82sEK7uFZ4 675Q== X-Gm-Message-State: AGi0Puau5oH+4alfbdTwYhjcaAn3TWqJyFVPO854E7EpylP88rhazLar Xe45Pk2ec1N7EWMTRJXGdTNrPjI7 X-Google-Smtp-Source: APiQypJwzJxA7wlYaZuhu2uzIBaQrxMlf0SuAEemys8azoPKPHcWNCCpK3JFdey+dHJ0hbkHsoQxFQ== X-Received: by 2002:a1c:6042:: with SMTP id u63mr34723342wmb.65.1589465884609; Thu, 14 May 2020 07:18:04 -0700 (PDT) Received: from localhost.localdomain (57.246.195.77.rev.sfr.net. [77.195.246.57]) by smtp.gmail.com with ESMTPSA id b2sm4925808wrm.30.2020.05.14.07.18.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 07:18:03 -0700 (PDT) From: zimoun Date: Thu, 14 May 2020 16:17:59 +0200 Message-Id: <20200514141759.6455-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): List installed multiple profiles. --- guix/scripts/package.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index a69efa365e..a4a6100a33 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -717,20 +717,23 @@ processed, #f otherwise." #t) (('list-installed regexp) - (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) - (manifest (profile-manifest profile)) - (installed (manifest-entries manifest))) - (leave-on-EPIPE - (for-each (match-lambda - (($ name version output path _) - (when (or (not regexp) - (regexp-exec regexp name)) - (format #t "~a\t~a\t~a\t~a~%" - name (or version "?") output path)))) - - ;; Show most recently installed packages last. - (reverse installed))) - #t)) + (for-each + (lambda (profile) + (let* ((regexp (and regexp (make-regexp* regexp regexp/icase))) + (manifest (profile-manifest profile)) + (installed (manifest-entries manifest))) + (leave-on-EPIPE + (for-each (match-lambda + (($ name version output path _) + (when (or (not regexp) + (regexp-exec regexp name)) + (format #t "~a\t~a\t~a\t~a~%" + name (or version "?") output path)))) + + ;; Show most recently installed packages last. + (reverse installed))))) + profiles) + #t) (('list-available regexp) (let* ((regexp (and regexp (make-regexp* regexp regexp/icase)))