summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Estep <sam@samestep.com>2025-07-14 06:16:37 -0400
committerGitHub <noreply@github.com>2025-07-14 10:16:37 +0000
commitdb06fbb163877b8823507b162ee7f2dfca8520f0 (patch)
tree1cf768196bcafe359d8eefd7aef9e906341298ba
parentd39590228241cb42d72f493f6f484c5ea93df934 (diff)
Let `flake.nix` users run `extras/formatting.sh` (#7682)
Co-authored-by: Ellie Hermaszewska <ellieh@nvidia.com>
-rw-r--r--docs/building.md2
-rw-r--r--flake.lock6
-rw-r--r--flake.nix26
3 files changed, 18 insertions, 16 deletions
diff --git a/docs/building.md b/docs/building.md
index f32bda997..156e2471a 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -322,7 +322,7 @@ have the Nix environment automatically activate when you enter your clone of
this repository:
```bash
-echo 'use flake' >> .envrc
+echo 'use flake' > .envrc
direnv allow
```
diff --git a/flake.lock b/flake.lock
index c3c585c60..f64cb7ae4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1742206328,
- "narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=",
+ "lastModified": 1751949589,
+ "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "096478927c360bc18ea80c8274f013709cf7bdcd",
+ "rev": "9b008d60392981ad674e04016d25619281550a9d",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 211e5f107..a6ad8f9f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,18 +16,20 @@
pkgs = import nixpkgs { inherit system; };
in
{
- devShell =
- with pkgs;
- mkShell {
- buildInputs = [
- cmake
- llvm
- ninja
- nixfmt-rfc-style
- python3
- xorg.libX11
- ];
- };
+ devShell = pkgs.mkShell {
+ buildInputs = [
+ pkgs.cmake
+ pkgs.gersemi
+ pkgs.llvm
+ pkgs.llvmPackages_17.clang-tools
+ pkgs.ninja
+ pkgs.nixfmt-rfc-style
+ pkgs.prettier
+ pkgs.python3
+ pkgs.shfmt
+ pkgs.xorg.libX11
+ ];
+ };
}
);
}