Update to Jbuilder 1.0+beta17

jhwoodyatt · Feb 8, 2018 · 0c7a580 · 0c7a580
1 parent e625cbc
commit 0c7a580
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 25 deletions.
diff --git a/appveyor.patch b/appveyor.patch
@@ -26,21 +26,6 @@ index 1a350068..964a818c 100644
 
  ifndef FETCH
    ifneq ($(shell command -v curl 2>/dev/null),)
-diff --git a/src_ext/Makefile.sources b/src_ext/Makefile.sources
-index a1aa44cb..0d297877 100644
---- a/src_ext/Makefile.sources
-+++ b/src_ext/Makefile.sources
-@@ -48,8 +48,8 @@ MD5_result = 3d5b66c5526918f0f2ca9d6811ef09c8
-
- $(call PKG_SAME,result)
-
--URL_jbuilder = https://github.com/janestreet/jbuilder/archive/1.0+beta16.tar.gz
--MD5_jbuilder = baef04fc99d52e98736db9e53a72bfce
-+URL_jbuilder = https://github.com/dra27/jbuilder/archive/fix-copy.tar.gz
-+MD5_jbuilder = cbf9d2e783feab1f4a61fea35ec96118
-
- $(call PKG_SAME,jbuilder)
-
 -- 
 2.12.0.windows.1
 
diff --git a/opam-client.opam b/opam-client.opam
@@ -22,6 +22,6 @@ depends: [
   "opam-state" {= "2.0.0~rc"}
   "opam-solver" {= "2.0.0~rc"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-core.opam b/opam-core.opam
@@ -23,7 +23,7 @@ depends: [
   "base-bigarray"
   "ocamlgraph"
   "re" {>= "1.5.0"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
   "cppo" {build}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-devel.opam b/opam-devel.opam
@@ -22,7 +22,7 @@ build-test: [make "tests"]
 depends: [
   "opam-client" {= "2.0.0~rc"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 post-messages: [
 "The development version of opam has been successfuly compiled into %{lib}%/%{name}%. You should not run it from there, please install the binaries to your PATH, e.g. with

diff --git a/opam-format.opam b/opam-format.opam
@@ -21,6 +21,6 @@ build: [
 depends: [
   "opam-core" {= "2.0.0~rc"}
   "opam-file-format" {>= "2.0.0~beta5"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-installer.opam b/opam-installer.opam
@@ -23,6 +23,6 @@ build: [
 depends: [
   "opam-format" {= "2.0.0~rc"}
   "cmdliner" {>= "0.9.8"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-repository.opam b/opam-repository.opam
@@ -20,6 +20,6 @@ build: [
 ]
 depends: [
   "opam-format" {= "2.0.0~rc"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-solver.opam b/opam-solver.opam
@@ -23,6 +23,6 @@ depends: [
   "mccs" {>= "1.1+4"}
   "dose3" {>= "5"}
   "cudf" {>= "0.7"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/opam-state.opam b/opam-state.opam
@@ -20,6 +20,6 @@ build: [
 ]
 depends: [
   "opam-repository" {= "2.0.0~rc"}
-  "jbuilder" {build & >= "1.0+beta12"}
+  "jbuilder" {build & >= "1.0+beta17"}
 ]
 available: ocaml-version >= "4.02.3"
diff --git a/src_ext/Makefile.sources b/src_ext/Makefile.sources
@@ -48,8 +48,8 @@ MD5_result = 3d5b66c5526918f0f2ca9d6811ef09c8
 
 $(call PKG_SAME,result)
 
-URL_jbuilder = https://github.com/janestreet/jbuilder/archive/1.0+beta16.tar.gz
-MD5_jbuilder = baef04fc99d52e98736db9e53a72bfce
+URL_jbuilder = https://github.com/ocaml/dune/archive/1.0+beta17.tar.gz
+MD5_jbuilder = c734e716e4fdb7e3564ed19b6eba2a1b
 
 $(call PKG_SAME,jbuilder)