From 6f5d3bec32192116d5b13e6f1f012f94434062eb Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Wed, 14 Sep 2016 02:05:53 -0400
Subject: [PATCH 1/2] oasis: 0.4.6 -> 0.4.7

---
 pkgs/development/tools/ocaml/oasis/0.4.6.nix  | 34 +++++++++++++++++++
 .../development/tools/ocaml/oasis/default.nix |  6 ++--
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/oasis/0.4.6.nix

diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix
new file mode 100644
index 000000000000..6dcf05222320
--- /dev/null
+++ b/pkgs/development/tools/ocaml/oasis/0.4.6.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
+ ocamlmod, ocamlify, ounit, expect}:
+
+stdenv.mkDerivation {
+  name = "ocaml-oasis-0.4.6";
+
+  src = fetchurl {
+    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;
+    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";
+  };
+
+  createFindlibDestdir = true;
+
+  buildInputs =
+    [
+      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
+    ];
+
+  propagatedBuildInputs = [ ocaml_data_notation ];
+
+  configurePhase = "ocaml setup.ml -configure --prefix $out";
+  buildPhase     = "ocaml setup.ml -build";
+  installPhase   = "ocaml setup.ml -install";
+
+  meta = with stdenv.lib; {
+    homepage = http://oasis.forge.ocamlcore.org/;
+    description = "Configure, build and install system for OCaml projects";
+    license = licenses.lgpl21;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = with maintainers; [
+      vbgl z77z
+    ];
+  };
+}
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 6dcf05222320..9b69b3bb016f 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -2,11 +2,11 @@
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
-  name = "ocaml-oasis-0.4.6";
+  name = "ocaml-oasis-0.4.7";
 
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz;
-    sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k";
+    url = http://forge.ocamlcore.org/frs/download.php/1635/oasis-0.4.6.tar.gz;
+    sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l";
   };
 
   createFindlibDestdir = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2ee65deae11..1e2c7a3d50f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5357,6 +5357,7 @@ in
     ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { };
 
     ocaml_oasis = callPackage ../development/tools/ocaml/oasis { };
+    ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { };
 
     ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { };
 

From 3e81648645ecd7751b3822d0526999044efd5bb2 Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Sat, 24 Sep 2016 13:08:51 -0400
Subject: [PATCH 2/2] janestreet: use Oasis 0.4.6

---
 pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix | 4 ++--
 pkgs/development/ocaml-modules/janestreet/js-build-tools.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
index 61b2038bfd29..6e988c4479a5 100644
--- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
@@ -1,4 +1,4 @@
-{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :
+{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } :
 
 { name, version ? "113.33.03", buildInputs ? [],
   hash ? "",
@@ -14,7 +14,7 @@ buildOcaml (args // {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;
+  buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs;
 
   dontAddPrefix = true;
 
diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index bf697eda8007..328ffc58bdc1 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, ocaml_oasis, opam}:
+{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}:
 
 buildOcaml rec {
   name = "js-build-tools";
@@ -13,7 +13,7 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis opam ];
+  buildInputs = [ ocaml_oasis_46 opam ];
 
   dontAddPrefix = true;
   configurePhase = "./configure --prefix $prefix";