Skip to content

nix: remove 5.1 #1484

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

Merged
merged 1 commit into from
Feb 23, 2025
Merged

nix: remove 5.1 #1484

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: 1 addition & 10 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
url = "github:ocaml/merlin/502";
flake = false;
};
merlin5_1 = {
url = "github:ocaml/merlin/501";
flake = false;
};
};

outputs = { self, flake-utils, nixpkgs, ... }@inputs:
Expand Down Expand Up @@ -138,10 +134,8 @@
pkgsWithoutOverlays = (import nixpkgs { inherit system; });
makeNixpkgs = ocaml: merlin:
pkgsWithoutOverlays.appendOverlays [ (ocamlVersionOverlay ocaml) (overlay merlin) ];
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;
devShell = localPackages: nixpkgs:
Expand All @@ -154,15 +148,12 @@
in {
packages = (localPackages_5_3 // {
default = localPackages_5_3.ocaml-lsp;
ocaml_5_1 = localPackages_5_1;
ocaml_5_2 = localPackages_5_1;
ocaml_5_2 = localPackages_5_2;
});

devShells = {
default = devShell localPackages_5_3 pkgs_5_3;

ocaml5_1 = devShell localPackages_5_1 pkgs_5_1;

ocaml5_2 = devShell localPackages_5_2 pkgs_5_2;

release = pkgsWithoutOverlays.mkShell {
Expand Down
Loading