mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #51914 from dotlambda/home-assistant-python37

Browse source 
home-assistant: use python37
This commit is contained in:
Franz Pletz 2018-12-19 19:32:11 +00:00 committed by GitHub
parent df90fdf62b 00a9057f75
commit 65dfc2b272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/python-modules/ruamel_yaml/default.nix
View file

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, ruamel_base , ruamel_base
, typing
, ruamel_ordereddict , ruamel_ordereddict
, isPy3k , isPy3k
}: }:
@ -19,7 +18,7 @@ buildPythonPackage rec {
# Tests cannot load the module to test # Tests cannot load the module to test
doCheck = false; doCheck = false;
propagatedBuildInputs = [ ruamel_base typing ] propagatedBuildInputs = [ ruamel_base ]
++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict; ++ stdenv.lib.optional (!isPy3k) ruamel_ordereddict;
meta = with stdenv.lib; { meta = with stdenv.lib; {

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

@ -13549,9 +13549,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 { };