diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 1c56a2515abe..43d990068c73 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -462,7 +462,7 @@ in pkgs.gnome-2048 pkgs.gnome-chess pkgs.gnome-klotski - gnome-mahjongg + pkgs.gnome-mahjongg gnome-mines gnome-nibbles gnome-robots diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix similarity index 89% rename from pkgs/desktops/gnome/games/gnome-mahjongg/default.nix rename to pkgs/by-name/gn/gnome-mahjongg/package.nix index ce3a2402b9de..85b4e5b93307 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -48,10 +48,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-mahjongg"; - attrPath = "gnome.gnome-mahjongg"; - }; + updateScript = gnome.updateScript { packageName = "gnome-mahjongg"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b0179b1a4a1b..76bee393d770 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - gnome-mines = callPackage ./games/gnome-mines { }; gnome-nibbles = callPackage ./games/gnome-nibbles { }; @@ -162,6 +160,7 @@ in 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. + gnome-mahjongg = lib.warn "The ‘gnome.gnome-mahjongg’ was moved to top-level. Please use ‘pkgs.gnome-mahjongg’ directly." pkgs.gnome-mahjongg; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11.