OCaml: default to version 4.08

This commit is contained in:
Vincent Laporte 2020-03-08 16:59:07 +01:00 committed by Vincent Laporte
parent 4ce4db473c
commit 7b33cbdbf5
2 changed files with 16 additions and 6 deletions

View file

@ -4551,6 +4551,7 @@ in
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
@ -8361,7 +8362,9 @@ in
fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
fstar = callPackage ../development/compilers/fstar { };
fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
@ -10163,6 +10166,7 @@ in
fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
flow = callPackage ../development/tools/analysis/flow {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -21722,7 +21726,7 @@ in
stalonetray = callPackage ../applications/window-managers/stalonetray {};
inherit (ocamlPackages) stog;
inherit (ocaml-ng.ocamlPackages_4_07) stog;
stp = callPackage ../applications/science/logic/stp { };
@ -24409,7 +24413,9 @@ in
abc-verifier = callPackage ../applications/science/logic/abc {};
abella = callPackage ../applications/science/logic/abella {};
abella = callPackage ../applications/science/logic/abella {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
acgtk = callPackage ../applications/science/logic/acgtk {};
@ -24417,7 +24423,9 @@ in
aspino = callPackage ../applications/science/logic/aspino {};
beluga = callPackage ../applications/science/logic/beluga { };
beluga = callPackage ../applications/science/logic/beluga {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
};
boogie = dotnetPackages.Boogie;
@ -24765,7 +24773,9 @@ in
golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
megam = callPackage ../applications/science/misc/megam { };
megam = callPackage ../applications/science/misc/megam {
inherit (ocaml-ng.ocamlPackages_4_07) ocaml;
};
netlogo = callPackage ../applications/science/misc/netlogo { };

View file

@ -1229,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec
ocamlPackages_latest = ocamlPackages_4_10;
ocamlPackages = ocamlPackages_4_07;
ocamlPackages = ocamlPackages_4_08;
}