diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix
index 3751864ff27d..956eaa30b847 100644
--- a/pkgs/development/python-modules/spdx-tools/default.nix
+++ b/pkgs/development/python-modules/spdx-tools/default.nix
@@ -1,31 +1,42 @@
 { lib
-, buildPythonPackage
 , beartype
+, buildPythonPackage
 , click
-, fetchPypi
+, fetchFromGitHub
 , license-expression
-, pyyaml
-, rdflib
 , ply
-, semantic-version
-, xmltodict
 , pytestCheckHook
 , pythonOlder
+, pyyaml
+, rdflib
+, semantic-version
+, setuptools
+, setuptools-scm
 , uritools
+, xmltodict
 }:
 
 buildPythonPackage rec {
   pname = "spdx-tools";
   version = "0.8.0";
-  format = "setuptools";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ZoCb94eDtHFH3K9ppju51WHrReay7BXC6P4VUOJK4c0=";
+  src = fetchFromGitHub {
+    owner = "spdx";
+    repo = "tools-python";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM=";
   };
 
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     beartype
     click
@@ -47,15 +58,21 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    # Depends on the currently not packaged pyshacl module.
+    # Test depends on the currently not packaged pyshacl module
     "tests/spdx3/validation/json_ld/test_shacl_validation.py"
   ];
 
+  disabledTests = [
+    # Missing files
+    "test_spdx2_convert_to_spdx3"
+    "test_json_writer"
+  ];
+
   meta = with lib; {
     description = "SPDX parser and tools";
     homepage = "https://github.com/spdx/tools-python";
     changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index c8ee0e1b657d..e55c4d66e6ef 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -22,14 +22,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.3.361";
+  version = "2.3.364";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss=";
+    hash = "sha256-pec8JLFLqhe75G2Tk/3EwGYr9Dg2xgT8MlVS471QH60=";
   };
 
   patches = [