mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2026-03-29 05:44:24 +00:00
Compare commits
No commits in common. "f8d4113975b0b4c8f0367e4f0cf93ca2167b2aa8" and "53c757521a3ab5f3198383e325321ead2a70adaf" have entirely different histories.
f8d4113975
...
53c757521a
@ -3,7 +3,6 @@
|
||||
|
||||
(define-module (rosenthal packages binaries)
|
||||
;; Guile builtins
|
||||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
;; Utilities
|
||||
#:use-module (gnu build icecat-extension)
|
||||
@ -12,7 +11,6 @@
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (rosenthal utils packages)
|
||||
;; Guix origin methods
|
||||
#:use-module (guix download)
|
||||
;; Guix build systems
|
||||
@ -178,7 +176,7 @@ the most niche uses.")
|
||||
(define-public komga-bin
|
||||
(package
|
||||
(name "komga-bin")
|
||||
(version "1.24.1")
|
||||
(version "1.23.6")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -186,7 +184,7 @@ the most niche uses.")
|
||||
"/komga-" version ".jar"))
|
||||
(sha256
|
||||
(base32
|
||||
"085jh6fi29yayr15zl4wmarx893bmhi3dsdwsvpnq5y5x89nq65g"))))
|
||||
"01mkhdxd2gh75g46381j5c4frys1bq5rywmb700ma5bdy7vd8k9i"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -226,7 +224,7 @@ eBooks.")
|
||||
(define-public navidrome-bin
|
||||
(package
|
||||
(name "navidrome-bin")
|
||||
(version "0.60.0")
|
||||
(version "0.59.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -234,7 +232,7 @@ eBooks.")
|
||||
version "/navidrome_" version "_linux_amd64.tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"13877bkjxgk2n7ws6zq02p3iqkryhbw3bswzfns0qlgzn0kv09ik"))))
|
||||
"1fn8hj6hm72nsyw69l5asqd1hm13z564ikk9v7nzg417553asx0h"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -424,7 +422,7 @@ multi-tenant, long-term storage for Prometheus.")
|
||||
(define-public loki-bin
|
||||
(package
|
||||
(name "loki-bin")
|
||||
(version "3.6.5")
|
||||
(version "3.6.4")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -432,7 +430,7 @@ multi-tenant, long-term storage for Prometheus.")
|
||||
version "/loki-linux-amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"026ln5p0ff8gvnj6943mr2qj3hksmcscd58x9261faanzs1zlp99"))))
|
||||
"153kzznw9jc10bvkjyqckmbkh8f6xg1d83wbd5vlajdvmrhl4l2i"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
@ -449,16 +447,10 @@ rather a set of labels for each log stream.")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(properties '((upstream-name . "loki")))))
|
||||
|
||||
|
||||
;;;
|
||||
;;; alloy
|
||||
;;;
|
||||
|
||||
(define-public %alloy-source-x86_64-linux
|
||||
(define-public alloy-bin
|
||||
(package
|
||||
(inherit %binary-source)
|
||||
(name "alloy")
|
||||
(version "1.13.0")
|
||||
(name "alloy-bin")
|
||||
(version "1.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -466,13 +458,38 @@ rather a set of labels for each log stream.")
|
||||
version "/alloy-linux-amd64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"0xy986hgzbpq7yq0h9c364ki3j9z21wj6097f1dkk8722ycq0khy"))))))
|
||||
"0fknk73z13a3jic6q3gmnwcgzz51jplikmg3xaz08217khpqh4kx"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list #:install-plan
|
||||
#~'(("alloy-linux-amd64" "bin/alloy"))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'install 'patch-elf
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((name "alloy")
|
||||
(dest (in-vicinity #$output "bin"))
|
||||
(ld.so (search-input-file inputs #$(glibc-dynamic-linker))))
|
||||
(with-directory-excursion dest
|
||||
(invoke "patchelf" "--set-interpreter" ld.so name)
|
||||
(chmod name #o555))))))))
|
||||
(native-inputs (list patchelf unzip))
|
||||
(synopsis
|
||||
"OpenTelemetry Collector distribution with programmable pipelines")
|
||||
(description
|
||||
"Grafana Alloy is an open source OpenTelemetry Collector distribution with
|
||||
built-in Prometheus pipelines and support for metrics, logs, traces, and
|
||||
profiles.")
|
||||
(home-page "https://grafana.com/oss/alloy-opentelemetry-collector/")
|
||||
(license license:agpl3)
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(properties '((upstream-name . "alloy")))))
|
||||
|
||||
(define-public %alloy-source-aarch64-linux
|
||||
(define-public alloy-bin-aarch64-linux
|
||||
(package
|
||||
(inherit %binary-source)
|
||||
(name "alloy")
|
||||
(version "1.13.0")
|
||||
(inherit alloy-bin)
|
||||
(name "alloy-bin-aarch64-linux")
|
||||
(version "1.12.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@ -480,79 +497,9 @@ rather a set of labels for each log stream.")
|
||||
version "/alloy-linux-arm64.zip"))
|
||||
(sha256
|
||||
(base32
|
||||
"1pxnjzygm2mylipf6cjkqxm4k3i9vnm7v80avxbhv8400p3aszqk"))))))
|
||||
|
||||
(define-public alloy-bin
|
||||
(package
|
||||
(name "alloy-bin")
|
||||
(version (package-version %alloy-source-x86_64-linux))
|
||||
(source #f)
|
||||
(build-system copy-build-system)
|
||||
"08k7dhj8dhdv5w2d6gkny31rp1p51ycd6f0mp5v13iq9w7d4w3bd"))))
|
||||
(arguments
|
||||
(let ((binary-source
|
||||
(match (or (%current-target-system)
|
||||
(%current-system))
|
||||
((? target-aarch64?)
|
||||
(package-source %alloy-source-aarch64-linux))
|
||||
(_
|
||||
(package-source %alloy-source-x86_64-linux)))))
|
||||
(list
|
||||
#:install-plan
|
||||
(match (or (%current-target-system)
|
||||
(%current-system))
|
||||
((? target-aarch64?)
|
||||
#~'(("alloy-linux-arm64" "bin/alloy")))
|
||||
(_
|
||||
#~'(("alloy-linux-amd64" "bin/alloy"))))
|
||||
#:modules
|
||||
'((ice-9 match)
|
||||
(guix build copy-build-system)
|
||||
(guix build utils))
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(replace 'unpack
|
||||
(lambda _
|
||||
((assoc-ref %standard-phases 'unpack)
|
||||
#:source #+binary-source)))
|
||||
(add-after 'install 'patch-elf
|
||||
(lambda _
|
||||
(let ((name "alloy")
|
||||
(dest (in-vicinity #$output "bin"))
|
||||
(ld.so #$(file-append glibc (glibc-dynamic-linker))))
|
||||
(with-directory-excursion dest
|
||||
(invoke "patchelf" "--set-interpreter" ld.so name)
|
||||
(chmod name #o555)))))
|
||||
(add-after 'patch-elf 'install-extras
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((alloy
|
||||
(if #$(%current-target-system)
|
||||
(search-input-file (or native-inputs inputs)
|
||||
"bin/alloy")
|
||||
(in-vicinity #$output "bin/alloy"))))
|
||||
(for-each
|
||||
(match-lambda
|
||||
((shell . file)
|
||||
(mkdir-p (in-vicinity #$output (dirname file)))
|
||||
(with-output-to-file (in-vicinity #$output file)
|
||||
(lambda ()
|
||||
(invoke alloy "completion" shell)))))
|
||||
'(("bash" . "share/bash-completion/completions/alloy")
|
||||
("fish" . "share/fish/vendor_completions.d/alloy.fish")
|
||||
("zsh" . "share/zsh/site-functions/_alloy"))))))))))
|
||||
(native-inputs
|
||||
(append (if (%current-target-system)
|
||||
(list this-package)
|
||||
'())
|
||||
(list patchelf unzip)))
|
||||
(supported-systems '("x86_64-linux" "aarch64-linux"))
|
||||
(home-page "https://grafana.com/oss/alloy-opentelemetry-collector/")
|
||||
(synopsis
|
||||
"OpenTelemetry Collector distribution with programmable pipelines")
|
||||
(description
|
||||
"Grafana Alloy is an open source OpenTelemetry Collector distribution with
|
||||
built-in Prometheus pipelines and support for metrics, logs, traces, and
|
||||
profiles.")
|
||||
(license license:agpl3)
|
||||
(properties '((disable-updater? . #t)))))
|
||||
|
||||
(define-deprecated-package alloy-bin-aarch64-linux alloy-bin)
|
||||
(substitute-keyword-arguments (package-arguments alloy-bin)
|
||||
((#:install-plan _ ''())
|
||||
#~'(("alloy-linux-arm64" "bin/alloy")))))
|
||||
(supported-systems '("aarch64-linux"))))
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
(define-public systemd-stub
|
||||
(package
|
||||
(name "systemd-stub")
|
||||
(version "259.1")
|
||||
(version "259")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -95,7 +95,7 @@
|
||||
(file-name (git-file-name "name" version))
|
||||
(sha256
|
||||
(base32
|
||||
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj"))))
|
||||
"1j0f710m6h2vlry6a62q8qhvkv4c4gah6s7n212fi8liqpb1g5cl"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:tests? #f
|
||||
@ -129,7 +129,7 @@ Supports measured and/or verified boot environments.")
|
||||
(define-public ukify
|
||||
(package
|
||||
(name "ukify")
|
||||
(version "259.1")
|
||||
(version "259")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -138,7 +138,7 @@ Supports measured and/or verified boot environments.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1581hd16kwqa3i73szazym9rbjrmybfrqvx2x5pkcb3y2d7dclkj"))))
|
||||
"1j0f710m6h2vlry6a62q8qhvkv4c4gah6s7n212fi8liqpb1g5cl"))))
|
||||
(build-system pyproject-build-system)
|
||||
(arguments
|
||||
(list #:phases
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
(define-public cloudflared
|
||||
(package
|
||||
(name "cloudflared")
|
||||
(version "2026.2.0")
|
||||
(version "2026.1.1")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -34,7 +34,7 @@
|
||||
;; (snippet '(delete-file-recursively "vendor"))
|
||||
(sha256
|
||||
(base32
|
||||
"17cvbkxrs1768r48iczxq75kr698cys0dymdbbhs9p1c75m0b0si"))))
|
||||
"11bdgv12y6ys5p6sxr0b7mqirvwcpll1jpdsdmkiwrd95maq7rgp"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list #:go go-1.24
|
||||
@ -143,7 +143,7 @@ bypass network restrictions." )
|
||||
(define-public sing-box
|
||||
(package
|
||||
(name "sing-box")
|
||||
(version "1.12.20")
|
||||
(version "1.12.15")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -152,7 +152,7 @@ bypass network restrictions." )
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02y6yrllkaf4wswgcb6fv35scj1gngvkvnc972z0h2f2r86bi28x"))))
|
||||
"04bb5xq4pskcd2sbpi5vvh8f9c52ivjrc2mafz96b6cnbm2ix1fx"))))
|
||||
(build-system go-build-system)
|
||||
(arguments
|
||||
(list
|
||||
@ -220,7 +220,7 @@ bypass network restrictions." )
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"1b1ciib7w5zqhbmxxjayiynhhmchvpyzn1kwl1lz3v85zwnkf38p"))))
|
||||
"01gkszwkxbq133kfjg2iqdd033c1llawdplmka9hwp1hqidhf94r"))))
|
||||
(if (%current-target-system)
|
||||
(list this-package)
|
||||
'())))
|
||||
@ -261,7 +261,7 @@ a SOCKS5 proxy.")
|
||||
(define-public tailscale
|
||||
(package
|
||||
(name "tailscale")
|
||||
(version "1.94.1")
|
||||
(version "1.92.5")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -270,7 +270,7 @@ a SOCKS5 proxy.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0n5k8adplcffjwlpiy35nrklc0sf9ms18zlilcis5g1s3kdh4klf"))
|
||||
"0i96m98ambmb532isi44qzzh7qm16lg78k5y6pdg2l0x3zxq6ijb"))
|
||||
(patches
|
||||
(rosenthal-patches
|
||||
"tailscale-set-guix-system-PATH-for-SSH.patch"))
|
||||
@ -375,7 +375,7 @@ a SOCKS5 proxy.")
|
||||
(file-name "vendored-go-dependencies")
|
||||
(sha256
|
||||
(base32
|
||||
"04zzwizns5a5wvwpa1a82jg0l641fnk3schffrpqi3qi84x17qsr"))))
|
||||
"1j1bnlqk4k098vj31ylj5b7iwd18di84m7zacrlc5aclrif9554c"))))
|
||||
(if (%current-target-system)
|
||||
(list this-package)
|
||||
'())))
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
(define-public noctalia-shell
|
||||
(package
|
||||
(name "noctalia-shell")
|
||||
(version "4.4.0")
|
||||
(version "4.3.3")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -46,7 +46,7 @@
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"0p0gp8sqmv4xd696nrhbiln61wkgiyzyz7kjbqx6fs9kqc3i0wyf"))))
|
||||
"03sb4kqr6bvdbf32fs27xaf2ghd9dmrrjnqvrj6mzhwslvdhqvcj"))))
|
||||
(build-system copy-build-system)
|
||||
(arguments
|
||||
(list
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
#:use-module (guix ui)
|
||||
;; Guix packages
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:replace (%patch-path
|
||||
search-patch)
|
||||
#:export (rosenthal-patches
|
||||
@ -30,9 +29,7 @@
|
||||
spec->pkg
|
||||
spec->pkg+out
|
||||
specs->pkgs
|
||||
specs->pkgs+out
|
||||
|
||||
%binary-source))
|
||||
specs->pkgs+out))
|
||||
|
||||
(define %rosenthal-root-directory
|
||||
;; This is like %distro-root-directory from (gnu packages), with adjusted
|
||||
@ -135,14 +132,3 @@ packages, excluding superseded packages."
|
||||
(define-deprecated/public-alias pkg+out spec->pkg+out)
|
||||
(define-deprecated/public-alias pkgs specs->pkgs)
|
||||
(define-deprecated/public-alias pkgs+out specs->pkgs+out)
|
||||
|
||||
|
||||
;;;
|
||||
;;; Binary packages.
|
||||
;;;
|
||||
|
||||
(define %binary-source
|
||||
(hidden-package
|
||||
(package
|
||||
(inherit hello)
|
||||
(supported-systems '()))))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user