From a8af0809326ce376565d3e122a5fc63b40fc0fb2 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 15 Jan 2024 09:10:43 +0800 Subject: [PATCH] rosenthal: clash-meta-bin: Update to 1.18.0, rename to mihomo-bin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * rosenthal/packages/binaries.scm (clash-meta-bin): Update to 1.18.0. Rename to… (mihomo-bin): …this. (clash-meta-bin): Define as deprecated package. * rosenthal/services/child-error.scm (clash-shepherd-service): Adjust accordingly. --- rosenthal/packages/binaries.scm | 25 ++++++++++++++----------- rosenthal/services/child-error.scm | 8 ++++---- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/rosenthal/packages/binaries.scm b/rosenthal/packages/binaries.scm index 233fda7..9d31169 100644 --- a/rosenthal/packages/binaries.scm +++ b/rosenthal/packages/binaries.scm @@ -48,36 +48,39 @@ network and application layer, supporting various proxy and anti-censorship protocols out-of-the-box.") (license license:gpl3))) -(define-public clash-meta-bin +(define-public mihomo-bin (package - (name "clash-meta-bin") - (version "1.16.0") + (name "mihomo-bin") + (version "1.18.0") (source (origin (method url-fetch) - (uri (string-append "https://github.com/MetaCubeX/Clash.Meta" - "/releases/download/v" version - "/clash.meta-linux-amd64-v" version ".gz")) + (uri (string-append + "https://github.com/MetaCubeX/mihomo/releases/download/v" + version "/mihomo-linux-amd64-v" version ".gz")) (sha256 (base32 - "1kl4v87lqnc78zcvh0a9kyx3gfbj74nmpgcdd93kpaxa3rmrfnjb")))) + "1b2ljl14k4vbpq4dgms1hk0iys161afyr1j2hl2hga70ay6n7j7i")))) (build-system copy-build-system) (arguments (list #:install-plan #~'((#$(string-append - "clash.meta-linux-amd64-v" (package-version this-package)) - "bin/clash.meta")) + "mihomo-linux-amd64-v" (package-version this-package)) + "bin/mihomo")) #:phases #~(modify-phases %standard-phases (add-after 'install 'fix-permission (lambda _ - (chmod (string-append #$output "/bin/clash.meta") #o555)))))) + (chmod (string-append #$output "/bin/mihomo") #o555)))))) (supported-systems '("x86_64-linux")) (home-page "https://wiki.metacubex.one/") (synopsis "Rule-based tunnel in Go") (description - "This package provides @command{clash.meta}, another @code{clash} kernel.") + "This package provides @command{mihomo}, another @code{clash} kernel.") (license license:gpl3))) +(define-public clash-meta-bin + (deprecated-package "clash-meta-bin" mihomo-bin)) + (define-public cloudflare-warp-bin (package (name "cloudflare-warp-bin") diff --git a/rosenthal/services/child-error.scm b/rosenthal/services/child-error.scm index ff9cf6a..c099908 100644 --- a/rosenthal/services/child-error.scm +++ b/rosenthal/services/child-error.scm @@ -103,12 +103,12 @@ (provision shepherd-provision) (requirement '(loopback networking)) (start #~(make-forkexec-constructor - (list (let ((clash-meta-cmd - #$(file-append clash "/bin/clash.meta")) + (list (let ((mihomo-cmd + #$(file-append clash "/bin/mihomo")) (clash-cmd #$(file-append clash "/bin/clash"))) - (if (file-exists? clash-meta-cmd) - clash-meta-cmd + (if (file-exists? mihomo-cmd) + mihomo-cmd clash-cmd)) "-d" #$data-directory) #:user "clash"