guix_mirror_bot pushed a commit to branch version-1.5.0 in repository guix.
commit 105dbf7deec8599b2175bb3a6798ce726ece0154 Author: Rutherther <[email protected]> AuthorDate: Tue Dec 16 12:15:12 2025 +0100 vm-image.tmpl: Remove current-guix url override. This simplifies things thanks to the release artifacts now, they have been rewritten to Guile and can now supply current-guix-package as a parameter, as was intended. That way the checkout is not leaked for the release artifacts. * gnu/system/examples/vm-image.tmpl (guix-package-commit): Remove variable. (operating-system): Use (current-guix) directly. * gnu/system/examples/vm-image-efi.tmpl: Likewise. Change-Id: Iabf1bb5bbb86b9984bfb87ba0543782a6dce3192 Signed-off-by: Rutherther <[email protected]> --- gnu/system/examples/vm-image-efi.tmpl | 18 +----------------- gnu/system/examples/vm-image.tmpl | 19 ++----------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/gnu/system/examples/vm-image-efi.tmpl b/gnu/system/examples/vm-image-efi.tmpl index 1bde66c2dd..d264b27a5f 100644 --- a/gnu/system/examples/vm-image-efi.tmpl +++ b/gnu/system/examples/vm-image-efi.tmpl @@ -30,15 +30,6 @@ Run '\x1b[1;37minfo guix\x1b[0m' to browse documentation. accounts.\x1b[0m ")) -(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))))) - (operating-system (host-name "gnu") (timezone "Etc/UTC") @@ -148,14 +139,7 @@ root ALL=(ALL) ALL (guix-service-type config => (guix-configuration (inherit config) - (guix - (let ((guix (current-guix))) - (package - (inherit guix) - ;; Do not leak the local checkout URL. - (source (channel - (inherit %default-guix-channel) - (commit (guix-package-commit guix))))))))))))) + (guix (current-guix)))))))) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss)) diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index f7c27d23db..2a0e9e21c8 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -10,6 +10,7 @@ (srfi srfi-1) (ice-9 match) (guix channels) + (gnu packages package-management) (gnu system image)) (use-service-modules desktop mcron networking spice ssh xorg sddm) (use-package-modules bootloaders fonts @@ -30,15 +31,6 @@ Run '\x1b[1;37minfo guix\x1b[0m' to browse documentation. accounts.\x1b[0m ")) -(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))))) - (operating-system (host-name "gnu") (timezone "Etc/UTC") @@ -141,14 +133,7 @@ root ALL=(ALL) ALL (guix-service-type config => (guix-configuration (inherit config) - (guix - (let ((guix (current-guix))) - (package - (inherit guix) - ;; Do not leak the local checkout URL. - (source (channel - (inherit %default-guix-channel) - (commit (guix-package-commit guix))))))))))))) + (guix (current-guix)))))))) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss))
