diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 55c91dc4f7c2..775244cd6e9a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -458,7 +458,7 @@ in pkgs.aisleriot pkgs.atomix pkgs.five-or-more - four-in-a-row + pkgs.four-in-a-row pkgs.gnome-2048 gnome-chess gnome-klotski diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/by-name/fo/four-in-a-row/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/four-in-a-row/default.nix rename to pkgs/by-name/fo/four-in-a-row/package.nix index a64a6252fd05..f2b9b8335abe 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -52,10 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "four-in-a-row"; - attrPath = "gnome.four-in-a-row"; - }; + updateScript = gnome.updateScript { packageName = "four-in-a-row"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 51e8704d65fe..efe5c465a459 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - four-in-a-row = callPackage ./games/four-in-a-row { }; - gnome-chess = callPackage ./games/gnome-chess { }; gnome-klotski = callPackage ./games/gnome-klotski { }; @@ -147,6 +145,7 @@ in evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. 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. 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. + 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. geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.