From 4be62ca52cd604eaef5d5a158939acb34b725179 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 29 Sep 2025 10:32:03 +0200 Subject: [PATCH 1/4] Revert "python3Packages.catkin-pkg: remove package" This reverts commit ef5b27d9a9c01927f6604a6aacd412d2d99a1903. The package is used in https://github.com/lopsided98/nix-ros-overlay. --- .../python-modules/catkin-pkg/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/catkin-pkg/default.nix diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix new file mode 100644 index 000000000000..c48d1b054b7b --- /dev/null +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + docutils, + pyparsing, + python-dateutil, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "catkin-pkg"; + version = "1.0.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "ros-infrastructure"; + repo = "catkin_pkg"; + rev = version; + hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + docutils + pyparsing + python-dateutil + setuptools + ]; + + pythonImportsCheck = [ "catkin_pkg" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "test/test_flake8.py" ]; + + meta = { + changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${version}/CHANGELOG.rst"; + description = "Library for retrieving information about catkin packages"; + homepage = "http://wiki.ros.org/catkin_pkg"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + adhityaravi + bepri + dstathis + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f0135c1ca6d..655faae719f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2392,6 +2392,8 @@ self: super: with self; { }; }; + catkin-pkg = callPackage ../development/python-modules/catkin-pkg { }; + catppuccin = callPackage ../development/python-modules/catppuccin { }; cattrs = callPackage ../development/python-modules/cattrs { }; From 8c69f8c3a867fb2a86627b79431e1391b4127277 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 29 Sep 2025 10:40:45 +0200 Subject: [PATCH 2/4] python3Packages.catkin-pkg: Set myself as a maintainer This was suggested by a former maintainer: https://github.com/NixOS/nixpkgs/pull/443998#issuecomment-3345661682. --- pkgs/development/python-modules/catkin-pkg/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix index c48d1b054b7b..da3644de735b 100644 --- a/pkgs/development/python-modules/catkin-pkg/default.nix +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -43,9 +43,7 @@ buildPythonPackage rec { homepage = "http://wiki.ros.org/catkin_pkg"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - adhityaravi - bepri - dstathis + wentasah ]; }; } From b1e8ec65f859b081f81868560ba0219df611f3df Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 29 Sep 2025 10:49:27 +0200 Subject: [PATCH 3/4] python3Packages.catkin-pkg: 1.0.0 -> 1.1.0 Changelog: https://github.com/ros-infrastructure/catkin_pkg/blob/1.1.0/CHANGELOG.rst --- pkgs/development/python-modules/catkin-pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix index da3644de735b..82e3aeea62ad 100644 --- a/pkgs/development/python-modules/catkin-pkg/default.nix +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "catkin-pkg"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ros-infrastructure"; repo = "catkin_pkg"; rev = version; - hash = "sha256-lHUKhE9dQLO1MbkstUEiGrHc9Rm+bY/AmgLyh7AbvFQ="; + hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM="; }; build-system = [ setuptools ]; From dff00dc5d5675ce846d2345faafa124f3b14d37e Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 30 Sep 2025 08:15:09 +0200 Subject: [PATCH 4/4] python3Packages.catkin-pkg: Address PR review comments --- pkgs/development/python-modules/catkin-pkg/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/catkin-pkg/default.nix b/pkgs/development/python-modules/catkin-pkg/default.nix index 82e3aeea62ad..5a9e4894eb52 100644 --- a/pkgs/development/python-modules/catkin-pkg/default.nix +++ b/pkgs/development/python-modules/catkin-pkg/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ros-infrastructure"; repo = "catkin_pkg"; - rev = version; + tag = version; hash = "sha256-V4iurFt1WmY2jXy0A4Qa2eKMCWmR+Hs3d9pru0/zUSM="; }; @@ -28,7 +28,6 @@ buildPythonPackage rec { docutils pyparsing python-dateutil - setuptools ]; pythonImportsCheck = [ "catkin_pkg" ]; @@ -38,7 +37,7 @@ buildPythonPackage rec { disabledTestPaths = [ "test/test_flake8.py" ]; meta = { - changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/ros-infrastructure/catkin_pkg/blob/${src.tag}/CHANGELOG.rst"; description = "Library for retrieving information about catkin packages"; homepage = "http://wiki.ros.org/catkin_pkg"; license = lib.licenses.bsd3;