Skip to content

home-assistant: unpin and fix build dependencies #250124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tjni wants to merge 2 commits into from
Closed

home-assistant: unpin and fix build dependencies #250124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ad0a85
home-assistant: unpin setuptools in intents-package
tjni Aug 19, 2023
1101d86
home-assistant: unpin and fix build dependencies
tjni Aug 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkgs/servers/home-assistant/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ let
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry>=1.0.0b1" "poetry-core" \
--replace "poetry.masonry" "poetry.core.masonry"
'';
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
Expand Down Expand Up @@ -324,6 +325,7 @@ in python.pkgs.buildPythonApplication rec {

nativeBuildInputs = with python.pkgs; [
setuptools
wheel
];

# copy tests early, so patches apply as they would to the git repo
Expand Down Expand Up @@ -368,6 +370,9 @@ in python.pkgs.buildPythonApplication rec {
) relaxedConstraints)}
pyproject.toml
substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"'

sed -i 's/setuptools[~=]/setuptools>/' pyproject.toml
sed -i 's/wheel[~=]/wheel>/' pyproject.toml
Comment on lines +374 to +375
Copy link
Member

@mweinelt mweinelt Aug 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried adding it to relaxedConstraints above?

Copy link
Member

@mweinelt mweinelt Aug 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That breaks as it expects one dependency per line.

'';

propagatedBuildInputs = with python.pkgs; [
Expand Down
12 changes: 12 additions & 0 deletions pkgs/servers/home-assistant/intents.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
, setuptools
, wheel

# build
, hassil
Expand Down Expand Up @@ -32,13 +34,23 @@ buildPythonPackage rec {
fetchSubmodules = true;
};

patches = [
# https://github.com/home-assistant/intents-package/pull/1
(fetchpatch {
name = "unpin-setuptools-dependency.patch";
url = "https://github.com/home-assistant/intents-package/commit/fc03c1ec1001ba3b812f2eea670d1c447cf2acee.patch";
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
})
];
Comment on lines +37 to +44
Copy link
Member

@mweinelt mweinelt Aug 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good luck getting anything merged after having mentioned you require this for nixpkgs.


nativeBuildInputs = [
hassil
jinja2
pyyaml
regex
setuptools
voluptuous
wheel
];

postInstall = ''
Expand Down