Update to latest nixpkgs-unstable, rustc #4374
Conversation
mmilata
force-pushed
the
mmilata/nixpkgs-bump2
branch
4 times, most recently
from
0916a1d to
20a13b6
Compare
|
mmilata
force-pushed
the
mmilata/nixpkgs-bump2
branch
from
20a13b6 to
6b1aa72
Compare
|
mmilata
force-pushed
the
mmilata/nixpkgs-bump2
branch
2 times, most recently
from
74ebe54 to
edd2bfa
Compare
|
There’s an issue with the Unix build on macOS:
|
|
When you run and this: (maybe these're not new) |
Probably a result of switching from MmacOS clang to NixOS gcc, seems harmless.
Looks like a micropython bug: micropython/micropython#16300, will backport it to our fork later. I guess this is the reason we switched to the system compiler in the first place?
I can't see this one, perhaps I don't have anything in the legacy location wherever it is?
Fixed in 404fa9a. |
|
Still, even with the micropython fix device tests crash on something. I'm giving up for now.
```
$ make test_emu
/Users/mm/work/trezor-firmware/core/emu.py --disable-animation --headless --output=/Users/mm/work/trezor-firmware/core/../tests/trezor.log --temporary-profile -c pytest --junitxml=/Users/mm/work/trezor-firmware/core/../tests/junit.xml /Users/mm/work/trezor-firmware/core/../tests/device_tests --lang="en"
TREZOR_PATH=udp:127.0.0.1:21324
TREZOR_PROFILE_DIR=/private/tmp/nix-shell-45162-0/trezor-emulator-5esd7p_9
TREZOR_UDP_PORT=21324
TREZOR_FIDO2_UDP_PORT=21326
TREZOR_SRC=/Users/mm/work/trezor-firmware/core/src
Waiting for emulator to come up...
Emulator ready after 0.417 seconds
================================================================================================ test session starts =================================================================================================
platform darwin -- Python 3.10.10, pytest-8.3.2, pluggy-1.5.0
Using --random-order-bucket=module
Using --random-order-seed=389422
rootdir: /Users/mm/work/trezor-firmware Current thread 0x00000002022af840 (most recent call first): Extension modules: PIL._imaging (total: 1) |
|
Ok, this seems to happen on The message |
Turns out I can't read and it's probably a GCC problem. Need to try again with GCC 14 or a clang version from nixpkgs. |
|
The failing valgrind crypto test appears similar to what we dealt with here. I also discovered this is caused by updating |
|
Yep, documented what I found in #4393. Not sure how useful is testing this on |
[no changelog]
Fixes the following warning: Warning: The current project could not be installed: No file/folder found for package trezor-firmware If you do not want to install the current project use --no-root. If you want to use Poetry only for dependency management but not for packaging, you can disable package mode by setting package-mode = false in your pyproject.toml file. In a future version of Poetry this warning will become an error!
mmilata
force-pushed
the
mmilata/nixpkgs-bump2
branch
from
5dcbf9c to
de6babf
Compare
|
Seems to be in somewhat workable state now. @cepetr when you have time can you please test on macOS and review the micropython changes? |
edit: this seems to fix the second issue???diff --git a/core/embed/io/display/unix/display_driver.c b/core/embed/io/display/unix/display_driver.c
index bdb25c787..e77a1e194 100644
--- a/core/embed/io/display/unix/display_driver.c
+++ b/core/embed/io/display/unix/display_driver.c
@@ -117,7 +117,7 @@ void display_init(display_content_mode_t mode) {
#ifdef TREZOR_EMULATOR_RASPI
SDL_WINDOW_SHOWN | SDL_WINDOW_FULLSCREEN
#else
- SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI
+ SDL_WINDOW_SHOWN
#endif
);
free(window_title_alloc); |
|
Fixed in 311906c, please test when you have spare cycles. Also brought back micropython/micropython#16300 and added questionable fix for emulator image scaling on macOS. |
It seems, it's ok now. Thanks. |
Yes, it seems harmless but is very annoying since the message appears for every compiled C file. We should either modify the SCons script for the Unix emulator or investigate the root cause to resolve it. |
Looks like the problem is specific to my machine. I fixed it by manually moving |
|
It seems the emulator is still crashing on macOS, but now with a different error than before: |
Fixes #3337. Replaces #3412.
Reduces the number of different nixpkgs used from 3 to 2, we're keeping the older one for:
because legacy is using some internal API that no longer exists in v 21- needs poetry.lock changes, TBD separately Update protobuf #4394MacOS switches from system clang to GCC 14 from nixpkgs, which requires micropython/micropython#14126 backported. Linux keeps GCC 12 due to #4393.