@@ -132,7 +132,7 @@ main = do
132132 it "works with master branch impl" $ inTmp $ \_ -> run "ob" ["init", "--branch", "master"]
133133 it "works with symlink" $ inTmp $ \_ -> run "ob" ["init", "--symlink", toTextIgnore obeliskImpl]
134134 it "doesn't silently overwrite existing files" $ withSystemTempDirectory "ob-init λ" $ \dir -> do
135− let p force = (proc "ob" $ "--no-handoff" : "init" : ["--force"|force]) { cwd = Just dir }
135+ let p force = (System.Process.proc "ob" $ "--no-handoff" : "init" : ["--force"|force]) { cwd = Just dir }
136136 (ExitSuccess, _, _) <- readCreateProcessWithExitCode (p False) ""
137137 (ExitFailure _, _, _) <- readCreateProcessWithExitCode (p False) ""
138138 (ExitSuccess, _, _) <- readCreateProcessWithExitCode (p True) ""
@@ -164,23 +164,23 @@ main = do
164164 it "can build ghc.backend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghc.backend"]
165165 it "can build ghcjs.frontend" $ inTmpObInit $ \_ -> nixBuild ["-A", "ghcjs.frontend"]
166166
167− if System.Info.os == "darwin"
168− then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
169− else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
170− let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
171− writefile defaultNixPath
172− =<< T.replace
173− "# config.android_sdk.accept_license = false;"
174− "config.android_sdk.accept_license = true;"
175− <$> readfile defaultNixPath
176− nixBuild ["-A", "android.frontend"]
167+ -- if System.Info.os == "darwin"
168+ -- then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]
169+ -- else it "can build android after accepting license" $ inTmpObInit $ \dir -> do
170+ -- let defaultNixPath = dir </> ("default.nix" :: Shelly.FilePath)
171+ -- writefile defaultNixPath
172+ -- =<< T.replace
173+ -- "# config.android_sdk.accept_license = false;"
174+ -- "config.android_sdk.accept_license = true;"
175+ -- <$> readfile defaultNixPath
176+ -- nixBuild ["-A", "android.frontend"]
177177
178178 forM_ ["ghc", "ghcjs"] $ \compiler -> do
179179 let
180− shell = "shells." <> compiler
181− inShell cmd' = run "nix-shell" ["default.nix", "-A", fromString shell, "--run", cmd']
182− it ("can enter " <> shell) $ inTmpObInit $ \_ -> inShell "exit"
183− it ("can build in " <> shell) $ inTmpObInit $ \_ -> inShell $ "cabal new-build --" <> fromString compiler <> " all"
180+ shellName = "shells." <> compiler
181+ inShell cmd' = run "nix-shell" ["default.nix", "-A", fromString shellName, "--run", cmd']
182+ it ("can enter " <> shellName) $ inTmpObInit $ \_ -> inShell "exit"
183+ it ("can build in " <> shellName) $ inTmpObInit $ \_ -> inShell $ "cabal new-build --" <> fromString compiler <> " all"
184184
185185 it "has idempotent thunk update" $ inTmpObInit $ \_ -> do
186186 u <- update