From f35531bc9e200e386df0806a76b2acb448bcd49d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 12:24:46 +0200 Subject: [PATCH 1/3] python312Packages.asteval: refactor --- .../development/python-modules/asteval/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 0fc6631dd590..e9cec51c3728 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,23 +9,23 @@ buildPythonPackage rec { pname = "asteval"; version = "0.9.31"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "newville"; - repo = pname; + owner = "lmfit"; + repo = "asteval"; rev = "refs/tags/${version}"; hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace " --cov=asteval --cov-report xml" "" + --replace-fail " --cov=asteval --cov-report xml" "" ''; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; @@ -44,8 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "AST evaluator of Python expression using ast module"; - homepage = "https://github.com/newville/asteval"; - changelog = "https://github.com/newville/asteval/releases/tag/${version}"; + homepage = "https://github.com/lmfit/asteval"; + changelog = "https://github.com/lmfit/asteval/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From db1732a6af7f7cf87c307d32c6577b45eb95fc65 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 12:25:26 +0200 Subject: [PATCH 2/3] python312Packages.asteval: 0.9.31 -> 0.9.32 Diff: https://github.com/lmfit/asteval/compare/refs/tags/0.9.31...0.9.32 Changelog: https://github.com/lmfit/asteval/releases/tag/0.9.32 --- pkgs/development/python-modules/asteval/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index e9cec51c3728..866f6f378d51 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "asteval"; - version = "0.9.31"; + version = "0.9.32"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; + hash = "sha256-3eML5lEKEUlp3Fwdgvk31an83x8no5ichskKvzYJDsE="; }; postPatch = '' From 7429e993a7012f17881dd6b13a1d72dd3ae97354 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 12:25:37 +0200 Subject: [PATCH 3/3] python312Packages.asteval: format with nixfmt --- .../python-modules/asteval/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 866f6f378d51..d625dfe3448e 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools-scm, }: buildPythonPackage rec { @@ -25,17 +26,11 @@ buildPythonPackage rec { --replace-fail " --cov=asteval --cov-report xml" "" ''; - build-system = [ - setuptools-scm - ]; + build-system = [ setuptools-scm ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "asteval" - ]; + pythonImportsCheck = [ "asteval" ]; disabledTests = [ # AssertionError: 'ImportError' != None