From 2d4cabe7860cb7ef7aa5bb6a3c21153e624d61b6 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 28 Feb 2025 14:39:47 +0900 Subject: nix: increase nixfmt max width Signed-off-by: Ophestra --- flake.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index e1dccece..b32b5a73 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ cd ${./.} echo "running nixfmt..." - nixfmt --check . + nixfmt --width=256 --check . touch $out ''; @@ -115,21 +115,19 @@ }; fsu = pkgs.callPackage ./cmd/fsu/package.nix { inherit (self.packages.${system}) fortify; }; - dist = - pkgs.runCommand "${fortify.name}-dist" { inherit (self.devShells.${system}.default) buildInputs; } - '' - # go requires XDG_CACHE_HOME for the build cache - export XDG_CACHE_HOME="$(mktemp -d)" + dist = pkgs.runCommand "${fortify.name}-dist" { inherit (self.devShells.${system}.default) buildInputs; } '' + # go requires XDG_CACHE_HOME for the build cache + export XDG_CACHE_HOME="$(mktemp -d)" - # get a different workdir as go does not like /build - cd $(mktemp -d) \ - && cp -r ${fortify.src}/. . \ - && chmod +w cmd && cp -r ${fsu.src}/. cmd/fsu/ \ - && chmod -R +w . + # get a different workdir as go does not like /build + cd $(mktemp -d) \ + && cp -r ${fortify.src}/. . \ + && chmod +w cmd && cp -r ${fsu.src}/. cmd/fsu/ \ + && chmod -R +w . - export FORTIFY_VERSION="v${fortify.version}" - ./dist/release.sh && mkdir $out && cp -v "dist/fortify-$FORTIFY_VERSION.tar.gz"* $out - ''; + export FORTIFY_VERSION="v${fortify.version}" + ./dist/release.sh && mkdir $out && cp -v "dist/fortify-$FORTIFY_VERSION.tar.gz"* $out + ''; fhs = pkgs.buildFHSEnv { pname = "fortify-fhs"; -- cgit v1.3.1