Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5cdabcc0eef5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d15dd3a08d9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 26, 2020

  1. zerotierone: 1.4.6 -> 1.6.0

    @danielfullmer @ehmry
    danielfullmer authored and ehmry committed Nov 26, 2020
    Copy the full SHA
    c05b0c3 View commit details

  2. zerotierone: 1.6.0 -> 1.6.1

    @danielfullmer @ehmry
    danielfullmer authored and ehmry committed Nov 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4d15dd3 View commit details
Showing with 2 additions and 8 deletions.
  1. +2 −8 pkgs/tools/networking/zerotierone/default.nix
10 changes: 2 additions & 8 deletions pkgs/tools/networking/zerotierone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,22 +2,16 @@

stdenv.mkDerivation rec {
pname = "zerotierone";
version = "1.4.6";
version = "1.6.1";

src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3";
sha256 = "0zk1lvjramahjpq94axdic8sgvvmgyg1fmcb89lynqqvh66qsv12";
};

preConfigure = ''
substituteInPlace ./osdep/ManagedRoute.cpp \
--replace '/usr/sbin/ip' '${iproute}/bin/ip'
substituteInPlace ./osdep/ManagedRoute.cpp \
--replace '/sbin/ip' '${iproute}/bin/ip'
patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \
--replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \