public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-07-01 00:02:42 +00:00
committed by GitHub
parent bb60ebee93 beb05a45aa
commit 5052d11c95
17 changed files with 531 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/tinc/pre.nix
+3 -11
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 ];