public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eliom: modernize derivation

Browse Source
This commit is contained in:
Florent Becker 2016-10-22 11:08:27 +02:00
parent a52c1b4840
commit ac69382453
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,15 +1,10 @@
{ stdenv, fetchurl, ocaml, findlib, which, ocsigen_server, ocsigen_deriving, { buildOcaml, stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml, js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp, ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
reactivedata, opam, ppx_tools, camlp4}: reactivedata, opam, ppx_tools, ppx_deriving, camlp4}:
let ocamlVersion = (stdenv.lib.getVersion ocaml); let ocamlVersion = (stdenv.lib.getVersion ocaml); in
in buildOcaml rec
(
assert stdenv.lib.versionAtLeast ocamlVersion "4";
stdenv.mkDerivation rec
{ {
pname = "eliom"; pname = "eliom";
version = "5.0.0"; version = "5.0.0";
@ -22,12 +17,11 @@ stdenv.mkDerivation rec
patches = [ ./camlp4.patch ]; patches = [ ./camlp4.patch ];
buildInputs = [ocaml which ocsigen_server findlib ocsigen_deriving buildInputs = [ which ocaml_optcomp opam ppx_tools camlp4 ];
js_of_ocaml ocaml_optcomp opam ppx_tools camlp4 ];
propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocsigen_deriving js_of_ocaml
ocaml_pcre ]; calendar cryptokit ocamlnet ocaml_react ocaml_ssl ocaml_pcre ];
preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") '' preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
export PPX=false export PPX=false
@ -57,8 +51,6 @@ stdenv.mkDerivation rec
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = [ stdenv.lib.maintainers.gal_bolle ]; maintainers = [ stdenv.lib.maintainers.gal_bolle ];
}; };
}) }