From 53d105f80eae0291ae4cb613a2cf01c59a399393 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 29 Dec 2022 13:03:34 -0800 Subject: [PATCH] easyrsa2: remove --- pkgs/tools/networking/easyrsa/2.x.nix | 47 --------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 49 deletions(-) delete mode 100644 pkgs/tools/networking/easyrsa/2.x.nix diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix deleted file mode 100644 index b88aeda0fc5a..000000000000 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, makeWrapper -, gnugrep -, openssl -}: - -stdenv.mkDerivation rec { - pname = "easyrsa"; - version = "2.2.0"; - - src = fetchFromGitHub { - owner = "OpenVPN"; - repo = "easy-rsa"; - rev = "v${version}"; - sha256 = "sha256-zTdk8mv+gC/SHK813wZ6CWZf9Jm2XkKfAPU3feFpAkY="; - }; - - preBuild = '' - mkdir -p $out/share/easy-rsa - ''; - - nativeBuildInputs = [ autoreconfHook makeWrapper ]; - buildInputs = [ gnugrep openssl ]; - - # Make sane defaults and patch default config vars - postInstall = '' - cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf - for prog in $(find "$out/share/easy-rsa" -executable -type f); do - makeWrapper "$prog" "$out/bin/$(basename $prog)" \ - --set EASY_RSA "$out/share/easy-rsa" \ - --set OPENSSL "${openssl.bin}/bin/openssl" \ - --set GREP "${gnugrep}/bin/grep" - done - sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars - ''; - - meta = with lib; { - description = "Simple shell based CA utility"; - homepage = "https://openvpn.net/"; - license = licenses.gpl2; - maintainers = [ maintainers.offline ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6246647a2c1d..30bf74e7be46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6557,8 +6557,6 @@ with pkgs; easyrsa = callPackage ../tools/networking/easyrsa { }; - easyrsa2 = callPackage ../tools/networking/easyrsa/2.x.nix { }; - easysnap = callPackage ../tools/backup/easysnap { }; ebook_tools = callPackage ../tools/text/ebook-tools { };