commit bd545892332ede39cd5c1c0ba26e7101b0d2c971 · pyrox.dev/nixpkgs

+1

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

···

       34
       34
        
             networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };

     

       35
       35
        
             networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };

     

       36
       36
        
             networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };

     

       37
       37
       +
             networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };

     

       37
       38
        
             pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };

     

       38
       39
        
           };

     

       39
       40
        
         };

+10 -1

nixos/modules/services/networking/networkmanager.nix

···

       130
       130
        
               default = { inherit networkmanager modemmanager wpa_supplicant

     

       131
       131
        
                                   networkmanager_openvpn networkmanager_vpnc

     

       132
       132
        
                                   networkmanager_openconnect networkmanager_fortisslvpn

     

       133
       133
       -
                                   networkmanager_pptp networkmanager_l2tp; };

     

       133
       133
       +
                                   networkmanager_pptp networkmanager_l2tp

     

       134
       134
       +
                                   networkmanager_iodine; };

     

       134
       135
        
               internal = true;

     

       135
       136
        
             };

     

       136
       137
        
       

     
···

       255
       256
        
             { source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";

     

       256
       257
        
               target = "NetworkManager/VPN/nm-strongswan-service.name";

     

       257
       258
        
             }

     

       259
       259
       +
             { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";

     

       260
       260
       +
               target = "NetworkManager/VPN/nm-iodine-service.name";

     

       261
       261
       +
             }

     

       258
       262
        
           ] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])

     

       259
       263
        
                  { source = overrideNameserversScript;

     

       260
       264
        
                    target = "NetworkManager/dispatcher.d/02overridedns";

     
···

       278
       282
        
             name = "nm-openvpn";

     

       279
       283
        
             uid = config.ids.uids.nm-openvpn;

     

       280
       284
        
             extraGroups = [ "networkmanager" ];

     

       285
       285
       +
           }

     

       286
       286
       +
           {

     

       287
       287
       +
             name = "nm-iodine";

     

       288
       288
       +
             isSystemUser = true;

     

       289
       289
       +
             group = "networkmanager";

     

       281
       290
        
           }];

     

       282
       291
        
       

     

       283
       292
        
           systemd.packages = cfg.packages;

+2 -1

nixos/modules/services/x11/desktop-managers/gnome3.nix

···

       186
       186
        
           networking.networkmanager.basePackages =

     

       187
       187
        
             { inherit (pkgs) networkmanager modemmanager wpa_supplicant;

     

       188
       188
        
               inherit (gnome3) networkmanager_openvpn networkmanager_vpnc

     

       189
       189
       -
                                networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp

     

       189
       189
       +
                                networkmanager_openconnect networkmanager_fortisslvpn

     

       190
       190
       +
                                networkmanager_pptp networkmanager_iodine

     

       190
       191
        
                                networkmanager_l2tp; };

     

       191
       192
        
       

     

       192
       193
        
           # Needed for themes and backgrounds

+4

pkgs/desktops/gnome-3/3.22/default.nix

···

       220
       220
        
           inherit gnome3;

     

       221
       221
        
         };

     

       222
       222
        
       

     

       223
       223
       +
         networkmanager_iodine = pkgs.networkmanager_iodine.override {

     

       224
       224
       +
           inherit gnome3;

     

       225
       225
       +
         };

     

       226
       226
       +
       

     

       223
       227
        
         networkmanagerapplet = pkgs.networkmanagerapplet.override {

     

       224
       228
        
           inherit gnome3 gsettings_desktop_schemas glib_networking;

     

       225
       229
        
         };

+36

pkgs/tools/networking/network-manager/iodine.nix

···

       1
       1
       +
       { stdenv, fetchurl, iodine, intltool, pkgconfig, networkmanager, libsecret

     

       2
       2
       +
       , withGnome ? true, gnome3 }:

     

       3
       3
       +
       

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

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

     

       6
       6
       +
         pname   = "NetworkManager-iodine";

     

       7
       7
       +
         major   = "1.2";

     

       8
       8
       +
         version = "${major}.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchurl {

     

       11
       11
       +
           url    = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";

     

       12
       12
       +
           sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         buildInputs = [ iodine networkmanager libsecret ]

     

       16
       16
       +
           ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring

     

       17
       17
       +
                                               gnome3.networkmanagerapplet ];

     

       18
       18
       +
       

     

       19
       19
       +
         nativeBuildInputs = [ intltool pkgconfig ];

     

       20
       20
       +
       

     

       21
       21
       +
         configureFlags = [

     

       22
       22
       +
           "${if withGnome then "--with-gnome" else "--without-gnome"}"

     

       23
       23
       +
           "--disable-static"

     

       24
       24
       +
           "--localstatedir=/" # needed for the management socket under /run/NetworkManager

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         preConfigure = ''

     

       28
       28
       +
            substituteInPlace "src/nm-iodine-service.c" \

     

       29
       29
       +
              --replace "/usr/bin/iodine" "${iodine}/bin/iodine"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "NetworkManager's iodine plugin";

     

       34
       34
       +
           inherit (networkmanager.meta) maintainers platforms;

     

       35
       35
       +
         };

     

       36
       36
       +
       }

+2

pkgs/top-level/all-packages.nix

···

       3393
       3393
        
       

     

       3394
       3394
        
         networkmanager = callPackage ../tools/networking/network-manager { };

     

       3395
       3395
        
       

     

       3396
       3396
       +
         networkmanager_iodine = callPackage ../tools/networking/network-manager/iodine.nix { };

     

       3397
       3397
       +
       

     

       3396
       3398
        
         networkmanager_openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };

     

       3397
       3399
        
       

     

       3398
       3400
        
         networkmanager_pptp = callPackage ../tools/networking/network-manager/pptp.nix { };