Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

home-assistant: use python37 #51914

Merged
merged 2 commits into from
Dec 19, 2018
Merged

home-assistant: use python37 #51914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee5f2b
python.pkgs.ruamel_yaml: do not depend on typing
Dec 12, 2018
00a9057
Revert "home-assistant: pin to python 3.6"
Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/ruamel_yaml/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, buildPythonPackage
, fetchPypi
, ruamel_base
, typing
, ruamel_ordereddict
, isPy3k
}:
Expand All @@ -19,7 +18,7 @@ buildPythonPackage rec {
# Tests cannot load the module to test
doCheck = false;

propagatedBuildInputs = [ ruamel_base typing ]
propagatedBuildInputs = [ ruamel_base ]
++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict;

meta = with stdenv.lib; {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/servers/home-assistant/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, python
{ lib, fetchFromGitHub, fetchpatch, python3

# Look up dependencies of specified components in component-packages.nix
, extraComponents ? []
Expand Down Expand Up @@ -52,7 +52,7 @@ let
(mkOverride "colorlog" "3.1.4"
"418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d")

# hass-frontend does not exist in python.pkgs
# hass-frontend does not exist in python3.pkgs
(self: super: {
hass-frontend = self.callPackage ./frontend.nix { };
})
Expand All @@ -68,7 +68,7 @@ let
});
};

py = python.override {
py = python3.override {
# Put packageOverrides at the start so they are applied after defaultOverrides
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
};
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13498,9 +13498,7 @@ in

hiawatha = callPackage ../servers/http/hiawatha {};

home-assistant = callPackage ../servers/home-assistant {
python = python36;
};
home-assistant = callPackage ../servers/home-assistant { };

hydron = callPackage ../servers/hydron { };

Expand Down