From 5e29c709a07120cab1d928de1f8aaf2ba1f555da Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 17 Aug 2023 13:01:56 +0200
Subject: [PATCH 1/3] nvd: use `finalAttrs` pattern

---
 pkgs/tools/package-management/nvd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix
index 066b23cbd8d8..cd2f10dd98c8 100644
--- a/pkgs/tools/package-management/nvd/default.nix
+++ b/pkgs/tools/package-management/nvd/default.nix
@@ -1,13 +1,13 @@
 { fetchFromGitLab, installShellFiles, lib, python3, stdenv }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nvd";
   version = "0.2.3";
 
   src = fetchFromGitLab {
     owner = "khumba";
-    repo = pname;
-    rev = "refs/tags/v${version}";
+    repo = finalAttrs.pname;
+    rev = "refs/tags/v${finalAttrs.version}";
     sha256 = "sha256:005nh24j01s0hd5j0g0qp67wpivpjwryxyyh6y44jijb4arrfrjf";
   };
 
@@ -29,4 +29,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ khumba ];
     platforms = platforms.all;
   };
-}
+})

From 5da7c5adee784ed040861f740546f715121d3060 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 17 Aug 2023 13:02:22 +0200
Subject: [PATCH 2/3] nvd: add `meta.mainProgram`

---
 pkgs/tools/package-management/nvd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix
index cd2f10dd98c8..0fcd5e9afbbb 100644
--- a/pkgs/tools/package-management/nvd/default.nix
+++ b/pkgs/tools/package-management/nvd/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Nix/NixOS package version diff tool";
     homepage = "https://gitlab.com/khumba/nvd";
     license = licenses.asl20;
+    mainProgram = "nvd";
     maintainers = with maintainers; [ khumba ];
     platforms = platforms.all;
   };

From fbedb8d6e01320d05173c708422f66f884e9911f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 17 Aug 2023 13:04:17 +0200
Subject: [PATCH 3/3] nvd: reformat using `nixpkgs-fmt` and update minor things

---
 pkgs/tools/package-management/nvd/default.nix | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix
index 0fcd5e9afbbb..8f33b4a5fbfa 100644
--- a/pkgs/tools/package-management/nvd/default.nix
+++ b/pkgs/tools/package-management/nvd/default.nix
@@ -1,4 +1,9 @@
-{ fetchFromGitLab, installShellFiles, lib, python3, stdenv }:
+{ fetchFromGitLab
+, installShellFiles
+, lib
+, python3
+, stdenv
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nvd";
@@ -6,14 +11,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitLab {
     owner = "khumba";
-    repo = finalAttrs.pname;
+    repo = "nvd";
     rev = "refs/tags/v${finalAttrs.version}";
-    sha256 = "sha256:005nh24j01s0hd5j0g0qp67wpivpjwryxyyh6y44jijb4arrfrjf";
+    hash = "sha256-TmaXsyJLRkmIN9D77jOXd8fLj7kYPCBLg0AHIImAtgA=";
   };
 
-  buildInputs = [ python3 ];
+  buildInputs = [
+    python3
+  ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -22,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nix/NixOS package version diff tool";
     homepage = "https://gitlab.com/khumba/nvd";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     mainProgram = "nvd";
-    maintainers = with maintainers; [ khumba ];
-    platforms = platforms.all;
+    maintainers = with lib.maintainers; [ khumba ];
+    platforms = lib.platforms.all;
   };
 })