From bdea7d475e5fb13ea7768a5bbeaaa4600073d829 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 1 Feb 2024 11:45:33 -0500
Subject: [PATCH] System.Posix.Terminal.PosixString: Fix imports in
 HAVE_OPENPTY path

This appears to have broken with the `os-string` split of
`filepath-1.5`.
---
 System/Posix/Terminal/PosixString.hsc | 12 +++++++++---
 cabal.project.wasm32-wasi             |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/System/Posix/Terminal/PosixString.hsc b/System/Posix/Terminal/PosixString.hsc
index a62f2bb..5262360 100644
--- a/System/Posix/Terminal/PosixString.hsc
+++ b/System/Posix/Terminal/PosixString.hsc
@@ -72,12 +72,18 @@ module System.Posix.Terminal.PosixString (
 import Foreign
 import System.Posix.Types
 import System.Posix.Terminal.Common
+
 #ifndef HAVE_OPENPTY
-import qualified System.OsPath.Data.ByteString.Short as SBS
-import System.Posix.IO.ByteString (defaultFileFlags, openFd, noctty, OpenMode(ReadWrite))
 import Data.ByteString.Char8 as B ( pack, )
-import qualified System.OsPath.Data.ByteString.Short as BC
+import System.Posix.IO.ByteString (defaultFileFlags, openFd, noctty, OpenMode(ReadWrite))
 import System.OsString.Internal.Types (PosixString(..))
+#if MIN_VERSION_filepath(1,5,0)
+import qualified System.OsString.Data.ByteString.Short as SBS
+import qualified System.OsString.Data.ByteString.Short as BC
+#else
+import qualified System.OsPath.Data.ByteString.Short as SBS
+import qualified System.OsPath.Data.ByteString.Short as BC
+#endif
 #endif
 
 import Foreign.C hiding (
diff --git a/cabal.project.wasm32-wasi b/cabal.project.wasm32-wasi
index 87a3e35..f6e34e2 100644
--- a/cabal.project.wasm32-wasi
+++ b/cabal.project.wasm32-wasi
@@ -5,4 +5,4 @@ package unix
 
 write-ghc-environment-files: always
 
-allow-newer: all:base, all:filepath
+allow-newer: all:base
-- 
GitLab