File tree Expand file tree Collapse file tree 3 files changed +7
-16
lines changed
Expand file tree Collapse file tree 3 files changed +7
-16
lines changed Original file line number Diff line number Diff line change 1414 matrix :
1515 nixChannel :
1616 - nixos-25.05
17+ - nixos-24.11 # remove this when 25.05 is out of beta
1718 - nixos-unstable
1819 - nixpkgs-unstable
1920
Original file line number Diff line number Diff line change 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- } ;
2926 in
3027 {
3128 packages =
3835 } ;
3936
4037 devShells . default = pkgs . mkShell {
41- buildInputs = [
42- rustToolchain
43- pkgs . rust-analyzer
44- ]
38+ buildInputs = ( with pkgs ; [
39+ rust-analyzer
40+ clippy
41+ rustfmt
42+ ] )
4543 ++ self . packages . ${ system } . default . buildInputs
4644 ++ self . packages . ${ system } . default . nativeBuildInputs ;
4745 } ;
Original file line number Diff line number Diff line change 77 rustPlatform ,
88 stdenv ,
99 pkg-config ,
10- rust-bin ,
1110 } :
1211 let
1312 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- } ;
2113 in
22- rustPlatformWithToolchain . buildRustPackage {
14+ rustPlatform . buildRustPackage {
2315 pname = cargoToml . package . name ;
2416 version = cargoToml . package . version ;
2517
You can’t perform that action at this time.
0 commit comments