From cee5f2b6229226706573bf8dd6c7b7f508be1992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Dec 2018 14:35:32 +0100 Subject: [PATCH 1/2] python.pkgs.ruamel_yaml: do not depend on typing The dependency was removed in version 0.14.9. --- pkgs/development/python-modules/ruamel_yaml/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 619b2fb5eb33..e10005fc2058 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , ruamel_base -, typing , ruamel_ordereddict , isPy3k }: @@ -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; { From 00a9057f750ddd512311b8627913dbec61a23d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 12 Dec 2018 14:01:39 +0100 Subject: [PATCH 2/2] Revert "home-assistant: pin to python 3.6" This reverts commit 2fb90e57fd8f3342d72d4176df24d9981da1bacd. Home Assistant now builds fine with Python 3.7. --- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 88b824530631..4ab5e79fd38b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python +{ lib, fetchFromGitHub, fetchpatch, python3 # 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 python.pkgs + # hass-frontend does not exist in python3.pkgs (self: super: { 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 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 b6e10ef78c2c..926fd40dcb1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };