Merge pull request #22240 from pradeepchhetri/openconnect

openconnect: 7.06 -> 7.08
This commit is contained in:
Arseniy Seroka 2017-01-29 02:13:14 +03:00 committed by GitHub
commit d948e55c27
2 changed files with 8 additions and 4 deletions

View File

@ -7,13 +7,13 @@ in
assert xor (openssl != null) (gnutls != null);
stdenv.mkDerivation rec {
name = "openconnect-7.06";
name = "openconnect-7.08";
src = fetchurl {
urls = [
"ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
];
sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs";
sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w";
};
preConfigure = ''
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
meta = {
description = "VPN Client for Cisco's AnyConnect SSL VPN";
homepage = http://www.infradead.org/openconnect/;
license = stdenv.lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ pradeepchhetri ];
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -4204,11 +4204,11 @@ with pkgs;
openconnect = openconnect_gnutls;
openconnect_openssl = callPackage ../tools/networking/openconnect.nix {
openconnect_openssl = callPackage ../tools/networking/openconnect {
gnutls = null;
};
openconnect_gnutls = callPackage ../tools/networking/openconnect.nix {
openconnect_gnutls = callPackage ../tools/networking/openconnect {
openssl = null;
};