diff options
| author | sternenseemann <git@lukasepple.de> | 2016-11-03 03:03:04 +0100 |
|---|---|---|
| committer | sternenseemann <git@lukasepple.de> | 2016-11-03 14:34:35 +0100 |
| commit | 18788cbac7fa912586510ecc2879ade0f20f7229 (patch) | |
| tree | 0f29893e9d6749f77d1bb8f479be4a7cf9b8e432 /pkgs/development/ocaml-modules | |
| parent | 21a191df74e9b9ca8c32050d343177635a6b8ccd (diff) | |
| download | nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar.gz nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar.bz2 nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar.lz nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar.xz nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.tar.zst nixpkgs-18788cbac7fa912586510ecc2879ade0f20f7229.zip | |
ocaml-uuseg: 0.8.0 -> 0.9.0
This commit also refactors the expression.
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/uuseg/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 3c7a4ff5c58..2ba3dd02683 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,40 +1,39 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: +{ stdenv, buildOcaml, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let - inherit (stdenv.lib) getVersion versionAtLeast; - pname = "uuseg"; - version = "0.8.0"; webpage = "http://erratique.ch/software/${pname}"; in -assert versionAtLeast (getVersion ocaml) "4.01"; +buildOcaml rec { -stdenv.mkDerivation { + minimumSupportedOcamlVersion = "4.01"; - name = "ocaml-${pname}-${version}"; + name = pname; + version = "0.9.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; - propagatedBuildInputs = [ uucp uutf ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; + propagatedBuildInputs = [ uucp uutf cmdliner ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; buildPhase = '' + ocaml pkg/git.ml 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/${getVersion ocaml}/site-lib/${pname} + opam-installer --prefix $out --script | sh + ln -s $out/lib/uuseg $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { |