Skip to content

Commit bc97300

Browse files
committed
chore(flake): update flake
Updates the flake to bring in a more recently nightly compiler. Also, formats and removes unused variables
1 parent 9733a10 commit bc97300

File tree

2 files changed

+40
-35
lines changed

2 files changed

+40
-35
lines changed

flake.lock

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

flake.nix

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,27 @@
1010
flake-utils.url = "github:numtide/flake-utils";
1111
};
1212

13-
outputs = { self, nixpkgs, flake-utils, fenix }:
14-
flake-utils.lib.eachDefaultSystem (system:
15-
let
16-
overlays = [ fenix.overlays.default ];
17-
pkgs = import nixpkgs { inherit overlays system; };
18-
toolchain = "latest";
19-
rustPkg = fenix.packages.${system}.${toolchain}.withComponents [
20-
"cargo"
21-
"clippy"
22-
"rust-src"
23-
"rustc"
24-
"rustfmt"
25-
];
26-
in
27-
{
28-
devShell = pkgs.mkShell {
29-
buildInputs = with pkgs; [
13+
outputs = {
14+
nixpkgs,
15+
flake-utils,
16+
fenix,
17+
...
18+
}:
19+
flake-utils.lib.eachDefaultSystem (system: let
20+
overlays = [fenix.overlays.default];
21+
pkgs = import nixpkgs {inherit overlays system;};
22+
toolchain = "latest";
23+
rustPkg = fenix.packages.${system}.${toolchain}.withComponents [
24+
"cargo"
25+
"clippy"
26+
"rust-src"
27+
"rustc"
28+
"rustfmt"
29+
];
30+
in {
31+
devShell = pkgs.mkShell {
32+
buildInputs = with pkgs;
33+
[
3034
act
3135
clang
3236
elixir
@@ -37,19 +41,20 @@
3741
rustPkg
3842
rust-analyzer-nightly
3943
cmake
40-
] ++ lib.optionals stdenv.isDarwin [
44+
]
45+
++ lib.optionals stdenv.isDarwin [
4146
darwin.apple_sdk.frameworks.Security
4247
darwin.apple_sdk.frameworks.SystemConfiguration
4348
];
44-
shellHook = ''
45-
mkdir -p .nix-mix
46-
mkdir -p .nix-hex
47-
export MIX_HOME=$PWD/.nix-mix
48-
export HEX_HOME=$PWD/.nix-hex
49-
export PATH=$MIX_HOME/bin:$PATH
50-
export PATH=$HEX_HOME/bin:$PATH
51-
export PATH=$MIX_HOME/escripts:$PATH
52-
'';
53-
};
54-
});
49+
shellHook = ''
50+
mkdir -p .nix-mix
51+
mkdir -p .nix-hex
52+
export MIX_HOME=$PWD/.nix-mix
53+
export HEX_HOME=$PWD/.nix-hex
54+
export PATH=$MIX_HOME/bin:$PATH
55+
export PATH=$HEX_HOME/bin:$PATH
56+
export PATH=$MIX_HOME/escripts:$PATH
57+
'';
58+
};
59+
});
5560
}

0 commit comments

Comments
 (0)