diff --git a/pkgs/development/python-modules/cwlformat/default.nix b/pkgs/development/python-modules/cwlformat/default.nix
new file mode 100644
index 00000000000..201155eac59
--- /dev/null
+++ b/pkgs/development/python-modules/cwlformat/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, ruamel-yaml
+}:
+
+buildPythonPackage rec {
+  pname = "cwlformat";
+  version = "2022.02.18";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "rabix";
+    repo = "cwl-format";
+    rev = "refs/tags/${version}";
+    hash = "sha256-FI8hUgb/KglTkubZ+StzptoSsYal71ITyyFNg7j48yk=";
+  };
+
+  propagatedBuildInputs = [
+    ruamel-yaml
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "cwlformat"
+  ];
+
+  meta = with lib; {
+    description = "Code formatter for CWL";
+    homepage = "https://github.com/rabix/cwl-format";
+    changelog = "https://github.com/rabix/cwl-format/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72cc04a90b2..bb5e0310b26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2126,6 +2126,8 @@ self: super: with self; {
 
   cwl-upgrader = callPackage ../development/python-modules/cwl-upgrader { };
 
+  cwlformat = callPackage ../development/python-modules/cwlformat { };
+
   cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
 
   cx_oracle = callPackage ../development/python-modules/cx_oracle { };