commit 6e5ccaa34f381d557e8df9f049b69218afd16ad8 · pyrox.dev/nixpkgs

+2 -1

nixos/modules/config/no-x-libs.nix

···

       30
        
             cairo = super.cairo.override { x11Support = false; };

     

       31
        
             dbus = super.dbus.override { x11Support = false; };

     

       32
        
             networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };

     

       0
        
       
     

       33
        
             networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };

     

       34
        
             networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; };

     

       35
        
             networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };

     

       0
        
       
     

       36
        
             networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };

     

       37
       -
             networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };

     

       38
        
             gobject-introspection = super.gobject-introspection.override { x11Support = false; };

     

       39
        
             qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };

     

       40
        
           }));

···

       30
        
             cairo = super.cairo.override { x11Support = false; };

     

       31
        
             dbus = super.dbus.override { x11Support = false; };

     

       32
        
             networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; };

     

       33
       +
             networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; };

     

       34
        
             networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; };

     

       35
        
             networkmanager-openconnect = super.networkmanager-openconnect.override { withGnome = false; };

     

       36
        
             networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; };

     

       37
       +
             networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; };

     

       38
        
             networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; };

     

       0
        
       
     

       39
        
             gobject-introspection = super.gobject-introspection.override { x11Support = false; };

     

       40
        
             qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; };

     

       41
        
           }));

nixos/modules/services/networking/networkmanager.nix

···

       15
        
           networkmanager-openconnect

     

       16
        
           networkmanager-openvpn

     

       17
        
           networkmanager-vpnc

     

       0
        
       
     

       18
        
          ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;

     

       19
        
       

     

       20
        
         delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];

     
···

       386
        
       

     

       387
        
             "NetworkManager/VPN/nm-iodine-service.name".source =

     

       388
        
               "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       389
        
             }

     

       390
        
             // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != [])

     

       391
        
                {

···

       15
        
           networkmanager-openconnect

     

       16
        
           networkmanager-openvpn

     

       17
        
           networkmanager-vpnc

     

       18
       +
           networkmanager-sstp

     

       19
        
          ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;

     

       20
        
       

     

       21
        
         delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];

     
···

       387
        
       

     

       388
        
             "NetworkManager/VPN/nm-iodine-service.name".source =

     

       389
        
               "${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";

     

       390
       +
       

     

       391
       +
             "NetworkManager/VPN/nm-sstp-service.name".source =

     

       392
       +
               "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";

     

       393
        
             }

     

       394
        
             // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != [])

     

       395
        
                {

+64

pkgs/tools/networking/network-manager/sstp/default.nix

···

       1
       +
       { stdenv

     

       2
       +
       , autoreconfHook

     

       3
       +
       , fetchFromGitHub

     

       4
       +
       , fetchpatch

     

       5
       +
       , file

     

       6
       +
       , glib

     

       7
       +
       , gnome3

     

       8
       +
       , gtk3

     

       9
       +
       , intltool

     

       10
       +
       , libnma

     

       11
       +
       , libsecret

     

       12
       +
       , networkmanager

     

       13
       +
       , pkgconfig

     

       14
       +
       , ppp

     

       15
       +
       , sstp

     

       16
       +
       , substituteAll

     

       17
       +
       , withGnome ? true }:

     

       18
       +
       

     

       19
       +
       let

     

       20
       +
         pname = "NetworkManager-sstp";

     

       21
       +
         version = "unstable-2020-04-20";

     

       22
       +
       in stdenv.mkDerivation {

     

       23
       +
         name = "${pname}${if withGnome then "-gnome" else ""}-${version}";

     

       24
       +
       

     

       25
       +
         src = fetchFromGitHub {

     

       26
       +
           owner = "enaess";

     

       27
       +
           repo = "network-manager-sstp";

     

       28
       +
           rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8";

     

       29
       +
           sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3";

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         buildInputs = [ sstp networkmanager glib ppp ]

     

       33
       +
           ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];

     

       34
       +
       

     

       35
       +
         nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ];

     

       36
       +
       

     

       37
       +
         postPatch = ''

     

       38
       +
           sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c

     

       39
       +
           sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c

     

       40
       +
         '';

     

       41
       +
       

     

       42
       +
         # glib-2.62 deprecations

     

       43
       +
         NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";

     

       44
       +
       

     

       45
       +
         preConfigure = "intltoolize";

     

       46
       +
         configureFlags = [

     

       47
       +
           "--without-libnm-glib"

     

       48
       +
           "--with-gnome=${if withGnome then "yes" else "no"}"

     

       49
       +
           "--enable-absolute-paths"

     

       50
       +
         ];

     

       51
       +
       

     

       52
       +
         passthru = {

     

       53
       +
           updateScript = gnome3.updateScript {

     

       54
       +
             packageName = pname;

     

       55
       +
             attrPath = "networkmanager-sstp";

     

       56
       +
           };

     

       57
       +
         };

     

       58
       +
       

     

       59
       +
         meta = with stdenv.lib; {

     

       60
       +
           description = "NetworkManager's sstp plugin";

     

       61
       +
           inherit (networkmanager.meta) maintainers platforms;

     

       62
       +
           license = licenses.gpl2Plus;

     

       63
       +
         };

     

       64
       +
       }

+3 -3

pkgs/tools/networking/sstp/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sstp-client";

     

       5
       -
         version = "1.0.12";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       -
           url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";

     

       9
       -
           sha256 = "1zv7rx6wh9rhbyg9pg6759by8hc6n4162zrrw0y812cnaw3b8zj8";

     

       10
        
         };

     

       11
        
       

     

       12
        
         patchPhase =

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "sstp-client";

     

       5
       +
         version = "1.0.13";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
       +
           url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz";

     

       9
       +
           sha256 = "06rjyncmgdy212xf9l9z6mfh4gdmgk7l4y841gb8lpbrl3y5h4ln";

     

       10
        
         };

     

       11
        
       

     

       12
        
         patchPhase =

pkgs/top-level/all-packages.nix

···

       5727
        
       

     

       5728
        
         networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { };

     

       5729
        
       

     

       0
        
       
     

       0
        
       
     

       5730
        
         networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };

     

       5731
        
       

     

       5732
        
         libnma = callPackage ../tools/networking/network-manager/libnma { };

···

       5727
        
       

     

       5728
        
         networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { };

     

       5729
        
       

     

       5730
       +
         networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { };

     

       5731
       +
       

     

       5732
        
         networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };

     

       5733
        
       

     

       5734
        
         libnma = callPackage ../tools/networking/network-manager/libnma { };