Merge staging-next into staging

3 files changed, 48 insertions, 42 deletions

diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock
index e8b9d9229b30..9275df8c1c14 100644
--- a/pkgs/development/tools/language-servers/millet/Cargo.lock
+++ b/pkgs/development/tools/language-servers/millet/Cargo.lock
@@ -28,7 +28,7 @@ dependencies = [
 
 [[package]]
 name = "analysis"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "config",
  "diagnostic",
@@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chain-map"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "str-util",
@@ -131,7 +131,7 @@ source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fd
 
 [[package]]
 name = "cm-syntax"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "lex-util",
  "paths",
@@ -161,7 +161,7 @@ dependencies = [
 
 [[package]]
 name = "config"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "serde",
@@ -189,7 +189,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
 
 [[package]]
 name = "cov-mark"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "once_cell",
@@ -417,7 +417,7 @@ dependencies = [
 
 [[package]]
 name = "input"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "cm-syntax",
  "config",
@@ -466,7 +466,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
 
 [[package]]
 name = "lang-srv"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "analysis",
  "anyhow",
@@ -494,7 +494,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lex-util"
-version = "0.14.0"
+version = "0.14.2"
 
 [[package]]
 name = "libc"
@@ -566,7 +566,7 @@ dependencies = [
 
 [[package]]
 name = "millet-cli"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "analysis",
  "codespan-reporting",
@@ -584,7 +584,7 @@ dependencies = [
 
 [[package]]
 name = "millet-ls"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -604,7 +604,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-hir"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "paths",
@@ -616,7 +616,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-statics"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "config",
  "diagnostic",
@@ -641,7 +641,7 @@ dependencies = [
 
 [[package]]
 name = "mlb-syntax"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "lex-util",
  "paths",
@@ -705,7 +705,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "panic-hook"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "better-panic",
 ]
@@ -928,7 +928,7 @@ dependencies = [
 
 [[package]]
 name = "slash-var-path"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "str-util",
@@ -936,14 +936,14 @@ dependencies = [
 
 [[package]]
 name = "sml-comment"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "sml-syntax",
 ]
 
 [[package]]
 name = "sml-dynamics"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "fmt-util",
@@ -954,7 +954,7 @@ dependencies = [
 
 [[package]]
 name = "sml-dynamics-tests"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "config",
  "pretty_assertions",
@@ -971,11 +971,11 @@ dependencies = [
 
 [[package]]
 name = "sml-file"
-version = "0.14.0"
+version = "0.14.2"
 
 [[package]]
 name = "sml-file-syntax"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "config",
  "elapsed",
@@ -990,7 +990,7 @@ dependencies = [
 
 [[package]]
 name = "sml-fixity"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "once_cell",
@@ -999,7 +999,7 @@ dependencies = [
 
 [[package]]
 name = "sml-hir"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "la-arena",
  "sml-lab",
@@ -1010,7 +1010,7 @@ dependencies = [
 
 [[package]]
 name = "sml-hir-lower"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "config",
  "cov-mark",
@@ -1022,23 +1022,26 @@ dependencies = [
  "sml-path",
  "sml-syntax",
  "str-util",
+ "text-size-util",
 ]
 
 [[package]]
 name = "sml-lab"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-lex"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "cov-mark",
  "diagnostic",
  "lex-util",
  "sml-syntax",
+ "text-size-util",
+ "token",
 ]
 
 [[package]]
@@ -1048,20 +1051,21 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7
 
 [[package]]
 name = "sml-naive-fmt"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "sml-comment",
  "sml-syntax",
+ "text-size-util",
 ]
 
 [[package]]
 name = "sml-namespace"
-version = "0.14.0"
+version = "0.14.2"
 
 [[package]]
 name = "sml-parse"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "diagnostic",
  "event-parse",
@@ -1069,18 +1073,20 @@ dependencies = [
  "sml-fixity",
  "sml-syntax",
  "str-util",
+ "text-size-util",
+ "token",
 ]
 
 [[package]]
 name = "sml-path"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "str-util",
 ]
 
 [[package]]
 name = "sml-scon"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -1089,7 +1095,7 @@ dependencies = [
 
 [[package]]
 name = "sml-statics"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "chain-map",
  "config",
@@ -1112,7 +1118,7 @@ dependencies = [
 
 [[package]]
 name = "sml-statics-types"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "chain-map",
  "code-h2-md-map",
@@ -1131,7 +1137,7 @@ dependencies = [
 
 [[package]]
 name = "sml-symbol-kind"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "sml-namespace",
  "sml-statics-types",
@@ -1139,7 +1145,7 @@ dependencies = [
 
 [[package]]
 name = "sml-syntax"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "code-h2-md-map",
  "fast-hash",
@@ -1150,7 +1156,7 @@ dependencies = [
 
 [[package]]
 name = "sml-ty-var-scope"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "fast-hash",
  "sml-hir",
@@ -1223,7 +1229,7 @@ dependencies = [
 
 [[package]]
 name = "tests"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "analysis",
  "cm-syntax",
@@ -1634,7 +1640,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "0.14.0"
+version = "0.14.2"
 dependencies = [
  "anyhow",
  "flate2",
diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix
index 9efe4b1f45ad..42f932c04ef9 100644
--- a/pkgs/development/tools/language-servers/millet/default.nix
+++ b/pkgs/development/tools/language-servers/millet/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "millet";
-  version = "0.14.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "azdavis";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-dTYnJofXzpkfXfS4RoJHqXEMlPKW5w1z+X39rL+VoQE=";
+    hash = "sha256-UtdkflM9ftmSVQI4CF0PAlLlbQ9l0EHF5SzJL4sU08Q=";
   };
 
   cargoLock = {
diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix
index 3cee6dd3b708..6397dabb1da4 100644
--- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix
+++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "neocmakelsp";
-  version = "0.6.11";
+  version = "0.6.17";
 
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
     rev = "v${version}";
-    hash = "sha256-ZLZGPigZSrW2C909Kc8t0U3+5sWRGkhT820fl+k37x4=";
+    hash = "sha256-0Rc5oPm6BAjPmoRHUO3gVivbQt2p2y62VbT5NIzHtpI=";
   };
 
-  cargoHash = "sha256-dONoaLX2nlnJIjnRPSgQ5oHWqWw632nSpoWUOiU0w58=";
+  cargoHash = "sha256-7ifdmW9JBjz0jxpltn5gFa60oNsB4daA6cXCLnBne7o=";
 
   meta = with lib; {
     description = "A cmake lsp based on tower-lsp and treesitter";