ocaml: init at 4.04

This commit is contained in:
Vincent Laporte 2016-11-09 13:58:34 +01:00
parent c9d5e5b34b
commit ae047510bf
3 changed files with 10 additions and 2 deletions

View file

@ -0,0 +1,6 @@
import ./generic.nix {
major_version = "4";
minor_version = "04";
patch_version = "0";
sha256 = "1d2nk3kq4dyzz8dls45r13jprq5by3q8kshc8kvxzm8n4fnnvvb4";
}

View file

@ -41,7 +41,7 @@ stdenv.mkDerivation (args // rec {
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = ''
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat)
sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
'';

View file

@ -727,7 +727,9 @@ in rec
ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { });
ocamlPackages_latest = ocamlPackages_4_03;
ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { });
ocamlPackages_latest = ocamlPackages_4_04;
ocamlPackages = ocamlPackages_4_01_0;
}