ocamlPackages.reason: 2.0.0 -> 3.0.0

1 files changed, 14 insertions, 30 deletions

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index e364f536c889..a4f0442d9d1b 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,41 +1,20 @@
 { stdenv, makeWrapper, buildOcaml, fetchFromGitHub,
   ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }:
 
-let 
-  version = "2.0.0";
+buildOcaml rec {
+  name = "reason";
+  version = "3.0.0";
+
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
     rev = version;
-    sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy";
+    sha256 = "0vj3y9vlm9gqvj9grmb9n487avbrj4q5611m7wv1bsdpndvv96jr";
   };
-  meta = with stdenv.lib; {
-    homepage = https://facebook.github.io/reason/;
-    description = "Facebook's friendly syntax to OCaml";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.volth ];
-  };
-
-  reason-parser = buildOcaml {
-    name = "reason-parser";
-    inherit version src meta;
-    sourceRoot = "reason-${version}-src/reason-parser";
 
-    minimumSupportedOcamlVersion = "4.02";
+  propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
 
-    propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
-    buildInputs = [ opam topkg ];
-
-    createFindlibDestdir = true;
-
-    inherit (topkg) installPhase;
-  };
-in
-buildOcaml {
-  name = "reason";
-  inherit version src meta;
-
-  buildInputs = [ makeWrapper opam topkg reason-parser utop ];
+  buildInputs = [ makeWrapper opam topkg utop menhir opam topkg ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
@@ -48,10 +27,15 @@ buildOcaml {
   installPhase = ''
     ${topkg.installPhase}
 
-    wrapProgram $out/bin/reup \
-      --prefix PATH : "${opam}/bin"
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
       --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
   '';
+
+  meta = with stdenv.lib; {
+    homepage = https://facebook.github.io/reason/;
+    description = "Facebook's friendly syntax to OCaml";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.volth ];
+  };
 }