diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix
index 73e748056632..d1084e8425e8 100644
--- a/pkgs/development/python-modules/gstools/default.nix
+++ b/pkgs/development/python-modules/gstools/default.nix
@@ -5,44 +5,47 @@
 
   # build-system
   cython,
-  extension-helpers,
-  numpy,
-  setuptools,
-  setuptools-scm,
+  hatch-vcs,
+  hatchling,
 
   # dependencies
-  hankel,
   emcee,
+  gstools-cython,
+  hankel,
   meshio,
+  numpy,
   pyevtk,
   scipy,
 
+  # optional dependencies
+  matplotlib,
+  pyvista,
+
   # tests
   pytestCheckHook,
+  pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "gstools";
-  version = "1.6.1";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GeoStat-Framework";
     repo = "GSTools";
     tag = "v${version}";
-    hash = "sha256-Aieuk0Xjlut8rTZoFHcBpPtyIj/fstMrHiiKyDOpQlg=";
+    hash = "sha256-rQ7mSa1BWAaRiiE6aQD6jl8BktihY9bjFJV+5eT9n/M=";
   };
 
   build-system = [
-    cython
-    extension-helpers
-    numpy
-    setuptools
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
     emcee
+    gstools-cython
     hankel
     meshio
     numpy
@@ -50,13 +53,23 @@ buildPythonPackage rec {
     scipy
   ];
 
+  optional-dependencies = {
+    plotting = [
+      matplotlib
+      pyvista
+    ];
+  };
+
   pythonImportsCheck = [ "gstools" ];
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
   meta = {
     description = "Geostatistical toolbox";
     homepage = "https://github.com/GeoStat-Framework/GSTools";
-    changelog = "https://github.com/GeoStat-Framework/GSTools/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.lgpl3Only;
     maintainers = with lib.maintainers; [ sigmanificient ];
   };