diff options
author | Daniel Fullmer <danielrf12@gmail.com> | 2019-07-30 13:19:15 -0400 |
---|---|---|
committer | Daniel Fullmer <danielrf12@gmail.com> | 2019-07-30 13:19:15 -0400 |
commit | 8c975f2f38c0767e82b00a1874ce822b237dd142 (patch) | |
tree | 39998e7302e2db32c1008387dc8051423dee6ed5 /pkgs/tools/networking | |
parent | 20b993ef2c9e818a636582ade9597f71a485209d (diff) | |
download | nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar.gz nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar.bz2 nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar.lz nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar.xz nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.tar.zst nixlib-8c975f2f38c0767e82b00a1874ce822b237dd142.zip |
zerotierone: 1.2.12 -> 1.4.0
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 2853c595e431..76a2dbd8850a 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: +{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.12"; - name = "zerotierone-${version}"; - - src = fetchurl { - url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "1m7ynrgzpg2sp37hcmjkx6w173icfhakzn1c1zrdzrxmmszrj9r1"; + pname = "zerotierone"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "zerotier"; + repo = "ZeroTierOne"; + rev = version; + sha256 = "14iwhlxmxsnvnm9rrp6rysiz461w0v5nsmnz5p91rfi351103a63"; }; preConfigure = '' @@ -16,9 +18,6 @@ stdenv.mkDerivation rec { substituteInPlace ./osdep/ManagedRoute.cpp \ --replace '/sbin/ip' '${iproute}/bin/ip' - substituteInPlace ./osdep/LinuxEthernetTap.cpp \ - --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ |