~ruther/guix-local

270e1b9e1ea2b3e41067a38b094b0656ceb56838 — Ludovic Courtès 3 years ago 36445e4
reconfigure: Use 'current-channels' to obtain provenance data.

This reinstates a modified version of
b08439809f0868a74d0bd0e14d45cb3e5dd46a8c, which contained a thinko.

Previously, build-time metadata from (guix config) would be ignored when
available--e.g., when running /run/current-system/profile/bin/guix.

This is a followup to 316fc2acbb112bfa572ae30f95a93bcd56621234.

* guix/scripts/system/reconfigure.scm (check-forward-update): Use
'current-channels' rather than 'current-profile' + 'profile-channels'.
1 files changed, 1 insertions(+), 3 deletions(-)

M guix/scripts/system/reconfigure.scm
M guix/scripts/system/reconfigure.scm => guix/scripts/system/reconfigure.scm +1 -3
@@ 34,7 34,6 @@
  #:use-module (guix monads)
  #:use-module (guix store)
  #:use-module ((guix self) #:select (make-config.scm))
  #:autoload   (guix describe) (current-profile)
  #:use-module (guix channels)
  #:autoload   (guix git) (update-cached-checkout)
  #:use-module (guix i18n)


@@ 372,8 371,7 @@ 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
    (or (and=> (current-profile) profile-channels)
        '()))
    ((@ (guix describe) current-channels)))

  (when (null? current-channels)
    (warning (G_ "cannot determine provenance for current system~%")))