Merge master into staging-next

This commit is contained in:
nixpkgs-ci[bot]
2026-04-12 06:34:02 +00:00
committed by GitHub
31 changed files with 92 additions and 84 deletions
@@ -14,19 +14,19 @@ let
{
x86_64-linux = {
arch = "linux-x64";
hash = "sha256-DeyQgxfPD7R2OjQZ99PNN7hV0Vt9jk5sw+XcM+yIURI=";
hash = "sha256-jAQJh1JqomJDUFeb2N452ICo0azFelT8vHvEsBqXi8w=";
};
aarch64-linux = {
arch = "linux-arm64";
hash = "sha256-A8xjglh1re02mix5BpE00FNyU6Cjj01vz48lmz2acG8=";
hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY=";
};
x86_64-darwin = {
arch = "darwin-x64";
hash = "sha256-mK/pLDemgmVuLAMYMEeSvi96ckHNq8ie2Y+JENtaTXA=";
hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw=";
};
aarch64-darwin = {
arch = "darwin-arm64";
hash = "sha256-taFeZB00iBoYQULhlRHDjrj/Zm7aXYgbPiPK7xjnsYU=";
hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA=";
};
}
.${system} or (throw "Unsupported system: ${system}");
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
# Please update the corresponding binary (typos-lsp)
# when updating this extension.
# See pkgs/by-name/ty/typos-lsp/package.nix
version = "0.1.45";
version = "0.1.51";
inherit (extInfo) hash arch;
};
@@ -526,11 +526,11 @@
"vendorHash": null
},
"hashicorp_azurerm": {
"hash": "sha256-3rj9YJqgys+IZjx8/pMckAYyv5yKhHdySWlCmgZy5TU=",
"hash": "sha256-22ZxBz5ZKJzgG/HMv6kce5NosPtmYPk46R7pu3Ss4OA=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
"owner": "hashicorp",
"repo": "terraform-provider-azurerm",
"rev": "v4.67.0",
"rev": "v4.68.0",
"spdx": "MPL-2.0",
"vendorHash": null
},
@@ -1274,13 +1274,13 @@
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
},
"sysdiglabs_sysdig": {
"hash": "sha256-TKdZaE3FJ3vE+wxCrqaIuON1sKW/EJAZ1YE73v23K9I=",
"hash": "sha256-+rP7HnEF+J5NjwgnYEnFbSBdV/fyq7s2A0Xt4maLy7k=",
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
"owner": "sysdiglabs",
"repo": "terraform-provider-sysdig",
"rev": "v3.5.0",
"rev": "v3.7.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
"vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978="
},
"tailscale_tailscale": {
"hash": "sha256-yR65w/o/VpwKINcvz4SBybAwsphGC7A/B+baKRcIT3I=",
+2 -2
View File
@@ -6,14 +6,14 @@
}:
python3Packages.buildPythonApplication (finalAttrs: {
pname = "actool";
version = "1.4.0";
version = "1.5.1";
pyproject = true;
src = fetchFromGitHub {
owner = "viraptor";
repo = "actool";
tag = finalAttrs.version;
hash = "sha256-WtiunUS0E6t7X+5lZqm4vZJ7C4dvFGiUKfjvHwNNtR0=";
hash = "sha256-HWi+MM0jMfg+nPiNFa3dG3sRuSEnS84+h3s6YRcxcAs=";
};
build-system = with python3Packages; [
+5 -5
View File
@@ -39,7 +39,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "beekeeper-studio";
version = "5.6.4";
version = "5.6.5";
src =
let
@@ -54,10 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
fetchurl {
url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${finalAttrs.version}/${asset}";
hash = selectSystem {
x86_64-linux = "sha256-HAWT2JSM+H4iDvfFAAYTRXWszmyHnxd/iik2f0kfVoY=";
aarch64-linux = "sha256-GZqoIVg/RGheSrbViGJF+U9becDml1TNQisZB+cqO4g=";
x86_64-darwin = "sha256-KqW4tYrxl0fwfiLmGLyjkZHxpHm5CGE5z60Ml+X9W/A=";
aarch64-darwin = "sha256-/Gn+64aXBfpdii/TL4rbUKL2TvibYDDIX08B3/wfOlQ=";
x86_64-linux = "sha256-JQs/B2CkwUuVBWgn+eJCokE3wWNrQzl8nj8Rd1UcCgk=";
aarch64-linux = "sha256-/yyXvp2x2elVUqDAzB7/jWQi2Z/7b1td8sGBD7WRPDw=";
x86_64-darwin = "sha256-0cSsRiFCFVKMkPjUj3bC096ijZu8rAj0GObeLlpvaX8=";
aarch64-darwin = "sha256-Mtf0xlEvFcsE7O2IgXFmOzVU7P9WKr5DhJRmf5WCU4E=";
};
};
+1 -1
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL
];
depsBuildBuild = [
depsBuildBuild = lib.optionals (!stdenv.buildPlatform.isDarwin) [
binutils # build calls `ar`
];
+3 -3
View File
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
stdenvNoCC.mkDerivation
{
inherit pname;
version = "0-unstable-2026-04-02";
version = "0-unstable-2026-04-08";
src = fetchFromGitLab {
owner = "aiyahm";
repo = "FairyWren-Icons";
rev = "515fa1a65a368fcfea9a9e9954809560d4464366";
hash = "sha256-cu0aEIUAK4QGY5V3wWbMkweVugJ8Z99ahbla/Cdl9kM=";
rev = "428ee2eef9f607021406376f55bfc6cf4054caf1";
hash = "sha256-XEuchaxh9h7hNpS2wjmytutcgroohdgsh7f1x5hrDKg=";
};
propagatedBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "metapac";
version = "0.9.3";
version = "0.9.4";
src = fetchFromGitHub {
owner = "ripytide";
repo = "metapac";
tag = "v${finalAttrs.version}";
hash = "sha256-qLu8fXPdeAVnZOm80aXXm20FXeGTy2KpZsN40ILPBUc=";
hash = "sha256-Cr9Ui1nnCrjWZkXiFc1tDRWToJYVuUSVK4VPwFzXW2E=";
};
cargoHash = "sha256-EOTf+RcYN6v4Yp/UhQEui48wQerwP+JwGhIZJzmV5cA=";
cargoHash = "sha256-ByaCeWfcGmTiQKz3DdSQMAaCGwJTjNOLxDljfM46LRk=";
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
+3 -3
View File
@@ -9,20 +9,20 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "sampo";
version = "0.17.2";
version = "0.17.3";
src = fetchFromGitHub {
owner = "bruits";
repo = "sampo";
tag = "sampo-v${finalAttrs.version}";
hash = "sha256-lCF38mDdoBqm9F9enEhYx3fdrTgLG+ItL37Kxzqhqcw=";
hash = "sha256-g/cl24IUTQ2Tqxfzfsx3yxCgsbiFOUWKy1JisUhQ3wg=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
cargoHash = "sha256-roYUqxY+zkRoHZbC52Psk7/T1lRYjgnQ0cAFlUCZPn4=";
cargoHash = "sha256-wd76EJeKrUH/h6Net3vwROw83sXjAPXX0N1ckYDMulc=";
cargoBuildFlags = [
"-p"
+4 -4
View File
@@ -20,7 +20,7 @@
let
pname = "typora";
version = "1.12.4";
version = "1.13.2";
passthru = {
sources = {
@@ -29,21 +29,21 @@ let
"https://download.typora.io/linux/typora_${version}_amd64.deb"
"https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
];
hash = "sha256-P3wgzMVcyvmXM/w24kPgYGOfSaAh+SFzgeoJoasEmH8=";
hash = "sha256-oMb57//kg8TldZpWD0kaNYhveDe9MXHu9IMeuIvGcq4=";
};
aarch64-linux = fetchurl {
urls = [
"https://download.typora.io/linux/typora_${version}_arm64.deb"
"https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
];
hash = "sha256-tQFCppOeeWJK8ovf71LPJRVteOJ8XbbNojhV4QLmVJ0=";
hash = "sha256-fa/jvmhQ/tx3JWCDwNxRW+WTXnLYD+WrJoGJmes0JKs=";
};
aarch64-darwin = fetchurl {
urls = [
"https://download.typora.io/mac/Typora-${version}.dmg"
"https://downloads.typoraio.cn/mac/Typora-${version}.dmg"
];
hash = "sha256-XPaMUHmIz+pjT/JQVV9ddNpTWtBDLjyoi5W1Qz9gBAo=";
hash = "sha256-3wPZAuU2EE62M0F3TQw6aX5cHdeUmJuASWnlbMVmgss=";
};
};
updateScript = ./update.sh;
+3 -3
View File
@@ -6,7 +6,7 @@
pkg-config,
}:
let
version = "1.25.5";
version = "1.27.0";
in
rustPlatform.buildRustPackage {
pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
owner = "neon-mmd";
repo = "websurfx";
tag = "v${version}";
hash = "sha256-CtS3HYRLq+Li7IPOOG+0lP8nyLwF+z0pjBtvTzQh2fE=";
hash = "sha256-j2CELNuHNMlxvdSEXOz5I7npzeq/s6hGLnFdmxN/m+c=";
};
nativeBuildInputs = [
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
openssl
];
cargoHash = "sha256-cFKuXhnUhPDBgy/LQUqSQgX2VBQLzzC6VBoeUU8J0H0=";
cargoHash = "sha256-0MXx17Jm/uXo70HoI2dbEl7XBzXGXKMZ+PYw/dQiJ5U=";
postPatch = ''
substituteInPlace src/handler.rs \
@@ -5,7 +5,7 @@
colorlog,
fetchFromGitHub,
pint,
poetry-core,
setuptools,
pytest-cov-stub,
pytestCheckHook,
pythonOlder,
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiocomelit";
version = "2.0.1";
version = "2.0.2";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -22,10 +22,10 @@ buildPythonPackage rec {
owner = "chemelli74";
repo = "aiocomelit";
tag = "v${version}";
hash = "sha256-RlSDSxJZ6xD0ifqGT4l2Jkfzo64rrrLCE/yykeJNaYs=";
hash = "sha256-k/p6z+flMvmuwwHqPH9Aw/ai761kbT+HQUXVNKeqk0U=";
};
build-system = [ poetry-core ];
build-system = [ setuptools ];
dependencies = [
aiohttp
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "axis";
version = "67";
version = "68";
pyproject = true;
disabled = pythonOlder "3.14";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = "axis";
tag = "v${version}";
hash = "sha256-Zfhz3AtiMSF5yNF+Z7++3O1oof5hyfues3u4bToFBYk=";
hash = "sha256-2a7zGgWc0QxxjCCg5yCfcepzLhEfvASv/Y8mDgl4y8M=";
};
postPatch = ''
@@ -15,14 +15,14 @@
buildPythonPackage (finalAttrs: {
pname = "opower";
version = "0.18.0";
version = "0.18.1";
pyproject = true;
src = fetchFromGitHub {
owner = "tronikos";
repo = "opower";
tag = "v${finalAttrs.version}";
hash = "sha256-ZkYZsML3xBMGNNhwVzOuUmVeRU/aJnHld6hSACuhTxc=";
hash = "sha256-Wy2FPWRSlxNEhqCfRwUyIxUCIdRJDIFICTJxM08+Xno=";
};
build-system = [ setuptools ];
@@ -22,6 +22,7 @@
dask,
duckdb,
fastapi,
frictionless,
geopandas,
hypothesis,
ibis-framework,
@@ -41,16 +42,16 @@
rich,
}:
buildPythonPackage rec {
buildPythonPackage (finalAttrs: {
pname = "pandera";
version = "0.28.1";
version = "0.30.1";
pyproject = true;
src = fetchFromGitHub {
owner = "unionai-oss";
repo = "pandera";
tag = "v${version}";
hash = "sha256-PXcLJwebJ6BQ4nUtXUZFGb0vQp/g6jj+afewTTMt84s=";
tag = "v${finalAttrs.version}";
hash = "sha256-JmD8p0Syt/Tgf9LiMWeug1dSPp4cyd7BtBfo6yi08xg=";
};
build-system = [
@@ -58,7 +59,7 @@ buildPythonPackage rec {
setuptools-scm
];
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
dependencies = [
packaging
@@ -77,7 +78,7 @@ buildPythonPackage rec {
io = [
pyyaml
black
#frictionless # not in nixpkgs
frictionless
];
# pyspark expression does not define optional-dependencies.connect:
#pyspark = [ pyspark ] ++ pyspark.optional-dependencies.connect;
@@ -121,7 +122,7 @@ buildPythonPackage rec {
pytestCheckHook
rich
]
++ optional-dependencies.all;
++ finalAttrs.passthru.optional-dependencies.all;
disabledTestPaths = [
"tests/fastapi/test_app.py" # tries to access network
@@ -167,8 +168,8 @@ buildPythonPackage rec {
meta = {
description = "Light-weight, flexible, and expressive statistical data testing library";
homepage = "https://pandera.readthedocs.io";
changelog = "https://github.com/unionai-oss/pandera/releases/tag/${src.tag}";
changelog = "https://github.com/unionai-oss/pandera/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bcdarwin ];
};
}
})
@@ -9,21 +9,23 @@
pycognito,
pyjwt,
pytest-aiohttp,
pytest-cov-stub,
pytest-freezegun,
pytest-timeout,
pytestCheckHook,
uv-dynamic-versioning,
}:
buildPythonPackage rec {
pname = "pylitterbot";
version = "2025.2.0";
version = "2025.3.0";
pyproject = true;
src = fetchFromGitHub {
owner = "natekspencer";
repo = "pylitterbot";
tag = version;
hash = "sha256-o5A4AWil6FeHjUBgbHaA010kszhuncHHzf8+CH4QL0c=";
hash = "sha256-EK2QiQMHhA69p7xnyeYE+kru0k7eL9EilkAUAN6LukU=";
};
build-system = [
@@ -41,7 +43,9 @@ buildPythonPackage rec {
nativeCheckInputs = [
aioresponses
pytest-aiohttp
pytest-cov-stub
pytest-freezegun
pytest-timeout
pytestCheckHook
];
@@ -19,14 +19,14 @@
buildPythonPackage (finalAttrs: {
pname = "python-bsblan";
version = "5.1.3";
version = "5.1.4";
pyproject = true;
src = fetchFromGitHub {
owner = "liudger";
repo = "python-bsblan";
tag = "v${finalAttrs.version}";
hash = "sha256-2Rynat0eXAWzlCBUJAvKrAFPLl74FMr2r1KtKPBlwYw=";
hash = "sha256-97Hgsu0ipX5oSAZdCikaWhj6g3gEom/Is2wnm6vpblY=";
};
postPatch = ''
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "qbusmqttapi";
version = "1.4.2";
version = "1.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "Qbus-iot";
repo = "qbusmqttapi";
tag = "v${version}";
hash = "sha256-8TNtfBxJcSwlcAgKF6Gvn+e4NGbOIE3JWBAgFKmNyKA=";
hash = "sha256-qwvgc80YIluIwb2532KBnVT8pOkn7a2T9FWX4Z5bG+A=";
};
postPatch = ''
@@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "securetar";
version = "2026.2.0";
version = "2026.4.1";
pyproject = true;
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "securetar";
tag = version;
hash = "sha256-76JZN0Y9uW0+HUX+j1aCIz9qOjogZ0KXOXXK8rR8Z/4=";
hash = "sha256-y2Ow272094Qrn52LGYkuRcjaR6d0C6bF12g7W6AwSMI=";
};
build-system = [ setuptools ];
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "velbus-aio";
version = "2026.2.0";
version = "2026.4.0";
pyproject = true;
src = fetchFromGitHub {
owner = "Cereal2nd";
repo = "velbus-aio";
tag = finalAttrs.version;
hash = "sha256-lQl5f7O6ZMfYGleyOESSbW87RPS7eBi3YZqCAcQfLow=";
hash = "sha256-bFR4iZdvkY8pg4OzAH7E0vEw7E5kyEII2iLfeG5p3OQ=";
fetchSubmodules = true;
};
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "zha";
version = "1.1.1";
version = "1.1.2";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zha";
tag = version;
hash = "sha256-hr+FeBVQ1yqQGOhhTBd4c1g6OEntGaPPuHt1/nD+HKE=";
hash = "sha256-GPl3nXi24ukNHDE81keyu8m1xgS0MSRdo7ULxy6foGQ=";
};
postPatch = ''
@@ -16,14 +16,14 @@
buildPythonPackage (finalAttrs: {
pname = "zinvolt";
version = "0.4.1";
version = "0.4.3";
pyproject = true;
src = fetchFromGitHub {
owner = "joostlek";
repo = "python-zinvolt";
tag = "v${finalAttrs.version}";
hash = "sha256-b6NWEk2sn0LpCd2qTpcU4pVH01FzMNHM6ybQU24mN1c=";
hash = "sha256-psZ9/V/bBGGvKdKxuvncJzJOB1jolYTeNw2XOJmxfco=";
};
build-system = [ poetry-core ];
@@ -2,7 +2,7 @@
# Do not edit!
{
version = "2026.4.1";
version = "2026.4.2";
components = {
"3_day_blinds" =
ps: with ps; [
@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "andrew-codechimp";
domain = "battery_notes";
version = "3.4.1";
version = "3.4.3";
src = fetchFromGitHub {
inherit owner;
repo = "HA-Battery-Notes";
tag = version;
hash = "sha256-1FRGNtNjX1YBUmnH9G2CoejkJKvIaWIMegvzdfFx76I=";
hash = "sha256-ftIq0PbTVJ1xuCyHH9MCfxA56x2ZNsPwCjCdivWMwZw=";
};
# has no tests
@@ -15,13 +15,13 @@
buildHomeAssistantComponent rec {
owner = "amitfin";
domain = "oref_alert";
version = "6.15.2";
version = "6.17.1";
src = fetchFromGitHub {
owner = "amitfin";
repo = "oref_alert";
tag = "v${version}";
hash = "sha256-2JWvTbnG8PNLLzTGAyz/u7oVCC3reHWYn9utawxIp1s=";
hash = "sha256-vpRVTxstuNL29C8cl+B4U/jTDfIOLYepGmr1uYjylYQ=";
};
# Do not publish cards, currently broken, attempting to write to nix store.
@@ -17,13 +17,13 @@
buildHomeAssistantComponent rec {
owner = "bramstroker";
domain = "powercalc";
version = "1.20.11";
version = "1.20.12";
src = fetchFromGitHub {
inherit owner;
repo = "homeassistant-powercalc";
tag = "v${version}";
hash = "sha256-FDCdB0Un7B51yJNGaRi1sCY/XNurGbySwxe6mZtkH60=";
hash = "sha256-kOxY/7JjDHbQC7adfcRDgDJnvU2TRyaKYXxfmo/cXPQ=";
};
dependencies = [ numpy ];
+3 -3
View File
@@ -253,7 +253,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run update-component-packages.py after updating
hassVersion = "2026.4.1";
hassVersion = "2026.4.2";
in
python.pkgs.buildPythonApplication rec {
@@ -274,13 +274,13 @@ python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
tag = version;
hash = "sha256-Cowd0vNtWeh5XTNZQxkLqZtYZjfbdw/6FhuIGs1cNQ4=";
hash = "sha256-dMkTuFEWlWAVptNEiYbBbqUM4ymXMfBAAyRsvzkcWls=";
};
# Secondary source is pypi sdist for translations
sdist = fetchPypi {
inherit pname version;
hash = "sha256-5nEhbXFZp4u8zTw00fd2W3PBafPhynPzpmF6Dj+G7Mo=";
hash = "sha256-eRdwYU/D4AjGbIfNbumBUBfbsr/P0i1k0KRaC5+1jfg=";
};
build-system = with python.pkgs; [
+2 -2
View File
@@ -8,7 +8,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20260325.6";
version = "20260325.7";
format = "wheel";
src = fetchPypi {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
hash = "sha256-YGIJW+MCiTzFlQkUEjtxMvYpYgvJJZXyslin7Zw1jRU=";
hash = "sha256-0OQM+UNI1QX3V53OQ57NuDXr05BllaYRjKnNrFXpwDc=";
};
# there is nothing to strip in this package
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "pytest-homeassistant-custom-component";
version = "0.13.322";
version = "0.13.323";
pyproject = true;
disabled = pythonOlder "3.13";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "MatthewFlamm";
repo = "pytest-homeassistant-custom-component";
tag = version;
hash = "sha256-5SnDNnFdMFIT9f4+vbSk/F34lM2sWxkgk+IyqRqbT0Y=";
hash = "sha256-kYBtVhvmH7Jt7rJw54D8dbeo/PboEZh/o8lt62IoYvU=";
};
build-system = [ setuptools ];
+2 -2
View File
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "homeassistant-stubs";
version = "2026.4.1";
version = "2026.4.2";
pyproject = true;
disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "KapJI";
repo = "homeassistant-stubs";
tag = version;
hash = "sha256-jU1257IfLevROsRXHmx6jmq3ud0WhpsuiXaUm0tLKgc=";
hash = "sha256-IBzRmkKxh6jozVpkQdsTkOubHOjNPNirnitsZJ39oIg=";
};
build-system = [
+1 -1
View File
@@ -268,5 +268,5 @@ in
callPackages ../build-support/prefer-remote-fetch/tests.nix { }
);
home-assistant-component-tests = recurseIntoAttrs pkgs.home-assistant.tests.components;
home-assistant-components = recurseIntoAttrs pkgs.home-assistant.tests.components;
}
+5 -2
View File
@@ -52,12 +52,15 @@ let
getOutputs (lib.optionalAttrs success value);
getOutputs =
value: lib.genAttrs (value.outputs or (lib.optional (value ? out) "out")) (output: value.${output});
outputNames = defaultValue.outputs or (lib.optional (defaultValue ? out) "out");
outputSplice = spliceReal (
mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; }
);
in
# The derivation along with its outputs, which we recur
# on to splice them together.
if lib.isDerivation defaultValue then
augmentedValue
// spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; })
augmentedValue // lib.genAttrs outputNames (out: outputSplice.${out})
else if lib.isAttrs defaultValue then
spliceReal value'
else