diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2bea020d6c95..88b34a1ba571 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -409,7 +409,7 @@ in gnome-contacts pkgs.gnome-font-viewer pkgs.gnome-logs - gnome-maps + pkgs.gnome-maps gnome-music pkgs.gnome-system-monitor gnome-weather diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/by-name/gn/gnome-maps/package.nix similarity index 95% rename from pkgs/desktops/gnome/apps/gnome-maps/default.nix rename to pkgs/by-name/gn/gnome-maps/package.nix index b51a1661d609..85515a19ad70 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -98,10 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-maps"; - attrPath = "gnome.gnome-maps"; - }; + updateScript = gnome.updateScript { packageName = "gnome-maps"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index cfbe02144593..42952c21efa5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-maps = callPackage ./apps/gnome-maps { }; - gnome-music = callPackage ./apps/gnome-music { }; gnome-nettool = callPackage ./apps/gnome-nettool { }; @@ -195,6 +193,7 @@ in 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-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-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-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-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.