ocaml-top: 1.1.2 -> 1.1.3

NixOS · Mar 14, 2017 · 8498f97 · 8498f97
1 parent 1d58781
commit 8498f97
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchzip, ncurses
-, ocaml, ocpBuild, findlib, lablgtk, ocp-index
+, ocamlPackages
 , opam }:
 
 stdenv.mkDerivation {
-  name = "ocaml-top-1.1.2";
+  name = "ocaml-top-1.1.3";
   src = fetchzip {
-    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.2.tar.gz;
-    sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j";
+    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz;
+    sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3";
   };
 
-  buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ];
+  buildInputs = [ ncurses opam ]
+  ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
 
   configurePhase = ''
     export TERM=xterm
@@ -18,15 +19,13 @@ stdenv.mkDerivation {
 
   buildPhase = "ocp-build ocaml-top";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ocaml-top.install | sh
-  '';
+  installPhase = "opam-installer --prefix=$out";
 
   meta = {
     homepage = http://www.typerex.org/ocaml-top.html;
     license = stdenv.lib.licenses.gpl3;
     description = "A simple cross-platform OCaml code editor built for top-level evaluation";
-    platforms = ocaml.meta.platforms or [];
+    platforms = ocamlPackages.ocaml.meta.platforms or [];
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -5452,7 +5452,7 @@ with pkgs;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
 
-  inherit (ocamlPackages) ocaml-top;
+  ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
 
   opa = callPackage ../development/compilers/opa {
     nodejs = nodejs-4_x;

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
@@ -752,8 +752,6 @@ let
 
     haxe = callPackage ../development/compilers/haxe { };
 
-    ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
-
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };
 
     trv = callPackage ../development/tools/misc/trv { };