From 56ed9f8b94cd56ceebdbef84b05af5eb26629fb2 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Sun, 29 Jan 2017 02:35:37 +0530 Subject: [PATCH] openconnect: 7.06 -> 7.08 --- .../{openconnect.nix => openconnect/default.nix} | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) rename pkgs/tools/networking/{openconnect.nix => openconnect/default.nix} (71%) diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect/default.nix similarity index 71% rename from pkgs/tools/networking/openconnect.nix rename to pkgs/tools/networking/openconnect/default.nix index 2160bdda9e1..d9e3063f5c1 100644 --- a/pkgs/tools/networking/openconnect.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3d786bac28..4056431fbdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4202,11 +4202,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; };