Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -18549,8 +18549,8 @@
   };
   pwnwriter = {
     name = "Nabeen Tiwaree";
-    email = "hey@pwnwriter.xyz";
-    keys = [ { fingerprint = "B681 763F 9B5B DF27 9A13  9E0C 0544 A89B C519 20AA"; } ];
+    email = "hi@pwnwriter.me";
+    keys = [ { fingerprint = "C153 DE7C 0A0D 432E F033  2B0B A524 11EC 5582 DE3A"; } ];
     github = "pwnwriter";
     githubId = 90331517;
   };

pkgs/applications/audio/puredata/default.nix

@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
   };
 
+  patches = [
+    # expose error function used by dependents
+    ./expose-error.patch
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     gettext

pkgs/applications/audio/puredata/expose-error.patch

@@ -0,0 +1,13 @@
+diff --git a/src/m_pd.h b/src/m_pd.h
+index c658fa5..a3a506c 100644
+--- a/src/m_pd.h
++++ b/src/m_pd.h
+@@ -8,6 +8,8 @@
+ extern "C" {
+ #endif
+ 
++extern void error(const char* fmt, ...);
++
+ #define PD_MAJOR_VERSION 0
+ #define PD_MINOR_VERSION 54
+ #define PD_BUGFIX_VERSION 1

pkgs/by-name/ac/actionlint/package.nix

@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.7.5";
+  version = "1.7.6";
 in
 buildGoModule {
   pname = "actionlint";
@@ -22,10 +22,10 @@ buildGoModule {
     owner = "rhysd";
     repo = "actionlint";
     rev = "v${version}";
-    hash = "sha256-CJ3T47zPO1p29Nxpxtgf7oTe3TT240RXJG14DW1uANY=";
+    hash = "sha256-NHmz+r7xO84eSQFBNwaI+ctzIgd014rRQtqvi8hOWPE=";
   };
 
-  vendorHash = "sha256-3c+0Hxn7JcJzrg9Ep/BKKb0mu0nbb5qX2snljCeu1N0=";
+  vendorHash = "sha256-4hBIDrFOADGo3gsTRW8hjBYzmWRo/5yyoM7Ylv3KJBk=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/by-name/co/cosmic-store/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   rustPlatform,
   appstream,
   makeBinaryWrapper,
@@ -24,18 +25,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-store";
-  version = "1.0.0-alpha.2";
+  version = "1.0.0-alpha.4";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     rev = "epoch-${version}";
-    hash = "sha256-mq94ZMVOdXAPR52ID5x8nppJ9mNoTOPBfn7Eouj3T1U=";
+    hash = "sha256-VaOKF3cCnNbfUfJeuhx0wXRvprAnSspTe8gIiR/t2Ng=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lhMMzT6igjEEvwpcc7d8JyyHU0DcWVIh3z9KR6eCv7c=";
+  cargoHash = "sha256-Zt2199zlxNbrN/S6bogp4JPM3ZMZpQL5jTXKMki6LQE=";
 
   postPatch = ''
     substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
@@ -99,6 +100,10 @@ rustPlatform.buildRustPackage rec {
       }
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     homepage = "https://github.com/pop-os/cosmic-store";
     description = "App Store for the COSMIC Desktop Environment";

pkgs/by-name/ev/evcc/package.nix

@@ -16,16 +16,16 @@
 }:
 
 let
-  version = "0.132.0";
+  version = "0.132.1";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-9HF9Beu2nLUoRViFluEc4kqGah2NfN/K0hqTZ4Bmo5c=";
+    hash = "sha256-TrKPI+b9hlVPGUXmJ73QO2TfGoDip31KZ5RzgQC+BS4=";
   };
 
-  vendorHash = "sha256-xxE/KBZvPBMd9cLE/uU74iyLaOYRd6m9HokTDi0FnRg=";
+  vendorHash = "sha256-jhYDk2BV1L6lrkOl6sSiYe79Q7vtC4Da/DzWzilCXRM=";
 
   commonMeta = with lib; {
     license = licenses.mit;

pkgs/by-name/fl/flexget/package.nix

@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.13.5";
+  version = "3.13.6";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     tag = "v${version}";
-    hash = "sha256-R6E5NWnrnezJsDm+Nnqgibv4e6mXVrOrKaCl/MBqUnY=";
+    hash = "sha256-I6AQtoGk/YUDM5DzegvLi8QmVvoma16zJGZ8BMUUN3c=";
   };
 
   # relax dep constrains, keep environment constraints

pkgs/by-name/ho/howard-hinnant-date/make-zoneinfo-available.diff

@@ -1,11 +1,9 @@
-diff --git a/src/tz.cpp b/src/tz.cpp
-index 68436c3..2bfe19e 100644
 --- a/src/tz.cpp
 +++ b/src/tz.cpp
-@@ -349,7 +349,7 @@ discover_tz_dir()
-     struct stat sb;
-     using namespace std;
- #  ifndef __APPLE__
+@@ -498,7 +498,7 @@ discover_tz_dir()
+     else
+         throw runtime_error("discover_tz_dir failed to find zoneinfo\n");
+ #  elif !defined(__APPLE__)
 -    CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
 +    CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
      CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";

pkgs/by-name/ho/howard-hinnant-date/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "howard-hinnant-date";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchFromGitHub {
     owner = "HowardHinnant";
     repo = "date";
     rev = "v${version}";
-    sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35";
+    hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs=";
   };
 
   patches = [
@@ -19,13 +19,6 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
       sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
     })
-    # Fix CMake include directory path.
-    # https://github.com/HowardHinnant/date/pull/753
-    (fetchpatch {
-      name = "fix-cmake-include-dir.patch";
-      url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch";
-      hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4=";
-    })
     # Without this patch, this library will drop a `tzdata` directory into
     # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
     # searches for `zoneinfo` be the one from the `tzdata` package.
@@ -33,13 +26,6 @@ stdenv.mkDerivation rec {
       src = ./make-zoneinfo-available.diff;
       inherit tzdata;
     })
-    # The reported version to cmake's find_package() is 3.0.0, but the actual
-    # version is 3.0.1. This patch fixes that.
-    (fetchpatch {
-      name = "fix-cmake-version.patch";
-      url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch";
-      hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk=";
-    })
   ];
 
   # Tweaks to fix undefined variable substitutions

pkgs/by-name/mr/mrpeach/package.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  patchPhase = ''
+  postPatch = ''
     for D in net osc
     do
       sed -i "s@prefix = /usr/local@prefix = $out@g" $D/Makefile
@@ -34,24 +34,28 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
+    runHook preBuild
     for D in net osc
     do
       cd $D
       make
       cd ..
     done
+    runHook postBuild
   '';
 
   installPhase = ''
+    runHook preInstall
     for D in net osc
     do
       cd $D
       make install
       cd ..
     done
+    runHook postInstall
   '';
 
-  fixupPhase = ''
+  preFixup = ''
     mv $out/lib/pd-externals/net $out
     mv $out/lib/pd-externals/osc $out
     rm -rf $out/lib

pkgs/by-name/ni/niri/package.nix

@@ -39,13 +39,8 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "libspa-0.8.0" = "sha256-kp5x5QhmgEqCrt7xDRfMFGoTK5IXOuvW2yOW02B8Ftk=";
-      "smithay-0.3.0" = "sha256-nSM7LukWHO2n2eWz5ipFNkTCYDvx/VvPXnKVngJFU0U=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-2hFavY3Y6aBPjo53o7GMjuvUKOcj+ZQiV0M1mpoH/Ck=";
 
   strictDeps = true;
 

pkgs/by-name/pr/pretalx/package.nix

@@ -17,7 +17,7 @@ let
       django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec {
         version = "3.0.0";
         src = oldAttrs.src.override {
-          rev = "v${version}";
+          tag = "v${version}";
           hash = "sha256-a8BopUwZjmvxOzBVqs4fTo0SY8sEEloGUw90daYWfz8=";
         };
 

pkgs/development/python-modules/bleak-esphome/default.nix

@@ -9,13 +9,15 @@
   lru-dict,
   poetry-core,
   pytest-asyncio,
+  pytest-codspeed,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "bleak-esphome";
-  version = "1.1.1";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,17 +26,12 @@ buildPythonPackage rec {
     owner = "bluetooth-devices";
     repo = "bleak-esphome";
     tag = "v${version}";
-    hash = "sha256-WFswGtPX0OpDTqT25oHGZ+gIN/fhco4orWeGVXIIfzM=";
+    hash = "sha256-rN2vpXiOaUjjN6yNZxeEgTpcz0K5soUqKKiDDOhcBtc=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace " --cov=bleak_esphome --cov-report=term-missing:skip-covered" ""
-  '';
+  build-system = [ poetry-core ];
 
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     aioesphomeapi
     bleak
     bluetooth-data-tools
@@ -44,6 +41,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-codspeed
+    pytest-cov-stub
     pytestCheckHook
   ];
 

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "demetriek";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-demetriek";
     tag = "v${version}";
-    hash = "sha256-MDGAhsLbJqvywQntlPfM/cPyltqsqnt2C31ACpMPn0Y=";
+    hash = "sha256-OTYQFw3Jy+sRGoPYVp5VKgCAzv9Gy2Fn2GjTGdsKjak=";
   };
 
   postPatch = ''

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

@@ -1,8 +1,8 @@
 {
   lib,
   async-interrupt,
-  bleak,
   bleak-retry-connector,
+  bleak,
   bluetooth-adapters,
   bluetooth-auto-recovery,
   bluetooth-data-tools,
@@ -11,6 +11,7 @@
   fetchFromGitHub,
   poetry-core,
   pytest-asyncio,
+  pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
@@ -19,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "habluetooth";
-  version = "3.6.0";
+  version = "3.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +29,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "habluetooth";
     tag = "v${version}";
-    hash = "sha256-ypE/PvJV29+P389wLKZUErqLRvy935dAZYeap7n1z4M=";
+    hash = "sha256-wOWQaM1hfWaqLFIzwB7O1yOS/CJPvZ+aGbKzvAE2DAE=";
   };
 
   build-system = [
@@ -48,6 +49,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-codspeed
     pytest-cov-stub
     pytestCheckHook
   ];

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

@@ -4,6 +4,7 @@
   aresponses,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   mashumaro,
   orjson,
   poetry-core,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "powerfox";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,9 +27,19 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-powerfox";
     tag = "v${version}";
-    hash = "sha256-stHZWGkISsemRUModIlE5CqYVVu3Mdt4ksW5tBewEDo=";
+    hash = "sha256-VSkOCJu3HXBHkvYtSe/kYFOhJ9kMrcf/ijMqvUB9aRU=";
   };
 
+  patches = [
+    # requires poetry-core>=2.0
+    (fetchpatch2 {
+      url = "https://github.com/klaasnicolaas/python-powerfox/commit/e3f1e39573fc278cd2800a2d4f4315cf0aff592b.patch";
+      includes = [ "pyproject.toml" ];
+      hash = "sha256-hkXLT3IWBVlbAwWvu/erENEsxOuIb8wv9UIVtAZqMPc=";
+      revert = true;
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

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

@@ -4,13 +4,12 @@
   fetchFromGitHub,
   hatchling,
   aiohttp,
-  regex,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pysuez";
-  version = "1.3.5";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,15 +18,12 @@ buildPythonPackage rec {
     owner = "jb101010-2";
     repo = "pySuez";
     tag = version;
-    hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8=";
+    hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4=";
   };
 
   build-system = [ hatchling ];
 
-  dependencies = [
-    aiohttp
-    regex
-  ];
+  dependencies = [ aiohttp ];
 
   # Module has no tests
   doCheck = false;
@@ -38,7 +34,7 @@ buildPythonPackage rec {
     description = "Module to get water consumption data from Suez";
     mainProgram = "pysuez";
     homepage = "https://github.com/jb101010-2/pySuez";
-    changelog = "https://github.com/jb101010-2/pySuez/releases/tag/v${version}";
+    changelog = "https://github.com/jb101010-2/pySuez/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "7.1.0";
+  version = "7.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${version}";
-    hash = "sha256-TALjJmTI5lMXyXcJtfyMVpqLo8dBbENG22EX7B+3QKQ=";
+    hash = "sha256-y4rJoT70WiVS9Gs/U6FPOaGGubPI43x9tA2vcdiDBlw=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/zha-quirks/default.nix

@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.129";
+  version = "0.0.130";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     tag = version;
-    hash = "sha256-/lcF7MZrw85H5LBL8aBdaIuFRT5yJUhr+vN9gJHnPDw=";
+    hash = "sha256-G5q4W9Dxjhjbkt5rcYhseeaSWC73MJCo/pX/OfNlPrQ=";
   };
 
   postPatch = ''

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

@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.44";
+  version = "0.0.45";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     tag = version;
-    hash = "sha256-ZgCbhezNsWZsQQViPK04UQA2mGZz47rFiMAk2oR8xR4=";
+    hash = "sha256-KeHGuQGEoXQnIJKQ86DrsoufN+Ppp/fyYblXx2iGHgU=";
   };
 
   postPatch = ''

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

@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.73.3";
+  version = "0.74.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zigpy";
     tag = version;
-    hash = "sha256-+YkNV6xbM38dHVpXD264KmzozborvotZRETAncpAUEs=";
+    hash = "sha256-B0BjDldIzHGRKR79mqgJHbvYeDGY5EDxFKaD2Q+HMyo=";
   };
 
   postPatch = ''

pkgs/servers/home-assistant/component-packages.nix

@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.1.0";
+  version = "2025.1.1";
   components = {
     "3_day_blinds" =
       ps: with ps; [

pkgs/servers/home-assistant/default.nix

@@ -289,7 +289,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.1.0";
+  hassVersion = "2025.1.1";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -310,13 +310,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-tkjOWJ29fvWzto3y6zV8h8yPIGyhC5sBIL5koOsw5i0=";
+    hash = "sha256-fiGdRXQmH+CcgnGQloktl66Yh8iiFEDCQyOL3jfXjdU=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-xaHD93crz4wm3CwX5d/UxeuOQ769G+ZnA26iE7y7hU4=";
+    hash = "sha256-CYvi2Z1d3hbcfet08TR/jScuOKGgipTEWmno7/r5qLU=";
   };
 
   build-system = with python.pkgs; [

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 = "20250103.0";
+  version = "20250106.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-i+XOHFGL7UVxL+bNohhi+8pF1kZ5oOY5EpZHR3NbwL4=";
+    hash = "sha256-Jhbw/HNOInLAihHeP+Vpsvsukjf3OY32EbBayDEuU+k=";
   };
 
   # there is nothing to strip in this package

pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-homeassistant-custom-component";
-  version = "0.13.200";
+  version = "0.13.201";
   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-aZeC003EGa8qBR+sN3EK1EbbwLZqdzNf1bjTQyQ6l9I=";
+    hash = "sha256-WWfVxLYW5V5q0huBoST3n64Fm9f69rjv8B6g96ZaFDc=";
   };
 
   build-system = [ setuptools ];

pkgs/servers/home-assistant/stubs.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.1.0";
+  version = "2025.1.1";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-qKmHQrciezgGPHNNGy7lDM9LaCXJO/DuYIrk8qjWpDQ=";
+    hash = "sha256-9z8HX9zNzRfMTWJiHwbCpOAmYF9yfHsM/FR9siB7D/E=";
   };
 
   build-system = [