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

shell.nix: update deps, add jlink #444

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Conversation

Samir-Rashid
Copy link
Contributor

Overview

With the 24.05 nixpkgs release, we should be good to add jlink back. I have added necessary deps uncrustify and unzip. Decompressing newlib fails (silently) and tries to reinstall every time if unzip is unavailable.

Testing Strategy

Built all examples successfully.

CC: @lschuermann

With the 24.05 nixpkgs release, we should be good to add jlink back. I have added necessary deps uncrustify and unzip. Decompressing newlib fails and tries to reinstall every time if `unzip` is unavailable.
@bradjc bradjc requested a review from lschuermann June 19, 2024 13:43
#
# [1]: https://github.com/NixOS/nixpkgs/pull/255185
uncrustify
unzip
Copy link
Member

Choose a reason for hiding this comment

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

These are good, though uncrustify in 24.05 is a newer version than the one libtock-c's tools expect, and as a result, ./formal_all.sh sill builds it from source.

uncrustify
unzip
] ++ (lib.optionals withUnfreePkgs [
segger-jlink
Copy link
Member

Choose a reason for hiding this comment

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

Ugh... it still requires export NIXPKGS_ALLOW_INSECURE=1 because JLink relies on some ancient version of Qt. Fine...

@alevy alevy added this pull request to the merge queue Jun 20, 2024
Merged via the queue into tock:master with commit bb2e9c1 Jun 20, 2024
2 checks passed
@Samir-Rashid Samir-Rashid deleted the nix-shell-updates branch June 20, 2024 20:47
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