Merge branch 'master' into misha/reporting

Author: mikekeke

Makefile

@@ -33,11 +33,16 @@ nix-cabal-repl:
 
 # Target to use as dependency to fail if not inside nix-shell.
 requires_nix_shell:
-	@ [ "($IN_NIX_SHELL)" ] || echo "The $(MAKECMDGOALS) target must be run from inside `nix develop`"
-	@ [ "($IN_NIX_SHELL)" ] || (echo "    run `nix develop` first" && false)
+	@ [ "$(IN_NIX_SHELL)" ] || echo "The $(MAKECMDGOALS) target must be run from inside a nix shell"
+	@ [ "$(IN_NIX_SHELL)" ] || (echo "    run 'nix develop' first" && false)
 
 # Add folder locations to the list to be reformatted.
 fourmolu-format:
 	@ echo "> Formatting all .hs files"
 	fourmolu -i $$(find src/  -iregex ".*.hs")
 	fourmolu -i $$(find test/ -iregex ".*.hs")
+
+NIX_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.nix' )
+
+nixfmt: requires_nix_shell
+	nixfmt $(NIX_SOURCES)

default.nix

@@ -1,13 +1,6 @@
-(
-  import (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  ) {
-    src = ./.;
-  }
-).defaultNix
+(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in fetchTarball {
+  url =
+    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+  sha256 = lock.nodes.flake-compat.locked.narHash;
+}) { src = ./.; }).defaultNix

nix/haskell.nix

@@ -73,6 +73,7 @@ pkgs.haskell-nix.cabalProject {
         entr
         ghcid
         git
+        nixfmt
 
         # hls doesn't support preprocessors yet so this has to exist in PATH
         haskellPackages.record-dot-preprocessor

shell.nix

@@ -1,13 +1,6 @@
-(
-  import (
-    let
-      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    in
-      fetchTarball {
-        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-        sha256 = lock.nodes.flake-compat.locked.narHash;
-      }
-  ) {
-    src = ./.;
-  }
-).shellNix.default
+(import (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+in fetchTarball {
+  url =
+    "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+  sha256 = lock.nodes.flake-compat.locked.narHash;
+}) { src = ./.; }).shellNix.default