Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 19e8aa6f1336
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0734f95e2566
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 17, 2021

  1. python3Packages.zigpy: 0.29.0 -> 0.30.0

    @mweinelt
    mweinelt committed Jan 17, 2021
    Copy the full SHA
    06dcf42 View commit details

  2. home-assistant: 2021.1.3 -> 2021.1.4

    @mweinelt
    mweinelt committed Jan 17, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    db4cdb0 View commit details

  3. Merge pull request #109605 from mweinelt/home-assistant 

    home-assistant: 2021.1.3 -> 2021.1.4 (+zigpy)
    @mweinelt
    mweinelt authored Jan 17, 2021
    Copy the full SHA
    0734f95 View commit details
Showing with 7 additions and 5 deletions.
  1. +2 −2 pkgs/development/python-modules/zigpy/default.nix
  2. +1 −1 pkgs/servers/home-assistant/component-packages.nix
  3. +4 −2 pkgs/servers/home-assistant/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/zigpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,13 +15,13 @@

buildPythonPackage rec {
pname = "zigpy";
version = "0.29.0";
version = "0.30.0";

src = fetchFromGitHub {
owner = "zigpy";
repo = "zigpy";
rev = version;
sha256 = "1r4i2ya9f241rls9mi24dksx4srrzi8agshnqy12rclxlh7qb1aw";
sha256 = "14qyxm7bj62fsvxfp6x3r1ygjlv7q3jjvq6gzj30na78x1fqr9g1";
};

propagatedBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/component-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# Do not edit!

{
version = "2021.1.3";
version = "2021.1.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
6 changes: 4 additions & 2 deletions pkgs/servers/home-assistant/default.nix
View file
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ let
extraBuildInputs = extraPackages py.pkgs;

# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.1.3";
hassVersion = "2021.1.4";

in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -76,7 +76,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "168njrzvqr3wn1xk02q1yn1f90mf1hds6m8lffgkql8m6a6576hn";
sha256 = "03aa7kd216rnp8h80nv002ahafiy0031lxk1bkwcirrznphcw7sj";
};

# leave this in, so users don't have to constantly update their downstream patch handling
@@ -179,6 +179,8 @@ in with py.pkgs; buildPythonApplication rec {
# keyring.errors.NoKeyringError: No recommended backend was available.
"test_secrets_from_unrelated_fails"
"test_secrets_credstash"
# RuntimeError: Event loop is closed
"test_remove_older_logs"
];

preCheck = ''