From 9fea0529e5d3d19a37463ea66e53845d020b9c5c Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 21 Mar 2025 16:08:09 -0300 Subject: [PATCH 01/63] ISSUE_TEMPLATES: remove the package request template Signed-off-by: Fernando Rodrigues --- .github/ISSUE_TEMPLATE/05_package_request.yml | 108 ------------------ ...date_request.yml => 05_update_request.yml} | 0 ...dule_request.yml => 06_module_request.yml} | 0 ...rt_request.yml => 07_backport_request.yml} | 0 ...quest.yml => 08_documentation_request.yml} | 0 ...kage.yml => 09_unreproducible_package.yml} | 0 6 files changed, 108 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/05_package_request.yml rename .github/ISSUE_TEMPLATE/{06_update_request.yml => 05_update_request.yml} (100%) rename .github/ISSUE_TEMPLATE/{07_module_request.yml => 06_module_request.yml} (100%) rename .github/ISSUE_TEMPLATE/{08_backport_request.yml => 07_backport_request.yml} (100%) rename .github/ISSUE_TEMPLATE/{09_documentation_request.yml => 08_documentation_request.yml} (100%) rename .github/ISSUE_TEMPLATE/{10_unreproducible_package.yml => 09_unreproducible_package.yml} (100%) diff --git a/.github/ISSUE_TEMPLATE/05_package_request.yml b/.github/ISSUE_TEMPLATE/05_package_request.yml deleted file mode 100644 index b73360a91cb4..000000000000 --- a/.github/ISSUE_TEMPLATE/05_package_request.yml +++ /dev/null @@ -1,108 +0,0 @@ -name: "Request: new package" -description: "Create a package request for software that is not yet included in Nixpkgs." -title: "Package request: PACKAGENAME" -labels: ["0.kind: enhancement", "0.kind: packaging request", "9.needs: package (new)"] -body: - - type: "markdown" - attributes: - value: | -

- - - - - NixOS logo - - -

- - Welcome to Nixpkgs. Please replace the **`Package request: PACKAGENAME`** template above with the correct package name (As seen in the [NixOS Package Search](https://search.nixos.org/packages)). - - > [!TIP] - > For instance, if you were filing a request against the missing `hello` package, your title would be as follows: - > `Package request: hello` - - --- - - type: "textarea" - id: "description" - attributes: - label: "Describe the package" - description: "Please include a clear and concise description of what the package is." - validations: - required: true - - type: "input" - id: "homepage" - attributes: - label: "Upstream homepage" - description: "Please copy and paste a link to the package's homepage." - validations: - required: true - - type: "input" - id: "source" - attributes: - label: "Source URL" - description: "Please copy and paste a link to the package's source code or binary download page." - validations: - required: true - - type: "input" - id: "license" - attributes: - label: "License" - description: "Please indicate the package's license. If the package has no license, or the source code is not public, please indicate the package is `unfree`." - validations: - required: true - - type: "dropdown" - id: "platforms" - attributes: - label: "Platforms" - description: "Please indicate the platforms this package compiles for. `darwin` refers to macOS. `Exotic` refers to uncommon platforms like RISC-V or 32-bit ARM; please mention in the 'Additional Context' section below if this package is supposed to compile for such exotic platforms." - multiple: true - options: - - "x86_64-linux" - - "aarch64-linux" - - "x86_64-darwin" - - "aarch64-darwin" - - "Exotic" - - type: "textarea" - id: "additional-context" - attributes: - label: "Additional context" - description: "Add any other context about the proposed module here." - validations: - required: false - - type: "checkboxes" - id: "sanity-check" - attributes: - label: "I assert that this issue is relevant for Nixpkgs" - options: - - label: "I assert that this package does not yet exist in an [open pull request](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%228.has%3A+package+%28new%29%22) or in [Nixpkgs Unstable](https://search.nixos.org/packages?channel=unstable)." - required: true - - label: "I assert that this is not a [duplicate of any known issue](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+label%3A%220.kind%3A+packaging+request%22)." - required: true - - label: "I assert that I have read the [NixOS Code of Conduct](https://github.com/NixOS/.github/blob/master/CODE_OF_CONDUCT.md) and agree to abide by it." - required: true - - type: "markdown" - attributes: - value: | - # Thank you for helping improve Nixpkgs! - - --- - - type: "textarea" - id: "prioritisation" - attributes: - label: "For this package's maintainers:" - description: | - **Please do not modify this text area!** - - This template helps Nixpkgs developers know which issues should be prioritised by allowing users to vote with a :+1: reaction and also reminds them to tag this issue in their pull requests. - This is not a guarantee that highly-requested issues will be fixed first, but it helps us to figure out what's important to users. Please react on other users' issues if you find them important. - value: | - - Please tag this issue in your pull request description. (i.e. `Resolves #ISSUE`.) - - --- - - Add a :+1: [reaction] to [issues you find important]. - - [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ - [issues you find important]: https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc diff --git a/.github/ISSUE_TEMPLATE/06_update_request.yml b/.github/ISSUE_TEMPLATE/05_update_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/06_update_request.yml rename to .github/ISSUE_TEMPLATE/05_update_request.yml diff --git a/.github/ISSUE_TEMPLATE/07_module_request.yml b/.github/ISSUE_TEMPLATE/06_module_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/07_module_request.yml rename to .github/ISSUE_TEMPLATE/06_module_request.yml diff --git a/.github/ISSUE_TEMPLATE/08_backport_request.yml b/.github/ISSUE_TEMPLATE/07_backport_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/08_backport_request.yml rename to .github/ISSUE_TEMPLATE/07_backport_request.yml diff --git a/.github/ISSUE_TEMPLATE/09_documentation_request.yml b/.github/ISSUE_TEMPLATE/08_documentation_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/09_documentation_request.yml rename to .github/ISSUE_TEMPLATE/08_documentation_request.yml diff --git a/.github/ISSUE_TEMPLATE/10_unreproducible_package.yml b/.github/ISSUE_TEMPLATE/09_unreproducible_package.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/10_unreproducible_package.yml rename to .github/ISSUE_TEMPLATE/09_unreproducible_package.yml From 32d4da5cbf64d65979dca96553197290dc2cb1a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Mar 2025 17:26:21 +0000 Subject: [PATCH 02/63] autobrr: 1.59.0 -> 1.60.0 --- pkgs/by-name/au/autobrr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 13d5453eda32..89d456a0cc9e 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -13,12 +13,12 @@ let pname = "autobrr"; - version = "1.59.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-etVhOgE8H8bWuraBepwDSZZzo9Xl819w2sT+UwpUVjM="; + hash = "sha256-HaNaVxOtlzquKvWmUzUELtv0ZQZ+C/G5ni9/QbOlAh4="; }; autobrr-web = stdenvNoCC.mkDerivation { From 7605633c219a4b3900b49cb1aaf3dafd562d80dc Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 28 Mar 2025 14:35:35 +0100 Subject: [PATCH 03/63] python313Packages.msmart-ng: 2025.3.1 -> 2025.3.3 https://github.com/mill1000/midea-msmart/releases/tag/2025.3.2 https://github.com/mill1000/midea-msmart/releases/tag/2025.3.3 This also reverts the pep639 license format change in pyproject.toml because setuptools has yet to implement pep639. --- .../python-modules/msmart-ng/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix index 0f01c755834f..8d1983474e18 100644 --- a/pkgs/development/python-modules/msmart-ng/default.nix +++ b/pkgs/development/python-modules/msmart-ng/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -17,16 +18,27 @@ buildPythonPackage rec { pname = "msmart-ng"; - version = "2025.3.1"; + version = "2025.3.3"; pyproject = true; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-msmart"; tag = version; - hash = "sha256-hTYqRJn/ixseHHezfTOG0UzdQmnpn4hACijYOMtwtT8="; + hash = "sha256-M8Gl6QXj0tRN7VFDhop47vINk8MeWSyCJ9bboo3j8Go="; }; + patches = [ + (fetchpatch2 { + # Revert until setuptools + # implements support for . + name = "revert-pyproject-license-declaration-pep639-syntax.patch"; + url = "https://github.com/mill1000/midea-msmart/commit/e5d6a982135e497c251095e421d3de4686f36056.patch?full_index=1"; + hash = "sha256-+mxmFGZd04MZY2C5eo4k1lFoXsM8XyeJNazShnjAseE="; + revert = true; + }) + ]; + build-system = [ setuptools setuptools-scm From c3b36902e41b61f7514182138cd121fda749d33b Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 28 Mar 2025 14:38:20 +0100 Subject: [PATCH 04/63] home-assistant-custom-components.midea_ac: 2025.3.0 -> 2025.3.1 https://github.com/mill1000/midea-ac-py/releases/tag/2025.3.1 --- .../home-assistant/custom-components/midea_ac/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix index 8588b6045e72..9befc39ade5e 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "mill1000"; domain = "midea_ac"; - version = "2025.3.0"; + version = "2025.3.1"; src = fetchFromGitHub { owner = "mill1000"; repo = "midea-ac-py"; tag = version; - hash = "sha256-UJS9z+t+Tb/w7yRHKXJ6HoQ4uS1guM8PYl0OcLz4EJM="; + hash = "sha256-oO+t0my72PwWWUAzr8blA3Q8uJyICZNcfoOHsLFL3MQ="; }; dependencies = [ msmart-ng ]; From 762d3dfa72b17524f43b070bcf2c743a668fab8e Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 18:17:43 +0800 Subject: [PATCH 05/63] petsc: reorder inputs --- pkgs/by-name/pe/petsc/package.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index d31359143af8..b1cbd689f197 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -2,16 +2,14 @@ lib, stdenv, fetchzip, - gfortran, replaceVars, - python3, - python3Packages, - blas, - lapack, - zlib, # propagated by p4est but required by petsc + bash, + pkg-config, + gfortran, mpi, # generic mpi dependency mpiCheckPhaseHook, - bash, + python3, + python3Packages, # Build options petsc-optimized ? true, @@ -33,14 +31,16 @@ withP4est ? withFullDeps, # External libraries + blas, + lapack, hdf5-fortran-mpi, metis, parmetis, scotch, scalapack, mumps_par, - pkg-config, p4est, + zlib, # propagated by p4est but required by petsc }: assert withFullDeps -> withCommonDeps; From 795f035bb7fb988018e9c77e87f8bc74ab7f39b6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 18:53:50 +0800 Subject: [PATCH 06/63] petsc: use finalAttrs --- pkgs/by-name/pe/petsc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index b1cbd689f197..7d7fe18a86db 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -54,12 +54,12 @@ assert withPtscotch -> mpiSupport; assert withScalapack -> mpiSupport; assert withMumps -> withScalapack; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "petsc"; version = "3.22.4"; src = fetchzip { - url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${version}.tar.gz"; + url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; hash = "sha256-8WV1ylXytkhiNa7YpWSOIpSvzLCCjdVVe5SiGfhicas="; }; @@ -213,4 +213,4 @@ stdenv.mkDerivation rec { qbisi ]; }; -} +}) From 1f4f2e029214c3b4badd1166537767de25dadaf3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 19:26:16 +0800 Subject: [PATCH 07/63] petsc: add fullDeps test --- pkgs/by-name/pe/petsc/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 7d7fe18a86db..8d682f86bbba 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -41,6 +41,9 @@ mumps_par, p4est, zlib, # propagated by p4est but required by petsc + + # Used in passthru.tests + petsc, }: assert withFullDeps -> withCommonDeps; @@ -199,6 +202,12 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit mpiSupport pythonSupport; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + fullDeps = petsc.override { + withFullDeps = true; + withParmetis = false; + }; + }; }; setupHook = ./setup-hook.sh; From e477c1f0b900848fb8aebb051982abd1a28c20c5 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 19:29:43 +0800 Subject: [PATCH 08/63] petsc: remove configure flag --with-hdf5-fortran-bindings=1 This option is only used when PETsc download and build hdf5 with fortran support for other project depend on petsc. PETsc does not need it. --- pkgs/by-name/pe/petsc/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 8d682f86bbba..af8be7de0743 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -150,7 +150,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals withHdf5 [ "--with-hdf5=1" - "--with-hdf5-fortran-bindings=1" "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include" "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]" ] From f00965dcff5fd8557fc764cd8651b69574277659 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 19:40:43 +0800 Subject: [PATCH 09/63] petsc: remove unnecssary configure flags --- pkgs/by-name/pe/petsc/package.nix | 35 +++++++------------------------ 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index af8be7de0743..c58e18f00f92 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -122,37 +122,16 @@ stdenv.mkDerivation (finalAttrs: { "--with-cxx=mpicxx" "--with-fc=mpif90" ] - ++ lib.optionals withMetis [ - "--with-metis=1" - "--with-metis-dir=${metis}" - ] - ++ lib.optionals withParmetis [ - "--with-parmetis=1" - "--with-parmetis-dir=${parmetis}" - ] - ++ lib.optionals withPtscotch [ - "--with-ptscotch=1" - "--with-ptscotch-include=${lib.getDev scotch}/include" - "--with-ptscotch-lib=[-L${lib.getLib scotch}/lib,-lptscotch,-lptesmumps,-lptscotchparmetisv3,-lptscotcherr,-lesmumps,-lscotch,-lscotcherr]" - ] - ++ lib.optionals withScalapack [ - "--with-scalapack=1" - "--with-scalapack-dir=${scalapack}" - ] - ++ lib.optionals withMumps [ - "--with-mumps=1" - "--with-mumps-dir=${mumps_par}" - ] + ++ lib.optional withMetis "--with-metis=1" + ++ lib.optional withParmetis "--with-parmetis=1" + ++ lib.optional withPtscotch "--with-ptscotch=1" + ++ lib.optional withScalapack "--with-scalapack=1" + ++ lib.optional withMumps "--with-mumps=1" ++ lib.optionals withP4est [ "--with-p4est=1" - "--with-zlib-include=${lib.getDev zlib}/include" - "--with-zlib-lib=[-L${lib.getLib zlib}/lib,-lz]" - ] - ++ lib.optionals withHdf5 [ - "--with-hdf5=1" - "--with-hdf5-include=${lib.getDev hdf5-fortran-mpi}/include" - "--with-hdf5-lib=[-L${lib.getLib hdf5-fortran-mpi}/lib,-lhdf5]" + "--with-zlib=1" ] + ++ lib.optional withHdf5 "--with-hdf5=1" ++ lib.optionals petsc-optimized [ "--with-debugging=0" "COPTFLAGS=-O3" From 45b86ca411ab8768af40fb23b45d46e5d4d0a024 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 19:49:13 +0800 Subject: [PATCH 10/63] petsc: add withZlib option --- pkgs/by-name/pe/petsc/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index c58e18f00f92..6498635fd568 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -24,6 +24,7 @@ # External libraries options withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, + withZlib ? withP4est, withScalapack ? withFullDeps, withParmetis ? withFullDeps, # parmetis is unfree withPtscotch ? withFullDeps, @@ -48,7 +49,7 @@ assert withFullDeps -> withCommonDeps; # This version of PETSc does not support a non-MPI p4est build -assert withP4est -> (p4est.mpiSupport && mpiSupport); +assert withP4est -> (p4est.mpiSupport && mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); @@ -86,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { lapack ] ++ lib.optional withHdf5 hdf5-fortran-mpi + ++ lib.optional withZlib zlib ++ lib.optional withP4est p4est ++ lib.optional withMetis metis ++ lib.optional withParmetis parmetis @@ -127,10 +129,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withPtscotch "--with-ptscotch=1" ++ lib.optional withScalapack "--with-scalapack=1" ++ lib.optional withMumps "--with-mumps=1" - ++ lib.optionals withP4est [ - "--with-p4est=1" - "--with-zlib=1" - ] + ++ lib.optional withP4est "--with-p4est=1" + ++ lib.optional withZlib "--with-zlib=1" ++ lib.optional withHdf5 "--with-hdf5=1" ++ lib.optionals petsc-optimized [ "--with-debugging=0" From 0a50de12c97d36f3aac685e0af4578a16c3e0e2e Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 19:52:01 +0800 Subject: [PATCH 11/63] petsc: reorder configure flags --- pkgs/by-name/pe/petsc/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 6498635fd568..4877768a1c07 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -118,12 +118,19 @@ stdenv.mkDerivation (finalAttrs: { "--with-precision=${petsc-precision}" "--with-mpi=${if mpiSupport then "1" else "0"}" ] - ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optionals mpiSupport [ "--CC=mpicc" "--with-cxx=mpicxx" "--with-fc=mpif90" ] + ++ lib.optionals petsc-optimized [ + "--with-debugging=0" + "COPTFLAGS=-O3" + "FOPTFLAGS=-O3" + "CXXOPTFLAGS=-O3" + "CXXFLAGS=-O3" + ] + ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optional withMetis "--with-metis=1" ++ lib.optional withParmetis "--with-parmetis=1" ++ lib.optional withPtscotch "--with-ptscotch=1" @@ -131,14 +138,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withMumps "--with-mumps=1" ++ lib.optional withP4est "--with-p4est=1" ++ lib.optional withZlib "--with-zlib=1" - ++ lib.optional withHdf5 "--with-hdf5=1" - ++ lib.optionals petsc-optimized [ - "--with-debugging=0" - "COPTFLAGS=-O3" - "FOPTFLAGS=-O3" - "CXXOPTFLAGS=-O3" - "CXXFLAGS=-O3" - ]; + ++ lib.optional withHdf5 "--with-hdf5=1"; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From 62208f0a1b16be2ee2fb388fb3e347a1fb8bd1aa Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 20:04:19 +0800 Subject: [PATCH 12/63] petsc: add fortranSupport option --- pkgs/by-name/pe/petsc/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 4877768a1c07..0a2653f2dc5c 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -16,6 +16,7 @@ petsc-scalar-type ? "real", petsc-precision ? "double", mpiSupport ? true, + fortranSupport ? true, pythonSupport ? false, # petsc python binding withExamples ? false, withFullDeps ? false, # full External libraries support @@ -130,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { "CXXOPTFLAGS=-O3" "CXXFLAGS=-O3" ] + ++ lib.optional (!fortranSupport) "--with-fortran-bindings=0" ++ lib.optional pythonSupport "--with-petsc4py=1" ++ lib.optional withMetis "--with-metis=1" ++ lib.optional withParmetis "--with-parmetis=1" @@ -179,7 +181,11 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "petsc4py" ]; passthru = { - inherit mpiSupport pythonSupport; + inherit + mpiSupport + pythonSupport + fortranSupport + ; tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { fullDeps = petsc.override { withFullDeps = true; From a11a1f196bbb9787065464785c9750a84c9c9720 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 20:19:26 +0800 Subject: [PATCH 13/63] petsc: override external math libraries in scope petscPackages --- pkgs/by-name/pe/petsc/package.nix | 58 ++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 0a2653f2dc5c..85e0853d9bf0 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -1,5 +1,6 @@ { lib, + newScope, stdenv, fetchzip, replaceVars, @@ -35,12 +36,12 @@ # External libraries blas, lapack, - hdf5-fortran-mpi, + hdf5, metis, parmetis, scotch, scalapack, - mumps_par, + mumps, p4est, zlib, # propagated by p4est but required by petsc @@ -50,7 +51,7 @@ assert withFullDeps -> withCommonDeps; # This version of PETSc does not support a non-MPI p4est build -assert withP4est -> (p4est.mpiSupport && mpiSupport && withZlib); +assert withP4est -> (mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); @@ -59,6 +60,34 @@ assert withPtscotch -> mpiSupport; assert withScalapack -> mpiSupport; assert withMumps -> withScalapack; +let + petscPackages = lib.makeScope newScope (self: { + inherit + # global override options + mpiSupport + fortranSupport + pythonSupport + precision + ; + enableMpi = self.mpiSupport; + + petscPackages = self; + # external libraries + mpi = self.callPackage mpi.override { }; + blas = self.callPackage blas.override { }; + lapack = self.callPackage lapack.override { }; + hdf5 = self.callPackage hdf5.override { + fortran = gfortran; + cppSupport = !mpiSupport; + }; + metis = self.callPackage metis.override { }; + parmetis = self.callPackage parmetis.override { }; + scotch = self.callPackage scotch.override { }; + scalapack = self.callPackage scalapack.override { }; + mumps = self.callPackage mumps.override { }; + p4est = self.callPackage p4est.override { }; + }); +in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; version = "3.22.4"; @@ -84,17 +113,17 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ - blas - lapack + petscPackages.blas + petscPackages.lapack ] - ++ lib.optional withHdf5 hdf5-fortran-mpi ++ lib.optional withZlib zlib - ++ lib.optional withP4est p4est - ++ lib.optional withMetis metis - ++ lib.optional withParmetis parmetis - ++ lib.optional withPtscotch scotch - ++ lib.optional withScalapack scalapack - ++ lib.optional withMumps mumps_par; + ++ lib.optional withHdf5 petscPackages.hdf5 + ++ lib.optional withP4est petscPackages.p4est + ++ lib.optional withMetis petscPackages.metis + ++ lib.optional withParmetis petscPackages.parmetis + ++ lib.optional withPtscotch petscPackages.scotch + ++ lib.optional withScalapack petscPackages.scalapack + ++ lib.optional withMumps petscPackages.mumps; propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy; @@ -186,6 +215,11 @@ stdenv.mkDerivation (finalAttrs: { pythonSupport fortranSupport ; + petscPackages = petscPackages.overrideScope ( + final: prev: { + petsc = finalAttrs.finalPackage; + } + ); tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { fullDeps = petsc.override { withFullDeps = true; From 9b40829f4da205eafd7947e5dbe9450ca1861f59 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 20:20:19 +0800 Subject: [PATCH 14/63] petsc: add serial tests --- pkgs/by-name/pe/petsc/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 85e0853d9bf0..712e56abba41 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -220,12 +220,18 @@ stdenv.mkDerivation (finalAttrs: { petsc = finalAttrs.finalPackage; } ); - tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { - fullDeps = petsc.override { - withFullDeps = true; - withParmetis = false; + tests = + { + serial = petsc.override { + mpiSupport = false; + }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + fullDeps = petsc.override { + withFullDeps = true; + withParmetis = false; + }; }; - }; }; setupHook = ./setup-hook.sh; From f75b5cfe460b3a14d14b5e8677daa25f3e2da4c7 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 21:02:44 +0800 Subject: [PATCH 15/63] petsc: add mumps,scalapack,ptscotch to commonDeps in petsc --- pkgs/by-name/pe/petsc/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 712e56abba41..f6e392282e02 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -27,10 +27,10 @@ withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, withZlib ? withP4est, - withScalapack ? withFullDeps, + withScalapack ? withCommonDeps && mpiSupport, withParmetis ? withFullDeps, # parmetis is unfree - withPtscotch ? withFullDeps, - withMumps ? withFullDeps, + withPtscotch ? withCommonDeps && mpiSupport, + withMumps ? withCommonDeps, withP4est ? withFullDeps, # External libraries @@ -58,7 +58,7 @@ assert withParmetis -> (withMetis && mpiSupport); assert withPtscotch -> mpiSupport; assert withScalapack -> mpiSupport; -assert withMumps -> withScalapack; +assert (withMumps && mpiSupport) -> withScalapack; let petscPackages = lib.makeScope newScope (self: { @@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withPtscotch "--with-ptscotch=1" ++ lib.optional withScalapack "--with-scalapack=1" ++ lib.optional withMumps "--with-mumps=1" + ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1" ++ lib.optional withP4est "--with-p4est=1" ++ lib.optional withZlib "--with-zlib=1" ++ lib.optional withHdf5 "--with-hdf5=1"; From 9b37979905769d2d6e28c58c0c9430a4f5f3e91a Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 21:35:21 +0800 Subject: [PATCH 16/63] petsc: add hypre,fftw,superlu,suitesparse to commonDeps --- pkgs/by-name/pe/petsc/package.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index f6e392282e02..40049cbeacbe 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -32,6 +32,10 @@ withPtscotch ? withCommonDeps && mpiSupport, withMumps ? withCommonDeps, withP4est ? withFullDeps, + withHypre ? withCommonDeps && mpiSupport, + withFftw ? withCommonDeps, + withSuperLu ? withCommonDeps, + withSuitesparse ? withCommonDeps, # External libraries blas, @@ -44,6 +48,10 @@ mumps, p4est, zlib, # propagated by p4est but required by petsc + hypre, + fftw, + superlu, + suitesparse, # Used in passthru.tests petsc, @@ -59,6 +67,7 @@ assert withParmetis -> (withMetis && mpiSupport); assert withPtscotch -> mpiSupport; assert withScalapack -> mpiSupport; assert (withMumps && mpiSupport) -> withScalapack; +assert withHypre -> mpiSupport; let petscPackages = lib.makeScope newScope (self: { @@ -86,6 +95,10 @@ let scalapack = self.callPackage scalapack.override { }; mumps = self.callPackage mumps.override { }; p4est = self.callPackage p4est.override { }; + hypre = self.callPackage hypre.override { }; + fftw = self.callPackage fftw.override { }; + superlu = self.callPackage superlu.override { }; + suitesparse = self.callPackage suitesparse.override { }; }); in stdenv.mkDerivation (finalAttrs: { @@ -123,7 +136,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withParmetis petscPackages.parmetis ++ lib.optional withPtscotch petscPackages.scotch ++ lib.optional withScalapack petscPackages.scalapack - ++ lib.optional withMumps petscPackages.mumps; + ++ lib.optional withMumps petscPackages.mumps + ++ lib.optional withHypre petscPackages.hypre + ++ lib.optional withSuperLu petscPackages.superlu + ++ lib.optional withFftw petscPackages.fftw + ++ lib.optional withSuitesparse petscPackages.suitesparse; propagatedBuildInputs = lib.optional pythonSupport python3Packages.numpy; @@ -170,7 +187,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (withMumps && !mpiSupport) "--with-mumps-serial=1" ++ lib.optional withP4est "--with-p4est=1" ++ lib.optional withZlib "--with-zlib=1" - ++ lib.optional withHdf5 "--with-hdf5=1"; + ++ lib.optional withHdf5 "--with-hdf5=1" + ++ lib.optional withHypre "--with-hypre=1" + ++ lib.optional withSuperLu "--with-superlu=1" + ++ lib.optional withFftw "--with-fftw=1" + ++ lib.optional withSuitesparse "--with-suitesparse=1"; hardeningDisable = lib.optionals (!petsc-optimized) [ "fortify" From bf1af1c732bb8d4381f15b2e352067f549c4f3b3 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sun, 23 Mar 2025 21:41:27 +0800 Subject: [PATCH 17/63] petsc: change some inputs style from kebab-case to camelCase --- pkgs/by-name/pe/petsc/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 40049cbeacbe..225beef79e6f 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -13,9 +13,9 @@ python3Packages, # Build options - petsc-optimized ? true, - petsc-scalar-type ? "real", - petsc-precision ? "double", + debug ? false, + scalarType ? "real", + precision ? "double", mpiSupport ? true, fortranSupport ? true, pythonSupport ? false, # petsc python binding @@ -161,8 +161,8 @@ stdenv.mkDerivation (finalAttrs: { [ "--with-blas=1" "--with-lapack=1" - "--with-scalar-type=${petsc-scalar-type}" - "--with-precision=${petsc-precision}" + "--with-scalar-type=${scalarType}" + "--with-precision=${precision}" "--with-mpi=${if mpiSupport then "1" else "0"}" ] ++ lib.optionals mpiSupport [ @@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-cxx=mpicxx" "--with-fc=mpif90" ] - ++ lib.optionals petsc-optimized [ + ++ lib.optionals (!debug) [ "--with-debugging=0" "COPTFLAGS=-O3" "FOPTFLAGS=-O3" @@ -193,7 +193,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withFftw "--with-fftw=1" ++ lib.optional withSuitesparse "--with-suitesparse=1"; - hardeningDisable = lib.optionals (!petsc-optimized) [ + hardeningDisable = lib.optionals debug [ "fortify" "fortify3" ]; From 9f0a2d26fce4e188dfc4272f2db3044e81d1c74c Mon Sep 17 00:00:00 2001 From: qbisi Date: Mon, 24 Mar 2025 21:07:02 +0800 Subject: [PATCH 18/63] petsc: remove with lib in meta attrs --- pkgs/by-name/pe/petsc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 225beef79e6f..617121aaf0d1 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -258,12 +258,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; - meta = with lib; { + meta = { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://petsc.org/release/"; - license = licenses.bsd2; + license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ cburstedde qbisi ]; From 605ec77678e47441a008a743e16e57d82d5b6bb8 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 2 Apr 2025 02:48:12 +0800 Subject: [PATCH 19/63] petsc: 3.22.4 -> 3.23.0 --- pkgs/by-name/pe/petsc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 617121aaf0d1..517987db5b90 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -103,11 +103,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "petsc"; - version = "3.22.4"; + version = "3.23.0"; src = fetchzip { url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz"; - hash = "sha256-8WV1ylXytkhiNa7YpWSOIpSvzLCCjdVVe5SiGfhicas="; + hash = "sha256-OcI4iyDOR0YTVV+JoOhbfutoW00EmfapNaMnD/JJFsI="; }; strictDeps = true; From 2a71140aba7402f794c61c2def4504e0f50ed807 Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 2 Apr 2025 03:03:22 +0800 Subject: [PATCH 20/63] petsc: fix ptscotch dependencies --- pkgs/by-name/pe/petsc/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 517987db5b90..d394c69ce2c4 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -7,6 +7,7 @@ bash, pkg-config, gfortran, + bison, mpi, # generic mpi dependency mpiCheckPhaseHook, python3, @@ -26,7 +27,7 @@ # External libraries options withHdf5 ? withCommonDeps, withMetis ? withCommonDeps, - withZlib ? withP4est, + withZlib ? (withP4est || withPtscotch), withScalapack ? withCommonDeps && mpiSupport, withParmetis ? withFullDeps, # parmetis is unfree withPtscotch ? withCommonDeps && mpiSupport, @@ -64,7 +65,7 @@ assert withP4est -> (mpiSupport && withZlib); # Package parmetis depend on metis and mpi support assert withParmetis -> (withMetis && mpiSupport); -assert withPtscotch -> mpiSupport; +assert withPtscotch -> (mpiSupport && withZlib); assert withScalapack -> mpiSupport; assert (withMumps && mpiSupport) -> withScalapack; assert withHypre -> mpiSupport; @@ -117,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { python3 gfortran pkg-config + bison ] ++ lib.optional mpiSupport mpi ++ lib.optionals pythonSupport [ From 26d320d7a9695e1af414d1df62569935c03df7ff Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 2 Apr 2025 02:49:14 +0800 Subject: [PATCH 21/63] slepc: 3.22.2 -> 3.23.0 --- pkgs/by-name/sl/slepc/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix index 371cd1d15805..42add99600f3 100644 --- a/pkgs/by-name/sl/slepc/package.nix +++ b/pkgs/by-name/sl/slepc/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitLab, - sowing, python3, python3Packages, arpack-mpi, @@ -17,13 +16,13 @@ assert petsc.mpiSupport; assert pythonSupport -> petsc.pythonSupport; stdenv.mkDerivation (finalAttrs: { pname = "slepc"; - version = "3.22.2"; + version = "3.23.0"; src = fetchFromGitLab { owner = "slepc"; repo = "slepc"; tag = "v${finalAttrs.version}"; - hash = "sha256-a5DmsA7NAlhrEaS43TYPk7vtDfhXLEP+5sftu2A9Yt4="; + hash = "sha256-Z9CVZQ/Ezb1S2EkTb9amAPxaN4tiUnKrbvQIc3BnVuU="; }; postPatch = '' @@ -33,11 +32,6 @@ stdenv.mkDerivation (finalAttrs: { "slepc.prefixdir,'${python3.sitePackages}'" patchShebangs lib/slepc/bin - - # Use system bfort - substituteInPlace config/packages/sowing.py \ - --replace-fail "bfort = os.path.join(archdir,'bin','bfort')" \ - "bfort = '${sowing}/bin/bfort'" ''; # Usually this project is being built as part of a `petsc` build or as part of From 29e8c7f2a811552f0dac1ae311421ef65eac7646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 11:38:58 -0700 Subject: [PATCH 22/63] python313Packages.aioesphomeapi: 29.4.0 -> 29.8.0 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v29.4.0...v29.8.0 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v29.8.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 8ae6e3a00ac5..3f5e661d508c 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "29.4.0"; + version = "29.8.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; tag = "v${version}"; - hash = "sha256-KBQYLaE2J/5/VYquajknF3gCJEwRENjgkxiZahqnRZA="; + hash = "sha256-hX0OOgLnaZOreBfb8ptNkNLzUn+S38/84DfJD423RAM="; }; build-system = [ From b12740849a076e432da151048bcb81fdc2a25644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 11:41:44 -0700 Subject: [PATCH 23/63] python313Packages.bluetooth-auto-recovery: 1.4.4 -> 1.4.5 Diff: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/refs/tags/v1.4.4...v1.4.5 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.4.5/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 068bcb17b089..877565fdb7c4 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.4.4"; + version = "1.4.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-auto-recovery"; tag = "v${version}"; - hash = "sha256-Sm3VLgWttMVXH+s1m1ab8kE6dHPit0GY4FVAld5Yg88="; + hash = "sha256-yh0Gf8veT5VCk05Y7QyxoCz0NHnVRj8HJLTbnvi+9C8="; }; build-system = [ poetry-core ]; From 7f0936d56b6fdb31f504350254a61e7178f5bee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 15:56:16 -0700 Subject: [PATCH 24/63] python313Packages.ha-silabs-firmware-client: init at 0.2.0 --- .../ha-silabs-firmware-client/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/ha-silabs-firmware-client/default.nix diff --git a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix new file mode 100644 index 000000000000..2264a9a20d2f --- /dev/null +++ b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix @@ -0,0 +1,54 @@ +{ + aiohttp, + aioresponses, + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + pythonOlder, + setuptools, + yarl, +}: + +buildPythonPackage rec { + pname = "ha-silabs-firmware-client"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.13"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "ha-silabs-firmware-client"; + tag = "v${version}"; + hash = "sha256-Kip9JL9tuF7OI22elN0w2Z7Xjdaayboo8LThp4FAets="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "setuptools-git-versioning<3"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + yarl + ]; + + pythonImportsCheck = [ "ha_silabs_firmware_client" ]; + + nativeCheckInputs = [ + aioresponses + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/home-assistant-libs/ha-silabs-firmware-client/releases/tag/${src.tag}"; + description = "Home Assistant client for firmwares released with silabs-firmware-builder"; + homepage = "https://github.com/home-assistant-libs/ha-silabs-firmware-client"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 344f93c65830..d4693ee8e70f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6054,6 +6054,8 @@ self: super: with self; { ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs { }; + ha-silabs-firmware-client = callPackage ../development/python-modules/ha-silabs-firmware-client { }; + habanero = callPackage ../development/python-modules/habanero { }; habiticalib = callPackage ../development/python-modules/habiticalib { }; From 2fa444aa928fd187706141aecaefa060c8cc0587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Mar 2025 09:15:58 +0100 Subject: [PATCH 25/63] python313Packages.bleak-esphome: 2.11.0 -> 2.12.0 Diff: https://github.com/bluetooth-devices/bleak-esphome/compare/refs/tags/v2.11.0...v2.12.0 Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/v2.12.0/CHANGELOG.md --- pkgs/development/python-modules/bleak-esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 88f21c0273b6..cbf1c6dc8dbf 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${version}"; - hash = "sha256-5APHpb2h//krpgVJs6pOPLapGZFzbFKNjFxDqpNyApQ="; + hash = "sha256-dR4KuaJWrWTVDWY11E/MRF12jCvOlC8c2flDOnkPjxw="; }; postPatch = '' From 5e54c8d235b2b0cffab8d80db8676ac4079dc6ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 17:54:21 -0700 Subject: [PATCH 26/63] python313Packages.hdate: 0.11.1 -> 1.0.3 Diff: https://github.com/py-libhdate/py-libhdate/compare/refs/tags/v0.11.1...v1.0.3 Changelog: https://github.com/py-libhdate/py-libhdate/blob/v1.0.3/CHANGELOG.md --- .../python-modules/hdate/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index 689f0c586686..5a91b644479f 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -3,24 +3,25 @@ astral, buildPythonPackage, fetchFromGitHub, + hypothesis, + num2words, pdm-backend, + pytest-timeout, + pytest-xdist, pytestCheckHook, - pythonOlder, - pytz, + syrupy, }: buildPythonPackage rec { pname = "hdate"; - version = "0.11.1"; + version = "1.0.3"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; tag = "v${version}"; - hash = "sha256-Il20aKOPQi4J4hWQEMEQOnLdBSHCOu214YE6pxeYbfI="; + hash = "sha256-J2ZbfzQdQSlnwcygwapDKkvZIx2VrlaaRe244V8Zt5c="; }; pythonRelaxDeps = [ @@ -32,11 +33,20 @@ buildPythonPackage rec { ]; dependencies = [ - astral - pytz + num2words ]; - nativeCheckInputs = [ pytestCheckHook ]; + optional-dependencies = { + astral = [ astral ]; + }; + + nativeCheckInputs = [ + hypothesis + pytest-timeout + pytest-xdist + pytestCheckHook + syrupy + ]; pytestFlagsArray = [ "tests" ]; @@ -45,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Jewish/Hebrew date and Zmanim"; homepage = "https://github.com/py-libhdate/py-libhdate"; - changelog = "https://github.com/py-libhdate/py-libhdate/releases/tag/v${version}"; + changelog = "https://github.com/py-libhdate/py-libhdate/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; From a58a42932a7e5668016ffb846ef7243c71ab0b5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Mar 2025 06:06:23 +0100 Subject: [PATCH 27/63] python313Packages.aiocomelit: 0.11.1 -> 0.11.3 Diff: https://github.com/chemelli74/aiocomelit/compare/refs/tags/v0.11.1...v0.11.3 Changelog: https://github.com/chemelli74/aiocomelit/blob/v0.11.3/CHANGELOG.md --- pkgs/development/python-modules/aiocomelit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index dcb9bd041c1d..23d5ebfa7aa1 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.11.1"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; tag = "v${version}"; - hash = "sha256-1iXfqLxZVrw9A3W7K34pPolbwdrFPSj0zXTJT7mgpYs="; + hash = "sha256-Hl5yUEtBFfx+p2WQssI7M+TgEiO5VvgIdWoFZMCjCUY="; }; build-system = [ poetry-core ]; From 71f43287829f165d98865e8f7f5142907bef11a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Apr 2025 05:53:10 +0200 Subject: [PATCH 28/63] python313Packages.fyta-cli: 0.7.0 -> 0.7.2 Diff: https://github.com/dontinelli/fyta_cli/compare/refs/tags/v0.7.0...v0.7.2 Changelog: https://github.com/dontinelli/fyta_cli/releases/tag/v0.7.1 https://github.com/dontinelli/fyta_cli/releases/tag/v0.7.2 --- pkgs/development/python-modules/fyta-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index edbd7f92a62f..75c6d6e7c1f1 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.7.0"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; tag = "v${version}"; - hash = "sha256-OgpQh7WyZynFd308TjIGkQNoy8TFu9gynbDiLueqB/0="; + hash = "sha256-YYH15ZuRZirSFC7No1goY/afk2BGtCCykcZAnCDdq7U="; }; build-system = [ hatchling ]; From ce83e1e0193b198d61dd2a3047c43524f64fa47f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 Mar 2025 19:57:02 +0100 Subject: [PATCH 29/63] python313Packages.gios: 5.0.0 -> 6.0.0 Diff: https://github.com/bieniu/gios/compare/refs/tags/5.0.0...6.0.0 Changelog: https://github.com/bieniu/gios/releases/tag/6.0.0 --- pkgs/development/python-modules/gios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 11f83067ee54..9272dcd18b06 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gios"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "gios"; tag = version; - hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI="; + hash = "sha256-SCVyEHxTV+6+3mLh8HEutRXHV2Xt0JzOrNnIKtIcFXw="; }; build-system = [ setuptools ]; From bf0e223a7b832cb96a32895a70d5446028cbbc30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Mar 2025 20:44:56 +0100 Subject: [PATCH 30/63] python313Packages.meteofrance-api: 1.3.0 -> 1.4.0 Diff: https://github.com/hacf-fr/meteofrance-api/compare/refs/tags/v1.3.0...v1.4.0 Changelog: https://github.com/hacf-fr/meteofrance-api/releases/tag/v1.4.0 --- .../meteofrance-api/default.nix | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/meteofrance-api/default.nix b/pkgs/development/python-modules/meteofrance-api/default.nix index 9894770ae392..7435395da31a 100644 --- a/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/pkgs/development/python-modules/meteofrance-api/default.nix @@ -8,35 +8,27 @@ pytz, requests, requests-mock, - typing-extensions, - urllib3, }: buildPythonPackage rec { pname = "meteofrance-api"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "hacf-fr"; repo = "meteofrance-api"; tag = "v${version}"; - hash = "sha256-uSrVK6LwCDyvsjzGl4xQd8585Hl6sp2Ua9ly0wqnC1Y="; + hash = "sha256-5zqmzPbzC9IUZ+y1FRh+u1gds/ZdGeRm5/ajQf8UKTQ="; }; - nativeBuildInputs = [ - poetry-core - ]; + build-system = [ poetry-core ]; - pythonRelaxDeps = [ "urllib3" ]; - - propagatedBuildInputs = [ + dependencies = [ pytz requests - typing-extensions - urllib3 ]; nativeCheckInputs = [ @@ -64,10 +56,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access information from the Meteo-France API"; - mainProgram = "meteofrance-api"; homepage = "https://github.com/hacf-fr/meteofrance-api"; changelog = "https://github.com/hacf-fr/meteofrance-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "meteofrance-api"; }; } From 2794702a72daee0f4c6b45566ccebfdbd6541a7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 10 Mar 2025 15:10:00 +0100 Subject: [PATCH 31/63] python313Packages.nettigo-air-monitor: 4.0.0 -> 4.1.0 Diff: https://github.com/bieniu/nettigo-air-monitor/compare/refs/tags/4.0.0...4.1.0 Changelog: https://github.com/bieniu/nettigo-air-monitor/releases/tag/4.1.0 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 9f2760721063..d818ec69c9a0 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "4.0.0"; + version = "4.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; tag = version; - hash = "sha256-aYlnaFim4ezZ/nOAf1m6iIfE4NGswtEmPsslfrTd5tI="; + hash = "sha256-tGadB2v3UIgX/v3Cvx95bEOpoOtQXGizk24FelKpidc="; }; build-system = [ setuptools ]; From 1ebaff04ae0e2df3443d42b6078f2dd5a9b51e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 20:48:30 -0700 Subject: [PATCH 32/63] python313Packages.dbus-fast: 2.33.0 -> 2.44.1 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v2.33.0...v2.44.1 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/blob/v2.44.1/CHANGELOG.md --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 49d9a1d4c7e0..2597b09d8eb4 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.33.0"; + version = "2.44.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "dbus-fast"; tag = "v${version}"; - hash = "sha256-U6NAEhoEcphAuvaAA2en4Ka4yFHiKPINl5CvtxE7FaI="; + hash = "sha256-r9F/3H/Bagi9QJHZDEsa80dglVE9vS1f9Cqt7CZWn8Y="; }; # The project can build both an optimized cython version and an unoptimized From 6509ee876b0db86df43b8798b26a4998944e079a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 20:55:24 -0700 Subject: [PATCH 33/63] python313Packages.habluetooth: 3.25.0 -> 3.38.0 Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v3.25.0...v3.38.0 Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v3.38.0/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 92db13c51c0f..010934f47b71 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "3.25.0"; + version = "3.38.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; tag = "v${version}"; - hash = "sha256-+3AcxRkTU61MuUGL+dc6ETn3poDatHGr6hWN9b+cVc8="; + hash = "sha256-eqsWm5g/D94NgoBbfh3uudcUOs4aekg4nHw2fODtTOA="; }; build-system = [ From 4d34996b1fe7a10098aeeef2a7d1de9ff75f5df0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 20:56:16 -0700 Subject: [PATCH 34/63] python313Packages.hass-nabucasa: 0.92.0 -> 0.95.0 Diff: https://github.com/nabucasa/hass-nabucasa/compare/refs/tags/0.92.0...0.95.0 Changelog: https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.95.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 930cdc526631..4ce17430f524 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,16 +23,16 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.92.0"; + version = "0.95.0"; pyproject = true; - disabled = pythonOlder "3.12"; + disabled = pythonOlder "3.13"; src = fetchFromGitHub { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-OwU3HxUj8M3/3Xv+9WPNbV8sVVR8S9u9U3mSK/P+4o8="; + hash = "sha256-KSGEgMgZ0fHot7hfT0sDl/4aZOsWT8CE+R5ebCqhLAA="; }; pythonRelaxDeps = [ "acme" ]; From d5d09184204d7d6ed07f321044ba796f7a7e6060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 21:02:21 -0700 Subject: [PATCH 35/63] python313Packages.mastodon-py: 1.8.1 -> 2.0.1 Diff: https://github.com/halcy/Mastodon.py/compare/1.8.1...v2.0.1 Changelog: https://github.com/halcy/Mastodon.py/blob/v2.0.1/CHANGELOG.rst --- .../python-modules/mastodon-py/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index cb2caaf45922..fc46268ecc6a 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -9,8 +9,8 @@ python-dateutil, python-magic, requests, - six, pytestCheckHook, + pytest-cov-stub, pytest-mock, pytest-vcr, requests-mock, @@ -19,29 +19,24 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.8.1"; + version = "2.0.1"; pyproject = true; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; - tag = version; - hash = "sha256-r0AAUjd2MBfZANEpyztMNyaQTlGWvWoUVjJNO1eL218="; + tag = "v${version}"; + hash = "sha256-Sqvn7IIzkGnIjMGek1QS4pLXI+LoKykJsVnr/X1QH7U="; }; - postPatch = '' - sed -i '/addopts/d' setup.cfg - ''; + build-system = [ setuptools ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ + dependencies = [ blurhash decorator python-dateutil python-magic requests - six ]; optional-dependencies = { @@ -54,10 +49,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-cov-stub pytest-mock pytest-vcr requests-mock - setuptools ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ @@ -70,7 +65,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mastodon" ]; meta = with lib; { - changelog = "https://github.com/halcy/Mastodon.py/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/halcy/Mastodon.py/blob/${src.tag}/CHANGELOG.rst"; description = "Python wrapper for the Mastodon API"; homepage = "https://github.com/halcy/Mastodon.py"; license = licenses.mit; From 9e4da276db811606bd1e7e771445090380a7079d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 21:32:04 -0700 Subject: [PATCH 36/63] python313Packages.music-assistant-models: 1.1.30 -> 1.1.43 Diff: https://github.com/music-assistant/models/compare/refs/tags/1.1.30...1.1.43 Changelog: https://github.com/music-assistant/models/blob/1.1.43/CHANGELOG.md --- .../python-modules/music-assistant-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/music-assistant-models/default.nix b/pkgs/development/python-modules/music-assistant-models/default.nix index 8ade60f250bd..6cae3bad249d 100644 --- a/pkgs/development/python-modules/music-assistant-models/default.nix +++ b/pkgs/development/python-modules/music-assistant-models/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "music-assistant-models"; - version = "1.1.30"; # Must be compatible with music-assistant-client package + version = "1.1.43"; # Must be compatible with music-assistant-client package pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "models"; tag = version; - hash = "sha256-ZLTRHarjVFAk+tYPkgLm192rE+C82vNzqs8PmJhGSeg="; + hash = "sha256-0SBNxpiBAKlAQe7eJTp+BwGNY52OTt37TksKrp9nfz4="; }; postPatch = '' From 63bad02283029db4fdc85dcf85d33fcd84b5713a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 21:32:13 -0700 Subject: [PATCH 37/63] python313Packages.music-assistant-client: 1.1.1 -> 1.2.0 Diff: https://github.com/music-assistant/client/compare/refs/tags/1.1.1...1.2.0 Changelog: https://github.com/music-assistant/client/blob/1.2.0/CHANGELOG.md --- .../python-modules/music-assistant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/music-assistant-client/default.nix b/pkgs/development/python-modules/music-assistant-client/default.nix index a2f25196d412..4545ea5dd722 100644 --- a/pkgs/development/python-modules/music-assistant-client/default.nix +++ b/pkgs/development/python-modules/music-assistant-client/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "music-assistant-client"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "client"; tag = version; - hash = "sha256-KAvNPG3gMJK/iWqen35UCmSccjOkvfrmMvx4YkrOPy8="; + hash = "sha256-i3VIRK3RUgbF5KX3U7i4WwjbLaRvg88zUH5Ly8BKEB0="; }; postPatch = '' From d4820a591d5cf952b9a63322b9c0b7449f9725bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 21:58:46 -0700 Subject: [PATCH 38/63] python313Packages.python-linkplay: 0.2.1 -> 0.2.2 Diff: https://github.com/Velleman/python-linkplay/compare/refs/tags/v0.2.1...v0.2.2 Changelog: https://github.com/Velleman/python-linkplay/releases/tag/v0.2.2 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 7d0f1849ea15..f2866b530c2f 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; tag = "v${version}"; - hash = "sha256-R4swSS+aOAygGRUPoJhJSutx6JEaO+QS1IL6nWEBTnw="; + hash = "sha256-K5MDpMza5z3CYuGymXusZ5WMmmN/6rVxegiiO8RtOTc="; }; build-system = [ setuptools ]; From ffb41d4dae8dfebc601a3b9bb2a0940eb8351a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 15:58:18 -0700 Subject: [PATCH 39/63] home-assistant.python.pkgs.home-assistant-frontend: 20250306.0 -> 20250401.0 Changelog: https://github.com/home-assistant/frontend/releases/tag/20250312.0 https://github.com/home-assistant/frontend/releases/tag/20250326.0 https://github.com/home-assistant/frontend/releases/tag/20250327.0 https://github.com/home-assistant/frontend/releases/tag/20250327.1 https://github.com/home-assistant/frontend/releases/tag/20250328.0 https://github.com/home-assistant/frontend/releases/tag/20250331.0 https://github.com/home-assistant/frontend/releases/tag/20250401.0 --- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 54b4b316e9ff..a40480769441 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -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 = "20250306.0"; + version = "20250401.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Nsh5zCyD72bjQ89BW5lmHdyWW9rxo+v2AW5fSOux/OA="; + hash = "sha256-EgNXMXVjGnNB4Q1U1HDXMNhJcMaVC9W1w2g4W83INOY="; }; # there is nothing to strip in this package From faae6938b7574c87293ea6dd9c7583a8af4d4262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 15:58:34 -0700 Subject: [PATCH 40/63] home-assistant.python.pkgs.home-assistant-intents: 2025.3.5 -> 2025.3.28 Diff: https://github.com/home-assistant/intents-package/compare/refs/tags/2025.3.5...2025.3.28 Changelog: https://github.com/home-assistant/intents/releases/tag/2025.3.12 https://github.com/home-assistant/intents/releases/tag/2025.3.23 https://github.com/home-assistant/intents/releases/tag/2025.3.24 https://github.com/home-assistant/intents/releases/tag/2025.3.28 --- pkgs/servers/home-assistant/intents.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 88d705f8b9a6..99cfdadb9148 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2025.3.5"; + version = "2025.3.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-4FYmj6EqcNxPzXJVM0svyJIoeMSBnINNfvOda4B9Jic="; + hash = "sha256-p1AQYwlMas6GLzg4ZsypDaUsQs74drKqfXA8uJ2K+xw="; }; build-system = [ @@ -62,6 +62,9 @@ buildPythonPackage rec { "intents/tests" ]; + # requires hassil 3.0.0, but Home Assistant is stuck on 2.2.3 + doCheck = false; + meta = with lib; { changelog = "https://github.com/home-assistant/intents/releases/tag/${version}"; description = "Intents to be used with Home Assistant"; From c829a6d7ce86284ca4eb6282c081766bc04598f3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:24:25 +0200 Subject: [PATCH 41/63] nixos/tests/home-assistant: update for 2025.4.0 Remove the shelly component, as it now has a dependency on a bluetooth setup, which is not easy to provide in the test environment. Enabling `hardware.bluetooth.enable` is insufficient. Turn up the loglevel to `debug`, so we can still see which integrations get set up. This is used for for checking whether all our ways of setting up integrations still work. --- nixos/tests/home-assistant.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 0420eb86d5e8..ce2cf17fab56 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -85,7 +85,6 @@ in # include some popular integrations, that absolutely shouldn't break knx = { }; - shelly = { }; zha = { }; # set up a wake-on-lan switch to test capset capability required @@ -108,7 +107,7 @@ in # https://www.home-assistant.io/integrations/logger/ logger = { - default = "info"; + default = "debug"; }; }; From 6696b3072adc00c7f4f118468802da6f23926e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 2 Apr 2025 11:34:35 -0700 Subject: [PATCH 42/63] home-assistant: 2025.3.4 -> 2025.4.0 https://www.home-assistant.io/blog/2025/04/02/release-20254 --- .../home-assistant/component-packages.nix | 43 ++++++++-- pkgs/servers/home-assistant/default.nix | 82 ++++++------------- 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8657939c1955..385d2e332192 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2025.3.4"; + version = "2025.4.0"; components = { "3_day_blinds" = ps: with ps; [ @@ -682,6 +682,10 @@ ps: with ps; [ bond-async ]; + "bosch_alarm" = + ps: with ps; [ + bosch-alarm-mode2 + ]; "bosch_shc" = ps: with ps; [ boschshcpy @@ -1802,6 +1806,9 @@ "foursquare" = ps: with ps; [ ]; + "frankever" = + ps: with ps; [ + ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms @@ -2265,18 +2272,21 @@ "homeassistant_green" = ps: with ps; [ aiohasupervisor + ha-silabs-firmware-client psutil-home-assistant universal-silabs-flasher ]; "homeassistant_hardware" = ps: with ps; [ aiohasupervisor + ha-silabs-firmware-client universal-silabs-flasher ]; "homeassistant_sky_connect" = ps: with ps; [ aiohasupervisor aiousbwatcher + ha-silabs-firmware-client psutil-home-assistant pyserial universal-silabs-flasher @@ -2284,6 +2294,7 @@ "homeassistant_yellow" = ps: with ps; [ aiohasupervisor + ha-silabs-firmware-client psutil-home-assistant universal-silabs-flasher ]; @@ -2769,9 +2780,12 @@ jellyfin-apiclient-python ]; "jewish_calendar" = - ps: with ps; [ + ps: + with ps; + [ hdate - ]; + ] + ++ hdate.optional-dependencies.astral; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api @@ -3136,6 +3150,9 @@ ps: with ps; [ linear-garage-door ]; + "linkedgo" = + ps: with ps; [ + ]; "linkplay" = ps: with ps; [ python-linkplay @@ -3941,6 +3958,9 @@ ps: with ps; [ oemthermostat ]; + "ogemray" = + ps: with ps; [ + ]; "ohmconnect" = ps: with ps; [ defusedxml @@ -4118,6 +4138,7 @@ ps: with ps; [ aiohasupervisor aiousbwatcher + ha-silabs-firmware-client ifaddr pillow psutil-home-assistant @@ -4411,6 +4432,10 @@ "psoklahoma" = ps: with ps; [ ]; + "pterodactyl" = + ps: with ps; [ + py-dactyl + ]; "pulseaudio_loopback" = ps: with ps; [ pulsectl @@ -4672,6 +4697,10 @@ "remote" = ps: with ps; [ ]; + "remote_calendar" = + ps: with ps; [ + ical + ]; "remote_rpi_gpio" = ps: with ps; [ gpiozero @@ -5435,7 +5464,6 @@ ]; "sunweg" = ps: with ps; [ - sunweg ]; "supervisord" = ps: with ps; [ @@ -6505,8 +6533,7 @@ ]; "zengge" = ps: with ps; [ - bluepy - ]; # missing inputs: zengge + ]; "zeroconf" = ps: with ps; [ ifaddr @@ -6528,6 +6555,7 @@ ps: with ps; [ aiohasupervisor aiousbwatcher + ha-silabs-firmware-client pillow pyserial universal-silabs-flasher @@ -6659,6 +6687,7 @@ "bluetooth_le_tracker" "bmw_connected_drive" "bond" + "bosch_alarm" "bosch_shc" "braviatv" "bring" @@ -7178,6 +7207,7 @@ "prosegur" "proximity" "prusalink" + "pterodactyl" "pure_energie" "purpleair" "push" @@ -7213,6 +7243,7 @@ "reddit" "refoss" "remote" + "remote_calendar" "renault" "renson" "reolink" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 35bdea4e4cac..2fbe3c41c182 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -129,12 +129,12 @@ let }); google-genai = super.google-genai.overridePythonAttrs (old: rec { - version = "1.1.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-genai"; tag = "v${version}"; - hash = "sha256-CszKr2dvo0dLMAD/FZHSosCczeAFDD0xxKysGNv4RxM="; + hash = "sha256-vmrFPE7H9s9varrP0s6WK4opoU1hREH7rVVjrKiXY5E="; }; }); @@ -283,28 +283,6 @@ let }; }); - pyopenweathermap = super.pyopenweathermap.overridePythonAttrs (old: rec { - version = "0.2.1"; - src = fetchFromGitHub { - owner = "freekode"; - repo = "pyopenweathermap"; - tag = "v${version}"; - hash = "sha256-UcnELAJf0Ltf0xJOlyzsHb4HQGSBTJ+/mOZ/XSTkA0w="; - }; - }); - - pyrail = super.pyrail.overridePythonAttrs (rec { - version = "0.0.3"; - src = fetchPypi { - pname = "pyrail"; - inherit version; - hash = "sha256-XxcVcRXMjYAKevANAqNJkGDUWfxDaLqgCL6XL9Lhsf4="; - }; - env.CI_JOB_ID = version; - build-system = [ self.setuptools ]; - dependencies = [ self.requests ]; - }); - # snmp component does not support pysnmp 7.0+ pysnmp = super.pysnmp.overridePythonAttrs (oldAttrs: rec { version = "6.2.6"; @@ -375,6 +353,16 @@ let }; }); + wolf-comm = super.wolf-comm.overridePythonAttrs (rec { + version = "0.0.23"; + src = fetchFromGitHub { + owner = "janrothkegel"; + repo = "wolf-comm"; + tag = version; + hash = "sha256-LpehooW3vmohiyMwOQTFNLiNCsaLKelWQxQk8bl+y1k="; + }; + }); + # internal python packages only consumed by home-assistant itself hass-web-proxy-lib = self.callPackage ./python-modules/hass-web-proxy-lib { }; home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -405,7 +393,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2025.3.4"; + hassVersion = "2025.4.0"; in python.pkgs.buildPythonApplication rec { @@ -426,47 +414,20 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; tag = version; - hash = "sha256-g1t9xAjrSSePyAloTQ2qwxAGEXJUTWX2zIZmAvlGGa8="; + hash = "sha256-AEJQueoHLp6xRFYVQ9cwSMFvlgwrMGJ1JUMnosk2qHg="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-MIh8FMTKZVEZ/zC+Av8fykTpz9kkXgZZfnsuOZbgP0M="; + hash = "sha256-wflwLkqTXaBh1flSVNJcA5KChipRCzZD7nb7VaK2EPM="; }; build-system = with python.pkgs; [ setuptools ]; - pythonRelaxDeps = [ - "aiohttp" - "aiozoneinfo" - "attrs" - "bcrypt" - "ciso8601" - "cryptography" - "fnv-hash-fast" - "hass-nabucasa" - "httpx" - "jinja2" - "orjson" - "pillow" - "propcache" - "pyjwt" - "pyopenssl" - "pyyaml" - "requests" - "securetar" - "sqlalchemy" - "typing-extensions" - "ulid-transform" - "urllib3" - "uv" - "voluptuous-openapi" - "yarl" - "zeroconf" - ]; + pythonRelaxDeps = true; # extract translations from pypi sdist prePatch = '' @@ -499,6 +460,7 @@ python.pkgs.buildPythonApplication rec { aiohttp-cors aiohttp-fast-zlib aiozoneinfo + annotatedyaml astral async-interrupt atomicwrites-homeassistant @@ -511,20 +473,28 @@ python.pkgs.buildPythonApplication rec { cronsim cryptography fnv-hash-fast + ha-ffmpeg hass-nabucasa + hassil home-assistant-bluetooth + home-assistant-intents httpx ifaddr jinja2 lru-dict + mutagen + numpy orjson packaging pillow propcache psutil-home-assistant pyjwt + pymicro-vad pyopenssl + pyspeex-noise python-slugify + pyturbojpeg pyyaml requests securetar @@ -538,7 +508,9 @@ python.pkgs.buildPythonApplication rec { voluptuous voluptuous-openapi voluptuous-serialize + webrtc-models yarl + zeroconf # REQUIREMENTS in homeassistant/auth/mfa_modules/totp.py and homeassistant/auth/mfa_modules/notify.py pyotp pyqrcode From eae7a6666203760eeb82cb85225a2f9ba81e61a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Mar 2025 01:53:12 +0000 Subject: [PATCH 43/63] python312Packages.python-roborock: 2.12.2 -> 2.16.1 --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 92aa4936b982..dffbe89f6264 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.12.2"; + version = "2.16.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; tag = "v${version}"; - hash = "sha256-QAv4R4Nnn+BcPp0ktf7riKt+ZvaZTF5KI9sjjtDH3SY="; + hash = "sha256-zQlNBQm+dBmw+kydNlqJU1D0KKuywyuNCqm0/BslWi0="; }; postPatch = '' From 4f2c4b72723e933475a341f898fc43d7ef10d07d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:06:16 -0700 Subject: [PATCH 44/63] python313Packages.python-tado: 0.18.6 -> 0.18.9 Diff: https://github.com/wmalgadey/PyTado/compare/refs/tags/0.18.6...0.18.9 Changelog: https://github.com/wmalgadey/PyTado/releases/tag/0.18.9 --- pkgs/development/python-modules/python-tado/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix index 4f5e6b14ad6d..42ebdadce993 100644 --- a/pkgs/development/python-modules/python-tado/default.nix +++ b/pkgs/development/python-modules/python-tado/default.nix @@ -5,7 +5,6 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, - pythonOlder, requests, responses, setuptools, @@ -13,16 +12,14 @@ buildPythonPackage rec { pname = "python-tado"; - version = "0.18.6"; + version = "0.18.9"; pyproject = true; - disabled = pythonOlder "3.5"; - src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; tag = version; - hash = "sha256-pDT159TY1PEG3TLoIaNy5VVpIklclgOvFy4W5HKy7uM="; + hash = "sha256-zGz3ySD+7zkHY/+IS2Kfrp9Y64It+rrEF7ImwbZG7ks="; }; build-system = [ setuptools ]; @@ -50,7 +47,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "PyTado" ]; meta = with lib; { - description = "Python binding for Tado web API. Pythonize your central heating!"; + description = "Python binding for Tado web API"; homepage = "https://github.com/wmalgadey/PyTado"; changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${src.tag}"; license = licenses.gpl3Plus; From f3d39263d4558487fb1bb2ae74052f8fdc133351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:10:23 -0700 Subject: [PATCH 45/63] python313Packages.tesla-fleet-api: 0.9.13 -> 1.0.17 Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/refs/tags/v0.9.13...v1.0.17 --- .../python-modules/tesla-fleet-api/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 0118c7ca0a27..f66ef53f039b 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -3,6 +3,8 @@ aiofiles, aiohttp, aiolimiter, + bleak, + bleak-retry-connector, buildPythonPackage, cryptography, fetchFromGitHub, @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.9.13"; + version = "1.0.17"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-Q+nALf5SBDjh6s6d8lZhFVIkz0vGvzRD8OgXX6v8mJY="; + hash = "sha256-3JLC+GXFNBy7xEPuk/ajVROp6IzZ7Jul+1VyOMB7t58="; }; build-system = [ setuptools ]; @@ -31,6 +33,8 @@ buildPythonPackage rec { aiofiles aiohttp aiolimiter + bleak + bleak-retry-connector cryptography protobuf ]; @@ -43,7 +47,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Tesla Fleet API and Teslemetry"; homepage = "https://github.com/Teslemetry/python-tesla-fleet-api"; - changelog = "https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From d84901d23ab249718902bb9c3fd27dbe5e111f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:13:51 -0700 Subject: [PATCH 46/63] python313Packages.zigpy: 0.77.1 -> 0.78.0 Diff: https://github.com/zigpy/zigpy/compare/refs/tags/0.77.1...0.78.0 Changelog: https://github.com/zigpy/zigpy/releases/tag/0.78.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index ae7c4a8b6d40..a9b9fde8ec90 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.77.1"; + version = "0.78.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-gvgGRTZc+JT0seeDyiu59Bxxp7J/gGIO0rCCtTeS9t4="; + hash = "sha256-7ckpg1ukuASWtTdQn/P0KfXaMo5l2NyB9alCXeTarEU="; }; postPatch = '' From 7e18b416f3615563faf5ab95bdf720dead9710e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:14:00 -0700 Subject: [PATCH 47/63] python313Packages.zigpy-znp: 0.13.1 -> 0.14.0 Diff: https://github.com/zigpy/zigpy-znp/compare/refs/tags/v0.13.1...v0.14.0 Changelog: https://github.com/zigpy/zigpy-znp/releases/tag/v0.14.0 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 1831638ec1d8..22aa4294a376 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.13.1"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; tag = "v${version}"; - hash = "sha256-6ApwGB6VvG+XiE8U85gg/EWnYniMb+1fqmNwtHGcf/I="; + hash = "sha256-vYB04vEFqpqrjJMS73mtYXakp7lEIJjB+tT0SF9hpWM="; }; postPatch = '' From c7a7383785496dbec8fd4fc43558f996aa025530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:14:11 -0700 Subject: [PATCH 48/63] python313Packages.bellows: 0.43.0 -> 0.44.0 Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.43.0...0.44.0 Changelog: https://github.com/zigpy/bellows/releases/tag/0.44.0 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 6d5328814ac7..301f22512cf8 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.43.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-RbhFvoNYR4wHKKbbMKLP4Dsx0pIJnwBOP49waRHg0qk="; + hash = "sha256-9CuZGorTqay09ZHrUDoorYew8vvDV6pyxMuik7/QKJ4="; }; postPatch = '' From a61c656b7aa86b755196cba080c7a6f3c1e13c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:14:24 -0700 Subject: [PATCH 49/63] python313Packages.zha-quirks: 0.0.134 -> 0.0.136 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.134...0.0.136 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.135 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.136 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b43705f3b185..3e2f7135a96d 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.134"; + version = "0.0.136"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-9h9Fsn15/1fZIiZEyGPIzuyxmGs7L4PyEwH/K2cRSgU="; + hash = "sha256-WoLs8/IqKt0rxALmObim+NnaTRq/VAecrkrbirktm+A="; }; postPatch = '' From c2478e9dfb4c8e236cd05e62962315d52cd27615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:12:59 -0700 Subject: [PATCH 50/63] python313Packages.zha: 0.0.53 -> 0.0.55 Diff: https://github.com/zigpy/zha/compare/refs/tags/0.0.53...0.0.55 Changelog: https://github.com/zigpy/zha/releases/tag/0.0.54 https://github.com/zigpy/zha/releases/tag/0.0.55 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 1d32f8f6d1d8..527283d544f3 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.53"; + version = "0.0.55"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-EszxMIdZKmw1q9WNyeTSMaGU9or/6oBe7VGOzXMkUzg="; + hash = "sha256-LiHJk7xVdIqNl6BTfwlch3jqQm/MvbrKSExhOR5KD0c="; }; postPatch = '' From ddece3e6c33eed6c4be4a7e42678b26883004ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Apr 2025 22:16:56 -0700 Subject: [PATCH 51/63] python313Packages.zwave-js-server-python: 0.61.0 -> 0.62.0 Diff: https://github.com/home-assistant-libs/zwave-js-server-python/compare/refs/tags/0.61.0...0.62.0 Changelog: https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.62.0 --- .../python-modules/zwave-js-server-python/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index ad8fb97f4e1b..edb9c5aa450a 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.61.0"; + version = "0.62.0"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = version; - hash = "sha256-bIo+Kggk8vQHtdey36WunhTR3x8nfySVaJOyZDzKXRk="; + hash = "sha256-V/YydWNSjZVvHeeDNMUTEtMQL6/oJvyXtTG/akELjEs="; }; build-system = [ setuptools ]; From 282668a6cf707436f4f5a175dd8ace6e60ab619e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 02:11:49 +0200 Subject: [PATCH 52/63] python313Packages.pushover-complete: fix and modernize build --- .../python-modules/pushover-complete/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index 9b8a2e5f06d7..855be914b0c3 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchPypi, - isPy27, + setuptools, requests, six, pytestCheckHook, @@ -13,16 +13,17 @@ buildPythonPackage rec { pname = "pushover-complete"; version = "1.2.0"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; src = fetchPypi { pname = "pushover_complete"; inherit version; - sha256 = "sha256-v0+JgShJMEdVXJ1xZD4UCKZzgV+uOuOstPn3nWtHDJw="; + hash = "sha256-v0+JgShJMEdVXJ1xZD4UCKZzgV+uOuOstPn3nWtHDJw="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests six ]; From c7115c1fc3aec28b024a75c8fbe4010bb23bdaae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 02:43:24 +0200 Subject: [PATCH 53/63] python313Packages.slixmpp: fix build and modernize --- .../python-modules/slixmpp/default.nix | 48 ++++++++++++++----- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index cad4defb2dfb..1a7d410e790d 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -3,19 +3,23 @@ buildPythonPackage, aiodns, aiohttp, + cryptography, + defusedxml, + emoji, fetchPypi, gnupg, pyasn1, pyasn1-modules, pytestCheckHook, replaceVars, + rustPlatform, pythonOlder, }: buildPythonPackage rec { pname = "slixmpp"; version = "1.10.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -24,25 +28,47 @@ buildPythonPackage rec { hash = "sha256-RrxdAVB8tChcglXOXHF8C19o5U38HxcSiDmY1tciV4o="; }; - propagatedBuildInputs = [ - aiodns - aiohttp - pyasn1 - pyasn1-modules - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - patches = [ (replaceVars ./hardcode-gnupg-path.patch { inherit gnupg; }) ]; + build-system = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname src; + hash = "sha256-CeuClBYEG2YCm5lnxFs5RhjIgYEOe76rzHpauLZeQR0="; + }; + + dependencies = [ + aiodns + pyasn1 + pyasn1-modules + ]; + + optional-dependencies = { + xep-0363 = [ aiohttp ]; + xep-0444-compliance = [ emoji ]; + xep-0464 = [ cryptography ]; + safer-xml-parserig = [ defusedxml ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); + + preCheck = '' + # don't test against pure python version in the source tree + rm -rf slixmpp + ''; + disabledTestPaths = [ + # Exclude integration tests + "itests/" # Exclude live tests "tests/live_test.py" - "tests/test_xep_0454.py" ]; pythonImportsCheck = [ "slixmpp" ]; From 85f037169009dbdf1bf394cb8761baf8022a317a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 03:44:56 +0200 Subject: [PATCH 54/63] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.223 -> 0.13.232 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.232/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 1830ed38cbd9..05341b413213 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.223"; + version = "0.13.232"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-mt8byu88r76cVkZlu8LSiInm/jwboauo6YblY2aTulA="; + hash = "sha256-LHdkU89YzILPZFf/EgnCdPCG4tk1s5V7tpDsNtEaAak="; }; build-system = [ setuptools ]; From 4127c373e8768e5b0759b8a79b59cc58d6b6ad3d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:30:25 +0200 Subject: [PATCH 55/63] home-assistant-custom-components.emporia_vue: 0.10.1 -> 0.10.2-pre https://github.com/magico13/ha-emporia-vue/releases/tag/v0.10.2-pre --- .../home-assistant/custom-components/emporia_vue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index c4a1d9893f42..f87b9576fb40 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "magico13"; domain = "emporia_vue"; - version = "0.10.1"; + version = "0.10.2-pre"; src = fetchFromGitHub { owner = "magico13"; repo = "ha-emporia-vue"; rev = "v${version}"; - hash = "sha256-OfJvln80ek/+4PURk23REhIyUckAEZ+Ybb5rZyKs6h4="; + hash = "sha256-mXzgd0dFwnwFCG0+9825uOrYhv2SNuLAOO1Unq6Kw/w="; }; dependencies = [ From 6c7a3729e028f8104b03e7f4166821460497fe4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:34:19 +0200 Subject: [PATCH 56/63] home-assistant-custom-components.ntfy: 1.2.0-pre.1 -> 1.2.0-pre.2 https://github.com/hbrennhaeuser/homeassistant_integration_ntfy/compare/v1.2.0-pre.1...v1.2.0-pre.2 --- .../servers/home-assistant/custom-components/ntfy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix index fdc34a3f679f..20468ad516e8 100644 --- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hbrennhaeuser"; domain = "ntfy"; - version = "1.2.0-pre.1"; + version = "1.2.0-pre.2"; src = fetchFromGitHub { inherit owner; repo = "homeassistant_integration_ntfy"; rev = "v${version}"; - hash = "sha256-cdqO8fwaEZzAEa7aVjV00OQYnmx0vJZqz7Nd9+MUHN8="; + hash = "sha256-ydWZ4ApYQ9kyMA5A2OGXG323/7H3fa2XPiOAFBZNM30="; }; dependencies = [ From ec8672999bb184d2c103a0e2d6d4ba16a99d364b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:35:34 +0200 Subject: [PATCH 57/63] home-assistant-custom-components.solax_modbus: 2025.02.1 -> 2025.04.1 https://github.com/wills106/homeassistant-solax-modbus/releases/tag/2025.04.1 --- .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 504e8d81ea2d..ecd1053daa5a 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2025.02.1"; + version = "2025.04.1"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-xOW/jjBXw6N00yo1jE8ibU5XJ9drabBypVAL9UmNMVM="; + hash = "sha256-kX8poctK1Q7QZnpvkOisQ47jNzXJJ2nlB1fa+Pv4AFs="; }; dependencies = [ pymodbus ]; From 9aaa1258c56aab83cb7b18f17707d69ea0f22ed7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:35:41 +0200 Subject: [PATCH 58/63] home-assistant-custom-components.solis-sensor: 3.9.0 -> 3.9.1 https://github.com/hultenvp/solis-sensor/releases/tag/v3.9.1 --- .../home-assistant/custom-components/solis-sensor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix index 2d1a056407cf..365d571da1cb 100644 --- a/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent rec { owner = "hultenvp"; domain = "solis"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "hultenvp"; repo = "solis-sensor"; rev = "v${version}"; - hash = "sha256-RgsKIav3ozWYO9CXzvhMVmvOW74L/AHGOW8OWOMFBcQ="; + hash = "sha256-hiCgro2BDi1ZXxZu9E+m0wdHN0qnjlUvgv4pPmSb9j4="; }; dependencies = [ aiofiles ]; From 1ca31de92455459a7441e00bbe5e6b795fc4e3b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:36:11 +0200 Subject: [PATCH 59/63] home-assistant-custom-components.tuya_local: 2025.2.2 -> 2025.3.0 https://github.com/make-all/tuya-local/releases/tag/2025.3.0 --- .../home-assistant/custom-components/tuya_local/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix index c7956ef85c1c..5bcb72bda07c 100644 --- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix +++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix @@ -11,13 +11,13 @@ buildHomeAssistantComponent rec { owner = "make-all"; domain = "tuya_local"; - version = "2025.2.2"; + version = "2025.3.0"; src = fetchFromGitHub { inherit owner; repo = "tuya-local"; tag = version; - hash = "sha256-RwPbFIDXSXFzR2sck1EUvQL+1o8Ppb5clsIAHhYxX5o="; + hash = "sha256-CkH2Njv9qdGlnEo3RP64Lz4ys62W6DxYC/TSl/lndPI="; }; dependencies = [ From 43e44191fd29b177d31577ddd9f564105b786643 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:38:20 +0200 Subject: [PATCH 60/63] home-assistant-custom-components.yoto_ha: 1.23.2 -> 1.24.0 https://github.com/cdnninja/yoto_ha/releases/tag/v1.24.0 --- .../home-assistant/custom-components/yoto_ha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix index e2259c87ee42..9677303ec4c1 100644 --- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix +++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cdnninja"; domain = "yoto"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cdnninja"; repo = "yoto_ha"; tag = "v${version}"; - hash = "sha256-RErsZGSoBhBGg852znZq6W8oDZmDDoPTZihUBhWCO5w="; + hash = "sha256-vlUPVKG6PAkQbROd/Pn5gf48/QWl2GAs3xGCnwX0ENU="; }; dependencies = [ From 0db9c840ad2bf3b1f36ddc12944c884b25f209d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:43:59 +0200 Subject: [PATCH 61/63] home-assistant-custom-lovelace-modules.clock-weather-card: 2.8.10 -> 2.8.11 https://github.com/pkissling/clock-weather-card/blob/v2.8.11/CHANGELOG.md --- .../custom-lovelace-modules/clock-weather-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix index 0e651743dbe0..d5f4740a68da 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix @@ -9,18 +9,18 @@ }: stdenvNoCC.mkDerivation rec { pname = "clock-weather-card"; - version = "2.8.10"; + version = "2.8.11"; src = fetchFromGitHub { owner = "pkissling"; repo = "clock-weather-card"; tag = "v${version}"; - hash = "sha256-ZmqtvA6kRkqkoRCBerLZXqRB1wwTF0jrc+KfigaE7Pw="; + hash = "sha256-CZ4tv6U94HbOJ0JwLgd8Fgw2BS6ayGVhqWBK9mJ6JEk="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-Z9UZHsmaRjaf7fIDYhNmlLU2T1l1hlFKvyEahPK3Y3E="; + hash = "sha256-L/piPdtHFQORD3dnKG/2gnMQ2y3EXdlGMyl8yS0s7KA="; }; nativeBuildInputs = [ From b2e68aeb638d33ed3d09580f9b4644c80c5f44d8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Apr 2025 04:46:32 +0200 Subject: [PATCH 62/63] home-assistant-custom-lovelace-modules.mini-graph-card: 0.12.1 -> 0.13.0-dev.2 https://github.com/kalkih/mini-graph-card/releases/tag/v0.13.0-dev.2 --- .../custom-lovelace-modules/mini-graph-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix index d09df4dc9fe8..f54d83d88c4e 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mini-graph-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "mini-graph-card"; - version = "0.12.1"; + version = "0.13.0-dev.2"; src = fetchFromGitHub { owner = "kalkih"; repo = "mini-graph-card"; tag = "v${version}"; - hash = "sha256-cDgfAfS4U3ihN808KPcG+jEQR+S2Q1M5SPqOkkYwYkI="; + hash = "sha256-JpteGI9oR2twCTvEQ8xtb55EGQw//9EVuELh4BG0BE0="; }; - npmDepsHash = "sha256-v+DqUAMNtDruR8E0sy7uAu3jndZUHkOw2xKtpY163R8="; + npmDepsHash = "sha256-Mg58i0L1e1YwBd81WwVgB56P7EYaq3FnMysIrgu0+qQ="; installPhase = '' runHook preInstall From a9e9363a1101283aa5f7059eb322e3076a96ea91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 00:49:11 +0000 Subject: [PATCH 63/63] geant4: 11.3.0 -> 11.3.1 --- pkgs/by-name/ge/geant4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index c2ce7289690b..13bc349112e6 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -38,12 +38,12 @@ let in stdenv.mkDerivation rec { - version = "11.3.0"; + version = "11.3.1"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-HaQxiz+W+H9NR1WKMtqyabjz/JVnCAOMKOcqGAsO+6Y="; + hash = "sha256-yTyplvbzWqQ/lI/8q6lgNGjfAd7rYvYcM7p2kifDGf4="; }; # Fix broken paths in a .pc