Merge pull request fpco#68 from sol/dev

Forward compatibility with future versions of GHC + DRY up package.yaml
sol · May 11, 2023 · 971f04a · 971f04a
2 parents 9988b77 + 3138f41
commit 971f04a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/package.yaml b/package.yaml
@@ -29,7 +29,8 @@ library:
     cpp-options: -DWINDOWS
 
 tests:
-  typed-process-test:
+  typed-process-test: &typed-process-test
+    build-tools: hspec-discover
     main: Spec.hs
     source-dirs: test
     ghc-options:
@@ -38,14 +39,9 @@ tests:
     - -with-rtsopts=-N
     dependencies:
     - base64-bytestring
-    - hspec
+    - hspec == 2.*
     - temporary
     - typed-process
   typed-process-test-single-threaded:
-    main: Spec.hs
-    source-dirs: test
-    dependencies:
-    - base64-bytestring
-    - hspec
-    - temporary
-    - typed-process
+    <<: *typed-process-test
+    ghc-options: []
diff --git a/src/System/Process/Typed/Internal.hs b/src/System/Process/Typed/Internal.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE DataKinds #-}