Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Nix Flake #226

Merged
merged 5 commits into from
May 31, 2024
Merged

Update Nix Flake #226

merged 5 commits into from
May 31, 2024

Conversation

Irockasingranite
Copy link
Contributor

This PR brings the Bridle Nix flake in-sync with current bridle main.

In particular:

  • The zephyr input now points towards tiacsys/main. When new release branches are created, their version of the flake should point toward the relevant zephyr release branch.
  • The west2nix.toml manifest is updated to reflect a west workspace as fetched on 2024-05-16.*
  • doxmlparser is added to the available python packages since bridle docs now require it.
  • bz is added to the available python packages since zephyr tests now require it.
  • The flake input locks are updated as of 2024-05-16.

* It seems the hal_espressif zephyr module is currently subtly broken: At least one of its submodules is dangling and isn't/can't be fetched. This failure seems to be invisible to west, but west2nix notices that it can't prefetch the module correctly. Due to this, espressif-hal is manually excised from the generated west2nix.toml manifest for now, and is unavailable to nix builds.

@Irockasingranite Irockasingranite self-assigned this May 16, 2024
Within each release branch the input should point at the corresponding
zephyr branch, but for development it should follow main.

Signed-off-by: Sarah Renkhoff <sarah.renkhoff@navimatix.de>
Note that the espressif-hal module is currently broken (in a way invisible
to west): It has at least one dangling submodule that doesn't get fetched
by west(but west2nix notices). Therefore, the module is removed from this
manifest for now.

Signed-off-by: Sarah Renkhoff <sarah.renkhoff@navimatix.de>
In b133706, doxmlparser was added to the
python dependencies for building documentation. It's not in nixpkgs, so
I've added derivation for it to the `bridle-python-deps` flake, and
updated the lock on that input to pull it into the bridle flake.

Signed-off-by: Sarah Renkhoff <sarah.renkhoff@navimatix.de>
Zephyr added this package as a dependency. Since it's not in nixpkgs, I
added it to the `bridle-python-deps` flake and pulled it in from there.

Signed-off-by: Sarah Renkhoff <sarah.renkhoff@navimatix.de>
Updates the inputs:

    * flake-utils
    * nixpkgs
    * pyproject-nix
    * zephyr
    * zephyr-nix

Signed-off-by: Sarah Renkhoff <sarah.renkhoff@navimatix.de>
@Irockasingranite Irockasingranite force-pushed the devel/nix-flake-maintenance branch from ca3ce1f to ce96640 Compare May 16, 2024 10:20
Copy link
Member

@rexut rexut left a comment

Choose a reason for hiding this comment

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

Pls, could you resolve the suggestion and update the PR?

west2nix.toml Show resolved Hide resolved
@Irockasingranite Irockasingranite merged commit ce96640 into main May 31, 2024
3 checks passed
@Irockasingranite Irockasingranite deleted the devel/nix-flake-maintenance branch May 31, 2024 08:18
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