From 4e7b12f1a292803ec62e6dc84f6fdbadb7a4f1d6 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 9 May 2023 18:51:28 +0200
Subject: [PATCH] build: fix compilation on darwin

[no changelog]
---
 ci/shell.nix       | 2 +-
 tools/version.sh   | 2 +-
 vendor/micropython | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/shell.nix b/ci/shell.nix
index 4740a155b..60ad7d387 100644
--- a/ci/shell.nix
+++ b/ci/shell.nix
@@ -74,7 +74,6 @@ stdenvNoCC.mkDerivation ({
     check
     curl  # for connect tests
     editorconfig-checker
-    gcc11
     gcc-arm-embedded
     git
     gitAndTools.git-subrepo
@@ -95,6 +94,7 @@ stdenvNoCC.mkDerivation ({
     moreutils
   ] ++ lib.optionals (!stdenv.isDarwin) [
     autoPatchelfHook
+    gcc11
     procps
     valgrind
   ] ++ lib.optionals (stdenv.isDarwin) [
diff --git a/tools/version.sh b/tools/version.sh
index 925c2f62f..28bd355fd 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -4,4 +4,4 @@ if [ -z "$1" ]; then
    exit 1
 fi
 
-echo "VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH" | cpp -include $1 -nostdinc -P | tr -d " "
+echo "VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH" | cpp -include $1 -nostdinc -P - | tr -d " "
diff --git a/vendor/micropython b/vendor/micropython
index a973bbca7..7dc799ca6 160000
--- a/vendor/micropython
+++ b/vendor/micropython
@@ -1 +1 @@
-Subproject commit a973bbca756ca0c9219deefea2873d3cc774839d
+Subproject commit 7dc799ca6c27ca7e82c527cbd3c783d64acde89f