public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "home-assistant: pin to python 3.6"

Browse Source 
This reverts commit 2fb90e57fd8f3342d72d4176df24d9981da1bacd.
Home Assistant now builds fine with Python 3.7.
This commit is contained in:
Robert Schütz 2018-12-12 14:01:39 +01:00
parent cee5f2b622
commit 00a9057f75
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/home-assistant/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, python { lib, fetchFromGitHub, fetchpatch, python3
# Look up dependencies of specified components in component-packages.nix # Look up dependencies of specified components in component-packages.nix
, extraComponents ? [] , extraComponents ? []
@ -52,7 +52,7 @@ let
(mkOverride "colorlog" "3.1.4" (mkOverride "colorlog" "3.1.4"
"418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d") "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d")
# hass-frontend does not exist in python.pkgs # hass-frontend does not exist in python3.pkgs
(self: super: { (self: super: {
hass-frontend = self.callPackage ./frontend.nix { }; hass-frontend = self.callPackage ./frontend.nix { };
}) })
@ -68,7 +68,7 @@ let
}); });
}; };
py = python.override { py = python3.override {
# Put packageOverrides at the start so they are applied after defaultOverrides # Put packageOverrides at the start so they are applied after defaultOverrides
packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);
}; };

4
pkgs/top-level/all-packages.nix
View File

@ -13498,9 +13498,7 @@ in
hiawatha = callPackage ../servers/http/hiawatha {}; hiawatha = callPackage ../servers/http/hiawatha {};
home-assistant = callPackage ../servers/home-assistant { home-assistant = callPackage ../servers/home-assistant { };
python = python36;
};
hydron = callPackage ../servers/hydron { }; hydron = callPackage ../servers/hydron { };