Skip to content

Commit 5c6f4e1

Browse files
committed
revert cahix build, and nix config
1 parent 2313cb9 commit 5c6f4e1

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

.github/workflows/upload_cachix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
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

flake.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
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 =
@@ -38,10 +35,11 @@
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
};

nix/packages.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@ let
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

0 commit comments

Comments
 (0)