From 294acaaca9f4fb28b756d07ba5b0db6a1f599839 Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Fri, 3 May 2024 19:07:08 -0300 Subject: [PATCH 1/3] Add stack.yaml for lts-22.18 --- stack-lts-22.18.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 stack-lts-22.18.yaml diff --git a/stack-lts-22.18.yaml b/stack-lts-22.18.yaml new file mode 100644 index 0000000..c2154fc --- /dev/null +++ b/stack-lts-22.18.yaml @@ -0,0 +1,21 @@ +resolver: none +allow-newer: true + +packages: + - ./packages/conferer/ + - ./packages/aeson/ + - ./packages/dhall/ + - ./packages/hedis/ + - ./packages/hspec/ + - ./packages/snap/ + - ./packages/warp/ + - ./packages/yaml/ + - ./example/ + +extra-deps: + - dhall-json-1.7.12@sha256:de9712d0d538a4e4ff5c86b6949f8776fd499cee9a7e537e31348566e74a317a,4517 + +flags: + conferer-hspec: + no-hspec-api: true + From 657b6582cada692dfd8fa29c55682c71788511e8 Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Fri, 3 May 2024 19:31:55 -0300 Subject: [PATCH 2/3] Handle newer version of hspec --- packages/hspec/src/Conferer/FromConfig/Hspec.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/hspec/src/Conferer/FromConfig/Hspec.hs b/packages/hspec/src/Conferer/FromConfig/Hspec.hs index 5d82f7c..b34d18d 100644 --- a/packages/hspec/src/Conferer/FromConfig/Hspec.hs +++ b/packages/hspec/src/Conferer/FromConfig/Hspec.hs @@ -170,6 +170,9 @@ desconstructHspecConfigToDefaults Hspec.Config{..} = #endif #if MIN_VERSION_hspec_core(2,11,5) , ("formatException", toDyn configFormatException) +#endif +#if MIN_VERSION_hspec_core(2,11,8) + , ("seed", toDyn configSeed) #endif ] @@ -254,5 +257,8 @@ instance FromConfig Hspec.Config where #endif #if MIN_VERSION_hspec_core(2,11,5) NotUserConfigurable configFormatException <- fetchFromConfig (key /. "formatException") config +#endif +#if MIN_VERSION_hspec_core(2,11,8) + configSeed <- fetchFromConfig (key /. "seed") config #endif pure Hspec.Config{..} From c751763139add34bd86927db960758af1c18f417 Mon Sep 17 00:00:00 2001 From: Lucas David Traverso Date: Fri, 3 May 2024 19:42:35 -0300 Subject: [PATCH 3/3] Remove now unnecessary flag --- stack-lts-22.18.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/stack-lts-22.18.yaml b/stack-lts-22.18.yaml index c2154fc..959ba1b 100644 --- a/stack-lts-22.18.yaml +++ b/stack-lts-22.18.yaml @@ -15,7 +15,3 @@ packages: extra-deps: - dhall-json-1.7.12@sha256:de9712d0d538a4e4ff5c86b6949f8776fd499cee9a7e537e31348566e74a317a,4517 -flags: - conferer-hspec: - no-hspec-api: true -