Skip to content

Commit 9253751

Browse files
committed
Update to the latest versions.
1 parent 1a97165 commit 9253751

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

base_builder.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ done
1515
rmdir lib/mbedtls
1616
ln -s $lib_mbedtls lib/mbedtls
1717
cp lib/mbedtls/LICENSE $out/licenses/LICENSE_mbedtls.txt
18-
cp lib/mbedtls/apache-2.0.txt $out/licenses/apache-2.0_mbedtls.txt
1918

2019
rmdir lib/micropython-lib
2120
ln -s $lib_micropython_lib lib/micropython-lib

default.nix

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
# This date is used to identify releases. It gets baked into the filenames,
33
# file system timestamps, and `sys.version` in Python.
4-
date = "2023-05-01";
4+
date = "2023-05-10";
55

66
short_date = (builtins.substring 2 2 date) +
77
(builtins.substring 5 2 date) + (builtins.substring 8 2 date);
@@ -18,8 +18,8 @@ let
1818
example_code = pkgs.fetchFromGitHub {
1919
owner = "pololu";
2020
repo = "pololu-3pi-2040-robot";
21-
rev = "63e9b05c3a7b12d7721cd0b9e2883a379c88d285"; # 2023-04-27
22-
hash = "sha256-qoWMnt0gbXQHYEud5Ze8rT2TC6kDhgJmLz9W28Flxjo=";
21+
rev = "edc85070ec9820e3740a7d118d253f67ea6fbc86"; # 2023-05-10
22+
hash = "sha256-uhod1T8c6q6GN1p3aUMjZjueissL1FrhVBSrvihJey8=";
2323
};
2424

2525
base = pkgs.stdenv.mkDerivation rec {
@@ -31,15 +31,15 @@ let
3131
src = pkgs.fetchFromGitHub {
3232
owner = "micropython";
3333
repo = "micropython";
34-
rev = "867e4dd3dc9235974974fd5dab204371616d6f49"; # master branch, 2023-04-04
35-
hash = "sha256-njvG1XfAwfVOCYE4O7lwGWgtmQanqMhdTlDSAEdVhOA=";
34+
rev = "4e4bdbd191eb00ef42d9bd6fe9a8303a16f6878d"; # master branch, 2023-05-09
35+
hash = "sha256-7uZw5JV6wDyhPlzKc0oM0zSDv6Xzm/xOVhP8inm7u0U=";
3636
};
3737
patches = [ ./3pi.patch ./traceback.patch ];
3838

3939
# After changing the MicroPython version above, run
4040
# 'git describe --tags --match=v*' to get the new values for these:
4141
version = "v1.20.0";
42-
version_suffix = "-24";
42+
version_suffix = "-62";
4343
MICROPY_GIT_TAG = version + version_suffix + "-g" + MICROPY_GIT_HASH;
4444
MICROPY_GIT_HASH = builtins.substring 0 9 src.rev;
4545

@@ -53,8 +53,8 @@ let
5353
lib_mbedtls = pkgs.fetchFromGitHub {
5454
owner = "ARMmbed";
5555
repo = "mbedtls";
56-
rev = "1bc2c9cb8b8fe4659bd94b8ebba5a4c02029b7fa";
57-
hash = "sha256-DiX++cDFRHfx67BDRMDd03G62aGvwAzqkgFWenroRAw=";
56+
rev = "981743de6fcdbe672e482b6fd724d31d0a0d2476";
57+
hash = "sha256-w5bJErCNRZLE8rHcuZlK3bOqel97gPPMKH2cPGUR6Zw=";
5858
};
5959
lib_micropython_lib = pkgs.fetchFromGitHub {
6060
owner = "micropython";
@@ -78,13 +78,13 @@ let
7878
ulab_src = pkgs.fetchFromGitHub {
7979
owner = "v923z";
8080
repo = "micropython-ulab";
81-
rev = "8c3e1058d441c2d075febadc8b7993b03e152bf9"; # 2023-03-03
82-
hash = "sha256-gbZFgCdbtr4oxSAfGONJpSJm4k3u8QGSOlM3iOkT9tI=";
81+
rev = "ac2e9954edc185ec212e437e73e4b5e4290de35b"; # 2023-05-07
82+
hash = "sha256-BVhPoZGyKP4x/CDFR5F3+edD7oT6J31t+EASVO0qYSI=";
8383
};
8484

8585
# After changing the ulab version, run
8686
# 'git describe --tags' to get the new value of this:
87-
ulab_git_tag = "5.1.1-27-g" + builtins.substring 0 7 ulab_src.rev;
87+
ulab_git_tag = "6.0.12"; #+ builtins.substring 0 7 ulab_src.rev;
8888

8989
MICROPY_BANNER_NAME_AND_VERSION =
9090
"MicroPython ${MICROPY_GIT_TAG} build ${build_git_tag}; with ulab ${ulab_git_tag}";

0 commit comments

Comments
 (0)