Compare commits

..

4 Commits

Author SHA1 Message Date
Hilton Chain
0754d51fba
rosenthal: caddy/dolly: Update to 2026.03.21-1.
* modules/rosenthal/packages/web.scm (caddy/dolly): Update to 2026.03.21-1.
[source, home-page]: Update URL.
[native-inputs]: Update vendored-go-dependencies.
2026-03-21 14:41:34 +08:00
Hilton Chain
c85bc1ad8f
services: conduit: Fix activation script.
* modules/rosenthal/services/web.scm (conduit-activation): Fix use-modules.
2026-03-21 14:29:29 +08:00
Hilton Chain
68573186b5
bootloader: limine: Simplify error handling in installation script, again. 2026-03-21 09:21:56 +08:00
Hilton Chain
1233c2154a
bootloader: limine: Align configuration file format strings. 2026-03-21 01:02:50 +08:00
3 changed files with 35 additions and 34 deletions

View File

@ -59,12 +59,13 @@
;; Install unified kernel images and generate Limine configuration. ;; Install unified kernel images and generate Limine configuration.
(call-with-output-file (in-vicinity limine-directory "limine.conf.tmp") (call-with-output-file (in-vicinity limine-directory "limine.conf.tmp")
(lambda (port) (lambda (port)
(let* ((ukify #$(file-append ukify "/bin/ukify")) (let ((ukify #$(file-append ukify "/bin/ukify"))
(current-label (first '#$labels)) (current-label (first '#$labels))
(current-args (first (list #$@ukify-args))) (current-args (first (list #$@ukify-args)))
(old-labels (cdr '#$labels)) (old-labels (cdr '#$labels))
(old-args (cdr (list #$@ukify-args)))) (old-args (cdr (list #$@ukify-args))))
(format port "timeout: 5~%") (format port "\
timeout: 5~%")
(with-directory-excursion guix-directory (with-directory-excursion guix-directory
(for-each delete-file (find-files "." "^OLD-[0-9]+\\.EFI$")) (for-each delete-file (find-files "." "^OLD-[0-9]+\\.EFI$"))
(apply invoke/quiet ukify "build" "--output" "CURRENT.EFI" (apply invoke/quiet ukify "build" "--output" "CURRENT.EFI"
@ -75,31 +76,31 @@
path: boot():/EFI/Guix/CURRENT.EFI~%" path: boot():/EFI/Guix/CURRENT.EFI~%"
current-label) current-label)
(unless (null? old-labels) (unless (null? old-labels)
(format port "~%/GNU system, old configurations...~%")) (format port "
(false-if-exception /GNU system, old configurations...~%"))
(let loop ((count 1) (let loop ((count 1)
(labels old-labels) (labels old-labels)
(args old-args)) (args old-args))
(let* ((image-name (format #f "OLD-~a.EFI" count))) (let ((image-name (format #f "OLD-~a.EFI" count)))
(unless (null? labels) (unless (null? labels)
(with-exception-handler (catch #t
(lambda _ (lambda ()
(delete-file image-name) (apply invoke/quiet
;; Exit loop. ukify "build" "--output" image-name
(loop 0 '() '())) (first args))
(lambda () (format port "~
(apply invoke/quiet
ukify "build" "--output" image-name
(first args))
(format port "~
//~a //~a
protocol: efi protocol: efi
path: boot():/EFI/Guix/OLD-~a.EFI~%" path: boot():/EFI/Guix/OLD-~a.EFI~%"
(first labels) (first labels)
count))) count))
(loop (1+ count) (lambda _
(cdr labels) (delete-file image-name)
(cdr args)))))))) ;; Exit loop.
(loop 0 '() '())))
(loop (1+ count)
(cdr labels)
(cdr args)))))))
(rename-file (in-vicinity limine-directory "limine.conf.tmp") (rename-file (in-vicinity limine-directory "limine.conf.tmp")
(in-vicinity limine-directory "limine.conf")) (in-vicinity limine-directory "limine.conf"))
;; Finally, install Limine. ;; Finally, install Limine.

View File

@ -196,16 +196,16 @@ from serving static websites to running dynamic web applications.")
(package (package
(inherit caddy) (inherit caddy)
(name "caddy-dolly") (name "caddy-dolly")
(version "2025.09.20-1") (version "2026.03.21-1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://codeberg.org/hako/caddy.git") (url "https://git.urspace.moe/hako/caddy.git")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3")))) "172kg8ycfba008brh1n8484hgwm60yq4i0gzv37qi83d3795s71d"))))
(native-inputs (native-inputs
(modify-inputs native-inputs (modify-inputs native-inputs
(replace "vendored-go-dependencies" (replace "vendored-go-dependencies"
@ -215,8 +215,8 @@ from serving static websites to running dynamic web applications.")
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"1lxbzig37z32nw2njiqy7bild4aw4y32man7490d13gg2s11rbn4")))))) "03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb"))))))
(home-page "https://git.boiledscript.com/hako/caddy") (home-page "https://git.urspace.moe/hako/caddy")
(properties '((disable-updater? . #t))))) (properties '((disable-updater? . #t)))))
(define-public forgejo (define-public forgejo

View File

@ -225,7 +225,7 @@ reload its configuration file."))
(database-path) (database-path)
(with-imported-modules (source-module-closure '((guix build utils))) (with-imported-modules (source-module-closure '((guix build utils)))
#~(begin #~(begin
(use-modules '((guix build utils))) (use-modules (guix build utils))
(let ((user (getpwnam "conduit")) (let ((user (getpwnam "conduit"))
(directory #$database-path)) (directory #$database-path))
(mkdir-p directory) (mkdir-p directory)