aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEthan Brierley <ethanboxx@gmail.com>2024-08-14 12:35:36 +0100
committerGitHub <noreply@github.com>2024-08-14 12:35:36 +0100
commitd264840b386c62996c4388c589a23a4e1f17b365 (patch)
tree1cf626d083c255a6ab52997b17a9a0c363887c2a
parentchore(deps): update to debian bookworm, rust 1.80 (#2354) (diff)
downloadatuin-d264840b386c62996c4388c589a23a4e1f17b365.zip
chore: update rust to `1.80.1` (#2362)
fixes #2360 https://blog.rust-lang.org/2024/08/08/Rust-1.80.1.html `1.80.1` fixes a fairly nasty miscompilation, but that's not my motivation for opening this PR. If I'm understanding correctly, because the rust patch version was not specified in `rust-toolchain.toml`, nix automatically upgraded to the new version. This broke the hash in `flake.nix` causing the flake to fail to build. Making this upgrade to `1.80.1` explicit, fixes this issue.
-rw-r--r--Dockerfile2
-rw-r--r--flake.lock18
-rw-r--r--flake.nix2
-rw-r--r--rust-toolchain.toml2
4 files changed, 12 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile
index 3feaf205..f421b692 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lukemathwalker/cargo-chef:latest-rust-1.80-slim-bookworm AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.80.1-slim-bookworm AS chef
WORKDIR app
FROM chef AS planner
diff --git a/flake.lock b/flake.lock
index 1d804726..5ca5e51a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1722839439,
- "narHash": "sha256-AwQv9kstzEOYjzuC9uY8jECqFJPuV/UxPLa30L3DLqo=",
+ "lastModified": 1723530607,
+ "narHash": "sha256-FaXZZLLDW1D+pj7UgrIslDS8XjMMG3Pus5gAvUYWQS0=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "1388e72dd8562c8b2908fd655dee0c797df9e930",
+ "rev": "296d44c440302980824c5f3b67e477cf0522e0c1",
"type": "github"
},
"original": {
@@ -57,11 +57,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1722730825,
- "narHash": "sha256-X6U+w8qFBuGPCYrZzc9mpN34aRjQ8604MonpBUkj908=",
+ "lastModified": 1723541349,
+ "narHash": "sha256-LrmeqqHdPgAJsVKIJja8jGgRG/CA2y6SGT2TjX5Do68=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f3834de3782b82bfc666abf664f946d0e7d1f116",
+ "rev": "4877ea239f4d02410c3516101faf35a81af0c30e",
"type": "github"
},
"original": {
@@ -82,11 +82,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1722798820,
- "narHash": "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg=",
+ "lastModified": 1723473250,
+ "narHash": "sha256-Ls0e6R4FmGUFXZlUcm6ZQaVNJ4Yj/nua4SSctXIopao=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "c9109f23de57359df39db6fa36b5ca4c64b671e1",
+ "rev": "32a86cb1dad2b208e8f36f1bb50c2e4806b0371f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 013ef3b2..19a8034a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
fenix.packages.${system}.fromToolchainFile
{
file = ./rust-toolchain.toml;
- sha256 = "sha256-6eN/GKzjVSjEhGO9FhWObkRFaE1Jf+uqMSdQnb8lcB4=";
+ sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE=";
};
in
pkgs.makeRustPlatform {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 8cca5be0..a56a283d 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
[toolchain]
-channel = "1.80"
+channel = "1.80.1"