diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-06-19 08:34:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 08:34:29 +0100 |
| commit | 0d68d7c857fe301d49cdcd56130e0beea4ecd5aa (patch) | |
| tree | b31db3d08516b18194edc902938647a7b5b04541 | |
| parent | Merge pull request #178189 from alkasm/alkasm/maintainers-add-alkasm (diff) | |
| parent | zerotierone: 1.8.9 -> 1.10.0 (diff) | |
| download | nixpkgs-origin/nixos-test-staging.tar.gz | |
Merge pull request #178148 from misuzu/zerotieroneorigin/nixos-test-staging-baselineorigin/nixos-test-staging
zerotierone: 1.8.9 -> 1.10.0
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 5a9239e2737c..e06d8bb2f41d 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -15,13 +15,13 @@ let pname = "zerotierone"; - version = "1.8.9"; + version = "1.10.0"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-N1VqzjaFJRJiSG4qHqRy4Fs8TlkUqyDoq0/3JQdGwfA="; + sha256 = "sha256-2lxXgQArHTFCuSBbKRSaLka42p2INLDg0z3TZ+J5msc="; }; in stdenv.mkDerivation { inherit pname version src; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoTarball { src = "${src}/zeroidc"; name = "${pname}-${version}"; - sha256 = "sha256-PDsJtz279P2IpgiL0T92IbcANeGSUnGKhEH1dj9VtbM="; + sha256 = "sha256-Q9uBUD5xxo5gcTQTedVqQv+Z7B1TTPWtaTSuWo7WEPM="; }; postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; @@ -39,7 +39,8 @@ in stdenv.mkDerivation { --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ substituteInPlace ./make-linux.mk \ - --replace 'armv5' 'armv6' + --replace '-march=armv6zk' "" \ + --replace '-mcpu=arm1176jzf-s' "" ''; nativeBuildInputs = [ |