guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: Revert "reconfigure: Use 'current-channels' to ob


From: guix-commits
Subject: branch master updated: Revert "reconfigure: Use 'current-channels' to obtain provenance data."
Date: Tue, 30 Aug 2022 02:45:49 -0400

This is an automated email from the git hooks/post-receive script.

iyzsong pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e214e87cc5 Revert "reconfigure: Use 'current-channels' to obtain 
provenance data."
e214e87cc5 is described below

commit e214e87cc5e0bd0d3325aab1c9086354f6570e9c
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Tue Aug 30 14:43:21 2022 +0800

    Revert "reconfigure: Use 'current-channels' to obtain provenance data."
    
    This fixes <https://issues.guix.gnu.org/57480>.
    
    This reverts commit b08439809f0868a74d0bd0e14d45cb3e5dd46a8c.
---
 guix/scripts/system/reconfigure.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/system/reconfigure.scm 
b/guix/scripts/system/reconfigure.scm
index 9bd26a39ee..9ca66687ee 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -34,7 +34,7 @@
   #:use-module (guix monads)
   #:use-module (guix store)
   #:use-module ((guix self) #:select (make-config.scm))
-  #:autoload   (guix describe) (current-channels)
+  #:autoload   (guix describe) (current-profile)
   #:use-module (guix channels)
   #:autoload   (guix git) (update-cached-checkout)
   #:use-module (guix i18n)
@@ -372,7 +372,8 @@ currently-deployed commit (from CURRENT-CHANNELS, which is 
as returned by
 'guix system describe' by default) and the target commit (as returned by 'guix
 describe')."
   (define new
-    (current-channels))
+    (or (and=> (current-profile) profile-channels)
+        '()))
 
   (when (null? current-channels)
     (warning (G_ "cannot determine provenance for current system~%")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]