diff --git a/pkgs/development/tools/gdtoolkit/default.nix b/pkgs/by-name/gd/gdtoolkit_3/package.nix similarity index 96% rename from pkgs/development/tools/gdtoolkit/default.nix rename to pkgs/by-name/gd/gdtoolkit_3/package.nix index ea5e5ec8de9a..608d86493217 100644 --- a/pkgs/development/tools/gdtoolkit/default.nix +++ b/pkgs/by-name/gd/gdtoolkit_3/package.nix @@ -23,7 +23,7 @@ let }; in python.pkgs.buildPythonApplication rec { - pname = "gdtoolkit"; + pname = "gdtoolkit3"; version = "3.3.1"; # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) @@ -62,7 +62,8 @@ python.pkgs.buildPythonApplication rec { - disable doCheck for gdtoolkit, or - provide a compatible godot-server version to gdtoolkit" ''; - in lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' + in + lib.throwIf (godotServerMajorVersion != gdtoolkitMajorVersion) msg '' # The tests want to run the installed executables export PATH=$out/bin:$PATH diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fc9248b519a8..486e8c5fdb0a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -414,6 +414,8 @@ mapAliases ({ godot-headless = throw "godot-headless has been renamed to godot3-headless to distinguish from version 4"; # Added 2023-07-16 godot-server = throw "godot-server has been renamed to godot3-server to distinguish from version 4"; # Added 2023-07-16 + gdtoolkit = throw "gdtoolkit has been renamed to gdtoolkit_3 to distinguish from version 4"; # Added 2024-02-17 + google-chrome-beta = throw "'google-chrome-beta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87916f7f9666..43cec31676c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8423,8 +8423,6 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; - gdtoolkit = callPackage ../development/tools/gdtoolkit { }; - gef = callPackage ../development/tools/misc/gef { }; gelasio = callPackage ../data/fonts/gelasio { };