c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

ocamlPackages.lsp: 1.25.0 → 1.26.0 (#527279)

Browse source
This commit is contained in:
Vincent Laporte 2026-06-09 18:31:52 +00:00 • committed by GitHub
commit 9eea37174f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/science/logic/coq/default.nix
View file

@ -105,11 +105,25 @@ let
substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"
substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"
'';
dune =
if lib.versions.isEq coq-version "8.20" then
args.dune.override { version = "3.21.1"; }
else
args.dune;
ocamlPackages =
if customOCamlPackages != null then
customOCamlPackages
else
lib.switch coq-version [
{
case = lib.versions.isEq "8.20";
out = ocamlPackages_4_14.overrideScope (
self: super: {
inherit dune;
dune_3 = dune;
}
);
}
{
case = lib.versions.range "8.16" "9.1";
out = ocamlPackages_4_14;

3
pkgs/by-name/du/dune/package.nix
View file

@ -3,7 +3,7 @@
stdenv,
fetchurl,
buildPackages,
version ? "3.21.1",
version ? "3.22.2",
}:
let
# needed for pkgsStatic
@ -21,6 +21,7 @@ stdenv.mkDerivation {
"https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz";
hash =
{
"3.22.2" = "sha256-wsz4vGsXr6R8RQKXNXSWMDqnyGgOMpt52Yxo41AToRg=";
"3.21.1" = "sha256-hPeoLG2ApxJPOEfppInoDPvq+3vtNXOsAShu9W/QjZQ=";
"2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y";
}

3
pkgs/development/coq-modules/coq-elpi/default.nix
View file

@ -2,6 +2,7 @@
lib,
mkCoqDerivation,
which,
dune,
coq,
stdlib,
version ? null,
@ -33,7 +34,7 @@ let
propagatedBuildInputs_wo_elpi = [
coq.ocamlPackages.findlib
];
derivation = mkCoqDerivation {
derivation = mkCoqDerivation.override { dune = dune.override { version = "3.21.1"; }; } {
pname = "elpi";
repo = "coq-elpi";
owner = "LPCIC";

3
pkgs/development/coq-modules/stalmarck/default.nix
View file

@ -1,6 +1,7 @@
{
lib,
mkCoqDerivation,
dune,
coq,
stdlib,
version ? null,
@ -38,7 +39,7 @@ let
else
"A two-level approach to prove tautologies using Stålmarck's algorithm in Coq.";
in
mkCoqDerivation {
mkCoqDerivation.override { dune = dune.override { version = "3.21.1"; }; } {
inherit
version
pname

2
pkgs/development/ocaml-modules/ocaml-lsp/default.nix
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";
};
})

7
pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
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";

2
pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
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

5
pkgs/development/tools/ocaml/merlin/4.x.nix
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

1
pkgs/top-level/coq-packages.nix
View file

@ -17,6 +17,7 @@
fetchpatch,
makeWrapper,
coq2html,
dune,
}@args:
let
lib = import ../build-support/coq/extra-lib.nix { inherit (args) lib; };