Compare commits

...

10 Commits

Author SHA1 Message Date
Hilton Chain
6285ce883b
test 2025-08-18 00:15:58 +08:00
Hilton Chain
5a07ccc328
rosenthal: tailscale: Update to 1.86.0.
* modules/rosenthal/packages/networking.scm (tailscale): Update to 1.86.0.
[native-inputs]: Update vendored Go dependencies.
2025-08-17 23:59:06 +08:00
Hilton Chain
67ca18a5cf
utils: go-mod-vendor: Always use system Go toolchain.
* modules/rosenthal/utils/download.scm (go-mod-vendor): Set environment
variable GOTOOLCHAIN to local.
2025-08-17 23:59:05 +08:00
Hilton Chain
3386c9a43d
rosenthal: caddy/hako: Update to 2025.08.17-1.
* modules/rosenthal/packages/web.scm (caddy/hako): Update to 2025.08.17-1.
[native-inputs]: Update vendored Go dependencies.
2025-08-17 22:06:59 +08:00
Hilton Chain
761e20bd85
util: go-mod-vendor: Make compatible with upcoming nss-updates merge.
* modules/rosenthal/utils/download.scm (go-mod-vendor): Also find nss-certs
in (gnu packages nss).
2025-08-16 18:45:19 +08:00
Hilton Chain
558f180b5d
rosenthal: hugo: Update to 0.148.2.
* modules/rosenthal/packages/web.scm (hugo): Update to 0.148.2.
2025-08-13 15:01:23 +08:00
Hilton Chain
9a2881db43
rosenthal: cloudflared: Update to 2025.8.0.
* modules/rosenthal/packages/networking.scm (cloudflared): Update to 2025.8.0.
2025-08-13 15:01:22 +08:00
Hilton Chain
4bbcf848dd
rosenthal: sing-box: Update to 1.12.1.
* modules/rosenthal/packages/networking.scm (sing-box): Update to 1.12.1.
[native-inputs]: Update vendored Go dependencies.
2025-08-13 14:58:02 +08:00
Hilton Chain
3f5bf035da
rosenthal: mihomo: Update to 1.19.12.
* modules/rosenthal/packages/networking.scm (mihomo): Update to 1.19.12.
[native-inputs]: Update vendored Go dependencies.
2025-08-13 14:53:41 +08:00
Hilton Chain
00f9a92812
home services: theme: Allow font configuration.
* modules/rosenthal/services/desktop.scm (home-theme-configuration) [font]:
New field.
* modules/rosenthal/services/desktop.scm (%home-theme-xdg-config): Use it.
2025-08-12 22:18:54 +08:00
4 changed files with 29 additions and 21 deletions

View File

@ -18,7 +18,7 @@
(define-public cloudflared
(package
(name "cloudflared")
(version "2025.7.0")
(version "2025.8.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -30,7 +30,7 @@
;; (snippet '(delete-file-recursively "vendor"))
(sha256
(base32
"0by8pqp2zfqwvqff0pjvrllskcyb2xfzn9ck8d38nhc5vicr428q"))))
"1qfi1770jaiwhklp1d7vd6kl8yfyxv1i64vdz7n8p4f015v47y4j"))))
(build-system go-build-system)
(arguments
(list #:go go-1.24
@ -69,7 +69,7 @@ origin can remain as closed as possible.")
(define-public mihomo
(package
(name "mihomo")
(version "1.19.11")
(version "1.19.12")
(source (origin
(method git-fetch)
(uri (git-reference
@ -78,7 +78,7 @@ origin can remain as closed as possible.")
(file-name (git-file-name name version))
(sha256
(base32
"1vsy73iian2kk89c40g8q0ndcabcwxvsi4j6h6x4y6dkyafrppcy"))))
"1g7v5zdjhkc5gd8ls9z9hmympwnsrlsyjjvxssqpcy09zbmc9fln"))))
(build-system go-build-system)
(arguments
(list
@ -123,7 +123,7 @@ origin can remain as closed as possible.")
(file-name "vendored-go-dependencies")
(sha256
(base32
"1kvhcngcabp43g27d7spz47dm2c8ngzh270cfwz2iy9vmng67xlk"))))
"0wdz4811n3wj3ihwq5g7klah16y7g0cdi06bd5crg0ixp579qdjh"))))
(if (%current-target-system)
(list this-package)
'())))
@ -139,7 +139,7 @@ bypass network restrictions." )
(define-public sing-box
(package
(name "sing-box")
(version "1.12.0")
(version "1.12.1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -148,7 +148,7 @@ bypass network restrictions." )
(file-name (git-file-name name version))
(sha256
(base32
"1dpf84c9iqz14pkvbac3r8plmwkh6cg0qy3965isg11ijqjhcg54"))))
"088vl3ad324r11g341gca6qrj53pyr1nfwhf7jmpy89m9wxp33ky"))))
(build-system go-build-system)
(arguments
(list
@ -213,10 +213,10 @@ bypass network restrictions." )
(list (origin
(method (go-mod-vendor #:go go-1.23))
(uri (package-source this-package))
(file-name "vendored-go-dependencies")
(file-name "vendored-dependencies")
(sha256
(base32
"0x4sd4hnyng2ihgp3i2sagw9f1md3l6rrpkbwrjkgngg30mp7s4m"))))
"1b5dd8qyla8i007sjy412am9rmsm303gk7drrh0y2wq46lya4rdi"))))
(if (%current-target-system)
(list this-package)
'())))
@ -257,7 +257,7 @@ a SOCKS5 proxy.")
(define-public tailscale
(package
(name "tailscale")
(version "1.84.3")
(version "1.86.0")
(source (origin
(method git-fetch)
(uri (git-reference
@ -266,7 +266,7 @@ a SOCKS5 proxy.")
(file-name (git-file-name name version))
(sha256
(base32
"1cdmr6z351i2ammr82gvbs2x3cp9w75q0nzvvk91rsx2khvd8yyh"))
"1w820zf5pcdzwvbijx7hm10bd5xp3c8nyhk68qj1w93f5m7byfpv"))
(modules '((guix build utils)))
(snippet
'(begin
@ -368,7 +368,7 @@ a SOCKS5 proxy.")
(file-name "vendored-go-dependencies")
(sha256
(base32
"1pbcp946wingy0xw8nc1x0hdj55scndv8kdgzfni0f4hwlq045j0"))))
"0l4j763bk2k9pl99rvga1kk828szmjwl7vc9jvrrfq6bj6rd4171"))))
(if (%current-target-system)
(list this-package)
'())))

View File

@ -193,7 +193,7 @@ from serving static websites to running dynamic web applications.")
(package
(inherit caddy)
(name "caddy-hako")
(version "2025.06.09-2")
(version "2025.08.17-1")
(source (origin
(method git-fetch)
(uri (git-reference
@ -202,7 +202,7 @@ from serving static websites to running dynamic web applications.")
(file-name (git-file-name name version))
(sha256
(base32
"0v3i4rlpvbb1hxppwk58bslrn4i43khp0yr9i48sq74dg3xxcman"))))
"07c1yxpyz1sbfs7xy8s32hsw3z4l6rpwz01g8n4lq4xzgavkpqab"))))
(native-inputs
(modify-inputs (package-native-inputs caddy)
(replace "vendored-go-dependencies"
@ -212,14 +212,14 @@ from serving static websites to running dynamic web applications.")
(file-name "vendored-go-dependencies")
(sha256
(base32
"0iv97phpwhp185bryx27vvdm7s6j1w195zdcjmpb7dr20p5l5i1i"))))))
"1fdspm2a4574hn4aik5wlli0yp4ih3w2rjyrw3s96n2drk0schqn"))))))
(home-page "https://git.boiledscript.com/hako/caddy")
(properties '((disable-updater? . #t)))))
(define-public hugo
(package
(name "hugo")
(version "0.148.1")
(version "0.148.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -228,7 +228,7 @@ from serving static websites to running dynamic web applications.")
(file-name (git-file-name name version))
(sha256
(base32
"0da6i21ygvcyhphhsdrsn5s9yjk7h9l6mqpdndwyzawsskg1ls0h"))))
"1ajv2m07kl6gysvr6qmgb5f36cygqqvj214v5zml0mjx513d10p8"))))
(build-system go-build-system)
(arguments
(list

View File

@ -357,6 +357,9 @@ compositor.")))
(icon-theme
(string "Adwaita")
"")
(font
(string "Sans")
"")
(cursor-theme
(string "Adwaita")
"")
@ -391,18 +394,18 @@ Inherits = ~a~%"
(define %home-theme-xdg-config
(match-record-lambda <home-theme-configuration>
(icon-theme cursor-theme cursor-size key-theme)
(icon-theme font cursor-theme cursor-size key-theme)
`(("gtk-3.0/settings.ini"
,(plain-file "settings.ini"
(format #f "\
[Settings]
gtk-theme-name = Adwaita
gtk-icon-theme-name = ~a
gtk-font-name = Sans
gtk-font-name = ~a
gtk-cursor-theme-name = ~a
gtk-cursor-theme-size = ~a
gtk-key-theme-name = ~a~%"
icon-theme cursor-theme cursor-size key-theme))))))
icon-theme font cursor-theme cursor-size key-theme))))))
(define home-theme-service-type
(service-type

View File

@ -15,7 +15,10 @@
(define* (go-mod-vendor #:key go)
(lambda* (src hash-algo hash #:optional name #:key (system (%current-system)))
(define nss-certs
(module-ref (resolve-interface '(gnu packages certs)) 'nss-certs))
(or (false-if-exception
(module-ref (resolve-interface '(gnu packages nss)) 'nss-certs))
(false-if-exception
(module-ref (resolve-interface '(gnu packages certs)) 'nss-certs))))
(gexp->derivation
(or name "vendored-go-dependencies")
@ -28,6 +31,8 @@
;; For HTTPS support.
(setenv "SSL_CERT_DIR" #+(file-append nss-certs "/etc/ssl/certs"))
(setenv "GOTOOLCHAIN" "local")
((assoc-ref %standard-phases 'unpack) #:source #+src)
(invoke #+(file-append go "/bin/go") "mod" "vendor")
(copy-recursively "vendor" #$output)))