summary refs log tree commit diff
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2016-06-30 10:34:46 +0100
committerGitHub <noreply@github.com>2016-06-30 10:34:46 +0100
commit85781f9bb63e5e85fdd6f55b39583cd5984e270c (patch)
tree762e5dc33d00a4c16cf7821454dab96f7afef671
parent51c04b74c1b39483c4e2674912c7590adeb41665 (diff)
parent3f4f3c40052c09790facd468a87d12e34a56558a (diff)
downloadnixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar.gz
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar.bz2
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar.lz
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar.xz
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.tar.zst
nixpkgs-85781f9bb63e5e85fdd6f55b39583cd5984e270c.zip
Merge pull request #16613 from danielfullmer/zerotierone-update
zerotierone: 1.1.4 -> 1.1.6
-rw-r--r--pkgs/tools/networking/zerotierone/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index e05a65d6967..29d131b509b 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.1.4";
+  version = "1.1.6";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "10aw0dlkmprdvph3aqkqximxqkryf0l4jcnv2bbm7f1qvclqihva";
+    sha256 = "1bl8dppaqydsd1qf9pk3bp16amkwjxyqh1gvm62ys2a0m4c529ks";
   };
 
   preConfigure = ''
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl lzo zlib gcc iproute ];
 
+  buildFlags = [ "one" ]; # TODO: Add support for building and installing manpages as well.
+
   installPhase = ''
     install -Dt "$out/bin/" zerotier-one
     ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool