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

allow eliom with ocaml-4.01

This commit is contained in:
Florent Becker 2016-05-31 18:36:45 +02:00
parent 71888e7973
commit 7395020b65
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,11 @@
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, camlp4}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; let ocamlVersion = (stdenv.lib.getVersion ocaml);
in
(
assert stdenv.lib.versionAtLeast ocamlVersion "4";
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
@ -25,9 +29,11 @@ stdenv.mkDerivation rec
calendar cryptokit ocamlnet ocaml_react ocaml_ssl calendar cryptokit ocamlnet ocaml_react ocaml_ssl
ocaml_pcre ]; ocaml_pcre ];
preConfigure = stdenv.lib.optionalString (!stdenv.lib.versionAtLeast ocamlVersion "4.02") ''
export PPX=false
'';
installPhase = installPhase =
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in
''opam-installer --script --prefix=$out ${pname}.install > install.sh ''opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh sh install.sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocamlVersion}/site-lib/
@ -55,4 +61,4 @@ stdenv.mkDerivation rec
maintainers = [ stdenv.lib.maintainers.gal_bolle ]; maintainers = [ stdenv.lib.maintainers.gal_bolle ];
}; };
} })

5
pkgs/top-level/all-packages.nix
View File

@ -4908,10 +4908,7 @@ in
eff = callPackage ../development/interpreters/eff { }; eff = callPackage ../development/interpreters/eff { };
eliom = eliom = callPackage ../development/ocaml-modules/eliom { };
if lib.versionAtLeast ocaml_version "4.02"
then callPackage ../development/ocaml-modules/eliom { }
else null;
enumerate = callPackage ../development/ocaml-modules/enumerate { }; enumerate = callPackage ../development/ocaml-modules/enumerate { };