aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author宋文武 <iyzsong@member.fsf.org>2022-08-30 14:43:21 +0800
committer宋文武 <iyzsong@member.fsf.org>2022-08-30 14:44:07 +0800
commite214e87cc5e0bd0d3325aab1c9086354f6570e9c (patch)
tree1b1fcfeb81dd7239d00f464698d3a2a120df8c59
parent9b8507df11f5ca3d13e49dc0588d3522d28fa9e4 (diff)
downloadguix-e214e87cc5e0bd0d3325aab1c9086354f6570e9c.tar.gz
guix-e214e87cc5e0bd0d3325aab1c9086354f6570e9c.zip
Revert "reconfigure: Use 'current-channels' to obtain provenance data."
This fixes <https://issues.guix.gnu.org/57480>. This reverts commit b08439809f0868a74d0bd0e14d45cb3e5dd46a8c.
-rw-r--r--guix/scripts/system/reconfigure.scm5
1 files 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~%")))