diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.07.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix new file mode 100644 index 00000000000..b39d57cc092 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "07"; + patch_version = "0+beta2"; + sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + + # If the executable is stripped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 03ae6e518d0..d8af0722c94 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation (args // rec { ; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses + ++ optionals useX11 [ libX11 xproto ]; installTargets = "install" + optionalString useNativeCompilers " installopt"; preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' CAT=$(type -tp cat) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f095ccb34ab..741a58ce588 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1042,6 +1042,8 @@ in rec ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); + ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { }); + ocamlPackages_latest = ocamlPackages_4_06; ocamlPackages = ocamlPackages_4_05; |