Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions nix/shell/ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ let
'';
in
{
buildInputs = with pkgs; [
pre-commit
];
buildInputs = pkgs.lib.optional (usePreCommit) pre-commit;

shellHook = ''
if [ "${toString usePreCommit}" = "1" ]; then
Expand Down
6 changes: 3 additions & 3 deletions nix/shell/rust.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ let
# Stable Rust channel configuration.
stable = {
buildInputs = buildInputs ++ [
rustChannels.stable
(rustChannels.stable.override ({ extensions = [ "rust-src" ]; }))
];

inherit shellEnv;
Expand All @@ -59,7 +59,7 @@ let
# Nightly Rust channel configuration.
nightly = {
buildInputs = buildInputs ++ [
rustChannels.nightly
(rustChannels.nightly.override ({ extensions = [ "rust-src" ]; }))
];

inherit shellEnv;
Expand All @@ -76,7 +76,7 @@ let
# Rust's ASAN requires nightly Rust.
asan = {
buildInputs = buildInputs ++ [
rustChannels.nightly
(rustChannels.nightly.override ({ extensions = [ "rust-src" ]; }))
];

shellEnv = shellEnv // {
Expand Down