From 99fd96f6a81de3f281763371fba289c3925c3f7c Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 7 Apr 2021 15:04:07 +0200
Subject: [PATCH 1/2] pythonPackages.bokeh: add comment to update together with
 panel

---
 pkgs/development/python-modules/bokeh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 091b020efc25..9375aa22a3fe 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "2.2.3";
+  version = "2.2.3";  # update together with panel which is not straightforward
 
   src = fetchPypi {
     inherit pname version;

From ab79e89081eb7ed0730314c8382a292c5a00e31b Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 3 Apr 2021 17:27:32 +0200
Subject: [PATCH 2/2] zigbee2mqtt: add upgrade warning

---
 pkgs/servers/zigbee2mqtt/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix
index 85465fd7d145..2a7c31a47a0f 100644
--- a/pkgs/servers/zigbee2mqtt/default.nix
+++ b/pkgs/servers/zigbee2mqtt/default.nix
@@ -3,6 +3,8 @@ let
   package = (import ./node.nix { inherit pkgs system; }).package;
 in
 package.override rec {
+  # don't upgrade! Newer versions cause stack overflows and fail trunk-combined
+  # see https://github.com/NixOS/nixpkgs/pull/118400
   version = "1.16.2";
   reconstructLock = true;