From 1b89337dab565c79eba966512a2c8dafc98e1197 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Jun 2024 21:42:56 +0000
Subject: [PATCH 1/3] python312Packages.single-source: 0.3.0 -> 0.4.0

---
 .../python-modules/single-source/default.nix      | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix
index 894ad9e1da42..c0b10ee60b15 100644
--- a/pkgs/development/python-modules/single-source/default.nix
+++ b/pkgs/development/python-modules/single-source/default.nix
@@ -2,8 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  importlib-metadata,
   poetry-core,
+  toml,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
@@ -11,23 +11,22 @@
 
 buildPythonPackage rec {
   pname = "single-source";
-  version = "0.3.0";
-  format = "pyproject";
+  version = "0.4.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "rabbit72";
     repo = "single-source";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bhfMRIeJUd5JhN2tPww7fdbmHQ7ypcsZrYSa55v0+W8=";
+    hash = "sha256-4l9ochlscQoWJVkYN8Iq2DsiU7qoOf7nUFYgBOebK/g=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [ importlib-metadata ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
+    toml
     pytest-mock
     pytestCheckHook
   ];

From a96197f98ee1bc035476164fcfef536f5f1be852 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 29 Jul 2024 15:53:33 -0400
Subject: [PATCH 2/3] python312Packages.single-source: add nickcao to
 maintainers

---
 pkgs/development/python-modules/single-source/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/single-source/default.nix b/pkgs/development/python-modules/single-source/default.nix
index c0b10ee60b15..809493dc0a30 100644
--- a/pkgs/development/python-modules/single-source/default.nix
+++ b/pkgs/development/python-modules/single-source/default.nix
@@ -33,11 +33,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "single_source" ];
 
-  meta = with lib; {
+  meta = {
     description = "Access to the project version in Python code for PEP 621-style projects";
     homepage = "https://github.com/rabbit72/single-source";
     changelog = "https://github.com/rabbit72/single-source/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

From 623e8888013d774958bd643f4730e99b47858516 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 29 Jul 2024 15:58:37 -0400
Subject: [PATCH 3/3] tell-me-your-secrets: modernize

---
 .../security/tell-me-your-secrets/default.nix | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/tools/security/tell-me-your-secrets/default.nix
index 30bd9d48fd23..8e38138d8a0c 100644
--- a/pkgs/tools/security/tell-me-your-secrets/default.nix
+++ b/pkgs/tools/security/tell-me-your-secrets/default.nix
@@ -1,9 +1,10 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "tell-me-your-secrets";
   version = "2.4.2";
   pyproject = true;
@@ -16,35 +17,29 @@ python3.pkgs.buildPythonApplication rec {
   };
 
   pythonRelaxDeps = [
-    "gitignore-parser"
     "pandas"
+    "single-source"
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3Packages; [ poetry-core ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     gitignore-parser
     pandas
     pyyaml
     single-source
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
 
-  pythonImportsCheck = [
-    "tell_me_your_secrets"
-  ];
+  pythonImportsCheck = [ "tell_me_your_secrets" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tools to find secrets from various signatures";
     mainProgram = "tell-me-your-secrets";
     homepage = "https://github.com/valayDave/tell-me-your-secrets";
     changelog = "https://github.com/valayDave/tell-me-your-secrets/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }