bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm-image.tmpl: Remove current-guix url override.

Browse source 
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 <rutherther@ditigal.xyz>
This commit is contained in:
Rutherther 2025-12-16 12:15:12 +01:00
parent d226cc4933
commit 105dbf7dee
No known key found for this signature in database
GPG key ID: 0322798269E471C3
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gnu/system/examples/vm-image-efi.tmpl
View file

@ -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))

19
gnu/system/examples/vm-image.tmpl
View file

@ -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))