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

ocaml: init at 4.07.0+beta2

Browse Source
This commit is contained in:
Vincent Laporte 2018-04-18 12:47:27 +00:00 committed by Vincent Laporte
parent c4b7bbf77e
commit 5c4ee2a3ab
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/ocaml/4.07.nix Normal file
View File

@ -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;
}

3
pkgs/development/compilers/ocaml/generic.nix
View File

@ -45,7 +45,8 @@ stdenv.mkDerivation (args // rec {
; ;
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; 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"; installTargets = "install" + optionalString useNativeCompilers " installopt";
preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") '' preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
CAT=$(type -tp cat) CAT=$(type -tp cat)

2
pkgs/top-level/ocaml-packages.nix
View File

@ -1042,6 +1042,8 @@ in rec
ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { }); 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_latest = ocamlPackages_4_06;
ocamlPackages = ocamlPackages_4_05; ocamlPackages = ocamlPackages_4_05;