Skip to content

Commit

Permalink
Fix Nix packages that incorrectly used Python 2 (#43895)
Browse files Browse the repository at this point in the history
pythonPackages normally refers to Python 2 in nixpkgs, but I have had an
override in nix-ros-overlay that remaps it to Python 3, dating back to
the days when I had to support both Python 2 and Python 3 for different
distros. This has led to several packages in rosdep mistakenly using
pythonPackages rather than python3Packages. Fix these to allow me to
remove the override for ROS 2.
  • Loading branch information
lopsided98 authored Dec 30, 2024
1 parent 489bea0 commit 2b4a36c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rosdep/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7963,7 +7963,7 @@ pybind11-dev:
fedora: [pybind11-devel]
freebsd: [pybind11]
gentoo: [dev-python/pybind11]
nixos: [pythonPackages.pybind11]
nixos: [python3Packages.pybind11]
openembedded: [python3-pybind11@meta-python]
rhel:
'*': [pybind11-devel]
Expand Down
4 changes: 2 additions & 2 deletions rosdep/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ black:
debian: [black]
fedora: [black]
gentoo: [dev-python/black]
nixos: [pythonPackages.black]
nixos: [python3Packages.black]
openembedded: [python3-black@meta-ros]
ubuntu:
'*': [black]
Expand Down Expand Up @@ -8880,7 +8880,7 @@ python3-pytest:
fedora: [python3-pytest]
freebsd: [devel/py-pytest]
gentoo: [dev-python/pytest]
nixos: [pythonPackages.pytest]
nixos: [python3Packages.pytest]
openembedded: [python3-pytest@meta-python]
opensuse: [python3-pytest]
osx:
Expand Down

0 comments on commit 2b4a36c

Please sign in to comment.