upgrade nimlangserver to v1.6.0

flake.lock

@@ -1209,11 +1209,11 @@
       },
       "locked": {
         "dir": "nix",
-        "lastModified": 1726527644,
-        "narHash": "sha256-WAruDParTj7AY16SNjTDPgXf54vJCQRpRAiED3x9FIM=",
+        "lastModified": 1727122609,
+        "narHash": "sha256-M6tkMDvt4zOoYAhBOCFxFQGjORhhjZbWMC+0tPnHkxU=",
         "owner": "daylinmorgan",
         "repo": "tsm",
-        "rev": "5991d93bcb216c4cd5345296111fee7027be29cf",
+        "rev": "e8539740f6faf49404f30225607edbad58c34962",
         "type": "github"
       },
       "original": {

lib/default.nix

@@ -6,7 +6,6 @@ let
   inherit (lib)
     genAttrs
     pkgFromSystem
-    pkgsFromSystem
     loadOverlays
     ;
 
@@ -46,7 +45,7 @@ let
         oizys-nim = pkgs.callPackage ../pkgs/oizys-nim { };
         oizys-go = pkgs.callPackage ../pkgs/oizys { };
         # nimlangserver = pkgs.callPackage ../pkgs/nimlangserver { };
-        # nph = pkgs.callPackage ../pkgs/nph { };
+        nph = pkgs.callPackage ../pkgs/nph { };
         iso = mkIso.config.system.build.isoImage;
         # roc = (pkgsFromSystem pkgs.system "roc").full;
       }

pkgs/nim/nimlangserver/default.nix

@@ -1,15 +1,16 @@
 { fetchFromGitHub, buildNimPackage }:
-buildNimPackage{
+buildNimPackage( finalAttrs:  {
   pname = "nimlangserver";
-  version = "unstable";
+  version = "1.6.0";
   src = fetchFromGitHub {
-    owner = "daylinmorgan";
+    owner = "nim-lang";
     repo = "langserver";
-    rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c";
-    # rev = "v${version}";
-    hash = "sha256-XFgA0yOfE34+bZxBgOdoK+5CWhxvppzl8QSQx1TTPpQ=";
+    # rev = "26b333d0c8d62ba947a9ce9fbd59a7a77766872c";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rTlkbNuJbL9ke1FpHYVYduiYHUON6oACg20pBs0MaP4=";
   };
 
   doCheck = false;
   lockFile = ./lock.json;
 }
+)

pkgs/nim/nph/default.nix

@@ -1,4 +1,7 @@
-{ fetchFromGitHub, buildNimPackage }:
+{
+  fetchFromGitHub,
+  buildNimPackage,
+}:
 buildNimPackage (finalAttrs: {
   pname = "nph";
   version = "0.6.0";
@@ -8,7 +11,11 @@ buildNimPackage (finalAttrs: {
     rev = "v${finalAttrs.version}";
     hash = "sha256-9t5VeGsxyytGdu7+Uv/J+x6bmeB5+eQapbyp30iPxqs=";
   };
-
+  # replace gorge(git...) call to for version
+  patchPhase = ''
+    runHook prePatch
+    sed -i 's/Version = gorge(.*/Version = """v${finalAttrs.version}\n"""/' src/nph.nim
+    runHook postPatch
+  '';
   doCheck = false;
-}
-)
+})

pkgs/oizys-nim/src/oizys.nim

@@ -117,13 +117,14 @@ when isMainModule:
     # clUse must be set here using clCfg doesn't seem to work with dispatchMutli ...
     clUse* = $bb("$command $args\n${doc}[bold]Options[/]:\n$options")
     osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
+
   dispatchMulti(
-    [build,  help = sharedHelp],
-    [cache,  help = cacheHelp ],
-    [ci,     help = ciHelp    ],
-    [dry,    help = sharedHelp],
+    [build,  help = sharedHelp, usage = clUse ],
+    [cache,  help = cacheHelp , usage = clUse ],
+    [ci,     help = ciHelp    , usage = clUse ],
+    [dry,    help = sharedHelp, usage = clUse ],
     [osCmd,  help = sharedHelp, usage = osUsage, cmdName = "os"],
-    [output, help = sharedHelp],
-    [update, help = updateHelp],
+    [output, help = sharedHelp, usage = clUse],
+    [update, help = updateHelp, usage = clUse],
   )
 

pkgs/oizys-nim/src/oizys/logging.nim

@@ -94,10 +94,10 @@ method log*(logger: FancyConsoleLogger, level: Level, args: varargs[string, `$`]
 
   if level >= logger.levelThreshold:
     let ln = substituteLog(logger.fmtStrs[level], level, args)
-    when defined(js): {.fatal: "handler does note support JS".}
+    when defined(js): {.fatal: "handler does not support JS".}
     try:
       let handle =
-        if logger.useStderr: stderr 
+        if logger.useStderr: stderr
         else: stdout
       writeLine(handle, ln)
       if level >= logger.flushThreshold: flushFile(handle)
@@ -112,6 +112,6 @@ template errorQuit*(args: varargs[string, `$`]) =
   quit QuitFailure
 
 template fatalQuit*(args: varargs[string, `$`]) =
-  error args
+  fatal args
   quit QuitFailure