aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2024-04-23 18:54:26 +0000
committerAlex <alex@adnab.me>2024-04-23 18:54:26 +0000
commit123d3e1f0414341a2bfe19a5682180735fb63523 (patch)
tree80c3b61e28fa9903f0e023156d9944b70513abd5
parent33c2086d9e985059574302b42560e769f14587de (diff)
parenta6e4b96ca970de18950c4e7d5f06d6ad58555a21 (diff)
downloadgarage-123d3e1f0414341a2bfe19a5682180735fb63523.tar.gz
garage-123d3e1f0414341a2bfe19a5682180735fb63523.zip
Merge pull request 'flake.nix: add rust-analyzer to devShells.full, expose devShells.full in shell.nix' (#816) from flokli/garage:shell-fixes into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/816
-rw-r--r--flake.nix1
-rw-r--r--shell.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/flake.nix b/flake.nix
index 06c74220..f8840c5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,6 +76,7 @@
# import the full shell using `nix develop .#full`
full = shellWithPackages (with pkgs; [
rustfmt
+ rust-analyzer
clang
mold
# ---- extra packages for dev tasks ----
diff --git a/shell.nix b/shell.nix
index 0fa02b66..7236fdcb 100644
--- a/shell.nix
+++ b/shell.nix
@@ -11,6 +11,7 @@ in
{
# --- Dev shell inherited from flake.nix ---
devShell = devShells.default;
+ devShellFull = devShells.full;
# --- Continuous integration shell ---
# The shell used for all CI jobs (along with devShell)