From 102ce3625c525cf7b9db3b70d248238da5434acd Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sun, 23 Feb 2025 21:09:08 +0000 Subject: [PATCH] nix: remove 5.1 (#1484) Signed-off-by: Rudi Grinberg --- flake.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index ca848a92c..1a86ad51f 100644 --- a/flake.nix +++ b/flake.nix @@ -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: @@ -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: @@ -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 {