From a22e908e854e880fe0907c1242c05450602489e8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 24 Jan 2026 19:38:40 +0200 Subject: [PATCH 1/3] brotab: replace susbstitution with pythonRelaxDeps --- pkgs/by-name/br/brotab/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix index 90000a4e1264..a46bc6f3b482 100644 --- a/pkgs/by-name/br/brotab/package.nix +++ b/pkgs/by-name/br/brotab/package.nix @@ -37,12 +37,11 @@ python3Packages.buildPythonApplication rec { setuptools ]; - postPatch = '' - substituteInPlace requirements/base.txt \ - --replace-fail "Flask==2.0.2" "Flask>=2.0.2" \ - --replace-fail "psutil==5.8.0" "psutil>=5.8.0" \ - --replace-fail "requests==2.24.0" "requests>=2.24.0" - ''; + pythonRelaxDeps = [ + "flask" + "psutil" + "requests" + ]; __darwinAllowLocalNetworking = true; From 341d164b89fa0fa0bba34f0e5f7db0cc764cd08f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 24 Jan 2026 20:03:49 +0200 Subject: [PATCH 2/3] brotab: install native messaging hosts files properly --- pkgs/by-name/br/brotab/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix index a46bc6f3b482..f34acc69bb54 100644 --- a/pkgs/by-name/br/brotab/package.nix +++ b/pkgs/by-name/br/brotab/package.nix @@ -43,6 +43,16 @@ python3Packages.buildPythonApplication rec { "requests" ]; + postInstall = '' + substituteInPlace $out/config/*json \ + --replace-fail '$PWD/brotab_mediator.py' $out/bin/bt_mediator + mkdir -p $out/lib/mozilla/native-messaging-hosts + mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts + mkdir -p $out/etc/chromium/native-messaging-hosts + mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts + rmdir $out/config + ''; + __darwinAllowLocalNetworking = true; nativeCheckInputs = with python3Packages; [ From d5588763c0abd08f326dc95b5a4b79f343a6429e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 24 Jan 2026 19:34:16 +0200 Subject: [PATCH 3/3] brotab: 1.4.2 -> 1.5.0 Diff: https://github.com/balta2ar/brotab/compare/1.4.2...1.5.0 --- pkgs/by-name/br/brotab/package.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix index f34acc69bb54..61cbf7603302 100644 --- a/pkgs/by-name/br/brotab/package.nix +++ b/pkgs/by-name/br/brotab/package.nix @@ -1,31 +1,21 @@ { lib, fetchFromGitHub, - fetchpatch, python3Packages, }: python3Packages.buildPythonApplication rec { pname = "brotab"; - version = "1.4.2"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "balta2ar"; repo = "brotab"; tag = version; - hash = "sha256-HKKjiW++FwjdorqquSCIdi1InE6KbMbFKZFYHBxzg8Q="; + hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28="; }; - patches = [ - # https://github.com/balta2ar/brotab/pull/102 - (fetchpatch { - name = "remove-unnecessary-pip-import.patch"; - url = "https://github.com/balta2ar/brotab/commit/825cd48f255c911aabbfb495f6b8fc73f27d3fe5.patch"; - hash = "sha256-IN28AOLPKPUc3KkxIGFMpZNNXA1+O12NxS+Hl4KMXbg="; - }) - ]; - build-system = with python3Packages; [ setuptools ]; @@ -34,6 +24,7 @@ python3Packages.buildPythonApplication rec { flask psutil requests + werkzeug setuptools ]; @@ -41,6 +32,8 @@ python3Packages.buildPythonApplication rec { "flask" "psutil" "requests" + "werkzeug" + "setuptools" ]; postInstall = '' @@ -50,6 +43,8 @@ python3Packages.buildPythonApplication rec { mv $out/config/firefox_mediator.json $out/lib/mozilla/native-messaging-hosts mkdir -p $out/etc/chromium/native-messaging-hosts mv $out/config/chromium_mediator.json $out/etc/chromium/native-messaging-hosts + mkdir -p $out/lib/albert + mv $out/config/Brotab.qss $out/lib/albert rmdir $out/config '';