Fix compat with spawn v0.12

janestreet · Apr 26, 2018 · 078a2db · 078a2db
1 parent 91c3640
commit 078a2db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,10 @@ you might want to have a look at Base's
 and Core\_kernel's
 [changelog](https://github.com/janestreet/core_kernel/blob/master/CHANGES.md).
 
+## v0.11.1
+
+- Fix compatibility with spawn v0.12.0
+
 ## v0.11
 
 - Fix a segfault in `Time`. (fixes #102)

diff --git a/core.opam b/core.opam
@@ -1,5 +1,5 @@
 opam-version: "1.2"
-version: "v0.11.0"
+version: "v0.11.1"
 maintainer: "[email protected]"
 authors: ["Jane Street Group, LLC <[email protected]>"]
 homepage: "https://github.com/janestreet/core"
@@ -16,7 +16,7 @@ depends: [
   "ppx_assert"              {>= "v0.11" & < "v0.12"}
   "ppx_jane"                {>= "v0.11" & < "v0.12"}
   "sexplib"                 {>= "v0.11" & < "v0.12"}
-  "spawn"                   {>= "v0.11" & < "v0.12"}
+  "spawn"                   {>= "v0.12"}
   "stdio"                   {>= "v0.11" & < "v0.12"}
   "base-threads"
   "jbuilder"                {build & >= "1.0+beta18.1"}

diff --git a/src/core_unix.ml b/src/core_unix.ml
@@ -1580,7 +1580,7 @@ let create_process_internal
           ?cwd:(Option.map working_dir ~f:(fun x -> Spawn.Working_dir.Path x))
           ~prog
           ~argv
-          ~env
+          ~env:(Spawn.Env.of_list env)
           ~stdin:in_read
           ~stdout:out_write
           ~stderr:err_write