From 50987a5d7332b21e5ad905ecd42bed856e32b21d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Mar 2025 11:44:29 +0000 Subject: [PATCH 1/3] python312Packages.yangson: 1.5.6 -> 1.6.2 --- pkgs/development/python-modules/yangson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 4a5b520eddf7..7d2d68747795 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.5.6"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "CZ-NIC"; repo = "yangson"; tag = version; - hash = "sha256-/9MxCkcPGRNZkuwAAvlr7gtGcyxXtliski7bNtFhVBE="; + hash = "sha256-gGunbQVRV9cFRnwGDIaGi/NM75rtw5vYVz2PiPiZlQo="; }; build-system = [ poetry-core ]; From c4be0b174db0a78d83b80655935ef5880cbd33e0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Mar 2025 00:25:26 +0100 Subject: [PATCH 2/3] python312Packages.yangson: drop setuptools --- pkgs/development/python-modules/yangson/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index 7d2d68747795..b72e32eea1b0 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -5,7 +5,6 @@ poetry-core, elementpath, pyyaml, - setuptools, pytestCheckHook, }: @@ -23,14 +22,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - pythonRelaxDeps = [ - "setuptools" - ]; - dependencies = [ elementpath pyyaml - setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From f3e37c6b3aa4d8baf5eef5bc2d794d178e793bd2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Mar 2025 00:56:20 +0100 Subject: [PATCH 3/3] scap-security-guide: add setuptools to build inputs --- pkgs/by-name/sc/scap-security-guide/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix index d084aa2bb594..3c7c1a1c8a33 100755 --- a/pkgs/by-name/sc/scap-security-guide/package.nix +++ b/pkgs/by-name/sc/scap-security-guide/package.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = with python3Packages; [ + setuptools sphinx sphinxcontrib-jinjadomain sphinx-rtd-theme