Merge pull request #123123 from trobert/remove-openconnect_pa
openconnect_pa: remove, integrated in openconnect upstream
This commit is contained in:
commit
8f0f1926a9
|
@ -1,40 +0,0 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, autoreconfHook } :
|
||||
|
||||
assert (openssl != null) == (gnutls == null);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "unstable-2018-10-08";
|
||||
pname = "openconnect_pa";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlenski";
|
||||
repo = "openconnect";
|
||||
rev = "e5fe063a087385c5b157ad7a9a3fa874181f6e3b";
|
||||
sha256 = "0ywacqs3nncr2gpjjcz2yc9c6v4ifjssh0vb07h0qff06whqhdax";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
export PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config
|
||||
export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
|
||||
export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
|
||||
"--disable-nls"
|
||||
"--without-openssl-version-check"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN";
|
||||
homepage = "https://github.com/dlenski/openconnect/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ chessai ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -503,6 +503,7 @@ mapAliases ({
|
|||
opencascade_oce = opencascade; # added 2018-04-25
|
||||
oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
|
||||
opencl-icd = ocl-icd; # added 2017-01-20
|
||||
openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
|
||||
openexr_ctl = ctl; # added 2018-04-25
|
||||
openisns = open-isns; # added 2020-01-28
|
||||
openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # added 2021-01-24
|
||||
|
|
|
@ -9383,10 +9383,6 @@ in
|
|||
SDL = SDL_sixel;
|
||||
};
|
||||
|
||||
openconnect_pa = callPackage ../tools/networking/openconnect_pa {
|
||||
openssl = null;
|
||||
};
|
||||
|
||||
openconnect = openconnect_gnutls;
|
||||
|
||||
openconnect_openssl = callPackage ../tools/networking/openconnect {
|
||||
|
|
Loading…
Reference in a new issue