chore: drop oldNixpkgs from shell.nix#6897
Conversation
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (3)
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (2)
WalkthroughUpdates shell.nix to import a pinned nixpkgs with rustOverlay via overlays, enable unfree packages, and set segger-jlink.acceptLicense from TREZOR_FIRMWARE_ACCEPT_JLINK_LICENSE; removes oldNixpkgs and migrates SDL2 references to sdl2-compat/SDL2_image in fullDeps. Changes docs/tests/upgrade-tests.md to recommend running nix-shell --arg fullDeps true and adds SDL troubleshooting for older emulators. Updates tests/download_emulators.sh to call nix-shell --arg fullDeps true when available. Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Tip 💬 Introducing Slack Agent: The best way for teams to turn conversations into code.Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.
Built for teams:
One agent for your entire SDLC. Right inside Slack. Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
| model | device_test | click_test | persistence_test |
|---|---|---|---|
| T2T1 | test(all) main(all) ![]() |
test(all) main(all) ![]() |
test(all) main(all) ![]() |
| T3B1 | test(all) main(all) ![]() |
test(all) main(all) ![]() |
test(all) main(all) ![]() |
| T3T1 | test(all) main(all) ![]() |
test(all) main(all) ![]() |
test(all) main(all) ![]() |
| T3W1 | test(all) main(all) ![]() |
test(all) main(all) ![]() |
test(all) main(all) ![]() |
Latest CI run: 25911049278
d2e7101 to
85d52f9
Compare
mmilata
left a comment
There was a problem hiding this comment.
Sorry, missed the comment in the original PR. We can postpone this until later.
| SDL2="$(nix-build '<nixpkgs>' -A SDL2 --no-out-link)/lib" | ||
| SDL2_IMAGE="$(nix-build '<nixpkgs>' -A SDL2_image --no-out-link)/lib" |
There was a problem hiding this comment.
Oh, did not realize it's needed for old emulators. This is going to use SDL2 and SDL2_image from user's current nixpkgs channel, not what's in shell.nix, which is not good for reproducibility.
I propose to do one of the following:
- Put
SDL2 SDL2_image(orsdl2-compat SDL2_image, same thing) under the fullDeps section in shell.nix. Add a note that--arg fullDeps trueis needed and theSDL_VIDEODRIVER=x11workaround indoc/tests/upgrade-tests.md. - Put
oldNixpkgs.SDL2 oldNixpkgs.SDL2_imagein there and only the first note inupgrade-tests.md
5faec34 to
8631e69
Compare
Importing `oldNixpkgs` is no longer needed, as SDL2 was replaced by SDL3, and they are not used anywhere else. [no changelog]
8631e69 to
e5aae86
Compare




































Importing
oldNixpkgsis no longer needed, as SDL2 was replaced by SDL3, and they are not used anywhere else.SDL2 libraries moved to fullDeps nix-shell to be used with upgrade tests.
Follows: #6858