Skip to content

Commit 2313cb9

Browse files
committed
ai update nix and cachix
1 parent 98ce37d commit 2313cb9

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

.github/workflows/upload_cachix.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
matrix:
1515
nixChannel:
1616
- nixos-25.05
17-
- nixos-24.11 # remove this when 25.05 is out of beta
1817
- nixos-unstable
1918
- nixpkgs-unstable
2019

flake.nix

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
let
2424
overlays = [ rust-overlay.overlays.default ];
2525
pkgs = import nixpkgs { inherit system overlays; };
26+
rustToolchain = pkgs.rust-bin.stable."1.85.0".default.override {
27+
extensions = [ "rust-src" "clippy" "rustfmt" ];
28+
};
2629
in
2730
{
2831
packages =
@@ -35,11 +38,10 @@
3538
};
3639

3740
devShells.default = pkgs.mkShell {
38-
buildInputs = (with pkgs; [
39-
rust-analyzer
40-
clippy
41-
rustfmt
42-
])
41+
buildInputs = [
42+
rustToolchain
43+
pkgs.rust-analyzer
44+
]
4345
++ self.packages.${system}.default.buildInputs
4446
++ self.packages.${system}.default.nativeBuildInputs;
4547
};

nix/packages.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,19 @@ let
77
rustPlatform,
88
stdenv,
99
pkg-config,
10+
rust-bin,
1011
}:
1112
let
1213
cargoToml = builtins.fromTOML (builtins.readFile /${root}/crates/${x}/Cargo.toml);
14+
rustToolchain = rust-bin.stable."1.85.0".default.override {
15+
extensions = [ "rust-src" "clippy" "rustfmt" ];
16+
};
17+
rustPlatformWithToolchain = rustPlatform.override {
18+
rustc = rustToolchain;
19+
cargo = rustToolchain;
20+
};
1321
in
14-
rustPlatform.buildRustPackage {
22+
rustPlatformWithToolchain.buildRustPackage {
1523
pname = cargoToml.package.name;
1624
version = cargoToml.package.version;
1725

0 commit comments

Comments
 (0)