yggdrasil: 0.4.7 -> 0.5.1

This commit is contained in:
Emery Hemingway 2023-10-30 16:45:11 +00:00
parent 63678e9f3d
commit 50d4288307
3 changed files with 6 additions and 23 deletions

View File

@ -2,28 +2,25 @@
buildGoModule rec {
pname = "yggdrasil";
version = "0.4.7";
version = "0.5.1";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY=";
sha256 = "sha256-JeeOT3fb+4+eUyWl7rAXa5+Yf1XCT20xJeCdhBC0oeo=";
};
vendorHash = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc=";
# Change the default location of the management socket on Linux
# systems so that the yggdrasil system service unit does not have to
# be granted write permission to /run.
patches = [ ./change-runtime-dir.patch ];
vendorHash = "sha256-yu725RgKDRmpNFNuffBFKZjZOFyzt00kKGuz696JHk0=";
subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
ldflags = [
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
"-s" "-w"
"-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock"
"-s"
"-w"
];
passthru.tests.basic = nixosTests.yggdrasil;

View File

@ -1,12 +0,0 @@
diff -ruN a/src/defaults/defaults_linux.go b/src/defaults/defaults_linux.go
--- a/src/defaults/defaults_linux.go 2019-06-17 10:23:09.495613784 -0700
+++ b/src/defaults/defaults_linux.go 2019-07-01 10:17:11.295669440 -0700
@@ -7,7 +7,7 @@
func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{
// Admin
- DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+ DefaultAdminListen: "unix:///var/run/yggdrasil/yggdrasil.sock",
// Configuration (used for yggdrasilctl)
DefaultConfigFile: "/etc/yggdrasil.conf",

View File

@ -30323,8 +30323,6 @@ with pkgs;
anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { };
yggdrasil = callPackage ../tools/networking/yggdrasil { };
masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };