Unverified Commit ffbac733 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 41895efe 237adfc1

nixos/modules/config/users-groups.nix

+1 −0
Original line number Diff line number Diff line
@@ -558,6 +558,7 @@ in { 
      input.gid = ids.gids.input;

      kvm.gid = ids.gids.kvm;

      render.gid = ids.gids.render;

      sgx.gid = ids.gids.sgx;

      shadow.gid = ids.gids.shadow;

    };

nixos/modules/misc/ids.nix

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ in 
      qemu-libvirtd = 301;

      kvm = 302; # default udev rules from systemd requires these

      render = 303; # default udev rules from systemd requires these

      # zeronet = 304; # removed 2019-01-03

      sgx = 304; # default udev rules from systemd requires these

      lirc = 305;

      lidarr = 306;

      slurm = 307;

nixos/modules/programs/dconf.nix

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ in 
    environment.systemPackages = [ pkgs.dconf ];



    # Needed for unwrapped applications

    environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];

    environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];

  };



}

nixos/modules/services/desktops/gnome/glib-networking.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ with lib; 


    systemd.packages = [ pkgs.glib-networking ];



    environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];

    environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ];



  };

nixos/modules/services/desktops/gvfs.nix

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ in 
    services.udev.packages = [ pkgs.libmtp.bin ];



    # Needed for unwrapped applications

    environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];

    environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ];



  };