diff options
author | romildo <malaquias@gmail.com> | 2017-05-28 17:38:23 -0300 |
---|---|---|
committer | romildo <malaquias@gmail.com> | 2017-05-28 17:38:23 -0300 |
commit | 56a4aaf4dfec8c189eca907f2815d29b77dcc6d5 (patch) | |
tree | 73af186048eb9cc74f1321808f0012e2f358e4bb /pkgs | |
parent | 60ba38fd8a9fe95ab9dd614fccc9917fb2b866a0 (diff) | |
download | nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar.gz nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar.bz2 nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar.lz nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar.xz nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.tar.zst nixlib-56a4aaf4dfec8c189eca907f2815d29b77dcc6d5.zip |
cmdliner: 0.9.8 -> 1.0.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/ocaml-modules/cmdliner/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 8be36a2a408f..9448610a3784 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }: let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; - version = "0.9.8"; + version = "1.0.0"; src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; + sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x"; }; unpackCmd = "tar xjf $src"; - buildInputs = [ ocaml findlib ocamlbuild opam ]; + + nativeBuildInputs = [ ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ result ]; createFindlibDestdir = true; - configurePhase = "ocaml pkg/git.ml"; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' - opam-installer --script --prefix=$out ${pname}.install > install.sh - sh install.sh + buildPhase = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build + ''; + + installPhase = '' + opam-installer --script --prefix=$out | sh ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; @@ -33,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; - maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.vbgl ]; }; } |