diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 11ff9a36a41..a9c7add6129 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uutf, cmdliner }: let pname = "uunf"; webpage = "http://erratique.ch/software/${pname}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "0.9.3"; + version = "2.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; + sha256 = "1i132168949vdc8magycgf9mdysf50vvr7zngnjl4vi3zdayq20c"; }; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg uutf cmdliner ]; + + propagatedBuildInputs = [ uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "./pkg/build true false"; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "An OCaml module for normalizing Unicode text";