pyrox.dev
tinc_pre: 1.1pre14 -> 1.1pre15
Remove an obsolete patch
Add lassulus to maintainers
Supply the build with the correct version number and changelog
authored by lassulus and committed by Franz Pletz f4dfa30d 6f15e1d3
+7
-11
pkgs/tools/networking/tinc/pre.nix
+7
-11
pkgs/tools/networking/tinc/pre.nix
···
2
3
stdenv.mkDerivation rec {
4
name = "tinc-${version}";
5
-
version = "1.1pre14";
6
7
src = fetchgit {
8
rev = "refs/tags/release-${version}";
9
url = "git://tinc-vpn.org/tinc";
10
-
sha256 = "05an2vj0a3wjv5w672wgzyixbydin5jpja5zv6x81bc72dms0ymc";
11
};
12
13
outputs = [ "out" "man" "info" ];
···
15
nativeBuildInputs = [ autoreconfHook texinfo ];
16
buildInputs = [ ncurses readline zlib lzo openssl ];
17
18
prePatch = ''
19
substituteInPlace configure.ac --replace UNKNOWN ${version}
20
'';
21
22
-
patches = [
23
-
# 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
24
-
(fetchpatch {
25
-
url = https://github.com/gsliepen/tinc/compare/acefa66...e4544db.patch;
26
-
sha256 = "1jz7anqqzk7j96l5ifggc2knp14fmbsjdzfrbncxx0qhb6ihdcvn";
27
-
})
28
-
];
29
-
30
postInstall = ''
31
rm $out/bin/tinc-gui
32
'';
···
47
homepage="http://www.tinc-vpn.org/";
48
license = licenses.gpl2Plus;
49
platforms = platforms.unix;
50
-
maintainers = with maintainers; [ wkennington fpletz ];
51
};
52
}
···
2
3
stdenv.mkDerivation rec {
4
name = "tinc-${version}";
5
+
version = "1.1pre15";
6
7
src = fetchgit {
8
rev = "refs/tags/release-${version}";
9
url = "git://tinc-vpn.org/tinc";
10
+
sha256 = "1msym63jpipvzb5dn8yn8yycrii43ncfq6xddxh2ifrakr48l6y5";
11
};
12
13
outputs = [ "out" "man" "info" ];
···
15
nativeBuildInputs = [ autoreconfHook texinfo ];
16
buildInputs = [ ncurses readline zlib lzo openssl ];
17
18
+
# needed so the build doesn't need to run git to find out the version.
19
prePatch = ''
20
substituteInPlace configure.ac --replace UNKNOWN ${version}
21
+
echo "${version}" > configure-version
22
+
echo "https://tinc-vpn.org/git/browse?p=tinc;a=log;h=refs/tags/release-${version}" > ChangeLog
23
+
sed -i '/AC_INIT/s/m4_esyscmd_s.*/${version})/' configure.ac
24
'';
25
26
postInstall = ''
27
rm $out/bin/tinc-gui
28
'';
···
43
homepage="http://www.tinc-vpn.org/";
44
license = licenses.gpl2Plus;
45
platforms = platforms.unix;
46
+
maintainers = with maintainers; [ wkennington fpletz lassulus ];
47
};
48
}