From 2d172daee363d3d5ac6919b3f5bbed8eaaadef77 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Sun, 10 Aug 2025 10:35:11 +0200
Subject: [PATCH 1/2] python313Packages.osrf-pycommon: init at 2.1.7

---
 .../python-modules/osrf-pycommon/default.nix  | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/osrf-pycommon/default.nix

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 { };

From 55a5425fc4f9e59a52a852b06561f2823769ff92 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 19 May 2026 20:37:53 +0200
Subject: [PATCH 2/2] python3Packages.osrf-pycommon: modernize

---
 .../python-modules/osrf-pycommon/default.nix  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/osrf-pycommon/default.nix b/pkgs/development/python-modules/osrf-pycommon/default.nix
index 6ee7a3cc50a6..bf40562a528e 100644
--- a/pkgs/development/python-modules/osrf-pycommon/default.nix
+++ b/pkgs/development/python-modules/osrf-pycommon/default.nix
@@ -7,7 +7,7 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "osrf-pycommon";
   version = "2.1.7";
   pyproject = true;
@@ -15,16 +15,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "osrf";
     repo = "osrf_pycommon";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-gKYeCvcJDJkW2OYP7K3eyztuPSkzE8dHoTUh4sKvxcM=";
   };
 
   build-system = [ setuptools ];
 
-  disabledTestPaths = [
-    "tests/test_code_format.py" # flake8 based tests don't work
-  ];
-
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
@@ -32,14 +28,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "osrf_pycommon" ];
 
+  disabledTestPaths = [
+    "tests/test_code_format.py" # flake8 based tests don't work
+  ];
+
   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";
+    changelog = "https://github.com/osrf/osrf_pycommon/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     downloadPage = "https://github.com/osrf/osrf_pycommon";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      guelakais
-    ];
+    maintainers = with lib.maintainers; [ guelakais ];
   };
-}
+})