Merge branch 'master' into push-lrpxpruqstnw

ocharles · Jun 9, 2024 · 565f914 · 565f914
2 parents 0af2122 + 4c4fbd6
commit 565f914
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/flake.nix b/flake.nix
@@ -40,8 +40,9 @@
           modules = [
             {
               reinstallableLibGhc = false;
+              enableLibraryProfiling = true;
               nonReinstallablePkgs = [
-                "rts" "ghc-prim" "integer-gmp" "integer-simple" "base"
+                "rts" "ghc-prim" "integer-gmp" "integer-simple" "base" "terminfo"
                 "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
                 "ghc-bignum" "system-cxx-std-lib" "ghc" "binary" "bytestring" "containers" 
                 "directory" "exceptions" "filepath" "hpc" "process" "semaphore-compat" "stm" 

diff --git a/src/Weeder/Main.hs b/src/Weeder/Main.hs
@@ -191,7 +191,7 @@ main = handleWeederException do
     >>= mainWithConfig hieExt hieDirectories requireHsFiles
   where
     throwConfigError e =
-      throwIO $ ExitConfigFailure (show e)
+      throwIO $ ExitConfigFailure (displayException e)
 
     decodeConfig noDefaultFields =
       if noDefaultFields

diff --git a/weeder.cabal b/weeder.cabal
@@ -62,6 +62,8 @@ executable weeder
   default-language: Haskell2010
 
 test-suite weeder-test
+  build-tool-depends:
+    hspec-discover:hspec-discover
   build-depends:
     , aeson
     , algebraic-graphs