mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2026-04-09 19:34:21 +00:00
Compare commits
No commits in common. "9d95263fcf4d0158477ccbb51712b17f2b642eb5" and "a238fc8c286b3fa0d3264e179c49d0d26b2e6865" have entirely different histories.
9d95263fcf
...
a238fc8c28
@ -24,7 +24,7 @@
|
||||
(define-public dinit
|
||||
(package
|
||||
(name "dinit")
|
||||
(version "0.21.0")
|
||||
(version "0.20.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -33,7 +33,7 @@
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "0fs0sv9pkplwl27bar8ng2b7idpp1bnrmxnf1jkwdigq1ll2xsyw"))))
|
||||
(base32 "1bs61i08fnlmpkbz189ks1ljj0569avb51b22fk27mm99msmdjgy"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:configure-flags
|
||||
|
||||
@ -142,7 +142,7 @@ host Matrix for your family, friends or company.")
|
||||
(define-public tuwunel-bin
|
||||
(package
|
||||
(name "tuwunel-bin")
|
||||
(version "1.5.1")
|
||||
(version "1.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -152,11 +152,10 @@ host Matrix for your family, friends or company.")
|
||||
(file-name (string-append name "-" version ".zst"))
|
||||
(sha256
|
||||
(base32
|
||||
"00kpapzd7alm3g34ijfhwszc1x1ddd4ykcyk8ah73gmyc2lq8gys"))))
|
||||
"0d2fmpsisnzqgrx0sq6zrn31jvdisnm6jb2q6qcc39z4jdllwhrb"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:tests? (not (%current-target-system))
|
||||
#:install-plan
|
||||
(list #:install-plan
|
||||
#~'((#$(format #f "~a-~a"
|
||||
(package-name this-package)
|
||||
(package-version this-package))
|
||||
@ -165,13 +164,7 @@ host Matrix for your family, friends or company.")
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'fix-permission
|
||||
(lambda _
|
||||
(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"))))))))
|
||||
(chmod (string-append #$output "/bin/tuwunel") #o555))))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Matrix homeserver")
|
||||
(description
|
||||
@ -187,7 +180,7 @@ the most niche uses.")
|
||||
(define-public komga-bin
|
||||
(package
|
||||
(name "komga-bin")
|
||||
(version "1.24.3")
|
||||
(version "1.24.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -195,7 +188,7 @@ the most niche uses.")
|
||||
"/komga-" version ".jar"))
|
||||
(sha256
|
||||
(base32
|
||||
"16ms8rfr5qqi375qsgl1392jnmxb3bjbcl4p0n59nq6hpx37dipq"))))
|
||||
"085jh6fi29yayr15zl4wmarx893bmhi3dsdwsvpnq5y5x89nq65g"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -293,7 +286,7 @@ monster-in-the-middle}.")
|
||||
(define-public wakapi-bin
|
||||
(package
|
||||
(name "wakapi-bin")
|
||||
(version "2.17.2")
|
||||
(version "2.17.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -301,7 +294,7 @@ monster-in-the-middle}.")
|
||||
version "/wakapi_linux_amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1x51a9jhnhzanbgb713f0j8rnj4sgcdpghzhifvncj8hz6w4i8sy"))))
|
||||
"0gb75wlip98187wc933p1cabsghh9w6lrh87nk3f2nhy86i2b5m7"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments (list #:install-plan #~'(("wakapi" "bin/wakapi"))))
|
||||
(supported-systems '("x86_64-linux"))
|
||||
@ -317,7 +310,7 @@ coding statistics.")
|
||||
(define-public wakatime-cli-bin
|
||||
(package
|
||||
(name "wakatime-cli-bin")
|
||||
(version "2.0.0")
|
||||
(version "1.139.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/wakatime/wakatime-cli"
|
||||
@ -325,7 +318,7 @@ coding statistics.")
|
||||
"/wakatime-cli-linux-amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1ci4gjhxyn05amq0dx34ck2q0zpv43x1qq3rhkwx02wk3ny5mn0i"))))
|
||||
"11jl7riqnn7c4bphrxc19x8gw2x87a9ymp2qkdil2syk24gfrjw6"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -343,30 +336,21 @@ to WakaTime, which is used by all WakaTime text editor plugins.")
|
||||
(define-public grafana-bin
|
||||
(package
|
||||
(name "grafana-bin")
|
||||
(version "12.4.2")
|
||||
(version "12.1.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://dl.grafana.com/grafana/release/"
|
||||
version "/grafana_" version "_"
|
||||
"23531306697_linux_amd64.tar.gz"))
|
||||
version "/grafana_" version "_" "16903967602"
|
||||
"_linux_amd64.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"07sr78wi5nqlsx1nfj87bzgq29hcflqm6r5f5xcn9gq3m00b4h7j"))))
|
||||
"056jj4ww1l36y77v9qmqhgsg7lsr328bhp7y48c6l125cal1snl2"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:tests? (not (%current-target-system))
|
||||
#:install-plan
|
||||
(list #:install-plan
|
||||
#~'(("bin" "bin")
|
||||
("conf" "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"))))))))
|
||||
("public" "share/grafana/"))))
|
||||
(synopsis "Platform for monitoring and observability")
|
||||
(description
|
||||
"Grafana allows you to query, visualize, alert on and understand your
|
||||
@ -380,7 +364,7 @@ metrics no matter where they are stored.")
|
||||
(define-public prometheus-bin
|
||||
(package
|
||||
(name "prometheus-bin")
|
||||
(version "3.10.0")
|
||||
(version "3.9.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/prometheus/prometheus"
|
||||
@ -388,7 +372,7 @@ metrics no matter where they are stored.")
|
||||
"/prometheus-" version ".linux-amd64.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"08h1d7whb85vp28r1nlkrilyws6cs1hzxlw9zhiic63apfbhvia1"))))
|
||||
"116569xwfma38j7wbdz7r3hlnk9iz9ycg4yymjadkjxassfrk9l6"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -409,7 +393,7 @@ observed.")
|
||||
(define-public mimir-bin
|
||||
(package
|
||||
(name "mimir-bin")
|
||||
(version "3.0.4")
|
||||
(version "2.17.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -417,11 +401,10 @@ observed.")
|
||||
version "/mimir-linux-amd64"))
|
||||
(sha256
|
||||
(base32
|
||||
"09bhfbax659p1svzk8gq37vckqd62xsr219ab8f4r36c74ml3vz8"))))
|
||||
"1vnrpzwyjz7plzdiih65853ndvg64a9n1x1i7jqr085byhpayp82"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:tests? (not (%current-target-system))
|
||||
#:phases
|
||||
(list #:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'install
|
||||
(lambda* (#:key source #:allow-other-keys)
|
||||
@ -430,12 +413,7 @@ observed.")
|
||||
(mkdir-p dest)
|
||||
(with-directory-excursion dest
|
||||
(copy-file source name)
|
||||
(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"))))))))
|
||||
(chmod name #o555))))))))
|
||||
(synopsis "Scalable long-term storage for Prometheus")
|
||||
(description
|
||||
"Grafana Mimir provides horizontally scalable, highly available,
|
||||
@ -449,7 +427,7 @@ multi-tenant, long-term storage for Prometheus.")
|
||||
(define-public loki-bin
|
||||
(package
|
||||
(name "loki-bin")
|
||||
(version "3.7.1")
|
||||
(version "3.6.7")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -457,7 +435,7 @@ multi-tenant, long-term storage for Prometheus.")
|
||||
version "/loki-linux-amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w5aarm1vbyn2l2mzqbd90g1azqq5y1swwkvj57bgm95lrips0pg"))))
|
||||
"1b5ia3nhfphnh79nn4qvrz0hhnbsl6bs347dghgkii0vqwip0wz9"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -483,7 +461,7 @@ rather a set of labels for each log stream.")
|
||||
(package
|
||||
(inherit %binary-source)
|
||||
(name "alloy")
|
||||
(version "1.14.2")
|
||||
(version "1.13.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -491,13 +469,13 @@ rather a set of labels for each log stream.")
|
||||
version "/alloy-linux-amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1srvmqmbll7c4pmn9v0pas7r8kp0vlq494pxmf411p6l3nzm100v"))))))
|
||||
"1q3hnq8ndbcjhqnz31aikz3h8x71sqak1ybf3bix4180v226l9bg"))))))
|
||||
|
||||
(define-public %alloy-source-aarch64-linux
|
||||
(package
|
||||
(inherit %binary-source)
|
||||
(name "alloy")
|
||||
(version "1.14.2")
|
||||
(version "1.13.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -505,7 +483,7 @@ rather a set of labels for each log stream.")
|
||||
version "/alloy-linux-arm64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"107fpppibyqv4cmgpqpczj70yfqvwwwhvkqrxbh8c2a5qw76m1rk"))))))
|
||||
"0iyns3xm3s6ch6xxgbwmvzkzisqic8d5zqh34l5fa015w2qndrmx"))))))
|
||||
|
||||
(define-public alloy-bin
|
||||
(binary-package
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
(define-public limine
|
||||
(package
|
||||
(name "limine")
|
||||
(version "11.1.0")
|
||||
(version "10.8.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -47,7 +47,7 @@
|
||||
version "/limine-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02940hw882h0hflvkkjaxbcf715kqa6rikx4i2d11vg2qy8i53mm"))))
|
||||
"1y7qi39ryy8gwv25n0wv68dy1q1gzh0syn4z3psfrl7px98m5ikd"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
@ -84,8 +84,7 @@
|
||||
(description
|
||||
"Limine is a multiprotocol bootloader and boot manager. It's also used as
|
||||
the reference implementation for the Limine boot protocol.")
|
||||
(license license:bsd-2)
|
||||
(properties '((disable-updater? . #t)))))
|
||||
(license license:bsd-2)))
|
||||
|
||||
|
||||
;;;
|
||||
@ -103,7 +102,7 @@ the reference implementation for the Limine boot protocol.")
|
||||
(define-public systemd-stub
|
||||
(package
|
||||
(name "systemd-stub")
|
||||
(version "260.1")
|
||||
(version "259.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -112,7 +111,7 @@ the reference implementation for the Limine boot protocol.")
|
||||
(file-name (git-file-name "name" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1az9sswsyfyw7m4if1mmxyamw8xnb0i3gg1bng4c9kz3bgga6hhm"))))
|
||||
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
@ -146,7 +145,7 @@ Supports measured and/or verified boot environments.")
|
||||
(define-public ukify
|
||||
(package
|
||||
(name "ukify")
|
||||
(version "260.1")
|
||||
(version "259.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -155,7 +154,7 @@ Supports measured and/or verified boot environments.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1az9sswsyfyw7m4if1mmxyamw8xnb0i3gg1bng4c9kz3bgga6hhm"))))
|
||||
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
|
||||
@ -13,11 +13,11 @@
|
||||
|
||||
(define-public dnsmasq-china-list
|
||||
;; No version.
|
||||
(let ((commit "7da1a5a5885c3f19dd000aa76a25e457352dd696")
|
||||
(revision "21"))
|
||||
(let ((commit "1a4d9fce63c44e80c2d6d790d7501e6103caf8da")
|
||||
(revision "20"))
|
||||
(package
|
||||
(name "dnsmasq-china-list")
|
||||
(version (git-version "0.0.0" revision commit))
|
||||
(version (git-version "0" revision commit))
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -26,7 +26,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"04dgra5123k94k0q1v9f7rmk3zdzc429hkr6jvn1lx4cxfcs0zfq"))))
|
||||
"0wy3p9fimzvbv6jrcyi2s89cvz2v7b3h61gfj93kn2wmpli6apyp"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
|
||||
@ -37,8 +37,7 @@
|
||||
((#:lisp-directory _ #f) "lisp")))
|
||||
(propagated-inputs
|
||||
(modify-inputs propagated-inputs
|
||||
(prepend emacs-consult)))
|
||||
(properties '((disable-updater? . #t))))))
|
||||
(prepend emacs-consult))))))
|
||||
|
||||
(define-public emacs-caddyfile-mode
|
||||
(let ((commit "fc41148f5a7eb320f070666f046fb9d88cf17680")
|
||||
@ -106,8 +105,7 @@ minibuffer. This allows editing the search string in arbitrary ways without any
|
||||
special maneuver. Unlike standard @code{isearch}, cursor motion commands do not
|
||||
end the search. Moreover, the search status information in the echo area and
|
||||
some keybindings are slightly simplified.")
|
||||
(license license:gpl3+)
|
||||
(properties '((disable-updater? . #t)))))
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public emacs-kdl-mode
|
||||
(let ((commit "2d849e298199f490e4894c01764a8a83decd704a")
|
||||
@ -132,19 +130,6 @@ some keybindings are slightly simplified.")
|
||||
(license license:gpl3+)
|
||||
(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
|
||||
(let ((commit "acd6bce54af506b0450cf6aa1068f63d4e25c8ce")
|
||||
(revision "0"))
|
||||
|
||||
@ -44,5 +44,4 @@
|
||||
(home-page "https://github.com/hylophile/guile-toml")
|
||||
(synopsis "TOML module for GNU Guile")
|
||||
(description "")
|
||||
(license license:gpl3+)
|
||||
(properties '((disable-updater? . #t))))))
|
||||
(license license:gpl3+))))
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
;; Guix packages
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages dns)
|
||||
#:use-module (gnu packages freedesktop)
|
||||
#:use-module (gnu packages golang)
|
||||
#:use-module (gnu packages golang-build)
|
||||
#:use-module (gnu packages linux))
|
||||
@ -23,7 +22,7 @@
|
||||
(define-public cloudflared
|
||||
(package
|
||||
(name "cloudflared")
|
||||
(version "2026.3.0")
|
||||
(version "2026.2.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -35,7 +34,7 @@
|
||||
;; (snippet '(delete-file-recursively "vendor"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j71qzxg50kn2hnxrfgny9n6clm45sg9pz1y96z50w48jxjvlrx0"))))
|
||||
"17cvbkxrs1768r48iczxq75kr698cys0dymdbbhs9p1c75m0b0si"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:go go-1.24
|
||||
@ -74,7 +73,7 @@ origin can remain as closed as possible.")
|
||||
(define-public mihomo
|
||||
(package
|
||||
(name "mihomo")
|
||||
(version "1.19.21")
|
||||
(version "1.19.20")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -83,12 +82,12 @@ origin can remain as closed as possible.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1qa6fw3axnas39ri0qmy54rvyk3xbpnmv3iss21wrhjvnlcagmdw"))))
|
||||
"1gkp2ssnyci5klk5q56p32kpbbamzk3y49nh24s7122s576bqmf3"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||
#:go go-1.26
|
||||
#:go go-1.23
|
||||
#:install-source? #f
|
||||
#:import-path "."
|
||||
#:build-flags
|
||||
@ -123,12 +122,12 @@ origin can remain as closed as possible.")
|
||||
(native-inputs
|
||||
(append
|
||||
(list (origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.23))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"15452bapz7jwi9gawww9kyszbj2pfdy50xg5zcs2rjrjkh5aygya"))))
|
||||
"14vmch6l9carq395p269c5gg5hxbyv6i9my47s50j6ki029x9c9j"))))
|
||||
(if (%current-target-system)
|
||||
(list this-package)
|
||||
'())))
|
||||
@ -144,7 +143,7 @@ bypass network restrictions." )
|
||||
(define-public sing-box
|
||||
(package
|
||||
(name "sing-box")
|
||||
(version "1.13.4")
|
||||
(version "1.12.22")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -153,12 +152,12 @@ bypass network restrictions." )
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0ihs7n4hnmn6karrwlp6j6aqirm56zpnfzf6mpl5m42ph204dvg2"))))
|
||||
"0wr97myxdskqlh1mrpn0rnnvdkifaqnm420j3y6hbk9rf4ijzf3l"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||
#:go go-1.26
|
||||
#:go go-1.23
|
||||
#:install-source? #f
|
||||
#:import-path "./cmd/sing-box"
|
||||
#:build-flags
|
||||
@ -216,12 +215,12 @@ bypass network restrictions." )
|
||||
(native-inputs
|
||||
(append
|
||||
(list (origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.23))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1j8f1b8sx5r7azniqypqz6sqm1hpadxlg1rrkgss8xzh6p0h5y4r"))))
|
||||
"0h3m4rfkwdcm22f8vbdl3idki46nxfmynagvy7s00lycylz1f809"))))
|
||||
(if (%current-target-system)
|
||||
(list this-package)
|
||||
'())))
|
||||
@ -262,7 +261,7 @@ a SOCKS5 proxy.")
|
||||
(define-public tailscale
|
||||
(package
|
||||
(name "tailscale")
|
||||
(version "1.96.4")
|
||||
(version "1.94.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -271,7 +270,7 @@ a SOCKS5 proxy.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0qqlj6cq43h0pr8jg9g956yz5xgg81959vq2kl7n9yqnixyh8w2n"))
|
||||
"0n5k8adplcffjwlpiy35nrklc0sf9ms18zlilcis5g1s3kdh4klf"))
|
||||
(patches
|
||||
(rosenthal-patches
|
||||
"tailscale-set-guix-system-PATH-for-SSH.patch"))
|
||||
@ -285,7 +284,7 @@ a SOCKS5 proxy.")
|
||||
(arguments
|
||||
(list
|
||||
#:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||
#:go go-1.26
|
||||
#:go go-1.25
|
||||
#:install-source? #f
|
||||
#:import-path "."
|
||||
#:build-flags
|
||||
@ -312,11 +311,6 @@ a SOCKS5 proxy.")
|
||||
"vendor")))
|
||||
(replace '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
|
||||
(lambda* (#:key build-flags parallel-build? #:allow-other-keys)
|
||||
(let* ((njobs (if parallel-build? (parallel-job-count) 1)))
|
||||
@ -376,24 +370,17 @@ a SOCKS5 proxy.")
|
||||
(native-inputs
|
||||
(append
|
||||
(list (origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.25))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1kj1q82n62x5dx4s9ivnnqi5c711pwyfic0kaykdn2ky8c89c6xf"))))
|
||||
"04zzwizns5a5wvwpa1a82jg0l641fnk3schffrpqi3qi84x17qsr"))))
|
||||
(if (%current-target-system)
|
||||
(list this-package)
|
||||
'())))
|
||||
(inputs
|
||||
(list desktop-file-utils
|
||||
findutils
|
||||
glibc
|
||||
iproute
|
||||
iptables-nft
|
||||
kmod
|
||||
openresolv
|
||||
procps))
|
||||
(list findutils glibc iproute iptables-nft kmod openresolv procps))
|
||||
(home-page "https://tailscale.com/")
|
||||
(synopsis "Mesh VPN service utilizing the WireGuard protocol and 2FA")
|
||||
(description
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
(define-public sops
|
||||
(package
|
||||
(name "sops")
|
||||
(version "3.12.2")
|
||||
(version "3.12.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -28,10 +28,10 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"01w67iv0v9hnxgaklixk871dwnhyhllm3zz36iiwqsd19d5rllfm"))))
|
||||
"1z3m1smcbyshrfw2h2rmnvy9pcwjv7q9hd79kffnf4qxzsp3m4zb"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:go go-1.26
|
||||
(list #:go go-1.24
|
||||
#:install-source? #f
|
||||
#:import-path "./cmd/sops"
|
||||
#:build-flags
|
||||
@ -56,12 +56,12 @@
|
||||
(assoc-ref gnu:%standard-phases 'install-license-files)))))
|
||||
(native-inputs
|
||||
(list (origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.24))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1gd5kpiqizrab7fbhzhwj5lm1b6wmpvwpvnrwwz0xkfn6hqwj1qy")))))
|
||||
"04gnkz3w1ckxq1dccwvwrbar30nc79b8rbj0smsmvc6g9x99ay3n")))))
|
||||
(home-page "https://getsops.io/")
|
||||
(synopsis "Simple and flexible tool for managing secrets")
|
||||
(description
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
(define-public ai-robots-txt
|
||||
(package
|
||||
(name "ai-robots-txt")
|
||||
(version "1.45")
|
||||
(version "1.44")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -35,7 +35,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j2nwf6i2fhlhkcqfqnzyiy2x6m974s59yrcy5y4nar5lij6q10z"))
|
||||
"14jfkymkrs51xkgf48rin01kcfmk043zkdyzfhb459fv3brxms50"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet '(delete-file-recursively "code"))))
|
||||
(build-system copy-build-system)
|
||||
@ -57,7 +57,7 @@ website owners block unwanted AI crawlers from accessing their sites.")
|
||||
(define-public anubis-anti-crawler
|
||||
(package
|
||||
(name "anubis-anti-crawler")
|
||||
(version "1.25.0")
|
||||
(version "1.21.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(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"))
|
||||
(sha256
|
||||
(base32
|
||||
"0kqp5j0739lpdw55gx4bnnda1b90qlavcdlp8vh9bp014xx84yqj"))))
|
||||
"1anjymg7mwjc8j0gn2gn1wb15iiljm68p15n77y5jg3av8wnky5g"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:tests? (not (%current-target-system)) ;FIXME
|
||||
#:go go-1.26
|
||||
#:go go-1.24
|
||||
#:install-source? #f
|
||||
#:import-path "./cmd/anubis"
|
||||
#:build-flags
|
||||
@ -102,12 +102,13 @@ website owners block unwanted AI crawlers from accessing their sites.")
|
||||
"Anubis checks incoming HTTP requests using one or more challenges in
|
||||
order to protect upstream resources from web crawlers.")
|
||||
(license license:expat)
|
||||
(properties '((upstream-name . "anubis")))))
|
||||
(properties '((upstream-name . "anubis")
|
||||
(disable-updater? . #t)))))
|
||||
|
||||
(define-public caddy
|
||||
(package
|
||||
(name "caddy")
|
||||
(version "2.11.2")
|
||||
(version "2.11.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -116,10 +117,10 @@ order to protect upstream resources from web crawlers.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"12r6pm6kw23bqa4gkkb85mj7zhw77j0j2w2m1cp28sb1x7rsm0a2"))))
|
||||
"1j3f123wv2a7vn944av2maxa74z9qldl2fy9l4mxdardsfhx3nzh"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:go go-1.26
|
||||
(list #:go go-1.25
|
||||
#:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||
#:install-source? #f
|
||||
#:import-path
|
||||
@ -175,12 +176,12 @@ order to protect upstream resources from web crawlers.")
|
||||
(invoke caddy "version"))))))))
|
||||
(native-inputs
|
||||
(list (origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.25))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1raa53ry78zsxsp81psl60z5rbx9y36gdkayh7dmdlrb460iap6f")))))
|
||||
"18zb1faw42pmsqfb1ffpk10wnsvby84sv5vs2b2xcya10p2fi7wd")))))
|
||||
(home-page "https://caddyserver.com/")
|
||||
(synopsis "Extensible HTTP web server with automatic HTTPS")
|
||||
(description
|
||||
@ -195,7 +196,7 @@ from serving static websites to running dynamic web applications.")
|
||||
(package
|
||||
(inherit caddy)
|
||||
(name "caddy-dolly")
|
||||
(version "2026.03.29-1")
|
||||
(version "2026.03.21-1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -204,24 +205,24 @@ from serving static websites to running dynamic web applications.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"04klhf0plnzldn894c8z5g8v3bmh342pgaq97cslvh6cjm3dwisd"))))
|
||||
"172kg8ycfba008brh1n8484hgwm60yq4i0gzv37qi83d3795s71d"))))
|
||||
(native-inputs
|
||||
(modify-inputs native-inputs
|
||||
(replace "vendored-go-dependencies"
|
||||
(origin
|
||||
(method (go-mod-vendor #:go go-1.26))
|
||||
(method (go-mod-vendor #:go go-1.25))
|
||||
(uri (package-source this-package))
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"0zjp5i2si8qkww8632rxhd4y1y39bycn111pydm70n02q3jwir27"))))))
|
||||
"03k5cjnkpy3ar79rs3p01lm0b6x4ypf7ixzindcv858gdyncq5pb"))))))
|
||||
(home-page "https://git.guix.moe/hako/caddy")
|
||||
(properties '((disable-updater? . #t)))))
|
||||
|
||||
(define-public forgejo
|
||||
(package
|
||||
(name "forgejo")
|
||||
(version "14.0.3")
|
||||
(version "12.0.3")
|
||||
;; TODO: Address npm dependencies and fetch from git.
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
@ -230,11 +231,11 @@ from serving static websites to running dynamic web applications.")
|
||||
version "/forgejo-src-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1j68clndn10gsv4v3xxrk5d8npriaj4af2gm4lg3nvd258zhyhcq"))))
|
||||
"0x09nwhps70n8rkvgp7mqzr7cyprdn274q7jhkljxna3r3w8qcb5"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||
#:go go-1.26
|
||||
#:go go-1.25
|
||||
#:install-source? #f
|
||||
#:import-path "."
|
||||
#:build-flags
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
(define-public noctalia-shell
|
||||
(package
|
||||
(name "noctalia-shell")
|
||||
(version "4.7.1")
|
||||
(version "4.7.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -49,7 +49,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0q9p9jl0iixf20bgwlray59rywgw4c1xq1pkp57zbbg0d1acr647"))))
|
||||
"0qylp37xrb71c3a5fr55a5zr7ibb4nd87jkdw01l54ij15jrdqxd"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -156,7 +156,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
|
||||
(package
|
||||
(inherit quickshell)
|
||||
(name "noctalia-qs")
|
||||
(version "0.0.10")
|
||||
(version "0.0.8")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@ -165,7 +165,7 @@ supporting various Wayland compositors like @code{niri}, @code{hyprland}, and
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1zly09mdpsqv220q5bi6vg70a6h2bpmd3f0badv2wzn1v1h19ixn"))))
|
||||
(base32 "0pyakmaq2bwdhnnqnrsqm9g1mjf5spij6hsvmlw058kxj8xkbbd4"))))
|
||||
(inputs
|
||||
(modify-inputs inputs
|
||||
(prepend glib polkit)))
|
||||
|
||||
@ -112,13 +112,13 @@
|
||||
"ZFS package to use.")
|
||||
(kernel-has-zfs-module?
|
||||
(boolean #f)
|
||||
"Whether ZFS module has already been built into the kernel.")
|
||||
"Whether or not ZFS modules have already been built into the kernel.")
|
||||
(volumes?
|
||||
(boolean #f)
|
||||
"Wait for ZFS volumes to show up.")
|
||||
"Wait for ZFS volumes.")
|
||||
(auto-mount?
|
||||
(boolean #t)
|
||||
"Auto-mount ZFS datasets."))
|
||||
"Mount all available ZFS file systems."))
|
||||
|
||||
(define zfs-linux-loadable-module-service
|
||||
(match-record-lambda <zfs-configuration>
|
||||
@ -135,21 +135,29 @@
|
||||
(define zfs-shepherd-service
|
||||
(match-record-lambda <zfs-configuration>
|
||||
(zfs volumes? auto-mount?)
|
||||
`(,(shepherd-service
|
||||
(append
|
||||
(list
|
||||
(shepherd-service
|
||||
(provision '(file-system-zfs))
|
||||
(requirement
|
||||
`(zfs-import
|
||||
,@(if volumes? '(zfs-volumes) '())
|
||||
,@(if auto-mount? '(zfs-mount) '())))
|
||||
(start #~(const #t))
|
||||
(stop #~(const #f)))
|
||||
(shepherd-service
|
||||
(provision '(zfs-import))
|
||||
(requirement '(udev))
|
||||
(documentation "Import ZFS storage pools.")
|
||||
(requirement '(kernel-module-loader))
|
||||
(start
|
||||
#~(make-system-constructor
|
||||
(string-join
|
||||
(list #$(file-append zfs "/sbin/zpool") "import" "-a" "-N"))))
|
||||
(stop #~(const #f)))
|
||||
,@(if volumes?
|
||||
(stop #~(const #f))))
|
||||
(if volumes?
|
||||
(list
|
||||
(shepherd-service
|
||||
(provision '(zfs-volumes))
|
||||
(requirement '(zfs-import))
|
||||
(documentation "Wait for ZFS volume links to appear in /dev.")
|
||||
(start
|
||||
#~(make-system-constructor
|
||||
(string-join
|
||||
@ -158,12 +166,11 @@
|
||||
#$(file-append zfs "/bin/zvol_wait")))))
|
||||
(stop #~(const #f))))
|
||||
'())
|
||||
,@(if auto-mount?
|
||||
(if auto-mount?
|
||||
(list
|
||||
(shepherd-service
|
||||
(provision '(zfs-mount))
|
||||
(requirement '(zfs-import))
|
||||
(documentation "Mount all available ZFS file systems.")
|
||||
(start
|
||||
#~(make-system-constructor
|
||||
(string-join
|
||||
@ -172,16 +179,7 @@
|
||||
#~(make-system-destructor
|
||||
(string-join
|
||||
(list #$(file-append zfs "/sbin/zfs") "unmount" "-a"))))))
|
||||
'())
|
||||
,(shepherd-service
|
||||
(provision '(file-system-zfs))
|
||||
(requirement
|
||||
`(zfs-import
|
||||
,@(if volumes? '(zfs-volumes) '())
|
||||
,@(if auto-mount? '(zfs-mount) '())))
|
||||
(documentation "Take care of ZFS file systems.")
|
||||
(start #~(const #t))
|
||||
(stop #~(const #f))))))
|
||||
'()))))
|
||||
|
||||
(define zfs-service-type
|
||||
(service-type
|
||||
@ -191,11 +189,13 @@
|
||||
zfs-linux-loadable-module-service)
|
||||
(service-extension udev-service-type
|
||||
add-zfs-package)
|
||||
(service-extension profile-service-type
|
||||
add-zfs-package)
|
||||
(service-extension kernel-module-loader-service-type
|
||||
(const '("zfs")))
|
||||
(service-extension shepherd-root-service-type
|
||||
zfs-shepherd-service)
|
||||
(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))
|
||||
(description "")))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user