diff options
author | Lassulus <github@lassul.us> | 2023-10-31 08:09:43 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-31 08:09:43 +0000 |
commit | d24929277ba7106c3a17c880936efdcc7931457e (patch) | |
tree | c1c29b5fd9c2e87a29e21367dd75105dc0441a2a /pkgs/tools/networking | |
parent | 7c3e584ea5036750280eb89f3f592690e644703d (diff) | |
parent | 50d4288307d27bad3193dc28f82ca91f8f4b20c3 (diff) | |
download | nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar.gz nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar.bz2 nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar.lz nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar.xz nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.tar.zst nixpkgs-d24929277ba7106c3a17c880936efdcc7931457e.zip |
Merge pull request #264401 from ehmry/yggdrasil
yggdrasil: 0.4.7 -> 0.5.1
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/yggdrasil/change-runtime-dir.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/yggdrasil/default.nix | 38 |
2 files changed, 0 insertions, 50 deletions
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 b4edc6a8387..00000000000 --- 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/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix deleted file mode 100644 index 5154ef60bd0..00000000000 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: - -buildGoModule rec { - pname = "yggdrasil"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "yggdrasil-network"; - repo = "yggdrasil-go"; - rev = "v${version}"; - sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY="; - }; - - 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 ]; - - 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" - ]; - - passthru.tests.basic = nixosTests.yggdrasil; - - meta = with lib; { - description = - "An experiment in scalable routing as an encrypted IPv6 overlay network"; - homepage = "https://yggdrasil-network.github.io/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; - }; -} |