Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #178148 from misuzu/zerotierone

zerotierone: 1.8.9 -> 1.10.0

authored by Jörg Thalheim and committed by GitHub 0d68d7c8 b07506ae

Changed files
+5 -4
pkgs
tools
networking
zerotierone
+5 -4
pkgs/tools/networking/zerotierone/default.nix
··· 15 15 16 16 let 17 17 pname = "zerotierone"; 18 - version = "1.8.9"; 18 + version = "1.10.0"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "zerotier"; 22 22 repo = "ZeroTierOne"; 23 23 rev = version; 24 - sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA="; 24 + sha256 = "sha256-2lxXgQArHTFCuSBbKRSaLka42p2INLDg0z3TZ+J5msc="; 25 25 }; 26 26 in stdenv.mkDerivation { 27 27 inherit pname version src; ··· 29 29 cargoDeps = rustPlatform.fetchCargoTarball { 30 30 src = "${src}/zeroidc"; 31 31 name = "${pname}-${version}"; 32 - sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM="; 32 + sha256 = "sha256-Q9uBUD5xxo5gcTQTedVqQv+Z7B1TTPWtaTSuWo7WEPM="; 33 33 }; 34 34 postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; 35 35 ··· 39 39 --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ 40 40 41 41 substituteInPlace ./make-linux.mk \ 42 - --replace 'armv5' 'armv6' 42 + --replace '-march=armv6zk' "" \ 43 + --replace '-mcpu=arm1176jzf-s' "" 43 44 ''; 44 45 45 46 nativeBuildInputs = [