Skip to content

Fixes for --pr-only support in the NixOS generator#326

Merged
robwoolley merged 2 commits intoros-infrastructure:masterfrom
wentasah:nixos-support
Oct 1, 2025
Merged

Fixes for --pr-only support in the NixOS generator#326
robwoolley merged 2 commits intoros-infrastructure:masterfrom
wentasah:nixos-support

Conversation

@wentasah
Copy link
Contributor

Hi @robwoolley and others!

I noticed just today that NixOS support has been merged (#309). Thanks for the effort.

For quite some time, we also use two other changes, which are needed for our use case and which I'm submitting here.

These were already merged to the original fork with NixOS support and are used in our Nix ROS overlay.

If this is merged here, we could switch to using upstream superflore version. I've just verified that it works and removes the pkg_resources warning (#315) :-)

If you need anything related to Nix support in the future, feel free to ping me.

@robwoolley
Copy link
Contributor

Thanks @wentasah! I would be happy to merge this in. The CI picked up an error when running pyflakes:

https://github.com/ros-infrastructure/superflore/actions/runs/18121962057/job/51703339669?pr=326#step:5:96

b"/home/runner/work/superflore/superflore/tests/../superflore/generators/nix/run.py:26:1: F401 'superflore.repo_instance.RepoInstance' imported but unused\n1\n"

Would you be open to adding a commit to the PR to resolve this issue?

Without this change, running "superflore-gen-nix --pr-only" fails with
this error:

    !!!! Failed to file PR!
    !!!! reason: Cmd('/nix/store/cjw8ydwnifad0wdlkhpsyrdm18bcmg63-git-minimal-2.47.2/bin/git') failed due to: exit code(128)
      cmdline: /nix/store/cjw8ydwnifad0wdlkhpsyrdm18bcmg63-git-minimal-2.47.2/bin/git clone -v --branch=master -- https://github.com/./False False
      stderr: 'Cloning into 'False'...
    remote: Not Found
    fatal: repository 'https://github.com/./False/' not found
    '

Signed-off-by: Michal Sojka <michal.sojka@cvut.cz>
Signed-off-by: Michal Sojka <michal.sojka@cvut.cz>
@wentasah
Copy link
Contributor Author

wentasah commented Oct 1, 2025

I've fixed it in the original commit. Thanks.

@robwoolley robwoolley self-requested a review October 1, 2025 19:54
Copy link
Contributor

@robwoolley robwoolley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes appear correct. The same changes were accepted upstream by the NixOS author. Automated CI tests pass.

Also @wentasah confirmed to have validated the changes on his Nix Hydra instance (https://hydra.iid.ciirc.cvut.cz/project/nix-ros-overlay)

Approved.

@robwoolley robwoolley merged commit b10efe8 into ros-infrastructure:master Oct 1, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants