diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-04-18 12:47:27 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-04-25 18:19:57 +0200 |
| commit | 5c4ee2a3ab9f278b12d9196e59307e65f5fed88c (patch) | |
| tree | 98df02f7273bf188a4a8dc1760fe0ad3a7dfcb26 /pkgs/development/compilers/ocaml | |
| parent | c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74 (diff) | |
| download | nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar.gz nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar.bz2 nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar.lz nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar.xz nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.tar.zst nixpkgs-5c4ee2a3ab9f278b12d9196e59307e65f5fed88c.zip | |
ocaml: init at 4.07.0+beta2
Diffstat (limited to 'pkgs/development/compilers/ocaml')
| -rw-r--r-- | pkgs/development/compilers/ocaml/4.07.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/ocaml/generic.nix | 3 |
2 files changed, 11 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) |