Compare commits

..

No commits in common. "0754d51fbab5d1489850e841fe934226c09e9232" and "ad8bb365c036de4fab2656300c0d88aab8dd48b8" have entirely different histories.

3 changed files with 34 additions and 35 deletions

View File

@ -59,13 +59,12 @@
;; 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 "\ (format port "timeout: 5~%")
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"
@ -76,31 +75,31 @@ timeout: 5~%")
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 " (format port "~%/GNU system, old configurations...~%"))
/GNU system, old configurations...~%")) (false-if-exception
(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)
(catch #t (with-exception-handler
(lambda () (lambda _
(apply invoke/quiet (delete-file image-name)
ukify "build" "--output" image-name ;; Exit loop.
(first args)) (loop 0 '() '()))
(format port "~ (lambda ()
(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)))
(lambda _ (loop (1+ count)
(delete-file image-name) (cdr labels)
;; Exit loop. (cdr args))))))))
(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 "2026.03.21-1") (version "2025.09.20-1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://git.urspace.moe/hako/caddy.git") (url "https://codeberg.org/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
"172kg8ycfba008brh1n8484hgwm60yq4i0gzv37qi83d3795s71d")))) "14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3"))))
(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
"03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb")))))) "1lxbzig37z32nw2njiqy7bild4aw4y32man7490d13gg2s11rbn4"))))))
(home-page "https://git.urspace.moe/hako/caddy") (home-page "https://git.boiledscript.com/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)