Unverified Commit d2492927 authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #264401 from ehmry/yggdrasil 

yggdrasil: 0.4.7 -> 0.5.1
parents 7c3e584e 50d42883

pkgs/tools/networking/yggdrasil/default.nix→pkgs/by-name/yg/yggdrasil/package.nix

+6 −9
Original line number Diff line number Diff line
@@ -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;

pkgs/tools/networking/yggdrasil/change-runtime-dir.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
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",

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -30324,8 +30324,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 { };