From 3b704f5dd3c90cb6b9b2b3e7f5eb441df52575a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 13:15:24 +0200 Subject: [PATCH 1/3] python312Packages.reuse: add changelog to meta --- pkgs/development/python-modules/reuse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index b0d992083001..ef3dbfc9123e 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; + changelog = "https://github.com/fsfe/reuse-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3Plus ]; maintainers = with maintainers; [ FlorianFranzen Luflosi ]; mainProgram = "reuse"; From c37239431b6fb7d7a4379d26096ddd84da13cc12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 13:16:39 +0200 Subject: [PATCH 2/3] python312Packages.reuse: refactor --- pkgs/development/python-modules/reuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index ef3dbfc9123e..c8f2d72a06d1 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "reuse"; version = "3.0.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "fsfe"; @@ -22,11 +22,11 @@ buildPythonPackage rec { hash = "sha256-ZYmQtJ503HDmu+Cd6IxOrCcOVH+CcFnFe3oe6PqvcE0="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ binaryornot boolean-py debian From 34966fa09840ec91b461d377e8cb70646bc62ca4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 13:18:47 +0200 Subject: [PATCH 3/3] python312Packages.reuse: format with nixfmt --- .../python-modules/reuse/default.nix | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index c8f2d72a06d1..e697d8b26210 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, binaryornot -, boolean-py -, debian -, jinja2 -, license-expression -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + binaryornot, + boolean-py, + debian, + jinja2, + license-expression, + pytestCheckHook, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-ZYmQtJ503HDmu+Cd6IxOrCcOVH+CcFnFe3oe6PqvcE0="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ binaryornot @@ -47,8 +46,16 @@ buildPythonPackage rec { description = "A tool for compliance with the REUSE Initiative recommendations"; homepage = "https://github.com/fsfe/reuse-tool"; changelog = "https://github.com/fsfe/reuse-tool/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3Plus ]; - maintainers = with maintainers; [ FlorianFranzen Luflosi ]; + license = with licenses; [ + asl20 + cc-by-sa-40 + cc0 + gpl3Plus + ]; + maintainers = with maintainers; [ + FlorianFranzen + Luflosi + ]; mainProgram = "reuse"; }; }