diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-23 15:02:23 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-11-23 15:14:31 +0100 |
| commit | 2fb90e57fd8f3342d72d4176df24d9981da1bacd (patch) | |
| tree | ff41cf75353e8b91254117502248078d50f98c58 | |
| parent | 4470dd9902befc20f2f24363e2f19b988f50dd6c (diff) | |
| download | nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar.gz nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar.bz2 nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar.lz nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar.xz nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.tar.zst nixpkgs-2fb90e57fd8f3342d72d4176df24d9981da1bacd.zip | |
home-assistant: pin to python 3.6
| -rw-r--r-- | pkgs/servers/home-assistant/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 69292e03d0b..c09aeb0f33f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3 +{ lib, fetchFromGitHub, fetchpatch, python # Look up dependencies of specified components in component-packages.nix , extraComponents ? [] @@ -52,7 +52,7 @@ let (mkOverride "colorlog" "3.1.4" "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d") - # hass-frontend does not exist in python3.pkgs + # hass-frontend does not exist in python.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; }) @@ -68,7 +68,7 @@ let }); }; - py = python3.override { + py = python.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bce8a01998..09f566ccd7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13360,7 +13360,9 @@ with pkgs; hiawatha = callPackage ../servers/http/hiawatha {}; - home-assistant = callPackage ../servers/home-assistant { }; + home-assistant = callPackage ../servers/home-assistant { + python = python36; + }; hydron = callPackage ../servers/hydron { }; |