diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c4c02e8f181c..3dddb260263a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -403,7 +403,7 @@ in pkgs.gnome-text-editor pkgs.gnome-calculator pkgs.gnome-calendar - gnome-characters + pkgs.gnome-characters gnome-clocks pkgs.gnome-console gnome-contacts diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/by-name/gn/gnome-characters/package.nix similarity index 91% rename from pkgs/desktops/gnome/apps/gnome-characters/default.nix rename to pkgs/by-name/gn/gnome-characters/package.nix index 3a0edd4050cf..04a5dac98cd4 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -61,10 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-characters"; - attrPath = "gnome.gnome-characters"; - }; + updateScript = gnome.updateScript { packageName = "gnome-characters"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 918f36dd2470..a645a44f373b 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-characters = callPackage ./apps/gnome-characters { }; - gnome-clocks = callPackage ./apps/gnome-clocks { }; gnome-logs = callPackage ./apps/gnome-logs { }; @@ -191,6 +189,7 @@ in gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. + gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.