gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.lsp: 1.25.0 → 1.26.0

Browse Source 
dune: 3.21.1 -> 3.22.2

ocamlPackages.merlin: 5.6-504 → 5.7.1-504

ocaml-lsp-server: mark old versions as broken
This commit is contained in:
Vincent Laporte
2026-06-02 22:21:47 +02:00
parent 5b2f924eeb
commit f69f2fb4f5
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/du/dune/package.nix
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
fetchurl,
buildPackages,
version ? "3.21.1",
version ? "3.22.2",
}:
let
# needed for pkgsStatic
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
"https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz";
hash =
{
"3.21.1" = "sha256-hPeoLG2ApxJPOEfppInoDPvq+3vtNXOsAShu9W/QjZQ=";
"3.22.2" = "sha256-wsz4vGsXr6R8RQKXNXSWMDqnyGgOMpt52Yxo41AToRg=";
"2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
}
."${version}";
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+1 -1
View File
@@ -85,6 +85,6 @@ buildDunePackage (finalAttrs: {
meta = lsp.meta // {
description = "OCaml Language Server Protocol implementation";
mainProgram = "ocamllsp";
broken = lib.versions.majorMinor ocaml.version == "4.13";
broken = lib.versionAtLeast ocaml.version "4.13" && lib.versionOlder ocaml.version "5.4";
};
})
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+6 -1
View File
@@ -10,7 +10,7 @@
ocaml,
version ?
if lib.versionAtLeast ocaml.version "5.4" then
"1.25.0"
"1.26.0"
else if lib.versionAtLeast ocaml.version "5.3" then
"1.23.1"
else if lib.versionAtLeast ocaml.version "5.2" then
@@ -28,6 +28,11 @@
let
params =
{
"1.26.0" = {
name = "lsp";
minimalOCamlVersion = "5.3";
sha256 = "sha256-tMgQ1mZKW/F1pvmUbIDIzCsY5GqYWTTBRQss4IDkaDI=";
};
"1.25.0" = {
name = "lsp";
minimalOCamlVersion = "5.3";
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+1 -1
View File
@@ -26,7 +26,7 @@
ocaml,
version ?
if lib.versionAtLeast ocaml.version "5.4" then
"1.25.0"
"1.26.0"
else if lib.versionAtLeast ocaml.version "5.3" then
"1.23.1"
else if lib.versionAtLeast ocaml.version "5.2" then
pkgs/development/tools/ocaml/merlin/4.x.nix
+3 -2
View File
@@ -31,8 +31,8 @@
"5.2.0" = "5.3-502";
"5.2.1" = "5.3-502";
"5.3.0" = "5.6-503";
"5.4.0" = "5.6-504";
"5.4.1" = "5.6-504";
"5.4.0" = "5.7.1-504";
"5.4.1" = "5.7.1-504";
}
."${ocaml.version}",
}:
@@ -52,6 +52,7 @@ let
"5.4.1-503" = "sha256-SbO0x3jBISX8dAXnN5CwsxLV15dJ3XPUg4tlYqJTMCI=";
"5.6-503" = "sha256-sNytCSqq96I/ZauaCJ6HYb1mXMcjV5CeCsbCGC9PwtQ=";
"5.6-504" = "sha256-gtZIpBgNbVqjoIMhjii/GX9OnxR4hN6TArtoEa2Yt38=";
"5.7.1-504" = "sha256-E5sHPPkUs4tyXFT3W4tkL2VMNJjQpLqM+oMf8CqJcNU=";
};
in