From 98028b791b722d7ceca5df8622686ca78f989f5f Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 18:51:53 +0200 Subject: [PATCH 1/2] python3Packages.objexplore: refactor - Sort inputs - Replace `substituteInPlace` with `pythonRelaxDeps` - Change `with lib;` to smaller with statements (license, maintainers) - Use `refs/tags` for version --- .../python-modules/objexplore/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/objexplore/default.nix b/pkgs/development/python-modules/objexplore/default.nix index 189af2fc0515..25e63a706c8f 100644 --- a/pkgs/development/python-modules/objexplore/default.nix +++ b/pkgs/development/python-modules/objexplore/default.nix @@ -1,13 +1,13 @@ { - blessed, - buildPythonPackage, - fetchFromGitHub, lib, - pandas, - pytestCheckHook, + buildPythonPackage, pythonOlder, - rich, + fetchFromGitHub, setuptools, + blessed, + rich, + pytestCheckHook, + pandas }: buildPythonPackage rec { @@ -20,14 +20,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kylepollina"; repo = "objexplore"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-FFQIiip7pk9fQhjGLxMSMakwoXbzaUjXcbQgDX52dnI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail '==' '>=' - ''; + pythonRelaxDeps = [ "blessed" "rich" ]; build-system = [ setuptools ]; @@ -53,10 +50,10 @@ buildPythonPackage rec { "objexplore.utils" ]; - meta = with lib; { + meta = { description = "Terminal UI to interactively inspect and explore Python objects"; homepage = "https://github.com/kylepollina/objexplore"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; }; } From af0baa47c1fe4b725c0fd9e4933695cb924c7ff9 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 20 Jul 2024 18:54:08 +0200 Subject: [PATCH 2/2] python3Packages.objexplore: add sigmanificient to maintainers --- pkgs/development/python-modules/objexplore/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/objexplore/default.nix b/pkgs/development/python-modules/objexplore/default.nix index 25e63a706c8f..cb92538340f6 100644 --- a/pkgs/development/python-modules/objexplore/default.nix +++ b/pkgs/development/python-modules/objexplore/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Terminal UI to interactively inspect and explore Python objects"; homepage = "https://github.com/kylepollina/objexplore"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pbsds ]; + maintainers = with lib.maintainers; [ pbsds sigmanificient ]; }; }