Skip to content

Commit 59e0783

Browse files
authored
nix: simplify ocaml overrides (#1478)
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
1 parent b203fb4 commit 59e0783

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

flake.nix

+4-7
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
});
5757
};
5858
ocamlVersionOverlay =
59-
(ocaml: self: super: { ocamlPackages = ocaml super.ocaml-ng; });
59+
(ocaml: self: super: { ocamlPackages = super.ocaml-ng.${ocaml}; });
6060
makeLocalPackages = pkgs:
6161
let buildDunePackage = pkgs.ocamlPackages.buildDunePackage;
6262
in rec {
@@ -141,12 +141,9 @@
141141
overlays = [ (ocamlVersionOverlay ocaml) (overlay merlin) ];
142142
inherit system;
143143
};
144-
pkgs_5_1 =
145-
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1;
146-
pkgs_5_2 =
147-
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2;
148-
pkgs_5_3 =
149-
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_3) inputs.merlin5_3;
144+
pkgs_5_1 = makeNixpkgs "ocamlPackages_5_1" inputs.merlin5_1;
145+
pkgs_5_2 = makeNixpkgs "ocamlPackages_5_2" inputs.merlin5_2;
146+
pkgs_5_3 = makeNixpkgs "ocamlPackages_5_3" inputs.merlin5_3;
150147
localPackages_5_1 = makeLocalPackages pkgs_5_1;
151148
localPackages_5_2 = makeLocalPackages pkgs_5_2;
152149
localPackages_5_3 = makeLocalPackages pkgs_5_3;

0 commit comments

Comments
 (0)