From 6f9b7b68cfdab3bdacc6caff729bca03cfc2f3b9 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 6 Aug 2024 08:55:54 -0400
Subject: [PATCH 1/2] nil: 2023-08-09 -> 2024-08-06

Diff: https://github.com/oxalica/nil/compare/2023-08-09...2024-08-06

Changelog: https://github.com/oxalica/nil/releases/tag/2024-08-06
---
 pkgs/development/tools/language-servers/nil/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/development/tools/language-servers/nil/default.nix
index e62f445aa5ba..71ee69ac6199 100644
--- a/pkgs/development/tools/language-servers/nil/default.nix
+++ b/pkgs/development/tools/language-servers/nil/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nil";
-  version = "2023-08-09";
+  version = "2024-08-06";
 
   src = fetchFromGitHub {
     owner = "oxalica";
     repo = pname;
     rev = version;
-    hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=";
+    hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
   };
 
-  cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";
+  cargoHash = "sha256-E4wmVunaX5SeBlXaLEpzMZ+IY0YVeJ1NORPo9msHr6M=";
 
   nativeBuildInputs = [
-    (lib.getBin nixVersions.nix_2_23)
+    (lib.getBin nixVersions.latest)
   ];
 
   env.CFG_RELEASE = version;

From 23faf66c5631b73bbad57c465188f3ac5aa1dbc3 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 6 Aug 2024 08:57:42 -0400
Subject: [PATCH 2/2] nil: migrate to by-name

---
 .../nil/default.nix => by-name/ni/nil/package.nix}              | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/language-servers/nil/default.nix => by-name/ni/nil/package.nix} (100%)

diff --git a/pkgs/development/tools/language-servers/nil/default.nix b/pkgs/by-name/ni/nil/package.nix
similarity index 100%
rename from pkgs/development/tools/language-servers/nil/default.nix
rename to pkgs/by-name/ni/nil/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9aea4bf5262..401e12c90c61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17413,8 +17413,6 @@ with pkgs;
 
   neocmakelsp = callPackage ../development/tools/language-servers/neocmakelsp { };
 
-  nil = callPackage ../development/tools/language-servers/nil { };
-
   inherit (callPackages ../development/tools/language-servers/nixd {
     llvmPackages = llvmPackages_16;
     nix = nixVersions.nix_2_19;