More work on windows

codedownio · Nov 18, 2023 · 825b070 · 825b070
1 parent 815f553
commit 825b070
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 33 deletions.
diff --git a/demos/demo-custom-exceptions/demo-custom-exceptions.cabal b/demos/demo-custom-exceptions/demo-custom-exceptions.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -28,11 +28,9 @@ executable demo-custom-exceptions
   ghc-options: -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base
+    , brick
     , sandwich
     , text
     , time
+    , vty
   default-language: Haskell2010
-  if !os(windows)
-    build-depends:
-        brick
-      , vty
diff --git a/demos/demo-custom-exceptions/package.yaml b/demos/demo-custom-exceptions/package.yaml
@@ -4,16 +4,11 @@ license:             BSD3
 
 dependencies:
 - base
+- brick
 - sandwich
 - text
 - time
-
-when:
-- condition: "!os(windows)"
-  dependencies:
-  - brick
-  - vty
-
+- vty
 
 default-extensions:
 - OverloadedStrings

diff --git a/sandwich-hedgehog/package.yaml b/sandwich-hedgehog/package.yaml
@@ -25,11 +25,7 @@ dependencies:
 - text
 - time
 - wl-pprint-annotated
-
-when:
-- condition: "!os(windows)"
-  dependencies:
-  - vty
+- vty
 
 default-extensions:
 - OverloadedStrings
@@ -45,9 +41,6 @@ library:
   source-dirs: src
   exposed-modules:
     - Test.Sandwich.Hedgehog
-  when:
-  - condition: "!os(windows)"
-    source-dirs: unix-src
 
 tests:
   sandwich-hedgehog-test:

diff --git a/sandwich-hedgehog/sandwich-hedgehog.cabal b/sandwich-hedgehog/sandwich-hedgehog.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -28,6 +28,7 @@ library
   exposed-modules:
       Test.Sandwich.Hedgehog
   other-modules:
+      Test.Sandwich.Hedgehog.Render
       Paths_sandwich_hedgehog
   hs-source-dirs:
       src
@@ -51,16 +52,9 @@ library
     , string-interpolate
     , text
     , time
+    , vty
     , wl-pprint-annotated
   default-language: Haskell2010
-  if !os(windows)
-    build-depends:
-        vty
-  if !os(windows)
-    other-modules:
-        Test.Sandwich.Hedgehog.Render
-    hs-source-dirs:
-        unix-src
 
 test-suite sandwich-hedgehog-test
   type: exitcode-stdio-1.0
@@ -90,8 +84,6 @@ test-suite sandwich-hedgehog-test
     , string-interpolate
     , text
     , time
+    , vty
     , wl-pprint-annotated
   default-language: Haskell2010
-  if !os(windows)
-    build-depends:
-        vty
diff --git a/...unix-src/Test/Sandwich/Hedgehog/Render.hs → ...ehog/src/Test/Sandwich/Hedgehog/Render.hs b/...unix-src/Test/Sandwich/Hedgehog/Render.hs → ...ehog/src/Test/Sandwich/Hedgehog/Render.hs
diff --git a/sandwich-webdriver/sandwich-webdriver.cabal b/sandwich-webdriver/sandwich-webdriver.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack