Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nix: simplify ocaml overrides #1478

Merged
merged 1 commit into from
Feb 23, 2025
Merged

nix: simplify ocaml overrides #1478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
});
};
ocamlVersionOverlay =
(ocaml: self: super: { ocamlPackages = ocaml super.ocaml-ng; });
(ocaml: self: super: { ocamlPackages = super.ocaml-ng.${ocaml}; });
makeLocalPackages = pkgs:
let buildDunePackage = pkgs.ocamlPackages.buildDunePackage;
in rec {
Expand Down Expand Up @@ -141,12 +141,9 @@
overlays = [ (ocamlVersionOverlay ocaml) (overlay merlin) ];
inherit system;
};
pkgs_5_1 =
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1;
pkgs_5_2 =
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2;
pkgs_5_3 =
makeNixpkgs (ocaml: ocaml.ocamlPackages_5_3) inputs.merlin5_3;
pkgs_5_1 = makeNixpkgs "ocamlPackages_5_1" inputs.merlin5_1;
pkgs_5_2 = makeNixpkgs "ocamlPackages_5_2" inputs.merlin5_2;
pkgs_5_3 = makeNixpkgs "ocamlPackages_5_3" inputs.merlin5_3;
localPackages_5_1 = makeLocalPackages pkgs_5_1;
localPackages_5_2 = makeLocalPackages pkgs_5_2;
localPackages_5_3 = makeLocalPackages pkgs_5_3;
Expand Down
Loading