mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2025-11-03 19:24:37 +00:00
rosenthal: tailscale: Update to 1.90.4.
* modules/rosenthal/packages/networking.scm (tailscale): Update to 1.90.4. [arguments] <#:phases>: Move PATH modification to ... * modules/rosenthal/packages/patches/tailscale-set-guix-system-PATH-for-SSH.patch: ... this patch.
This commit is contained in:
parent
7b15542d77
commit
442edefa43
@ -9,6 +9,7 @@
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (rosenthal utils download)
|
||||
#:use-module (rosenthal utils packages)
|
||||
#:use-module (gnu packages base)
|
||||
#:use-module (gnu packages dns)
|
||||
#:use-module (gnu packages golang)
|
||||
@ -258,7 +259,7 @@ a SOCKS5 proxy.")
|
||||
(define-public tailscale
|
||||
(package
|
||||
(name "tailscale")
|
||||
(version "1.90.2")
|
||||
(version "1.90.4")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
@ -267,7 +268,10 @@ a SOCKS5 proxy.")
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"07m76ijcrspmmyncdqvyfsi5nfca0m4gs3bjlzxg3ly7gg9hnfhr"))
|
||||
"0rs6db5dfmhiaylkpv85b3xn8n7y612z1vln79m33xgvc708vpni"))
|
||||
(patches
|
||||
(rosenthal-patches
|
||||
"tailscale-set-guix-system-PATH-for-SSH.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
'(begin
|
||||
@ -319,26 +323,6 @@ a SOCKS5 proxy.")
|
||||
"derpprobe"
|
||||
"tailscaled"
|
||||
"tsidp")))))
|
||||
(add-after 'unpack 'fix-paths
|
||||
(lambda _
|
||||
(substitute* "ssh/tailssh/user.go"
|
||||
(((format #f "(\")(~a|~a\")"
|
||||
(string-join
|
||||
'("/usr/local/sbin"
|
||||
"/usr/local/bin"
|
||||
"/usr/sbin"
|
||||
"/usr/bin"
|
||||
"/sbin"
|
||||
"/bin")
|
||||
":")
|
||||
(string-join
|
||||
'("/usr/local/bin"
|
||||
"/usr/bin"
|
||||
"/bin")
|
||||
":"))
|
||||
_ prefix suffix)
|
||||
(format #f "~a/run/current-system/profile/bin:~a"
|
||||
prefix suffix)))))
|
||||
(add-after 'install 'install-extras
|
||||
(lambda _
|
||||
(symlink (in-vicinity #$output "bin/tailscaled")
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
From 06ab33a4317d41953ad167bfabd5b5ff4e001fee Mon Sep 17 00:00:00 2001
|
||||
From: Hilton Chain <hako@ultrarare.space>
|
||||
Date: Wed, 29 Oct 2025 18:58:27 +0800
|
||||
Subject: [PATCH] Set Guix System PATH for Tailscale SSH.
|
||||
|
||||
---
|
||||
ssh/tailssh/user.go | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ssh/tailssh/user.go b/ssh/tailssh/user.go
|
||||
index ac92c762a..fccc5cbf5 100644
|
||||
--- a/ssh/tailssh/user.go
|
||||
+++ b/ssh/tailssh/user.go
|
||||
@@ -109,9 +109,9 @@ func defaultPathForUser(u *user.User) string {
|
||||
return defaultPathForUserOnNixOS(u)
|
||||
}
|
||||
if isRoot {
|
||||
- return "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
+ return "/run/privileged/bin:/run/current-system/profile/sbin:/run/current-system/profile/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
}
|
||||
- return "/usr/local/bin:/usr/bin:/bin"
|
||||
+ return "/run/privileged/bin:/run/current-system/profile/sbin:/run/current-system/profile/bin:/usr/local/bin:/usr/bin:/bin"
|
||||
}
|
||||
|
||||
func defaultPathForUserOnNixOS(u *user.User) string {
|
||||
--
|
||||
2.51.0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user