Skip to content

Commit a0f4cdd

Browse files
committed
chore: Switch to pkgs.nixfmt-rfc-style
1 parent 2559f5f commit a0f4cdd

File tree

3 files changed

+6
-101
lines changed

3 files changed

+6
-101
lines changed

.devops/nix/sif.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
}:
88

99
let
10-
optionalInt = cond: x: if cond then x else 0;
10+
optionalInt = cond: x: if cond then x else 0;
1111
in
1212
singularity-tools.buildImage rec {
1313
inherit (llama-cpp) name;

flake.lock

Lines changed: 0 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
inputs = {
1919
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
2020
flake-parts.url = "github:hercules-ci/flake-parts";
21-
nixfmt = {
22-
url = "github:piegamesde/nixfmt/rfc101-style";
23-
inputs.nixpkgs.follows = "nixpkgs";
24-
};
2521
};
2622

2723
# There's an optional binary cache available. The details are below, but they're commented out.
@@ -111,11 +107,12 @@
111107
# ```
112108
#
113109
# Cf. https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-flake.html?highlight=flake#flake-format
114-
flake.overlays.default =
115-
(final: prev: {
110+
flake.overlays.default = (
111+
final: prev: {
116112
llamaPackages = final.callPackage .devops/nix/scope.nix { inherit llamaVersion; };
117113
inherit (final.llamaPackages) llama-cpp;
118-
});
114+
}
115+
);
119116

120117
systems = [
121118
"aarch64-darwin"
@@ -136,9 +133,7 @@
136133
}:
137134
{
138135
# For standardised reproducible formatting with `nix fmt`
139-
# HELP: why does the per system formatter not work?
140-
# formatter = inputs.nixfmt.packages.${system}.nixfmt;
141-
formatter = if (system == "x86_64-linux") then inputs.nixfmt.packages.${system}.nixfmt else null;
136+
formatter = pkgs.nixfmt-rfc-style;
142137

143138
# Unlike `.#packages`, legacyPackages may contain values of
144139
# arbitrary types (including nested attrsets) and may even throw

0 commit comments

Comments
 (0)