From 1e331e9dbff0a1a2da78668a06f2fb7d65d6a868 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Sun, 5 Apr 2026 16:26:08 -0700 Subject: [PATCH] python3Packages.jfx-bridge: drop --- .../python-modules/jfx-bridge/default.nix | 52 ------------------- .../jfx-bridge/no-invoke-git.patch | 13 ----- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 4 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 pkgs/development/python-modules/jfx-bridge/default.nix delete mode 100644 pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch diff --git a/pkgs/development/python-modules/jfx-bridge/default.nix b/pkgs/development/python-modules/jfx-bridge/default.nix deleted file mode 100644 index 2c261be4b96a..000000000000 --- a/pkgs/development/python-modules/jfx-bridge/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - pytestCheckHook, - python, - setuptools, -}: - -buildPythonPackage rec { - pname = "jfx-bridge"; - version = "1.0.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "justfoxing"; - repo = "jfx_bridge"; - tag = version; - hash = "sha256-fpUrKNGqTpthhTfohCbwO1GBDAP/YnLWeapVhZftldg="; - }; - - patches = [ ./no-invoke-git.patch ]; - - postPatch = '' - substituteInPlace ./setup.py --subst-var-by version ${version} - ''; - - build-system = [ setuptools ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - preCheck = '' - ${python.interpreter} test_bridge_server.py & - ''; - - disabledTests = [ - # known to cause timeout with newer python (acknowledged in test comment) - "test_nonreturn_marker_local" - # the mechanisms that hook into the python import machinery seem broken on newer python - "TestBridgeHookImport" - ]; - - pythonImportsCheck = [ "jfx_bridge" ]; - - meta = { - description = "Base Python RPC bridge used for ghidra_bridge"; - homepage = "https://github.com/justfoxing/jfx_bridge"; - changelog = "https://github.com/justfoxing/jfx_bridge/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ scoder12 ]; - }; -} diff --git a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch b/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch deleted file mode 100644 index 2c1f53ca2d6c..000000000000 --- a/pkgs/development/python-modules/jfx-bridge/no-invoke-git.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 079cb01..c5e71b8 100644 ---- a/setup.py -+++ b/setup.py -@@ -6,7 +6,7 @@ with open("README.md", "r") as fh: - long_description = fh.read() - - # determine the version, then write it out into the bridge.py file --version = subprocess.check_output("git describe --tags", shell=True).decode("utf-8").strip() -+version = "@version@" - # check if this is a non-tag release and remark it as a dev release - if "-" in version: - ver, commits, hash = version.split("-") diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4527c21e2e45..5dc3ae361d00 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -272,6 +272,7 @@ mapAliases { jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29 jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29 JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29 + jfx-bridge = throw "'jfx-bridge' has been removed as it was unmaintained upstream"; # Added 2026-04-05 jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29 jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29 JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0123a8767605..57fa745aa87d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7859,8 +7859,6 @@ self: super: with self; { jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - jfx-bridge = callPackage ../development/python-modules/jfx-bridge { }; - jh2 = callPackage ../development/python-modules/jh2 { }; jianpu-ly = callPackage ../development/python-modules/jianpu-ly { };