From d0ed0ee3399a109c2e7027f0c8c16f2b629fad9e Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 8 Feb 2024 21:33:34 -0500 Subject: [PATCH] Override to use empy 3.3.4 Empy 4.0 has many breaking changes and is not supported by ROS. Fixes: #340 --- distros/distro-overlay.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/distros/distro-overlay.nix b/distros/distro-overlay.nix index 6f925b9049..f59b6cd785 100644 --- a/distros/distro-overlay.nix +++ b/distros/distro-overlay.nix @@ -2,8 +2,19 @@ self: super: let pythonOverridesFor = with self.lib; prevPython: prevPython // { - pkgs = prevPython.pkgs.overrideScope (pyFinal: pyPrev: optionalAttrs pyPrev.isPy3k { + pkgs = prevPython.pkgs.overrideScope (pyFinal: pyPrev: { wxPython = pyFinal.wxPython_4_2; + + # ROS is not compatible with empy 4 + empy = pyPrev.empy.overrideAttrs ({ + pname, ... + }: rec { + version = "3.3.4"; + src = pyFinal.fetchPypi { + inherit pname version; + hash = "sha256-c6xJeFtgFHnfTqGKfHm8EwSop8NMArlHLPEgauiPAbM="; + }; + }); }); };