commit 33be3c463022748449c46e4027d23ceb3d74671c · pyrox.dev/nixpkgs

+6 -3

nixos/tests/home-assistant.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         configDir = "/var/lib/foobar";

     

       5
       5
       -
         apiPassword = "secret";

     

       5
       5
       +
         apiPassword = "some_secret";

     

       6
       6
       +
         mqttPassword = "another_secret";

     

       6
       7
        
       

     

       7
       8
        
       in {

     

       8
       9
        
         name = "home-assistant";

     
···

       33
       34
        
                   };

     

       34
       35
        
                   frontend = { };

     

       35
       36
        
                   http.api_password = apiPassword;

     

       36
       36
       -
                   mqtt = { }; # Use hbmqtt as broker

     

       37
       37
       +
                   mqtt = { # Use hbmqtt as broker

     

       38
       38
       +
                     password = mqttPassword;

     

       39
       39
       +
                   };

     

       37
       40
        
                   binary_sensor = [

     

       38
       41
        
                     {

     

       39
       42
        
                       platform = "mqtt";

     
···

       62
       65
        
       

     

       63
       66
        
           # Toggle a binary sensor using MQTT

     

       64
       67
        
           $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"off\"'");

     

       65
       65
       -
           $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light");

     

       68
       68
       +
           $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light");

     

       66
       69
        
           $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");

     

       67
       70
        
       

     

       68
       71
        
           # Print log to ease debugging

+11 -5

pkgs/servers/home-assistant/component-packages.nix

···

       2
       2
        
       # Do not edit!

     

       3
       3
        
       

     

       4
       4
        
       {

     

       5
       5
       -
         version = "0.75.2";

     

       5
       5
       +
         version = "0.76.1";

     

       6
       6
        
         components = {

     

       7
       7
        
           "abode" = ps: with ps; [  ];

     

       8
       8
        
           "ads" = ps: with ps; [  ];

     
···

       112
       112
        
           "binary_sensor.netatmo" = ps: with ps; [  ];

     

       113
       113
        
           "binary_sensor.nx584" = ps: with ps; [  ];

     

       114
       114
        
           "binary_sensor.octoprint" = ps: with ps; [  ];

     

       115
       115
       +
           "binary_sensor.openuv" = ps: with ps; [  ];

     

       115
       116
        
           "binary_sensor.pilight" = ps: with ps; [  ];

     

       116
       117
        
           "binary_sensor.ping" = ps: with ps; [  ];

     

       117
       118
        
           "binary_sensor.qwikswitch" = ps: with ps; [  ];

     
···

       337
       338
        
           "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];

     

       338
       339
        
           "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];

     

       339
       340
        
           "device_tracker.ping" = ps: with ps; [  ];

     

       341
       341
       +
           "device_tracker.ritassist" = ps: with ps; [  ];

     

       340
       342
        
           "device_tracker.sky_hub" = ps: with ps; [  ];

     

       341
       343
        
           "device_tracker.snmp" = ps: with ps; [ pysnmp ];

     

       342
       344
        
           "device_tracker.swisscom" = ps: with ps; [  ];

     
···

       383
       385
        
           "fan.mqtt" = ps: with ps; [ paho-mqtt ];

     

       384
       386
        
           "fan.template" = ps: with ps; [  ];

     

       385
       387
        
           "fan.tuya" = ps: with ps; [  ];

     

       386
       386
       -
           "fan.velbus" = ps: with ps; [  ];

     

       387
       388
        
           "fan.wink" = ps: with ps; [  ];

     

       388
       389
        
           "fan.xiaomi_miio" = ps: with ps; [ construct ];

     

       389
       390
        
           "fan.zha" = ps: with ps; [  ];

     
···

       536
       537
        
           "light.tplink" = ps: with ps; [  ];

     

       537
       538
        
           "light.tradfri" = ps: with ps; [  ];

     

       538
       539
        
           "light.tuya" = ps: with ps; [  ];

     

       539
       539
       -
           "light.velbus" = ps: with ps; [  ];

     

       540
       540
        
           "light.vera" = ps: with ps; [  ];

     

       541
       541
        
           "light.wemo" = ps: with ps; [  ];

     

       542
       542
        
           "light.wink" = ps: with ps; [  ];

     
···

       600
       600
        
           "media_player.denon" = ps: with ps; [  ];

     

       601
       601
        
           "media_player.denonavr" = ps: with ps; [  ];

     

       602
       602
        
           "media_player.directv" = ps: with ps; [  ];

     

       603
       603
       +
           "media_player.dlna_dmr" = ps: with ps; [  ];

     

       603
       604
        
           "media_player.dunehd" = ps: with ps; [  ];

     

       604
       605
        
           "media_player.emby" = ps: with ps; [  ];

     

       605
       606
        
           "media_player.epson" = ps: with ps; [  ];

     
···

       625
       626
        
           "media_player.pandora" = ps: with ps; [ pexpect ];

     

       626
       627
        
           "media_player.philips_js" = ps: with ps; [  ];

     

       627
       628
        
           "media_player.pioneer" = ps: with ps; [  ];

     

       629
       629
       +
           "media_player.pjlink" = ps: with ps; [  ];

     

       628
       630
        
           "media_player.plex" = ps: with ps; [  ];

     

       629
       631
        
           "media_player.roku" = ps: with ps; [  ];

     

       630
       632
        
           "media_player.russound_rio" = ps: with ps; [  ];

     
···

       691
       693
        
           "notify.gntp" = ps: with ps; [  ];

     

       692
       694
        
           "notify.group" = ps: with ps; [  ];

     

       693
       695
        
           "notify.hipchat" = ps: with ps; [  ];

     

       694
       694
       -
           "notify.html5" = ps: with ps; [ pyjwt aiohttp-cors ];

     

       696
       696
       +
           "notify.html5" = ps: with ps; [ aiohttp-cors ];

     

       695
       697
        
           "notify.instapush" = ps: with ps; [  ];

     

       696
       698
        
           "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ];

     

       697
       699
        
           "notify.joaoapps_join" = ps: with ps; [  ];

     
···

       723
       725
        
           "notify.synology_chat" = ps: with ps; [  ];

     

       724
       726
        
           "notify.syslog" = ps: with ps; [  ];

     

       725
       727
        
           "notify.telegram" = ps: with ps; [ python-telegram-bot ];

     

       726
       726
       -
           "notify.telstra" = ps: with ps; [  ];

     

       727
       728
        
           "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];

     

       728
       729
        
           "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];

     

       729
       730
        
           "notify.twitter" = ps: with ps; [  ];

     
···

       736
       737
        
           "onboarding" = ps: with ps; [ aiohttp-cors ];

     

       737
       738
        
           "onboarding.const" = ps: with ps; [  ];

     

       738
       739
        
           "onboarding.views" = ps: with ps; [  ];

     

       740
       740
       +
           "openuv" = ps: with ps; [  ];

     

       739
       741
        
           "panel_custom" = ps: with ps; [ aiohttp-cors ];

     

       740
       742
        
           "panel_iframe" = ps: with ps; [ aiohttp-cors ];

     

       741
       743
        
           "persistent_notification" = ps: with ps; [  ];

     
···

       850
       852
        
           "sensor.eliqonline" = ps: with ps; [  ];

     

       851
       853
        
           "sensor.emoncms" = ps: with ps; [  ];

     

       852
       854
        
           "sensor.enocean" = ps: with ps; [  ];

     

       855
       855
       +
           "sensor.enphase_envoy" = ps: with ps; [  ];

     

       853
       856
        
           "sensor.envirophat" = ps: with ps; [  ];

     

       854
       857
        
           "sensor.envisalink" = ps: with ps; [  ];

     

       855
       858
        
           "sensor.etherscan" = ps: with ps; [  ];

     
···

       942
       945
        
           "sensor.openexchangerates" = ps: with ps; [  ];

     

       943
       946
        
           "sensor.openhardwaremonitor" = ps: with ps; [  ];

     

       944
       947
        
           "sensor.opensky" = ps: with ps; [  ];

     

       948
       948
       +
           "sensor.openuv" = ps: with ps; [  ];

     

       945
       949
        
           "sensor.openweathermap" = ps: with ps; [ pyowm ];

     

       946
       950
        
           "sensor.otp" = ps: with ps; [  ];

     

       947
       951
        
           "sensor.pi_hole" = ps: with ps; [  ];

     
···

       965
       969
        
           "sensor.rfxtrx" = ps: with ps; [  ];

     

       966
       970
        
           "sensor.ring" = ps: with ps; [  ];

     

       967
       971
        
           "sensor.ripple" = ps: with ps; [  ];

     

       972
       972
       +
           "sensor.rmvtransport" = ps: with ps; [  ];

     

       968
       973
        
           "sensor.sabnzbd" = ps: with ps; [  ];

     

       969
       974
        
           "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];

     

       970
       975
        
           "sensor.season" = ps: with ps; [ ephem ];

     
···

       1085
       1090
        
           "switch.bbb_gpio" = ps: with ps; [  ];

     

       1086
       1091
        
           "switch.broadlink" = ps: with ps; [  ];

     

       1087
       1092
        
           "switch.command_line" = ps: with ps; [  ];

     

       1093
       1093
       +
           "switch.deconz" = ps: with ps; [  ];

     

       1088
       1094
        
           "switch.deluge" = ps: with ps; [ deluge-client ];

     

       1089
       1095
        
           "switch.demo" = ps: with ps; [  ];

     

       1090
       1096
        
           "switch.digital_ocean" = ps: with ps; [ digital-ocean ];

+46 -47

pkgs/servers/home-assistant/default.nix

···

       6
       6
        
       # Additional packages to add to propagatedBuildInputs

     

       7
       7
        
       , extraPackages ? ps: []

     

       8
       8
        
       

     

       9
       9
       +
       # Override Python packages using

     

       10
       10
       +
       # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); }

     

       11
       11
       +
       # Applied after defaultOverrides

     

       12
       12
       +
       , packageOverrides ? self: super: { }

     

       13
       13
       +
       

     

       9
       14
        
       # Skip pip install of required packages on startup

     

       10
       15
        
       , skipPip ? true }:

     

       11
       16
        
       

     

       12
       17
        
       let

     

       13
       18
        
       

     

       14
       14
       -
         py = python3.override {

     

       19
       19
       +
         defaultOverrides = [

     

       15
       20
        
           # Override the version of some packages pinned in Home Assistant's setup.py

     

       16
       16
       -
           packageOverrides = self: super: {

     

       17
       17
       -
             aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {

     

       18
       18
       -
               version = "3.3.2";

     

       21
       21
       +
           (mkOverride "aiohttp" "3.3.2"

     

       22
       22
       +
             "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12")

     

       23
       23
       +
           (mkOverride "astral" "1.6.1"

     

       24
       24
       +
             "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d")

     

       25
       25
       +
           (mkOverride "attrs" "18.1.0"

     

       26
       26
       +
             "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")

     

       27
       27
       +
           (mkOverride "pyjwt" "1.6.4"

     

       28
       28
       +
             "4ee413b357d53fd3fb44704577afac88e72e878716116270d722723d65b42176")

     

       29
       29
       +
           (mkOverride "cryptography" "2.3.1"

     

       30
       30
       +
             "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6")

     

       31
       31
       +
           (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1

     

       32
       32
       +
             "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46")

     

       33
       33
       +
           (mkOverride "requests" "2.19.1"

     

       34
       34
       +
             "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a")

     

       35
       35
       +
           (mkOverride "voluptuous" "0.11.5"

     

       36
       36
       +
             "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef")

     

       37
       37
       +
       

     

       38
       38
       +
           # used by check_config script

     

       39
       39
       +
           # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved

     

       40
       40
       +
           (mkOverride "colorlog" "3.1.4"

     

       41
       41
       +
             "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d")

     

       42
       42
       +
       

     

       43
       43
       +
           # hass-frontend does not exist in python3.pkgs

     

       44
       44
       +
           (self: super: {

     

       45
       45
       +
             hass-frontend = self.callPackage ./frontend.nix { };

     

       46
       46
       +
           })

     

       47
       47
       +
         ];

     

       48
       48
       +
       

     

       49
       49
       +
         mkOverride = attrname: version: sha256:

     

       50
       50
       +
           self: super: {

     

       51
       51
       +
             ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {

     

       52
       52
       +
               inherit version;

     

       19
       53
        
               src = oldAttrs.src.override {

     

       20
       20
       -
                 inherit version;

     

       21
       21
       -
                 sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12";

     

       54
       54
       +
                 inherit version sha256;

     

       22
       55
        
               };

     

       23
       56
        
             });

     

       24
       24
       -
             requests = super.requests.overridePythonAttrs (oldAttrs: rec {

     

       25
       25
       -
               version = "2.19.1";

     

       26
       26
       -
               src = oldAttrs.src.override {

     

       27
       27
       -
                 inherit version;

     

       28
       28
       -
                 sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";

     

       29
       29
       -
               };

     

       30
       30
       -
             });

     

       31
       31
       -
             voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec {

     

       32
       32
       -
               version = "0.11.5";

     

       33
       33
       -
               src = oldAttrs.src.override {

     

       34
       34
       -
                 inherit version;

     

       35
       35
       -
                 sha256 = "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef";

     

       36
       36
       -
               };

     

       37
       37
       -
             });

     

       38
       38
       -
             attrs = super.attrs.overridePythonAttrs (oldAttrs: rec {

     

       39
       39
       -
               version = "18.1.0";

     

       40
       40
       -
               src = oldAttrs.src.override {

     

       41
       41
       -
                 inherit version;

     

       42
       42
       -
                 sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";

     

       43
       43
       -
               };

     

       44
       44
       -
             });

     

       45
       45
       -
             astral = super.astral.overridePythonAttrs (oldAttrs: rec {

     

       46
       46
       -
               version = "1.6.1";

     

       47
       47
       -
               src = oldAttrs.src.override {

     

       48
       48
       -
                 inherit version;

     

       49
       49
       -
                 sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d";

     

       50
       50
       -
               };

     

       51
       51
       -
             });

     

       52
       52
       -
             # used by check_config script

     

       53
       53
       -
             # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved

     

       54
       54
       -
             colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec {

     

       55
       55
       -
               version = "3.1.4";

     

       56
       56
       -
               src = oldAttrs.src.override {

     

       57
       57
       -
                 inherit version;

     

       58
       58
       -
                 sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";

     

       59
       59
       -
               };

     

       60
       60
       -
             });

     

       61
       61
       -
             hass-frontend = super.callPackage ./frontend.nix { };

     

       62
       57
        
           };

     

       58
       58
       +
           

     

       59
       59
       +
         py = python3.override {

     

       60
       60
       +
           # Put packageOverrides at the start so they are applied after defaultOverrides

     

       61
       61
       +
           packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides);

     

       63
       62
        
         };

     

       64
       63
        
       

     

       65
       64
        
         componentPackages = import ./component-packages.nix;

     
···

       74
       73
        
         extraBuildInputs = extraPackages py.pkgs;

     

       75
       74
        
       

     

       76
       75
        
         # Don't forget to run parse-requirements.py after updating

     

       77
       77
       -
         hassVersion = "0.75.2";

     

       76
       76
       +
         hassVersion = "0.76.1";

     

       78
       77
        
       

     

       79
       78
        
       in with py.pkgs; buildPythonApplication rec {

     

       80
       79
        
         pname = "homeassistant";

     
···

       89
       88
        
           owner = "home-assistant";

     

       90
       89
        
           repo = "home-assistant";

     

       91
       90
        
           rev = version;

     

       92
       92
       -
           sha256 = "1ib76wz3f6jfi7a0w2v561g8vf5w4p2b2d79667api6ynvbw2l9d";

     

       91
       91
       +
           sha256 = "0bqvb6wsbv1irp92ijdvx62vqicsqhyk301ixf8yb2d1dwwwmid3";

     

       93
       92
        
         };

     

       94
       93
        
       

     

       95
       94
        
         propagatedBuildInputs = [

     

       96
       95
        
           # From setup.py

     

       97
       97
       -
           requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs

     

       96
       96
       +
           aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous

     

       98
       97
        
           # From http, frontend, recorder and config.config_entries components

     

       99
       98
        
           sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize

     

       100
       99
        
         ] ++ componentBuildInputs ++ extraBuildInputs;

+2 -2

pkgs/servers/home-assistant/frontend.nix

···

       2
       2
        
       

     

       3
       3
        
       buildPythonPackage rec {

     

       4
       4
        
         pname = "home-assistant-frontend";

     

       5
       5
       -
         version = "20180804.0";

     

       5
       5
       +
         version = "20180818.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchPypi {

     

       8
       8
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "50a9e74efe2b56fbc34fba07205829e0ea77315183e85c235d177cabff3b62ee";

     

       9
       9
       +
           sha256 = "b6101c342e49c943c59e3525d6741cd3a23af94b65549d59bdeee8cf3f07b294";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         propagatedBuildInputs = [ user-agents ];

+1 -1

pkgs/servers/home-assistant/parse-requirements.py

···

       1
       1
        
       #! /usr/bin/env nix-shell

     

       2
       2
       -
       #! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs ])"

     

       2
       2
       +
       #! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp astral async-timeout attrs certifi jinja2 pyjwt cryptography pip pytz pyyaml requests voluptuous ])"

     

       3
       3
        
       #

     

       4
       4
        
       # This script downloads Home Assistant's source tarball.

     

       5
       5
        
       # Inside the homeassistant/components directory, each component has an associated .py file,