Vladimír Čunát 09f5763784 Merge branch 'master' into staging-next ... Conflicts: - pkgs/development/python-modules/pathspec/default.nix The hashes are equivalent, so it's not a real conflict. - pkgs/top-level/static.nix I can't see a solution, deffered redoing this to the later PR: https://github.com/NixOS/nixpkgs/pull/136849		2021-09-07 08:43:26 +02:00
..
0001-tests-ignore-OSErrors-in-hass-fixture.patch	home-assistant: 2021.6.6 -> 2021.7.0	2021-07-23 00:27:16 +02:00
appdaemon.nix	pythonPackages: websocket_client -> websocket-client	2021-06-15 22:03:10 +02:00
cli.nix	home-assistant-cli: 0.9.3 -> 0.9.4	2021-06-22 13:42:54 +02:00
component-packages.nix	home-assistant: update component-packages	2021-09-07 00:00:36 +02:00
default.nix	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
frontend.nix	home-assistant: 2021.8.4 -> 2021.8.5	2021-08-10 13:25:15 +02:00
parse-requirements.py	home-assistant: don't treat frontend specially in parse-requirements.py	2021-06-16 10:36:20 +02:00
update.sh	home-assistant: 2021.7.4 -> 2021.8.3	2021-08-07 01:13:12 +02:00