changes

Signed-off-by: Bloxx12 <charlie@charlieroot.dev>
Change-Id: I6a6a696407aaf040f34e2ef257545f441b621c99

packages/helix/languages.nix

@@ -14,8 +14,8 @@
   gdb,
   kdePackages,
   lib,
-  nil,
   ruff,
+  nixVersions,
   rustPlatform,
   shfmt,
   typescript-language-server,
@@ -30,24 +30,18 @@ let
 
   nixfmt = callPackage "${sources.nixfmt}/default.nix" { };
 
-  # a newer nil version, for pipes support.
-  new-nil = nil.overrideAttrs (_: {
-    version = "unstable-18-07-2025";
-
-    src = fetchFromGitHub {
-      owner = "oxalica";
-      repo = "nil";
-      rev = "524ae2d67dd84d99a10f409ed6cd8e4e7b3cae3f";
-      hash = "sha256-Uy2qzd+fMoBcp4NPSO7DavEC1pGMegmAqoEMvmXbIQU=";
+  nil = rustPlatform.buildRustPackage {
+    pname = "nil";
+    version = "unstable";
+    src = sources.nil;
+    cargoLock = {
+      lockFile = "${sources.nil}/Cargo.lock";
+      allowBuiltinFetchGit = false;
     };
+    nativeBuildInputs = [ nixVersions.latest ];
 
     doInstallCheck = false;
-
-    cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit (new-nil) src;
-      hash = "sha256-Sljr3ff8hl/qm/0wqc1GXsEr1wWn7NAXmdrd5wHzUX8=";
-    };
-  });
+  };
 
   new-deadnix = deadnix.overrideAttrs (
     finalAttrs: previousAttrs: {
@@ -65,6 +59,7 @@ let
         inherit (new-deadnix) src;
         hash = "sha256-O8yhqyPflOvQXAA19k1XpbrHysgV5VNWLBX0l5Q5GkM=";
       };
+      meta.mainProgram = "nil";
     }
   );
   helix-languages = {
@@ -274,7 +269,7 @@ let
       };
 
       nil = {
-        command = getExe new-nil;
+        command = getExe nil;
         config.nil = {
           formatting.command = [ "${getExe nixfmt}" ];
           diagnostics = {