From 87884c7df7010b4e5170960e205f32578c132c78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Mar 2025 21:22:52 +0100 Subject: [PATCH 1/2] python312Packages.yamllint: 1.35.1 -> 1.37.0 Diff: https://github.com/adrienverge/yamllint/compare/refs/tags/v1.35.1...v1.37.0 Changelog: https://github.com/adrienverge/yamllint/blob/v1.37.0/CHANGELOG.rst --- .../python-modules/yamllint/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index f1d80867a9b2..203ad3fe7228 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -12,21 +12,21 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.35.1"; + version = "1.37.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "adrienverge"; repo = "yamllint"; tag = "v${version}"; - hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM="; + hash = "sha256-874VqcJyHMVIvrR3qzL2H7/Hz7qRb7GDWI56SAdCz00="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml pathspec ]; @@ -37,6 +37,8 @@ buildPythonPackage rec { [ # test failure reported upstream: https://github.com/adrienverge/yamllint/issues/373 "test_find_files_recursively" + # Issue wih fixture + "test_codec_built_in_equivalent" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # locale tests are broken on BSDs; see https://github.com/adrienverge/yamllint/issues/307 @@ -49,12 +51,10 @@ buildPythonPackage rec { meta = with lib; { description = "Linter for YAML files"; - mainProgram = "yamllint"; homepage = "https://github.com/adrienverge/yamllint"; changelog = "https://github.com/adrienverge/yamllint/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - mikefaille - ]; + maintainers = with maintainers; [ mikefaille ]; + mainProgram = "yamllint"; }; } From 80285029e835199624d50e306c85ef12246a69fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 23 Mar 2025 22:12:56 +0100 Subject: [PATCH 2/2] ansible-later: relax yamllint --- pkgs/tools/admin/ansible/later.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/later.nix b/pkgs/tools/admin/ansible/later.nix index 2c626708b9b9..08012dacdccd 100644 --- a/pkgs/tools/admin/ansible/later.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -17,7 +17,10 @@ python3Packages.buildPythonApplication rec { hash = "sha256-4ZHCnLeG5gr0UtKQLU+6xnTxUbxnLcmDd51Psnaa42I="; }; - pythonRelaxDeps = [ "python-json-logger" ]; + pythonRelaxDeps = [ + "python-json-logger" + "yamllint" + ]; build-system = with python3Packages; [ poetry-core