diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-11 06:01:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-11 06:01:15 +0000 |
| commit | 63655bdaea6985faea18fcd604b011c065073781 (patch) | |
| tree | c5b10ae9c6ce15ae14070c6e8b40a0c9fca9dff8 /pkgs/servers | |
| parent | e969c56b62ba3d9114c6acd2ce125fe5848b8ee8 (diff) | |
| parent | 59101f53e21ed7e5db5ab566701936bf426015bc (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/jackett/default.nix | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 94ab3ab5b5090..921a6dccbc1b7 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -249,8 +249,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; 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"; |