From patchwork Sun Jan 23 15:25:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36777 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 6A96827BBEB; Sun, 23 Jan 2022 15:26:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B8B8827BBEA for ; Sun, 23 Jan 2022 15:26:11 +0000 (GMT) Received: from localhost ([::1]:42760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBeks-0004jv-VU for patchwork@mira.cbaines.net; Sun, 23 Jan 2022 10:26:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBekl-0004jh-3Q for guix-patches@gnu.org; Sun, 23 Jan 2022 10:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nBekk-00007X-GT for guix-patches@gnu.org; Sun, 23 Jan 2022 10:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nBekk-0003lG-Db for guix-patches@gnu.org; Sun, 23 Jan 2022 10:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53476] [PATCH] home: 'reconfigure' checks for potential downgrades. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jan 2022 15:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53476 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53476@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164295154614425 (code B ref -1); Sun, 23 Jan 2022 15:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jan 2022 15:25:46 +0000 Received: from localhost ([127.0.0.1]:40834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBekT-0003ka-Mp for submit@debbugs.gnu.org; Sun, 23 Jan 2022 10:25:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:44858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBekS-0003kT-LR for submit@debbugs.gnu.org; Sun, 23 Jan 2022 10:25:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBekS-0004i8-Fk for guix-patches@gnu.org; Sun, 23 Jan 2022 10:25:44 -0500 Received: from [2001:470:142:3::e] (port=42814 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBekP-0008WO-Pe; Sun, 23 Jan 2022 10:25:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=UcIH1L4hyBQahdKpghCvu0HFdPDBeQ363MuJBbvteqg=; b=NFmvPssc65afY0 Ous3NM1RrSmTkfmehy5Y/tUQwUQi9T2Ueu03sggNU/nxn/ajW5KsBxx6+6s8miDrFp4saDIN2EVMO H/89LmSYR4LaKknMzuVCDJR0fV9W+qRbVa0JAFFLKY9St3BtF85RFpc2iKiEo2X5gHCxMNbDLn2Hm 3/mp7OVdNe5BXQFqPrI9tZCoFN+grDbe4oaplGdkQST4ElixsWkfBkpoHpOAsZbH2Og+zzJj/6g2i w/YvQvfqhXGf2rXRcHRUWK/vddjWbAXCQmTJlOpa7YvFBKiqUdYF5YO8AUc2JUmMzJBe9369TsZJe hO89eRVeykodmvA7vAZQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=57244 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nBekI-00022f-MP; Sun, 23 Jan 2022 10:25:39 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sun, 23 Jan 2022 16:25:25 +0100 Message-Id: <20220123152525.3211-1-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 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/home.scm (show-help, %options): Add "--allow-downgrades". (%default-options): Remove 'build-mode'; add 'validate-reconfigure'. (perform-action): Add #:validate-reconfigure. Call 'check-forward-update' when ACTION is 'reconfigure. (process-action): Pass #:validate-reconfigure to 'perform-action'. * gnu/home/services.scm (home-provenance): Export. * doc/guix.texi (Invoking guix home): Document '--allow-downgrades'. --- doc/guix.texi | 10 ++++++++++ gnu/home/services.scm | 1 + guix/scripts/home.scm | 37 +++++++++++++++++++++++++------------ 3 files changed, 36 insertions(+), 12 deletions(-) Hello! This patch adds downgrade protection to ‘guix home reconfigure’, as already implemented in ‘guix system reconfigure’ and ‘guix deploy’. Ludo’. base-commit: ee6bf00b2d89f6acab55b7a82896d99e39c1229b diff --git a/doc/guix.texi b/doc/guix.texi index 912a8e3c5a..22dc5f6156 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37791,6 +37791,16 @@ Consider the home-environment @var{expr} evaluates to. This is an alternative to specifying a file which evaluates to a home environment. +@item --allow-downgrades +Instruct @command{guix home reconfigure} to allow system downgrades. + +Just like @command{guix system}, @command{guix home reconfigure}, by +default, prevents you from downgrading your home to older or unrelated +revisions compared to the channel revisions that were used to deploy +it---those shown by @command{guix home describe}. Using +@option{--allow-downgrades} allows you to bypass that check, at the risk +of downgrading your home---be careful! + @end table @node Documentation diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 2a3cb44952..1c860d7b01 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -43,6 +43,7 @@ (define-module (gnu home services) home-provenance-service-type fold-home-service-types + home-provenance %initialize-gettext) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 2312e4d313..837fd96361 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -36,7 +36,8 @@ (define-module (guix scripts home) #:use-module (guix scripts) #:use-module (guix scripts package) #:use-module (guix scripts build) - #:use-module (guix scripts system search) + #:autoload (guix scripts system search) (service-type->recutils) + #:use-module (guix scripts system reconfigure) #:autoload (guix scripts pull) (channel-commit-hyperlink) #:use-module (guix scripts home import) #:use-module ((guix status) #:select (with-status-verbosity)) @@ -91,6 +92,9 @@ (define (show-help) (display (G_ " -e, --expression=EXPR consider the home-environment EXPR evaluates to instead of reading FILE, when applicable")) + (display (G_ " + --allow-downgrades for 'reconfigure', allow downgrades to earlier + channel revisions")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) @@ -127,18 +131,23 @@ (define %options (option '(#\e "expression") #t #f (lambda (opt name arg result) (alist-cons 'expression arg result))) + (option '("allow-downgrades") #f #f + (lambda (opt name arg result) + (alist-cons 'validate-reconfigure + warn-about-backward-reconfigure + result))) %standard-build-options)) (define %default-options - `((build-mode . ,(build-mode normal)) - (graft? . #t) + `((graft? . #t) (substitutes? . #t) (offload? . #t) (print-build-trace? . #t) (print-extended-build-trace? . #t) (multiplexed-build-output? . #t) (verbosity . #f) ;default - (debug . 0))) + (debug . 0) + (validate-reconfigure . ,ensure-forward-reconfigure))) ;;; @@ -149,12 +158,17 @@ (define* (perform-action action he #:key dry-run? derivations-only? - use-substitutes?) + use-substitutes? + (validate-reconfigure ensure-forward-reconfigure)) "Perform ACTION for home environment. " (define println (cut format #t "~a~%" <>)) + (when (eq? action 'reconfigure) + (check-forward-update validate-reconfigure + #:current-channels (home-provenance %guix-home))) + (mlet* %store-monad ((he-drv (home-environment-derivation he)) (drvs (mapm/accumulate-builds lower-object (list he-drv))) @@ -237,13 +251,12 @@ (define (ensure-home-environment file-or-exp obj) (mbegin %store-monad (set-guile-for-build (default-guile)) - (case action - (else - (perform-action action home-environment - #:dry-run? dry? - #:derivations-only? (assoc-ref opts 'derivations-only?) - #:use-substitutes? (assoc-ref opts 'substitutes?)) - )))))) + (perform-action action home-environment + #:dry-run? dry? + #:derivations-only? (assoc-ref opts 'derivations-only?) + #:use-substitutes? (assoc-ref opts 'substitutes?) + #:validate-reconfigure + (assoc-ref opts 'validate-reconfigure)))))) (warn-about-disk-space)))