Revert "fix(pkg): Create temporary directories on same FS"

This reverts commit 9a68cd0.

This change has been upstreamed.

Author: gridbugs

Diff for: src/dune_pkg/fetch.ml

@@ -195,19 +195,9 @@ let unpack ~target ~archive =
     Pp.textf "unable to extract %S" (Path.to_string archive))
 ;;
 
-let with_download url checksum ~target ~f =
+let with_download url checksum ~f =
   let url = OpamUrl.to_string url in
-  let temp_dir =
-    let prefix = "dune" in
-    let suffix = Filename.basename url in
-    match (target : Path.t) with
-    | In_build_dir _ ->
-      Temp.temp_in_dir Dir ~dir:(Lazy.force Temp_dir.in_build) ~prefix ~suffix
-    | _ ->
-      let parent = Path.parent_exn target in
-      Path.mkdir_p parent;
-      Temp.temp_in_dir Dir ~dir:parent ~prefix ~suffix
-  in
+  let temp_dir = Temp.create Dir ~prefix:"dune" ~suffix:(Filename.basename url) in
   let output = Path.relative temp_dir "download" in
   Fiber.finalize ~finally:(fun () ->
     Temp.destroy Dir temp_dir;
@@ -232,9 +222,10 @@ let with_download url checksum ~target ~f =
 ;;
 
 let fetch_curl ~unpack:unpack_flag ~checksum ~target (url : OpamUrl.t) =
-  with_download url checksum ~target ~f:(fun output ->
+  with_download url checksum ~f:(fun output ->
     match unpack_flag with
     | false ->
+      Path.mkdir_p (Path.parent_exn target);
       Path.rename output target;
       Fiber.return @@ Ok ()
     | true ->

Diff for: src/dune_pkg/rev_store.ml

@@ -710,13 +710,7 @@ module At_rev = struct
   let check_out { repo = { dir; _ }; revision = Sha1 rev; files = _ } ~target =
     (* TODO iterate over submodules to output sources *)
     let git = Lazy.force Vcs.git in
-    let temp_dir =
-      Temp.temp_in_dir
-        Dir
-        ~dir:(Lazy.force Temp_dir.in_build)
-        ~prefix:"rev-store"
-        ~suffix:rev
-    in
+    let temp_dir = Temp.create Dir ~prefix:"rev-store" ~suffix:rev in
     Fiber.finalize ~finally:(fun () ->
       let+ () = Fiber.return () in
       Temp.destroy Dir temp_dir)

Diff for: src/dune_pkg/tar.ml

@@ -11,6 +11,13 @@ let bin =
 
 let output_limit = 1_000_000
 
+let temp_dir_in_build =
+  lazy
+    (let dir = Path.relative (Path.build Path.Build.root) ".temp" in
+     Path.mkdir_p dir;
+     dir)
+;;
+
 let extract ~archive ~target =
   let* () = Fiber.return () in
   let tar = Lazy.force bin in
@@ -19,10 +26,8 @@ let extract ~archive ~target =
     let suffix = Path.basename archive in
     match target with
     | In_build_dir _ ->
-      Temp.temp_in_dir Dir ~dir:(Lazy.force Temp_dir.in_build) ~prefix ~suffix
-    | _ ->
-      let parent = Path.parent_exn target in
-      Temp.temp_in_dir Dir ~dir:parent ~prefix ~suffix
+      Temp.temp_in_dir Dir ~dir:(Lazy.force temp_dir_in_build) ~prefix ~suffix
+    | _ -> Temp.create Dir ~prefix ~suffix
   in
   Fiber.finalize ~finally:(fun () ->
     Temp.destroy Dir target_in_temp;