Unverified Commit 5f88abb8 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

buildHomeAssistantComponent: run manifestRequirementsCheckHook independently... 

buildHomeAssistantComponent: run manifestRequirementsCheckHook independently of checkPhase (#467204)
parents 0d3f292f 8065f9ec

pkgs/development/python-modules/pymitsubishi/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -18,9 +18,14 @@ buildPythonPackage rec { 
    owner = "pymitsubishi";

    repo = "pymitsubishi";

    tag = "v${version}";

    hash = "sha256-QjHMIzl2VV1S8tNWsFLgLDNX6/0wN9FeIJIo5KgkDVE=";

    hash = "sha256-frqyAXAP2O8TZzXx5ephcLSLJA9p0P74KJrPoSKPYYo=";

  };



  postPatch = ''

    # make sure pyproject.toml specifies the correct version

    grep -qF 'version = "${version}"' pyproject.toml

  '';



  build-system = [ setuptools ];



  dependencies = [

pkgs/servers/home-assistant/build-custom-component/check_manifest.py

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ def main(args): 
    # At least one manifest should match the component name

    ok &= any(check_derivation_name(manifest) for manifest in manifests)



    # All requirements need to match, use `ignoreRequirementVersion` to ignore too strict version constraints

    # All requirements need to match, use `ignoreVersionRequirement` to ignore too strict version constraints

    ok &= all(

        check_requirements(manifest, args.ignore_version_requirement)

        for manifest in manifests

pkgs/servers/home-assistant/build-custom-component/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ home-assistant.python.pkgs.buildPythonPackage ( 
      runHook postInstall

    '';



    nativeCheckInputs =

    nativeBuildInputs =

      with home-assistant.python.pkgs;

      [

        manifestRequirementsCheckHook

        packaging

      ]

      ++ (args.nativeCheckInputs or [ ]);

      ++ (args.nativeBuildInputs or [ ]);



    passthru = {

      isHomeAssistantComponent = true;

pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 
buildHomeAssistantComponent rec {

  owner = "pymitsubishi";

  domain = "mitsubishi";

  version = "0.4.0";

  version = "0.4.2";



  src = fetchFromGitHub {

    owner = "pymitsubishi";

    repo = "homeassistant-mitsubishi";

    tag = "v${version}";

    hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4=";

    hash = "sha256-c1KnFpRK5dH7ZGsDuJD6Awa0xhxYYZxC4zCjoRdpOns=";

  };



  dependencies = [

pkgs/servers/home-assistant/custom-components/rct_power/package.nix

+7 −2
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 
buildHomeAssistantComponent rec {

  owner = "weltenwort";

  domain = "rct_power";

  version = "v0.14.1";

  version = "0.14.1";



  src = fetchFromGitHub {

    owner = "weltenwort";

    repo = "home-assistant-rct-power-integration";

    tag = version;

    tag = "v${version}";

    hash = "sha256-wM66MyRhBsMfUr+KlqV4jSuXcnKfW0fkbDAyuU2crsc=";

  };
@@ -21,6 +21,11 @@ buildHomeAssistantComponent rec { 
    rctclient

  ];



  ignoreVersionRequirement = [

    # rctclient 0.0.4 was never published on PyPI

    "rctclient"

  ];



  doCheck = false; # no tests



  meta = with lib; {