From c1936ac744ff916ce4f27079cd23a1d7ca0e6f57 Mon Sep 17 00:00:00 2001 From: 0xthefr34k Date: Tue, 11 Mar 2025 21:09:27 +0000 Subject: [PATCH 1/5] 4.3.9 -> 4.3.10 --- pkgs/by-name/ex/exegol/package.nix | 38 ++++++++++-------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 5a1b997d84ea..1103f124edbe 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -1,32 +1,20 @@ -{ - fetchPypi, - lib, - python3, - xorg, -}: +{ fetchPypi, lib, python3, xorg, }: python3.pkgs.buildPythonApplication rec { pname = "exegol"; - version = "4.3.9"; - format = "setuptools"; + version = "4.3.10"; + format = "pyproject"; - # Project has no unit tests - doCheck = false; + doCheck = true; + pythonRelaxDeps = true; - propagatedBuildInputs = - with python3.pkgs; - [ - pyyaml - gitpython - docker - requests - rich - argcomplete - ] - ++ [ xorg.xhost ]; + nativeBuildInputs = with python3.pkgs; [ pdm-backend ]; + + propagatedBuildInputs = with python3.pkgs; + [ pyyaml gitpython docker requests rich argcomplete ] ++ [ xorg.xhost ]; src = fetchPypi { inherit pname version; - hash = "sha256-CoPQMEk8eagYU/TfaPAM6ItfSCZbrvzUww8H9ND8VUk="; + hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; }; meta = with lib; { @@ -43,9 +31,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}"; license = licenses.gpl3Only; mainProgram = "exegol"; - maintainers = with maintainers; [ - _0b11stan - charB66 - ]; + maintainers = with maintainers; [ _0b11stan charB66 ]; }; } + From b4480a2f752373a902cfac615ca9adb4d8e243a2 Mon Sep 17 00:00:00 2001 From: 0xthefr34k Date: Tue, 11 Mar 2025 19:19:36 -0400 Subject: [PATCH 2/5] exegol: 4.3.9 -> 4.3.10 --- pkgs/by-name/ex/exegol/package.nix | 33 +++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 1103f124edbe..260e4af963e5 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -1,22 +1,39 @@ -{ fetchPypi, lib, python3, xorg, }: +{ + fetchPypi, + lib, + python3, + xorg, +}: python3.pkgs.buildPythonApplication rec { pname = "exegol"; version = "4.3.10"; format = "pyproject"; - doCheck = true; - pythonRelaxDeps = true; + pythonRelaxDeps = [ + "rich" + ]; nativeBuildInputs = with python3.pkgs; [ pdm-backend ]; - propagatedBuildInputs = with python3.pkgs; - [ pyyaml gitpython docker requests rich argcomplete ] ++ [ xorg.xhost ]; + propagatedBuildInputs = + with python3.pkgs; + [ + pyyaml + gitpython + docker + requests + rich + argcomplete + ] + ++ [ xorg.xhost ]; src = fetchPypi { inherit pname version; hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; }; + doCheck = true; + meta = with lib; { description = "Fully featured and community-driven hacking environment"; longDescription = '' @@ -31,7 +48,9 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}"; license = licenses.gpl3Only; mainProgram = "exegol"; - maintainers = with maintainers; [ _0b11stan charB66 ]; + maintainers = with maintainers; [ + _0b11stan + charB66 + ]; }; } - From 1d1e26669a96f40164b5466ba81dd11caafb34b0 Mon Sep 17 00:00:00 2001 From: 0xTheFr34k <57847472+0xTheFr34k@users.noreply.github.com> Date: Wed, 12 Mar 2025 13:49:58 +0000 Subject: [PATCH 3/5] exegol: 4.3.9 -> 4.3.10 Co-authored-by: Sarah Clark --- pkgs/by-name/ex/exegol/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 260e4af963e5..54c4e9efd4a6 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "exegol"; version = "4.3.10"; - format = "pyproject"; + pyproject = true; pythonRelaxDeps = [ "rich" From 4cacc74b83fd08a3c84c6567218905ca0b3c6e51 Mon Sep 17 00:00:00 2001 From: 0xthefr34k Date: Wed, 12 Mar 2025 14:22:05 +0000 Subject: [PATCH 4/5] exegol: 4.3.9 -> 4.3.10 adding the tzlocal for darwin arch --- pkgs/by-name/ex/exegol/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 54c4e9efd4a6..c29355dd4343 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -24,6 +24,7 @@ python3.pkgs.buildPythonApplication rec { requests rich argcomplete + tzlocal ] ++ [ xorg.xhost ]; From db302ff3cfc7333116baf4167c9a2d8746ccff6e Mon Sep 17 00:00:00 2001 From: 0xthefr34k Date: Wed, 12 Mar 2025 16:44:28 +0000 Subject: [PATCH 5/5] exegol: 4.3.9 -> 4.3.10 --- pkgs/by-name/ex/exegol/package.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index c29355dd4343..66dd61875dc9 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -1,22 +1,27 @@ { fetchPypi, lib, - python3, + python3Packages, xorg, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "exegol"; version = "4.3.10"; pyproject = true; + src = fetchPypi { + inherit pname version; + hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; + }; + + build-system = with python3Packages; [ pdm-backend ]; + pythonRelaxDeps = [ "rich" ]; - nativeBuildInputs = with python3.pkgs; [ pdm-backend ]; - - propagatedBuildInputs = - with python3.pkgs; + dependencies = + with python3Packages; [ pyyaml gitpython @@ -28,13 +33,10 @@ python3.pkgs.buildPythonApplication rec { ] ++ [ xorg.xhost ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-BtOW7EBbFil7yyhL6uayTUUkDldI8+xxolfQZtX+00c="; - }; - doCheck = true; + pythonImportsCheck = [ "exegol" ]; + meta = with lib; { description = "Fully featured and community-driven hacking environment"; longDescription = '' @@ -47,9 +49,9 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/ThePorgs/Exegol"; changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "exegol"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ _0b11stan charB66 ];