MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 15:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'redox-2026-05-24' into 'master'

Browse Source 
Support nightly 2026-05-24

See merge request redox-os/redox!2167
This commit is contained in:
Jeremy Soller 2026-05-26 07:21:11 -06:00
commit 9ae3059530
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -45,7 +45,7 @@
overlays = [ rust-overlay.overlays.default ];
};
rust-bin = pkgs.rust-bin.nightly."2025-10-03".default.override {
rust-bin = pkgs.rust-bin.nightly."2026-05-24".default.override {
extensions = [
"rust-analyzer"
"rust-src"

3
mk/prefix.mk
View File

@ -26,8 +26,7 @@ LIBCURL_TARGET=recipes/net/download/curl/target/$(HOST_TARGET)/$(TARGET)
LIBGCC_TARGET=recipes/libs/libgcc/target/$(TARGET)
LIBCPP_TARGET=recipes/libs/libstdcxx/target/$(TARGET)
# official RISC-V support introduced in newer version
UPSTREAM_RUSTC_VERSION=2025-11-15
UPSTREAM_RUSTC_VERSION=2026-05-24
export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)

2
recipes/dev/rust/recipe.toml
View File

@ -1,6 +1,6 @@
[source]
git = "https://gitlab.redox-os.org/redox-os/rust.git"
branch = "redox-2025-10-03"
branch = "redox-2026-05-24"
shallow_clone = true
[build]

2
rust-toolchain.toml
View File

@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2025-10-03"
channel = "nightly-2026-05-24"
components = ["rust-src", "rustfmt", "clippy"]
profile = "minimal"