diff --git a/pkgs/by-name/ga/gaphor/package.nix b/pkgs/by-name/ga/gaphor/package.nix
index eb05f1001a28..22db18b93e29 100644
--- a/pkgs/by-name/ga/gaphor/package.nix
+++ b/pkgs/by-name/ga/gaphor/package.nix
@@ -4,26 +4,29 @@
   glib,
   gobject-introspection,
   wrapGAppsHook4,
+  gitMinimal,
   gtksourceview5,
   libadwaita,
   python3Packages,
   nix-update-script,
+  writableTmpDirAsHomeHook,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "gaphor";
-  version = "3.1.0";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gaphor";
     repo = "gaphor";
     tag = version;
-    hash = "sha256-0xivimpYM1gwOO2QrovYiJPNUfuGclr+F/WyHLNl+jw=";
+    hash = "sha256-0Z0RFQrN2g0beV2konZBfMroeNtbT+sPRsWlRvQFYBk=";
   };
 
   pythonRelaxDeps = [
     "pydot"
     "pygobject"
+    "dulwich"
   ];
 
   nativeBuildInputs = [
@@ -52,6 +55,8 @@ python3Packages.buildPythonApplication rec {
     pydot
     pygobject3
     tinycss2
+    ipython
+    sphinx
   ];
 
   postInstall = ''
@@ -76,6 +81,35 @@ python3Packages.buildPythonApplication rec {
                       --replace-fail "Exec=/usr/bin/gaphor" "Exec=$out/bin/gaphor"
   '';
 
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    gitMinimal
+  ]
+  ++ (with python3Packages; [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-archon
+    hypothesis
+    xdoctest
+    markdown-it-py
+  ]);
+
+  disabledTests = [
+    # Segfault due to gtk initialization failure?
+    "page"
+    "editor"
+    "drop"
+  ];
+
+  disabledTestPaths = [
+    # Same, segfault
+    "gaphor/diagram/tools/tests"
+    "gaphor/plugins/console/tests"
+    "gaphor/ui/tests"
+    "gaphor/tests/test_application.py"
+    "tests/*"
+  ];
+
   # Prevent double wrapping
   dontWrapGApps = true;