From 4fc84a24b86a6f02b54a37fc858436cc747b6e8b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:41:57 +0200 Subject: [PATCH 1/4] python312Packages.puremagic: refactor --- pkgs/development/python-modules/puremagic/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 72f0dfc4dde7..aee0801a8e53 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "puremagic"; version = "1.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cdgriffith"; - repo = pname; + repo = "puremagic"; rev = "refs/tags/${version}"; hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; }; + build-system = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From 407c357d8ab91474bac8a2cf6c43d729d9bc06cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:42:25 +0200 Subject: [PATCH 2/4] python312Packages.puremagic: 1.21 -> 1.22 Diff: https://github.com/cdgriffith/puremagic/compare/refs/tags/1.21...1.22 Changelog: https://github.com/cdgriffith/puremagic/blob/1.22/CHANGELOG.md --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index aee0801a8e53..22d9abbf34de 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.21"; + version = "1.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; + hash = "sha256-48gtwH6NXj/n3mm313Im1ey4ZH9TbsSFwjsQuBGuqwA="; }; build-system = [ From 5f345fdffc07ebd37564798dfdea0bdaff7290b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:42:46 +0200 Subject: [PATCH 3/4] python312Packages.puremagic: format with nixfmt --- .../python-modules/puremagic/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 22d9abbf34de..d9171b6497c6 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,17 +21,11 @@ buildPythonPackage rec { hash = "sha256-48gtwH6NXj/n3mm313Im1ey4ZH9TbsSFwjsQuBGuqwA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "puremagic" - ]; + pythonImportsCheck = [ "puremagic" ]; meta = with lib; { description = "Implementation of magic file detection"; From dc4af9eb9e3ae8b5d113c04396194feda5d2070b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:43:10 +0200 Subject: [PATCH 4/4] python312Packages.playwrightcapture: 1.24.6 -> 1.24.7 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.24.6...v1.24.7 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.24.7 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 36c701b1a49f..37766343c269 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.24.6"; + version = "1.24.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-DFMnlFN9CooQ7HBiw6Ur6KMTMrEw6JxkT6IxlVU+PdY="; + hash = "sha256-mCwV5rgJLns4LvCVwnGAJeqs426GK/8rfp93YKH34VA="; }; pythonRelaxDeps = [