diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/by-name/gt/gtkhtml/package.nix
similarity index 91%
rename from pkgs/desktops/gnome/misc/gtkhtml/default.nix
rename to pkgs/by-name/gt/gtkhtml/package.nix
index 8a3eaae91057..9fc4c38790e3 100644
--- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix
+++ b/pkgs/by-name/gt/gtkhtml/package.nix
@@ -35,10 +35,7 @@ stdenv.mkDerivation rec {
];
passthru = {
- updateScript = gnome.updateScript {
- packageName = "gtkhtml";
- attrPath = "gnome.gtkhtml";
- };
+ updateScript = gnome.updateScript { packageName = "gtkhtml"; };
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 9e371d26f64f..a81a5ea46350 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -77,7 +77,6 @@ in
gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };
- gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; };
}) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
@@ -151,6 +150,7 @@ in
gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13.
gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11.
gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22.
+ gtkhtml = lib.warn "The ‘gnome.gtkhtml’ was moved to top-level. Please use ‘pkgs.gtkhtml’ directly." pkgs.gtkhtml; # Added on 2024-08-11.
gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22.
hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11.
iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f7fc0bbcb04..43a80051d243 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34847,9 +34847,7 @@ with pkgs;
inherit (gnome2) libglade GConf;
};
- xiphos = callPackage ../applications/misc/xiphos {
- gtkhtml = gnome.gtkhtml;
- };
+ xiphos = callPackage ../applications/misc/xiphos { };
xournal = callPackage ../applications/graphics/xournal {
inherit (gnome2) libgnomecanvas;