git.iko.soy/typeable/nixpkgs
on master help sign in
OCaml: default to version 4.08
commit7b33cbdbf5dea320836fae7918926322aa1c4132 authorVincent Laporte <Vincent.Laporte@gmail.com> dateSun 8 Mar 2020, 16:59 (7 years ago) parent4ce4db4
2 files changed+16−6
pkgs/top-level/all-packages.nix+15−5 pkgs/top-level/ocaml-packages.nix+1−1
pkgs/top-level/all-packages.nix+15−5
@@ -4551,6 +4551,7 @@ in
45514551
45524552 liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
45534553 ffmpeg = ffmpeg-full;
4554+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
45544555 };
45554556
45564557 lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
@@ -8361,7 +8362,9 @@ in
83618362
83628363 fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
83638364
8364− fstar = callPackage ../development/compilers/fstar { };
8365+ fstar = callPackage ../development/compilers/fstar {
8366+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
8367+ };
83658368
83668369 dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
83678370
@@ -10163,6 +10166,7 @@ in
1016310166 fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
1016410167
1016510168 flow = callPackage ../development/tools/analysis/flow {
10169+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
1016610170 inherit (darwin.apple_sdk.frameworks) CoreServices;
1016710171 };
1016810172
@@ -21722,7 +21726,7 @@ in
2172221726
2172321727 stalonetray = callPackage ../applications/window-managers/stalonetray {};
2172421728
21725− inherit (ocamlPackages) stog;
21729+ inherit (ocaml-ng.ocamlPackages_4_07) stog;
2172621730
2172721731 stp = callPackage ../applications/science/logic/stp { };
2172821732
@@ -24409,7 +24413,9 @@ in
2440924413
2441024414 abc-verifier = callPackage ../applications/science/logic/abc {};
2441124415
24412− abella = callPackage ../applications/science/logic/abella {};
24416+ abella = callPackage ../applications/science/logic/abella {
24417+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
24418+ };
2441324419
2441424420 acgtk = callPackage ../applications/science/logic/acgtk {};
2441524421
@@ -24417,7 +24423,9 @@ in
2441724423
2441824424 aspino = callPackage ../applications/science/logic/aspino {};
2441924425
24420− beluga = callPackage ../applications/science/logic/beluga { };
24426+ beluga = callPackage ../applications/science/logic/beluga {
24427+ ocamlPackages = ocaml-ng.ocamlPackages_4_07;
24428+ };
2442124429
2442224430 boogie = dotnetPackages.Boogie;
2442324431
@@ -24765,7 +24773,9 @@ in
2476524773 golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
2476624774 golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
2476724775
24768− megam = callPackage ../applications/science/misc/megam { };
24776+ megam = callPackage ../applications/science/misc/megam {
24777+ inherit (ocaml-ng.ocamlPackages_4_07) ocaml;
24778+ };
2476924779
2477024780 netlogo = callPackage ../applications/science/misc/netlogo { };
2477124781
pkgs/top-level/ocaml-packages.nix+1−1
@@ -1229,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec
12291229
12301230 ocamlPackages_latest = ocamlPackages_4_10;
12311231
1232− ocamlPackages = ocamlPackages_4_07;
1232+ ocamlPackages = ocamlPackages_4_08;
12331233}