From 6877988515cd624109b18c835d2d06f065c432d4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 19 Feb 2025 14:45:41 -0500 Subject: [PATCH] Fix dev shell There was one `inputs.nixFmt` left after 573ffac2e67659dd00904e8bf53a66adfc40f95e. --- flake.nix | 2 +- packaging/dev-shell.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c2461a2ebc7..8283ccf970d 100644 --- a/flake.nix +++ b/flake.nix @@ -403,7 +403,7 @@ devShells = let - makeShell = import ./packaging/dev-shell.nix { inherit inputs lib devFlake; }; + makeShell = import ./packaging/dev-shell.nix { inherit lib devFlake; }; prefixAttrs = prefix: lib.concatMapAttrs (k: v: { "${prefix}-${k}" = v; }); in forAllSystems ( diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix index 8e1bb89368a..1b6c37f354d 100644 --- a/packaging/dev-shell.nix +++ b/packaging/dev-shell.nix @@ -1,6 +1,5 @@ { lib, - inputs, devFlake, }: @@ -117,7 +116,7 @@ pkgs.nixComponents.nix-util.overrideAttrs ( pkgs.buildPackages.changelog-d modular.pre-commit.settings.package (pkgs.writeScriptBin "pre-commit-hooks-install" modular.pre-commit.settings.installationScript) - inputs.nixfmt.packages.${pkgs.hostPlatform.system}.default + pkgs.buildPackages.nixfmt-rfc-style ] # TODO: Remove the darwin check once # https://github.com/NixOS/nixpkgs/pull/291814 is available