Unverified Commit befee44c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #143666 from LibreCybernetics/remove-vtun

parents 87695e30 b96ab960

pkgs/tools/networking/vtun/default.nix

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:



stdenv.mkDerivation rec {

  pname = "vtun";

  version = "3.0.4";



  src = fetchurl {

    url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz";

    sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";

  };



  patches = [

    (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch";

                 sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1";

                })

  ];



  postPatch = ''

    sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in

    sed -i '/strip/d' Makefile.in

  '';

  buildInputs = [ lzo openssl zlib bison flex ];



  configureFlags = [

    "--with-lzo-headers=${lzo}/include/lzo"

    "--with-ssl-headers=${openssl.dev}/include/openssl"

    "--with-blowfish-headers=${openssl.dev}/include/openssl"

  ];



  meta = with lib; {

      description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption";

      homepage = "http://vtun.sourceforge.net/";

      license = licenses.gpl2;

      platforms = platforms.linux;

      maintainers = with maintainers; [ pSub ];

  };

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -967,6 +967,7 @@ mapAliases ({ 
  virtmanager-qt = virt-manager-qt; # added 2019-10-29

  virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21

  vorbisTools = vorbis-tools; # added 2016-01-26

  vtun = throw "vtune has been removed as it's unmaintained upstream."; # added 2021-10-29

  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

  webkit = webkitgtk; # added 2019-03-05

  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

+0 −4
Original line number Diff line number Diff line
@@ -10387,10 +10387,6 @@ with pkgs; 














  sentry-native = callPackage ../development/libraries/sentry-native { };



























  vtun = callPackage ../tools/networking/vtun {













    openssl = openssl_1_0_2;













  };



























  waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {















    inherit (darwin.apple_sdk.frameworks) OpenCL;















  };