From 03cf072bfa632a0320d255e5a2a86e04c66d3a3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 10:05:22 +0200 Subject: [PATCH 1/3] python312Packages.model-bakery: 1.17.0 -> 1.18.0 Diff: https://github.com/model-bakers/model_bakery/compare/refs/tags/1.17.0...1.18.0 Changelog: https://github.com/model-bakers/model_bakery/blob/1.18.0/CHANGELOG.md --- pkgs/development/python-modules/model-bakery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index a5b38b525f7d..9d6004ae2b17 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-bakery"; - version = "1.17.0"; + version = "1.18.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "model-bakers"; repo = "model_bakery"; rev = "refs/tags/${version}"; - hash = "sha256-o3BI2lMwctR9tiGmY07dAOQUfv9K4rWkc/xI6uHnVfs="; + hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ="; }; nativeBuildInputs = [ From 3e97b42b829431c8e6bd76f00bae5d973a815f1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 10:06:10 +0200 Subject: [PATCH 2/3] python312Packages.model-bakery: refactor --- pkgs/development/python-modules/model-bakery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 9d6004ae2b17..57923da1690e 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-bakery"; version = "1.18.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,11 +22,11 @@ buildPythonPackage rec { hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ="; }; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ django ]; From 1cd9327dc47bc45ebac521ea8ccb6d020f830e7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Apr 2024 10:06:28 +0200 Subject: [PATCH 3/3] python312Packages.model-bakery: format with nixfmt --- .../python-modules/model-bakery/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/model-bakery/default.nix b/pkgs/development/python-modules/model-bakery/default.nix index 57923da1690e..82b91dd10da5 100644 --- a/pkgs/development/python-modules/model-bakery/default.nix +++ b/pkgs/development/python-modules/model-bakery/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hatchling -, django -, pytestCheckHook -, pythonOlder -, pytest-django +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + django, + pytestCheckHook, + pythonOlder, + pytest-django, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-mf6NV7r/9kDCRlszx/QGtfEsC1O/SATd6+EX+w7ptEQ="; }; - build-system = [ - hatchling - ]; + build-system = [ hatchling ]; - dependencies = [ - django - ]; + dependencies = [ django ]; nativeCheckInputs = [ pytest-django pytestCheckHook ]; - pythonImportsCheck = [ - "model_bakery" - ]; + pythonImportsCheck = [ "model_bakery" ]; meta = with lib; { description = "Object factory for Django";