Merge pull request #128555 from NixOS/backport-128479-to-release-21.05

[Backport release-21.05] tinc_pre: 1.1pre17 -> 1.1pre18
This commit is contained in:
Linus Heckemann 2021-06-28 23:23:12 +02:00 committed by GitHub
commit 623912568d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions

View File

@ -2,24 +2,16 @@
stdenv.mkDerivation rec {
pname = "tinc";
version = "1.1pre17";
version = "1.1pre18";
src = fetchgit {
rev = "refs/tags/release-${version}";
rev = "release-${version}";
url = "git://tinc-vpn.org/tinc";
sha256 = "12abmx9qglchgn94a1qwgzldf2kaz77p8705ylpggzyncxv6bw2q";
sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm";
};
outputs = [ "out" "man" "info" ];
patches = [
(fetchpatch {
name = "tinc-openssl-1.0.2r.patch";
url = "http://git.tinc-vpn.org/git/browse?p=tinc;a=patch;h=2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904";
sha256 = "0kidzlmgl0cin4g54ygcxa0jbq9vwlk3dyq5f65nkjd8yvayfzi8";
})
];
nativeBuildInputs = [ autoreconfHook texinfo ];
buildInputs = [ ncurses readline zlib lzo openssl ];