Merge pull request commercialhaskell#2477 from 0xmohit/remove_os_flag

mgsloan · web-flow · commit 0bc1927fbaa0 · 2016-08-12T00:15:45.000-07:00
Remove the `--os` flag.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -42,6 +42,8 @@ Bug fixes:
   [#2361](https://github.com/commercialhaskell/stack/issues/2361)
 * Fixes src directory pollution of `style.css` and `highlight.js` with GHC 8's
   haddock [#2429](https://github.com/commercialhaskell/stack/issues/2429)
+* Remove the `--os` flag
+  [#2227](https://github.com/commercialhaskell/stack/issues/2227)
 
 ## 1.1.2
 
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -244,8 +244,7 @@ configFromConfigMonoid configStackRoot configUserConfigPath mresolver mproject C
          (Platform defArch defOS) = buildPlatform
          arch = fromMaybe defArch
               $ (getFirst configMonoidArch) >>= Distribution.Text.simpleParse
-         os = fromMaybe defOS
-            $ (getFirst configMonoidOS) >>= Distribution.Text.simpleParse
+         os = defOS
          configPlatform = Platform arch os
 
          configRequireStackVersion = simplifyVersionRange (getIntersectingVersionRange configMonoidRequireStackVersion)
diff --git a/src/Stack/Options.hs b/src/Stack/Options.hs
@@ -208,7 +208,7 @@ cleanOptsParser = CleanShallow <$> packages <|> doFullClean
 -- | Command-line arguments parser for configuration.
 configOptsParser :: GlobalOptsContext -> Parser ConfigMonoid
 configOptsParser hide0 =
-    (\stackRoot workDir buildOpts dockerOpts nixOpts systemGHC installGHC arch os ghcVariant jobs includes libs overrideGccPath skipGHCCheck skipMsys localBin modifyCodePage allowDifferentUser -> mempty
+    (\stackRoot workDir buildOpts dockerOpts nixOpts systemGHC installGHC arch ghcVariant jobs includes libs overrideGccPath skipGHCCheck skipMsys localBin modifyCodePage allowDifferentUser -> mempty
         { configMonoidStackRoot = stackRoot
         , configMonoidWorkDir = workDir
         , configMonoidBuildOpts = buildOpts
@@ -218,7 +218,6 @@ configOptsParser hide0 =
         , configMonoidInstallGHC = installGHC
         , configMonoidSkipGHCCheck = skipGHCCheck
         , configMonoidArch = arch
-        , configMonoidOS = os
         , configMonoidGHCVariant = ghcVariant
         , configMonoidJobs = jobs
         , configMonoidExtraIncludeDirs = includes
@@ -259,12 +258,6 @@ configOptsParser hide0 =
            <> help "System architecture, e.g. i386, x86_64"
            <> hide
             ))
-    <*> optionalFirst (strOption
-            ( long "os"
-           <> metavar "OS"
-           <> help "Operating system, e.g. linux, windows"
-           <> hide
-            ))
     <*> optionalFirst (ghcVariantParser (hide0 /= OuterGlobalOpts))
     <*> optionalFirst (option auto
             ( long "jobs"
diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs
@@ -786,8 +786,6 @@ data ConfigMonoid =
     -- ^ See: 'configCompilerCheck'
     ,configMonoidRequireStackVersion :: !IntersectingVersionRange
     -- ^ See: 'configRequireStackVersion'
-    ,configMonoidOS                  :: !(First String)
-    -- ^ Used for overriding the platform
     ,configMonoidArch                :: !(First String)
     -- ^ Used for overriding the platform
     ,configMonoidGHCVariant          :: !(First GHCVariant)
@@ -867,7 +865,6 @@ parseConfigMonoidJSON obj = do
     configMonoidRequireStackVersion <- IntersectingVersionRange <$> unVersionRangeJSON <$>
                                        obj ..:? configMonoidRequireStackVersionName
                                            ..!= VersionRangeJSON anyVersion
-    configMonoidOS <- First <$> obj ..:? configMonoidOSName
     configMonoidArch <- First <$> obj ..:? configMonoidArchName
     configMonoidGHCVariant <- First <$> obj ..:? configMonoidGHCVariantName
     configMonoidJobs <- First <$> obj ..:? configMonoidJobsName
@@ -956,9 +953,6 @@ configMonoidSkipMsysName = "skip-msys"
 configMonoidRequireStackVersionName :: Text
 configMonoidRequireStackVersionName = "require-stack-version"
 
-configMonoidOSName :: Text
-configMonoidOSName = "os"
-
 configMonoidArchName :: Text
 configMonoidArchName = "arch"
 
