Merge pull request haskell-nix#278 from haskell-nix/srk/daemon

add Arbitrary Eq for SuccessCodeReply, CI: re-enable on.pull_request
obsidiansystems · Dec 13, 2023 · b57f69b · b57f69b
2 parents c1f7666 + 083dfd8
commit b57f69b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.dhall.frozen b/.github/workflows/ci.dhall.frozen
@@ -1,6 +1,6 @@
 let haskellCi =
       https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
-        sha256:a39801f73d93c6e0f91942755ef8ae4c50947e9a9b180b6724957229470f7b8d
+        sha256:5d7058a7684fd5315467b562853bd1c4a43da691c09293d3715ee739dfa26e08
 
 let defSteps = haskellCi.defaultCabalSteps
 

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -57,6 +57,7 @@ jobs:
         - "macos-latest"
 name: Haskell CI
 'on':
+  pull_request: {}
   push: {}
   schedule:
   - cron: "4 20 10 * *"
diff --git a/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs b/hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs
@@ -123,6 +123,9 @@ instance Arbitrary (Some StoreRequest) where
 
 -- ** Reply
 
+deriving via GenericArbitrary SuccessCodeReply
+  instance Arbitrary SuccessCodeReply
+
 deriving via GenericArbitrary GCResult
   instance Arbitrary GCResult
 

diff --git a/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs b/hnix-store-remote/src/System/Nix/Store/Remote/Types/SuccessCodeReply.hs
@@ -2,7 +2,9 @@ module System.Nix.Store.Remote.Types.SuccessCodeReply
   ( SuccessCodeReply(..)
   ) where
 
+import GHC.Generics (Generic)
+
 -- | Reply that checks an int success return value
 data SuccessCodeReply = SuccessCodeReply
-  deriving (Show)
+  deriving (Eq, Show, Generic)