From 8ceb99bfde24e99269d8eebc63be7a02168eeda8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= Date: Mon, 28 Oct 2024 20:20:28 +0100 Subject: [PATCH 1/2] build: add rust-toolchain.toml file --- rust-toolchain.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000..7f4575e0c --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel="1.82.0" +components = ["rustfmt", "clippy", "rust-analyzer"] + From 348eef9d2dbe95f3d60c24a8d888f7f2a5dbcca8 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Mon, 4 Nov 2024 19:29:02 +0000 Subject: [PATCH 2/2] chore: define specfic rust version in flake --- flake.lock | 12 ++++++------ flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index d8d8de915..4073e5a1b 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730137625, - "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -139,11 +139,11 @@ ] }, "locked": { - "lastModified": 1730341826, - "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", + "lastModified": 1730687492, + "narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", + "rev": "41814763a2c597755b0755dbe3e721367a5e420f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 47e846313..dc67d02eb 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,7 @@ # Toolchains # latest stable - stable_toolchain = pkgs.rust-bin.stable.latest.default.override { + stable_toolchain = pkgs.rust-bin.stable."1.82.0".default.override { targets = [ "wasm32-unknown-unknown" ]; # wasm }; @@ -63,7 +63,7 @@ pkg-config curl just - protobuf3_20 + protobuf nixpkgs-fmt rust-analyzer typos