commit ef45f53bc97bdd3d3a1f30f7601195b7a7eb08ac · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       694
       694
        
         ./services/networking/gdomap.nix

     

       695
       695
        
         ./services/networking/ghostunnel.nix

     

       696
       696
        
         ./services/networking/git-daemon.nix

     

       697
       697
       +
         ./services/networking/globalprotect-vpn.nix

     

       697
       698
        
         ./services/networking/gnunet.nix

     

       698
       699
        
         ./services/networking/go-neb.nix

     

       699
       700
        
         ./services/networking/go-shadowsocks2.nix

+43

nixos/modules/services/networking/globalprotect-vpn.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.services.globalprotect;

     

       7
       7
       +
       

     

       8
       8
       +
         execStart = if cfg.csdWrapper == null then

     

       9
       9
       +
             "${pkgs.globalprotect-openconnect}/bin/gpservice"

     

       10
       10
       +
           else

     

       11
       11
       +
             "${pkgs.globalprotect-openconnect}/bin/gpservice --csd-wrapper=${cfg.csdWrapper}";

     

       12
       12
       +
       in

     

       13
       13
       +
       

     

       14
       14
       +
       {

     

       15
       15
       +
         options.services.globalprotect = {

     

       16
       16
       +
           enable = mkEnableOption "globalprotect";

     

       17
       17
       +
       

     

       18
       18
       +
           csdWrapper = mkOption {

     

       19
       19
       +
             description = ''

     

       20
       20
       +
               A script that will produce a Host Integrity Protection (HIP) report,

     

       21
       21
       +
               as described at <link xlink:href="https://www.infradead.org/openconnect/hip.html" />

     

       22
       22
       +
             '';

     

       23
       23
       +
             default = null;

     

       24
       24
       +
             example = literalExample "\${pkgs.openconnect}/libexec/openconnect/hipreport.sh";

     

       25
       25
       +
             type = types.nullOr types.path;

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         config = {

     

       30
       30
       +
           services.dbus.packages = [ pkgs.globalprotect-openconnect ];

     

       31
       31
       +
       

     

       32
       32
       +
           systemd.services.gpservice = {

     

       33
       33
       +
             description = "GlobalProtect openconnect DBus service";

     

       34
       34
       +
             serviceConfig = {

     

       35
       35
       +
               Type="dbus";

     

       36
       36
       +
               BusName="com.yuezk.qt.GPService";

     

       37
       37
       +
               ExecStart=execStart;

     

       38
       38
       +
             };

     

       39
       39
       +
             wantedBy = [ "multi-user.target" ];

     

       40
       40
       +
             after = [ "network.target" ];

     

       41
       41
       +
           };

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+43

pkgs/tools/networking/globalprotect-openconnect/default.nix

···

       1
       1
       +
       { stdenv, lib, fetchFromGitHub

     

       2
       2
       +
       , qmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         pname = "globalprotect-openconnect";

     

       7
       7
       +
         version = "1.2.6";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "yuezk";

     

       11
       11
       +
           repo = "GlobalProtect-openconnect";

     

       12
       12
       +
           rev = "c14a6ad1d2b62f8d297bc4cfbcb1dcea4d99112f";

     

       13
       13
       +
           fetchSubmodules = true;

     

       14
       14
       +
           sha256 = "1zkc3vk1j31n2zs5ammzv23dah7x163gfrzz222ynbkvsccrhzrk";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         nativeBuildInputs = [ qmake wrapQtAppsHook ];

     

       18
       18
       +
       

     

       19
       19
       +
         buildInputs = [ openconnect qtwebsockets qtwebengine ];

     

       20
       20
       +
       

     

       21
       21
       +
         patchPhase = ''

     

       22
       22
       +
           for f in GPClient/GPClient.pro \

     

       23
       23
       +
             GPClient/com.yuezk.qt.gpclient.desktop \

     

       24
       24
       +
             GPService/GPService.pro \

     

       25
       25
       +
             GPService/dbus/com.yuezk.qt.GPService.service \

     

       26
       26
       +
             GPService/systemd/gpservice.service; do

     

       27
       27
       +
               substituteInPlace $f \

     

       28
       28
       +
                 --replace /usr $out \

     

       29
       29
       +
                 --replace /etc $out/lib;

     

       30
       30
       +
           done;

     

       31
       31
       +
       

     

       32
       32
       +
           substituteInPlace GPService/gpservice.h \

     

       33
       33
       +
             --replace /usr/local/bin/openconnect ${openconnect}/bin/openconnect;

     

       34
       34
       +
         '';

     

       35
       35
       +
       

     

       36
       36
       +
         meta = with lib; {

     

       37
       37
       +
           description = "GlobalProtect VPN client (GUI) for Linux based on OpenConnect that supports SAML auth mode";

     

       38
       38
       +
           homepage = "https://github.com/yuezk/GlobalProtect-openconnect";

     

       39
       39
       +
           license = licenses.gpl3Only;

     

       40
       40
       +
           maintainers = [ maintainers.jerith666 ];

     

       41
       41
       +
           platforms = platforms.linux;

     

       42
       42
       +
         };

     

       43
       43
       +
       }

+6 -12

pkgs/tools/networking/openconnect/default.nix

···

       8
       8
        
       , libxml2

     

       9
       9
        
       , stoken

     

       10
       10
        
       , zlib

     

       11
       11
       -
       , fetchgit

     

       12
       12
       -
       , darwin

     

       11
       11
       +
       , vpnc-scripts

     

       12
       12
       +
       , PCSC

     

       13
       13
        
       , head ? false

     

       14
       14
        
         , fetchFromGitLab

     

       15
       15
        
         , autoreconfHook

     
···

       17
       17
        
       

     

       18
       18
        
       assert (openssl != null) == (gnutls == null);

     

       19
       19
        
       

     

       20
       20
       -
       let vpnc = fetchgit {

     

       21
       21
       -
         url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git";

     

       22
       22
       -
         rev = "c0122e891f7e033f35f047dad963702199d5cb9e";

     

       23
       23
       -
         sha256 = "11b1ls012mb704jphqxjmqrfbbhkdjb64j2q4k8wb5jmja8jnd14";

     

       24
       24
       -
       };

     

       25
       25
       -
       

     

       26
       26
       -
       in stdenv.mkDerivation rec {

     

       20
       20
       +
       stdenv.mkDerivation rec {

     

       27
       21
        
         pname = "openconnect${lib.optionalString head "-head"}";

     

       28
       22
        
         version = if head then "2021-05-05" else "8.10";

     

       29
       23
        
       

     
···

       42
       36
        
         outputs = [ "out" "dev" ];

     

       43
       37
        
       

     

       44
       38
        
         configureFlags = [

     

       45
       45
       -
           "--with-vpnc-script=${vpnc}/vpnc-script"

     

       39
       39
       +
           "--with-vpnc-script=${vpnc-scripts}/bin/vpnc-script"

     

       46
       40
        
           "--disable-nls"

     

       47
       41
        
           "--without-openssl-version-check"

     

       48
       42
        
         ];

     

       49
       43
        
       

     

       50
       44
        
         buildInputs = [ openssl gnutls gmp libxml2 stoken zlib ]

     

       51
       51
       -
           ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.PCSC;

     

       45
       45
       +
           ++ lib.optional stdenv.isDarwin PCSC;

     

       52
       46
        
         nativeBuildInputs = [ pkg-config ]

     

       53
       47
        
           ++ lib.optional head autoreconfHook;

     

       54
       48
        
       

     

       55
       49
        
         meta = with lib; {

     

       56
       50
        
           description = "VPN Client for Cisco's AnyConnect SSL VPN";

     

       57
       57
       -
           homepage = "http://www.infradead.org/openconnect/";

     

       51
       51
       +
           homepage = "https://www.infradead.org/openconnect/";

     

       58
       52
        
           license = licenses.lgpl21Only;

     

       59
       53
        
           maintainers = with maintainers; [ pradeepchhetri tricktron ];

     

       60
       54
        
           platforms = lib.platforms.linux ++ lib.platforms.darwin;

+41

pkgs/tools/networking/vpnc-scripts/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchgit

     

       2
       2
       +
       , makeWrapper

     

       3
       3
       +
       , nettools, gawk, systemd, openresolv, coreutils, gnugrep

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       stdenv.mkDerivation {

     

       7
       7
       +
         pname = "vpnc-scripts";

     

       8
       8
       +
         version = "unstable-2021-03-21";

     

       9
       9
       +
         src = fetchgit {

     

       10
       10
       +
           url = "git://git.infradead.org/users/dwmw2/vpnc-scripts.git";

     

       11
       11
       +
           rev = "8fff06090ed193c4a7285e9a10b42e6679e8ecf3";

     

       12
       12
       +
           sha256 = "14bzzpwz7kdmlbx825h6s4jjdml9q6ziyrq8311lp8caql68qdq1";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         nativeBuildInputs = [ makeWrapper ];

     

       16
       16
       +
       

     

       17
       17
       +
         installPhase = ''

     

       18
       18
       +
           mkdir -p $out/bin

     

       19
       19
       +
           cp vpnc-script $out/bin

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         preFixup = ''

     

       23
       23
       +
           substituteInPlace $out/bin/vpnc-script \

     

       24
       24
       +
             --replace "which" "type -P"

     

       25
       25
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       26
       26
       +
           substituteInPlace $out/bin/vpnc-script \

     

       27
       27
       +
             --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf" \

     

       28
       28
       +
             --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl"

     

       29
       29
       +
         '' + ''

     

       30
       30
       +
           wrapProgram $out/bin/vpnc-script \

     

       31
       31
       +
             --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}"

     

       32
       32
       +
         '';

     

       33
       33
       +
       

     

       34
       34
       +
         meta = with lib; {

     

       35
       35
       +
           description = "script for vpnc to configure the network routing and name service";

     

       36
       36
       +
           homepage = "https://www.infradead.org/openconnect/";

     

       37
       37
       +
           license = licenses.gpl2Only;

     

       38
       38
       +
           maintainers = with maintainers; [ jerith666 ];

     

       39
       39
       +
           platforms = platforms.linux ++ platforms.darwin;

     

       40
       40
       +
         };

     

       41
       41
       +
       }

pkgs/top-level/all-packages.nix

···

       9515
       9515
        
       

     

       9516
       9516
        
         vpnc = callPackage ../tools/networking/vpnc { };

     

       9517
       9517
        
       

     

       9518
       9518
       +
         vpnc-scripts = callPackage ../tools/networking/vpnc-scripts { };

     

       9519
       9519
       +
       

     

       9518
       9520
        
         vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { };

     

       9519
       9521
        
       

     

       9520
       9522
        
         vp = callPackage ../applications/misc/vp {

     
···

       9527
       9529
        
         openconnect = openconnect_gnutls;

     

       9528
       9530
        
       

     

       9529
       9531
        
         openconnect_openssl = callPackage ../tools/networking/openconnect {

     

       9532
       9532
       +
           inherit (darwin.apple_sdk.frameworks) PCSC;

     

       9530
       9533
        
           gnutls = null;

     

       9531
       9534
        
         };

     

       9532
       9535
        
       

     

       9533
       9536
        
         openconnect_gnutls = callPackage ../tools/networking/openconnect {

     

       9537
       9537
       +
           inherit (darwin.apple_sdk.frameworks) PCSC;

     

       9534
       9538
        
           openssl = null;

     

       9535
       9539
        
         };

     

       9536
       9540
        
       

     

       9537
       9541
        
         openconnect_head = callPackage ../tools/networking/openconnect {

     

       9542
       9542
       +
           inherit (darwin.apple_sdk.frameworks) PCSC;

     

       9538
       9543
        
           head = true;

     

       9539
       9544
        
           openssl = null;

     

       9540
       9545
        
         };

     

       9546
       9546
       +
       

     

       9547
       9547
       +
         globalprotect-openconnect = libsForQt5.callPackage ../tools/networking/globalprotect-openconnect { };

     

       9541
       9548
        
       

     

       9542
       9549
        
         ding-libs = callPackage ../tools/misc/ding-libs { };

     

       9543
       9550