remote: GADT -> Types.StoreRequest

Author: sorki

hnix-store-remote/hnix-store-remote.cabal

@@ -76,7 +76,6 @@ library
     , System.Nix.Store.Remote
     , System.Nix.Store.Remote.Arbitrary
     , System.Nix.Store.Remote.Client
-    , System.Nix.Store.Remote.GADT
     , System.Nix.Store.Remote.Logger
     , System.Nix.Store.Remote.MonadStore
     , System.Nix.Store.Remote.Serialize
@@ -90,6 +89,7 @@ library
     , System.Nix.Store.Remote.Types.Logger
     , System.Nix.Store.Remote.Types.ProtoVersion
     , System.Nix.Store.Remote.Types.StoreConfig
+    , System.Nix.Store.Remote.Types.StoreRequest
     , System.Nix.Store.Remote.Types.StoreText
     , System.Nix.Store.Remote.Types.SubstituteMode
     , System.Nix.Store.Remote.Types.Verbosity

hnix-store-remote/src/System/Nix/Store/Remote/Arbitrary.hs

@@ -5,7 +5,6 @@ module System.Nix.Store.Remote.Arbitrary where
 
 import Data.Some (Some(Some))
 import System.Nix.Arbitrary ()
-import System.Nix.Store.Remote.GADT
 import System.Nix.Store.Remote.Types
 
 import Test.QuickCheck (Arbitrary(..), oneof)

hnix-store-remote/src/System/Nix/Store/Remote/Types.hs

@@ -5,6 +5,7 @@ module System.Nix.Store.Remote.Types
   , module System.Nix.Store.Remote.Types.Logger
   , module System.Nix.Store.Remote.Types.ProtoVersion
   , module System.Nix.Store.Remote.Types.StoreConfig
+  , module System.Nix.Store.Remote.Types.StoreRequest
   , module System.Nix.Store.Remote.Types.StoreText
   , module System.Nix.Store.Remote.Types.SubstituteMode
   , module System.Nix.Store.Remote.Types.Verbosity
@@ -18,6 +19,7 @@ import System.Nix.Store.Remote.Types.CheckMode
 import System.Nix.Store.Remote.Types.Logger
 import System.Nix.Store.Remote.Types.ProtoVersion
 import System.Nix.Store.Remote.Types.StoreConfig
+import System.Nix.Store.Remote.Types.StoreRequest
 import System.Nix.Store.Remote.Types.StoreText
 import System.Nix.Store.Remote.Types.SubstituteMode
 import System.Nix.Store.Remote.Types.Verbosity

hnix-store-remote/src/System/Nix/Store/Remote/GADT.hs renamed to hnix-store-remote/src/System/Nix/Store/Remote/Types/StoreRequest.hs

@@ -1,8 +1,8 @@
-{-# language GADTs #-}
-{-# language Rank2Types #-}
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE Rank2Types #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module System.Nix.Store.Remote.GADT
+module System.Nix.Store.Remote.Types.StoreRequest
   ( StoreRequest(..)
   ) where