From b376ec113b8bab7b4dbae054bd2805e501e1a6f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yannik=20R=C3=B6del?= Date: Tue, 19 Jul 2022 13:25:52 +0200 Subject: [PATCH] home-assistant: fix packageOverrides ordering As documented by lib.composeManyExtensions, overrides intended to be applied later should come last in the list. This commit switches the order to make sure that custom overrides are in fact evaluated after the default ones. Also, since the previous version was basically a reimplementation of composeManyExtensions anyway, switching to that makes it a bit cleaner. --- pkgs/servers/home-assistant/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5dd4d60cbde7..369c859db51b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -155,8 +155,7 @@ let }; python = python3.override { - # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); + packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; componentPackages = import ./component-packages.nix;