Updated hnix dependencies in all Stack configurations

Also added `mkParsec` method to MonadParsec instance for megaparsec>=9.4
dhall-lang · Jun 5, 2024 · 99649e6 · 99649e6
1 parent 3b47381
commit 99649e6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/dhall/src/Dhall/Parser/Combinators.hs b/dhall/src/Dhall/Parser/Combinators.hs
@@ -169,6 +169,10 @@ instance Text.Megaparsec.MonadParsec Void Text Parser where
 
     updateParserState f = Parser (Text.Megaparsec.updateParserState f)
 
+#if MIN_VERSION_megaparsec(9,4,0)
+    mkParsec f = Parser (Text.Megaparsec.mkParsec f)
+#endif
+
 instance Semigroup a => Semigroup (Parser a) where
     (<>) = liftA2 (<>)
 

diff --git a/stack.ghc-8.10.yaml b/stack.ghc-8.10.yaml
@@ -13,9 +13,9 @@ packages:
 extra-deps:
   - co-log-core-0.3.2.0
   - hashable-1.3.5.0@sha256:3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7,4240
-  - hnix-0.16.0
-  - hnix-store-core-0.5.0.0
-  - hnix-store-remote-0.5.0.0
+  - hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224
+  - hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
+  - hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
   - lsp-2.1.0.0
   - lsp-types-2.0.1.0
   - lsp-test-0.15.0.1

diff --git a/stack.ghc-9.2.yaml b/stack.ghc-9.2.yaml
@@ -11,12 +11,11 @@ packages:
   - dhall-toml
   - dhall-yaml
 extra-deps:
-  - github: haskell-nix/hnix
-    commit: 2adbc502e62e755ca0372c913e6278ebe564d7d2
   - chronos-1.1.5
   - hashing-0.1.1.0
-  - hnix-store-core-0.6.1.0
-  - hnix-store-remote-0.6.0.0
+  - hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224
+  - hnix-store-core-0.6.1.0@sha256:0171c3a571ab263c3e3aa3e6daca15602f2030a6862cb032038017e6d0265898,3882
+  - hnix-store-remote-0.6.0.0@sha256:a8ea18bb355164bfd357fac12b0c5d32c95ffd455260f8b6c7fcaeddebf5918c,3270
   - logict-0.7.0.3
   - lsp-2.1.0.0
   - lsp-types-2.0.1.0