From 871f09b6f7ebf16baeef4b35f9637548acae5a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 4 Jun 2025 12:51:33 +0200 Subject: [PATCH] install: Adjust for (package-source guix) not being a . MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes guix/guix#422. * gnu/system/install.scm (%installation-services)[guix-package-commit]: New procedure. : Use it instead of ‘channel-commit’. Change-Id: I6ed5bc3f21a375e639fabfcbcdaf70b6347d1c5c --- gnu/system/install.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 20960e62b31..c71a533c8e2 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -33,6 +33,7 @@ #:use-module (guix store) #:use-module (guix modules) #:use-module ((guix packages) #:select (package-version supported-package?)) + #:autoload (guix channels) (channel? channel-commit) #:use-module (guix platform) #:use-module (guix utils) #:use-module (guix packages) @@ -353,6 +354,15 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (define bare-bones-os (load "examples/bare-bones.tmpl")) + (define (guix-package-commit guix) + ;; Extract the commit of the GUIX package. + (match (package-source guix) + ((? channel? source) + (channel-commit source)) + (_ + (apply (lambda* (#:key commit #:allow-other-keys) commit) + (package-arguments guix))))) + (append ;; Generic services (list (service virtual-terminal-service-type) @@ -403,8 +413,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Do not leak the local checkout URL. (source (channel (inherit %default-guix-channel) - (commit (channel-commit - (package-source guix)))))))))) + (commit (guix-package-commit guix))))))))) ;; Start udev so that useful device nodes are available. ;; Use device-mapper rules for cryptsetup & co; enable the CRDA for