diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-03-08 16:59:07 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-03-13 22:31:01 +0100 |
| commit | 7b33cbdbf5dea320836fae7918926322aa1c4132 (patch) | |
| tree | 58076d9afbf4e7c4ae6c1febeaf139727664a081 | |
| parent | 4ce4db473c9d43d2ff42e643c800067a879f9f4f (diff) | |
| download | nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar.gz nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar.bz2 nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar.lz nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar.xz nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.tar.zst nixpkgs-7b33cbdbf5dea320836fae7918926322aa1c4132.zip | |
OCaml: default to version 4.08
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db737c3e2a6..8d10404e05f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0a3cbc6f1c3..e8a6bc21035 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1229,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_07; + ocamlPackages = ocamlPackages_4_08; } |