Skip to content

Commit a8e9163

Browse files
authored
rust-overlay: upgrade rust-bin to 1.78.0 (1.77.0 for x86_64-win builds) (#35)
* rust-overlay: upgrade rust-bin to 1.78.0 Upgrade rust to 1.78.0, which is the highest available version of the stable rust-bin before a breaking change was introduced in May 2024. We will need to debug the build failure before using a later version of rust-overlay. * Roll rust back to 1.77.0 for x86_64-win build There are some issues with 1.78.0 for win64. Let's try an older version.
1 parent 8ac0b36 commit a8e9163

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

nix-rust-overlay/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ ENV RUST_PROJECT_NAME="rust-cross-build-nix"
1010

1111
# nixpkgs 22.05
1212
ENV NIXPKGS_COMMIT_SHA="ce6aa13369b667ac2542593170993504932eb836"
13-
# rust-overlay version 20240303
14-
ENV RUST_OVERLAY_COMMIT_SHA="30c3af18405567115958c577c62548bdc5a251e7"
13+
# rust-overlay version 20240502 with latest rust-bin.stable 1.78.0
14+
# Note that this is the previous commit of the problematic commit
15+
# 0bf05d8534406776a0fbc9ed8d4ef5bd925b056a that seemed to have introduced a
16+
# breaking change
17+
ENV RUST_OVERLAY_COMMIT_SHA="2e7ccf572ce0f0547d4cf4426de4482936882d0e"
1518

1619
# Apple M1 workaround
1720
COPY nix.conf /build/nix.conf

nix-rust-overlay/shell-aarch64.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
99
mkShell {
1010
nativeBuildInputs = [
11-
rust-bin.stable."1.76.0".minimal
11+
rust-bin.stable."1.78.0".minimal
1212
pkg-config
1313
];
1414

nix-rust-overlay/shell-armv6.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
99
mkShell {
1010
nativeBuildInputs = [
11-
rust-bin.stable."1.76.0".minimal
11+
rust-bin.stable."1.78.0".minimal
1212
pkg-config
1313
];
1414

nix-rust-overlay/shell-armv7.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
99
mkShell {
1010
nativeBuildInputs = [
11-
rust-bin.stable."1.76.0".minimal
11+
rust-bin.stable."1.78.0".minimal
1212
pkg-config
1313
];
1414

nix-rust-overlay/shell-i686.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
99
mkShell {
1010
nativeBuildInputs = [
11-
rust-bin.stable."1.76.0".minimal
11+
rust-bin.stable."1.78.0".minimal
1212
pkg-config
1313
];
1414

nix-rust-overlay/shell-x86_64-win.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{ mkShell, stdenv, rust-bin, windows, wine64, pkg-config }:
1111
mkShell {
1212
nativeBuildInputs = [
13-
rust-bin.stable."1.76.0".minimal
13+
rust-bin.stable."1.77.0".minimal
1414
pkg-config
1515
];
1616

nix-rust-overlay/shell-x86_64.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{ mkShell, stdenv, rust-bin, pkg-config, openssl, qemu }:
99
mkShell {
1010
nativeBuildInputs = [
11-
rust-bin.stable."1.76.0".minimal
11+
rust-bin.stable."1.78.0".minimal
1212
pkg-config
1313
];
1414

0 commit comments

Comments
 (0)