From unknown Mon Jun 23 20:20:49 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26756: [PATCH 2/2] scripts: refresh: Add -m manifest option. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 May 2017 11:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26756 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26756@debbugs.gnu.org Cc: Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14938110325148 (code B ref -1); Wed, 03 May 2017 11:31:03 +0000 Received: (at submit) by debbugs.gnu.org; 3 May 2017 11:30:32 +0000 Received: from localhost ([127.0.0.1]:51960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5sUK-0001KY-70 for submit@debbugs.gnu.org; Wed, 03 May 2017 07:30:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5sUI-0001E0-90 for submit@debbugs.gnu.org; Wed, 03 May 2017 07:30:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5sUC-0008DC-4u for submit@debbugs.gnu.org; Wed, 03 May 2017 07:30:25 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:36431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5sUC-0008D4-1u for submit@debbugs.gnu.org; Wed, 03 May 2017 07:30:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5sUA-0008JK-Ln for guix-patches@gnu.org; Wed, 03 May 2017 07:30:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5sU9-0008CJ-DR for guix-patches@gnu.org; Wed, 03 May 2017 07:30:22 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:37205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d5sU9-0008C3-6n for guix-patches@gnu.org; Wed, 03 May 2017 07:30:21 -0400 Received: by mail-wm0-x22b.google.com with SMTP id m123so54061783wma.0 for ; Wed, 03 May 2017 04:30:21 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=/dhd+Szxf1fBhb76/W/bCyGkB4w2e3gNypIaPY9q+xg=; b=JpCo7SfmAYAL2rqWwQpj6F6tWI06k1VFpyR6+fhYBPI68CMNimIyAp//Z9II61Ptc8 FrQLbHKqaJ3qXs6tstEtmBcYzE+NMWGhMJ41uzkagHxt0obXv5jeRazcPqytq5fHjZMv c2Ix5zC+9tadQwP4BDpZhFfQDnvWRnvDpecn7m4VYoO7IC5Mm06o0MPznf7gEq6KBItb /XJdwJLArUEQjwrVJr5N2Orqz0D+vA4xILYfSgp/hZOlLFo1ph5Zrc6aclZ1c9ejSI5M EB72n0ScuOLpq8hYoI+DPBkNcKskubYGyYNqteeMn2FQhnxPYRJbGu5wXDn7QSbeUCX2 Bf6w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=/dhd+Szxf1fBhb76/W/bCyGkB4w2e3gNypIaPY9q+xg=; b=FTsFqNoGTeyFnifFFSYn2fGCcA7WPp5Yh17hDT7xQi92Hnpw3ZB9S/I2cI2g7nprlx mEkOKOrtZNbI8ZrJTtKxowKrkkk4I/f+k4CrALfMQbeacn19Nsum2WZkGjZHC6nsi/v3 ihoEJaFDlkJDyiXzZMRVuw+SMVq/XEqgdemnt6y4KuKbXKxYhXpvvGpjkmDE0Ov2+ilV 2DIo333znxKWVKKOyerri6qn/e5bSaKH0dCBp3UFXatMu8kInP5g/twkPUrSD13zSlaL Sv+fLZttrRdc1gYCGlnDOukZrNOJbGquor7RTLqQyuKhDALG3YcQTj6j2hMK7aUuJhm/ wSZQ== X-Gm-Message-State: AN3rC/6QvlkXbHOqkXFJ7MGVy1PFUnI9w+8GyB100Dv7zfqfbUYQYppS r24cx2YPQCKSQ+bZ X-Received: by 10.28.217.18 with SMTP id q18mr532079wmg.55.1493811019914; Wed, 03 May 2017 04:30:19 -0700 (PDT) Received: from cervin.8.8.8.8 (85-169-37-239.rev.numericable.fr. [85.169.37.239]) by smtp.gmail.com with ESMTPSA id t26sm13768457wra.43.2017.05.03.04.30.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 May 2017 04:30:19 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 3 May 2017 13:29:56 +0200 Message-Id: <20170503112956.6785-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170503112956.6785-1-m.othacehe@gmail.com> References: <20170503112956.6785-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * guix/scripts/refresh.scm (%options): Add -m option, (show-help): document it, (get-manifest-packages): new procedure, (guix-refresh): use packages from manifest if specified, otherwise keep the previous behaviour. * doc/guix.texi (Invoking guix refresh): document new option. --- doc/guix.texi | 5 +++++ guix/scripts/refresh.scm | 29 ++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9b2fe3fdb..f04b3cafe 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5759,6 +5759,11 @@ The @code{non-core} subset refers to the remaining packages. It is typically useful in cases where an update of the core packages would be inconvenient. +@item --manifest=@var{file} +@itemx -m @var{file} +Select only packages specified in manifest @var{file}. This is useful to +check if any packages of the user manifest can be updated. + @item --type=@var{updater} @itemx -t @var{updater} Select only packages handled by @var{updater} (may be a comma-separated diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index c0d589af1..9dcb8d126 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2016 Ben Woodcroft +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix profiles) #:use-module (guix upstream) #:use-module (guix graph) #:use-module (guix scripts graph) @@ -87,6 +89,9 @@ (option '(#\L "list-updaters") #f #f (lambda args (list-updaters-and-exit))) + (option '(#\m "manifest") #t #f + (lambda (opt name arg result) + (alist-cons 'manifest arg result))) (option '(#\e "expression") #t #f (lambda (opt name arg result) (alist-cons 'expression arg result))) @@ -133,6 +138,8 @@ specified with `--select'.\n")) -s, --select=SUBSET select all the packages in SUBSET, one of `core' or `non-core'")) (display (_ " + -m, --manifest=FILE select all the packages in FILE manifest")) + (display (_ " -t, --type=UPDATER,... restrict to updates from the specified updaters (e.g., 'gnu')")) (display (_ " @@ -350,6 +357,17 @@ dependent packages are rebuilt: ~{~a~^ ~}~%" ;;; +;;; Manifest. +;;; + +(define (get-manifest-packages manifest) + "Return the list of packages in loaded MANIFEST." + (let* ((user-module (make-user-module '((guix profiles) (gnu)))) + (manifest (load* manifest user-module))) + (manifest->packages manifest))) + + +;;; ;;; Entry point. ;;; @@ -420,8 +438,11 @@ update would trigger a complete rebuild." ;; the command line. (warn? (or (assoc-ref opts 'argument) (assoc-ref opts 'expression))) - - (packages + (manifest-packages + (match (assoc-ref opts 'manifest) + ((? string? manifest) (get-manifest-packages manifest)) + (x #f))) + (args-packages (match (filter-map (match-lambda (('argument . spec) ;; Take either the specified version or the @@ -442,7 +463,9 @@ update would trigger a complete rebuild." result)) '()))) (some ; user-specified packages - some)))) + some))) + (packages + (or manifest-packages args-packages))) (with-error-handling (with-store store (run-with-store store -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Wed May 03 07:50:00 2017 Received: (at control) by debbugs.gnu.org; 3 May 2017 11:50:00 +0000 Received: from localhost ([127.0.0.1]:51992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5snA-00038T-2S for submit@debbugs.gnu.org; Wed, 03 May 2017 07:50:00 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:32973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5sn8-000387-BD for control@debbugs.gnu.org; Wed, 03 May 2017 07:49:58 -0400 Received: by mail-wr0-f196.google.com with SMTP id w50so22348659wrc.0 for ; Wed, 03 May 2017 04:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=fzvmArfZVjCJ001/80HuqaJxuMhKtn2DZ4aOuI4T7W8=; b=YNOMPOBWwsRUbIytrGXHabKIpliTRBD2lff3W/SWwm5l6pKIjEbBOE0jpLTREPhLIH E7t2GnaZiFeTyCkBdBIW8tsvVb4wbw1/axncCbJATDfu82OwbdE6kVWXQWrrBPErDNpD 5lUALWIpNdDuqZEQNyyOnJ4oE/7KixKi3mks3Tk46tAB/TYSb04650scBIp6xOlGrrzf SZC3sCEGbFoyrttL6itxMULGms4CAE+TErzpaUdIp5MHACjlPycE/J0cbAXkLh7X4mme SECfAQcz/mqvMp1Kz73D/GSeQmWE+r5KygW/5yM1F87gfExdQY1TFjWfn6Bwz8dJ4zH4 9Ssg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=fzvmArfZVjCJ001/80HuqaJxuMhKtn2DZ4aOuI4T7W8=; b=mS/znGCEw/dn6ljvP8blLWibJpob3nLPgq112E4j6DAeMpz+TvL94hms6j5q7usivZ vKgc4zbh+WL+rKBvvnq3YaUXPupyN2Y5dQpIdZ3nlBZrikZ7NozeteoQA488Zb/a48x3 SKCrqH48VruJp/is1mk0o9pbJnU7pKZjQcMkayf6qwYuppTbVrKU+6odB2imgg5Fxo3M yrLZIvITRcntLTbpPH6CYiIT8fednhUhaABV8zTLfdX2RFRpua2T+y/I19JUAH+vCOOF G+SyDAFbGNju3GNt0ZWePOFubfxGHjHoor1gXD/G7N92nXgL0RQOOm/R2eUyEZrwjkzh tT9A== X-Gm-Message-State: AN3rC/6QG/dcnoO+oTgprouxdrFbfQUqFKvNptFF7AqdJIVBvsW2Fxxr pWsy7/UFfmHnMj8C X-Received: by 10.223.160.70 with SMTP id l6mr23195470wrl.0.1493812192099; Wed, 03 May 2017 04:49:52 -0700 (PDT) Received: from zbook ([46.218.109.88]) by smtp.gmail.com with ESMTPSA id 136sm4577846wmx.25.2017.05.03.04.49.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2017 04:49:51 -0700 (PDT) Date: Wed, 03 May 2017 13:50:23 +0200 Message-Id: <867f1y5fcw.fsf@gmail.com> To: control@debbugs.gnu.org From: Mathieu Othacehe Subject: control message for bug #26756 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) close 26756