diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-08-21 12:34:43 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-08-29 12:49:46 +0000 |
| commit | 474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65 (patch) | |
| tree | 43b3c1cac27896c137affe6de4a5fe651a17e399 | |
| parent | 20af031a2ffa3cbcaacf10f4668e74ecf1380095 (diff) | |
| download | nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar.gz nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar.bz2 nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar.lz nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar.xz nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.tar.zst nixlib-474c0aa2218fa5b70eed8c43cd2f04d7dfba6c65.zip | |
ocamlPackages: default to 4.06
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 7 |
2 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98ed8a046d96..f599477fe583 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6735,13 +6735,9 @@ with pkgs; mono = mono46; }; - fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocaml-ng.ocamlPackages_4_06; - }; + fstar = callPackage ../development/compilers/fstar { }; - pyre = callPackage ../development/tools/pyre { - ocamlPackages = ocaml-ng.ocamlPackages_4_06; - }; + pyre = callPackage ../development/tools/pyre { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -21862,9 +21858,7 @@ with pkgs; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; - satysfi = callPackage ../tools/typesetting/satysfi { - ocamlPackages = ocaml-ng.ocamlPackages_4_06; - }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c94e0d5fb204..459a76143043 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1072,10 +1072,5 @@ in rec ocamlPackages_latest = ocamlPackages_4_07; - ocamlPackages = - # OCaml 4.05 is broken on aarch64 - if system == "aarch64-linux" then - ocamlPackages_4_06 - else - ocamlPackages_4_05; + ocamlPackages = ocamlPackages_4_06; } |