diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 5e9f1114137f..0de8147cf22a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -484,7 +484,7 @@ in (lib.mkIf serviceCfg.core-developer-tools.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ dconf-editor - devhelp + pkgs.devhelp pkgs.gnome-builder # boxes would make sense in this option, however # it doesn't function well enough to be included diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/by-name/de/devhelp/package.nix similarity index 97% rename from pkgs/desktops/gnome/devtools/devhelp/default.nix rename to pkgs/by-name/de/devhelp/package.nix index a47e2c711e6b..97795c1d9f7a 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/by-name/de/devhelp/package.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome.devhelp"; }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index bdf4cae1d193..f67f239c5506 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -142,10 +142,6 @@ in vinagre = callPackage ./apps/vinagre { }; -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - devhelp = callPackage ./devtools/devhelp { }; - #### Games aisleriot = callPackage ./games/aisleriot { }; @@ -216,6 +212,7 @@ in adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. + devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22. eog = lib.warn "The ‘gnome.eog’ was moved to top-level. Please use ‘pkgs.eog’ directly." pkgs.eog; # Added on 2024-06-22. epiphany = lib.warn "The ‘gnome.epiphany’ was moved to top-level. Please use ‘pkgs.epiphany’ directly." pkgs.epiphany; # Added on 2024-06-22. evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13.