Skip to content

<fix>: Improve the compatibility of shell.nix for different versions of Nix; fix overflow issue of micropython #600

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: touch
Choose a base branch
from
Open

<fix>: Improve the compatibility of shell.nix for different versions of Nix; fix overflow issue of micropython #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e394c35
fix overflow problem of micropython stack
Johnwanzi May 27, 2025
3870ff7
check path of pyright for nix
Johnwanzi May 28, 2025
c737444
add conditional import of SDL
Johnwanzi May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ci/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ let
};
llvmPackages = nixpkgs.llvmPackages_15;
# see pyright/README.md for update procedure
pyright = nixpkgs.callPackage ./pyright {};
pyrightpath = builtins.pathExists ./pyright;
pyright = if pyrightpath then
nixpkgs.callPackage ./pyright {}
else
nixpkgs.callPackage ./ci/pyright {};
in
with nixpkgs;
stdenvNoCC.mkDerivation ({
Expand All @@ -73,8 +77,6 @@ stdenvNoCC.mkDerivation ({
oldPythonNixpkgs.python37
oldPythonNixpkgs.python36
] ++ [
sdlnixpkgs.SDL2
sdlnixpkgs.SDL2_image
bash
check
curl # for connect tests
Expand All @@ -98,11 +100,15 @@ stdenvNoCC.mkDerivation ({
zlib
moreutils
] ++ lib.optionals (!stdenv.isDarwin) [
SDL2
SDL2_image
autoPatchelfHook
gcc11
procps
valgrind
] ++ lib.optionals (stdenv.isDarwin) [
sdlnixpkgs.SDL2
sdlnixpkgs.SDL2_image
darwin.apple_sdk.frameworks.CoreAudio
darwin.apple_sdk.frameworks.AudioToolbox
darwin.apple_sdk.frameworks.ForceFeedback
Expand Down
2 changes: 1 addition & 1 deletion core/embed/unix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
#endif

#if MICROPY_ENABLE_PYSTACK
static mp_obj_t pystack[1024];
static mp_obj_t pystack[4096];
mp_pystack_init(pystack, &pystack[MP_ARRAY_SIZE(pystack)]);
#endif

Expand Down
Loading