diff options
author | Emery Hemingway <ehmry@posteo.net> | 2023-10-30 16:45:11 +0000 |
---|---|---|
committer | Emery Hemingway <ehmry@posteo.net> | 2023-10-30 22:23:34 +0000 |
commit | 50d4288307d27bad3193dc28f82ca91f8f4b20c3 (patch) | |
tree | 752dab72b47530f383ae89e5c8c4d5c3b238ac0f | |
parent | 63678e9f3d3afecfeafa0acead6239cdb447574c (diff) |
yggdrasil: 0.4.7 -> 0.5.1
-rw-r--r-- | pkgs/by-name/yg/yggdrasil/package.nix (renamed from pkgs/tools/networking/yggdrasil/default.nix) | 15 | ||||
-rw-r--r-- | pkgs/tools/networking/yggdrasil/change-runtime-dir.patch | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 6 insertions, 23 deletions
diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/by-name/yg/yggdrasil/package.nix index 5154ef60bd0a2..858e8400d0049 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/by-name/yg/yggdrasil/package.nix @@ -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; diff --git a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch b/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch deleted file mode 100644 index b4edc6a838716..0000000000000 --- a/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch +++ /dev/null @@ -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", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eacb266e2ff79..69cc6febbff6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |