git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #143666 from LibreCybernetics/remove-vtun
commitbefee44c7708dbbc93e9a5405269cfc70b1fc7ee authorSandro <sandro.jaeckel@gmail.com> dateFri 29 Oct 2021, 16:41 (5 years ago) parent87695e3b96ab96
3 files changed+1−41
pkgs/tools/networking/vtun/default.nix−37 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−4
pkgs/tools/networking/vtun/default.nixdeleted−37
@@ -1,37 +0,0 @@
1−{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:
2−
3−stdenv.mkDerivation rec {
4− pname = "vtun";
5− version = "3.0.4";
6−
7− src = fetchurl {
8− url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz";
9− sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";
10− };
11−
12− patches = [
13− (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch";
14− sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1";
15− })
16− ];
17−
18− postPatch = ''
19− sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in
20− sed -i '/strip/d' Makefile.in
21− '';
22− buildInputs = [ lzo openssl zlib bison flex ];
23−
24− configureFlags = [
25− "--with-lzo-headers=${lzo}/include/lzo"
26− "--with-ssl-headers=${openssl.dev}/include/openssl"
27− "--with-blowfish-headers=${openssl.dev}/include/openssl"
28− ];
29−
30− meta = with lib; {
31− description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";
32− homepage = "http://vtun.sourceforge.net/";
33− license = licenses.gpl2;
34− platforms = platforms.linux;
35− maintainers = with maintainers; [ pSub ];
36− };
37−}
pkgs/top-level/aliases.nix+1
@@ -967,6 +967,7 @@ mapAliases ({
967967 virtmanager-qt = virt-manager-qt; # added 2019-10-29
968968 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21
969969 vorbisTools = vorbis-tools; # added 2016-01-26
970+ vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29
970971 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # added 2020-01-13
971972 webkit = webkitgtk; # added 2019-03-05
972973 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
pkgs/top-level/all-packages.nix−4
@@ -10387,10 +10387,6 @@ with pkgs;
1038710387
1038810388 sentry-native = callPackage ../development/libraries/sentry-native { };
1038910389
10390− vtun = callPackage ../tools/networking/vtun {
10391− openssl = openssl_1_0_2;
10392− };
10393−
1039410390 waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
1039510391 inherit (darwin.apple_sdk.frameworks) OpenCL;
1039610392 };