Compare commits

..

29 Commits

Author SHA1 Message Date
Hilton Chain
9d95263fcf
rosenthal: caddy/dolly: Update to 2026.03.29-1.
* modules/rosenthal/packages/web.scm (caddy/dolly): Update to 2026.03.29-1.
[native-inputs]: Update vendored-go-dependencies.
Use go-1.26.
2026-03-29 21:21:05 +08:00
Hilton Chain
2f044f37a1
rosenthal: forgejo: Update to 14.0.3.
* modules/rosenthal/packages/web.scm (forgejo): Update to 14.0.3.
[arguments]: Use go-1.26.
2026-03-29 18:59:24 +08:00
Hilton Chain
70963cef82
rosenthal: anubis-anti-crawler: Update to 1.25.0.
* modules/rosenthal/packages/web.scm (anubis-anti-crawler): Update to 1.25.0.
[arguments]: Use go-1.26.
2026-03-29 16:31:41 +08:00
Hilton Chain
486b0e6b8c
rosenthal: dnsmasq-china-list: Update to 0.0.0-21.7da1a5a.
* modules/rosenthal/packages/dns.scm (dnsmasq-china-list): Update to
0.0.0-21.7da1a5a.
2026-03-29 16:31:41 +08:00
Hilton Chain
7f328d7e5e
rosenthal: grafana-bin: Update to 12.4.2.
* modules/rosenthal/packages/binaries.scm (grafana-bin): Update to 12.4.2.
[arguments]: Add a basic check phase.
2026-03-29 16:31:39 +08:00
Hilton Chain
00e9db6dec
rosenthal: mimir-bin: Update to 3.0.4.
* modules/rosenthal/packages/binaries.scm (mimir-bin): Update to 3.0.4.
[arguments]: Add a basic check phase.
2026-03-29 16:18:51 +08:00
Hilton Chain
c548c1425f
rosenthal: tuwunel-bin: Update to 1.5.1.
* modules/rosenthal/packages/binaries.scm (tuwunel-bin): Update to 1.5.1.
[arguments]: Add a basic check phase.
2026-03-29 16:18:47 +08:00
Hilton Chain
90dff49155
rosenthal: ai-robots-txt: Update to 1.45.
* modules/rosenthal/packages/web.scm (ai-robots-txt): Update to 1.45.
2026-03-29 15:56:35 +08:00
Hilton Chain
e9be75c6d9
rosenthal: cloudflared: Update to 2026.3.0.
* modules/rosenthal/packages/networking.scm (cloudflared): Update to 2026.3.0.
2026-03-29 15:56:35 +08:00
Hilton Chain
fe7df07124
rosenthal: ukify: Update to 260.1.
* modules/rosenthal/packages/bootloaders.scm (ukify): Update to 260.1.
2026-03-29 15:56:35 +08:00
Hilton Chain
11a6d50676
rosenthal: systemd-stub: Update to 260.1.
* modules/rosenthal/packages/bootloaders.scm (systemd-stub): Update to 260.1.
2026-03-29 15:56:35 +08:00
Hilton Chain
a718f60689
rosenthal: limine: Update to 11.1.0.
* modules/rosenthal/packages/bootloaders.scm (limine): Update to 11.1.0.
2026-03-29 15:56:34 +08:00
Hilton Chain
77a32bb8a9
rosenthal: alloy-bin: Update to 1.14.2.
* modules/rosenthal/packages/binaries.scm (%alloy-source-x86_64-linux)
(%alloy-source-aarch64-linux): Update to 1.14.2.
2026-03-29 15:56:34 +08:00
Hilton Chain
c74f493dc4
rosenthal: loki-bin: Update to 3.7.1.
* modules/rosenthal/packages/binaries.scm (loki-bin): Update to 3.7.1.
2026-03-29 15:56:34 +08:00
Hilton Chain
6c68775645
rosenthal: prometheus-bin: Update to 3.10.0.
* modules/rosenthal/packages/binaries.scm (prometheus-bin): Update to 3.10.0.
2026-03-29 15:56:34 +08:00
Hilton Chain
ffd46b111e
rosenthal: wakatime-cli-bin: Update to 2.0.0.
* modules/rosenthal/packages/binaries.scm (wakatime-cli-bin): Update to 2.0.0.
2026-03-29 15:56:34 +08:00
Hilton Chain
151590cd8a
rosenthal: wakapi-bin: Update to 2.17.2.
* modules/rosenthal/packages/binaries.scm (wakapi-bin): Update to 2.17.2.
2026-03-29 15:56:34 +08:00
Hilton Chain
537a7bd808
rosenthal: komga-bin: Update to 1.24.3.
* modules/rosenthal/packages/binaries.scm (komga-bin): Update to 1.24.3.
2026-03-29 15:56:34 +08:00
Hilton Chain
7102af4ea6
rosenthal: dinit: Update to 0.21.0.
* modules/rosenthal/packages/admin.scm (dinit): Update to 0.21.0.
2026-03-29 15:56:34 +08:00
Hilton Chain
df562fa016
rosenthal: sops: Update to 3.12.2.
* modules/rosenthal/packages/password-utils.scm (sops): Update to 3.12.2.
[arguments]: Use go-1.26.
[native-inputs]: Update vendored-go-dependencies.
2026-03-29 15:56:33 +08:00
Hilton Chain
8f44724051
rosenthal: caddy: Update to 2.11.2.
* modules/rosenthal/packages/web.scm (caddy): Update to 2.11.2.
[arguments]: Use go-1.26.
[native-inputs]: Update vendored-go-dependencies.
2026-03-29 15:56:33 +08:00
Hilton Chain
08c50357d9
rosenthal: tailscale: Update to 1.96.4.
* modules/rosenthal/packages/networking.scm (tailscale): Update to 1.96.4.
[native-inputs]: Update vendored-go-dependencies.
[inputs]: Add desktop-file-utils.
[arguments]: Patch its references.
Use go-1.26.
2026-03-29 15:56:32 +08:00
Hilton Chain
889a4a3683
rosenthal: sing-box: Update to 1.13.4.
* modules/rosenthal/packages/networking.scm (sing-box): Update to 1.13.4.
[arguments]: Use go-1.26.
[native-inputs]: Update vendored-go-dependencies.
2026-03-29 15:42:46 +08:00
Hilton Chain
b0854202ae
rosenthal: mihomo: Update to 1.19.21.
* modules/rosenthal/packages/networking.scm (mihomo): Update to 1.19.21.
[arguments]: Use go-1.26.
[native-inputs]: Update vendored-go-dependencies.
2026-03-29 15:42:46 +08:00
Hilton Chain
de83ac7d58
rosenthal: noctalia-shell: Update to 4.7.1.
* modules/rosenthal/packages/wm.scm (noctalia-shell): Update to 4.7.1.
2026-03-29 15:42:46 +08:00
Hilton Chain
5adf855943
rosenthal: noctalia-qs: Update to 0.0.10.
* modules/rosenthal/packages/wm.scm (noctalia-qs): Update to 0.0.10.
2026-03-29 15:42:42 +08:00
Hilton Chain
7dc52aa59b
rosenthal: Disable updater for a few packages. 2026-03-29 14:09:37 +08:00
Hilton Chain
eef03fcfec
rosenthal: Add emacs-magit-delta/dolly.
* modules/rosenthal/packages/emacs-xyz.scm (emacs-magit-delta/dolly): New variable.
2026-03-29 14:09:36 +08:00
Hilton Chain
760c336362
services: zfs: Improve style. 2026-03-29 14:09:35 +08:00
11 changed files with 194 additions and 143 deletions

View File

@ -24,7 +24,7 @@
(define-public dinit (define-public dinit
(package (package
(name "dinit") (name "dinit")
(version "0.20.0") (version "0.21.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -33,7 +33,7 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bs61i08fnlmpkbz189ks1ljj0569avb51b22fk27mm99msmdjgy")))) (base32 "0fs0sv9pkplwl27bar8ng2b7idpp1bnrmxnf1jkwdigq1ll2xsyw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags

View File

@ -142,7 +142,7 @@ host Matrix for your family, friends or company.")
(define-public tuwunel-bin (define-public tuwunel-bin
(package (package
(name "tuwunel-bin") (name "tuwunel-bin")
(version "1.5.0") (version "1.5.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -152,10 +152,11 @@ host Matrix for your family, friends or company.")
(file-name (string-append name "-" version ".zst")) (file-name (string-append name "-" version ".zst"))
(sha256 (sha256
(base32 (base32
"0d2fmpsisnzqgrx0sq6zrn31jvdisnm6jb2q6qcc39z4jdllwhrb")))) "00kpapzd7alm3g34ijfhwszc1x1ddd4ykcyk8ah73gmyc2lq8gys"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:tests? (not (%current-target-system))
#:install-plan
#~'((#$(format #f "~a-~a" #~'((#$(format #f "~a-~a"
(package-name this-package) (package-name this-package)
(package-version this-package)) (package-version this-package))
@ -164,7 +165,13 @@ host Matrix for your family, friends or company.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'fix-permission (add-after 'install 'fix-permission
(lambda _ (lambda _
(chmod (string-append #$output "/bin/tuwunel") #o555)))))) (chmod (string-append #$output "/bin/tuwunel") #o555)))
(add-after 'fix-permission 'check
(lambda* (#:key tests? outputs #:allow-other-keys)
(let ((tuwunel (search-input-file outputs "bin/tuwunel")))
(when tests?
(invoke tuwunel "--help")
(invoke tuwunel "--version"))))))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(synopsis "Matrix homeserver") (synopsis "Matrix homeserver")
(description (description
@ -180,7 +187,7 @@ the most niche uses.")
(define-public komga-bin (define-public komga-bin
(package (package
(name "komga-bin") (name "komga-bin")
(version "1.24.1") (version "1.24.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -188,7 +195,7 @@ the most niche uses.")
"/komga-" version ".jar")) "/komga-" version ".jar"))
(sha256 (sha256
(base32 (base32
"085jh6fi29yayr15zl4wmarx893bmhi3dsdwsvpnq5y5x89nq65g")))) "16ms8rfr5qqi375qsgl1392jnmxb3bjbcl4p0n59nq6hpx37dipq"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -286,7 +293,7 @@ monster-in-the-middle}.")
(define-public wakapi-bin (define-public wakapi-bin
(package (package
(name "wakapi-bin") (name "wakapi-bin")
(version "2.17.1") (version "2.17.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -294,7 +301,7 @@ monster-in-the-middle}.")
version "/wakapi_linux_amd64.zip")) version "/wakapi_linux_amd64.zip"))
(sha256 (sha256
(base32 (base32
"0gb75wlip98187wc933p1cabsghh9w6lrh87nk3f2nhy86i2b5m7")))) "1x51a9jhnhzanbgb713f0j8rnj4sgcdpghzhifvncj8hz6w4i8sy"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (list #:install-plan #~'(("wakapi" "bin/wakapi")))) (arguments (list #:install-plan #~'(("wakapi" "bin/wakapi"))))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
@ -310,7 +317,7 @@ coding statistics.")
(define-public wakatime-cli-bin (define-public wakatime-cli-bin
(package (package
(name "wakatime-cli-bin") (name "wakatime-cli-bin")
(version "1.139.1") (version "2.0.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/wakatime/wakatime-cli" (uri (string-append "https://github.com/wakatime/wakatime-cli"
@ -318,7 +325,7 @@ coding statistics.")
"/wakatime-cli-linux-amd64.zip")) "/wakatime-cli-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"11jl7riqnn7c4bphrxc19x8gw2x87a9ymp2qkdil2syk24gfrjw6")))) "1ci4gjhxyn05amq0dx34ck2q0zpv43x1qq3rhkwx02wk3ny5mn0i"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -336,21 +343,30 @@ to WakaTime, which is used by all WakaTime text editor plugins.")
(define-public grafana-bin (define-public grafana-bin
(package (package
(name "grafana-bin") (name "grafana-bin")
(version "12.1.1") (version "12.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.grafana.com/grafana/release/" (uri (string-append "https://dl.grafana.com/grafana/release/"
version "/grafana_" version "_" "16903967602" version "/grafana_" version "_"
"_linux_amd64.tar.gz")) "23531306697_linux_amd64.tar.gz"))
(sha256 (sha256
(base32 (base32
"056jj4ww1l36y77v9qmqhgsg7lsr328bhp7y48c6l125cal1snl2")))) "07sr78wi5nqlsx1nfj87bzgq29hcflqm6r5f5xcn9gq3m00b4h7j"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:tests? (not (%current-target-system))
#:install-plan
#~'(("bin" "bin") #~'(("bin" "bin")
("conf" "share/grafana/") ("conf" "share/grafana/")
("public" "share/grafana/")))) ("public" "share/grafana/"))
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'check
(lambda* (#:key tests? outputs #:allow-other-keys)
(let ((cmd (search-input-file outputs "bin/grafana")))
(when tests?
(invoke cmd "--help")
(invoke cmd "--version"))))))))
(synopsis "Platform for monitoring and observability") (synopsis "Platform for monitoring and observability")
(description (description
"Grafana allows you to query, visualize, alert on and understand your "Grafana allows you to query, visualize, alert on and understand your
@ -364,7 +380,7 @@ metrics no matter where they are stored.")
(define-public prometheus-bin (define-public prometheus-bin
(package (package
(name "prometheus-bin") (name "prometheus-bin")
(version "3.9.1") (version "3.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/prometheus/prometheus" (uri (string-append "https://github.com/prometheus/prometheus"
@ -372,7 +388,7 @@ metrics no matter where they are stored.")
"/prometheus-" version ".linux-amd64.tar.gz")) "/prometheus-" version ".linux-amd64.tar.gz"))
(sha256 (sha256
(base32 (base32
"116569xwfma38j7wbdz7r3hlnk9iz9ycg4yymjadkjxassfrk9l6")))) "08h1d7whb85vp28r1nlkrilyws6cs1hzxlw9zhiic63apfbhvia1"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -393,7 +409,7 @@ observed.")
(define-public mimir-bin (define-public mimir-bin
(package (package
(name "mimir-bin") (name "mimir-bin")
(version "2.17.1") (version "3.0.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -401,10 +417,11 @@ observed.")
version "/mimir-linux-amd64")) version "/mimir-linux-amd64"))
(sha256 (sha256
(base32 (base32
"1vnrpzwyjz7plzdiih65853ndvg64a9n1x1i7jqr085byhpayp82")))) "09bhfbax659p1svzk8gq37vckqd62xsr219ab8f4r36c74ml3vz8"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:phases (list #:tests? (not (%current-target-system))
#:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'install (replace 'install
(lambda* (#:key source #:allow-other-keys) (lambda* (#:key source #:allow-other-keys)
@ -413,7 +430,12 @@ observed.")
(mkdir-p dest) (mkdir-p dest)
(with-directory-excursion dest (with-directory-excursion dest
(copy-file source name) (copy-file source name)
(chmod name #o555)))))))) (chmod name #o555)))))
(add-after 'install 'check
(lambda* (#:key tests? outputs #:allow-other-keys)
(let ((cmd (search-input-file outputs "bin/mimir")))
(when tests?
(invoke cmd "-version"))))))))
(synopsis "Scalable long-term storage for Prometheus") (synopsis "Scalable long-term storage for Prometheus")
(description (description
"Grafana Mimir provides horizontally scalable, highly available, "Grafana Mimir provides horizontally scalable, highly available,
@ -427,7 +449,7 @@ multi-tenant, long-term storage for Prometheus.")
(define-public loki-bin (define-public loki-bin
(package (package
(name "loki-bin") (name "loki-bin")
(version "3.6.7") (version "3.7.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -435,7 +457,7 @@ multi-tenant, long-term storage for Prometheus.")
version "/loki-linux-amd64.zip")) version "/loki-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"1b5ia3nhfphnh79nn4qvrz0hhnbsl6bs347dghgkii0vqwip0wz9")))) "0w5aarm1vbyn2l2mzqbd90g1azqq5y1swwkvj57bgm95lrips0pg"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan
@ -461,7 +483,7 @@ rather a set of labels for each log stream.")
(package (package
(inherit %binary-source) (inherit %binary-source)
(name "alloy") (name "alloy")
(version "1.13.2") (version "1.14.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -469,13 +491,13 @@ rather a set of labels for each log stream.")
version "/alloy-linux-amd64.zip")) version "/alloy-linux-amd64.zip"))
(sha256 (sha256
(base32 (base32
"1q3hnq8ndbcjhqnz31aikz3h8x71sqak1ybf3bix4180v226l9bg")))))) "1srvmqmbll7c4pmn9v0pas7r8kp0vlq494pxmf411p6l3nzm100v"))))))
(define-public %alloy-source-aarch64-linux (define-public %alloy-source-aarch64-linux
(package (package
(inherit %binary-source) (inherit %binary-source)
(name "alloy") (name "alloy")
(version "1.13.2") (version "1.14.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -483,7 +505,7 @@ rather a set of labels for each log stream.")
version "/alloy-linux-arm64.zip")) version "/alloy-linux-arm64.zip"))
(sha256 (sha256
(base32 (base32
"0iyns3xm3s6ch6xxgbwmvzkzisqic8d5zqh34l5fa015w2qndrmx")))))) "107fpppibyqv4cmgpqpczj70yfqvwwwhvkqrxbh8c2a5qw76m1rk"))))))
(define-public alloy-bin (define-public alloy-bin
(binary-package (binary-package

View File

@ -39,7 +39,7 @@
(define-public limine (define-public limine
(package (package
(name "limine") (name "limine")
(version "10.8.2") (version "11.1.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -47,7 +47,7 @@
version "/limine-" version ".tar.xz")) version "/limine-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1y7qi39ryy8gwv25n0wv68dy1q1gzh0syn4z3psfrl7px98m5ikd")))) "02940hw882h0hflvkkjaxbcf715kqa6rikx4i2d11vg2qy8i53mm"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
@ -84,7 +84,8 @@
(description (description
"Limine is a multiprotocol bootloader and boot manager. It's also used as "Limine is a multiprotocol bootloader and boot manager. It's also used as
the reference implementation for the Limine boot protocol.") the reference implementation for the Limine boot protocol.")
(license license:bsd-2))) (license license:bsd-2)
(properties '((disable-updater? . #t)))))
;;; ;;;
@ -102,7 +103,7 @@ the reference implementation for the Limine boot protocol.")
(define-public systemd-stub (define-public systemd-stub
(package (package
(name "systemd-stub") (name "systemd-stub")
(version "259.1") (version "260.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -111,7 +112,7 @@ the reference implementation for the Limine boot protocol.")
(file-name (git-file-name "name" version)) (file-name (git-file-name "name" version))
(sha256 (sha256
(base32 (base32
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj")))) "1az9sswsyfyw7m4if1mmxyamw8xnb0i3gg1bng4c9kz3bgga6hhm"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
@ -145,7 +146,7 @@ Supports measured and/or verified boot environments.")
(define-public ukify (define-public ukify
(package (package
(name "ukify") (name "ukify")
(version "259.1") (version "260.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -154,7 +155,7 @@ Supports measured and/or verified boot environments.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj")))) "1az9sswsyfyw7m4if1mmxyamw8xnb0i3gg1bng4c9kz3bgga6hhm"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases (list #:phases

View File

@ -13,11 +13,11 @@
(define-public dnsmasq-china-list (define-public dnsmasq-china-list
;; No version. ;; No version.
(let ((commit "1a4d9fce63c44e80c2d6d790d7501e6103caf8da") (let ((commit "7da1a5a5885c3f19dd000aa76a25e457352dd696")
(revision "20")) (revision "21"))
(package (package
(name "dnsmasq-china-list") (name "dnsmasq-china-list")
(version (git-version "0" revision commit)) (version (git-version "0.0.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -26,7 +26,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wy3p9fimzvbv6jrcyi2s89cvz2v7b3h61gfj93kn2wmpli6apyp")))) "04dgra5123k94k0q1v9f7rmk3zdzc429hkr6jvn1lx4cxfcs0zfq"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list #:install-plan (list #:install-plan

View File

@ -37,7 +37,8 @@
((#:lisp-directory _ #f) "lisp"))) ((#:lisp-directory _ #f) "lisp")))
(propagated-inputs (propagated-inputs
(modify-inputs propagated-inputs (modify-inputs propagated-inputs
(prepend emacs-consult)))))) (prepend emacs-consult)))
(properties '((disable-updater? . #t))))))
(define-public emacs-caddyfile-mode (define-public emacs-caddyfile-mode
(let ((commit "fc41148f5a7eb320f070666f046fb9d88cf17680") (let ((commit "fc41148f5a7eb320f070666f046fb9d88cf17680")
@ -105,7 +106,8 @@ minibuffer. This allows editing the search string in arbitrary ways without any
special maneuver. Unlike standard @code{isearch}, cursor motion commands do not special maneuver. Unlike standard @code{isearch}, cursor motion commands do not
end the search. Moreover, the search status information in the echo area and end the search. Moreover, the search status information in the echo area and
some keybindings are slightly simplified.") some keybindings are slightly simplified.")
(license license:gpl3+))) (license license:gpl3+)
(properties '((disable-updater? . #t)))))
(define-public emacs-kdl-mode (define-public emacs-kdl-mode
(let ((commit "2d849e298199f490e4894c01764a8a83decd704a") (let ((commit "2d849e298199f490e4894c01764a8a83decd704a")
@ -130,6 +132,19 @@ some keybindings are slightly simplified.")
(license license:gpl3+) (license license:gpl3+)
(properties '((disable-updater? . #t)))))) (properties '((disable-updater? . #t))))))
(define-public emacs-magit-delta/dolly
(package
(inherit
(package-with-extra-patches emacs-magit-delta
(list (origin
(method url-fetch)
(uri "https://github.com/dandavison/magit-delta/pull/34.patch")
(sha256
(base32
"1ipqvrszh6fp9d9g3grk4mbh762knhn0zp3jhww0mkib73f3p0sy"))))))
(name "emacs-magit-delta-dolly")
(properties '((disable-updater? . #t)))))
(define-public emacs-pcmpl-tailscale (define-public emacs-pcmpl-tailscale
(let ((commit "acd6bce54af506b0450cf6aa1068f63d4e25c8ce") (let ((commit "acd6bce54af506b0450cf6aa1068f63d4e25c8ce")
(revision "0")) (revision "0"))

View File

@ -44,4 +44,5 @@
(home-page "https://github.com/hylophile/guile-toml") (home-page "https://github.com/hylophile/guile-toml")
(synopsis "TOML module for GNU Guile") (synopsis "TOML module for GNU Guile")
(description "") (description "")
(license license:gpl3+)))) (license license:gpl3+)
(properties '((disable-updater? . #t))))))

View File

@ -15,6 +15,7 @@
;; Guix packages ;; Guix packages
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages dns) #:use-module (gnu packages dns)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages linux)) #:use-module (gnu packages linux))
@ -22,7 +23,7 @@
(define-public cloudflared (define-public cloudflared
(package (package
(name "cloudflared") (name "cloudflared")
(version "2026.2.0") (version "2026.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -34,7 +35,7 @@
;; (snippet '(delete-file-recursively "vendor")) ;; (snippet '(delete-file-recursively "vendor"))
(sha256 (sha256
(base32 (base32
"17cvbkxrs1768r48iczxq75kr698cys0dymdbbhs9p1c75m0b0si")))) "1j71qzxg50kn2hnxrfgny9n6clm45sg9pz1y96z50w48jxjvlrx0"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.24 (list #:go go-1.24
@ -73,7 +74,7 @@ origin can remain as closed as possible.")
(define-public mihomo (define-public mihomo
(package (package
(name "mihomo") (name "mihomo")
(version "1.19.20") (version "1.19.21")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -82,12 +83,12 @@ 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
"1gkp2ssnyci5klk5q56p32kpbbamzk3y49nh24s7122s576bqmf3")))) "1qa6fw3axnas39ri0qmy54rvyk3xbpnmv3iss21wrhjvnlcagmdw"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
#:tests? (not (%current-target-system)) ;TODO: Run test suite. #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:go go-1.23 #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "." #:import-path "."
#:build-flags #:build-flags
@ -122,12 +123,12 @@ origin can remain as closed as possible.")
(native-inputs (native-inputs
(append (append
(list (origin (list (origin
(method (go-mod-vendor #:go go-1.23)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"14vmch6l9carq395p269c5gg5hxbyv6i9my47s50j6ki029x9c9j")))) "15452bapz7jwi9gawww9kyszbj2pfdy50xg5zcs2rjrjkh5aygya"))))
(if (%current-target-system) (if (%current-target-system)
(list this-package) (list this-package)
'()))) '())))
@ -143,7 +144,7 @@ bypass network restrictions." )
(define-public sing-box (define-public sing-box
(package (package
(name "sing-box") (name "sing-box")
(version "1.12.22") (version "1.13.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -152,12 +153,12 @@ bypass network restrictions." )
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0wr97myxdskqlh1mrpn0rnnvdkifaqnm420j3y6hbk9rf4ijzf3l")))) "0ihs7n4hnmn6karrwlp6j6aqirm56zpnfzf6mpl5m42ph204dvg2"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
#:tests? (not (%current-target-system)) ;TODO: Run test suite. #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:go go-1.23 #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "./cmd/sing-box" #:import-path "./cmd/sing-box"
#:build-flags #:build-flags
@ -215,12 +216,12 @@ bypass network restrictions." )
(native-inputs (native-inputs
(append (append
(list (origin (list (origin
(method (go-mod-vendor #:go go-1.23)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"0h3m4rfkwdcm22f8vbdl3idki46nxfmynagvy7s00lycylz1f809")))) "1j8f1b8sx5r7azniqypqz6sqm1hpadxlg1rrkgss8xzh6p0h5y4r"))))
(if (%current-target-system) (if (%current-target-system)
(list this-package) (list this-package)
'()))) '())))
@ -261,7 +262,7 @@ a SOCKS5 proxy.")
(define-public tailscale (define-public tailscale
(package (package
(name "tailscale") (name "tailscale")
(version "1.94.1") (version "1.96.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -270,7 +271,7 @@ a SOCKS5 proxy.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0n5k8adplcffjwlpiy35nrklc0sf9ms18zlilcis5g1s3kdh4klf")) "0qqlj6cq43h0pr8jg9g956yz5xgg81959vq2kl7n9yqnixyh8w2n"))
(patches (patches
(rosenthal-patches (rosenthal-patches
"tailscale-set-guix-system-PATH-for-SSH.patch")) "tailscale-set-guix-system-PATH-for-SSH.patch"))
@ -284,7 +285,7 @@ a SOCKS5 proxy.")
(arguments (arguments
(list (list
#:tests? (not (%current-target-system)) ;TODO: Run test suite. #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:go go-1.25 #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "." #:import-path "."
#:build-flags #:build-flags
@ -311,6 +312,11 @@ a SOCKS5 proxy.")
"vendor"))) "vendor")))
(replace 'install-license-files (replace 'install-license-files
(assoc-ref gnu:%standard-phases 'install-license-files)) (assoc-ref gnu:%standard-phases 'install-license-files))
(add-after 'unpack 'patch-references
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "client/systray/startup-creator.go"
(("desktop-file-(install|edit)" all)
(search-input-file inputs (in-vicinity "bin" all))))))
(replace 'build (replace 'build
(lambda* (#:key build-flags parallel-build? #:allow-other-keys) (lambda* (#:key build-flags parallel-build? #:allow-other-keys)
(let* ((njobs (if parallel-build? (parallel-job-count) 1))) (let* ((njobs (if parallel-build? (parallel-job-count) 1)))
@ -370,17 +376,24 @@ a SOCKS5 proxy.")
(native-inputs (native-inputs
(append (append
(list (origin (list (origin
(method (go-mod-vendor #:go go-1.25)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"04zzwizns5a5wvwpa1a82jg0l641fnk3schffrpqi3qi84x17qsr")))) "1kj1q82n62x5dx4s9ivnnqi5c711pwyfic0kaykdn2ky8c89c6xf"))))
(if (%current-target-system) (if (%current-target-system)
(list this-package) (list this-package)
'()))) '())))
(inputs (inputs
(list findutils glibc iproute iptables-nft kmod openresolv procps)) (list desktop-file-utils
findutils
glibc
iproute
iptables-nft
kmod
openresolv
procps))
(home-page "https://tailscale.com/") (home-page "https://tailscale.com/")
(synopsis "Mesh VPN service utilizing the WireGuard protocol and 2FA") (synopsis "Mesh VPN service utilizing the WireGuard protocol and 2FA")
(description (description

View File

@ -19,7 +19,7 @@
(define-public sops (define-public sops
(package (package
(name "sops") (name "sops")
(version "3.12.1") (version "3.12.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -28,10 +28,10 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1z3m1smcbyshrfw2h2rmnvy9pcwjv7q9hd79kffnf4qxzsp3m4zb")))) "01w67iv0v9hnxgaklixk871dwnhyhllm3zz36iiwqsd19d5rllfm"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.24 (list #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "./cmd/sops" #:import-path "./cmd/sops"
#:build-flags #:build-flags
@ -56,12 +56,12 @@
(assoc-ref gnu:%standard-phases 'install-license-files))))) (assoc-ref gnu:%standard-phases 'install-license-files)))))
(native-inputs (native-inputs
(list (origin (list (origin
(method (go-mod-vendor #:go go-1.24)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"04gnkz3w1ckxq1dccwvwrbar30nc79b8rbj0smsmvc6g9x99ay3n"))))) "1gd5kpiqizrab7fbhzhwj5lm1b6wmpvwpvnrwwz0xkfn6hqwj1qy")))))
(home-page "https://getsops.io/") (home-page "https://getsops.io/")
(synopsis "Simple and flexible tool for managing secrets") (synopsis "Simple and flexible tool for managing secrets")
(description (description

View File

@ -26,7 +26,7 @@
(define-public ai-robots-txt (define-public ai-robots-txt
(package (package
(name "ai-robots-txt") (name "ai-robots-txt")
(version "1.44") (version "1.45")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -35,7 +35,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14jfkymkrs51xkgf48rin01kcfmk043zkdyzfhb459fv3brxms50")) "0j2nwf6i2fhlhkcqfqnzyiy2x6m974s59yrcy5y4nar5lij6q10z"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(delete-file-recursively "code")))) (snippet '(delete-file-recursively "code"))))
(build-system copy-build-system) (build-system copy-build-system)
@ -57,7 +57,7 @@ website owners block unwanted AI crawlers from accessing their sites.")
(define-public anubis-anti-crawler (define-public anubis-anti-crawler
(package (package
(name "anubis-anti-crawler") (name "anubis-anti-crawler")
(version "1.21.1") (version "1.25.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -65,11 +65,11 @@ website owners block unwanted AI crawlers from accessing their sites.")
version "/anubis-src-vendor-npm-" version ".tar.gz")) version "/anubis-src-vendor-npm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1anjymg7mwjc8j0gn2gn1wb15iiljm68p15n77y5jg3av8wnky5g")))) "0kqp5j0739lpdw55gx4bnnda1b90qlavcdlp8vh9bp014xx84yqj"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:tests? (not (%current-target-system)) ;FIXME (list #:tests? (not (%current-target-system)) ;FIXME
#:go go-1.24 #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "./cmd/anubis" #:import-path "./cmd/anubis"
#:build-flags #:build-flags
@ -102,13 +102,12 @@ website owners block unwanted AI crawlers from accessing their sites.")
"Anubis checks incoming HTTP requests using one or more challenges in "Anubis checks incoming HTTP requests using one or more challenges in
order to protect upstream resources from web crawlers.") order to protect upstream resources from web crawlers.")
(license license:expat) (license license:expat)
(properties '((upstream-name . "anubis") (properties '((upstream-name . "anubis")))))
(disable-updater? . #t)))))
(define-public caddy (define-public caddy
(package (package
(name "caddy") (name "caddy")
(version "2.11.1") (version "2.11.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -117,10 +116,10 @@ order to protect upstream resources from web crawlers.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1j3f123wv2a7vn944av2maxa74z9qldl2fy9l4mxdardsfhx3nzh")))) "12r6pm6kw23bqa4gkkb85mj7zhw77j0j2w2m1cp28sb1x7rsm0a2"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.25 (list #:go go-1.26
#:tests? (not (%current-target-system)) ;TODO: Run test suite. #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:install-source? #f #:install-source? #f
#:import-path #:import-path
@ -176,12 +175,12 @@ order to protect upstream resources from web crawlers.")
(invoke caddy "version")))))))) (invoke caddy "version"))))))))
(native-inputs (native-inputs
(list (origin (list (origin
(method (go-mod-vendor #:go go-1.25)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"18zb1faw42pmsqfb1ffpk10wnsvby84sv5vs2b2xcya10p2fi7wd"))))) "1raa53ry78zsxsp81psl60z5rbx9y36gdkayh7dmdlrb460iap6f")))))
(home-page "https://caddyserver.com/") (home-page "https://caddyserver.com/")
(synopsis "Extensible HTTP web server with automatic HTTPS") (synopsis "Extensible HTTP web server with automatic HTTPS")
(description (description
@ -196,7 +195,7 @@ 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 "2026.03.29-1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -205,24 +204,24 @@ 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
"172kg8ycfba008brh1n8484hgwm60yq4i0gzv37qi83d3795s71d")))) "04klhf0plnzldn894c8z5g8v3bmh342pgaq97cslvh6cjm3dwisd"))))
(native-inputs (native-inputs
(modify-inputs native-inputs (modify-inputs native-inputs
(replace "vendored-go-dependencies" (replace "vendored-go-dependencies"
(origin (origin
(method (go-mod-vendor #:go go-1.25)) (method (go-mod-vendor #:go go-1.26))
(uri (package-source this-package)) (uri (package-source this-package))
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb")))))) "0zjp5i2si8qkww8632rxhd4y1y39bycn111pydm70n02q3jwir27"))))))
(home-page "https://git.guix.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
(package (package
(name "forgejo") (name "forgejo")
(version "12.0.3") (version "14.0.3")
;; TODO: Address npm dependencies and fetch from git. ;; TODO: Address npm dependencies and fetch from git.
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -231,11 +230,11 @@ from serving static websites to running dynamic web applications.")
version "/forgejo-src-" version ".tar.gz")) version "/forgejo-src-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0x09nwhps70n8rkvgp7mqzr7cyprdn274q7jhkljxna3r3w8qcb5")))) "1j68clndn10gsv4v3xxrk5d8npriaj4af2gm4lg3nvd258zhyhcq"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:tests? (not (%current-target-system)) ;TODO: Run test suite. (list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
#:go go-1.25 #:go go-1.26
#:install-source? #f #:install-source? #f
#:import-path "." #:import-path "."
#:build-flags #:build-flags

View File

@ -40,7 +40,7 @@
(define-public noctalia-shell (define-public noctalia-shell
(package (package
(name "noctalia-shell") (name "noctalia-shell")
(version "4.7.0") (version "4.7.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -49,7 +49,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qylp37xrb71c3a5fr55a5zr7ibb4nd87jkdw01l54ij15jrdqxd")))) "0q9p9jl0iixf20bgwlray59rywgw4c1xq1pkp57zbbg0d1acr647"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list (list
@ -156,7 +156,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
(package (package
(inherit quickshell) (inherit quickshell)
(name "noctalia-qs") (name "noctalia-qs")
(version "0.0.8") (version "0.0.10")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -165,7 +165,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0pyakmaq2bwdhnnqnrsqm9g1mjf5spij6hsvmlw058kxj8xkbbd4")))) (base32 "1zly09mdpsqv220q5bi6vg70a6h2bpmd3f0badv2wzn1v1h19ixn"))))
(inputs (inputs
(modify-inputs inputs (modify-inputs inputs
(prepend glib polkit))) (prepend glib polkit)))

View File

@ -112,13 +112,13 @@
"ZFS package to use.") "ZFS package to use.")
(kernel-has-zfs-module? (kernel-has-zfs-module?
(boolean #f) (boolean #f)
"Whether or not ZFS modules have already been built into the kernel.") "Whether ZFS module has already been built into the kernel.")
(volumes? (volumes?
(boolean #f) (boolean #f)
"Wait for ZFS volumes.") "Wait for ZFS volumes to show up.")
(auto-mount? (auto-mount?
(boolean #t) (boolean #t)
"Mount all available ZFS file systems.")) "Auto-mount ZFS datasets."))
(define zfs-linux-loadable-module-service (define zfs-linux-loadable-module-service
(match-record-lambda <zfs-configuration> (match-record-lambda <zfs-configuration>
@ -135,51 +135,53 @@
(define zfs-shepherd-service (define zfs-shepherd-service
(match-record-lambda <zfs-configuration> (match-record-lambda <zfs-configuration>
(zfs volumes? auto-mount?) (zfs volumes? auto-mount?)
(append `(,(shepherd-service
(list (provision '(zfs-import))
(shepherd-service (requirement '(udev))
(provision '(file-system-zfs)) (documentation "Import ZFS storage pools.")
(requirement (start
`(zfs-import #~(make-system-constructor
,@(if volumes? '(zfs-volumes) '()) (string-join
,@(if auto-mount? '(zfs-mount) '()))) (list #$(file-append zfs "/sbin/zpool") "import" "-a" "-N"))))
(start #~(const #t)) (stop #~(const #f)))
(stop #~(const #f))) ,@(if volumes?
(shepherd-service (list
(provision '(zfs-import)) (shepherd-service
(requirement '(kernel-module-loader)) (provision '(zfs-volumes))
(start (requirement '(zfs-import))
#~(make-system-constructor (documentation "Wait for ZFS volume links to appear in /dev.")
(string-join (start
(list #$(file-append zfs "/sbin/zpool") "import" "-a" "-N")))) #~(make-system-constructor
(stop #~(const #f)))) (string-join
(if volumes? ;; TODO: Patch references within zfs package instead.
(list (list "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin"
(shepherd-service #$(file-append zfs "/bin/zvol_wait")))))
(provision '(zfs-volumes)) (stop #~(const #f))))
(requirement '(zfs-import)) '())
(start ,@(if auto-mount?
#~(make-system-constructor (list
(string-join (shepherd-service
;; TODO: Patch references within zfs package instead. (provision '(zfs-mount))
(list "PATH=/run/current-system/profile/bin:/run/current-system/profile/sbin" (requirement '(zfs-import))
#$(file-append zfs "/bin/zvol_wait"))))) (documentation "Mount all available ZFS file systems.")
(stop #~(const #f)))) (start
'()) #~(make-system-constructor
(if auto-mount? (string-join
(list (list #$(file-append zfs "/sbin/zfs") "mount" "-a" "-l"))))
(shepherd-service (stop
(provision '(zfs-mount)) #~(make-system-destructor
(requirement '(zfs-import)) (string-join
(start (list #$(file-append zfs "/sbin/zfs") "unmount" "-a"))))))
#~(make-system-constructor '())
(string-join ,(shepherd-service
(list #$(file-append zfs "/sbin/zfs") "mount" "-a" "-l")))) (provision '(file-system-zfs))
(stop (requirement
#~(make-system-destructor `(zfs-import
(string-join ,@(if volumes? '(zfs-volumes) '())
(list #$(file-append zfs "/sbin/zfs") "unmount" "-a")))))) ,@(if auto-mount? '(zfs-mount) '())))
'())))) (documentation "Take care of ZFS file systems.")
(start #~(const #t))
(stop #~(const #f))))))
(define zfs-service-type (define zfs-service-type
(service-type (service-type
@ -189,13 +191,11 @@
zfs-linux-loadable-module-service) zfs-linux-loadable-module-service)
(service-extension udev-service-type (service-extension udev-service-type
add-zfs-package) add-zfs-package)
(service-extension kernel-module-loader-service-type (service-extension profile-service-type
(const '("zfs"))) add-zfs-package)
(service-extension shepherd-root-service-type (service-extension shepherd-root-service-type
zfs-shepherd-service) zfs-shepherd-service)
(service-extension user-processes-service-type (service-extension user-processes-service-type
(const '(file-system-zfs))) (const '(file-system-zfs)))))
(service-extension profile-service-type
add-zfs-package)))
(default-value (zfs-configuration)) (default-value (zfs-configuration))
(description ""))) (description "")))