From d8500118d489361884b135fc4987cadbeea704e3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 17:16:22 -0400
Subject: [PATCH 1/2] python3Packages.nvchecker: 2.18 -> 2.19

Co-authored-by: R. Ryantm <ryantm-bot@ryantm.com>
---
 pkgs/development/python-modules/nvchecker/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index ec03672ca806..fb9d76d29bcb 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -19,11 +19,12 @@
   awesomeversion,
   packaging,
   lxml,
+  zstandard,
 }:
 
 buildPythonPackage rec {
   pname = "nvchecker";
-  version = "2.18";
+  version = "2.19";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +33,7 @@ buildPythonPackage rec {
     owner = "lilydjwg";
     repo = "nvchecker";
     tag = "v${version}";
-    hash = "sha256-6uFox07mZeKwyhRXGuU8dMoPhLB5CkgdLaWCfG2dy4k=";
+    hash = "sha256-C8g8uhuWOl3zPCjTaGs21yJ8k3tmvZE8U9LzSXoDSxE=";
   };
 
   build-system = [ setuptools ];
@@ -77,6 +78,8 @@ buildPythonPackage rec {
     awesomeversion = [ awesomeversion ];
     pypi = [ packaging ];
     htmlparser = [ lxml ];
+    rpmrepo = [ lxml ] ++ lib.optionals (pythonOlder "3.14") [ zstandard ];
+    jq = [ jq ];
   };
 
   passthru.updateScript = nix-update-script { };

From 01f6ea84ce00935f936ad2cf620a1a47ed46a364 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 19 Sep 2025 17:16:38 -0400
Subject: [PATCH 2/2] python313Packages.nvchecker: modernize

- adjust ordering

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 .../python-modules/nvchecker/default.nix      | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix
index fb9d76d29bcb..47a014cf5517 100644
--- a/pkgs/development/python-modules/nvchecker/default.nix
+++ b/pkgs/development/python-modules/nvchecker/default.nix
@@ -1,24 +1,25 @@
 {
   lib,
-  platformdirs,
+  awesomeversion,
   buildPythonPackage,
   docutils,
   fetchFromGitHub,
-  nix-update-script,
   flaky,
   installShellFiles,
+  jq,
+  lxml,
+  nix-update-script,
+  packaging,
+  platformdirs,
   pycurl,
   pytest-asyncio,
-  pytest-httpbin,
   pytestCheckHook,
+  pytest-httpbin,
   pythonOlder,
   setuptools,
   structlog,
   tomli,
   tornado,
-  awesomeversion,
-  packaging,
-  lxml,
   zstandard,
 }:
 
@@ -27,8 +28,6 @@ buildPythonPackage rec {
   version = "2.19";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "lilydjwg";
     repo = "nvchecker";
@@ -36,6 +35,8 @@ buildPythonPackage rec {
     hash = "sha256-C8g8uhuWOl3zPCjTaGs21yJ8k3tmvZE8U9LzSXoDSxE=";
   };
 
+  __darwinAllowLocalNetworking = true;
+
   build-system = [ setuptools ];
 
   nativeBuildInputs = [
@@ -43,7 +44,7 @@ buildPythonPackage rec {
     installShellFiles
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     structlog
     platformdirs
     tornado
@@ -51,7 +52,14 @@ buildPythonPackage rec {
   ]
   ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
-  __darwinAllowLocalNetworking = true;
+  optional-dependencies = {
+    # vercmp = [ pyalpm ];
+    awesomeversion = [ awesomeversion ];
+    pypi = [ packaging ];
+    htmlparser = [ lxml ];
+    rpmrepo = [ lxml ] ++ lib.optionals (pythonOlder "3.14") [ zstandard ];
+    jq = [ jq ];
+  };
 
   nativeCheckInputs = [
     flaky
@@ -73,22 +81,13 @@ buildPythonPackage rec {
 
   disabledTestMarks = [ "needs_net" ];
 
-  optional-dependencies = {
-    # vercmp = [ pyalpm ];
-    awesomeversion = [ awesomeversion ];
-    pypi = [ packaging ];
-    htmlparser = [ lxml ];
-    rpmrepo = [ lxml ] ++ lib.optionals (pythonOlder "3.14") [ zstandard ];
-    jq = [ jq ];
-  };
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "New version checker for software";
     homepage = "https://github.com/lilydjwg/nvchecker";
-    changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/v${version}";
+    changelog = "https://github.com/lilydjwg/nvchecker/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.mdaniels5757 ];
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd669e9b308c..3057787371b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3668,7 +3668,7 @@ with pkgs;
     toPythonApplication (
       nvchecker.overridePythonAttrs (oldAttrs: {
         propagatedBuildInputs =
-          oldAttrs.propagatedBuildInputs ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
+          oldAttrs.dependencies ++ lib.flatten (builtins.attrValues oldAttrs.optional-dependencies);
       })
     );