From 72b6eada2d8c9eada0b3b68e40725336e8aaabfa Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 28 Sep 2024 13:49:57 -0400
Subject: [PATCH 1/3] nixpkgs-review: format with nixfmt

---
 .../nixpkgs-review/default.nix                | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 3d119f6b846a..34cd5cd2d41b 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+  lib,
+  python3,
+  fetchFromGitHub,
 
-, installShellFiles
-, bubblewrap
-, nix-output-monitor
-, cacert
-, git
-, nix
+  installShellFiles,
+  bubblewrap,
+  nix-output-monitor,
+  cacert,
+  git,
+  nix,
 
-, withAutocomplete ? true
-, withSandboxSupport ? false
-, withNom ? false
+  withAutocomplete ? true,
+  withSandboxSupport ? false,
+  withNom ? false,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -26,20 +27,23 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ=";
   };
 
-  nativeBuildInputs = [
-    installShellFiles
-    python3.pkgs.setuptools
-  ] ++ lib.optionals withAutocomplete [
-    python3.pkgs.argcomplete
-  ];
+  nativeBuildInputs =
+    [
+      installShellFiles
+      python3.pkgs.setuptools
+    ]
+    ++ lib.optionals withAutocomplete [
+      python3.pkgs.argcomplete
+    ];
 
   propagatedBuildInputs = [ python3.pkgs.argcomplete ];
 
   makeWrapperArgs =
     let
-      binPath = [ nix git ]
-        ++ lib.optional withSandboxSupport bubblewrap
-        ++ lib.optional withNom nix-output-monitor;
+      binPath = [
+        nix
+        git
+      ] ++ lib.optional withSandboxSupport bubblewrap ++ lib.optional withNom nix-output-monitor;
     in
     [
       "--prefix PATH : ${lib.makeBinPath binPath}"
@@ -65,6 +69,9 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/Mic92/nixpkgs-review";
     license = licenses.mit;
     mainProgram = "nixpkgs-review";
-    maintainers = with maintainers; [ figsoda mic92 ];
+    maintainers = with maintainers; [
+      figsoda
+      mic92
+    ];
   };
 }

From 2e913231ee30600d7acb5cc54ff0a435468d934f Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 28 Sep 2024 13:52:22 -0400
Subject: [PATCH 2/3] nixpkgs-review: modernize

---
 .../package-management/nixpkgs-review/default.nix   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 34cd5cd2d41b..3923fbb4449d 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -18,7 +18,7 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "nixpkgs-review";
   version = "2.10.5";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Mic92";
@@ -27,17 +27,22 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-dRTKE8gkV298ZmMokyy3Ufer/Lp1GQYdEhIBoLhloEQ=";
   };
 
+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
+  dependencies = lib.optionals withAutocomplete [
+    python3.pkgs.argcomplete
+  ];
+
   nativeBuildInputs =
     [
       installShellFiles
-      python3.pkgs.setuptools
     ]
     ++ lib.optionals withAutocomplete [
       python3.pkgs.argcomplete
     ];
 
-  propagatedBuildInputs = [ python3.pkgs.argcomplete ];
-
   makeWrapperArgs =
     let
       binPath = [

From 7a96b48e2aa4f3a9fc7f17dec9d28e994f5b4d30 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sat, 28 Sep 2024 13:53:41 -0400
Subject: [PATCH 3/3] nixpkgs-review: use python3Packages instead of
 python3.pkgs to fix splicing

---
 .../package-management/nixpkgs-review/default.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 3923fbb4449d..895b4300ac45 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
 
   installShellFiles,
@@ -15,7 +15,7 @@
   withNom ? false,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "nixpkgs-review";
   version = "2.10.5";
   pyproject = true;
@@ -28,11 +28,11 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   build-system = [
-    python3.pkgs.setuptools
+    python3Packages.setuptools
   ];
 
   dependencies = lib.optionals withAutocomplete [
-    python3.pkgs.argcomplete
+    python3Packages.argcomplete
   ];
 
   nativeBuildInputs =
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec {
       installShellFiles
     ]
     ++ lib.optionals withAutocomplete [
-      python3.pkgs.argcomplete
+      python3Packages.argcomplete
     ];
 
   makeWrapperArgs =