From 3138f41c03d087a6d40fd5e7645b596f651b2ed3 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Thu, 11 May 2023 12:36:56 +0700 Subject: [PATCH] Forward compatibility with future versions of GHC + DRY up package.yaml --- package.yaml | 14 +++++--------- src/System/Process/Typed/Internal.hs | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.yaml b/package.yaml index 41e15f7..5b6a7e5 100644 --- 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 index 13f65d5..0c958bd 100644 --- 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 #-}