fbaebf9 · obelisk · git.iko.soy

git.iko.soy/obelisk

Merge pull request #471 from obsidiansystems/eac@nix-build-no-out-link

Use --no-out-link with nix-build

commitfbaebf9941cf08abf8c696555cf3280b9356eddb authorAli Abrar <aliabrar@gmail.com> dateFri 26 Jul 2019, 11:59 (7 years ago) parent761d8e3 ed1cead

3 files changed+16−11

compare with master

unifiedsplit

lib/command/src/Obelisk/Command/Run.hs+4−1 lib/command/src/Obelisk/Command/VmBuilder.hs+2−1 lib/selftest/src/Obelisk/SelfTest.hs+10−9

lib/command/src/Obelisk/Command/Run.hs+4−1

@@ -73,7 +73,10 @@ run = do

7373 -- Check whether the impure static files are a derivation (and so must be built)

7474 if isDerivation == "1"

7575 then fmap T.strip $ readProcessAndLogStderr Debug $ -- Strip whitespace here because nix-build has no --raw option

76− proc "nix-build" ["-E", "(import " <> importableRoot <> "{}).passthru.staticFilesImpure"]

76+ proc "nix-build"

77+ [ "--no-out-link"

78+ , "-E", "(import " <> importableRoot <> "{}).passthru.staticFilesImpure"

79+ ]

7780 else readProcessAndLogStderr Debug $

7881 proc "nix" ["eval", "-f", root, "passthru.staticFilesImpure", "--raw"]

7982 putLog Debug $ "Assets impurely loaded from: " <> assets

lib/command/src/Obelisk/Command/VmBuilder.hs+2−1

@@ -156,7 +156,8 @@ testLinuxBuild stateDir

156156 | System.Info.os == "linux" = failWith "Using the docker builder is not necessary on linux."

157157 | otherwise = do

158158 (exitCode, _stdout, stderr) <- readCreateProcessWithExitCode $ proc "nix-build"

159− [ "-E", "(import <nixpkgs> { system = \"x86_64-linux\"; }).writeText \"test\" builtins.currentTime"

159+ [ "--no-out-link"

160+ , "-E", "(import <nixpkgs> { system = \"x86_64-linux\"; }).writeText \"test\" builtins.currentTime"

160161 , "--builders", nixBuildersArgString stateDir

161162 ]

162163 unless (exitCode == ExitSuccess) $ do

lib/selftest/src/Obelisk/SelfTest.hs+10−9

@@ -75,6 +75,7 @@ main = do

7575 unless isVerbose $

7676 putStrLn "Tests may take longer to run if there are unbuilt derivations: use -v for verbose output"

7777 let verbosity = bool silently verbosely isVerbose

78+ nixBuild args = run "nix-build" ("--no-out-link" : args)

7879 obeliskImpl <- fromString <$> getEnv "OBELISK_IMPL"

7980 httpManager <- HTTP.newManager HTTP.defaultManagerSettings

8081 [p0, p1, p2, p3] <- liftIO $ getFreePorts 4

@@ -141,22 +142,22 @@ main = do

141142 testObRunInDir p2 p3 (Just "frontend") httpManager

142143

143144 describe "obelisk project" $ parallel $ do

144− it "can build obelisk command" $ inTmpObInit $ \_ -> run "nix-build" ["-A", "command" , obeliskImpl]

145− it "can build obelisk skeleton" $ inTmpObInit $ \_ -> run "nix-build" ["-A", "skeleton", obeliskImpl]

146− it "can build obelisk shell" $ inTmpObInit $ \_ -> run "nix-build" ["-A", "shell", obeliskImpl]

145+ it "can build obelisk command" $ inTmpObInit $ \_ -> nixBuild ["-A", "command" , obeliskImpl]

146+ it "can build obelisk skeleton" $ inTmpObInit $ \_ -> nixBuild ["-A", "skeleton", obeliskImpl]

147+ it "can build obelisk shell" $ inTmpObInit $ \_ -> nixBuild ["-A", "shell", obeliskImpl]

147148 -- See https://github.com/obsidiansystems/obelisk/issues/101

148− -- it "can build everything" $ shelly_ $ run "nix-build" [obeliskImpl]

149+ -- it "can build everything" $ shelly_ $ nixBuild [obeliskImpl]

149150

150151 describe "blank initialized project" $ parallel $ do

151152

152153 it "can build ghc.backend" $ inTmpObInit $ \_ -> do

153− run "nix-build" ["--no-out-link", "-A", "ghc.backend"]

154+ nixBuild ["-A", "ghc.backend"]

154155 it "can build ghcjs.frontend" $ inTmpObInit $ \_ -> do

155− run "nix-build" ["--no-out-link", "-A", "ghcjs.frontend"]

156+ nixBuild ["-A", "ghcjs.frontend"]

156157

157158 if os == "darwin"

158− then it "can build ios" $ inTmpObInit $ \_ -> run "nix-build" ["--no-out-link", "-A", "ios.frontend" ]

159− else it "can build android" $ inTmpObInit $ \_ -> run "nix-build" ["--no-out-link", "-A", "android.frontend"]

159+ then it "can build ios" $ inTmpObInit $ \_ -> nixBuild ["-A", "ios.frontend"]

160+ else it "can build android" $ inTmpObInit $ \_ -> nixBuild ["-A", "android.frontend"]

160161

161162 forM_ ["ghc", "ghcjs"] $ \compiler -> do

162163 let

@@ -166,7 +167,7 @@ main = do

166167 it ("can build in " <> shell) $ inTmpObInit $ \_ -> inShell $ "cabal new-build --" <> fromString compiler <> " all"

167168

168169 it "can build reflex project" $ inTmpObInit $ \_ -> do

169− run "nix-build" []

170+ nixBuild []

170171

171172 it "has idempotent thunk update" $ inTmpObInit $ \_ -> do

172173 u <- update