From ce0e3a57c005615fa3d2c4c70b5a2a5a024fe623 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:25 -0600 Subject: [PATCH] ocamlPackages.ocaml-lsp: migrate to finalAttrs --- .../ocaml-modules/ocaml-lsp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 83ca1daffd9e..04f8867cb0ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -53,7 +53,7 @@ let merlin-lib = merlin-lib_v; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-lsp-server"; inherit (lsp) version src preBuild; @@ -63,18 +63,18 @@ buildDunePackage rec { lsp re ] - ++ lib.optional (lib.versionAtLeast version "1.9") spawn - ++ lib.optionals (lib.versionAtLeast version "1.10") [ + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.9") spawn + ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.10") [ fiber xdg ] - ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc - ++ lib.optionals (lib.versionAtLeast version "1.17.0") [ + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.14.2") ocamlc-loc + ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.17.0") [ astring camlp-streams merlin-lib ] - ++ lib.optional (lib.versionAtLeast version "1.18.0") base; + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.18.0") base; nativeBuildInputs = [ makeWrapper ]; @@ -87,4 +87,4 @@ buildDunePackage rec { mainProgram = "ocamllsp"; broken = lib.versions.majorMinor ocaml.version == "4.13"; }; -} +})