diff options
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | misc/pre-commit.nix | 2 | ||||
| -rw-r--r-- | nix-support/nixfmt.nix | 65 | ||||
| -rw-r--r-- | package.nix | 4 |
4 files changed, 4 insertions, 72 deletions
@@ -140,10 +140,7 @@ system = crossSystem; } // lib.optionalAttrs (crossSystem == "x86_64-freebsd") { useLLVM = true; }; - overlays = [ - (overlayFor (p: p.${stdenv})) - (final: prev: { nixfmt = final.callPackage ./nix-support/nixfmt.nix { }; }) - ]; + overlays = [ (overlayFor (p: p.${stdenv})) ]; }; stdenvs = forAllStdenvs (make-pkgs null); native = stdenvs.stdenvPackages; diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix index 292940e83..59ad2f874 100644 --- a/misc/pre-commit.nix +++ b/misc/pre-commit.nix @@ -106,7 +106,7 @@ pre-commit-run { }; treefmt = { enable = true; - settings.formatters = [ pkgs.nixfmt ]; + settings.formatters = [ pkgs.nixfmt-rfc-style ]; }; }; } diff --git a/nix-support/nixfmt.nix b/nix-support/nixfmt.nix deleted file mode 100644 index b51e26295..000000000 --- a/nix-support/nixfmt.nix +++ /dev/null @@ -1,65 +0,0 @@ -# Copy of `nixfmt-rfc-style` vendored from `nixpkgs` master: -# https://github.com/NixOS/nixpkgs/blob/ab6071eb54cc9b66dda436111d4f569e4e56cbf4/pkgs/by-name/ni/nixfmt-rfc-style/package.nix -{ - haskell, - haskellPackages, - fetchFromGitHub, -}: -let - inherit (haskell.lib.compose) justStaticExecutables; - raw-pkg = haskellPackages.callPackage ( - { - mkDerivation, - base, - cmdargs, - directory, - fetchzip, - filepath, - lib, - megaparsec, - mtl, - parser-combinators, - safe-exceptions, - scientific, - text, - transformers, - unix, - }: - mkDerivation { - pname = "nixfmt"; - version = "0.6.0-unstable-2024-03-14"; - src = fetchFromGitHub { - owner = "serokell"; - repo = "nixfmt"; - rev = "8d13b593fa8d8d6e5075f541f3231222a08e84df"; - hash = "sha256-HtXvzmfN4wk45qiKZ7V+/5WBV7jnTHfd7iBwF4XGl64="; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base - megaparsec - mtl - parser-combinators - scientific - text - transformers - ]; - executableHaskellDepends = [ - base - cmdargs - directory - filepath - safe-exceptions - text - unix - ]; - jailbreak = true; - homepage = "https://github.com/serokell/nixfmt"; - description = "An opinionated formatter for Nix"; - license = lib.licenses.mpl20; - mainProgram = "nixfmt"; - } - ) { }; -in -justStaticExecutables raw-pkg diff --git a/package.nix b/package.nix index 435a265d1..16477a6a2 100644 --- a/package.nix +++ b/package.nix @@ -396,7 +396,7 @@ stdenv.mkDerivation (finalAttrs: { glibcLocales, just, llvmPackages, - nixfmt, + nixfmt-rfc-style, skopeo, xonsh, @@ -457,7 +457,7 @@ stdenv.mkDerivation (finalAttrs: { # docker image tool skopeo just - nixfmt + nixfmt-rfc-style # Included above when internalApiDocs is true, but we set that to # false intentionally to save dev build time. # To build them in a dev shell, you can set -Dinternal-api-docs=enabled when configuring. |