Unverified Commit 12a2201d authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #229780 from NixOS/home-assistant 

home-assistant: 2023.4.6 -> 2023.5.0
parents 6a8cb457 ac848b1e

nixos/modules/services/home-automation/home-assistant.nix

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ in { 
          "mopeka"

          "oralb"

          "qingping"

          "rapt_ble"

          "ruuvi_gateway"

          "ruuvitag_ble"

          "sensirion_ble"

pkgs/applications/audio/sublime-music/default.nix

+24 −7
Original line number Diff line number Diff line 
{ lib

, fetchFromGitLab

, python3Packages

, fetchFromGitHub

, python3

, gobject-introspection

, gtk3

, pango
@@ -15,7 +16,22 @@ 
, networkmanager

}:



python3Packages.buildPythonApplication rec {

let

  python = python3.override {

    packageOverrides = self: super: {

      semver = super.semver.overridePythonAttrs (oldAttrs: rec {

        version = "2.13.0";

        src = fetchFromGitHub {

          owner = "python-semver";

          repo = "python-semver";

          rev = "refs/tags/${version}";

          hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";

        };

      });

    };

  };

in

python.pkgs.buildPythonApplication rec {

  pname = "sublime-music";

  version = "0.11.16";

  format = "pyproject";
@@ -29,10 +45,11 @@ python3Packages.buildPythonApplication rec { 


  nativeBuildInputs = [

    gobject-introspection

    python3Packages.poetry-core

    python3Packages.pythonRelaxDepsHook

    wrapGAppsHook

  ];

  ] ++ (with python.pkgs; [

    poetry-core

    pythonRelaxDepsHook

  ]);



  # Can be removed in later versions (probably > 0.11.16)

  pythonRelaxDeps = [
@@ -57,7 +74,7 @@ python3Packages.buildPythonApplication rec { 
  ++ lib.optional networkSupport networkmanager

  ;



  propagatedBuildInputs = with python3Packages; [

  propagatedBuildInputs = with python.pkgs; [

    bleach

    dataclasses-json

    deepdiff
@@ -75,7 +92,7 @@ python3Packages.buildPythonApplication rec { 
  ++ lib.optional serverSupport bottle

  ;



  nativeCheckInputs = with python3Packages; [

  nativeCheckInputs = with python.pkgs; [

    pytest

  ];

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

+4 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, buildPythonPackage

, fetchFromGitHub

, poetry-core

, pydantic

, pytest-aiohttp

, pytest-asyncio

, pytest-cov
@@ -13,7 +14,7 @@ 


buildPythonPackage rec {

  pname = "aionotion";

  version = "2022.10.0";

  version = "2023.04.2";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -22,7 +23,7 @@ buildPythonPackage rec { 
    owner = "bachya";

    repo = pname;

    rev = version;

    hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U=";

    hash = "sha256-pMBUhCm16+Zs6xZExLB4Z5y+OKNHX+utjsfMLeYUSWY=";

  };



  nativeBuildInputs = [
@@ -31,6 +32,7 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    aiohttp

    pydantic

  ];



  nativeCheckInputs = [

pkgs/development/python-modules/appthreat-vulnerability-db/default.nix

+17 −5
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
, packageurl-python

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, semver

, tabulate

}:
@@ -27,6 +28,22 @@ buildPythonPackage rec { 
    hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk=";

  };



  postPatch = ''

    substituteInPlace pytest.ini \

      --replace " --cov-append --cov-report term --cov vdb" ""

    # https://github.com/AppThreat/vulnerability-db/pull/48

    substituteInPlace vdb/lib/utils.py \

      --replace "isvalid(" "is_valid("

  '';



  pythonRelaxDeps = [

    "semver"

  ];



  nativeBuildInputs = [

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = [

    appdirs

    cvss
@@ -42,11 +59,6 @@ buildPythonPackage rec { 
    pytestCheckHook

  ];



  postPatch = ''

    substituteInPlace pytest.ini \

      --replace " --cov-append --cov-report term --cov vdb" ""

  '';



  preCheck = ''

    export HOME=$(mktemp -d);

  '';

pkgs/development/python-modules/bimmer-connected/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


buildPythonPackage rec {

  pname = "bimmer-connected";

  version = "0.13.1";

  version = "0.13.2";

  format = "setuptools";



  disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec { 
    owner = "bimmerconnected";

    repo = "bimmer_connected";

    rev = "refs/tags/${version}";

    hash = "sha256-bkJhVMcQifNWT/TkUDR2xHlKFHf0lydHdRMQotZWeCM=";

    hash = "sha256-3EKtWomzgtQlYgCQjahOEDo/yaPtprsp5WPQs/tVChU=";

  };



  nativeBuildInputs = [