@@ -1,16 +1,13 @@
1−{ lib, callPackage, newScope, pkgs, config }:
1+{ lib, newScope, pkgs, config }:
22
33let
44 inherit (pkgs.stdenv.hostPlatform) system;
55
6− mkOcamlPackages = ocaml: overrides:
7− let
8− packageSet = self:
9− with self; let inherit (self) callPackage; in
10− let ocamlPackages =
11− {
12− callPackage = newScope self;
6+ liftJaneStreet = self: super: super.janeStreet // super;
137
8+ mkOcamlPackages = ocaml:
9+ (lib.makeScope newScope (self: with self;
10+ {
1411 inherit ocaml;
1512
1613 # Libs
@@ -1062,29 +1059,26 @@ let
10621059 camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; };
10631060 };
10641061
1065− };
1066− in (ocamlPackages.janeStreet // ocamlPackages);
1067− in lib.fix' (lib.extends overrides packageSet);
1068−in rec
1069−{
1062+ })).overrideScope' liftJaneStreet;
10701063
1071− inherit mkOcamlPackages;
1064+in let inherit (pkgs) callPackage; in rec
1065+{
10721066
1073− ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { });
1067+ ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { });
10741068
1075− ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { });
1069+ ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { });
10761070
1077− ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { });
1071+ ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { });
10781072
1079− ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { });
1073+ ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { });
10801074
1081− ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { });
1075+ ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { });
10821076
1083− ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { });
1077+ ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { });
10841078
1085− ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { });
1079+ ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { });
10861080
1087− ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { });
1081+ ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { });
10881082
10891083 ocamlPackages_latest = ocamlPackages_4_07;
10901084