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

tinc_pre: 1.1pre14 -> 1.1pre15

Browse Source 
Remove an obsolete patch
Add lassulus to maintainers
Supply the build with the correct version number and changelog
This commit is contained in:
lassulus 2017-09-14 22:12:08 +02:00 committed by Franz Pletz
parent 6f15e1d3c9
commit f4dfa30d24
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/networking/tinc/pre.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tinc-${version}"; name = "tinc-${version}";
version = "1.1pre14"; version = "1.1pre15";
src = fetchgit { src = fetchgit {
rev = "refs/tags/release-${version}"; rev = "refs/tags/release-${version}";
url = "git://tinc-vpn.org/tinc"; url = "git://tinc-vpn.org/tinc";
sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc"; sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5";
}; };
outputs = [ "out" "man" "info" ]; outputs = [ "out" "man" "info" ];
@ -15,18 +15,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook texinfo ]; nativeBuildInputs = [ autoreconfHook texinfo ];
buildInputs = [ ncurses readline zlib lzo openssl ]; buildInputs = [ ncurses readline zlib lzo openssl ];
# needed so the build doesn't need to run git to find out the version.
prePatch = '' prePatch = ''
substituteInPlace configure.ac --replace UNKNOWN ${version} substituteInPlace configure.ac --replace UNKNOWN ${version}
echo "${version}" > configure-version
echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog
sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac
''; '';
patches = [
# Avoid infinite loop with "Error while reading from Linux tun/tap device (tun mode) /dev/net/tun: File descriptor in bad state" on network restart
(fetchpatch {
url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
})
];
postInstall = '' postInstall = ''
rm $out/bin/tinc-gui rm $out/bin/tinc-gui
''; '';
@ -47,6 +43,6 @@ stdenv.mkDerivation rec {
homepage="http://www.tinc-vpn.org/"; homepage="http://www.tinc-vpn.org/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington fpletz ]; maintainers = with maintainers; [ wkennington fpletz lassulus ];
}; };
} }