From c33d2738f6bf97a32316966301c7b45b0c5b45f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 May 2024 14:05:22 +0200
Subject: [PATCH 1/2] skjold: 0.6.1 -> 0.6.2

Diff: https://github.com/twu/skjold/compare/refs/tags/v0.6.1...v0.6.2

Changelog: https://github.com/twu/skjold/releases/tag/v0.6.2
---
 pkgs/development/tools/skjold/default.nix | 43 +++++++++--------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix
index e827e727a957..fdf640a22db9 100644
--- a/pkgs/development/tools/skjold/default.nix
+++ b/pkgs/development/tools/skjold/default.nix
@@ -3,47 +3,38 @@
 , python3
 }:
 
-let
-  py = python3.override {
-    packageOverrides = self: super: {
-      packaging = super.packaging.overridePythonAttrs (oldAttrs: rec {
-        version = "21.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          hash = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s=";
-        };
-        nativeBuildInputs = with python3.pkgs; [ setuptools ];
-        propagatedBuildInputs = with python3.pkgs; [ pyparsing six ];
-      });
-    };
-  };
-in
-with py.pkgs;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "skjold";
-  version = "0.6.1";
-  format = "pyproject";
+  version = "0.6.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "twu";
-    repo = pname;
+    repo = "skjold";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rsdstzNZvokYfTjEyPrWR+0SJpf9wL0HAesq8+A+tPY=";
+    hash = "sha256-/ltaRs2WZXbrG3cVez+QIwupJrsV550TjOALbHX9Z0I=";
   };
 
-  nativeBuildInputs = with py.pkgs; [
+  pythonRelaxDeps = [
+    "packaging"
+  ];
+
+  build-system = with python3.pkgs; [
     poetry-core
   ];
 
-  propagatedBuildInputs = with py.pkgs; [
+  nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
+  ];
+
+  dependencies = with python3.pkgs; [
     click
     packaging
     pyyaml
     toml
   ];
 
-  nativeCheckInputs = with py.pkgs; [
+  nativeCheckInputs = with python3.pkgs; [
     pytest-mock
     pytest-watch
     pytestCheckHook
@@ -75,7 +66,7 @@ buildPythonApplication rec {
     description = "Tool to Python dependencies against security advisory databases";
     homepage = "https://github.com/twu/skjold";
     changelog = "https://github.com/twu/skjold/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 40b9116d8cdbcb81e6bfd018f029bcfd24d21797 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 May 2024 14:06:37 +0200
Subject: [PATCH 2/2] skjold: format with nixfmt

---
 pkgs/development/tools/skjold/default.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix
index fdf640a22db9..75de1dfe1eb2 100644
--- a/pkgs/development/tools/skjold/default.nix
+++ b/pkgs/development/tools/skjold/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -15,17 +16,11 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-/ltaRs2WZXbrG3cVez+QIwupJrsV550TjOALbHX9Z0I=";
   };
 
-  pythonRelaxDeps = [
-    "packaging"
-  ];
+  pythonRelaxDeps = [ "packaging" ];
 
-  build-system = with python3.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3.pkgs; [ poetry-core ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    pythonRelaxDepsHook
-  ];
+  nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
 
   dependencies = with python3.pkgs; [
     click
@@ -58,9 +53,7 @@ python3.pkgs.buildPythonApplication rec {
     "urllib3"
   ];
 
-  pythonImportsCheck = [
-    "skjold"
-  ];
+  pythonImportsCheck = [ "skjold" ];
 
   meta = with lib; {
     description = "Tool to Python dependencies against security advisory databases";