cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

ocaml: init at 4.08.0+beta1

Browse source
This commit is contained in:
Vincent Laporte 2019-02-11 16:21:46 +00:00 committed by Vincent Laporte
parent c721be4008
commit 1753b20648
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/compilers/ocaml/4.08.nix Normal file
View file

@ -0,0 +1,9 @@
import ./generic.nix {
major_version = "4";
minor_version = "08";
patch_version = "0+beta1";
sha256 = "1jgvp4pyhrg27wqpsx88kacw3ymjiz44nms9lzbh5s8pp05z5f5f";
# If the executable is stripped it does not work
dontStrip = true;
}

6
pkgs/development/compilers/ocaml/generic.nix
View file

@ -41,8 +41,10 @@ stdenv.mkDerivation (args // rec {
};
prefixKey = "-prefix ";
configureFlags = optionals useX11 [ "-x11lib" x11lib
"-x11include" x11inc ]
configureFlags = optionals useX11 (
if stdenv.lib.versionAtLeast version "4.08"
then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
else [ "-x11lib" x11lib "-x11include" x11inc ])
++ optional flambdaSupport "-flambda"
;

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

@ -1072,6 +1072,8 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
ocamlPackages_4_08 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.08.nix { });
ocamlPackages_latest = ocamlPackages_4_07;
ocamlPackages = ocamlPackages_4_06;