diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-21 06:01:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-21 06:01:33 +0000 |
commit | 2d285b1590ee2326d234a31cdc4a632ab3d2443d (patch) | |
tree | 8f9befd1f04c059cc0025b3b226b5e902dffef7a /pkgs/servers | |
parent | fc3641aa1e3031088747752caca78d9083d70f7b (diff) | |
parent | af79979d5887fae3d2c24f45221241ab5ad1e12e (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6051f5f3182c..f3be58216803 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -265,10 +265,6 @@ let # Ensure that we are using a consistent package set extraBuildInputs = extraPackages python.pkgs; - # Create info about included packages and components - extraComponentsFile = writeText "home-assistant-components" (lib.concatStringsSep "\n" extraComponents); - extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); - # Don't forget to run parse-requirements.py after updating hassVersion = "2023.2.5"; @@ -359,7 +355,7 @@ in python.pkgs.buildPythonApplication rec { yarl # Implicit dependency via homeassistant/requirements.py setuptools - ] ++ componentBuildInputs ++ extraBuildInputs; + ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -428,11 +424,6 @@ in python.pkgs.buildPythonApplication rec { export PATH=${inetutils}/bin:$PATH ''; - postInstall = '' - cp -v ${extraComponentsFile} $out/extra_components - cp -v ${extraPackagesFile} $out/extra_packages - ''; - passthru = { inherit availableComponents @@ -440,6 +431,7 @@ in python.pkgs.buildPythonApplication rec { getPackages python supportedComponentsWithTests; + pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs); intents = python.pkgs.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; |