diff options
| author | Tushar <ditsuke@protonmail.com> | 2024-03-02 04:48:26 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-01 15:18:26 -0800 |
| commit | cb5e8f7fc4ee57d4bcccafbe04a82cededd35486 (patch) | |
| tree | 7b1474860eb940376393120b2cf050ee88787465 | |
| parent | da3b9ba2b710c0f8b44398a0eb9e5a7ae2ad967a (diff) | |
build(nix): Introduce flake.formatter for `nix fmt` (#5687)
* build(nix): Introduce flake.formatter for `nix fmt`
* chore: Switch to pkgs.nixfmt-rfc-style
| -rw-r--r-- | .devops/nix/sif.nix | 2 | ||||
| -rw-r--r-- | flake.nix | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.devops/nix/sif.nix b/.devops/nix/sif.nix index 7535ca0f..7a5e1dd0 100644 --- a/.devops/nix/sif.nix +++ b/.devops/nix/sif.nix @@ -7,7 +7,7 @@ }: let - optionalInt = cond: x: if cond then x else 0; + optionalInt = cond: x: if cond then x else 0; in singularity-tools.buildImage rec { inherit (llama-cpp) name; @@ -107,11 +107,12 @@ # ``` # # Cf. https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-flake.html?highlight=flake#flake-format - flake.overlays.default = - (final: prev: { + flake.overlays.default = ( + final: prev: { llamaPackages = final.callPackage .devops/nix/scope.nix { inherit llamaVersion; }; inherit (final.llamaPackages) llama-cpp; - }); + } + ); systems = [ "aarch64-darwin" @@ -131,6 +132,9 @@ ... }: { + # For standardised reproducible formatting with `nix fmt` + formatter = pkgs.nixfmt-rfc-style; + # Unlike `.#packages`, legacyPackages may contain values of # arbitrary types (including nested attrsets) and may even throw # exceptions. This attribute isn't recursed into by `nix flake |