From 6cead234cb25993868e603435b4d020ec7a66165 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 21 May 2025 14:09:16 +0300
Subject: [PATCH 1/3] neovide: use `finalAttrs`, remove `with lib`

---
 pkgs/by-name/ne/neovide/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix
index 79d69da40353..924dd60f6743 100644
--- a/pkgs/by-name/ne/neovide/package.nix
+++ b/pkgs/by-name/ne/neovide/package.nix
@@ -24,14 +24,14 @@
   wayland,
 }:
 
-rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
+rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: {
   pname = "neovide";
   version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "neovide";
     repo = "neovide";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-MLiLddF53OXDPYuJbTAscezxN09mxZkuSOZtQz07JSE=";
   };
 
@@ -122,15 +122,17 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
       install -m444 -Dt $out/share/applications assets/neovide.desktop
     '';
 
-  disallowedReferences = [ SKIA_SOURCE_DIR ];
+  disallowedReferences = [ finalAttrs.SKIA_SOURCE_DIR ];
 
   meta = {
     description = "Neovide is a simple, no-nonsense, cross-platform graphical user interface for Neovim";
     mainProgram = "neovide";
     homepage = "https://neovide.dev/";
-    changelog = "https://github.com/neovide/neovide/releases/tag/${version}";
-    license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ ck3d ];
+    changelog = "https://github.com/neovide/neovide/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      ck3d
+    ];
     platforms = lib.platforms.unix;
   };
-}
+})

From e98fa164847acc194b8b0ae2feaa0dd1928ca013 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 21 May 2025 14:09:16 +0300
Subject: [PATCH 2/3] neovim-qt-unwrapped: use `finalAttrs`, remove `with lib`

---
 pkgs/by-name/ne/neovim-qt-unwrapped/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
index b4a888905608..197ff546f6b6 100644
--- a/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-qt-unwrapped/package.nix
@@ -10,14 +10,14 @@
   python3Packages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "neovim-qt-unwrapped";
   version = "0.2.19";
 
   src = fetchFromGitHub {
     owner = "equalsraf";
     repo = "neovim-qt";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-r77tg3xVemHW/zDNA6dYerFjFaYDDeHsD68WhMfI70Q=";
   };
 
@@ -51,12 +51,14 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Neovim client library and GUI, in Qt5";
     homepage = "https://github.com/equalsraf/neovim-qt";
-    license = licenses.isc;
+    license = lib.licenses.isc;
     mainProgram = "nvim-qt";
-    maintainers = with maintainers; [ peterhoeg ];
+    maintainers = with lib.maintainers; [
+      peterhoeg
+    ];
     inherit (neovim.meta) platforms;
   };
-}
+})

From d88309158fbf0bf2d13bec68e9e54f7d5b7fedbd Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 21 May 2025 14:09:16 +0300
Subject: [PATCH 3/3] neovim-gtk: use `finalAttrs`, remove `with lib`

---
 pkgs/by-name/ne/neovim-gtk/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-gtk/package.nix b/pkgs/by-name/ne/neovim-gtk/package.nix
index 44ec67d0fb25..d1483fc8e71a 100644
--- a/pkgs/by-name/ne/neovim-gtk/package.nix
+++ b/pkgs/by-name/ne/neovim-gtk/package.nix
@@ -10,14 +10,14 @@
   vte-gtk4,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "neovim-gtk";
   version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "Lyude";
-    repo = pname;
-    rev = "v${version}";
+    repo = "neovim-gtk";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I=";
   };
 
@@ -42,11 +42,13 @@ rustPlatform.buildRustPackage rec {
     make PREFIX=$out install-resources
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Gtk ui for neovim";
     homepage = "https://github.com/Lyude/neovim-gtk";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ aleksana ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      aleksana
+    ];
     mainProgram = "nvim-gtk";
   };
-}
+})