Merge master into staging-next

2025-02-07 00:14:33 +00:00
parent 7fd17c8316 affff94d36
commit 13fd8fecfe
189 changed files with 3700 additions and 13591 deletions
@@ -23735,6 +23735,7 @@
    email = "admin@snappeh.com";
    github = "tris203";
    githubId = 18444302;
+    name = " Tristan Knight";
  };
  trishtzy = {
    github = "trishtzy";
@@ -20,19 +20,23 @@ let
      meta.maintainers = [ lib.maintainers.aanderse ];

      nodes.machine = {
-        services.mysql = {
-          inherit package;
-          enable = true;
-          initialDatabases = [
-            {
-              name = "testdb";
-              schema = ./testdb.sql;
-            }
-          ];
-        };
+        services = {
+          mysql = {
+            inherit package;
+            enable = true;
+            initialDatabases = [
+              {
+                name = "testdb";
+                schema = ./testdb.sql;
+              }
+            ];
+          };

-        services.automysqlbackup.enable = true;
-        automysqlbackup.settings.mysql_dump_port = "";
+          automysqlbackup = {
+            enable = true;
+            settings.mysql_dump_port = "";
+          };
+        };
      };

      testScript = ''
@@ -364,7 +364,6 @@ in
  # for instance luasnip has a dependency on jsregexp
  can_require_transitive_deps =
    runTest nvim-with-luasnip ''
-    cat ${nvim-with-luasnip}/nvim
    ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall!
  '';

@@ -84,13 +84,9 @@ let
    pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) []  pluginsNormalized;

    # a limited RC script used only to generate the manifest for remote plugins
-    manifestRc = vimUtils.vimrcContent { customRC = ""; };
+    manifestRc = "";
    # we call vimrcContent without 'packages' to avoid the init.vim generation
-    neovimRcContent' = vimUtils.vimrcContent {
-      beforePlugins = "";
-      customRC = lib.concatStringsSep "\n" (pluginRC ++ lib.optional (neovimRcContent != null) neovimRcContent);
-      packages = null;
-    };
+    neovimRcContent' = lib.concatStringsSep "\n" (pluginRC ++ lib.optional (neovimRcContent != null) neovimRcContent);

    packpathDirs.myNeovimPackages = myVimPackage;
    finalPackdir = neovimUtils.packDir packpathDirs;
@@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "jupyter";
    publisher = "ms-toolsai";
-    version = "2024.11.0";
-    hash = "sha256-BwZLF52ilEaLU6swUFEa+PtrxzsFOLIYd8TVD7xRgPg=";
+    version = "2025.1.0";
+    hash = "sha256-xZMk7eNnmWviqpUvl9hXcoKL3Uwii0ZJz6DCCI9UM2k=";
  };

  nativeBuildInputs = [
@@ -26,11 +26,11 @@ let

  sha256 =
    {
-      x86_64-linux = "1l8w890xb3hszz1xf17xh1h8w0n2vcxc2jg3w1yzlx06rdb8bdy5";
-      x86_64-darwin = "1pb8i73bnpgcxzjdbcnb0cgjzr07a8pkb204m1w0zgl4ffjfhak0";
-      aarch64-linux = "0qkjrnhafbdam068gz8fzwpjb6cc3r70m9n11rkcw50i3m4gljrh";
-      aarch64-darwin = "0y3wwzpqwx6hk3rpnjjj8w3la6hw0g1y1fxw73paj9zcsmmz9l0a";
-      armv7l-linux = "053zkdjdvgmibqdd8jwr7msf9awdblqcxkim0wq1zxjxq5xnzz8j";
+      x86_64-linux = "095ilb9b8703lik5ssgs94b7z640pnmwwphnrilwzdj639ldjzf8";
+      x86_64-darwin = "1i08ylzmnfpqmzdm5yx4wx9nq4z2ghcsfvhla3afnw9ah91yf278";
+      aarch64-linux = "0m9yf7ks4y6mw1qz5h1clw0s7vwn8yca830f98v69a3f2axb2x8i";
+      aarch64-darwin = "0lg05v1mzbsrmqjg20chr4rywbrg45j8d7irkzxg4kqbz8z7z9w6";
+      armv7l-linux = "0b8y5qffacxwis3fhif9d4vsi8268gff8daqavj4rzdaahvjxdhj";
    }
    .${system} or throwSystem;

@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {

  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
-  version = "1.96.4.25017";
+  version = "1.96.4.25026";
  pname = "vscodium";

  executableName = "codium";
@@ -12,13 +12,13 @@
 }:
 mkLibretroCore {
  core = "same_cdi";
-  version = "0-unstable-2023-02-28";
+  version = "0-unstable-2025-01-31";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "same_cdi";
-    rev = "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0";
-    hash = "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=";
+    rev = "7ee1d8e9cb4307b7cd44ee1dd757e9b3f48f41d5";
+    hash = "sha256-EGE3NuO0gpZ8MKPypH8rFwJiv4QsdKuIyLKVuKTcvws=";
  };

  extraNativeBuildInputs = [ python3 ];
@@ -8,13 +8,13 @@
 let
  drv = stdenv.mkDerivation rec {
    pname = "controller-topology-project";
-    version = "1.0.1";
+    version = "1.0.2";

    src = fetchFromGitHub {
      owner = "kodi-game";
      repo = "controller-topology-project";
      rev = "v${version}";
-      sha256 = "sha256-NRoI28LqXbsF6Icym98SWLHNl+WD8TsJ0P+ELf/JhyQ=";
+      sha256 = "sha256-pbYFNCDhKhYKREffWbMbcd9xBL4ZiKWR7hMZUCTUHRg=";
    };

    postPatch = ''
@@ -8,11 +8,11 @@
 buildKodiAddon rec {
  pname = "idna";
  namespace = "script.module.idna";
-  version = "3.4.0";
+  version = "3.10.0";

  src = fetchzip {
    url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk=";
+    sha256 = "sha256-wFS7rETO+VGeg1MxMEdb/cwVw5/TEoZF2CS3BjkxDlk=";
  };

  passthru = {
@@ -20,14 +20,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "alpaca";
-  version = "3.5.0";
+  version = "4.0.1";
  pyproject = false; # Built with meson

  src = fetchFromGitHub {
    owner = "Jeffser";
    repo = "Alpaca";
    tag = version;
-    hash = "sha256-YheyeT9KiH9LphFfExie7RU7q/qVni5pFdpz32rM8RQ=";
+    hash = "sha256-BTTqSYoyhtFh+sk95hTNpg9AK/mdnXKz3hy/nqSbSTQ=";
  };

  nativeBuildInputs = [
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-deb";
-  version = "2.11.0";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "kornelski";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-Nr6Hl8kjLHVrxqj5Xm147gb13xF2dQ5C+KuPD+PQglU=";
+    hash = "sha256-5XAlgXWYZiq5Y2dXw0CtzObORII1baMo7yuLwlh8s4A=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-4YEomAErh8+0NyLYtpGe5NVol308z3JkClpKz2GB/C4=";
+  cargoHash = "sha256-t+7EcvlJ9f/6Uja3c3HTnrR9hoyLjUxtCqfkHWqSv08=";

  nativeBuildInputs = [
    makeWrapper
@@ -11,15 +11,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-public-api";
-  version = "0.43.0";
+  version = "0.44.0";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-oAtAfoWJ4YZ9YcU7DQtj6QqF1DSEMOUjauQxqo1a6GA=";
+    hash = "sha256-DInUd9r2ABvehc/SoJI9VmbfllbYNwwORWSTfsL9EwE=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-VcblQw9EZSvV8rw9Krp5ZTXwVdZJe0FqJbqpptkpJfU=";
+  cargoHash = "sha256-CcDoGAt3CMDO7NFyx+0Jk2RRvQT+vFWUu0vz40Ogpgo=";

  nativeBuildInputs = [ pkg-config ];

@@ -5,7 +5,7 @@
  libffi,
  libxml2,
  llvmPackages,
-  python3,
+  sphinx,
  stdenv,
  testers,
  zlib,
@@ -16,7 +16,6 @@

 let
  inherit (llvmPackages) libclang llvm;
-  inherit (python3.pkgs) sphinx;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "castxml";
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "cloud-nuke";
-  version = "0.38.1";
+  version = "0.38.2";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-i+mhxcY7201YADNb+OHLoh4zLIBLwkWVBZ6RnYPOJaM=";
+    hash = "sha256-hQFuHEIxsvyCmP4DR9MsrWmPbo3BFU3k5nYNsQVNy/U=";
  };

-  vendorHash = "sha256-OrTRHje3ks3eGsJNusWJTpL740OWj5jy1es52DfNDbI=";
+  vendorHash = "sha256-ExZZHCGmU9r1DrJ3alN6Y39P6rfFymQSpK8b+ZD7h0s=";

  nativeBuildInputs = [
    makeBinaryWrapper
@@ -11,8 +11,8 @@ let
  btrfsProgsPatched = btrfs-progs.overrideAttrs {
    patches = [
      (fetchpatch {
-        url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/1f1d29eff61430e118f88239545a29f0bcf3e15d/patch/btrfs-progs-v6.3.3/0001-Print-csum-for-a-given-file-on-stdout.patch";
-        hash = "sha256-bO0t8QePnUbMkQQPesZlBF/khD/H8AaWHr2GkOnT6x8=";
+        url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/7e8f995a3a6179a31d15ce073bce6cfbaefb81ed/patch/btrfs-progs-v6.11/0001-Print-csum-for-a-given-file-on-stdout.patch";
+        hash = "sha256-ndydH5tHKYLKhstNdpfuJVCUrwl+6VJwprKy4hz8uwM=";
      })
    ];
  };
@@ -33,7 +33,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dnf5";
-  version = "5.2.9.0";
+  version = "5.2.10.0";

  outputs = [
    "out"
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "rpm-software-management";
    repo = "dnf5";
    rev = finalAttrs.version;
-    hash = "sha256-TkWFSxbxsRRRMDkTKlaOnKC0VLmcV0LuZmmnvqtywaw=";
+    hash = "sha256-FDC9va2UKnmAHMQeoH7Rwvu/IN+vZCspvupYvo81nkY=";
  };

  nativeBuildInputs =
@@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "doctl";
-  version = "1.120.2";
+  version = "1.121.0";

  vendorHash = null;

@@ -31,7 +31,7 @@ buildGoModule rec {
    owner = "digitalocean";
    repo = "doctl";
    rev = "v${version}";
-    sha256 = "sha256-zIpwR9tgv1vO2xI5DaLTY/eFuv91G4tlQAtJBi0pXfA=";
+    sha256 = "sha256-2bXUbzNt1xsy1ZHVrMvTrih2qhuacnS2Qo0g1vt4qYk=";
  };

  meta = with lib; {
@@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "eigenmath";
-  version = "337-unstable-2025-01-25";
+  version = "337-unstable-2025-01-31";

  src = fetchFromGitHub {
    owner = "georgeweigt";
    repo = pname;
-    rev = "ae71bdf698283760ad3ac74ce57158f25c8d9198";
-    hash = "sha256-vmbujai7xW4U6fmsp4Gv63Tl3AcxOUsUA2rPTfFL3ZQ=";
+    rev = "42a92c35d0ccc85fd8b16aa432c641edd3fa5b87";
+    hash = "sha256-59iD5ivu2hPBfoxItfmTek4944ch6PlkAiVIimmvI5o=";
  };

  checkPhase =
@@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "flintlock";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "weaveworks";
    repo = "flintlock";
    rev = "v${version}";
-    sha256 = "sha256-ODr6rZYrWtGZ7S/QmRHHjK9Krb9I+0A3A98cNuyIHz0=";
+    sha256 = "sha256-dBwuguOSIc4+cdxfW91kdyprayYu2m2WjBg3qBnVM98=";
  };

-  vendorHash = "sha256-I8An3QbgN+dYMIvFX2M7U54AbJBlvpO3pfkzixZaHrY=";
+  vendorHash = "sha256-Iv1qHEQLgw6huCA/6PKNmm+dS2yHgOvY/oy2fKjwEpY=";

  subPackages = [
    "cmd/flintlock-metrics"
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "flyctl";
-  version = "0.3.68";
+  version = "0.3.75";

  src = fetchFromGitHub {
    owner = "superfly";
    repo = "flyctl";
    rev = "v${version}";
-    hash = "sha256-6/84MC7wmMCfCtuV0HJ/zMG96RO55LQxudejI5exVAM=";
+    hash = "sha256-uNJzJpeJpDNDgnBIzveK2dKVdRpEWFW912c/vZgeXQo=";
  };

-  vendorHash = "sha256-aKDziIx0xyWOczc9G0YQ7mdWdc5cWHjpjTDyJMsFriM=";
+  vendorHash = "sha256-ylz8O/HW1rtOCI6/YzIT/byYmSdMkSrF0AX7nIzALTU=";

  subPackages = [ "." ];

@@ -27,7 +27,7 @@
 }:

 let
-  version = "1.20.1";
+  version = "1.20.2";

  # build stimuli file for PGO build and the script to generate it
  # independently of the foot's build, so we can cache the result
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
    owner = "dnkl";
    repo = "foot";
    rev = version;
-    hash = "sha256-0tnB6fCZEUAlQ3iPxXXlJ5EXPMeWSNIHsIWV4d3cuKM=";
+    hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
  };

  separateDebugInfo = true;
@@ -1,23 +1,24 @@
 {
  lib,
-  fetchFromSourcehut,
+  fetchFromGitea,
  buildNpmPackage,
  writeText,
-  # https://git.sr.ht/~emersion/gamja/tree/master/doc/config-file.md
+  # https://codeberg.org/emersion/gamja/src/branch/master/doc/config-file.md
  gamjaConfig ? null,
 }:
 buildNpmPackage rec {
  pname = "gamja";
-  version = "1.0.0-beta.9";
+  version = "1.0.0-beta.10";

-  src = fetchFromSourcehut {
-    owner = "~emersion";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "emersion";
    repo = "gamja";
    rev = "v${version}";
-    hash = "sha256-09rCj9oMzldRrxMGH4rUnQ6wugfhfmJP3rHET5b+NC8=";
+    hash = "sha256-JqnEiPnYRGSeIZm34Guu7MgMfwcySc42aTXweMqL8BQ=";
  };

-  npmDepsHash = "sha256-LxShwZacCctKAfMNCUMyrSaI1hIVN80Wseq/d8WITkc=";
+  npmDepsHash = "sha256-dAfbluNNBF1e9oagej+SRxO/YffCdLLAUUgt8krnWvg=";

  installPhase = ''
    runHook preInstall
@@ -6,67 +6,65 @@
  gettext,
  git,
  qt5,
-  gitUpdater,
+  versionCheckHook,
+  nix-update-script,
 }:

 python3Packages.buildPythonApplication rec {
  pname = "git-cola";
-  version = "4.10.1";
+  version = "4.11.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "git-cola";
    repo = "git-cola";
-    rev = "v${version}";
-    hash = "sha256-tOd+LSS6inGLRb6Wm92tta0JbjSZw+88hqFDJmSSJlY=";
+    tag = "v${version}";
+    hash = "sha256-aFdjkuQrVYgYALTnupdwVL58kSsp4SC6xsXefA1NnKI=";
  };

-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    qt5.qtwayland
-  ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];

-  propagatedBuildInputs = with python3Packages; [
-    setuptools
-    git
-    pyqt5
-    qtpy
-    send2trash
-    polib
-  ];
+  propagatedBuildInputs =
+    [ git ]
+    ++ (with python3Packages; [
+      setuptools
+      pyqt5
+      qtpy
+      send2trash
+      polib
+    ]);

-  nativeBuildInputs = with python3Packages; [
-    setuptools-scm
+  nativeBuildInputs = [
    gettext
    qt5.wrapQtAppsHook
+    python3Packages.setuptools-scm
  ];

-  nativeCheckInputs = with python3Packages; [
+  nativeCheckInputs = [
    git
-    pytestCheckHook
+    python3Packages.pytestCheckHook
+    versionCheckHook
  ];

-  disabledTestPaths =
-    [
-      "qtpy/"
-      "contrib/win32"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "cola/inotify.py"
-    ];
+  versionCheckProgramArg = "--version";
+
+  disabledTestPaths = [
+    "qtpy/"
+    "contrib/win32"
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ];

  preFixup = ''
    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
  '';

-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v";
-  };
+  passthru.updateScript = nix-update-script { };

-  meta = with lib; {
-    homepage = "https://github.com/git-cola/git-cola";
+  meta = {
    description = "Sleek and powerful Git GUI";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.bobvanderlinden ];
+    homepage = "https://git-cola.github.io/";
+    changelog = "https://github.com/git-cola/git-cola/blob/v${version}/CHANGES.rst";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ bobvanderlinden ];
    mainProgram = "git-cola";
  };
 }
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "go-minimock";
-  version = "3.4.3";
+  version = "3.4.4";

  src = fetchFromGitHub {
    owner = "gojuno";
    repo = "minimock";
    rev = "v${version}";
-    hash = "sha256-K7b77EqcXl4fZcpp93Jwg3fXLVmDuantv4QJYHj/Fik=";
+    hash = "sha256-pXSi5gdEqTrvSOQ2yJysowRKJ0bZjhgCkV9Vxx1J5Lk=";
  };

  ldflags = [
@@ -2,43 +2,42 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
+  versionCheckHook,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "hashrat";
-  version = "1.22";
+  version = "1.23";

  src = fetchFromGitHub {
    owner = "ColumPaget";
    repo = "Hashrat";
-    rev = "v${version}";
-    hash = "sha256-mjjK315OUUFVdUY+zcCvm7yeo7XxourR1sghWbeFT7c=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dDtn01eoODgRtsbEdtuXhib3fZLosP8ajJBGaG8Skss=";
  };

-  patches = [
-    # fix cross compilation by replacing hardcoded ar with AC_PROG_AR
-    # https://github.com/ColumPaget/Hashrat/pull/27
-    (fetchpatch {
-      url = "https://github.com/ColumPaget/Hashrat/commit/a82615e02021245850a1703e613055da2520c8fd.patch";
-      hash = "sha256-tjyhM2ahZBRoRP8WjyQhrI3l20oaqMtfYmOeAZVEZqU=";
-    })
-  ];
-
  configureFlags = [ "--enable-xattr" ];

  makeFlags = [ "PREFIX=$(out)" ];

-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Command-line hash-generation utility";
    mainProgram = "hashrat";
    longDescription = ''
      Hashing tool supporting md5,sha1,sha256,sha512,whirlpool,jh and hmac versions of these.
      Includes recursive file hashing and other features.
    '';
-    homepage = "http://www.cjpaget.co.uk/Code/Hashrat";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zendo ];
+    homepage = "https://github.com/ColumPaget/Hashrat";
+    changelog = "https://github.com/ColumPaget/Hashrat/blob/v${finalAttrs.version}/CHANGELOG";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zendo ];
  };
-}
+})
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  cmake,
  cairo,
+  bash,
  expat,
  file,
  fribidi,
@@ -41,6 +42,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-pmkJCzjflvsOytiu2mgn2wfSeyL6mTfoi214T4A2OZQ=";
  };

+  prePatch = ''
+    substituteInPlace src/main.cpp \
+      --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"'
+  '';
+  postPatch = ''
+    substituteInPlace src/helpers/MiscFunctions.cpp \
+      --replace-fail '/bin/bash' '${bash}/bin/bash'
+  '';
+
  nativeBuildInputs = [
    cmake
    pkg-config
@@ -50,6 +60,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    cairo
+    bash
    expat
    file
    fribidi
@@ -73,11 +84,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
    hyprgraphics
  ];

-  prePatch = ''
-    substituteInPlace src/main.cpp \
-      --replace-fail GIT_COMMIT_HASH '"${finalAttrs.src.rev}"'
-  '';
-
  meta = with lib; {
    inherit (finalAttrs.src.meta) homepage;
    description = "Blazing fast wayland wallpaper utility";
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kyverno";
-  version = "1.13.2";
+  version = "1.13.3";

  src = fetchFromGitHub {
    owner = "kyverno";
    repo = "kyverno";
    rev = "v${version}";
-    hash = "sha256-dJyNurdJ5A09ouiJsyWiBaAeGM/xE/U2HdYNmPfY6VI=";
+    hash = "sha256-sRfVxNSUMjTszeKjPu6YlED3L7lzZEaPHxC4f0ztiMM=";
  };

  ldflags = [
@@ -18,7 +18,7 @@ buildGoModule rec {
    "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
  ];

-  vendorHash = "sha256-euHYTd2iyfVWsJhWZux5OCv2CPWqmsIPB1/rGD22a5Q=";
+  vendorHash = "sha256-U53CYkQlf2Ejmpe2XltZUA+zsXcKZl7e8A5X/M1E1so=";

  subPackages = [ "cmd/cli/kubectl-kyverno" ];

@@ -6,11 +6,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "lxgw-neoxihei";
-  version = "1.212";
+  version = "1.213";

  src = fetchurl {
    url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-g64kMY/9kHSlUH2rvDxKy4nmS+TH//SNJfCnQXHC4Q8=";
+    hash = "sha256-5vztvpOkUMbnZb7apT19ksLQlro7lQeT0iTqGjlPJdM=";
  };

  dontUnpack = true;
@@ -26,7 +26,8 @@ rustPlatform.buildRustPackage rec {
    hash = "sha256-rFex6stw++xNrcCYnYn3N0HrUQd91DAw9QU0R2MUzyQ=";
  };

-  cargoHash = "sha256-0RqCgIiH7O4bAuzy1To0+8wfvZWnZ8irZNSCthaKqAk=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-u3C6JmaPU4/pyg8Ko01Y33UkuqrVa2lV/jYdMUAF6ng=";

  npmDeps = fetchNpmDeps {
    name = "${pname}-${version}-npm-deps";
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mdds";
-  version = "3.0.0";
+  version = "2.1.1";

  src = fetchFromGitLab {
    owner = "mdds";
    repo = "mdds";
    rev = finalAttrs.version;
-    hash = "sha256-XIfrbnjY3bpnbRBnE44dQNJm3lhL0Y1Mm0sayh3T2aY=";
+    hash = "sha256-a412LpgDiYM8TMToaUrTlHtblYS1HehzrDOwvIAAxiA=";
  };

  nativeBuildInputs = [ autoreconfHook ];
@@ -12,7 +12,34 @@ let
  python = python3.override {
    self = python;
    packageOverrides = self: super: {
+      aiojellyfin = super.aiojellyfin.overridePythonAttrs (oldAttrs: rec {
+        version = "0.10.1";
+
+        src = fetchFromGitHub {
+          owner = "Jc2k";
+          repo = "aiojellyfin";
+          tag = "v${version}";
+          hash = "sha256-A+uvM1/7HntRMIdknfHr0TMGIjHk7BCwsZopXdVoEO8=";
+        };
+      });
+
      music-assistant-frontend = self.callPackage ./frontend.nix { };
+
+      music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec {
+        version = "1.1.4";
+
+        src = fetchFromGitHub {
+          owner = "music-assistant";
+          repo = "models";
+          tag = version;
+          hash = "sha256-keig18o32X53q/QcoaPO0o9AT4XTEZ+dQ3L6u6BVkLU=";
+        };
+
+        postPatch = ''
+          substituteInPlace pyproject.toml \
+            --replace-fail "0.0.0" "${version}"
+        '';
+      });
    };
  };

@@ -27,14 +54,14 @@ in

 python.pkgs.buildPythonApplication rec {
  pname = "music-assistant";
-  version = "2.3.4";
+  version = "2.3.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "music-assistant";
    repo = "server";
    tag = version;
-    hash = "sha256-HV2R5zMTao8akUNZMGRKbU8BIxWmdjKFLsGMqA5cfBs=";
+    hash = "sha256-CSGpG1E4ou1TGz/S1mXFHyk49p7dStEwxUTB+xxfNEc=";
  };

  patches = [
@@ -58,6 +85,7 @@ python.pkgs.buildPythonApplication rec {

  pythonRelaxDeps = [
    "aiohttp"
+    "certifi"
    "colorlog"
    "cryptography"
    "mashumaro"
@@ -111,6 +139,7 @@ python.pkgs.buildPythonApplication rec {
      aiojellyfin
      pytest-aiohttp
      pytest-cov-stub
+      pytest-timeout
      pytestCheckHook
      syrupy
      pytest-timeout
@@ -118,8 +147,10 @@ python.pkgs.buildPythonApplication rec {
    ++ lib.flatten (lib.attrValues optional-dependencies);

  pytestFlagsArray = [
-    # blocks in setup
-    "--deselect=tests/server/providers/jellyfin/test_init.py::test_initial_sync"
+    # blocks in poll()
+    "--deselect=tests/providers/jellyfin/test_init.py::test_initial_sync"
+    "--deselect=tests/core/test_server_base.py::test_start_and_stop_server"
+    "--deselect=tests/core/test_server_base.py::test_events"
  ];

  pythonImportsCheck = [ "music_assistant" ];
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py

 {
-  version = "2.3.4";
+  version = "2.3.6";
  providers = {
    airplay = ps: [
    ];
@@ -1,11 +0,0 @@
-diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
-index 578eac1..d17aa22 100644
--- a/bin/afppasswd/Makefile.am
-+++ b/bin/afppasswd/Makefile.am
-@@ -16,5 +16,5 @@ AM_CFLAGS = @SSL_CFLAGS@ -I$(top_srcdir)/sys \
- 
- install-exec-hook:
- if HAVE_OPENSSL
-	chmod u+s $(DESTDIR)$(bindir)/afppasswd
-+#	chmod u+s $(DESTDIR)$(bindir)/afppasswd
- endif
@@ -1,19 +0,0 @@
-diff --git a/config/Makefile.am b/config/Makefile.am
-index c98a2ab..58b7f0a 100644
--- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -36,10 +36,10 @@ endif
- #
- 
- install-data-local: install-config-files
-	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
-	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
-+#	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
-+#	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
-+#	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
-+#	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
- 
- uninstall-local:
- 	@for f in $(CONFFILES) $(GENFILES); do \
@@ -13,29 +13,33 @@
  pam,
  perl,
  pkg-config,
-  python3,
+  meson,
+  ninja,
+  file,
+  cracklib,
+  cups,
+  libtirpc,
+  openldap,
+  glib,
+  dbus,
+  docbook-xsl-nons,
+  libxslt,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "netatalk";
-  version = "3.1.19";
+  version = "4.1.1";

  src = fetchurl {
-    url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-p0pzHwnjNNWPsWRBflgaZB+ijMP5bF99TEdLs4mVKsI=";
+    url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LI0xIkWzmotzSsmo60URC8A94wiJKOV0MQqZDTuAAkE=";
  };

-  patches = [
-    ./000-no-suid.patch
-    ./001-omit-localstatedir-creation.patch
-  ];
-
  nativeBuildInputs = [
-    autoreconfHook
    pkg-config
-    perl
-    python3
-    python3.pkgs.wrapPython
+    meson
+    ninja
+    file
  ];

  buildInputs = [
@@ -47,26 +51,34 @@ stdenv.mkDerivation (finalAttrs: {
    libiconv
    openssl
    pam
+    cracklib
+    cups
+    libtirpc
+    openldap
+    glib
+    perl
+    dbus
+    docbook-xsl-nons
+    libxslt
  ];

-  configureFlags = [
-    "--with-bdb=${db.dev}"
-    "--with-ssl-dir=${openssl.dev}"
-    "--with-lockfile=/run/lock/netatalk"
-    "--localstatedir=/var/lib"
+  mesonFlags = [
+    "-Dwith-appletalk=true"
+    "-Dwith-bdb-path=${db.out}"
+    "-Dwith-bdb-include-path=${db.dev}/include"
+    "-Dwith-install-hooks=false"
+    "-Dwith-init-hooks=false"
+    "-Dwith-lockfile-path=/run/lock/"
+    "-Dwith-cracklib=true"
+    "-Dwith-cracklib-path=${cracklib.out}"
+    "-Dwith-docbook-path=${docbook-xsl-nons.out}/share/xml/docbook-xsl-nons/"
  ];

-  postInstall = ''
-    sed -i -e "s%/usr/bin/env python%${python3}/bin/python3%" $out/bin/afpstats
-    buildPythonPath ${python3.pkgs.dbus-python}
-    patchPythonScript $out/bin/afpstats
-  '';
-
  enableParallelBuilding = true;

  meta = with lib; {
    description = "Apple Filing Protocol Server";
-    homepage = "http://netatalk.sourceforge.net/";
+    homepage = "https://netatalk.io/";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ jcumming ];
@@ -7,14 +7,14 @@

 python3Packages.buildPythonApplication rec {
  pname = "oelint-adv";
-  version = "6.6.9";
+  version = "6.7.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "priv-kweihmann";
    repo = "oelint-adv";
    tag = version;
-    hash = "sha256-2QV8fYfqi+UvPL1WiGtVZWwjHEs4r8siy3TLwy9uHH0=";
+    hash = "sha256-rJ1M5YRXcKbDEGhy0G+N2dGD3sx8KFUfLJSLthYQNtU=";
  };

  build-system = with python3Packages; [
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "okteto";
-  version = "3.3.1";
+  version = "3.4.0";

  src = fetchFromGitHub {
    owner = "okteto";
    repo = "okteto";
    rev = version;
-    hash = "sha256-9EGtcSOCRtt1Jw/e6EyZ5i4vTpof2fjV+XhF87IrUPU=";
+    hash = "sha256-vi2ow95a3btiR4yINunEa56SUGWlbgNdMdS/T747a+U=";
  };

-  vendorHash = "sha256-4fw3Qc1VPrPFVtQNtCRW6RqPqV7aF+t9GQDL/sCqNvw=";
+  vendorHash = "sha256-tlZr1IOGOSbahd0Wh3yozbBrVL3RAWQLKNv/3XlMKqM=";

  postPatch = ''
    # Disable some tests that need file system & network access.
@@ -27,6 +27,8 @@ stdenv.mkDerivation {
      --replace 'convert ' "${lib.getBin imagemagick}/bin/convert "
  '';

+  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-int" ];
+
  preInstall = ''
    mkdir -p $out/bin
  '';
@@ -2,57 +2,47 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  pkg-config,
  cmake,
  libpulseaudio,
  ncurses,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "pamix";
-  version = "1.6";
+  version = "2.0";

  src = fetchFromGitHub {
    owner = "patroclos";
    repo = "pamix";
-    rev = version;
-    sha256 = "1d44ggnwkf2gff62959pj45v3a2k091q8v154wc5pmzamam458wp";
+    tag = finalAttrs.version;
+    hash = "sha256-7UPz6YpsnZHpW7sOJdJU2wQ5jyFPWTHxoknago0W+Ss=";
  };

-  patches = [
-    # ncurses-6.3 support, included in next release
-    (fetchpatch {
-      name = "ncurses-6.3-p1.patch";
-      url = "https://github.com/patroclos/PAmix/commit/3400b9c048706c572373e4617b4d5fcdb8dd2505.patch";
-      sha256 = "0rw56a844pz876ad9p8hfvn2fkd5rh29gpp47h55g08spf0vwb2z";
-    })
-    (fetchpatch {
-      name = "ncurses-6.3-p2.patch";
-      url = "https://github.com/patroclos/PAmix/commit/5ef67fc5ef6fc0dc0b48ff07ba48093881561d9c.patch";
-      sha256 = "0f8shpdv2swxdz04bkqgmkvl6c17r5mn4slzr7xd6pvw8hh51p4h";
-    })
-  ];
-
  preConfigure = ''
-    substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc/xdg"
+    substituteInPlace CMakeLists.txt --replace-fail "/etc" "$out/etc/xdg"
  '';

  nativeBuildInputs = [
    cmake
    pkg-config
  ];
+
  buildInputs = [
    libpulseaudio
    ncurses
  ];

-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Pulseaudio terminal mixer";
    homepage = "https://github.com/patroclos/PAmix";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ericsagnes ];
+    changelog = "https://github.com/patroclos/PAmix/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ericsagnes ];
    mainProgram = "pamix";
  };
-}
+})
@@ -6,7 +6,7 @@
 }:
 let
  # also update rev of headers in python3Packages.pypdfium2
-  version = "6968";
+  version = "6996";
  src =
    let
      inherit (stdenv.hostPlatform) system;
@@ -18,10 +18,10 @@ let
        aarch64-darwin = "mac-arm64";
      };
      hash = selectSystem {
-        x86_64-linux = "sha256-jITBi7w8jhZVkwimFp4nmWpQahPWXAGIJj/zHe5TVCU=";
-        aarch64-linux = "sha256-rDyLhRuRzw/R9Z1ZuSadXKJ+74U+RVJIC9NSCddd5lg=";
-        x86_64-darwin = "sha256-ofqKS54ZKcXLVGEs2mhFGC4W7+d87JfhCS+HqcJkzTg=";
-        aarch64-darwin = "sha256-g8iHsGVp/wCu4FU9ds6RBzabuMIONPA1H/M14BNjPu8=";
+        x86_64-linux = "sha256-DAu9t7PA8R3F2BotYaoPLoQFMkDIdJOnf4ljkJYMXxI=";
+        aarch64-linux = "sha256-pNXBX0t6+ShaXGTSmM6J1UWaTLW/ZXoyfF7/gWl7rhc=";
+        x86_64-darwin = "sha256-GlEoDifWTVC2tAVoHmkRpVdV+V6vsPUkZZVYP15oeXc=";
+        aarch64-darwin = "sha256-OtUpNxo7HvrEIWSdCWC6MVf0fLQL2vqovhtRMzrrb5I=";
      };
    in
    fetchzip {
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "popeye";
-  version = "0.21.7";
+  version = "0.22.1";

  src = fetchFromGitHub {
    rev = "v${version}";
    owner = "derailed";
    repo = "popeye";
-    sha256 = "sha256-8X/L9je5TaxSx/RtPQlO/6CKd+zUIxFBfTDrNZAA2fU=";
+    sha256 = "sha256-CbVYQIE7kjUah+SDEjs5Qz+n4+f3HriQNxYPqDcdr/I=";
  };

  ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
    "-X github.com/derailed/popeye/cmd.commit=${version}"
  ];

-  vendorHash = "sha256-JX9afHS76kUkOdIZZP44UjcZt69YqzW/S1JKhGxLVOw=";
+  vendorHash = "sha256-Xhn1iOqzCY8fW2lODXwqY4XQZTAPWXaZ0XM5j02bnCs=";

  nativeBuildInputs = [ installShellFiles ];

@@ -1,8 +1,8 @@
 [
  {
    "pname": "Avalonia",
-    "version": "11.2.0",
-    "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q="
+    "version": "11.2.3",
+    "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY="
  },
  {
    "pname": "Avalonia.Angle.Windows.Natives",
@@ -16,58 +16,58 @@
  },
  {
    "pname": "Avalonia.Desktop",
-    "version": "11.2.0",
-    "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM="
+    "version": "11.2.3",
+    "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I="
  },
  {
    "pname": "Avalonia.Fonts.Inter",
-    "version": "11.2.0",
-    "hash": "sha256-0xa+Gnnoo+WRVhCF8lU0chA0w6znOyG0kjH03Xmj4+A="
+    "version": "11.2.3",
+    "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q="
  },
  {
    "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.0",
-    "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo="
+    "version": "11.2.3",
+    "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY="
  },
  {
    "pname": "Avalonia.Native",
-    "version": "11.2.0",
-    "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI="
+    "version": "11.2.3",
+    "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8="
  },
  {
    "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.0",
-    "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo="
+    "version": "11.2.3",
+    "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg="
  },
  {
    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.0",
-    "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM="
+    "version": "11.2.3",
+    "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw="
  },
  {
    "pname": "Avalonia.Skia",
-    "version": "11.2.0",
-    "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o="
+    "version": "11.2.3",
+    "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA="
  },
  {
    "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.0",
-    "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8="
+    "version": "11.2.3",
+    "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8="
  },
  {
    "pname": "Avalonia.Win32",
-    "version": "11.2.0",
-    "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU="
+    "version": "11.2.3",
+    "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE="
  },
  {
    "pname": "Avalonia.X11",
-    "version": "11.2.0",
-    "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM="
+    "version": "11.2.3",
+    "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60="
  },
  {
    "pname": "CommunityToolkit.Mvvm",
-    "version": "8.3.2",
-    "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs="
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
  },
  {
    "pname": "DiscUtils.Core",
@@ -101,28 +101,28 @@
  },
  {
    "pname": "HarfBuzzSharp",
-    "version": "7.3.0.2",
-    "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
  },
  {
    "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.2",
-    "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
  },
  {
    "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.2",
-    "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
  },
  {
    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3-preview.2.2",
-    "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM="
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
  },
  {
    "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.2",
-    "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
  },
  {
    "pname": "MicroCom.Runtime",
@@ -161,28 +161,28 @@
  },
  {
    "pname": "SkiaSharp",
-    "version": "2.88.8",
-    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
  },
  {
    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.8",
-    "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
  },
  {
    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.8",
-    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
  },
  {
    "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.8",
-    "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w="
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
  },
  {
    "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.8",
-    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
  },
  {
    "pname": "Splat",
@@ -191,8 +191,8 @@
  },
  {
    "pname": "System.CodeDom",
-    "version": "9.0.0",
-    "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw="
+    "version": "9.0.1",
+    "hash": "sha256-AhoLbz7WIP5tV7dExnYxRgFGl4NgSXA3R7h2SzaW0Wc="
  },
  {
    "pname": "System.ComponentModel.Annotations",
@@ -201,8 +201,8 @@
  },
  {
    "pname": "System.IO.Hashing",
-    "version": "9.0.0",
-    "hash": "sha256-k6Pdndm5fTD6CB1QsQfP7G+2h4B30CWIsuvjHuBg3fc="
+    "version": "9.0.1",
+    "hash": "sha256-IJru9BdFNsNs7FbG+F9djJdkkWdpoz2IxQ+GgvKvUOs="
  },
  {
    "pname": "System.IO.Pipelines",
@@ -211,8 +211,8 @@
  },
  {
    "pname": "System.Management",
-    "version": "9.0.0",
-    "hash": "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ="
+    "version": "9.0.1",
+    "hash": "sha256-dHSBGiI5OWxNQF/7ZrcVDRybYwdDOMyIUNDSGh0Gpz0="
  },
  {
    "pname": "System.Memory",
@@ -9,13 +9,13 @@

 buildDotnetModule rec {
  pname = "ps3-disc-dumper";
-  version = "4.2.5";
+  version = "4.3.0";

  src = fetchFromGitHub {
    owner = "13xforever";
    repo = "ps3-disc-dumper";
    tag = "v${version}";
-    hash = "sha256-ax2Q1VodzktXSdZBvO1fys+xigk/jzbMWHxqoLIKE7w=";
+    hash = "sha256-FtKFX7w60lAt7aMg/KNumFGESluYZf1/vzjdkLctkqs=";
  };

  dotnet-sdk = dotnetCorePackages.sdk_9_0;
@@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "pyenv";
-  version = "2.5.1";
+  version = "2.5.2";

  src = fetchFromGitHub {
    owner = "pyenv";
    repo = "pyenv";
    tag = "v${version}";
-    hash = "sha256-i4CQTaz4VDYxUOGcmyIQN+n9yd1ptQ+rqiES/JR189A=";
+    hash = "sha256-RDBIe26IAGn3Mj+zof55GxMI7mwL9JQGjN3egUhhhgg=";
  };

  nativeBuildInputs = [
@@ -12,19 +12,19 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.90.0";
+  version = "1.91.0";

  src =
    {
      aarch64-darwin = fetchurl {
        name = "Raycast.dmg";
        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm";
-        hash = "sha256-3++hipn/7dJKQhY1gh8v/OsY+R316n5EJcEcmOheYnM=";
+        hash = "sha256-FvYgJw/iOijnEixt2hbn7abYOCuaK9UN5uXEj6nArKY=";
      };
      x86_64-darwin = fetchurl {
        name = "Raycast.dmg";
        url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64";
-        hash = "sha256-qa4ESWW6voh45Kl0ydL6kyTwH8MNUNnyRSlFJcu3trI=";
+        hash = "sha256-iks3C/S42TdXYZIMgg0vY4VzCRFx4dNsOhaPHA2MlR4=";
      };
    }
    .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported.");
@@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rdma-core";
-  version = "55.0";
+  version = "56.0";

  src = fetchFromGitHub {
    owner = "linux-rdma";
    repo = "rdma-core";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ZXs0yxwL00Kyp8b516sKslm4yvyQEm/UMtag2a2X+5c=";
+    hash = "sha256-nzd7BDP72o0TsSTrCGT6HOF7td+3ex4/c68GdjIA6Bc=";
  };

  strictDeps = true;
@@ -79,7 +79,7 @@ GEM
      xpath (~> 3.2)
    chunky_png (1.4.0)
    commonmarker (0.23.11)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
    crass (1.0.6)
    css_parser (1.21.0)
      addressable
@@ -89,22 +89,22 @@ GEM
      html-pipeline
    docile (1.4.1)
    erubi (1.13.1)
-    ffi (1.17.0)
+    ffi (1.17.1)
    globalid (1.2.1)
      activesupport (>= 6.1)
    html-pipeline (2.13.2)
      activesupport (>= 2)
      nokogiri (>= 1.4)
    htmlentities (4.3.4)
-    i18n (1.14.6)
+    i18n (1.14.7)
      concurrent-ruby (~> 1.0)
    json (2.9.1)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
    listen (3.9.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
-    loofah (2.23.1)
+    logger (1.6.5)
+    loofah (2.24.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.8.1)
@@ -137,16 +137,16 @@ GEM
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
      ast (~> 2.4.1)
      racc
    pg (1.5.9)
    public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
      nio4r (~> 2.0)
    racc (1.8.1)
    rack (2.2.10)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
      rack (>= 1.3)
    rails (6.1.7.10)
      actioncable (= 6.1.7.10)
@@ -186,7 +186,7 @@ GEM
      rbpdf-font (~> 1.19.0)
    rbpdf-font (1.19.1)
    redcarpet (3.6.0)
-    regexp_parser (2.9.3)
+    regexp_parser (2.10.0)
    request_store (1.5.1)
      rack (>= 1.4)
    rexml (3.4.0)
@@ -213,7 +213,7 @@ GEM
      rubocop-ast (>= 1.28.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
      parser (>= 3.3.1.0)
    rubocop-performance (1.19.1)
      rubocop (>= 1.7.0, < 2.0)
@@ -229,7 +229,7 @@ GEM
    sanitize (6.1.3)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    selenium-webdriver (4.27.0)
+    selenium-webdriver (4.28.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -257,7 +257,8 @@ GEM
    unicode-display_width (2.6.0)
    webrick (1.9.1)
    websocket (1.2.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    with_advisory_lock (5.1.0)
@@ -319,7 +320,7 @@ DEPENDENCIES
  yard

 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108

 BUNDLED WITH
   2.5.22
@@ -208,10 +208,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
+      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
      type = "gem";
    };
-    version = "1.3.4";
+    version = "1.3.5";
  };
  crass = {
    groups = ["default"];
@@ -300,10 +300,10 @@
    }];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
+      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
      type = "gem";
    };
-    version = "1.17.0";
+    version = "1.17.1";
  };
  globalid = {
    dependencies = ["activesupport"];
@@ -343,10 +343,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
      type = "gem";
    };
-    version = "1.14.6";
+    version = "1.14.7";
  };
  json = {
    groups = ["default" "test"];
@@ -363,10 +363,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
      type = "gem";
    };
-    version = "3.17.0.3";
+    version = "3.17.0.4";
  };
  listen = {
    dependencies = ["rb-fsevent" "rb-inotify"];
@@ -384,10 +384,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1rrf3y8j3fjjmn74d2i3l85pjm7yhvl8xgz7684hac92j8fbj9xn";
+      sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3";
      type = "gem";
    };
-    version = "1.6.4";
+    version = "1.6.5";
  };
  loofah = {
    dependencies = ["crass" "nokogiri"];
@@ -395,10 +395,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h";
+      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
      type = "gem";
    };
-    version = "2.23.1";
+    version = "2.24.0";
  };
  mail = {
    dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"];
@@ -609,10 +609,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15";
+      sha256 = "16qi2qhpszm842awxghmsp64yvvawafq96w5jw98irz3f4bh2jbl";
      type = "gem";
    };
-    version = "3.3.6.0";
+    version = "3.3.7.0";
  };
  pg = {
    groups = ["default"];
@@ -648,10 +648,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1wl9q4fl8gvhwdpfxghx6jdqi4508287pcgiwi96sdbzmdfbglcl";
+      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
      type = "gem";
    };
-    version = "6.5.0";
+    version = "6.6.0";
  };
  racc = {
    groups = ["common_mark" "default" "test"];
@@ -679,10 +679,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c";
+      sha256 = "0qy4ylhcfdn65a5mz2hly7g9vl0g13p5a0rmm6sc0sih5ilkcnh0";
      type = "gem";
    };
-    version = "2.1.0";
+    version = "2.2.0";
  };
  rails = {
    dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
@@ -805,10 +805,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0yb3iycaj3krvlnicijm99qxvfbrbi0pd81i2cpdhjc3xmbhcqjb";
+      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
      type = "gem";
    };
-    version = "2.9.3";
+    version = "2.10.0";
  };
  request_store = {
    dependencies = ["rack"];
@@ -911,10 +911,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10604xc4bcji3ca43anlc89xwxb4wkzk69cia95x04zima4aq4wm";
+      sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg";
      type = "gem";
    };
-    version = "1.37.0";
+    version = "1.38.0";
  };
  rubocop-performance = {
    dependencies = ["rubocop" "rubocop-ast"];
@@ -985,10 +985,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1q5nbszbxz566yzyiv0a4lvfk56q89k0lk4mqp6wyddrc2nz88c8";
+      sha256 = "1lw9b8gxr921akpc02zvwkig5m0m6y6xd438c6f1ysf3c8h75xsc";
      type = "gem";
    };
-    version = "4.27.0";
+    version = "4.28.0";
  };
  simplecov = {
    dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
@@ -1124,15 +1124,15 @@
    version = "1.2.11";
  };
  websocket-driver = {
-    dependencies = ["websocket-extensions"];
+    dependencies = ["base64" "websocket-extensions"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n";
+      sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85";
      type = "gem";
    };
-    version = "0.7.6";
+    version = "0.7.7";
  };
  websocket-extensions = {
    groups = ["default"];
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, bundlerEnv, ruby_3_2, makeWrapper, nixosTests }:

 let
-  version = "5.1.5";
+  version = "5.1.6";
  rubyEnv = bundlerEnv {
    name = "redmine-env-${version}";

@@ -16,7 +16,7 @@ in

    src = fetchurl {
      url = "https://www.redmine.org/releases/redmine-${version}.tar.gz";
-      hash = "sha256-LJc5URcS/BOB2VhPoAX5EaMCLoNm0dalP+wPAU2sAWg=";
+      hash = "sha256-1zWE501pKqlGRHmdmG306Eb7WaQyBcFr2FftVs8Kvtk=";
    };

    nativeBuildInputs = [ makeWrapper ];
@@ -4,6 +4,7 @@
  fetchurl,
  fetchpatch,
  bzip2,
+  autoreconfHook,
 }:

 stdenv.mkDerivation rec {
@@ -14,6 +15,8 @@ stdenv.mkDerivation rec {
    url = "mirror://samba/rzip/rzip-${version}.tar.gz";
    sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7";
  };
+
+  nativeBuildInputs = [ autoreconfHook ];
  buildInputs = [ bzip2 ];

  patches = [
@@ -24,8 +27,6 @@ stdenv.mkDerivation rec {
    })
  ];

-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-int";
-
  meta = with lib; {
    homepage = "https://rzip.samba.org/";
    description = "Compression program";
@@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "supermariowar";
-  version = "2023-unstable-2024-10-17";
+  version = "2024-unstable-2025-01-30";

  src = fetchFromGitHub {
    owner = "mmatyas";
    repo = "supermariowar";
-    rev = "a04d6f4069d2ef90a76bf562d1fd937c9cf56140";
-    hash = "sha256-4WsjSjT3uN5hBqUtH6UaTxHUYkwvjiYrWzRqY3vBpAE=";
+    rev = "8192bbda2eca807cfe1e2793018bd55ecdaac50a";
+    hash = "sha256-i/UdKXIOUViv+FJFyss3Xa4Z8+OwW2CQjJ3hROZVaRA=";
    fetchSubmodules = true;
  };

@@ -109,7 +109,7 @@ lib.warnIf (useHardenedMalloc != null)
        ++ lib.optionals mediaSupport [ ffmpeg ]
      );

-      version = "14.0.4";
+      version = "14.0.5";

      sources = {
        x86_64-linux = fetchurl {
@@ -119,7 +119,7 @@ lib.warnIf (useHardenedMalloc != null)
            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
          ];
-          hash = "sha256-u5UlGYXVeTVSJcIJBJYn2L6+si8XmguB59Pf/bWfj7g=";
+          hash = "sha256-S+v0w6lMuWnzYoDvIEJ9/7Rus2wcKbwx2/J1LYXOfhw=";
        };

        i686-linux = fetchurl {
@@ -129,7 +129,7 @@ lib.warnIf (useHardenedMalloc != null)
            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
          ];
-          hash = "sha256-e1FMcTCgVPUud8hZNwl4r6J2ltATa0gBSiLqx/3DxzQ=";
+          hash = "sha256-ThGKSb3lTwblUTyKbd54I5ZyA0xXeEiQeXFK3IDhOmw=";
        };
      };

@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "vencord";
-  version = "1.11.3";
+  version = "1.11.4";

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-hx8YXkkpZoNq1aDsgdU5+Usmcp/mrlTo9sV2X4vqRuY=";
+    hash = "sha256-7bFn3+mpiXC4+PGhoJ10QN1oBjj7zS5U2MJf8cJm114=";
  };

  pnpmDeps = pnpm_9.fetchDeps {
@@ -6,17 +6,17 @@

 buildGoModule rec {
  pname = "vuls";
-  version = "0.28.1";
+  version = "0.29.0";

  src = fetchFromGitHub {
    owner = "future-architect";
    repo = "vuls";
    tag = "v${version}";
-    hash = "sha256-mrptQSTxTdste6UgbkAm3aqgpYfaoOykHX0eYOTojgA=";
+    hash = "sha256-aQwQgQPuzsqm05m4Qf4cJBPrKU/TLai88CbDOWs9s58=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-KufQPVnNRoyaHiuVaVIjwifh5CsoCoF7CrqvBKcG7kA=";
+  vendorHash = "sha256-OOU4m3qo6AFAXzCZMQyhdwj9USE9PV4zv4NjDwgZnxE=";

  ldflags = [
    "-s"
@@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "wavelog";
-  version = "1.9.1";
+  version = "2.0";

  src = fetchFromGitHub {
    owner = "wavelog";
    repo = pname;
    tag = version;
-    hash = "sha256-BYCRqb27QWOo74w3O6tfZGEDF3UInsgshsIm9uxOm+8=";
+    hash = "sha256-njolFPtcNzF/AGchJd8BwdJDFPe4+6xgRBi1JKo4r0k=";
  };

  installPhase = ''
@@ -14,22 +14,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "wgpu-utils";
-  version = "22.1.0";
+  version = "24.0.1";

  src = fetchFromGitHub {
    owner = "gfx-rs";
    repo = "wgpu";
-    rev = "v${version}";
-    hash = "sha256-Gtq0xYZoWNwW+BKVLqVVKGqc+4HjaD7NN1hlzyFP5g0=";
+    tag = "wgpu-v${version}";
+    hash = "sha256-fhys0PYMFI23rvKcq9aJrXJrl7q9UQln9rmUybMJY1o=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "noise-0.8.2" = "sha256-7GvShJeSNfwMCBIfqLghXgKQv7EDMqVchJw0uxPhNr4=";
-      "rspirv-0.11.0+sdk-1.2.198" = "sha256-AcJqkcXBr/+SHdUDXd63sQ0h5eosMqRhV4aUREJH8Bw=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-cufabcRNrLxMjejDydqR4zf4SajeWkX/fcXj96RakDQ=";

  nativeBuildInputs = [
    pkg-config
@@ -2,7 +2,6 @@
  stdenv,
  lib,
  fetchFromGitLab,
-  fetchpatch,
  gitUpdater,
  nixosTests,
  cmake,
@@ -29,95 +28,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lomiri-camera-app";
-  version = "4.0.6";
+  version = "4.0.7";

  src = fetchFromGitLab {
    owner = "ubports";
    repo = "development/apps/lomiri-camera-app";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-93skB614T9RcMhYfeCDjV+JLYoJocylk32uzdcQ4I8Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-x0hxOGPIxzQdwzb8f4wvllAW1hJ5lyR4qYvyX96RMoA=";
  };

-  patches = [
-    # Remove when version > 4.0.6
-    (fetchpatch {
-      name = "0001-lomiri-camera-app-Stop using qt5_use_modules.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/567f983e59cc412c9e1951f78f0809c6faebd3a6.patch";
-      hash = "sha256-peP3c7XqpjGcdVG5zLKTcZPUPVz9Tu8tVBPaLVc5vWE=";
-    })
-
-    # Fix GNUInstallDirs usage
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/205 merged & in release
-    (fetchpatch {
-      name = "0002-lomiri-camera-app-GNUInstallDirs.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/76fbccd627bdbf30e4f3a736d1821e25f1cf45a7.patch";
-      hash = "sha256-qz/2Df84e5+T8zQANb2Bl4dwoI10Z3blAlNI9ODavSw=";
-    })
-
-    # Call i18n.bindtextdomain with correct locale path
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/206 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-camera-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/9250b79f85218b561dce07030a2920d5443ac4ba.patch";
-      hash = "sha256-vCE64sxpin68Ks/hu1LWuOT5eZWozPPKqYR2GcsriPg=";
-    })
-
-    # Fix doubled DESTINATION
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/207 merged & in release
-    (fetchpatch {
-      name = "0004-lomiri-camera-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/4af85daccac0904cbb0cfb08e592d9ab1d745d6d.patch";
-      hash = "sha256-PCGwQ6rAyrBeAefTe1ciod+R4tbJk+D76g9fH4PoTlg=";
-    })
-
-    # Use pkg-config to find QZXing
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/208 merged & in release
-    (fetchpatch {
-      name = "0005-lomiri-camera-app-QZXing-pkg-config.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/e79a10ca236ef5ed0af328786dbaef281e2c120b.patch";
-      hash = "sha256-dC6a6IjpPez+asKdTB885rAEN+mqtP7uYpicz/4hRSM=";
-    })
-
-    # Make testing optional
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/209 merged & in release
-    (fetchpatch {
-      name = "0006-lomiri-camera-app-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/e3ec58327ffc25c565cf8c28d09adc09c4067b23.patch";
-      hash = "sha256-U5r3+218Cx4T0iF7nm2Mfhlr+4dn7ptPfgsxZrIUJHQ=";
-    })
-
-    # Fix translation of window title
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/211 merged & in release
-    (fetchpatch {
-      name = "0007-lomiri-camera-app-title-translation.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/43f0018158f65fe81f50e7860d8af2e469785434.patch";
-      hash = "sha256-7qFqps488B2d1wp79kFyUDR1FzE1Q9QMIOFFa/astHU=";
-    })
-
-    # Make barcode reader's icons SVGs and fix icon installations
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/merge_requests/210 merged & in release
-    (fetchpatch {
-      name = "0011-lomiri-camera-app-camera-icon-installation-fix.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/48ebaffc1f589569387127e953b0995451580cc1.patch";
-      hash = "sha256-nq5iCTHCUzEj/38hCIaqhzUX7ABVkSAeB5hEzZfIX7A=";
-    })
-    (fetchpatch {
-      name = "0012-lomiri-camera-app-splash-icon-location-fix.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/6c96eade82d6d812aa605bc45a5ff06ed3a2aeff.patch";
-      hash = "sha256-8QusJPyNO8ADx3Ce1y/thQAaXQa8XnnMvPrxyzx8oRk=";
-    })
-    (fetchpatch {
-      name = "0013-lomiri-camera-app-Vectorise-barcode-icons.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/d5232590a02b535d24d9765d24ce5a066cc57724.patch";
-      hash = "sha256-sfSdzFFLof1dN/7KnerZOBoarubGcTxp7h9Ab6rGoV0=";
-    })
-    (fetchpatch {
-      name = "0014-lomiri-camera-app-barcode-icon-installation-fix.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-camera-app/-/commit/a8718d6621a34aaf19aaaaea5dd31f401a652953.patch";
-      hash = "sha256-eiBliqk71aDmIMY6cn1J5cxmzlHMTtiYKeQ0cJuCNYA=";
-    })
-  ];
-
  # We don't want absolute paths in dekstop files
  postPatch = ''
    substituteInPlace CMakeLists.txt \
@@ -202,8 +121,6 @@ stdenv.mkDerivation (finalAttrs: {
    mkdir -p $out/share/lomiri-app-launch/splash
    ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg
    ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg
-
-    install -Dm644 ../camera-contenthub.json $out/share/lomiri-content-hub/peers/lomiri-camera-app
  '';

  dontWrapGApps = true;
@@ -4,6 +4,7 @@
  fetchFromGitHub,
  cmake,
  llvmPackages,
+  xcbuild,
  targetPackages,
  libxml2,
  zlib,
@@ -30,10 +31,15 @@ stdenv.mkDerivation (finalAttrs: {

  patches = args.patches or [ ];

-  nativeBuildInputs = [
-    cmake
-    (lib.getDev llvmPackages.llvm.dev)
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      (lib.getDev llvmPackages.llvm.dev)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # provides xcode-select, which is required for SDK detection
+      xcbuild
+    ];

  buildInputs =
    [
@@ -81,16 +87,28 @@ stdenv.mkDerivation (finalAttrs: {
  # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
  # work in Nix's sandbox. Use env from our coreutils instead.
  postPatch =
-    if lib.versionAtLeast finalAttrs.version "0.12" then
-      ''
-        substituteInPlace lib/std/zig/system.zig \
-          --replace-fail "/usr/bin/env" "${coreutils}/bin/env"
-      ''
-    else
-      ''
-        substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
-          --replace-fail "/usr/bin/env" "${coreutils}/bin/env"
-      '';
+    let
+      zigSystemPath =
+        if lib.versionAtLeast finalAttrs.version "0.12" then
+          "lib/std/zig/system.zig"
+        else
+          "lib/std/zig/system/NativeTargetInfo.zig";
+    in
+    ''
+      substituteInPlace ${zigSystemPath} \
+        --replace-fail "/usr/bin/env" "${lib.getExe' coreutils "env"}"
+    ''
+    # Zig tries to access xcrun and xcode-select at the absolute system path to query the macOS SDK
+    # location, which does not work in the darwin sandbox.
+    # Upstream issue: https://github.com/ziglang/zig/issues/22600
+    # Note that while this fix is already merged upstream and will be included in 0.14+,
+    # we can't fetchpatch the upstream commit as it won't cleanly apply on older versions,
+    # so we substitute the paths instead.
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder finalAttrs.version "0.14") ''
+      substituteInPlace lib/std/zig/system/darwin.zig \
+        --replace-fail /usr/bin/xcrun xcrun \
+        --replace-fail /usr/bin/xcode-select xcode-select
+    '';

  postBuild =
    if lib.versionAtLeast finalAttrs.version "0.13" then
@@ -2,12 +2,18 @@
  lib,
  makeSetupHook,
  zig,
+  stdenv,
+  xcbuild,
 }:

 makeSetupHook {
  name = "zig-hook";

-  propagatedBuildInputs = [ zig ];
+  propagatedBuildInputs =
+    [ zig ]
+    # while xcrun is already included in the darwin stdenv, Zig also needs
+    # xcode-select (provided by xcbuild) for SDK detection
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];

  substitutions = {
    # This zig_default_flags below is meant to avoid CPU feature impurity in
@@ -147,7 +147,10 @@ stdenv.mkDerivation rec {

  doCheck = false;
  doInstallCheck =
-    stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin;
+    stdenv.buildPlatform.canExecute stdenv.hostPlatform
+    && !stdenv.hostPlatform.isDarwin
+    # Tests rely on mocking, which can't work with static libs.
+    && !stdenv.hostPlatform.isStatic;
  # Since we rewrote the load path in the dynamic loader for the TCTI
  # The various tcti implementation should be placed in their target directory
  # before we could run tests, so we make turn checkPhase into installCheckPhase
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.2.139";
+  version = "9.2.140";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "ailment";
    tag = "v${version}";
-    hash = "sha256-VFW/PMUELijG+vrs6rtmXE340wcVtIwTMpyJ6Of/lIU=";
+    hash = "sha256-J4Wu2EbDnwj63kDQSIPWZmTB61nAATZHeawCxLC5lbY=";
  };

  build-system = [ setuptools ];
@@ -13,20 +13,21 @@
  python-socketio,
  pythonOlder,
  websockets,
+  yarl,
 }:

 buildPythonPackage rec {
  pname = "aioambient";
-  version = "2024.08.0";
+  version = "2025.02.0";
  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.11";

  src = fetchFromGitHub {
    owner = "bachya";
    repo = "aioambient";
    tag = version;
-    hash = "sha256-GedGwG4Lm28BvfSBOGcspUQ3LCmdb2IC2rLifuKGOes=";
+    hash = "sha256-F1c2S0c/CWHeCd24Zc8ib3aPR7yj9gCPBJpmpgoddQY=";
  };

  build-system = [ poetry-core ];
@@ -37,6 +38,7 @@ buildPythonPackage rec {
    python-engineio
    python-socketio
    websockets
+    yarl
  ];

  __darwinAllowLocalNetworking = true;
@@ -57,7 +59,7 @@ buildPythonPackage rec {
    description = "Python library for the Ambient Weather API";
    homepage = "https://github.com/bachya/aioambient";
    changelog = "https://github.com/bachya/aioambient/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
 }
@@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "aioautomower";
-  version = "2025.1.0";
+  version = "2025.1.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "Thomas55555";
    repo = "aioautomower";
    tag = version;
-    hash = "sha256-MEZdYOpBAHmWidzq+7SpEFsHNYlSaIQ4utnGK9Y3/NE=";
+    hash = "sha256-5/NG3VMJfLOCQDqnP1LVRJlT08LDITlZZFb3aYjtm5I=";
  };

  postPatch = ''
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "aiodhcpwatcher";
-  version = "1.0.2";
+  version = "1.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bdraco";
    repo = "aiodhcpwatcher";
    rev = "v${version}";
-    hash = "sha256-KZL5DejzDmizvvMUNfkFltl1xXz+2jX/3DVj60x6xOk=";
+    hash = "sha256-/4x+FhKCEIpmFSTC5PIEe4QsYojrvx4Wlf7+WUvSHu8=";
  };

  postPatch = ''
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    description = "Watch for DHCP packets with asyncio";
    homepage = "https://github.com/bdraco/aiodhcpwatcher";
    changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl3Only;
+    license = licenses.asl20;
    maintainers = with maintainers; [ hexa ];
    platforms = platforms.linux;
  };
@@ -3,31 +3,37 @@
  aiohttp,
  async-timeout,
  buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
+  pytest-cov-stub,
+  pytestCheckHook,
+  setuptools,
  slixmpp,
 }:

 buildPythonPackage rec {
  pname = "aioharmony";
-  version = "0.2.10";
-  format = "setuptools";
+  version = "0.4.1";
+  pyproject = true;

-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-18+38QunEdEGdirQOT+528vYqiqDuUr/CWRQtXKf4rs=";
+  src = fetchFromGitHub {
+    owner = "Harmony-Libs";
+    repo = "aioharmony";
+    tag = "v${version}";
+    hash = "sha256-X7oL4jokomNLhBEp4z8t11Yv/4pNDnqFurPmChXUU3o=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    aiohttp
    async-timeout
    slixmpp
  ];

-  # aioharmony does not seem to include tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];

  pythonImportsCheck = [
    "aioharmony.harmonyapi"
@@ -35,7 +41,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
-    homepage = "https://github.com/ehendrix23/aioharmony";
+    homepage = "https://github.com/Harmony-Libs/aioharmony";
    description = "Python library for interacting the Logitech Harmony devices";
    mainProgram = "aioharmony";
    license = licenses.asl20;
@@ -3,7 +3,7 @@
  aiohttp,
  aioresponses,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  mashumaro,
  orjson,
  pytest-aiohttp,
@@ -17,18 +17,21 @@

 buildPythonPackage rec {
  pname = "aiohasupervisor";
-  version = "0.2.2b5";
+  version = "0.3.0";
  pyproject = true;

  disabled = pythonOlder "3.12";

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-EFVhR7L+1SVzXO4UpDrXA1EuPdeew55CV4ykO3K5BFI=";
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-supervisor-client";
+    tag = version;
+    hash = "sha256-72YRaTlgRJ8liQ1q+Hx1iCG8Av7wWk61t306fYT9gss=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"' \
      --replace-fail "setuptools~=68.0.0" "setuptools>=68.0.0" \
      --replace-fail "wheel~=0.40.0" "wheel>=0.40.0"
  '';
@@ -56,6 +59,7 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "aiohasupervisor" ];

  meta = {
+    changelog = "https://github.com/home-assistant-libs/python-supervisor-client/releases/tag/${src.tag}";
    description = "Client for Home Assistant Supervisor";
    homepage = "https://github.com/home-assistant-libs/python-supervisor-client";
    license = lib.licenses.asl20;
@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "aiohomeconnect";
-  version = "0.12.2";
+  version = "0.12.3";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = "aiohomeconnect";
    tag = "v${version}";
-    hash = "sha256-wOtvKA1Tf7Dsmvb0qmbXH47ZTlMowGxj458+QY7RJjo=";
+    hash = "sha256-zb4ld92bqgl2rt6YD8w2tz9CEMaiLBbXNPk5bB32IcI=";
  };

  pythonRelaxDeps = [ "httpx" ];
@@ -0,0 +1,52 @@
+{
+  lib,
+  aiodns,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  zeroconf,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp-asyncmdnsresolver";
+  version = "0.0.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "aio-libs";
+    repo = "aiohttp-asyncmdnsresolver";
+    rev = "v${version}";
+    hash = "sha256-YtBPMhRbilLY0VV1qVIPBYT0w91MbsUo2nbr4ODgCZA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiodns
+    aiohttp
+    zeroconf
+  ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiohttp_asyncmdnsresolver" ];
+
+  meta = {
+    description = "Module to resolve mDNS with aiohttp";
+    homepage = "https://github.com/aio-libs/aiohttp-asyncmdnsresolver";
+    changelog = "https://github.com/aio-libs/aiohttp-asyncmdnsresolver/blob/${src.rev}/CHANGES.rst";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
@@ -22,6 +22,12 @@ buildPythonPackage rec {
    hash = "sha256-Vx51WBjjNPIfLlwMnAuwHnGNljhnjKkU0tWB9M9rjsw=";
  };

+  postPatch = ''
+    substituteInPlace aiomodernforms/modernforms.py --replace-fail \
+      "with async_timeout.timeout(self._request_timeout):" \
+      "async with async_timeout.timeout(self._request_timeout):"
+  '';
+
  propagatedBuildInputs = [
    aiohttp
    backoff
@@ -3,7 +3,7 @@
  anyio,
  buildPythonPackage,
  fetchFromGitHub,
-  paho-mqtt_2,
+  paho-mqtt,
  poetry-core,
  poetry-dynamic-versioning,
  pytestCheckHook,
@@ -31,7 +31,7 @@ buildPythonPackage rec {
  ];

  dependencies = [
-    paho-mqtt_2
+    paho-mqtt
    typing-extensions
  ];

@@ -48,6 +48,7 @@ buildPythonPackage rec {
  ];

  meta = with lib; {
+    broken = lib.versionOlder "paho-mqtt" "2";
    description = "Idiomatic asyncio MQTT client, wrapped around paho-mqtt";
    homepage = "https://github.com/sbtinstruments/aiomqtt";
    changelog = "https://github.com/sbtinstruments/aiomqtt/blob/${src.tag}/CHANGELOG.md";
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aioopenexchangerates";
-  version = "0.6.19";
+  version = "0.6.20";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = "aioopenexchangerates";
    tag = "v${version}";
-    hash = "sha256-Rb5oCheiTZ737nKDwSpoRZcgpWPt5YMzplD6Wb6kZxY=";
+    hash = "sha256-CdkrD7T3COPxzSrLnKEx2XZ1PHki/qXzR9CiewlRsxw=";
  };

  pythonRelaxDeps = [ "pydantic" ];
@@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "aiortm";
-  version = "0.9.44";
+  version = "0.9.45";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = "aiortm";
    tag = "v${version}";
-    hash = "sha256-m62VEmrmczNxBLBEmLKP3vEi14BuwLA2WwtLOU436hY=";
+    hash = "sha256-5PbfadI80hIdqUh/7tenTD3buiM7tcGauDqhv2uHNDs=";
  };

  pythonRelaxDeps = [ "typer" ];
@@ -37,6 +37,11 @@ buildPythonPackage rec {
    pytest-asyncio
  ];

+  disabledTestPaths = [
+    # these tests get stuck, could be pytest-asyncio compat issue
+    "tests/test_connection.py"
+  ];
+
  pythonImportsCheck = [ "aiortsp" ];

  meta = with lib; {
@@ -13,6 +13,7 @@
  pytestCheckHook,
  pythonAtLeast,
  pythonOlder,
+  pytz,
  time-machine,
 }:

@@ -52,6 +53,7 @@ buildPythonPackage rec {
    pytest-mockservers
    pytest-resource-path
    pytestCheckHook
+    pytz
    time-machine
  ];

@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  asyncinotify,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "aiousbwatcher";
+  version = "1.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Bluetooth-Devices";
+    repo = "aiousbwatcher";
+    tag = "v${version}";
+    hash = "sha256-M9MUaB3oHELHdtgaWri9nILnVQpF2FJvHrL68jXeOqg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ asyncinotify ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "aiousbwatcher" ];
+
+  meta = {
+    description = "Watch for USB devices to be plugged and unplugged";
+    homepage = "https://github.com/Bluetooth-Devices/aiousbwatcher";
+    changelog = "https://github.com/Bluetooth-Devices/aiousbwatcher/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
@@ -4,12 +4,12 @@
  fetchFromGitHub,
  pythonOlder,
  setuptools,
-  websockets,
+  aiohttp,
 }:

 buildPythonPackage rec {
  pname = "aiowebostv";
-  version = "0.4.2";
+  version = "0.6.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -18,12 +18,12 @@ buildPythonPackage rec {
    owner = "home-assistant-libs";
    repo = "aiowebostv";
    tag = "v${version}";
-    hash = "sha256-RrSEl/U6UzPoE2151opDe0QRmj6M6wAtsQyF4/dd8ek=";
+    hash = "sha256-x1lpqR/e3itkRc/Cs3opXF4NzOZ17g/IcHZeGo234aM=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [ websockets ];
+  dependencies = [ aiohttp ];

  # Module doesn't have tests
  doCheck = false;
@@ -36,7 +36,7 @@

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.2.139";
+  version = "9.2.140";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "angr";
    tag = "v${version}";
-    hash = "sha256-zhLeBJeJpoW4JAX77EfXyvfIUL3ZBHALoVJkzSrKMP0=";
+    hash = "sha256-wo+4DgZlcUvuz8DJR7upsKeWlTh1CYAaxpNlfCnbYN0=";
  };

  postPatch = ''
@@ -24,7 +24,7 @@

 buildPythonPackage rec {
  pname = "anthropic";
-  version = "0.43.1";
+  version = "0.45.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
    owner = "anthropics";
    repo = "anthropic-sdk-python";
    tag = "v${version}";
-    hash = "sha256-7tDCKFT+j6oRU4EeII4wAM1T5W4qAeg6HbBp3efO81A=";
+    hash = "sha256-/QuAUU0/nNhJZouCP0LVkCFMTiNdeze/fF+SZKD1Jis=";
  };

  build-system = [
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.2.139";
+  version = "9.2.140";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "archinfo";
    tag = "v${version}";
-    hash = "sha256-YxA/wrNkVUHFfNNDRV9ciAACbMGZ3n/nLoyN+oj3Du8=";
+    hash = "sha256-7yBjLamoxFs+9XJNb/BcHiTgzRuEnszaahMm1HBmlfo=";
  };

  build-system = [ setuptools ];
@@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "async-upnp-client";
-  version = "0.42.0";
+  version = "0.43.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "StevenLooman";
    repo = "async_upnp_client";
    tag = version;
-    hash = "sha256-xIa7QeflS7JxkPoV8KqFfuLfHPpnrBGLeOFSa17IHyk=";
+    hash = "sha256-oGnWo+QLSq2h6R4Iirwy9kE7U47PLYYSBMjx8/WWA0o=";
  };

  pythonRelaxDeps = [
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "bellows";
-  version = "0.42.6";
+  version = "0.43.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "zigpy";
    repo = "bellows";
    tag = version;
-    hash = "sha256-qMODlsImGSvUkR+0jjrU23jJtM3c7JNJ7lY7Svli+ao=";
+    hash = "sha256-RbhFvoNYR4wHKKbbMKLP4Dsx0pIJnwBOP49waRHg0qk=";
  };

  postPatch = ''
@@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "bleak-esphome";
-  version = "2.0.0";
+  version = "2.7.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "bluetooth-devices";
    repo = "bleak-esphome";
    tag = "v${version}";
-    hash = "sha256-rN2vpXiOaUjjN6yNZxeEgTpcz0K5soUqKKiDDOhcBtc=";
+    hash = "sha256-AZkSWBMyTl2NgqmhVG4sE/N1AQGd6x4CZVYMgRKxlOQ=";
  };

  build-system = [ poetry-core ];
@@ -10,11 +10,12 @@
  pytestCheckHook,
  pythonOlder,
  pytest-asyncio,
+  pytest-cov-stub,
 }:

 buildPythonPackage rec {
  pname = "bleak-retry-connector";
-  version = "3.7.0";
+  version = "3.8.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -23,14 +24,9 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "bleak-retry-connector";
    tag = "v${version}";
-    hash = "sha256-+qY8BWi7zznaJBEMXfbDWjNvHEwpKq1h0XBHFum1+4M=";
+    hash = "sha256-Vkmn+CKQm+i+MRx12U6AmDGUyhtagoXbpeC/uou311o=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" ""
-  '';
-
  build-system = [ poetry-core ];

  dependencies = [
@@ -42,6 +38,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ];

@@ -11,6 +11,7 @@
  myst-parser,
  poetry-core,
  pytest-asyncio,
+  pytest-cov-stub,
  pytestCheckHook,
  pythonOlder,
  sphinx-rtd-theme,
@@ -21,7 +22,7 @@

 buildPythonPackage rec {
  pname = "bluetooth-adapters";
-  version = "0.21.0";
+  version = "0.21.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -30,14 +31,9 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "bluetooth-adapters";
    tag = "v${version}";
-    hash = "sha256-DQaxjSajO3SfmogWtstT6xcsUgUW80jJ5prfIajJW/s=";
+    hash = "sha256-JUh4v9YeqMeecJh/eTpmLMwNsxbc/oqZY2CrEJUO418=";
  };

-  postPatch = ''
-    # Drop pytest arguments (coverage, ...)
-    sed -i '/addopts/d' pyproject.toml
-  '';
-
  outputs = [
    "out"
    "doc"
@@ -63,6 +59,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytest-asyncio
+    pytest-cov-stub
    pytestCheckHook
  ];

@@ -6,8 +6,8 @@
  cython,
  poetry-core,
  pytest-benchmark,
-  pytest-cov-stub,
  pytest-codspeed,
+  pytest-cov-stub,
  pytestCheckHook,
  pythonOlder,
  setuptools,
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "bluetooth-data-tools";
-  version = "1.22.0";
+  version = "1.23.4";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "bluetooth-data-tools";
    tag = "v${version}";
-    hash = "sha256-ygtpOKrvVaM2rWfzRdKj96Z229+6wPSCuZq3agx+/IY=";
+    hash = "sha256-WYwcczYqUd7JH68zKBQ9xl5sxX1YAHTEpi0gc81k6DY=";
  };

  # The project can build both an optimized cython version and an unoptimized
@@ -41,6 +41,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    pytest-benchmark
+    pytest-codspeed
    pytest-cov-stub
    pytest-codspeed
    pytestCheckHook
@@ -359,7 +359,7 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.36.13";
+  version = "1.36.15";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-kVtyFA//Xx2pzrEJbgJTcnnYCUDnwvm81EmMaD1pvzE=";
+    hash = "sha256-VXViNY9tYbL/NjhPbTkezIIRtpsvURDu0/aJRJ36gCQ=";
  };

  build-system = [ setuptools ];
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.36.12";
+  version = "1.36.15";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-wefqyBDkLeSbR8sjwRjbIGwOcZEw5Gjd7csOuCwhkEw=";
+    hash = "sha256-1IUrr98fV3xYjwEzT7q0u/Q+Ye6AZRwhi0gv3GU00ac=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -4,16 +4,20 @@
  aioresponses,
  buildPythonPackage,
  fetchFromGitHub,
+  mashumaro,
+  orjson,
  pytest-asyncio,
  pytestCheckHook,
  python-dotenv,
  pythonOlder,
  setuptools,
+  syrupy,
+  yarl,
 }:

 buildPythonPackage rec {
  pname = "bring-api";
-  version = "0.9.1";
+  version = "1.0.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -22,18 +26,26 @@ buildPythonPackage rec {
    owner = "miaucl";
    repo = "bring-api";
    tag = version;
-    hash = "sha256-wPplw1yYJ5xR2CzhDXXjhMFJ7swGf2AARI4a1kE8MRw=";
+    hash = "sha256-1K8CijA2cSyofH/qanOsDRLqnQZyBTqsnrUtvZYBS2c=";
  };

  build-system = [ setuptools ];

-  dependencies = [ aiohttp ];
+  dependencies = [
+    # https://github.com/miaucl/bring-api/blob/1.0.0/requirements.txt
+    # pyproject.toml is out of sync
+    aiohttp
+    yarl
+    mashumaro
+    orjson
+  ];

  nativeCheckInputs = [
    aioresponses
    pytest-asyncio
    pytestCheckHook
    python-dotenv
+    syrupy
  ];

  pythonImportsCheck = [ "bring_api" ];
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "bthome-ble";
-  version = "3.11.0";
+  version = "3.12.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "bthome-ble";
    tag = "v${version}";
-    hash = "sha256-TlZyNGfHNKN+6tCKepLS+fbgfq3a1uzeCXl25khl6d8=";
+    hash = "sha256-1Kr+KKL8o1qsu/ncwclsokPcO1QHYadul/f+/Nnv6SQ=";
  };

  build-system = [ poetry-core ];
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.2.139";
+  version = "9.2.140";
  pyproject = true;

  disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "claripy";
    tag = "v${version}";
-    hash = "sha256-v8mwBTnPnYWVhY79HAdpxqwxIhz/9VdVYwkQbmHpuKc=";
+    hash = "sha256-VnvAIQm4TiNUGmpg1agOj/qEQZiR011M1BQdSyrCY5Y=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
@@ -16,14 +16,14 @@

 let
  # The binaries are following the argr projects release cycle
-  version = "9.2.139";
+  version = "9.2.140";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
    owner = "angr";
    repo = "binaries";
    rev = "refs/tags/v${version}";
-    hash = "sha256-kd2IY/sIGUShzVfcIj/5QLVqygHH2zBtxe+Su6Q3bWw=";
+    hash = "sha256-H+2ZfSqbu4dsioQdIZxSQZW2Q6liqL114GgZgflSqqE=";
  };
 in
 buildPythonPackage rec {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = "cle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+ROjdm2SE65mtsTlwyS7scPD99KbizW/OtUvPnbe/VM=";
+    hash = "sha256-3z1cOaSO2XMA4h1U6N+PS+YnrS/ujGDDsZqTks1hu5w=";
  };

  build-system = [ setuptools ];
@@ -1,12 +1,11 @@
 {
  lib,
  buildPythonPackage,
-  pythonOlder,
  fetchFromGitHub,

  # build-system
-  setuptools,
-  setuptools-scm,
+  hatch-vcs,
+  hatchling,

  # dependencies
  matplotlib,
@@ -21,7 +20,7 @@
  pytest,
  scipy,

-  # checks
+  # tests
  pytestCheckHook,
  corner,
 }:
@@ -31,8 +30,6 @@ buildPythonPackage rec {
  version = "2.2.3";
  pyproject = true;

-  disable = pythonOlder "3.9";
-
  src = fetchFromGitHub {
    owner = "dfm";
    repo = "corner.py";
@@ -41,8 +38,8 @@ buildPythonPackage rec {
  };

  build-system = [
-    setuptools
-    setuptools-scm
+    hatch-vcs
+    hatchling
  ];

  dependencies = [ matplotlib ];
@@ -70,6 +67,7 @@ buildPythonPackage rec {

  # matplotlib.testing.exceptions.ImageComparisonFailure: images not close
  disabledTests = [
+    "test_1d_fig_argument"
    "test_arviz"
    "test_basic"
    "test_bins"
@@ -104,7 +102,7 @@ buildPythonPackage rec {
  meta = {
    description = "Make some beautiful corner plots";
    homepage = "https://github.com/dfm/corner.py";
-    changelog = "https://github.com/dfm/corner.py/releases/tag/${src.tag}";
+    changelog = "https://github.com/dfm/corner.py/releases/tag/v${version}";
    license = lib.licenses.bsd2;
    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
@@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "cyclonedx-python-lib";
-  version = "8.5.0";
+  version = "8.7.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    owner = "CycloneDX";
    repo = "cyclonedx-python-lib";
    tag = "v${version}";
-    hash = "sha256-+IGykcKdezvwecLyQA1vW9YE8YJpd6ZEBe+J3zilH44=";
+    hash = "sha256-gnY8JgdxdjXzO9PE9mt57+DQCmxR00pHEL/q9sHN3+Q=";
  };

  pythonRelaxDeps = [ "py-serializable" ];
@@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "dbus-fast";
-  version = "2.30.2";
+  version = "2.33.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = "dbus-fast";
    tag = "v${version}";
-    hash = "sha256-DGDmv7zJP5LAa90KmqSU8yJXn5q8MDL2dCQjvmDg+Bw=";
+    hash = "sha256-U6NAEhoEcphAuvaAA2en4Ka4yFHiKPINl5CvtxE7FaI=";
  };

  # The project can build both an optimized cython version and an unoptimized
@@ -1,6 +1,7 @@
 {
  lib,
  aiohttp,
+  async-upnp-client,
  buildPythonPackage,
  fetchFromGitHub,
  pythonOlder,
@@ -21,9 +22,12 @@ buildPythonPackage rec {
    hash = "sha256-HmTiHa7DEmjARaYn7/OoGotnTirE7S7zXLK/TfHdEAg=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [
+    aiohttp
+    async-upnp-client
+  ];

  # Module has no tests
  doCheck = false;
@@ -2,7 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  poetry-core,
+  setuptools,
  bleak,
  construct,
  construct-typing,
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    hash = "sha256-JPmIKj8IL3i7QWiMTmGQzqb4h0VqLlhILPAOqMucsuM=";
  };

-  build-system = [ poetry-core ];
+  build-system = [ setuptools ];

  dependencies = [
    bleak
@@ -27,9 +27,9 @@ buildPythonPackage rec {
    hash = "sha256-8VUXW6tIX43TV7UIxeforZIxAUqGY9uqpz6WGyH4d8E=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    aiohttp
    ical
    pydantic
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "google-generativeai";
-  version = "0.8.3";
+  version = "0.8.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "google";
    repo = "generative-ai-python";
    tag = "v${version}";
-    hash = "sha256-XHYO2bH95Naoha2ZLpkP0YCq60qqiQPz+YzU6O4pInQ=";
+    hash = "sha256-Snsp6hP1BKNLSFGbcotdhmluTuuBPZBcLkNY8mtOl6o=";
  };

  pythonRelaxDeps = [ "google-ai-generativelanguage" ];
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "google-nest-sdm";
-  version = "7.0.0";
+  version = "7.1.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "allenporter";
    repo = "python-google-nest-sdm";
    tag = version;
-    hash = "sha256-j3L0U4dcmU35eHyrB8ZASGso8lWFwSD3PGq5fRSGOg0=";
+    hash = "sha256-hBpAwDRmqRRWW0DiG3aXy+OXZPCXdhPzAP79mXOn1kg=";
  };

  build-system = [ setuptools ];
--- a/Show More
+++ b/Show More