Merge pull request #4594 from commercialhaskell/allow-ghci

Rename duplicated System.Permissions module
commercialhaskell · Feb 18, 2019 · bc0bc3e · bc0bc3e
2 parents 2c17ce5 + 1c24689
commit bc0bc3e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/subs/pantry/src/Pantry/Repo.hs b/subs/pantry/src/Pantry/Repo.hs
@@ -19,7 +19,7 @@ import RIO.Process
 import Database.Persist (Entity (..))
 import qualified RIO.Text as T
 import System.Console.ANSI (hSupportsANSIWithoutEmulation)
-import System.Permissions (osIsWindows)
+import System.IsWindows (osIsWindows)
 
 fetchReposRaw
   :: (HasPantryConfig env, HasLogFunc env, HasProcessContext env)

diff --git a/subs/pantry/src/unix/System/Permissions.hs → subs/pantry/src/unix/System/IsWindows.hs b/subs/pantry/src/unix/System/Permissions.hs → subs/pantry/src/unix/System/IsWindows.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-module System.Permissions
+module System.IsWindows
   ( osIsWindows
   ) where
 

diff --git a/.../pantry/src/windows/System/Permissions.hs → subs/pantry/src/windows/System/IsWindows.hs b/.../pantry/src/windows/System/Permissions.hs → subs/pantry/src/windows/System/IsWindows.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
-module System.Permissions
+module System.IsWindows
   ( osIsWindows
   ) where