mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2026-03-25 19:24:22 +00:00
Compare commits
4 Commits
ad8bb365c0
...
0754d51fba
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0754d51fba | ||
|
|
c85bc1ad8f | ||
|
|
68573186b5 | ||
|
|
1233c2154a |
@ -59,12 +59,13 @@
|
||||
;; Install unified kernel images and generate Limine configuration.
|
||||
(call-with-output-file (in-vicinity limine-directory "limine.conf.tmp")
|
||||
(lambda (port)
|
||||
(let* ((ukify #$(file-append ukify "/bin/ukify"))
|
||||
(current-label (first '#$labels))
|
||||
(current-args (first (list #$@ukify-args)))
|
||||
(old-labels (cdr '#$labels))
|
||||
(old-args (cdr (list #$@ukify-args))))
|
||||
(format port "timeout: 5~%")
|
||||
(let ((ukify #$(file-append ukify "/bin/ukify"))
|
||||
(current-label (first '#$labels))
|
||||
(current-args (first (list #$@ukify-args)))
|
||||
(old-labels (cdr '#$labels))
|
||||
(old-args (cdr (list #$@ukify-args))))
|
||||
(format port "\
|
||||
timeout: 5~%")
|
||||
(with-directory-excursion guix-directory
|
||||
(for-each delete-file (find-files "." "^OLD-[0-9]+\\.EFI$"))
|
||||
(apply invoke/quiet ukify "build" "--output" "CURRENT.EFI"
|
||||
@ -75,31 +76,31 @@
|
||||
path: boot():/EFI/Guix/CURRENT.EFI~%"
|
||||
current-label)
|
||||
(unless (null? old-labels)
|
||||
(format port "~%/GNU system, old configurations...~%"))
|
||||
(false-if-exception
|
||||
(let loop ((count 1)
|
||||
(labels old-labels)
|
||||
(args old-args))
|
||||
(let* ((image-name (format #f "OLD-~a.EFI" count)))
|
||||
(unless (null? labels)
|
||||
(with-exception-handler
|
||||
(lambda _
|
||||
(delete-file image-name)
|
||||
;; Exit loop.
|
||||
(loop 0 '() '()))
|
||||
(lambda ()
|
||||
(apply invoke/quiet
|
||||
ukify "build" "--output" image-name
|
||||
(first args))
|
||||
(format port "~
|
||||
(format port "
|
||||
/GNU system, old configurations...~%"))
|
||||
(let loop ((count 1)
|
||||
(labels old-labels)
|
||||
(args old-args))
|
||||
(let ((image-name (format #f "OLD-~a.EFI" count)))
|
||||
(unless (null? labels)
|
||||
(catch #t
|
||||
(lambda ()
|
||||
(apply invoke/quiet
|
||||
ukify "build" "--output" image-name
|
||||
(first args))
|
||||
(format port "~
|
||||
//~a
|
||||
protocol: efi
|
||||
path: boot():/EFI/Guix/OLD-~a.EFI~%"
|
||||
(first labels)
|
||||
count)))
|
||||
(loop (1+ count)
|
||||
(cdr labels)
|
||||
(cdr args))))))))
|
||||
(first labels)
|
||||
count))
|
||||
(lambda _
|
||||
(delete-file image-name)
|
||||
;; Exit loop.
|
||||
(loop 0 '() '())))
|
||||
(loop (1+ count)
|
||||
(cdr labels)
|
||||
(cdr args)))))))
|
||||
(rename-file (in-vicinity limine-directory "limine.conf.tmp")
|
||||
(in-vicinity limine-directory "limine.conf"))
|
||||
;; Finally, install Limine.
|
||||
|
||||
@ -196,16 +196,16 @@ from serving static websites to running dynamic web applications.")
|
||||
(package
|
||||
(inherit caddy)
|
||||
(name "caddy-dolly")
|
||||
(version "2025.09.20-1")
|
||||
(version "2026.03.21-1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://codeberg.org/hako/caddy.git")
|
||||
(url "https://git.urspace.moe/hako/caddy.git")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3"))))
|
||||
"172kg8ycfba008brh1n8484hgwm60yq4i0gzv37qi83d3795s71d"))))
|
||||
(native-inputs
|
||||
(modify-inputs native-inputs
|
||||
(replace "vendored-go-dependencies"
|
||||
@ -215,8 +215,8 @@ from serving static websites to running dynamic web applications.")
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1lxbzig37z32nw2njiqy7bild4aw4y32man7490d13gg2s11rbn4"))))))
|
||||
(home-page "https://git.boiledscript.com/hako/caddy")
|
||||
"03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb"))))))
|
||||
(home-page "https://git.urspace.moe/hako/caddy")
|
||||
(properties '((disable-updater? . #t)))))
|
||||
|
||||
(define-public forgejo
|
||||
|
||||
@ -225,7 +225,7 @@ reload its configuration file."))
|
||||
(database-path)
|
||||
(with-imported-modules (source-module-closure '((guix build utils)))
|
||||
#~(begin
|
||||
(use-modules '((guix build utils)))
|
||||
(use-modules (guix build utils))
|
||||
(let ((user (getpwnam "conduit"))
|
||||
(directory #$database-path))
|
||||
(mkdir-p directory)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user