diff --git a/pkgs/development/python-modules/osrf-pycommon/default.nix b/pkgs/development/python-modules/osrf-pycommon/default.nix
new file mode 100644
index 000000000000..6ee7a3cc50a6
--- /dev/null
+++ b/pkgs/development/python-modules/osrf-pycommon/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "osrf-pycommon";
+  version = "2.1.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "osrf";
+    repo = "osrf_pycommon";
+    tag = version;
+    hash = "sha256-gKYeCvcJDJkW2OYP7K3eyztuPSkzE8dHoTUh4sKvxcM=";
+  };
+
+  build-system = [ setuptools ];
+
+  disabledTestPaths = [
+    "tests/test_code_format.py" # flake8 based tests don't work
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "osrf_pycommon" ];
+
+  meta = {
+    description = "Commonly needed Python modules used by Python software developed at OSRF";
+    homepage = "http://osrf-pycommon.readthedocs.org/";
+    changelog = "https://github.com/osrf/osrf_pycommon/blob/${src.tag}/CHANGELOG.rst";
+    downloadPage = "https://github.com/osrf/osrf_pycommon";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      guelakais
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00be0656f960..24cdff7b9640 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12061,6 +12061,8 @@ self: super: with self; {
 
   osqp = callPackage ../development/python-modules/osqp { };
 
+  osrf-pycommon = callPackage ../development/python-modules/osrf-pycommon { };
+
   osrparse = callPackage ../development/python-modules/osrparse { };
 
   oss2 = callPackage ../development/python-modules/oss2 { };