diff --git a/pkgs/development/python-modules/gdtoolkit/default.nix b/pkgs/development/tools/gdtoolkit/default.nix
similarity index 85%
rename from pkgs/development/python-modules/gdtoolkit/default.nix
rename to pkgs/development/tools/gdtoolkit/default.nix
index 2ca2f67cc9e..67d98e0aa36 100644
--- a/pkgs/development/python-modules/gdtoolkit/default.nix
+++ b/pkgs/development/tools/gdtoolkit/default.nix
@@ -1,29 +1,23 @@
 { lib
-, buildPythonPackage
+, python3Packages
 , fetchFromGitHub
-, pythonOlder
-, lark
-, docopt
-, pyyaml
-, setuptools
-, pytestCheckHook
 , godot-server
-, hypothesis
 }:
 
-let lark080 = lark.overrideAttrs (old: rec {
+let lark080 = python3Packages.lark.overrideAttrs (old: rec {
   # gdtoolkit needs exactly this lark version
   version = "0.8.0";
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
     rev = version;
-    sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4=";
+    hash = "sha256-KN9buVlH8hJ8t0ZP5yefeYM5vH5Gg7a7TEDGKJYpozs=";
+    fetchSubmodules = true;
   };
 });
 
 in
-buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   pname = "gdtoolkit";
   version = "3.3.1";
 
@@ -35,18 +29,18 @@ buildPythonPackage rec {
     sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn";
   };
 
-  disabled = pythonOlder "3.7";
+  disabled = python3Packages.pythonOlder "3.7";
 
-  propagatedBuildInputs = [
-    lark080
+  propagatedBuildInputs = [ lark080
+  ] ++ (with python3Packages; [
     docopt
     pyyaml
     setuptools
-  ];
+  ]);
 
   doCheck = true;
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     pytestCheckHook
     hypothesis
     godot-server
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ce382334ef..64d46f1399b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7584,6 +7584,8 @@ with pkgs;
 
   gdmap = callPackage ../tools/system/gdmap { };
 
+  gdtoolkit = callPackage ../development/tools/gdtoolkit { };
+
   gef = callPackage ../development/tools/misc/gef { };
 
   gelasio = callPackage ../data/fonts/gelasio { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index adf13052e99..b2e8033b97e 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -91,6 +91,7 @@ mapAliases ({
   functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
   garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
   garminconnect-ha = garminconnect; # added 2022-02-05
+  gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute"; # added 2023-02-15
   gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   GitPython = gitpython; # added 2022-10-28
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b5a3e86dac..2e98fb16c57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3726,8 +3726,6 @@ self: super: with self; {
 
   gdown = callPackage ../development/python-modules/gdown { };
 
-  gdtoolkit = callPackage ../development/python-modules/gdtoolkit { };
-
   ge25519 = callPackage ../development/python-modules/ge25519 { };
 
   geant4 = toPythonModule (pkgs.geant4.override {