From f5fc444f56b46e33e7af6322d39a76d93e466c7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 15:47:49 +0000 Subject: [PATCH 1/3] python312Packages.saneyaml: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/saneyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 5fca7e223f6b..b9f98b3b2e08 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "saneyaml"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sjCfeDZiPNbbkyV067xD4/ZcdD52NReeZL7ssNFibkQ="; + hash = "sha256-Gc+9i/lNcwmYFix5D+XOyau1MAzFiQ/jfcbbyqj7Frs="; }; dontConfigure = true; From e504dff21e106af8f2b5ca4ea38c3c6372b7f61d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 07:57:02 +0200 Subject: [PATCH 2/3] python312Packages.saneyaml: add changelog to meta --- pkgs/development/python-modules/saneyaml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index b9f98b3b2e08..761bde70f06b 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -6,6 +6,7 @@ pyyaml, pytestCheckHook, }: + buildPythonPackage rec { pname = "saneyaml"; version = "0.6.1"; @@ -29,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyYaml wrapper with sane behaviour to read and write readable YAML safely"; homepage = "https://github.com/nexB/saneyaml"; + changelog = "https://github.com/aboutcode-org/saneyaml/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = [ ]; }; From 8406a2dc5e28b4192ea029bd645cd79a7ec5b880 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 15 Aug 2024 07:58:44 +0200 Subject: [PATCH 3/3] python312Packages.saneyaml: refactor --- pkgs/development/python-modules/saneyaml/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/saneyaml/default.nix b/pkgs/development/python-modules/saneyaml/default.nix index 761bde70f06b..1f27c46dd641 100644 --- a/pkgs/development/python-modules/saneyaml/default.nix +++ b/pkgs/development/python-modules/saneyaml/default.nix @@ -5,12 +5,16 @@ setuptools-scm, pyyaml, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "saneyaml"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -19,9 +23,9 @@ buildPythonPackage rec { dontConfigure = true; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ pyyaml ]; + dependencies = [ pyyaml ]; nativeCheckInputs = [ pytestCheckHook ];