Compare commits

..

2 Commits

Author SHA1 Message Date
Hilton Chain
91505ef7ef
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-12 22:23:38 +08:00
Hilton Chain
68cb5b37f8
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-12 22:23:36 +08:00
4 changed files with 18 additions and 24 deletions

View File

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

View File

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

View File

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

View File

@ -15,10 +15,7 @@
(define* (go-mod-vendor #:key go) (define* (go-mod-vendor #:key go)
(lambda* (src hash-algo hash #:optional name #:key (system (%current-system))) (lambda* (src hash-algo hash #:optional name #:key (system (%current-system)))
(define nss-certs (define nss-certs
(or (false-if-exception (module-ref (resolve-interface '(gnu packages certs)) 'nss-certs))
(module-ref (resolve-interface '(gnu packages nss)) 'nss-certs))
(false-if-exception
(module-ref (resolve-interface '(gnu packages certs)) 'nss-certs))))
(gexp->derivation (gexp->derivation
(or name "vendored-go-dependencies") (or name "vendored-go-dependencies")