Skip to content

Commit 1f9df0d

Browse files
Zantierrlouf
authored andcommitted
Install rustup instead of using rust overlay
1 parent 762d6b7 commit 1f9df0d

File tree

4 files changed

+20
-58
lines changed

4 files changed

+20
-58
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ end_of_line = lf
1010
charset = utf-8
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
13+
14+
[*.nix]
15+
indent_size = 2

flake.lock

Lines changed: 4 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
inputs = {
33
flake-utils.url = "github:numtide/flake-utils";
44
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
5-
rust-overlay.url = "github:oxalica/rust-overlay";
65
};
7-
outputs = { flake-utils, nixpkgs, rust-overlay, ... }:
6+
outputs = { flake-utils, nixpkgs, ... }:
87
flake-utils.lib.eachDefaultSystem (system:
98
let
10-
overlays = [ (import rust-overlay) ];
11-
pkgs = import nixpkgs { inherit system overlays; };
9+
pkgs = import nixpkgs { inherit system; };
1210
in {
13-
devShell = import ./shell.nix { inherit pkgs system; };
11+
devShell = pkgs.mkShell {
12+
buildInputs = [
13+
pkgs.pre-commit
14+
pkgs.python3
15+
pkgs.rustup
16+
];
17+
shellHook = ''
18+
FLAKE_DIR=$(dirname $(dirname $out))
19+
source $FLAKE_DIR/.venv/bin/activate
20+
'';
21+
};
1422
});
1523
}

shell.nix

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)