From b376ec113b8bab7b4dbae054bd2805e501e1a6f0 Mon Sep 17 00:00:00 2001 From: Yannik Rödel Date: Tue, 19 Jul 2022 13:25:52 +0200 Subject: 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(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 5dd4d60cbde79..369c859db51b8 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; -- cgit 1.4.1 From 2f431d194940bcced4469187ee3e031b276f0542 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Feb 2023 01:29:10 +0000 Subject: jackett: 0.20.3004 -> 0.20.3017 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/servers') diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ae8b8eacabe48..cebf1249e59af 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.3004"; + version = "0.20.3017"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-UNGkcCQeeMxonJ9Kf1SDMTgSC8uTM2gD377qA+ViSfpWoOGQCY003EZ0c3c0q6oSGVbiIma1wvyW/T/ILLi5yw=="; + hash = "sha512-Hc4EzHqydcBGbiQkr4Hhnfjly9CwaCJXau7WwBb/T+qYdCkOKwrGeuNr3UEMP2x4dth+713HQRrgXviQo+jJlw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; -- cgit 1.4.1