TOSQUASH

fs-api/CHANGELOG.md

@@ -15,7 +15,6 @@
   * `System.FS.IO.Internal` is moved to `System.FS.IO.Unix` on Linux and MacOS
     systems, and moved to `System.FS.IO.Windows` on Windows systems.
   * `System.FS.IO.Internal.Handle` is moved to `System.FS.IO.Handle`.
-* Make the `fs-api` package only buildable on Linux, MacOS and Windows systems.
 
 ### Non-breaking
 

fs-api/fs-api.cabal

@@ -55,19 +55,14 @@ library
     exposed-modules: System.FS.IO.Win32
     build-depends:   Win32 >=2.6.1.0
 
-  elif (os(linux) || os(osx))
+  -- every other distribution is handled like it is Unix-based
+  else
     hs-source-dirs:  src-unix
     exposed-modules: System.FS.IO.Unix
     build-depends:
       , unix
       , unix-bytestring  >=0.4.0
 
-  else
-    -- The package currently only supports Linux, MacOS and Windows
-    -- explicitly.
-    build-depends: unbuildable <0
-    buildable:     False
-
   ghc-options:
     -Wall -Wcompat -Wincomplete-uni-patterns
     -Wincomplete-record-updates -Wpartial-fields -Widentities

fs-sim/test/Test/System/FS/StateMachine.hs

@@ -381,9 +381,7 @@ allocaMutableByteArray size action = newPinnedByteArray size >>= action
 -- used to compare the 'FsError's that the mock throws against the 'FsError's
 -- that the SUT throws, is more lenient than the default 'sameFsError'.
 sameError :: FsError -> FsError -> Bool
-#if defined(linux_HOST_OS)
-sameError = sameFsError
-#elif defined(mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS)
 -- For the following error types, our mock FS implementation (and the Posix
 -- implementation) throw the same errors:
 --
@@ -420,7 +418,8 @@ sameError e1 e2 = sameFsError e1 e2
       (FsResourceInappropriateType, FsInsufficientPermissions  ) -> True
       (_                          , _                          ) -> False
 #else
-sameError = error "OS not supported"
+-- treat every other distribution like it is (Ubuntu) Linux
+sameError = sameFsError
 #endif
 
 -- | Responses are either successful termination or an error