Merge master into staging-next

2025-10-02 15:58:50 +00:00
parent 782c6bb3f5 93dc73320b
commit 7f2d963f4f
26 changed files with 599 additions and 431 deletions
@@ -331,6 +331,7 @@ let
        hasInfix
        hasPrefix
        hasSuffix
+        join
        stringToCharacters
        stringAsChars
        escape
@@ -41,6 +41,36 @@ rec {
    unsafeDiscardStringContext
    ;

+  /**
+    Concatenates a list of strings with a separator between each element.
+
+    # Inputs
+
+    `sep`
+    : Separator to add between elements
+
+    `list`
+    : List of strings that will be joined
+
+    # Type
+
+    ```
+    join :: string -> [ string ] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.join` usage example
+
+    ```nix
+    join ", " ["foo" "bar"]
+    => "foo, bar"
+    ```
+
+    :::
+  */
+  join = builtins.concatStringsSep;
+
  /**
    Concatenate a list of strings.

@@ -69,6 +69,7 @@ let
    id
    ifilter0
    isStorePath
+    join
    lazyDerivation
    length
    lists
@@ -435,6 +436,15 @@ runTests {

  # STRINGS

+  testJoin = {
+    expr = join "," [
+      "a"
+      "b"
+      "c"
+    ];
+    expected = "a,b,c";
+  };
+
  testConcatMapStrings = {
    expr = concatMapStrings (x: x + ";") [
      "a"
@@ -4981,6 +4981,12 @@
    githubId = 118829;
    name = "codec";
  };
+  CodedNil = {
+    github = "CodedNil";
+    githubId = 5075747;
+    email = "codenil@proton.me";
+    name = "Dan Lock";
+  };
  CodeLongAndProsper90 = {
    github = "CodeLongAndProsper90";
    githubId = 50145141;
@@ -33,9 +33,5 @@
    machine.wait_until_succeeds(
        "grep 'Wasabi Backend started' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"
    )
-    machine.sleep(5)
-    machine.succeed(
-        "grep 'Config is successfully initialized' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt"
-    )
  '';
 }
@@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "bloop";
-  version = "2.0.14";
+  version = "2.0.15";

  platform =
    if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
    url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
    sha256 =
      if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then
-        "sha256-r99N4VxIlpOwSe9f9PoEalzsi0v5YKU2is4+gpg7rpo="
+        "sha256-JEhBIYHCsh2Ij8PBhLWbhyVR5wcN3FnYV03GuE1Y/Ow="
      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then
-        "sha256-7U9zugsEDtVSlwn8sbth51RKAWx/+vRSZ8yNQAACHdo="
+        "sha256-UrQuk4FuZ/J55vdQShOZ4OHzecjuYTmt5rXiYhz5seE="
      else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then
-        "sha256-jT8GQim1dzOIbsg2hCgtS7MH+zHajYnppM50nh+HeYo="
+        "sha256-lIfXvBGK6r0akDgC9DYiU/m+BwHoFh7/RLnNtTBzkIo="
      else
        throw "unsupported platform";
  };
@@ -5,59 +5,63 @@
  cmake,
  extra-cmake-modules,
  leptonica,
-  libsForQt5,
-  qt5,
-  tesseract4,
-  gst_all_1,
+  qt6,
+  tesseract,
  testers,
+  kdePackages,
+  onnxruntime,
+  withPiper ? true,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "crow-translate";
-  version = "3.1.0";
+  version = "4.0.2";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "office";
    repo = "crow-translate";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-zL+Ucw6rzIoEaBHi/uqKQB0cnR6aAcF8MPOG3hwK3iA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hrxYC6zdh4aG9AkHZcnOE5jihJSo3xrq0hzBRE8NtRw=";
    fetchSubmodules = true;
  };

  postPatch = ''
    substituteInPlace data/org.kde.CrowTranslate.desktop.in \
-      --subst-var-by QT_BIN_DIR ${lib.getBin qt5.qttools}/bin
+      --subst-var-by QT_BIN_DIR ${lib.getBin qt6.qttools}/bin
  '';

  nativeBuildInputs = [
    cmake
    extra-cmake-modules
-    qt5.qttools
-    qt5.wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
  ];

  buildInputs = [
-    libsForQt5.kwayland
+    kdePackages.kwayland
    leptonica
-    tesseract4
-    qt5.qtmultimedia
-    qt5.qtx11extras
+    tesseract
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtscxml
+    qt6.qtspeech
  ]
-  ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-bad
-  ]);
-
-  preFixup = ''
-    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  ++ lib.optionals withPiper [
+    onnxruntime
+  ];
+  cmakeFlags = [
+    (lib.cmakeBool "ONNXRuntime_USE_STATIC" false)
+    (lib.cmakeBool "WITH_PIPER_TTS" withPiper)
+  ];
+  # Necessary for KWin D-BUS authorization for taking screenshots, without
+  # which the app falls back to interactive capture, which has some limitations.
+  postInstall = ''
+    substituteInPlace $out/share/applications/org.kde.CrowTranslate.desktop \
+      --replace-fail 'Exec=crow' "Exec=$out/bin/crow"
  '';

-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };

  meta = {
    description = "Simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing";
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "JankyBorders";
-  version = "1.8.3";
+  version = "1.8.4";

  src = fetchFromGitHub {
    owner = "FelixKratz";
    repo = "JankyBorders";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-lc61PjaRZ8ZOWAFhsf/G3sQkd1oUyePHU43w4pt1AWY=";
+    hash = "sha256-31Er+cUQNJbZnXKC6KvlrBhOvyPAM7nP3BaxunAtvWg=";
  };

  nativeBuildInputs = [
@@ -42,13 +42,13 @@ let
  };

  pname = "pretix";
-  version = "2025.7.1";
+  version = "2025.8.0";

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix";
    rev = "refs/tags/v${version}";
-    hash = "sha256-emPzCwViqbGqlQRYmyamhQ5y6a3g67TTYIdv6FWbGEU=";
+    hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg=";
  };

  npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
    inherit version src;

    sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-cvyOpEw6z0cNUdHRmyEZUoeKPMOAtC+YHYXCltbHdm0=";
+    npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08=";

    dontBuild = true;

@@ -85,6 +85,7 @@ python.pkgs.buildPythonApplication rec {
    "celery"
    "css-inline"
    "django-bootstrap3"
+    "django-formset-js-improved"
    "django-i18nfield"
    "django-localflavor"
    "django-phonenumber-field"
@@ -97,6 +98,7 @@ python.pkgs.buildPythonApplication rec {
    "phonenumberslite"
    "pillow"
    "protobuf"
+    "pycparser"
    "pycryptodome"
    "pyjwt"
    "pypdf"
@@ -127,6 +129,10 @@ python.pkgs.buildPythonApplication rec {
    substituteInPlace pyproject.toml \
      --replace-fail '"backend"' '"setuptools.build_meta"' \
      --replace-fail 'backend-path = ["_build"]' ""
+
+    # npm ci would remove and try to reinstall node_modules
+    substituteInPlace src/pretix/_build.py \
+      --replace-fail "npm ci" "npm install"
  '';

  build-system = with python.pkgs; [
@@ -20,14 +20,14 @@

 buildPythonPackage rec {
  pname = "pretix-sepadebit";
-  version = "2.6.0";
+  version = "2.7.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix-sepadebit";
    tag = "v${version}";
-    hash = "sha256-o4HVPuSpYIFjxmYuL+IsJJDkv+4ARuvaDqPjxWxlhMg=";
+    hash = "sha256-Xnp7aic+Xf4wJzJbWqhsfMajT4AOQGQMIGIewJ5B37o=";
  };

  build-system = [
@@ -55,6 +55,12 @@ buildPythonPackage rec {
    export DJANGO_SETTINGS_MODULE=pretix.testutils.settings
  '';

+  disabledTests = [
+    # https://github.com/pretix/pretix-sepadebit/issues/69
+    "test_mail_context"
+    "test_call_mail_context"
+  ];
+
  meta = with lib; {
    description = "Plugin to receive payments via SEPA direct debit";
    homepage = "https://github.com/pretix/pretix-sepadebit";
@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "pretix-servicefees";
-  version = "1.14.1";
+  version = "1.15.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix-servicefees";
    tag = "v${version}";
-    hash = "sha256-iceFpmuWlq4LnZpG57d4Fwx9bXJDGwx+ox58s8oxupU=";
+    hash = "sha256-oxuxlwNYJsuYj5zm2VYRMn8wz3vF92SzGxD8w3N7ZIM=";
  };

  build-system = [
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "pretix-zugferd";
-  version = "2.4.2";
+  version = "2.5.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretix";
    repo = "pretix-zugferd";
    rev = "v${version}";
-    hash = "sha256-ARTQjd78lkcs16cULAaudMtW1DmDKGf3gNBQZIHCQ1E=";
+    hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w=";
  };

  postPatch = ''
@@ -0,0 +1,15 @@
+Disable dprint on dstBundler
+
+dprint fails on sandbox, because it requires internet access to install its
+plugins.
+
+--- a/scripts/dtsBundler.mjs
+++ b/scripts/dtsBundler.mjs
+@@ -430,5 +430,5 @@
+     return result.replace(/\r\n/g, "\n");
+ }
+ 
+-fs.writeFileSync(output, dprint(publicContents));
+-fs.writeFileSync(internalOutput, dprint(internalContents));
+fs.writeFileSync(output, publicContents);
+fs.writeFileSync(internalOutput, internalContents);
@@ -1,20 +0,0 @@
-{
-  "name": "typescript",
-  "version": "5.9.2",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "typescript",
-      "version": "5.9.2",
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    }
-  }
-}
@@ -1,49 +1,27 @@
 {
  lib,
  buildNpmPackage,
-  fetchurl,
+  fetchFromGitHub,
  versionCheckHook,
-  writeShellApplication,
-  nodejs,
-  gnutar,
-  jq,
-  moreutils,
-  nix-update,
-  prefetch-npm-deps,
+  nix-update-script,
 }:

 buildNpmPackage (finalAttrs: {
  pname = "typescript";
-  version = "5.9.2";
+  version = "5.9.3";

-  # Prefer npmjs over the GitHub repository for source code.
-  # The TypeScript project typically publishes stable, versioned code to npmjs,
-  # whereas GitHub tags may sometimes include development versions.
-  # For example:
-  #   - https://github.com/microsoft/TypeScript/pull/61218#issuecomment-2911264050
-  #   - https://github.com/microsoft/TypeScript/pull/60150#issuecomment-2648791588, 5.8.3 includes this 5.9 breaking change
-  src = fetchurl {
-    url = "https://registry.npmjs.org/typescript/-/typescript-${finalAttrs.version}.tgz";
-    hash = "sha256-Z6O8gugiuPRfZTqA/DqXMNIyFNNsg7qF3X9avr7oIGI=";
+  src = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "TypeScript";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OVsvlHtYZhoCtTxdZO6mhVPpIICWEt1Q92Jqrf95jyM=";
  };

-  # The upstream GitHub repository's package-lock.json differs from the package.json in the npmjs tarball.
-  # For example, package-lock.json for v5.8.3 defines TypeScript as version 5.9.0. Therefore, we should use our own package-lock.json file.
-  # These files are typically large due to devDependencies. Removing the devDependencies section is better, especially considering issue #327064.
-  #
-  # We've removed devDependencies from package-lock.json via updateScript to minimize its size.
-  # Now, we must also modify package.json to reflect this change.
-  # As TypeScript will then have no dependencies, place an empty node_modules directory.
-  postPatch = ''
-    ${lib.getExe jq} 'del(.devDependencies)' package.json | ${moreutils}/bin/sponge package.json
-    ln -s '${./package-lock.json}' package-lock.json
-    mkdir -p node_modules
-  '';
+  patches = [
+    ./disable-dprint-dstBundler.patch
+  ];

-  npmDepsHash = "sha256-dyN94wmEA/jtiJCsEs/MoDSd6AFsaq2r25a/FeuqQ5k=";
-  forceEmptyCache = true;
-
-  dontNpmBuild = true;
+  npmDepsHash = "sha256-4ft5168ru+aGPvZAxASQ4wkjtfNG2e0sNhJTedbiKQA=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -53,23 +31,11 @@ buildNpmPackage (finalAttrs: {
  versionCheckProgramArg = "--version";

  passthru = {
-    updateScript = lib.getExe (writeShellApplication {
-      name = "${finalAttrs.pname}-updater";
-      runtimeInputs = [
-        nodejs
-        gnutar
-        jq
-        nix-update
-        prefetch-npm-deps
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex=^v([\\d.]+)$"
      ];
-      runtimeEnv = {
-        PNAME = finalAttrs.pname;
-        PKG_DIR = builtins.toString ./.;
-        FORCE_EMPTY_CACHE = "true";
-        OLD_NPM_DEPS_HASH = finalAttrs.npmDepsHash;
-      };
-      text = builtins.readFile ./update.bash;
-    });
+    };
  };

  meta = {
@@ -77,9 +43,7 @@ buildNpmPackage (finalAttrs: {
    homepage = "https://www.typescriptlang.org/";
    changelog = "https://github.com/microsoft/TypeScript/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      kachick
-    ];
+    maintainers = [ ];
    mainProgram = "tsc";
  };
 })
@@ -1,23 +0,0 @@
-pkg_file="$PKG_DIR/package.nix"
-
-cd "$PKG_DIR"
-
-# Update lockfile
-rm ./package-lock.json
-version="$(npm view typescript version)"
-npm pack typescript
-tar xvf "typescript-${version}.tgz"
-# Minimize size of package-lock.json
-jq 'del(.devDependencies)' package/package.json > package.json
-npm install --package-lock-only
-rm -rf ./package ./package.json ./"typescript-${version}.tgz"
-NEW_NPM_DEPS_HASH=$(prefetch-npm-deps ./package-lock.json)
-cd -
-
-# Update version and src hash
-nix-update "$PNAME" --version "$version"
-
-# Update npmDepsHash
-pkg_body="$(<"$pkg_file")"
-pkg_body="${pkg_body//"$OLD_NPM_DEPS_HASH"/"$NEW_NPM_DEPS_HASH"}"
-echo "$pkg_body" >"$pkg_file"
@@ -1,23 +1,19 @@
-commit 3048885aa749774b5677ab8df8f1a3eeff125d7a
+commit 0a258effd3492d7e4c11b4d175538c619699fbd6
 Author: rnhmjoj <rnhmjoj@inventati.org>
-Date:   Tue Aug 6 08:36:38 2024 +0200
+Date:   Wed Oct 1 09:43:45 2025 +0200

    Fix assets path on NixOS

 diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs
-index 03746dc4..c69d607b 100644
+index 13102e8..898b23b 100644
 --- a/common/assets/src/lib.rs
 +++ b/common/assets/src/lib.rs
-@@ -400,6 +400,13 @@ lazy_static! {
+@@ -381,6 +381,9 @@ lazy_static! {
             }
         }
 
 +        // 5. NixOS path
-+        if let Some(executable) = std::env::args().nth(0).map(PathBuf::from) {
-+            if let Some(package) = executable.ancestors().nth(2) {
-+                paths.push(package.join("share/veloren"));
-+            }
-+        }
+        paths.push("@out@/share/veloren/".into());
 +
         tracing::trace!("Possible asset locations paths={:?}", paths);
 
@@ -52,6 +52,8 @@ rustPlatform.buildRustPackage {
      println!("cargo:rustc-cfg=nightly");
    }
    EOF
+    # Fix assets path
+    substituteAllInPlace common/assets/src/lib.rs
  '';

  nativeBuildInputs = [
@@ -6,24 +6,25 @@
  dotnetCorePackages,
  zlib,
  openssl,
+  nix-update-script,
  nixosTests,
 }:
 buildDotnetModule rec {
  pname = "wasabibackend";
-  version = "2.0.2.1";
+  version = "2.3.1";

  src = fetchFromGitHub {
-    owner = "zkSNACKs";
+    owner = "WalletWasabi";
    repo = "WalletWasabi";
    tag = "v${version}";
-    hash = "sha512-JuCl3SyejzwUd2n8Fy7EdxUuO4bIcGb8yMWZQOhZzsY4fvg9prFOnVZEquxahD0a41MLKHRNA1R2N3NMapcc0A==";
+    hash = "sha256-vOvNumR/0agf9Mof0UD3KjJVgN18y6R/OrgLOXwL3K8=";
  };

  projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj";
  nugetDeps = ./deps.json;

-  dotnet-sdk = dotnetCorePackages.sdk_7_0-bin;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;

  buildInputs = [
    (lib.getLib stdenv.cc.cc)
@@ -35,26 +36,32 @@ buildDotnetModule rec {
    zlib
  ];

-  preConfigure = ''
-    makeWrapperArgs+=(
-      --chdir "$out/lib/${pname}"
-    )
-  '';
+  executables = [ "WalletWasabi.Backend" ];

  postFixup = ''
    mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend
  '';

-  passthru.tests = {
-    inherit (nixosTests) wasabibackend;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      inherit (nixosTests) wasabibackend;
+    };
  };

-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/WalletWasabi/WalletWasabi/releases/tag/${src.tag}";
    description = "Backend for the Wasabi Wallet";
    homepage = "https://wasabiwallet.io/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ mmahut ];
+    license = lib.licenses.mit;
+    mainProgram = "WasabiBackend";
+    maintainers = with lib.maintainers; [
+      mmahut
+    ];
    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [
+      binaryNativeCode # contains binaries in WalletWasabi/Microservices/Binaries
+      fromSource
+    ];
  };
 }
@@ -10,27 +10,22 @@
  pytest-asyncio,
  pytest-cov-stub,
  pytestCheckHook,
-  pythonOlder,
  syrupy,
  yarl,
 }:

 buildPythonPackage rec {
  pname = "autarco";
-  version = "3.1.0";
+  version = "3.2.0";
  pyproject = true;

-  disabled = pythonOlder "3.11";
-
  src = fetchFromGitHub {
    owner = "klaasnicolaas";
    repo = "python-autarco";
    tag = "v${version}";
-    hash = "sha256-zSqIEtQucrrAFEY7pBJ14Cevq8xbcGOheEmEE7Jd4qk=";
+    hash = "sha256-+j7limAYKFj9DZjetXnaFKIolitRppU1QLFRB94DlgE=";
  };

-  pythonRelaxDeps = [ "orjson" ];
-
  postPatch = ''
    # Upstream doesn't set a version for the pyproject.toml
    substituteInPlace pyproject.toml \
@@ -61,7 +56,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Module for the Autarco Inverter";
    homepage = "https://github.com/klaasnicolaas/python-autarco";
-    changelog = "https://github.com/klaasnicolaas/python-autarco/releases/tag/v${version}";
+    changelog = "https://github.com/klaasnicolaas/python-autarco/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
@@ -2,6 +2,8 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch,
+  setuptools,
  django,
  django-jquery-js,
 }:
@@ -9,7 +11,7 @@
 buildPythonPackage rec {
  pname = "django-formset-js-improved";
  version = "0.5.0.3";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "pretix";
@@ -18,9 +20,18 @@ buildPythonPackage rec {
    hash = "sha256-bOM24ldXk9WeV0jl6LIJB3BJ5hVWLA1PJTBBnJBoprU=";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/pretix/django-formset-js/commit/7d8a33190d58ff9d75270264342eba82672d054e.patch";
+      hash = "sha256-eBRP0eqMnH7UM9cToR+diejO6dMDDVt2bbUHLDcaWjk=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
  buildInputs = [ django ];

-  propagatedBuildInputs = [ django-jquery-js ];
+  dependencies = [ django-jquery-js ];

  pythonImportsCheck = [ "djangoformsetjs" ];

@@ -1,22 +1,35 @@
 {
  lib,
  buildPythonPackage,
+  fetchpatch,
  fetchPypi,
  attrs,
  requests,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "pyqwikswitch";
  version = "0.94";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-IpyWz+3EMr0I+xULBJJhBgdnQHNPJIM1SqKFLpszhQc=";
  };

-  propagatedBuildInputs = [
+  patches = [
+    # https://github.com/kellerza/pyqwikswitch/pull/7
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio.timeout.patch";
+      url = "https://github.com/kellerza/pyqwikswitch/commit/7b3f2211962b30bb6beea9a4fe17cd04cdf8e27f.patch";
+      hash = "sha256-sdO5jzIgKdneNY5dTngIzUFtyRg7HBGaZA1BBeAJxu4=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    attrs
    requests
  ];
@@ -24,14 +24,14 @@

 buildPythonPackage rec {
  pname = "urllib3-future";
-  version = "2.14.900";
+  version = "2.14.901";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jawah";
    repo = "urllib3.future";
    tag = version;
-    hash = "sha256-TMxYnvGkLZEaE4ECgzIN6XTI8OMI5N9mNcsvXeYCVbM=";
+    hash = "sha256-WbOtW36UrJCliEI4TW+8+iOF8ZUJmuP0JqvsdrJkLlc=";
  };

  postPatch = ''
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildHomeAssistantComponent,
+  fetchFromGitHub,
+  nix-update-script,
+  websockets,
+  # Test dependencies
+  pytestCheckHook,
+  pytest-homeassistant-custom-component,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "JeffSteinbok";
+  domain = "dreo";
+  version = "1.3.3";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo = "hass-dreo";
+    tag = "v${version}";
+    hash = "sha256-eAgqjAXNAY8kr7+49q+tikW3bDBJ0N0Rh5WJwzLYr8I=";
+  };
+
+  dependencies = [ websockets ];
+
+  nativeCheckInputs = [
+    pytest-homeassistant-custom-component
+    pytestCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/JeffSteinbok/hass-dreo/releases/tag/${src.tag}";
+    description = "Dreo Smart Device Integration for Home Assistant";
+    homepage = "https://github.com/JeffSteinbok/hass-dreo";
+    maintainers = with lib.maintainers; [ CodedNil ];
+    license = lib.licenses.mit;
+  };
+}
@@ -490,7 +490,6 @@ python.pkgs.buildPythonApplication rec {
      # some components are needed even if tests in tests/components are disabled
      "default_config"
      "hue"
-      "qwikswitch"
    ];

  pytestFlags = [