diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-25 11:51:55 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-25 11:51:55 +0200 |
commit | 3d00d8e4eebbaf41b28163aa1bcf344084b084a4 (patch) | |
tree | 70c548455ed31da834ffc4380750eb87153c6e17 /pkgs/servers/home-assistant/default.nix | |
parent | da6101d141ac3105c9048e73233b51dfa2bbbbc5 (diff) | |
download | nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.gz nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.bz2 nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.lz nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.xz nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.tar.zst nixpkgs-3d00d8e4eebbaf41b28163aa1bcf344084b084a4.zip |
pythonPackages.pyyaml_3: init , instead of multiple pyyaml overrides
Temporary attribute until we can get rid of it everywhere. This was triggered due to the libyaml 0.2.2 incompatibilty requiring patches and still not building.
Diffstat (limited to 'pkgs/servers/home-assistant/default.nix')
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d778e8df18f..511aff05dea 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -36,8 +36,6 @@ let "03f38115dccb266dd96538f94067442a877932c2322661bdc5bf2502c76658af") (mkOverride "python-slugify" "3.0.2" "57163ffb345c7e26063435a27add1feae67fa821f1ef4b2f292c25847575d758") - (mkOverride "pyyaml" "3.13" - "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") (mkOverride "ruamel_yaml" "0.15.94" @@ -63,6 +61,10 @@ let }; }) + (self: super: { + pyyaml = super.pyyaml_3; + }) + # hass-frontend does not exist in python3.pkgs (self: super: { hass-frontend = self.callPackage ./frontend.nix { }; @@ -78,7 +80,7 @@ let }; }); }; - + py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); |