public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages: default to 4.06

This commit is contained in:
Vincent Laporte 2018-08-21 12:34:43 +00:00
parent 20af031a2f
commit 474c0aa221
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@ -6735,13 +6735,9 @@ with pkgs;
mono = mono46; mono = mono46;
}; };
fstar = callPackage ../development/compilers/fstar { fstar = callPackage ../development/compilers/fstar { };
ocamlPackages = ocaml-ng.ocamlPackages_4_06;
};
pyre = callPackage ../development/tools/pyre { pyre = callPackage ../development/tools/pyre { };
ocamlPackages = ocaml-ng.ocamlPackages_4_06;
};
dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
@ -21862,9 +21858,7 @@ with pkgs;
sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
satysfi = callPackage ../tools/typesetting/satysfi { satysfi = callPackage ../tools/typesetting/satysfi { };
ocamlPackages = ocaml-ng.ocamlPackages_4_06;
};
sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller {
inherit libusb1; # Shadow python.pkgs.libusb1. inherit libusb1; # Shadow python.pkgs.libusb1.

7
pkgs/top-level/ocaml-packages.nix
View File

@ -1072,10 +1072,5 @@ in rec
ocamlPackages_latest = ocamlPackages_4_07; ocamlPackages_latest = ocamlPackages_4_07;
ocamlPackages = ocamlPackages = ocamlPackages_4_06;
# OCaml 4.05 is broken on aarch64
if system == "aarch64-linux" then
ocamlPackages_4_06
else
ocamlPackages_4_05;
} }