Merge pull request #319662 from r-ryantm/auto-update/python311Packages.single-source

python311Packages.single-source: 0.3.0 -> 0.4.0

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,34 +11,33 @@
 
 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
   ];
 
   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 ];
   };
 }

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 ];
   };
 }