From 6d07fea2324e8e464287f301161d968d3dacf62e Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 08:03:16 +0800 Subject: [PATCH 1/3] forbidden: 12.6 -> 13.2 Diff: https://github.com/ivan-sincek/forbidden/compare/refs/tags/v12.6...refs/tags/v13.2 Changelog: https://github.com/ivan-sincek/forbidden/releases/tag/v13.2 --- pkgs/by-name/fo/forbidden/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index b5fea8aad7ed..89dce3735a03 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -1,24 +1,22 @@ { lib, - fetchFromGitHub, python3, + fetchFromGitHub, }: python3.pkgs.buildPythonApplication rec { pname = "forbidden"; - version = "12.6"; + version = "13.2"; pyproject = true; src = fetchFromGitHub { owner = "ivan-sincek"; repo = "forbidden"; tag = "v${version}"; - hash = "sha256-KE2FHn0ocAna5ReRi9re/u8gdNVkCygSbSRj8gEudgI="; + hash = "sha256-DQ8zjiLTgBBoqp8AP5BYULz4KGnVEt8e7bkfYRGWvFw="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ alive-progress @@ -29,18 +27,20 @@ python3.pkgs.buildPythonApplication rec { requests tabulate termcolor + bot-safe-agents + cryptography ]; pythonImportsCheck = [ "forbidden" ]; - meta = with lib; { + meta = { description = "Tool to bypass 4xx HTTP response status code"; homepage = "https://github.com/ivan-sincek/forbidden"; changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "forbidden"; }; } From 28a7973a31e5e54aeeebd09568e830ab2fb61a08 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 08:15:30 +0800 Subject: [PATCH 2/3] python313Packages.bot-safe-agents: init at 1.0 --- .../bot-safe-agents/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/bot-safe-agents/default.nix diff --git a/pkgs/development/python-modules/bot-safe-agents/default.nix b/pkgs/development/python-modules/bot-safe-agents/default.nix new file mode 100644 index 000000000000..db9e87a6fe3e --- /dev/null +++ b/pkgs/development/python-modules/bot-safe-agents/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "bot-safe-agents"; + version = "1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ivan-sincek"; + repo = "bot-safe-agents"; + tag = "v${version}"; + hash = "sha256-XO7iCZ7Dik7CmeFPwmMZf5K4COT5mRhDZMTsQxfR45c="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "bot_safe_agents" ]; + + meta = { + description = "Library for fetching a list of bot-safe user agents"; + homepage = "https://github.com/ivan-sincek/bot-safe-agents"; + changelog = "https://github.com/ivan-sincek/bot-safe-agents/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ebcbb4eefda6..f84f777ff502 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2009,6 +2009,8 @@ self: super: with self; { bottombar = callPackage ../development/python-modules/bottombar { }; + bot-safe-agents = callPackage ../development/python-modules/bot-safe-agents { }; + bpemb = callPackage ../development/python-modules/bpemb { }; bpylist2 = callPackage ../development/python-modules/bpylist2 { }; From 30d98e60da1f5359da530f42a75b55b56c425ec6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 28 Apr 2025 10:19:45 +0200 Subject: [PATCH 3/3] forbidden: refactor --- pkgs/by-name/fo/forbidden/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fo/forbidden/package.nix b/pkgs/by-name/fo/forbidden/package.nix index 89dce3735a03..5f3b25083c25 100644 --- a/pkgs/by-name/fo/forbidden/package.nix +++ b/pkgs/by-name/fo/forbidden/package.nix @@ -1,7 +1,7 @@ { lib, - python3, fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -20,25 +20,26 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ alive-progress + bot-safe-agents colorama + cryptography pycurl pyjwt regex requests tabulate termcolor - bot-safe-agents - cryptography ]; - pythonImportsCheck = [ - "forbidden" - ]; + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "forbidden" ]; meta = { description = "Tool to bypass 4xx HTTP response status code"; homepage = "https://github.com/ivan-sincek/forbidden"; - changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/v${version}"; + changelog = "https://github.com/ivan-sincek/forbidden/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "forbidden";