From d3d6ff63f14075197b19bfe3ee865becbd051e86 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Fri, 6 Nov 2026 05:09:27 +0000 Subject: [PATCH] frappix: bump to 474adcf, drop insights mysqlclient override Upstream now ships mysqlclient with insights (kurogeek/frappix 474adcf). --- flake.lock | 6 +++--- pkgs/frappix/overlay.nix | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 5d2df48d..78a91cd1 100644 --- a/flake.lock +++ b/flake.lock @@ -464,11 +464,11 @@ "std": "std" }, "locked": { - "lastModified": 1789106589, - "narHash": "sha256-RMQdAvDaa4eUcdePDqUGAhnyTtzKxc6a8abauy8bzb0=", + "lastModified": 1793940934, + "narHash": "sha256-upFVzpfpKUqk52/daFyoRaFmJ5kQ3k3X4a4AY9fHrjU=", "owner": "kurogeek", "repo": "frappix", - "rev": "dbfa76d84df6354bd7528c9d0c407387f66c3e33", + "rev": "474adcf78b4438bc68f300be8b5732be638694e1", "type": "github" }, "original": { diff --git a/pkgs/frappix/overlay.nix b/pkgs/frappix/overlay.nix index f28b62ac..0ade3c6a 100644 --- a/pkgs/frappix/overlay.nix +++ b/pkgs/frappix/overlay.nix @@ -2,15 +2,8 @@ # Must be applied after frappixFrappeOverlay (needs prev.frappix). final: prev: { frappix = prev.frappix.overrideScope ( - ffinal: fprev: { + ffinal: _fprev: { default_thai_company = ffinal.callPackage ./default-thai-company.nix { }; - - # insights' after_migrate hook opens the "Site DB" data source via - # ibis.mysql, whose backend imports MySQLdb (mysqlclient) since ibis 10. - # Upstream frappix only ships ibis-framework without the mysql extra. - insights = fprev.insights.overridePythonAttrs (old: { - dependencies = old.dependencies ++ [ final.python3.pkgs.mysqlclient ]; - }); } ); }