pyrox.dev / nixpkgs
lol
fork atom

gdm: Move from gnome scope to top-level

Jan Tojnar a0d15e0d 214a26c5

+5 -9
unified split
+3 -3
nixos/modules/services/x11/display-managers/gdm.nix
··· 3 let 4 5 cfg = config.services.xserver.displayManager; 6 - gdm = pkgs.gnome.gdm; 7 pamCfg = config.security.pam.services; 8 settingsFormat = pkgs.formats.ini { }; 9 configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; ··· 310 auth requisite pam_nologin.so 311 auth required pam_succeed_if.so uid >= 1000 quiet 312 ${lib.optionalString pamCfg.login.enableGnomeKeyring '' 313 - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so 314 auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so 315 ''} 316 auth required pam_permit.so ··· 334 auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so 335 auth required pam_env.so 336 ${lib.optionalString pamCfg.login.enableGnomeKeyring '' 337 - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so 338 auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so 339 ''} 340
··· 3 let 4 5 cfg = config.services.xserver.displayManager; 6 + gdm = pkgs.gdm; 7 pamCfg = config.security.pam.services; 8 settingsFormat = pkgs.formats.ini { }; 9 configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; ··· 310 auth requisite pam_nologin.so 311 auth required pam_succeed_if.so uid >= 1000 quiet 312 ${lib.optionalString pamCfg.login.enableGnomeKeyring '' 313 + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so 314 auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so 315 ''} 316 auth required pam_permit.so ··· 334 auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so 335 auth required pam_env.so 336 ${lib.optionalString pamCfg.login.enableGnomeKeyring '' 337 + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so 338 auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so 339 ''} 340
+1 -4
pkgs/desktops/gnome/core/gdm/default.nix pkgs/by-name/gd/gdm/package.nix
··· 175 separateDebugInfo = true; 176 177 passthru = { 178 - updateScript = gnome.updateScript { 179 - packageName = "gdm"; 180 - attrPath = "gnome.gdm"; 181 - }; 182 183 # Used in GDM NixOS module 184 # Don't remove.
··· 175 separateDebugInfo = true; 176 177 passthru = { 178 + updateScript = gnome.updateScript { packageName = "gdm"; }; 179 180 # Used in GDM NixOS module 181 # Don't remove.
pkgs/desktops/gnome/core/gdm/fix-paths.patch pkgs/by-name/gd/gdm/fix-paths.patch
pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch pkgs/by-name/gd/gdm/gdm-session-worker_forward-vars.patch
pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch pkgs/by-name/gd/gdm/gdm-x-session_extra_args.patch
pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch
pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override pkgs/by-name/gd/gdm/org.gnome.login-screen.gschema.override
pkgs/desktops/gnome/core/gdm/reset-environment.patch pkgs/by-name/gd/gdm/reset-environment.patch
+1 -2
pkgs/desktops/gnome/default.nix
··· 22 23 caribou = callPackage ./core/caribou { }; 24 25 - gdm = callPackage ./core/gdm { }; 26 - 27 gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; 28 29 gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; ··· 112 file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. 113 five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. 114 four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. 115 geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. 116 ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. 117 gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
··· 22 23 caribou = callPackage ./core/caribou { }; 24 25 gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; 26 27 gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; ··· 110 file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. 111 five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. 112 four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. 113 + gdm = lib.warn "The ‘gnome.gdm’ was moved to top-level. Please use ‘pkgs.gdm’ directly." pkgs.gdm; # Added on 2024-08-11. 114 geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. 115 ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. 116 gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.