Compare commits

...

4 Commits

Author SHA1 Message Date
Hilton Chain
a238fc8c28
services: caddy: Reload by sending SIGUSR1 to the service.
* modules/rosenthal/services/web.scm (caddy-shepherd-services) [actions]:
Change reload action to send SIGUSR1 to the service.
2026-03-28 13:41:59 +08:00
Hilton Chain
79b5b07f83
rosenthal: ohmyech-icecat: Update to 1.2.
* modules/rosenthal/packages/browser-extensions.scm (ohmyech): Update to 1.2.
Unexport.
2026-03-28 13:41:59 +08:00
Hilton Chain
8821b60e0b
rosenthal: bitwarden/icecat: Update to 2026.2.0.
* modules/rosenthal/packages/browser-extensions.scm (bitwarden): Update to
2026.2.0.
2026-03-28 10:55:22 +08:00
Hilton Chain
d9861ba574
rosenthal: packages: Change git.urspace.moe URLs to git.guix.moe.
* modules/rosenthal/packages/patches/cuirass-templates-Add-more-forges.patch:
Update URLs in patch.
* modules/rosenthal/packages/web.scm (caddy/dolly): Update URLs.
2026-03-28 10:53:58 +08:00
4 changed files with 17 additions and 26 deletions

View File

@ -13,12 +13,14 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
;; Guix build systems ;; Guix build systems
#:use-module (guix build-system copy)) #:use-module (guix build-system copy)
;; Guix packages
#:use-module (gnu packages compression))
(define-public bitwarden (define bitwarden
(package (package
(name "bitwarden") (name "bitwarden")
(version "2025.6.1") (version "2026.2.0")
(source (origin (source (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
(uri (string-append "https://github.com/bitwarden/clients" (uri (string-append "https://github.com/bitwarden/clients"
@ -26,7 +28,7 @@
"/dist-firefox-" version ".zip")) "/dist-firefox-" version ".zip"))
(sha256 (sha256
(base32 (base32
"1yx9f1adh6swbzf24rj621vgccvi8gl7hi8q4r9ccv5qq4zq3f53")))) "1l2mabgbxf2jdsgd56fbalzszjkxp03cxba1r15vgvdlgmkif5cl"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -98,10 +100,10 @@ results are added in a sidebar next to search engine results.")
`(,@(alist-delete 'hidden? (package-properties base)) `(,@(alist-delete 'hidden? (package-properties base))
(disable-updater? . #t)))))) (disable-updater? . #t))))))
(define-public ohmyech (define ohmyech
(package (package
(name "ohmyech") (name "ohmyech")
(version "1.1") (version "1.2")
(properties (properties
'((addon-id . "{46b8ab0b-8adf-4e43-ad67-acef5a8d45c9}") '((addon-id . "{46b8ab0b-8adf-4e43-ad67-acef5a8d45c9}")
(hidden? . #t) (hidden? . #t)
@ -110,11 +112,11 @@ results are added in a sidebar next to search engine results.")
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/27justin/ohmyech") (url "https://github.com/27justin/ohmyech")
(commit "ec7935d500a9d354776586e25261cef3595c40c7"))) (commit "aa0cf4cc5c4bcb6ce508d8a4e7ee4c95c2e63cbe")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1mrbm8c8z9zpfrs0qk5qj64f35p7c5lrxfn3nhda0ar0b2rv6593")) "1cqgfv2q7shisi9ijac5s85xy9q2rz9f9hxwq3q41vfgrcvd8zng"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(substitute* "manifest.json" #~(substitute* "manifest.json"

View File

@ -1,4 +1,4 @@
From f45f42fe17a0037ce3b8c4f22537f257338734e5 Mon Sep 17 00:00:00 2001 From 90bf62f411590cc0b813e6f62c3a0ef89cf17d1f Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space> From: Hilton Chain <hako@ultrarare.space>
Date: Sun, 30 Nov 2025 12:13:36 +0800 Date: Sun, 30 Nov 2025 12:13:36 +0800
Subject: [PATCH] templates: Add more forges. Subject: [PATCH] templates: Add more forges.
@ -8,7 +8,7 @@ Subject: [PATCH] templates: Add more forges.
1 file changed, 13 insertions(+), 3 deletions(-) 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm
index 1cf7ebf..2ee29fa 100644 index 1cf7ebf..042d46a 100644
--- a/src/cuirass/templates.scm --- a/src/cuirass/templates.scm
+++ b/src/cuirass/templates.scm +++ b/src/cuirass/templates.scm
@@ -1526,7 +1526,9 @@ (define %vcs-web-views @@ -1526,7 +1526,9 @@ (define %vcs-web-views
@ -18,7 +18,7 @@ index 1cf7ebf..2ee29fa 100644
- ("github.com" ,labhub-url)))) - ("github.com" ,labhub-url))))
+ ("github.com" ,labhub-url) + ("github.com" ,labhub-url)
+ ("git.sr.ht" ,labhub-url) + ("git.sr.ht" ,labhub-url)
+ ("git.urspace.moe" ,labhub-url)))) + ("git.guix.moe" ,labhub-url))))
(define %vcs-web-commit-range-views (define %vcs-web-commit-range-views
;; List of host names and corresponding URL to display a commit range. ;; List of host names and corresponding URL to display a commit range.
@ -44,7 +44,7 @@ index 1cf7ebf..2ee29fa 100644
- ("github.com" ,github-url)))) - ("github.com" ,github-url))))
+ ("github.com" ,github-url) + ("github.com" ,github-url)
+ ("git.sr.ht" ,sourcehut-url) + ("git.sr.ht" ,sourcehut-url)
+ ("git.urspace.moe" ,github-url)))) + ("git.guix.moe" ,github-url))))
(define* (commit-hyperlink url commit (define* (commit-hyperlink url commit
#:optional (text commit)) #:optional (text commit))

View File

@ -200,7 +200,7 @@ from serving static websites to running dynamic web applications.")
(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://git.guix.moe/hako/caddy.git")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
@ -216,7 +216,7 @@ from serving static websites to running dynamic web applications.")
(sha256 (sha256
(base32 (base32
"03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb")))))) "03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb"))))))
(home-page "https://git.urspace.moe/hako/caddy") (home-page "https://git.guix.moe/hako/caddy")
(properties '((disable-updater? . #t))))) (properties '((disable-updater? . #t)))))
(define-public forgejo (define-public forgejo

View File

@ -142,18 +142,7 @@
#~(make-kill-destructor)) #~(make-kill-destructor))
(actions (actions
(list (shepherd-configuration-action "/etc/caddy/Caddyfile") (list (shepherd-configuration-action "/etc/caddy/Caddyfile")
(shepherd-action (shepherd-signal-action 'reload SIGUSR1)))
(name 'reload)
(documentation "Reload Caddy configuration file.")
(procedure
#~(lambda (pid)
(if pid
(begin
(invoke "/run/privileged/bin/caddy" "reload"
"--config" "/etc/caddy/Caddyfile")
(display "Service caddy has been asked to \
reload its configuration file."))
(display "Service caddy is not running.")))))))
(auto-start? auto-start?))))) (auto-start? auto-start?)))))
(define caddy-service-type (define caddy-service-type