commit 0c190d08d425febd0f21ee0dc71d4fd994521595 · pyrox.dev/nixpkgs

+25 -10

nixos/tests/home-assistant.nix

···

       128
       128
        
                 ];

     

       129
       129
        
               };

     

       130
       130
        
               lovelaceConfigWritable = true;

     

       131
       131
       +
             };

     

       131
       132
        
       

     

       132
       132
       -
               blueprints.automation = [

     

       133
       133
       -
                 (pkgs.fetchurl {

     

       134
       134
       -
                   url = "https://github.com/home-assistant/core/raw/2025.1.4/homeassistant/components/automation/blueprints/motion_light.yaml";

     

       135
       135
       -
                   hash = "sha256-4HrDX65ycBMfEY2nZ7A25/d3ZnIHdpHZ+80Cblp+P5w=";

     

       136
       136
       -
                 })

     

       137
       137
       -
               ];

     

       138
       138
       -
               blueprints.template = [

     

       139
       139
       -
                 "${pkgs.home-assistant.src}/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml"

     

       140
       140
       -
               ];

     

       133
       133
       +
             # Add blueprints next, because we want to test the installation of the default blueprints first

     

       134
       134
       +
             specialisation.addBlueprints = {

     

       135
       135
       +
               inheritParentConfig = true;

     

       136
       136
       +
               configuration.services.home-assistant = {

     

       137
       137
       +
                 blueprints.automation = [

     

       138
       138
       +
                   (pkgs.fetchurl {

     

       139
       139
       +
                     url = "https://github.com/home-assistant/core/raw/2025.1.4/homeassistant/components/automation/blueprints/motion_light.yaml";

     

       140
       140
       +
                     hash = "sha256-4HrDX65ycBMfEY2nZ7A25/d3ZnIHdpHZ+80Cblp+P5w=";

     

       141
       141
       +
                   })

     

       142
       142
       +
                 ];

     

       143
       143
       +
                 blueprints.template = [

     

       144
       144
       +
                   "${pkgs.home-assistant.src}/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml"

     

       145
       145
       +
                 ];

     

       146
       146
       +
               };

     

       141
       147
        
             };

     

       142
       148
        
       

     

       143
       149
        
             # Cause a configuration change inside `configuration.yml` and verify that the process is being reloaded.

     
···

       237
       243
        
             with subtest("Check extra components are considered in systemd unit hardening"):

     

       238
       244
        
                 hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB")

     

       239
       245
        
       

     

       240
       240
       -
             with subtest("Check that blueprints are installed"):

     

       246
       246
       +
             with subtest("Check that default blueprints are copied writable"):

     

       247
       247
       +
                 hass.succeed("stat -c '%a' ${configDir}/blueprints/automation/homeassistant | grep 700")

     

       248
       248
       +
                 hass.succeed("stat -c '%a' ${configDir}/blueprints/automation/homeassistant/motion_light.yaml | grep 600")

     

       249
       249
       +
                 # Delete blueprints, so we can check the declarative setup next

     

       250
       250
       +
                 hass.execute("rm -rf ${configDir}/blueprints")

     

       251
       251
       +
       

     

       252
       252
       +
             with subtest("Check that configured blueprints are installed"):

     

       253
       253
       +
                 cursor = get_journal_cursor()

     

       254
       254
       +
                 hass.succeed("${system}/specialisation/addBlueprints/bin/switch-to-configuration test")

     

       255
       255
       +
                 wait_for_homeassistant(cursor)

     

       241
       256
        
                 hass.succeed("test -L '${configDir}/blueprints/automation/motion_light.yaml'")

     

       242
       257
        
                 hass.succeed("test -L '${configDir}/blueprints/template/inverted_binary_sensor.yaml'")

     

       243
       258

pkgs/servers/home-assistant/default.nix

···

       432
       432
        
           # Follow symlinks in /var/lib/hass/www

     

       433
       433
        
           ./patches/static-follow-symlinks.patch

     

       434
       434
        
       

     

       435
       435
       +
           # Copy default blueprints without preserving permissions

     

       436
       436
       +
           ./patches/default-blueprint-permissions.patch

     

       437
       437
       +
       

     

       435
       438
        
           # Patch path to ffmpeg binary

     

       436
       439
        
           (replaceVars ./patches/ffmpeg-path.patch {

     

       437
       440
        
             ffmpeg = "${lib.getExe ffmpeg-headless}";

+35

pkgs/servers/home-assistant/patches/default-blueprint-permissions.patch

···

       1
       1
       +
       commit cca718816f66b0155602c974e6743e8ce49e367b

     

       2
       2
       +
       Author: Martin Weinelt <hexa@darmstadt.ccc.de>

     

       3
       3
       +
       Date:   Thu Jun 12 03:37:27 2025 +0200

     

       4
       4
       +
       

     

       5
       5
       +
           blueprints: copy default blueprints w/o permissions

     

       6
       6
       +
           

     

       7
       7
       +
           There is no easy way to achieve this with shutil, because copytree() will

     

       8
       8
       +
           always call copystat() an ruin directory permissions.

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/homeassistant/components/blueprint/models.py b/homeassistant/components/blueprint/models.py

     

       11
       11
       +
       index 88052100259..a0b29ed3d01 100644

     

       12
       12
       +
       --- a/homeassistant/components/blueprint/models.py

     

       13
       13
       +
       +++ b/homeassistant/components/blueprint/models.py

     

       14
       14
       +
       @@ -378,9 +378,17 @@ class DomainBlueprints:

     

       15
       15
       +
                    if self.blueprint_folder.exists():

     

       16
       16
       +
                        return

     

       17
       17
       +
        

     

       18
       18
       +
       -            shutil.copytree(

     

       19
       19
       +
       -                integration.file_path / BLUEPRINT_FOLDER,

     

       20
       20
       +
       -                self.blueprint_folder / HOMEASSISTANT_DOMAIN,

     

       21
       21
       +
       -            )

     

       22
       22
       +
       +            import os

     

       23
       23
       +
       +            os.makedirs(self.blueprint_folder / HOMEASSISTANT_DOMAIN)

     

       24
       24
       +
       +

     

       25
       25
       +
       +            import subprocess

     

       26
       26
       +
       +            subprocess.check_call([

     

       27
       27
       +
       +                "cp",

     

       28
       28
       +
       +                "--no-preserve=mode",

     

       29
       29
       +
       +                "--no-target-directory",

     

       30
       30
       +
       +                "--recursive",

     

       31
       31
       +
       +                str(integration.file_path / BLUEPRINT_FOLDER),

     

       32
       32
       +
       +                str(self.blueprint_folder / HOMEASSISTANT_DOMAIN),

     

       33
       33
       +
       +            ])

     

       34
       34
       +
        

     

       35
       35
       +
                await self.hass.async_add_executor_job(populate)