22
33 # This date is used to identify releases. It gets baked into the filenames,
44 # file system timestamps, and `sys.version` in Python.
5- date = "2023-11-13 " ;
5+ date = "2024-01-17 " ;
66
77 short_date = ( builtins . substring 2 2 date ) +
88 ( builtins . substring 5 2 date ) + ( builtins . substring 8 2 date ) ;
1111 builtins . throw "Be sure to use build.sh. See README." else
1212 short_date + "-" + builtins . getEnv "COMMIT" ;
1313
14- # nixos-22 .11 branch, 2022-12 -14
14+ # nixos-23 .11 branch, 2024-01 -14
1515 nixpkgs = import ( fetchTarball
16- "https://github.com/NixOS/nixpkgs/archive/170e39462b516bd1475ce9184f7bb93106d27c59 .tar.gz" ) ;
16+ "https://github.com/NixOS/nixpkgs/archive/428544ae95eec077c7f823b422afae5f174dee4b .tar.gz" ) ;
1717 pkgs = nixpkgs { } ;
1818
1919 micropython = {
2020 src = pkgs . fetchFromGitHub {
2121 owner = "micropython" ;
2222 repo = "micropython" ;
23- rev = "05cb1406ad1b421a238faf763e19f4119f5f6bb2 " ; # master branch, 2023-10-11
24- hash = "sha256-zgaa1sRGTyBGDrBFrhiUvuDYe1YGkJcbmFmuhieRBZc =" ;
23+ rev = "9b8c64c9cee8203be167e6bffc74e186ae2fc958 " ; # 1.22.1 release
24+ hash = "sha256-tGFXJW1RkUs/64Yatgg/1zZFPDQdu76uiMjNU8ebdvg =" ;
2525 } ;
26- patches = [ ./mpy-boards.patch ./mpy- traceback.patch ] ;
26+ patches = [ ./mpy-traceback.patch ] ;
2727
2828 # After changing the MicroPython version above, run
2929 # 'git describe --tags --match=v*' to get the new values for these:
30- version = "v1.22.0-preview " ;
31- version_suffix = "-8" ;
30+ version = "v1.22.1 " ;
31+ version_suffix = "" ; # e.g. "-47"
3232 } ;
3333
3434 # Submodules of MicroPython needed by the RP2 port.
3838 # After changing the MicroPython version, get the info you need to update this by
3939 # running in the MicroPython repository:
4040 # cd ports/rp2 && make submodules && git submodule status --recursive | grep '^ '
41+ lib_berkeley_db = pkgs . fetchFromGitHub {
42+ owner = "pfalcon" ;
43+ repo = "berkeley-db-1.xx" ;
44+ rev = "35aaec4418ad78628a3b935885dd189d41ce779b" ;
45+ hash = "sha256-XItxmpXXPgv11LcnL7dty6uq1JctGokHCU8UGG9ic04=" ;
46+ } ;
4147 lib_mbedtls = pkgs . fetchFromGitHub {
4248 owner = "ARMmbed" ;
4349 repo = "mbedtls" ;
4753 lib_micropython_lib = pkgs . fetchFromGitHub {
4854 owner = "micropython" ;
4955 repo = "micropython-lib" ;
50- rev = "e025c843b60e93689f0f991d753010bb5bd6a722 " ;
51- hash = "sha256-ilKBoIQy3xW+s5djp0jShjO/G29vASfUn6gBoHedMxk =" ;
56+ rev = "7cdf70881519c73667efbc4a61a04d9c1a49babb " ;
57+ hash = "sha256-XkBX+xMcaJsNs+VjNiZ8XNliMlsum8Gi+ndrxmVnM+M =" ;
5258 } ;
5359 lib_pico_sdk = pkgs . fetchFromGitHub {
5460 owner = "raspberrypi" ;
6874 ulab_src = pkgs . fetchFromGitHub {
6975 owner = "v923z" ;
7076 repo = "micropython-ulab" ;
71- rev = "a05ec05351260cf48fefc347265b8d8bf29c03f1 " ; # 2023-08-10
72- hash = "sha256-jo9eowplUgKOmdUFJsoDkEI7s7HvaH5Ya3tHxVoXN8k =" ;
77+ rev = "9a1d03d90d9ae1c7f676941f618d0451030354f7 " ; # 2024-01-16
78+ hash = "sha256-82Qd41jG2EBCjyGWXVO1tFpwY71mvOhQLazfl33M0pw =" ;
7379 } ;
7480
7581 # After changing the ulab version, look in its docs/ulab-change-log.md
7682 # file to get the new version of this.
77- ulab_git_tag = "6.4 .0" + "-" + builtins . substring 0 7 ulab_src . rev ;
83+ ulab_git_tag = "6.5 .0" + "-" + builtins . substring 0 7 ulab_src . rev ;
7884
7985 board = { board_name , file_name , MICROPY_BOARD , example_code , start_url } :
8086 let
8894 MICROPY_GIT_HASH = builtins . substring 0 9 src . rev ;
8995 MICROPY_GIT_TAG = version + version_suffix + "-g" + MICROPY_GIT_HASH ;
9096
91- inherit lib_mbedtls lib_micropython_lib lib_pico_sdk pico_sdk_patches lib_tinyusb ulab_src ulab_git_tag ;
97+ inherit lib_berkeley_db lib_mbedtls lib_micropython_lib lib_pico_sdk pico_sdk_patches lib_tinyusb ulab_src ulab_git_tag ;
9298
9399 MICROPY_BANNER_NAME_AND_VERSION =
94100 "MicroPython ${ MICROPY_GIT_TAG } build ${ build_git_tag } ; with ulab ${ ulab_git_tag } " ;
@@ -121,8 +127,8 @@ in rec {
121127 example_code = pkgs . fetchFromGitHub {
122128 owner = "pololu" ;
123129 repo = "pololu-3pi-2040-robot" ;
124- rev = "bf2688c366d4986be37e88ee364e237050a11e6b " ; # 2023-11-13
125- hash = "sha256-/e8KfNVponv1Crf67B5z/3PCRMo60oHCOpiIeU3+fPM =" ;
130+ rev = "6ddb719da080c21d9d1fb03e9f92007a12848f24 " ; # 2024-01-16
131+ hash = "sha256-KcT2ChRHVFUHAa1h+B75kmP1wDPcyP1cxVF3IsEllxU =" ;
126132 } ;
127133 } ;
128134
@@ -134,8 +140,8 @@ in rec {
134140 example_code = pkgs . fetchFromGitHub {
135141 owner = "pololu" ;
136142 repo = "zumo-2040-robot" ;
137- rev = "629845142ddc44e34f1340484afa8a22eab89d57 " ; # 2023-11-13
138- hash = "sha256-C044Eo3TCdePG3qZVKLUju8tNbDlhaSGfuJnGT0ztog =" ;
143+ rev = "7bf996d4aa4180349538ab3c64980621930f6623 " ; # 2024-01-16
144+ hash = "sha256-V+vFeZ82soP77lXwHTVZks7a2DvdbjIJckPnrViBgCE =" ;
139145 } ;
140146 } ;
141147
0 commit comments