Commit db9ae25d authored by Jan Tojnar's avatar Jan Tojnar
Browse files

gnome-initial-setup: Move from gnome scope to top-level

parent 5f5c3a54

nixos/modules/services/desktops/gnome/gnome-initial-setup.nix

+3 −3
Original line number Diff line number Diff line
@@ -64,13 +64,13 @@ in 
  config = lib.mkIf config.services.gnome.gnome-initial-setup.enable {



    environment.systemPackages = [

      pkgs.gnome.gnome-initial-setup

      pkgs.gnome-initial-setup

    ]

    ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart

    ;



    systemd.packages = [

      pkgs.gnome.gnome-initial-setup

      pkgs.gnome-initial-setup

    ];



    systemd.user.targets."gnome-session".wants = [
@@ -84,7 +84,7 @@ in 
    ];



    programs.dconf.profiles.gnome-initial-setup.databases = [

      "${pkgs.gnome.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"

      "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"

    ];

  };

pkgs/desktops/gnome/core/gnome-initial-setup/default.nix→pkgs/by-name/gn/gnome-initial-setup/package.nix

+1 −4
Original line number Diff line number Diff line
@@ -92,10 +92,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  passthru = {

    updateScript = gnome.updateScript {

      packageName = "gnome-initial-setup";

      attrPath = "gnome.gnome-initial-setup";

    };

    updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; };

  };



  meta = with lib; {

pkgs/desktops/gnome/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ in 


  gnome-control-center = callPackage ./core/gnome-control-center { };



  gnome-initial-setup = callPackage ./core/gnome-initial-setup { };



  gnome-session = callPackage ./core/gnome-session { };



  gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
@@ -131,6 +129,7 @@ in 
  gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.

  gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.

  gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.

  gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11.

  gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22.

  gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11.

  gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11.