Merge pull request #122617 from rnhmjoj/openconnect
openconnect-head: init at 2021-05-05
This commit is contained in:
commit
1ab8b02359
|
@ -1,4 +1,19 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib, fetchgit, darwin } :
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, pkg-config
|
||||||
|
, openssl ? null
|
||||||
|
, gnutls ? null
|
||||||
|
, gmp
|
||||||
|
, libxml2
|
||||||
|
, stoken
|
||||||
|
, zlib
|
||||||
|
, fetchgit
|
||||||
|
, darwin
|
||||||
|
, head ? false
|
||||||
|
, fetchFromGitLab
|
||||||
|
, autoreconfHook
|
||||||
|
}:
|
||||||
|
|
||||||
assert (openssl != null) == (gnutls == null);
|
assert (openssl != null) == (gnutls == null);
|
||||||
|
|
||||||
|
@ -9,15 +24,20 @@ let vpnc = fetchgit {
|
||||||
};
|
};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "openconnect";
|
pname = "openconnect${lib.optionalString head "-head"}";
|
||||||
version = "8.10";
|
version = if head then "2021-05-05" else "8.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src =
|
||||||
urls = [
|
if head then fetchFromGitLab {
|
||||||
"ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz"
|
owner = "openconnect";
|
||||||
];
|
repo = "openconnect";
|
||||||
sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih";
|
rev = "684f6db1aef78e61e01f511c728bf658c30b9114";
|
||||||
};
|
sha256 = "0waclawcymgd8sq9xbkn2q8mnqp4pd0gpyv5wrnb7i0nsv860wz8";
|
||||||
|
}
|
||||||
|
else fetchurl {
|
||||||
|
url = "ftp://ftp.infradead.org/pub/openconnect/${pname}-${version}.tar.gz";
|
||||||
|
sha256 = "1cdsx4nsrwawbsisfkldfc9i4qn60g03vxb13nzppr2br9p4rrih";
|
||||||
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
@ -29,12 +49,13 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
|
buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]
|
||||||
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;
|
++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ]
|
||||||
|
++ lib.optional head autoreconfHook;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "VPN Client for Cisco's AnyConnect SSL VPN";
|
description = "VPN Client for Cisco's AnyConnect SSL VPN";
|
||||||
homepage = "http://www.infradead.org/openconnect/";
|
homepage = "http://www.infradead.org/openconnect/";
|
||||||
license = licenses.lgpl21;
|
license = licenses.lgpl21Only;
|
||||||
maintainers = with maintainers; [ pradeepchhetri tricktron ];
|
maintainers = with maintainers; [ pradeepchhetri tricktron ];
|
||||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||||
};
|
};
|
||||||
|
|
|
@ -9442,6 +9442,11 @@ in
|
||||||
openssl = null;
|
openssl = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
openconnect_head = callPackage ../tools/networking/openconnect {
|
||||||
|
head = true;
|
||||||
|
openssl = null;
|
||||||
|
};
|
||||||
|
|
||||||
ding-libs = callPackage ../tools/misc/ding-libs { };
|
ding-libs = callPackage ../tools/misc/ding-libs { };
|
||||||
|
|
||||||
sssd = callPackage ../os-specific/linux/sssd {
|
sssd = callPackage ../os-specific/linux/sssd {
|
||||||
|
|
Loading…
Reference in a new issue