Merge branch 'master' into test-json

Author: Ericson2314

.github/workflows/ci.dhall

@@ -1,9 +1,10 @@
 let haskellCi =
-      https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
+      https://raw.githubusercontent.com/obsidiansystems/github-actions-dhall/merge-group/haskell-ci.dhall
 
 let defSteps = haskellCi.defaultCabalSteps
 
-in    haskellCi.generalCi
+let ci =
+      haskellCi.generalCi
         ( haskellCi.withNix
             ( defSteps
               with docStep = None haskellCi.BuildStep
@@ -24,4 +25,6 @@ in    haskellCi.generalCi
         , ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
         , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
         }
-    : haskellCi.CI.Type
+
+in  ci
+  with on = ci.on // { merge_group = Some haskellCi.MergeGroup.default }

.github/workflows/ci.dhall.frozen

@@ -1,10 +1,11 @@
 let haskellCi =
-      https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
-        sha256:1f1a5102e99ea92eb585b4d36aaeabb0bd93d39e62ba82f3080250fdc234e33a
+      https://raw.githubusercontent.com/obsidiansystems/github-actions-dhall/merge-group/haskell-ci.dhall
+        sha256:66e034024b7fa1606428cba5c009999d44dd95613b41acee2700f8e31c7902f1
 
 let defSteps = haskellCi.defaultCabalSteps
 
-in    haskellCi.generalCi
+let ci =
+      haskellCi.generalCi
         ( haskellCi.withNix
             ( defSteps
               with docStep = None haskellCi.BuildStep
@@ -25,4 +26,6 @@ in    haskellCi.generalCi
         , ghc = [ haskellCi.GHC.GHC9102, haskellCi.GHC.GHC984 ]
         , os = [ haskellCi.OS.Ubuntu, haskellCi.OS.MacOS ]
         }
-    : haskellCi.CI.Type
+
+in  ci
+  with on = ci.on // { merge_group = Some haskellCi.MergeGroup.default }

.github/workflows/ci.yaml

@@ -57,5 +57,6 @@ jobs:
         - "macos-latest"
 name: Haskell CI
 'on':
+  merge_group: {}
   pull_request: {}
   push: {}

hnix-store-core/hnix-store-core.cabal

@@ -95,8 +95,8 @@ library
     , memory
     , nix-derivation >= 1.1.1 && <2
     , some > 1.0.5 && < 2
-    , time
     , text
+    , time
     , unordered-containers
     , vector
   hs-source-dirs:      src

hnix-store-json/hnix-store-json.cabal

@@ -41,6 +41,8 @@ library
       System.Nix.JSON
   build-depends:
       base >=4.12 && <5
+    , hnix-store-core >= 0.8
+
     , aeson >= 2.0 && < 3.0
     , attoparsec
     , constraints-extras
@@ -49,7 +51,6 @@ library
     , data-default-class
     , dependent-sum
     , deriving-aeson >= 0.2
-    , hnix-store-core >= 0.8
     , monoidal-containers
     , text
     , these
@@ -79,6 +80,7 @@ test-suite json
     , hnix-store-core
     , hnix-store-json
     , hnix-store-tests
+
     , aeson
     , bytestring
     , constraints-extras