From 190cc673109ec9112cf857293982bd8ec561e4f2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Dec 2016 10:55:37 +0000 Subject: [PATCH] ocamlPackages.uuseg: 0.9.0 -> 1.0.0 --- .../ocaml-modules/uuseg/default.nix | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 92777129ca03..d1e958144612 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,39 +1,28 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, uchar, uucp, uutf, cmdliner }: let pname = "uuseg"; webpage = "http://erratique.ch/software/${pname}"; in -buildOcaml rec { +stdenv.mkDerivation rec { - minimumSupportedOcamlVersion = "4.01"; - - name = pname; - version = "0.9.0"; + name = "ocaml${ocaml.version}-${pname}-${version}"; + version = "1.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; + sha256 = "0m5n0kn70w862g5dhfkfvrnmb98z1r02g21ap7l81hy8sn08cbsz"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; - propagatedBuildInputs = [ uucp uutf ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner topkg uutf ]; + propagatedBuildInputs = [ uucp uchar ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = '' - ocaml pkg/build.ml \ - native=true native-dynlink=true \ - uutf=true cmdliner=true - ''; - - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install | sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/${pname} - ''; + inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { description = "An OCaml library for segmenting Unicode text";