build(nix): Introduce flake.formatter for nix fmt (#5687)

* build(nix): Introduce flake.formatter for `nix fmt`
* chore: Switch to pkgs.nixfmt-rfc-style
This commit is contained in:
Tushar 2024-03-02 04:48:26 +05:30 committed by GitHub
parent da3b9ba2b7
commit cb5e8f7fc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions

View File

@ -7,7 +7,7 @@
}: }:
let let
optionalInt = cond: x: if cond then x else 0; optionalInt = cond: x: if cond then x else 0;
in in
singularity-tools.buildImage rec { singularity-tools.buildImage rec {
inherit (llama-cpp) name; inherit (llama-cpp) name;

View File

@ -107,11 +107,12 @@
# ``` # ```
# #
# Cf. https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-flake.html?highlight=flake#flake-format # Cf. https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-flake.html?highlight=flake#flake-format
flake.overlays.default = flake.overlays.default = (
(final: prev: { final: prev: {
llamaPackages = final.callPackage .devops/nix/scope.nix { inherit llamaVersion; }; llamaPackages = final.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
inherit (final.llamaPackages) llama-cpp; inherit (final.llamaPackages) llama-cpp;
}); }
);
systems = [ systems = [
"aarch64-darwin" "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 # Unlike `.#packages`, legacyPackages may contain values of
# arbitrary types (including nested attrsets) and may even throw # arbitrary types (including nested attrsets) and may even throw
# exceptions. This attribute isn't recursed into by `nix flake # exceptions. This attribute isn't recursed into by `nix flake