Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

openconnect: update to version 7.06 and support openssl or gnutls

John Chee 85da7792 7a0ca522

+21 -5
+11 -4
pkgs/tools/networking/openconnect.nix
··· 1 - { stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2, zlib } : 2 3 stdenv.mkDerivation rec { 4 - name = "openconnect-5.02"; 5 6 src = fetchurl { 7 urls = [ 8 "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" 9 ]; 10 - sha256 = "1y7dn42gd3763sgwv2j72xy9hsikd6y9x142g84kwdbn0y0psgi4"; 11 }; 12 13 preConfigure = '' ··· 22 "--without-openssl-version-check" 23 ]; 24 25 - propagatedBuildInputs = [ vpnc openssl libxml2 zlib ]; 26 }
··· 1 + { stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } : 2 + 3 + let 4 + xor = a: b: (a || b) && (!(a && b)); 5 + in 6 + 7 + assert xor (openssl != null) (gnutls != null); 8 9 stdenv.mkDerivation rec { 10 + name = "openconnect-7.06"; 11 12 src = fetchurl { 13 urls = [ 14 "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz" 15 ]; 16 + sha256 = "1wkhmgfxkdkhy2p9w9idrgipxmxij2z4f88flfk3fifwd19nkkzs"; 17 }; 18 19 preConfigure = '' ··· 28 "--without-openssl-version-check" 29 ]; 30 31 + buildInputs = [ pkgconfig ]; 32 + propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ]; 33 }
+10 -1
pkgs/top-level/all-packages.nix
··· 3144 3145 vpnc = callPackage ../tools/networking/vpnc { }; 3146 3147 - openconnect = callPackage ../tools/networking/openconnect.nix { }; 3148 3149 vtun = callPackage ../tools/networking/vtun { }; 3150
··· 3144 3145 vpnc = callPackage ../tools/networking/vpnc { }; 3146 3147 + openconnect = openconnect_openssl; 3148 + 3149 + openconnect_openssl = callPackage ../tools/networking/openconnect.nix { 3150 + gnutls = null; 3151 + }; 3152 + 3153 + openconnect_gnutls = lowPrio (openconnect.override { 3154 + openssl = null; 3155 + gnutls = gnutls; 3156 + }); 3157 3158 vtun = callPackage ../tools/networking/vtun { }; 3159