Merge master into staging-next

pkgs/applications/editors/vim/plugins/generated.nix

@@ -6401,6 +6401,19 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
+  lackluster-nvim = buildVimPlugin {
+    pname = "lackluster.nvim";
+    version = "2024-12-29";
+    src = fetchFromGitHub {
+      owner = "slugbyte";
+      repo = "lackluster.nvim";
+      rev = "662fba7e6719b7afc155076385c00d79290bc347";
+      sha256 = "1jp02km6hmryb9g36z239qkv34hmjx0hbwmg2ns1aq7cqzy1m5x1";
+    };
+    meta.homepage = "https://github.com/slugbyte/lackluster.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   lalrpop-vim = buildVimPlugin {
     pname = "lalrpop.vim";
     version = "2017-11-22";

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -490,6 +490,7 @@ https://github.com/frabjous/knap/,HEAD,
 https://github.com/b3nj5m1n/kommentary/,,
 https://github.com/udalov/kotlin-vim/,,
 https://github.com/mistweaverco/kulala.nvim/,HEAD,
+https://github.com/slugbyte/lackluster.nvim/,HEAD,
 https://github.com/qnighy/lalrpop.vim/,,
 https://github.com/Wansmer/langmapper.nvim/,HEAD,
 https://github.com/sk1418/last256/,,

pkgs/applications/editors/vscode/extensions/ms-python.black-formatter/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "black-formatter";
-    version = "2024.6.0";
+    version = "2025.2.0";
-    hash = "sha256-Waw+WhazNqVoihC/K/tPFH4tCeYYVOFDBfg+AWvs3q4=";
+    hash = "sha256-EPtxcp42KunVwVdT/xhVzuwvQ+5VswGNnOZpYXZOP04=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.0.1";
+    version = "2025.4.0";
-    hash = "sha256-IPjQY8G1JvpcjZWRsk1+Z8yIZ1UG0jIxmNsNXcHr+bs=";
+    hash = "sha256-WbnR949zHuoW+jR6vugvHussScBvgRIi8PYi9HbJxjc=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-python.flake8/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "flake8";
-    version = "2025.1.10441012";
+    version = "2025.2.0";
-    hash = "sha256-Ed5cojxQzH0+j3oW7EnEk4ptsngYwTLz52Pcb3G6bNs=";
+    hash = "sha256-DbPm/ekturW31jqZw0fvVOvzxAY286eJmgDcahDt0K0=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "mypy-type-checker";
-    version = "2025.1.10451009";
+    version = "2025.2.0";
-    hash = "sha256-Q6wfbm3FMNe0VB29QOf5ulTelGVmZVHUnmK17vbrqWc=";
+    hash = "sha256-VJ/XSC4cbIjgxKLsXxUxwko+HR0U59c8OrhYnKPJu4g=";
   };
 
   meta = {

pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-python";
     name = "pylint";
-    version = "2024.2.0";
+    version = "2025.2.0";
-    hash = "sha256-z9bfV2JPFyDk+bgWFYua2462df36MZy3GSVKhrm2Q6Q=";
+    hash = "sha256-3RqY/uugtJvT2lWxsA8NWFWel/CxMZzo7PnS9SaRdGg=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog";

pkgs/applications/graphics/ImageMagick/default.nix

@@ -1,51 +1,85 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitHub
+  stdenv,
-, pkg-config
+  fetchFromGitHub,
-, libtool
+  pkg-config,
-, bzip2Support ? true, bzip2
+  libtool,
-, zlibSupport ? true, zlib
+  bzip2Support ? true,
-, libX11Support ? !stdenv.hostPlatform.isMinGW, libX11
+  bzip2,
-, libXtSupport ? !stdenv.hostPlatform.isMinGW, libXt
+  zlibSupport ? true,
-, fontconfigSupport ? true, fontconfig
+  zlib,
-, freetypeSupport ? true, freetype
+  libX11Support ? !stdenv.hostPlatform.isMinGW,
-, ghostscriptSupport ? false, ghostscript
+  libX11,
-, libjpegSupport ? true, libjpeg
+  libXtSupport ? !stdenv.hostPlatform.isMinGW,
-, djvulibreSupport ? true, djvulibre
+  libXt,
-, lcms2Support ? true, lcms2
+  fontconfigSupport ? true,
-, openexrSupport ? !stdenv.hostPlatform.isMinGW, openexr
+  fontconfig,
-, libjxlSupport ? true, libjxl
+  freetypeSupport ? true,
-, libpngSupport ? true, libpng
+  freetype,
-, liblqr1Support ? true, liblqr1
+  ghostscriptSupport ? false,
-, librawSupport ? true, libraw
+  ghostscript,
-, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg, pango
+  libjpegSupport ? true,
-, libtiffSupport ? true, libtiff
+  libjpeg,
-, libxml2Support ? true, libxml2
+  djvulibreSupport ? true,
-, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg
+  djvulibre,
-, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp
+  lcms2Support ? true,
-, libheifSupport ? true, libheif
+  lcms2,
-, fftwSupport ? true, fftw
+  openexrSupport ? !stdenv.hostPlatform.isMinGW,
-, potrace
+  openexr,
-, coreutils
+  libjxlSupport ? true,
-, curl
+  libjxl,
-, ApplicationServices
+  libpngSupport ? true,
-, Foundation
+  libpng,
-, testers
+  liblqr1Support ? true,
-, nixos-icons
+  liblqr1,
-, perlPackages
+  librawSupport ? true,
-, python3
+  libraw,
+  librsvgSupport ? !stdenv.hostPlatform.isMinGW,
+  librsvg,
+  pango,
+  libtiffSupport ? true,
+  libtiff,
+  libxml2Support ? true,
+  libxml2,
+  openjpegSupport ? !stdenv.hostPlatform.isMinGW,
+  openjpeg,
+  libwebpSupport ? !stdenv.hostPlatform.isMinGW,
+  libwebp,
+  libheifSupport ? true,
+  libheif,
+  fftwSupport ? true,
+  fftw,
+  potrace,
+  coreutils,
+  curl,
+  ApplicationServices,
+  Foundation,
+  testers,
+  nixos-icons,
+  perlPackages,
+  python3,
 }:
 
 assert libXtSupport -> libX11Support;
 
 let
   arch =
-    if stdenv.hostPlatform.system == "i686-linux" then "i686"
+    if stdenv.hostPlatform.system == "i686-linux" then
-    else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64"
+      "i686"
-    else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l"
+    else if
-    else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64"
+      stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin"
-    else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le"
+    then
-    else null;
+      "x86-64"
+    else if stdenv.hostPlatform.system == "armv7l-linux" then
+      "armv7l"
+    else if
+      stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin"
+    then
+      "aarch64"
+    else if stdenv.hostPlatform.system == "powerpc64le-linux" then
+      "ppc64le"
+    else
+      null;
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -59,33 +93,44 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-DsJRTLMyjU2mMEGq/2qEJvjdYa698TEZZqkxuWtd/A4=";
   };
 
-  outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ]; # bin/ isn't really big
   outputMan = "out"; # it's tiny
 
   enableParallelBuilding = true;
 
-  configureFlags = [
+  configureFlags =
-    # specify delegates explicitly otherwise `convert` will invoke the build
+    [
-    # coreutils for filetypes it doesn't natively support.
+      # specify delegates explicitly otherwise `convert` will invoke the build
-    "MVDelegate=${lib.getExe' coreutils "mv"}"
+      # coreutils for filetypes it doesn't natively support.
-    "RMDelegate=${lib.getExe' coreutils "rm"}"
+      "MVDelegate=${lib.getExe' coreutils "mv"}"
-    "--with-frozenpaths"
+      "RMDelegate=${lib.getExe' coreutils "rm"}"
-    (lib.withFeatureAs (arch != null) "gcc-arch" arch)
+      "--with-frozenpaths"
-    (lib.withFeature librsvgSupport "rsvg")
+      (lib.withFeatureAs (arch != null) "gcc-arch" arch)
-    (lib.withFeature librsvgSupport "pango")
+      (lib.withFeature librsvgSupport "rsvg")
-    (lib.withFeature liblqr1Support "lqr")
+      (lib.withFeature librsvgSupport "pango")
-    (lib.withFeature libjxlSupport "jxl")
+      (lib.withFeature liblqr1Support "lqr")
-    (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
+      (lib.withFeature libjxlSupport "jxl")
-    (lib.withFeature ghostscriptSupport "gslib")
+      (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")
-    (lib.withFeature fftwSupport "fftw")
+      (lib.withFeature ghostscriptSupport "gslib")
-  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [
+      (lib.withFeature fftwSupport "fftw")
-    # due to libxml2 being without DLLs ATM
+    ]
-    "--enable-static" "--disable-shared"
+    ++ lib.optionals stdenv.hostPlatform.isMinGW [
+      # due to libxml2 being without DLLs ATM
+      "--enable-static"
+      "--disable-shared"
+    ];
+
+  nativeBuildInputs = [
+    pkg-config
+    libtool
   ];
 
-  nativeBuildInputs = [ pkg-config libtool ];
+  buildInputs =
-
+    [ potrace ]
-  buildInputs = [ potrace ]
     ++ lib.optional zlibSupport zlib
     ++ lib.optional fontconfigSupport fontconfig
     ++ lib.optional ghostscriptSupport ghostscript
@@ -108,7 +153,8 @@ stdenv.mkDerivation (finalAttrs: {
       Foundation
     ];
 
-  propagatedBuildInputs = [ curl ]
+  propagatedBuildInputs =
+    [ curl ]
     ++ lib.optional bzip2Support bzip2
     ++ lib.optional freetypeSupport freetype
     ++ lib.optional libjpegSupport libjpeg
@@ -118,24 +164,26 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional libwebpSupport libwebp
     ++ lib.optional fftwSupport fftw;
 
-  postInstall = ''
+  postInstall =
-    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
+    ''
-    # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
+      (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
-    # If the default is changed, or the derivation is modified to use a different configuration
+      # Q16HDRI = 16 bit quantum depth with HDRI support, and is the default ImageMagick configuration
-    # this will need to be changed below.
+      # If the default is changed, or the derivation is modified to use a different configuration
-    moveToOutput "bin/*-config" "$dev"
+      # this will need to be changed below.
-    moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
+      moveToOutput "bin/*-config" "$dev"
-    configDestination=($out/share/ImageMagick-*)
+      moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params
-    grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
+      configDestination=($out/share/ImageMagick-*)
-    for file in "$dev"/bin/*-config; do
+      grep -v '/nix/store' $dev/lib/ImageMagick-*/config-Q16HDRI/configure.xml > $configDestination/configure.xml
-      substituteInPlace "$file" --replace pkg-config \
+      for file in "$dev"/bin/*-config; do
-        "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
+        substituteInPlace "$file" --replace pkg-config \
-    done
+          "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '$(command -v $PKG_CONFIG)'"
-  '' + lib.optionalString ghostscriptSupport ''
+      done
-    for la in $out/lib/*.la; do
+    ''
-      sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+    + lib.optionalString ghostscriptSupport ''
-    done
+      for la in $out/lib/*.la; do
-  '';
+        sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la
+      done
+    '';
 
   passthru.tests = {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
@@ -152,9 +200,16 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.imagemagick.org/";
     changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md";
     description = "Software suite to create, edit, compose, or convert bitmap images";
-    pkgConfigModules = [ "ImageMagick" "MagickWand" ];
+    pkgConfigModules = [
-    platforms = platforms.linux ++ platforms.darwin;
+      "ImageMagick"
-    maintainers = with maintainers; [ dotlambda rhendric bloxx12 ];
+      "MagickWand"
+    ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [
+      dotlambda
+      rhendric
+      bloxx12
+    ];
     license = licenses.asl20;
     mainProgram = "magick";
   };

pkgs/applications/graphics/fstl/default.nix

@@ -8,7 +8,7 @@
 
 mkDerivation rec {
   pname = "fstl";
-  version = "0.10.0";
+  version = "0.11.0";
 
   nativeBuildInputs = [ cmake ];
 
@@ -25,7 +25,7 @@ mkDerivation rec {
     owner = "fstl-app";
     repo = "fstl";
     rev = "v" + version;
-    hash = "sha256-z2X78GW/IeiPCnwkeLBCLjILhfMe2sT3V9Gbw4TSf4c=";
+    hash = "sha256-6V1L5aUZQl4zAkXD7yY8Ap0+QXgogQNxaTyZAxHFqM4=";
   };
 
   meta = with lib; {

pkgs/applications/networking/browsers/chromium/common.nix

@@ -216,6 +216,7 @@ let
 
   isElectron = packageName == "electron";
   needsCompgen = chromiumVersionAtLeast "133";
+  rustcVersion = buildPackages.rustc.version;
 
   chromiumDeps = lib.mapAttrs (
     path: args:
@@ -522,6 +523,9 @@ let
           revert = true;
           hash = "sha256-PuinMLhJ2W4KPXI5K0ujw85ENTB1wG7Hv785SZ55xnY=";
         })
+      ]
+      ++ lib.optionals (chromiumVersionAtLeast "134" && lib.versionOlder rustcVersion "1.86") [
+        ./patches/chromium-134-rust-adler2.patch
       ];
 
     postPatch =
@@ -726,7 +730,20 @@ let
         # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
         chrome_pgo_phase = 0;
         clang_base_path = "${llvmCcAndBintools}";
-        use_qt = false;
+      }
+      // (
+        # M134 changed use_qt to use_qt5 (and use_qt6)
+        if chromiumVersionAtLeast "134" then
+          {
+            use_qt5 = false;
+            use_qt6 = false;
+          }
+        else
+          {
+            use_qt = false;
+          }
+      )
+      // {
         # To fix the build as we don't provide libffi_pic.a
         # (ld.lld: error: unable to find library -l:libffi_pic.a):
         use_system_libffi = true;
@@ -738,7 +755,7 @@ let
         enable_rust = true;
         # While we technically don't need the cache-invalidation rustc_version provides, rustc_version
         # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py).
-        rustc_version = buildPackages.rustc.version;
+        rustc_version = rustcVersion;
       }
       // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) {
         # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html

pkgs/applications/networking/browsers/chromium/depot_tools.py

@@ -114,7 +114,7 @@ chromium.get_deps(
         },
         **{
         f"checkout_{arch}": True
-        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64"]
+        for arch in ["x64", "arm64", "arm", "x86", "mips", "mips64", "ppc"]
         },
     },
     "",

pkgs/applications/networking/browsers/chromium/info.json

@@ -1,26 +1,26 @@
 {
   "chromium": {
-    "version": "133.0.6943.141",
+    "version": "134.0.6998.35",
     "chromedriver": {
-      "hash_darwin": "sha256-ko7IT0yCfrz1Mdaen8FYsNBWMM6s7bzjZey4cG+QIIs=",
+      "hash_darwin": "sha256-5TirtxNycNy8l9BbZ0D5P27LjKzwTl0t1vUoTIxCQcE=",
-      "hash_darwin_aarch64": "sha256-4wiQUAesLgPJLWKFl8pAiB6QsReB3RAiPR5yw0F4/Vs="
+      "hash_darwin_aarch64": "sha256-Fp1x43sQ6H7sYjtntxanbifmur6hDEri+Hw7947XZPM="
     },
     "deps": {
       "depot_tools": {
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
       },
       "gn": {
-        "rev": "c97a86a72105f3328a540f5a5ab17d11989ab7dd",
+        "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00",
-        "hash": "sha256-T2dcISln9WCODoI/LsE2ldkRfFdMwVOmqqjQinAmZss="
+        "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U="
       },
       "npmHash": "sha256-oVoTruhxTymYiGkELd2Oa1wOfjGLtChQZozP4GzOO1A="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "2a5d6da0d6165d7b107502095a937fe7704fcef6",
+        "rev": "ea6ef4c2ac15ae95d2cfd65682da62c093415099",
-        "hash": "sha256-MJlCEe1WBh+7Pl3H4jnkMuSykTBSgh5x/ZPnNwYM4DE=",
+        "hash": "sha256-Y/3V1cmna7nSJkS05SYsDxtPTz8bF7Q8fWYxVhVSy/g=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -30,23 +30,23 @@
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "1f7db7501cf902d5d3ad5fd9b31bea33bb8bf9da",
+        "rev": "2e25154d49c29fa9aa42c30ad4a027bd30123434",
-        "hash": "sha256-d1Am+7O7KYKEfs9HpAHlw6n6nWpd219gw2Cr5RaBl7w="
+        "hash": "sha256-QxEbtsEKCs2Xgulq7nVWtAeOGkIYFOy/L1ROfXa5u8U="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "83dfa1f5bfce32d5f75695542468e37ead8163b8",
+        "rev": "634228a732a1d9ae1a6d459556e8fc58707cf961",
-        "hash": "sha256-SUpg+lGtjchvh2CejKEIADAo6ozvHYj2BxzMcMZODCw="
+        "hash": "sha256-ln/DCNYJXVksbwdDBnxCfc4VwtjQlJXF7ktl/NxLupg="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "d1e95b102f113ded38974cf06a65fe0457b6004b",
+        "rev": "e55d8cf51c6db1fdd4bb56c158945ec59772c8ee",
-        "hash": "sha256-cRqctLgtiqODZf3B8ZIA2wJWCiEsuYTH24ppFtzDh3M="
+        "hash": "sha256-JazjgI+ch9RgnsDgu6p4cT4UmCBor4x4sRi1ClLISAY="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "039fea2058d14b408637a931b36a717169617227",
+        "rev": "6d0c8ee02e2fd44e69ac30e721e13be463035ee5",
-        "hash": "sha256-Uf9DfH62xWzcOsvaekeqXiwsIaIJMFK7kXK82ReY66Y="
+        "hash": "sha256-bF4hV9fY0GLYAHUnxSXkCxdZLMKR3wYWaqYJaM9aQiE="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -65,18 +65,18 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "4d214097ba7305ec2b3f2dfcf0aa4fd2104c960a",
+        "rev": "600fc3a0b121d5007b4bb97b001e756625e6d418",
-        "hash": "sha256-QvwWHVdLnDqJ6hz0Eli5AnM5gaXDya0En7BIm4vlm6c="
+        "hash": "sha256-f3Tdz0ykxQ2FHbNweJwPdAZHA8eVpjPuxqRpxwhYtRM="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
-        "rev": "06395a2863cb1ebdb47617a995b73f95c14fe120",
+        "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-        "hash": "sha256-bx0zCgqgGPjm3wjo8Y3T5kWp14WW9uoDtvn5+QOAPw0="
+        "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik="
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "981c424462d9e5210dc843e92b325c93d3bee4e9",
+        "rev": "e7d001c82ee5bead5140481671828d5e156a525a",
-        "hash": "sha256-O/3qN0pCHSzTURuqzk4schY+aRgRCHHbaTVzbQl3ur4="
+        "hash": "sha256-5YFqWgkyQ/PUKTkk1j3mAFD8JMbI+E4XRdSq34HFMWA="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -90,13 +90,13 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "8304737811a7851e2bfdcf6f667b68dbac4e962a",
+        "rev": "914c97c116e09ef01a99fbbbe9cd28cda56552c7",
-        "hash": "sha256-kjBkeTaZ0aCpMVyHOJLK5mbGBMB5xG1bnx7pr6d92jc="
+        "hash": "sha256-Y4eX8YHwVXiXW4U8KGbFd4fTU/v/EAUpfwv6lB127Y4="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
-        "rev": "ca8de51fedb70bace5351c6b002eb952c747e889",
+        "rev": "cb550a25c75a99ae0def91a02e16ae29d73e6d1e",
-        "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk="
+        "hash": "sha256-kqBpWHCxUl1ekmrbdPn6cL2y75nK4FxECJ5mo83Zgf4="
       },
       "src/third_party/angle/third_party/rapidjson/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson",
@@ -105,13 +105,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "9509eb274dfec320e970d4c85e17ecf15f27ebe3",
+        "rev": "48e7f3020f52ef9adc31aa0f5db01dc42cc487cd",
-        "hash": "sha256-EZBAJP6puSn1vIO+JRPzZkp+uftneyga0zOXpf0W2os="
+        "hash": "sha256-g59uC7feByGR1Ema8LqUCr5XWKpDMeXXvlS2thOo5Ks="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "6ea6ec78f9e4998d0a7a5677b2aec08f0ac858f8",
+        "rev": "2e328dd4eace9648adcc943cac6a1792b5dcdec5",
-        "hash": "sha256-PMB49+zW9ewlS9ym+xi0xYQYLN0j5Urx6yBXWd8FjjI="
+        "hash": "sha256-mh4s57NonFQzWNaPiKfe9kW4Ow7XAN+hW6Xpvgjvb0w="
       },
       "src/third_party/content_analysis_sdk/src": {
         "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git",
@@ -120,13 +120,13 @@
       },
       "src/third_party/dav1d/libdav1d": {
         "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git",
-        "rev": "b129d9f2cb897cedba77a60bd5e3621c14ee5484",
+        "rev": "42b2b24fb8819f1ed3643aa9cf2a62f03868e3aa",
-        "hash": "sha256-79NsUzY9fxOXlzwutAF80salew+uVHsadj2BgtEQbfo="
+        "hash": "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g="
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "d4321eef8c5c94107783d903355c1cbbbb8a3776",
+        "rev": "7056f50fdefc6bc46aa442e720d0336e2855b570",
-        "hash": "sha256-28I6Q/Ip6FhlZa2uFuMrW5YJFaDJrv/bc/wztpfO42g="
+        "hash": "sha256-aYlcplXSGjFov9dqql6d+a1PxJWtZJNQaaezof0u9QQ="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -135,19 +135,14 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "a8a4e98a2367080af683c48feedd7f7481a31a96",
+        "rev": "c2ed9ad4ee775f3de903ce757c994aecc59a5306",
-        "hash": "sha256-kc3s0LLYi3rNVTPzKQiX46JqnPkqV98tbVQr7OHuRvs="
+        "hash": "sha256-jecGwARtdSr2OEC68749mpFUAHuYP/IzYUZyj23CwJE="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
         "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
         "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA="
       },
-      "src/third_party/dawn/third_party/webgpu-headers": {
-        "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686",
-        "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4="
-      },
       "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry",
         "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
@@ -160,8 +155,8 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "ba2bd8ab91d41b60b879b134d850d326eb86ef12",
+        "rev": "24d5dfa7725d6ece31941c3f3343ba6362986d6b",
-        "hash": "sha256-FOHgZOI7w7LzZZ14O72b7B/D/Gkvv/2KCf8+bZEPXNM="
+        "hash": "sha256-AEGYE2rSsPcRzJSm97DGsrPVbhCH+lyVI61Z4qavKc8="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
@@ -175,13 +170,13 @@
       },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "d777ea2a7004ff7ef40ef983b41a5125f316f898",
+        "rev": "ea42fe28775844ec8fe0444fc421398be42d51fe",
-        "hash": "sha256-GOzeQ6BOXSqpDtgYOIyQae+jCKkqzMsU5N2WE95UR6Q="
+        "hash": "sha256-g9i5v11uZy/3Smn8zSCFmC27Gdp5VP2b0ROrj+VmP1k="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "02dd5c3ffbfed2bcbc93b553ed0e90a1ac951cb4",
+        "rev": "0dfd77492fdb0dcd06027c5842095e2e908adc90",
-        "hash": "sha256-1JL9QLMycOXvSrwuvqHxYjSxru6qOmrsJIKMAzPId2s="
+        "hash": "sha256-jOTRgF2WxsX5P0LgUI9zdCc0+NcqSnO310aq15msThY="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -190,8 +185,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "8e5d239c953a309d4bf8aa70481bafa921834cc3",
+        "rev": "d5166861902b565df446e15181eba270fe168275",
-        "hash": "sha256-2sBXPPb9o/YKE9v9W+IxJ7o/6yOzP0q5GZWcWvohUM4="
+        "hash": "sha256-xkvz743+w0xsI0w4reAo2rfC4J7opl1biA3eNYuRn+o="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -200,8 +195,8 @@
       },
       "src/third_party/chromium-variations": {
         "url": "https://chromium.googlesource.com/chromium-variations.git",
-        "rev": "0fcd7c5b11aca584c5c03b2af870c9f3af6c631c",
+        "rev": "84c18c7a0205fbd0a27b0214b16ded7fc44dc062",
-        "hash": "sha256-K9saSXK6fCRuRBdX2PPmotO2K3tatiDwuciCDK6O1MU="
+        "hash": "sha256-zXAmoKyj104BaIe4Rug18WbVKkyAsyWPCTPPEerinVo="
       },
       "src/third_party/cld_3/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git",
@@ -220,8 +215,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "ca156f7bc9109c552973414a63d310f76ef0cbf8",
+        "rev": "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6",
-        "hash": "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="
+        "hash": "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -230,23 +225,23 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "497b90c6e283745f976d783ed2beaafeef42b1bf",
+        "rev": "ea21b22629965105426f3df5e58190513e95a17e",
-        "hash": "sha256-s8ot4NvZfpUbLz/AMNX4F9e78AquKWk/YjguErBZCYE="
+        "hash": "sha256-xUaGf4MaEXg2RHgrGS1Uuz97vq5Vbt4HFV/AXYB4lCA="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "1b41ed2574ef931f2d1157ebb153c9d552f69670",
+        "rev": "0391f0d11cbf3cf3c5bcf82e19e9d9839b1936ed",
-        "hash": "sha256-FgI0D1neQ/jrNaQxMsj2hOM6nF14ZYfGHuqUznRK4Rc="
+        "hash": "sha256-EL+lOTe1Vzg4JW2q7t3UoXzHHiEmLjf7khH9fXdplbo="
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "423f1e1914ab4aa7b2bdf804e216d4c097853ba2",
+        "rev": "e42fac3e9c1726ab14a61a25e6291d9ccc49e688",
-        "hash": "sha256-R7cGQLM6yJgFL43UO+zAGbq+9XEbKbtJVFRwdIUB1F8="
+        "hash": "sha256-BvEkk15Rm4nSoV/uWiwmQW/+gg2vpLQ187TbBAHl9Rk="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "41deafc3d1ae776a97d8fd1cfb457a06908e3a6d",
+        "rev": "044764a564924c9aa0897ba8c50149acc7ddf364",
-        "hash": "sha256-8ev0h+/R1L8VXQqpKJ3zVIQ+kYHKWyNJYcGhPdVhSa4="
+        "hash": "sha256-T8BlvYNMF77BubiR4tMvW8iAhqS0ppPAESO48/mNX3w="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -255,8 +250,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "24e0c2a125d2b37b35719124d1f758777c150ca8",
+        "rev": "2a35a917be47766a895be610bedd66006980b7e6",
-        "hash": "sha256-c0QHya0eDKQc5YvvxIoL722fPm3XD3PagJb+pEwSAGQ="
+        "hash": "sha256-WG7uiduuMnXrvEpXJNGksrYkBsim+l7eiu5N+mx0Yr0="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -265,8 +260,8 @@
       },
       "src/third_party/fast_float/src": {
         "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git",
-        "rev": "3e57d8dcfb0a04b5a8a26b486b54490a2e9b310f",
+        "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-        "hash": "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao="
+        "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -300,18 +295,18 @@
       },
       "src/third_party/grpc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git",
-        "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737",
+        "rev": "a363b6c001139b9c8ffb7cd63f60a72f15349c3b",
-        "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8="
+        "hash": "sha256-RKGZWtH2JmP2mXN+4ln/nCJvOyzynrYcfrxSY8k1vVg="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "afc7000cacb8cc90ae61036858c5306defa1236a",
+        "rev": "b1f47850878d232eea372ab167e760ccac4c4e32",
-        "hash": "sha256-ZaAoUxqr3GZ05Zux2jDS4YCbFaeJ4Z+dc3gZCRL09NE="
+        "hash": "sha256-YxWz3O9see1dktqZnC551V12yU5jcOERTB1Hn1lwUNM="
       },
       "src/third_party/freetype-testing/src": {
         "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git",
-        "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f",
+        "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-        "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A="
+        "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -320,13 +315,13 @@
       },
       "src/third_party/harfbuzz-ng/src": {
         "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-        "rev": "1c249be96e27eafd15eb86d832b67fbc3751634b",
+        "rev": "6d8035a99c279e32183ad063f0de201ef1b2f05c",
-        "hash": "sha256-TStJvz3Txn4cvU1tCPPZn6RLslvM+VNUqt8l8g67JN4="
+        "hash": "sha256-isQvwaVdL4cM465A8Gs06VioAu8RvZFrwXDsXhfOoFo="
       },
       "src/third_party/ink/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink.git",
-        "rev": "e5673a4ff2d82f29b22f7bec114161cbc1ff8cf8",
+        "rev": "bf387a71d7def4b48bf24c8e09d412dfb9962746",
-        "hash": "sha256-/F4p2VRDWJ0bZRtSoWtgK8gnQDaOrHwoKwGvuSRq3a0="
+        "hash": "sha256-OcGUJxKEjeiYJgknpyb/KvDu76GMaddxWO0Lj7l9Eu8="
       },
       "src/third_party/ink_stroke_modeler/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git",
@@ -350,13 +345,13 @@
       },
       "src/third_party/libgav1/src": {
         "url": "https://chromium.googlesource.com/codecs/libgav1.git",
-        "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd",
+        "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
-        "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE="
+        "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg="
       },
       "src/third_party/googletest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git",
-        "rev": "7d76a231b0e29caf86e68d1df858308cd53b2a66",
+        "rev": "e235eb34c6c4fed790ccdad4b16394301360dcd4",
-        "hash": "sha256-ssYxqE/NZJGTAbuWTXg150qlvMS3QNaonEk9dK8jJWI="
+        "hash": "sha256-jpXIcz5Uy6fDEvxTq8rTFx/M+0+SQ6TCDaqnp7nMtng="
       },
       "src/third_party/hunspell_dictionaries": {
         "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git",
@@ -375,8 +370,8 @@
       },
       "src/third_party/leveldatabase/src": {
         "url": "https://chromium.googlesource.com/external/leveldb.git",
-        "rev": "578eeb702ec0fbb6b9780f3d4147b1076630d633",
+        "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
-        "hash": "sha256-tOSl9w9hEUnuQR+DxfZlHqEXXcpeyDlZrw2NWDUyXoY="
+        "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w="
       },
       "src/third_party/libFuzzer/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git",
@@ -385,8 +380,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "3b4a590f7fc75a77823580c4c4e19d1c7bd6da52",
+        "rev": "44ac6c2594a880edbb9cb1e4e197c2b53d078130",
-        "hash": "sha256-+m6F1rqfIQcxKZbAJgQfKbokYPZSR+PrEHxMiE9IVKA="
+        "hash": "sha256-AKXKxXqOMUb3APf5r15NmIMyhJ4ZmW5+t7y5XdgdZkw="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -395,28 +390,23 @@
       },
       "src/third_party/libaddressinput/src": {
         "url": "https://chromium.googlesource.com/external/libaddressinput.git",
-        "rev": "e8712e415627f22d0b00ebee8db99547077f39bd",
+        "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
-        "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ="
+        "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80="
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "0c13a5d54053f82bf8500b421b5cdefb1cc1b3ed",
+        "rev": "3990233fc06a35944d6d33797e63931802122a95",
-        "hash": "sha256-uGvdLJNzvd7WxRAjTxYVaX5Y7Oc54f8fLEtpErAdCdg="
+        "hash": "sha256-4NOQug0MlWZ18527V3IDuGcxGEJ4b+mZZbdzugWoBgQ="
-      },
-      "src/third_party/libavif/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git",
-        "rev": "e9a27bc6a84f01b6670c05c301c445f33a464992",
-        "hash": "sha256-4slyN5V7UCDbGHK/xZfC5MuOGhctVF6r/1lSnOHJB5Y="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "879ca873d6648a01de65e4cb0b86336b581aa513",
+        "rev": "c5938b119ef52f9ff628436c1e66c9a5322ece83",
-        "hash": "sha256-JF1s3rDH0u5srtzyGQt/LU8iVlx1qPqE4RBE1AR8KPQ="
+        "hash": "sha256-+6339vcd0KJj5V11dvJvs0YpQpTxsLmDuBoYVzyn9Ec="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "1864b0b55506bfc1eafc3785502f085f41aa0921",
+        "rev": "97690c6996f683a6f3e07d75fc4557958c55ac7b",
-        "hash": "sha256-tTJ9tJBiWbAurKvb8aPn0KLHd724CYk5wlVIVZPWB0o="
+        "hash": "sha256-d1D9/6d7a1+27nD8VijhzRMglE2PqvAMK8+GbMeesSQ="
       },
       "src/third_party/beto-core/src": {
         "url": "https://beto-core.googlesource.com/beto-core.git",
@@ -430,8 +420,8 @@
       },
       "src/third_party/speedometer/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
-        "rev": "67bc21f1f44567a3ba41d7a3d8d0bec0e74f4a9e",
+        "rev": "d6b5ffea959ad31e231c203d7446bf8b39e987ce",
-        "hash": "sha256-mx4Z/co1mZcu//nlGIg5yH+XiTWB0sdiEK8Jvbi4THU="
+        "hash": "sha256-lCwGk4Q+OXwO8vOlOQrkgygYqLrwpku/PkR03oEdX3Y="
       },
       "src/third_party/speedometer/v3.0": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git",
@@ -455,8 +445,8 @@
       },
       "src/third_party/cros-components/src": {
         "url": "https://chromium.googlesource.com/external/google3/cros_components.git",
-        "rev": "59dd6e3d06e111c6a3d323a92e6478b9bbf15915",
+        "rev": "1f1c782f06956a2deb5d33f09c466e4852099c71",
-        "hash": "sha256-x9udwohR5jKPL6x2Hxu2FdS2aW3T8VIGZ4mLtgNQ5io="
+        "hash": "sha256-80WqSMP5Vlc4OY+gfpU3SRGavs7fJbTQVW1AIhq6jmE="
       },
       "src/third_party/libdrm/src": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git",
@@ -510,13 +500,13 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "8058a0b54991257a0e1a2fcf08d993a8b70c1d3a",
+        "rev": "7b3fa8114cf8ef23cbf91e50c368c1ca768d95d5",
-        "hash": "sha256-iwUQ7WI9ThluB2+a4T7FlE7gPyBxTt9PZJnG6k5PYew="
+        "hash": "sha256-2FgBb0HzgMihGsWbEtQqyN2EXZs/y5+ToWL1ZXG35W0="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
-        "rev": "26d9f667170dc75e8d759a997bb61c64dec42dda",
+        "rev": "b4f01ea3ed6fd00923caa383bb2cf6f7a0b7f633",
-        "hash": "sha256-Mn3snC2g4BDKBJsS6cxT3BZL7LZknOWg77+60Nr4Hy0="
+        "hash": "sha256-yQ5MIUKtuWQM5SfD74vPeqGEdLJNss2/RBUZfq5701A="
       },
       "src/third_party/libwebp/src": {
         "url": "https://chromium.googlesource.com/webm/libwebp.git",
@@ -525,8 +515,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "47ddac2996378c34aab9318f0d218303b1d282e7",
+        "rev": "5a9a6ea936085310f3b9fbd4a774868e6a984ec4",
-        "hash": "sha256-sB5iCuc3+Dp9uVm2mUt4XhQ3zazsueEVNNw6uTMGTuQ="
+        "hash": "sha256-E5ePVHrEXMM8mS1qaUwPTqYO0BdP7TYuUhfX+BCiq/0="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -555,18 +545,18 @@
       },
       "src/third_party/openh264/src": {
         "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264",
-        "rev": "478e5ab3eca30e600006d5a0a08b176fd34d3bd1",
+        "rev": "33f7f48613258446decb33b3575fc0a3c9ed14e3",
-        "hash": "sha256-S7dS2IZwt4p4ZrF6K7E5HnwKuI3owU2I7vwtu95uTkE="
+        "hash": "sha256-lZlZjX8GCJOc77VJ9i1fSWn63pfVOEcwwlzh0UpIgy4="
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "991678c7c3b66807cb40619e46ebb7de1bc45a18",
+        "rev": "38d1445b41d1eb597fcd100688dbaff98aa072ed",
-        "hash": "sha256-ULAd+neG99IXGMOT4Ur4tDdV+jxMucwQFid2xhHqcMY="
+        "hash": "sha256-KGVFyGp7ItKeapub3Bd+htXH/gMaaBd+k8iC7hLtvl0="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
-        "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b",
+        "rev": "56013b77b6c0a650d00bde40e750e7c3b7c6bc3d",
-        "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc="
+        "hash": "sha256-Dz7wMYQHVR7sjCGaQe2nxIxZsAxsK6GGDNpDvypPefo="
       },
       "src/third_party/openscreen/src/third_party/tinycbor/src": {
         "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git",
@@ -575,13 +565,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "a6637ded97c46aa4879769b1a6b0f2128e6ea257",
+        "rev": "12f7715a6390050c5cffb7e4c9b2be1c2f2956d0",
-        "hash": "sha256-Y2quVCJS62YFwxBSB42Wg03QQ10M8C1GTrRvhr73IN8="
+        "hash": "sha256-/u+HYjmxSIX2GlriEWYZQJ8TDFNfzSufATGq1j9zx9w="
       },
       "src/third_party/perfetto": {
         "url": "https://android.googlesource.com/platform/external/perfetto.git",
-        "rev": "2473cc95bc0d2d0c3c240be49ce4c2d0dc48edd4",
+        "rev": "0d78d85c2bfb993ab8dd9a85b6fee6caa6a0f357",
-        "hash": "sha256-OUnQ4XStZ0Olm/IvlaLzcRdHo/EMPlQ6ekVTSrG7HW0="
+        "hash": "sha256-bjgSwq4LPz9qN9rVqIJUTHetRguCx67Uq5oe1ksPqGE="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -589,9 +579,9 @@
         "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U="
       },
       "src/third_party/pthreadpool/src": {
-        "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git",
+        "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "560c60d342a76076f0557a3946924c6478470044",
+        "rev": "e1469417238e13eebaa001779fa031ed25c59def",
-        "hash": "sha256-rGg6lgLkmbYo+a9CdaXz9ZUyrqJ1rxLcjLJeBEOPAlE="
+        "hash": "sha256-cFRELaRtWspZaqtmdKmVPqM7HVskHlFMAny+Zv/Zflw="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -615,18 +605,23 @@
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
-        "rev": "95484c3e02206f73309c08ee5ee23d2304ca092b",
+        "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-        "hash": "sha256-BaRyNHZLpXNsJltffV7T19QrMWkTcCq37JZiWjAdSHo="
+        "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA="
+      },
+      "src/third_party/search_engines_data/resources": {
+        "url": "https://chromium.googlesource.com/external/search_engines_data.git",
+        "rev": "6dc3b54b420e6e03a34ee7259fcd2b1978fac5f3",
+        "hash": "sha256-8RY3AU2V4iZKEmVwT7Z1Q3QlcTXDIdeyYwnQoyJcAUY="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "ecebe831881cdf52c65df518777210071f7970dd",
+        "rev": "fb519f2fe5d4409bc0033a4ae00ab9a7095fe566",
-        "hash": "sha256-9pq0MEWRlR6bOamQW+onZkhGH82FUYRn3P1ooDUqnPY="
+        "hash": "sha256-Y0KtUKn6DxpxVLRM+jPvUPhPzekTAma1HYs27xlJlkw="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
-        "rev": "3e1f0d1d8340cfe136d33fd27c75eb7694148214",
+        "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
-        "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw="
+        "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s="
       },
       "src/third_party/snappy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git",
@@ -640,8 +635,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "52586b554f93e50bc67277c6031673ed23a8d903",
+        "rev": "86cf34f50cbe5a9f35da7eedad0f4d4127fb8342",
-        "hash": "sha256-WPTpjJK6qFzXJg5eYLpEb6hqGgNzAkQOlSeA5a78Vpk="
+        "hash": "sha256-PSkIU8zC+4AVcYu0vaYo6I1SSykrHgcgGVMBJanux8o="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -650,18 +645,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "b25df276c8e912c22f57263ffcae6ca8f4c64342",
+        "rev": "51c6eed226abcfeeb46864e837d01563cc5b907b",
-        "hash": "sha256-Xl5dgjiKpkwf3Iv15Oj83AR1iJQ5qNzClCk24Y28TVw="
+        "hash": "sha256-qXHENS/6NwHAr1/16eb079XzmwAnpLtVZuva8uGCf+8="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "915d114daeb26a3dbdad1622f5a72c0aa255acbb",
+        "rev": "2e4b45a53a0e2e66bcb6540ae384c53a517218d0",
-        "hash": "sha256-K7HND6c357xoDFAczG77RY4E7lGyEvt0J4NidSkRYTE="
+        "hash": "sha256-9ebWETg/fsS4MYZg74XHs/Nz3nX6BXBNVRN2PmyWXWM="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "10fb91c403b2f5e2142c751884dd12ed3fb13952",
+        "rev": "0549c7127c2fbab2904892c9d6ff491fa1e93751",
-        "hash": "sha256-MvX2ApY5EF/jVMCkSSLHkPVIyHPe+CIlKJnkURzmxLU="
+        "hash": "sha256-LwspMo771iaV5YeEJWgdb8xi37KMa0rsSdvO3uqMOAI="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -670,38 +665,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
+        "rev": "e7294a8ebed84f8c5bd3686c68dbe12a4e65b644",
-        "hash": "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="
+        "hash": "sha256-/p7kBW7mwpG/Uz0goMM7L3zjpOMBzGiuN+0ZBEOpORo="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "f3c4a5053f1bd34056282e56659659873f9d47ad",
+        "rev": "ce37fd67f83cd1e8793b988d2e4126bbf72b19dd",
-        "hash": "sha256-1qIdXDDRDXT27O8o9gFNEQHQKJVAoqN3BDepL/iu1zQ="
+        "hash": "sha256-SJcxmKdzOjg6lOJk/3m8qo7puvtci1YEU6dXKjthx0Q="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "36872f9062b17b1a30b8ed1d81ca5ea6bb608a72",
+        "rev": "39f924b810e561fd86b2558b6711ca68d4363f68",
-        "hash": "sha256-+29yOL4VBAR8QpsK/WcCiJkPQxSoReTXVSoAhzsPPKc="
+        "hash": "sha256-twJJVBfnZbH/8Wn273h45K3BOnlAicqL2zJl6OfLm2E="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "081b529a37f43249225114c4c0dea12a29ce605f",
+        "rev": "0508dee4ff864f5034ae6b7f68d34cb2822b827d",
-        "hash": "sha256-QyWnBxTo5KcbEB1/Kcz2679KCsSTRDini4Ef9YRY+lw="
+        "hash": "sha256-QqFC3Iyhw9Pq6TwBHxa0Ss7SW0bHo0Uz5N18oxl2ROg="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "86d6be76350413def51e96ed98a25cc2c9d048c9",
+        "rev": "c52931f012cb7b48e42bbf2050a7fb2183b76406",
-        "hash": "sha256-2LQGTmViNb4G19zcHyEpor2E0c1wD9+JDknLfeT1M2Y="
+        "hash": "sha256-nIzrishMMxWzOuD3aX8B6Iuq2kPsUF0Uuvz7GijTulY="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "b538fb5b08513aa78346cd414ad5e576a2a3e920",
+        "rev": "fe7a09b13899c5c77d956fa310286f7a7eb2c4ed",
-        "hash": "sha256-XoMQ9VhyS4eJ8TLxNKZ1YygeOJp65AsFSk2galRM7BE="
+        "hash": "sha256-zI3y5aoP4QcYp677Oxj5Ef7lJyJwOMdGsaRBe+X9vpI="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "24ad452082bfbf3eb749d7894266666a8aae4bbb",
+        "rev": "a30aa23cfaff4f28f039c025c159128a6c336a7e",
-        "hash": "sha256-OUdlPRua+Ujn2rdzmg62OLqlsgByBNh4yUnL11oM5gE="
+        "hash": "sha256-foa5hzqf1hPwOj3k57CloCe/j0qXW3zCQ4mwCT4epF4="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -710,8 +705,8 @@
       },
       "src/third_party/wasm_tts_engine/src": {
         "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine",
-        "rev": "6d5bc87a28e49361dac2964015957698b04a0df8",
+        "rev": "7a91dbfddd93afa096a69fb7d292e22d4afecad2",
-        "hash": "sha256-uqPCMa95uoLhf+cjmc5iz3m3qGy2BNrr8oipfDbColA="
+        "hash": "sha256-bV+1YFEtCyTeZujsZtZiexT/aUTN3MaVerR2UdkUPBY="
       },
       "src/third_party/wayland/src": {
         "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git",
@@ -745,8 +740,8 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "e99550b44ea9eedb364beb553d1a48549d0da115",
+        "rev": "fb2b951ac3c23e453335edf35c9b3bad431d9009",
-        "hash": "sha256-uklVbu4Sgb9FmmKcaep8ncd5FNfdPGwdKMvzVr2qUBI="
+        "hash": "sha256-tjY5ADd5tMFsYHk6xT+TXwsDYV5eI2oOywmyTjjAxYc="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
@@ -755,8 +750,8 @@
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "cd3e2951ff0f36fa12bea747862c52533a2b39f3",
+        "rev": "8d78f5de6c27b2c793039989ea381f1428fb0100",
-        "hash": "sha256-5tdES3wILTC25Lvos5mWYlfT4ZnM2pBFy5LVACVMXEY="
+        "hash": "sha256-IsjTrEnxIqINYYjWJmDp7rlubl5dJ2YMpJf/DrG/mRM="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -775,18 +770,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "7440eee88f66c4b81d4e7d31f6ae07af66e059ea",
+        "rev": "0824e2965f6edc2297e55c8dff5a8ac4cb12aaad",
-        "hash": "sha256-qC4hSubtlNKwRikKNYtiEnvCtV0/IGvQegnhrMCTKKs="
+        "hash": "sha256-eb9B9lXPB2GiC4qehB/HOU36W1e9RZ0N2oEbIifyrHE="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "b0a179d469680276adbd4007435989a6b7fd8b4f",
+        "rev": "ea0aa030cdf31f7897c5bfc153f0d36e92768095",
-        "hash": "sha256-uFzzxbTxCUl69URMJdb9BL9cHkwwiuSHyXGSVo2xX6w="
+        "hash": "sha256-UJsuaSzR4V8alLdtxzpla1v9WYHPKPp13YrgA4Y6/yA="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "93c6f1082c25ef7fdf60ee2e4a029d65808d9343",
+        "rev": "debba63b78f8791411bff379835982cb2e8cabfa",
-        "hash": "sha256-OV1WncJaYvx1bB5najkKDNC2iMTU+m2vDAi9S/AjCyw="
+        "hash": "sha256-iOpnf4jq4bl0CJlHngJ1BV6b0VY1PigJIIjVXk4rqOE="
       }
     }
   },

pkgs/applications/networking/browsers/chromium/patches/chromium-134-rust-adler2.patch

@@ -0,0 +1,13 @@
+diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
+index 6b996aa1fe3865187d02c017e56c0918bcc9b8f4..68b085be200fa4f116aa709b9157c4d2efdf7d6a 100644
+--- a/build/rust/std/BUILD.gn
++++ b/build/rust/std/BUILD.gn
+@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
+     # These are no longer present in the Windows toolchain.
+     stdlib_files += [
+       "addr2line",
+-      "adler2",
++      "adler",
+       "gimli",
+       "libc",
+       "memchr",

pkgs/applications/networking/browsers/librewolf/src.json

@@ -1,11 +1,11 @@
 {
-  "packageVersion": "135.0.1-1",
+  "packageVersion": "136.0-1",
   "source": {
-    "rev": "135.0.1-1",
+    "rev": "136.0-1",
-    "hash": "sha256-w//XSGqKd9nNX3NmsJvl4UN3tEA1/b9g0xn+hck4hKc="
+    "hash": "sha256-ELxcS33lYgYcBUjpfDBMGZfeWanUzcUb3gXI2kEE7O0="
   },
   "firefox": {
-    "version": "135.0.1",
+    "version": "136.0",
-    "hash": "sha512-n/fCq2vBZg4znNzXdF+L2sW+JdOnm58DkzhZNScNfvSIWZhWvDjCKuCwZzifpxppmXA7dIBKbg6oJl65l4jOqQ=="
+    "hash": "sha512-orfnToQEE4spT3s8Xx6urrjOhMmq0lN56Ox4WpaG9C3vn4wRnUvCdt03HRPXvrvksbCSr0FQCqjCssgnlxRFtA=="
   }
 }

pkgs/applications/networking/instant-messengers/qtox/default.nix

@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtox";
-  version = "1.18.0";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "qTox";
     tag = "v${version}";
-    hash = "sha256-UgUlWeFrNoNR1ZwobfNLmDBn9/Aw4LUMeSgIfrq/uqo=";
+    hash = "sha256-NPJ1tBIcM4zR5izsoiydUO2+cEuWOdWAf2xte7bwOxg=";
   };
 
   buildInputs = [

pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix

@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-ews";
-  version = "3.54.2";
+  version = "3.54.3.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-77UZ2inoIX58t3dNQ9BGJiSMO+WKGUbIpjwyDl2IPNQ=";
+    hash = "sha256-GscHzyWRqERRJXViGkkwx2GyF028XsscihhSYpRqFPY=";
   };
 
   patches = [

pkgs/applications/window-managers/i3/status-rust.nix

@@ -1,19 +1,21 @@
-{ lib
+{
-, rustPlatform
+  lib,
-, fetchFromGitHub
+  rustPlatform,
-, pkg-config
+  fetchFromGitHub,
-, makeWrapper
+  pkg-config,
-, dbus
+  makeWrapper,
-, libpulseaudio
+  dbus,
-, notmuch
+  libpulseaudio,
-, openssl
+  notmuch,
-, ethtool
+  openssl,
-, lm_sensors
+  ethtool,
-, iw
+  lm_sensors,
-, iproute2
+  iw,
-, pipewire
+  iproute2,
-, withICUCalendar ? false
+  pipewire,
-, withPipewire ? true
+  withICUCalendar ? false,
+  withPipewire ? true,
+  withNotmuch ? true,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -30,18 +32,29 @@ rustPlatform.buildRustPackage rec {
   useFetchCargoVendor = true;
   cargoHash = "sha256-EFFmH9aG7DvSA5rsAuszc1B8kcLdruSk3Hhp4V9t9Gk=";
 
-  nativeBuildInputs = [ pkg-config makeWrapper ]
+  nativeBuildInputs = [
-    ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
+    pkg-config
+    makeWrapper
+  ] ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]);
 
-  buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]
+  buildInputs =
-    ++ (lib.optionals withPipewire [ pipewire ]);
+    [
+      dbus
+      libpulseaudio
+      openssl
+      lm_sensors
+    ]
+    ++ (lib.optionals withPipewire [ pipewire ])
+    ++ (lib.optionals withNotmuch [ notmuch ]);
 
-  buildFeatures = [
+  buildFeatures =
-    "notmuch"
+    [
-    "maildir"
+      "maildir"
-    "pulseaudio"
+      "pulseaudio"
-  ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
+    ]
-  ++ (lib.optionals withPipewire [ "pipewire" ]);
+    ++ (lib.optionals withICUCalendar [ "icu_calendar" ])
+    ++ (lib.optionals withPipewire [ "pipewire" ])
+    ++ (lib.optionals withNotmuch [ "notmuch" ]);
 
   prePatch = ''
     substituteInPlace src/util.rs \
@@ -54,7 +67,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   postFixup = ''
-    wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]}
+    wrapProgram $out/bin/i3status-rs --prefix PATH : ${
+      lib.makeBinPath [
+        iproute2
+        ethtool
+        iw
+      ]
+    }
   '';
 
   # Currently no tests are implemented, so we avoid building the package twice
@@ -65,7 +84,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/greshake/i3status-rust";
     license = licenses.gpl3Only;
     mainProgram = "i3status-rs";
-    maintainers = with maintainers; [ backuitist globin ];
+    maintainers = with maintainers; [
+      backuitist
+      globin
+    ];
     platforms = platforms.linux;
   };
 }

pkgs/build-support/node/fetch-yarn-deps/default.nix

@@ -13,6 +13,7 @@
   nodejs-slim,
   prefetch-yarn-deps,
   fixup-yarn-lock,
+  diffutils,
   yarn,
   makeSetupHook,
   cacert,
@@ -169,6 +170,11 @@ in
       yarn
       fixup-yarn-lock
     ];
+    substitutions = {
+      # Specify `diff` by abspath to ensure that the user's build
+      # inputs do not cause us to find the wrong binaries.
+      diff = "${diffutils}/bin/diff";
+    };
     meta = {
       description = "Install nodejs dependencies from an offline yarn cache produced by fetchYarnDeps";
     };

pkgs/build-support/node/fetch-yarn-deps/yarn-config-hook.sh

@@ -10,6 +10,46 @@ yarnConfigHook() {
         echo yarnConfigHook: No yarnOfflineCache or offlineCache were defined\! >&2
         exit 2
     fi
+
+    local -r cacheLockfile="$offlineCache/yarn.lock"
+    local -r srcLockfile="$PWD/yarn.lock"
+
+    echo "Validating consistency between $srcLockfile and $cacheLockfile"
+
+    if ! @diff@ "$srcLockfile" "$cacheLockfile"; then
+      # If the diff failed, first double-check that the file exists, so we can
+      # give a friendlier error msg.
+      if ! [ -e "$srcLockfile" ]; then
+        echo
+        echo "ERROR: Missing yarn.lock from src. Expected to find it at: $srcLockfile"
+        echo "Hint: You can copy a vendored yarn.lock file via postPatch."
+        echo
+
+        exit 1
+      fi
+
+      if ! [ -e "$cacheLockfile" ]; then
+        echo
+        echo "ERROR: Missing lockfile from cache. Expected to find it at: $cacheLockfile"
+        echo
+
+        exit 1
+      fi
+
+      echo
+      echo "ERROR: fetchYarnDeps hash is out of date"
+      echo
+      echo "The yarn.lock in src is not the same as the in $offlineCache."
+      echo
+      echo "To fix the issue:"
+      echo '1. Use `lib.fakeHash` as the fetchYarnDeps hash value'
+      echo "2. Build the derivation and wait for it to fail with a hash mismatch"
+      echo "3. Copy the 'got: sha256-' value back into the fetchYarnDeps hash field"
+      echo
+
+      exit 1
+    fi
+
     yarn config --offline set yarn-offline-mirror "$offlineCache"
     fixup-yarn-lock yarn.lock
     yarn install \

pkgs/by-name/al/allure/package.nix

@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.32.2";
+  version = "2.33.0";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-/hcsXcLT6V2mSJMHBcjFRMFA0uuILQQDIKmrLNRsh9s=";
+    hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA=";
   };
 
   dontConfigure = true;

pkgs/by-name/al/alpaca/package.nix

@@ -20,14 +20,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "5.0.5";
+  version = "5.0.6";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-VfD10mMlRNi6Ye3IXy60ygx9DGTpzG06T6zQLm+8dFo=";
+    hash = "sha256-iBce9ROWajUBq3GX/IU7yMoWTFNw98HnaE0kp+t73G0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/al/alsa-lib/package.nix

@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
       "alsa"
       "alsa-topology"
     ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
     maintainers = with maintainers; [ l-as ];
   };
 })

pkgs/by-name/al/alsa-topology-conf/package.nix

@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.bsd3;
     maintainers = [ maintainers.roastiek ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
   };
 }

pkgs/by-name/al/alsa-ucm-conf/package.nix

@@ -18,31 +18,36 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontBuild = true;
 
-  installPhase = ''
+  installPhase =
-    runHook preInstall
+    ''
+      runHook preInstall
 
-    substituteInPlace ucm2/lib/card-init.conf \
+      substituteInPlace ucm2/lib/card-init.conf \
-      --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
+        --replace-fail "/bin/rm" "${coreutils}/bin/rm" \
-      --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
+        --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir"
 
-    files=(
+      files=(
-        "ucm2/HDA/HDA.conf"
+          "ucm2/HDA/HDA.conf"
-        "ucm2/codecs/rt715/init.conf"
+          "ucm2/codecs/rt715/init.conf"
-        "ucm2/codecs/rt715-sdca/init.conf"
+          "ucm2/codecs/rt715-sdca/init.conf"
-        "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf"
+          "ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf"
-        "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf"
+          "ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf"
-    )
+      )
 
-    for file in "''${files[@]}"; do
+    ''
-        substituteInPlace "$file" \
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
-            --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
+      for file in "''${files[@]}"; do
-    done
+          substituteInPlace "$file" \
+              --replace-fail '/sbin/modprobe' '${kmod}/bin/modprobe'
+      done
+    ''
+    + ''
 
-    mkdir -p $out/share/alsa
+      mkdir -p $out/share/alsa
-    cp -r ucm ucm2 $out/share/alsa
+      cp -r ucm ucm2 $out/share/alsa
 
-    runHook postInstall
+      runHook postInstall
-  '';
+    '';
 
   passthru.updateScript = directoryListingUpdater {
     url = "https://www.alsa-project.org/files/pub/lib/";
@@ -59,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.roastiek ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
   };
 })

pkgs/by-name/br/brainflow/package.nix

@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brainflow";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchFromGitHub {
     owner = "brainflow-dev";
     repo = "brainflow";
     tag = finalAttrs.version;
-    hash = "sha256-NBdSVYW2xWY5jgXeaeW0yBzIzvSWt5Qp2A9zIn7+0Yw=";
+    hash = "sha256-yQ4jJUIA4E+rQiR2VtEupgZoAzek/2lzol74vmppb/k=";
   };
 
   patches = [ ];

pkgs/by-name/ca/calamares-nixos-extensions/package.nix

@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calamares-nixos-extensions";
-  version = "0.3.21";
+  version = "0.3.22";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "calamares-nixos-extensions";
     rev = finalAttrs.version;
-    hash = "sha256-txEPZ3S231g46nKN8wnMU334dMExvfRoc/SAspVJZiY=";
+    hash = "sha256-Tmp/sWQmhiZe2dmA+msCMPwPlBd1Oa3q5X+QP+CoAWI=";
   };
 
   installPhase = ''

pkgs/by-name/cl/claude-code/package-lock.json

@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.29"
+        "@anthropic-ai/claude-code": "^0.2.30"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.29",
+      "version": "0.2.30",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.29.tgz",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.30.tgz",
-      "integrity": "sha512-4lZbbg+Qqz+mY3SLKcUYjnOd6/PIB+SQh7ICVIXFYGB1zOB4mVfiY7l2nBt67iw+Rxko2wGJAfg6gPM57S/Q/g==",
+      "integrity": "sha512-dX0CNMRpbJ3ZrIPuDzCowAdn5P0CZsa8ncBHOHt9WbqFy7y1wMbgUacJbGB41AgKp9YC7QD0C3G4nhfjW9onUA==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "bin": {

pkgs/by-name/cl/claude-code/package.nix

@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.29";
+  version = "0.2.30";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-Frc53cRlf0jtvarKAJCScU9wkN0m81irAwfIGnlfLNQ=";
+    hash = "sha256-i8C4lYryWUoLWLGryrte10nmKFbHLHJpoVD0z0CbdPo=";
   };
 
-  npmDepsHash = "sha256-4pCyeUY3Ava8gAi5kOJDRXdu3eay07sCMcO/Y/qy4w4=";
+  npmDepsHash = "sha256-p8ghlzCQ++gsVNmm3BliG3Q8VBu/PqJalBUJwP7GiyU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

pkgs/by-name/cl/cloudlist/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "cloudlist";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cloudlist";
     tag = "v${version}";
-    hash = "sha256-6XgqhCL8ehK8k3k8fKLFZSmUz8G3MwqXhjEpA99F0K4=";
+    hash = "sha256-HYCD7mCfIJOijKTPvL5OixZ6zmI/P/+0Agx9bBhxy0Y=";
   };
 
-  vendorHash = "sha256-4vR03dC8ZfBM7Jw3JqGxZ/DGxfTx8279j7CzSOQKPkQ=";
+  vendorHash = "sha256-fZ7l4+No/a8EYqC1nacSyh5fD2QAdzANjTTmbY0d/L4=";
 
   subPackages = [ "cmd/cloudlist/" ];
 

pkgs/by-name/el/element-desktop/package.nix

@@ -4,8 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   makeDesktopItem,
-  fixup-yarn-lock,
+  yarnConfigHook,
-  yarn,
   nodejs,
   fetchYarnDeps,
   jq,
@@ -48,8 +47,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
+      yarnConfigHook
-      fixup-yarn-lock
       nodejs
       makeWrapper
       jq
@@ -57,18 +55,6 @@ stdenv.mkDerivation (
 
     inherit seshat;
 
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$(mktemp -d)
-      yarn config --offline set yarn-offline-mirror $offlineCache
-      fixup-yarn-lock yarn.lock
-      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules/
-
-      runHook postConfigure
-    '';
-
     # Only affects unused scripts in $out/share/element/electron/scripts. Also
     # breaks because there are some `node`-scripts with a `npx`-shebang and
     # this shouldn't be in the closure just for unused scripts.

pkgs/by-name/el/element-web-unwrapped/package.nix

@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   jq,
-  yarn,
+  yarnConfigHook,
-  fixup-yarn-lock,
   nodejs,
   jitsi-meet,
 }:
@@ -36,8 +35,7 @@ stdenv.mkDerivation (
     };
 
     nativeBuildInputs = [
-      yarn
+      yarnConfigHook
-      fixup-yarn-lock
       jq
       nodejs
     ];
@@ -53,25 +51,6 @@ stdenv.mkDerivation (
       runHook postBuild
     '';
 
-    configurePhase = ''
-      runHook preConfigure
-
-      export HOME=$PWD/tmp
-      # with the update of openssl3, some key ciphers are not supported anymore
-      # this flag will allow those codecs again as a workaround
-      # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
-      # and https://github.com/element-hq/element-web/issues/21043
-      export NODE_OPTIONS=--openssl-legacy-provider
-      mkdir -p $HOME
-
-      fixup-yarn-lock yarn.lock
-      yarn config --offline set yarn-offline-mirror $offlineCache
-      yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
-      patchShebangs node_modules
-
-      runHook postConfigure
-    '';
-
     installPhase = ''
       runHook preInstall
 

pkgs/by-name/en/entr/package.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "entr";
-  version = "5.6";
+  version = "5.7";
 
   src = fetchurl {
     url = "https://eradman.com/entrproject/code/entr-${version}.tar.gz";
-    hash = "sha256-AiK435KNO1o7UZTWPn3gmFM+BBkNnZoVS5JsbB+d0U4=";
+    hash = "sha256-kMXZQ4IMcM7zfrQaOCpupPXdf9le/vE7K1Ug0yD10Gc=";
   };
 
   postPatch = ''

pkgs/by-name/f2/f2fs-tools/package.nix

@@ -39,6 +39,13 @@ stdenv.mkDerivation rec {
       url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/patch/?id=b15b6cc56ac7764be17acbdbf96448f388992adc";
       hash = "sha256-9XrNf9MMMDGOsuP3DvUhm30Sa2xICDtXbUIvM/TP35o=";
     })
+
+    # Fix the build against C23 compilers (like gcc-15):
+    (fetchpatch {
+      name = "c23.patch";
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/patch/?id=6617d15a660becc23825007ab3fc2d270b5b250f";
+      hash = "sha256-XgceNqwCDa5m9CJTQCmjfiDhZ7x/rO+UiBZwrovgywA=";
+    })
   ];
 
   enableParallelBuilding = true;

pkgs/by-name/fr/frei0r/package.nix

@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     description = "Minimalist, cross-platform, shared video plugins";
     license = licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
   };
 }

pkgs/by-name/ge/gel/0001-dynamically-patchelf-binaries.patch

@@ -1,14 +1,14 @@
-diff --git a/src/portable/install.rs b/src/portable/install.rs
+diff --git a/src/portable/server/install.rs b/src/portable/server/install.rs
-index 15944e4..f873349 100644
+index feb47f1..157d17a 100644
---- a/src/portable/install.rs
+--- a/src/portable/server/install.rs
-+++ b/src/portable/install.rs
++++ b/src/portable/server/install.rs
-@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
+@@ -229,8 +229,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
      for entry in arch.entries()? {
          let mut entry = entry?;
          let path = entry.path()?;
 +        let is_inside_bin = {
 +            let mut path_iter = path.iter();
-+            path_iter.next(); // discards first folder
++            path_iter.next(); // discards first path
 +            path_iter.as_path().starts_with("bin")
 +        };
          if let Some(path) = build_path(&target_dir, &path)? {
@@ -20,9 +20,9 @@ index 15944e4..f873349 100644
          }
      }
      bar.finish_and_clear();
-@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
+@@ -244,3 +252,12 @@ fn unlink_cache(cache_file: &Path) {
- 
+         })
-     Ok(info)
+         .ok();
  }
 +
 +fn nix_patchelf_if_needed(dest_path: &Path) {
@@ -32,3 +32,4 @@ index 15944e4..f873349 100644
 +        .arg(dest_path)
 +        .output();
 +}
++

pkgs/by-name/ge/gel/package.nix

@@ -11,24 +11,24 @@
   xz,
   replaceVars,
   # for passthru.tests:
-  edgedb,
+  gel,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "edgedb";
+  pname = "gel";
-  version = "6.1.2";
+  version = "7.0.3";
 
   src = fetchFromGitHub {
-    owner = "edgedb";
+    owner = "geldata";
-    repo = "edgedb-cli";
+    repo = "gel-cli";
     tag = "v${version}";
-    hash = "sha256-7epi7cF6u3Y/Fomcd1+lQfIIRKzuqL6Qk3gTZGZnjv8=";
+    hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk=";
     fetchSubmodules = true;
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Iq960LU3Xxu5LHBENsZ48diPVJrdTHxtChtSp7yghCw=";
+    hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk=";
   };
 
   nativeBuildInputs = [
@@ -60,16 +60,21 @@ rustPlatform.buildRustPackage rec {
     OPENSSL_NO_VENDOR = true;
   };
 
+  # cli warns when edgedb found but gel doesn't
+  postInstall = ''
+    mv $out/bin/edgedb $out/bin/gel
+  '';
+
   doCheck = false;
 
   passthru.tests.version = testers.testVersion {
-    package = edgedb;
+    package = gel;
-    command = "edgedb --version";
+    command = "gel --version";
   };
 
   meta = {
-    description = "EdgeDB cli";
+    description = "Gel cli";
-    homepage = "https://www.edgedb.com/docs/cli/index";
+    homepage = "https://docs.geldata.com/reference/cli";
     license = with lib.licenses; [
       asl20
       # or
@@ -79,6 +84,6 @@ rustPlatform.buildRustPackage rec {
       ahirner
       kirillrdy
     ];
-    mainProgram = "edgedb";
+    mainProgram = "gel";
   };
 }

pkgs/by-name/gh/ghostfolio/package.nix

@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.139.1";
+  version = "2.143.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-0NOcmqgHHTUKOZ+l4FBzWO9qxK3vlxrr5dVpbMUNVDo=";
+    hash = "sha256-jOIt8JJghXaKsfwgR6aMfaXEHgIalc/gtwkGJ831bWI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-/2bGyWf/FBQzgwU5PFLDHtzaDVKqyfkS9naOsL6RQSU=";
+  npmDepsHash = "sha256-K+SOl7wuxLhEOoM1A7QG3tB1Xiuz+hstiePIDjmzWVA=";
 
   nativeBuildInputs = [
     prisma

pkgs/by-name/go/go-dnscollector/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-dnscollector";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     rev = "v${version}";
-    sha256 = "sha256-JhkvWj5mQlFiGQ2A0yGIr0/4g9mYlWnK5DQfeSRX+Qo=";
+    sha256 = "sha256-rJHU/hDmnANziJj/K2FGccZjWFe8eyggtjIc2nt0pgo=";
   };
 
-  vendorHash = "sha256-crOswUMoFKsDdo8HiChSRSeR0eHHC1f8G6OcPuUGoww=";
+  vendorHash = "sha256-bAqr2ZVR6x1hJ80oZogA5ZXEuoz5A7yp5rxry1rIhSY=";
 
   subPackages = [ "." ];
 

pkgs/by-name/gr/granted/package.nix

@@ -4,9 +4,6 @@
   nix-update-script,
   versionCheckHook,
 
-  withFish ? false,
-  fish,
-
   lib,
   makeWrapper,
   xdg-utils,
@@ -75,12 +72,11 @@ buildGoModule rec {
 
       # Insert below the #!/bin/sh shebang
       echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
-    ''
+
-    + lib.optionalString withFish ''
       # Install fish script
       install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
       substituteInPlace $out/share/assume.fish \
-        --replace /bin/fish ${fish}/bin/fish
+        --replace-fail "#!/bin/fish" "#!/usr/bin/env fish"
     '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];

pkgs/by-name/hp/hp2p/package.nix

@@ -2,21 +2,22 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  mpi,
   python3Packages,
   autoconf,
   automake,
+  mpi,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hp2p";
-  version = "unstable-2023-10-25";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "cea-hpc";
     repo = "hp2p";
-    rev = "711f6cc5b4e552d969c2436ad77afd35d31bfd05";
+    tag = finalAttrs.version;
-    sha256 = "sha256-mBTJZb3DPmIlL7N+PfjlWmBw0WfFF2DesImVZlbDQKc=";
+    hash = "sha256-Rrqb6M9E3WNuxhJXYfBrrv3sFQ2avU33gLZNUtU9Yuc=";
   };
 
   enableParallelBuilding = true;
@@ -44,11 +45,21 @@ stdenv.mkDerivation rec {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "MPI based benchmark for network diagnostics";
     homepage = "https://github.com/cea-hpc/hp2p";
-    platforms = platforms.unix;
+    changelog = "https://github.com/cea-hpc/hp2p/releases/tag/${finalAttrs.version}";
-    license = licenses.cecill-c;
+    platforms = lib.platforms.unix;
-    maintainers = [ maintainers.bzizou ];
+    license = lib.licenses.cecill-c;
+    maintainers = [ lib.maintainers.bzizou ];
+    mainProgram = "hp2p.exe";
+    badPlatforms = [
+      # hp2p_algo_cpp.cpp:38:10: error: no member named 'random_shuffle' in namespace 'std'
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
-}
+})

pkgs/by-name/im/imgbrd-grabber/package.nix

@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "imgbrd-grabber";
-  version = "7.12.2";
+  version = "7.13.0";
 
   src = fetchFromGitHub {
     owner = "Bionus";
     repo = "imgbrd-grabber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6XfIaASfbvdPovtdDEJtsk4pEL4Dhmyq8ml4X7KZ4DE=";
+    hash = "sha256-7EIXmqfTADG95vxKU1cFGnzZD3NJJN28HOF71YZD6nI=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/ir/irpf/package.nix

@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2024-1.5";
+  version = "2024-1.6";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-Pz8oI96GpLcHFEtnKUHnUHtZL3/QGhtG93ab5Au/tw0=";
+      hash = "sha256-wYSfU6tkYuSns+RnSy2c3yRR05t/8iXLhRMqPQR+oO0=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''

pkgs/by-name/js/jsoncons/package.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jsoncons";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "danielaparker";
     repo = "jsoncons";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JGA3mQToTflm+1rLtKLzbX4x84S+6JoEQAQgx5+E278=";
+    hash = "sha256-EafFoS54svxY9zaFqzWYQ8QUxN2dHy2wI5UugxKnyUk=";
   };
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/le/ledger-live-desktop/package.nix

@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.100.0";
+  version = "2.102.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-WDSlVcWOwri8CT4AD9/tahx5upJvKCQp45wltPp8zI8=";
+    hash = "sha256-mi4YOY8TYorLiUbRCmknY3NBzTXId7/vfdvzUJSrdrI=";
   };
 
   appimageContents = appimageTools.extractType2 {

pkgs/by-name/li/libcamera/package.nix

@@ -132,6 +132,7 @@ stdenv.mkDerivation rec {
     changelog = "https://git.libcamera.org/libcamera/libcamera.git/tag/?h=${src.rev}";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ citadelcore ];
+    platforms = platforms.linux;
     badPlatforms = [
       # Mandatory shared libraries.
       lib.systems.inspect.platformPatterns.isStatic

pkgs/by-name/li/libvisual/package.nix

@@ -53,6 +53,6 @@ stdenv.mkDerivation rec {
     description = "Abstraction library for audio visualisations";
     homepage = "https://sourceforge.net/projects/libvisual/";
     license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.freebsd;
   };
 }

pkgs/by-name/mi/minify/package.nix

@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.21.2";
+  version = "2.21.3";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iR52KkstnpruTG7xJKbAIn15Ybrt03ctiSTU2EOnC24=";
+    hash = "sha256-WnkC6wydFDZDt6tPpsDipK/6Hwj3lfzx+20nDTUfn7g=";
   };
 
-  vendorHash = "sha256-tWNC2/sFqX+KcFrTD8ifN2f3TRHA3enT5glESy8spgo=";
+  vendorHash = "sha256-jZJpaUsHLjPrVTzzxfb9oqm8d6LM28OKdm1v4m7zxC8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ne/neovim-qt-unwrapped/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "neovim-qt-unwrapped";
-  version = "0.2.18";
+  version = "0.2.19";
 
   src = fetchFromGitHub {
     owner = "equalsraf";
     repo = "neovim-qt";
     rev = "v${version}";
-    hash = "sha256-BitFHHwL2aqBUpY/8eHaZIFvnDCeABC6w33Vmbx0z2g=";
+    hash = "sha256-r77tg3xVemHW/zDNA6dYerFjFaYDDeHsD68WhMfI70Q=";
   };
 
   cmakeFlags = [

pkgs/by-name/ni/nix-heuristic-gc/package.nix

@@ -9,12 +9,12 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "nix-heuristic-gc";
-  version = "0.6.0";
+  version = "0.6.1";
   src = fetchFromGitHub {
     owner = "risicle";
     repo = "nix-heuristic-gc";
     tag = "v${version}";
-    hash = "sha256-lph+rm8qXoA6h2dJTYeuj9HJAx6PnKZSdsKBElbBUbY=";
+    hash = "sha256-3SSIbfOx6oYsCZgK71bbx2H3bAMZ3VJxWfiMVPq5FaE=";
   };
 
   # NIX_SYSTEM suggested at

pkgs/by-name/oc/oci-cli/package.nix

@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.51.8";
+  version = "3.52.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-p+X6kJDjuDaOLgZ9KwrZJgAqORKLxPrXwQ4X+JZb1W4=";
+    hash = "sha256-5b+KFKj1IjAJwu166Q4YRmvNGmjKMVFhDwzPzWeKT2w=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -105,6 +105,7 @@ py.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [
       adamcstephens
       ilian
+      FKouhai
     ];
   };
 }

pkgs/by-name/pa/parted/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   lvm2,
   libuuid,
   gettext,
@@ -24,6 +25,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-O0Pb4zzKD5oYYB66tWt4UrEo7Bo986mzDM3l5zNZ5hI=";
   };
 
+  patches = [
+    # Fix the build against C23 compilers (like gcc-15):
+    (fetchpatch {
+      name = "c23.patch";
+      url = "https://git.savannah.gnu.org/gitweb/?p=parted.git;a=patch;h=16343bda6ce0d41edf43f8dac368db3bbb63d271";
+      hash = "sha256-8FgnwMrzMHPZNU+b/mRHCSu8sn6H7GhVLIhMUel40Hk=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"
@@ -46,6 +56,8 @@ stdenv.mkDerivation rec {
     ++ lib.optional (lvm2 == null) "--disable-device-mapper"
     ++ lib.optional enableStatic "--enable-static";
 
+  enableParallelBuilding = true;
+
   # Tests were previously failing due to Hydra running builds as uid 0.
   # That should hopefully be fixed now.
   doCheck = !stdenv.hostPlatform.isMusl; # translation test

pkgs/by-name/pr/protonmail-desktop/package.nix

@@ -9,7 +9,7 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.7.0";
+  version = "1.7.1";
 
 in
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://proton.me/download/mail/linux/${version}/ProtonMail-desktop-beta.deb";
-    sha256 = "sha256-hwaK8okaixTuVVXfEyb3+71V5dQl0NvCVOfg1a274f8=";
+    sha256 = "sha256-h5OQBZrG8whhsilS7qQU8txFKzjpl+Q27fcUOBYUzbQ=";
   };
 
   dontConfigure = true;

pkgs/by-name/ps/pspg/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "5.8.7";
+  version = "5.8.8";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "sha256-SE+62EODKWcKFpMMbWDw+Dp5b2D/XKbMFiJiD/ObrhU=";
+    sha256 = "sha256-8Wi8fMEBc1A0foEzwO5Dq6c3yC0pJ9hbzCjjMp+Lapg=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/qt/qtorganizer-mkcal/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtorganizer-mkcal";
-  version = "0-unstable-2025-02-14";
+  version = "0-unstable-2025-02-19";
 
   src = fetchFromGitHub {
     owner = "dcaliste";
     repo = "qtorganizer-mkcal";
-    rev = "3090565d70ecdfaad2cba57d5a895fa69afd024a";
+    rev = "312412de3f810fbedc7c4f27bd33adb2c3fbe967";
-    hash = "sha256-ZNAcqjkVf9efP+WWTDr2YFZT+eZdIJAfX45Gm0+Y81A=";
+    hash = "sha256-uv2cEs84bM614vg5K+t4vyXas+1b5Jm39tfGSwWj6n0=";
   };
 
   postPatch = ''
@@ -51,11 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontWrapQtApps = true;
 
-  cmakeFlags = [
+  # Flaky: https://github.com/dcaliste/qtorganizer-mkcal/issues/9
-    (lib.cmakeBool "INSTALL_TESTS" false)
+  doCheck = false;
-  ];
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
   preCheck =
     let

pkgs/by-name/qu/quirc/package.nix

@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
         hash = "sha256-WLQK7vy34VmgJzppTnRjAcZoSGWVaXQSaGq9An8W0rw=";
       })
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
-      # Disable building of linux-only demos on darwin systems
+      # Disable building of linux-only demos on non-linux systems
       ./0001-Don-t-build-demos.patch
     ];
 
@@ -84,9 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Small QR code decoding library";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux ++ [
+    platforms = lib.platforms.unix;
-      "x86_64-darwin"
-      "aarch64-darwin"
-    ];
   };
 })

pkgs/by-name/ro/rocketchat-desktop/package.nix

@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/RocketChat/Rocket.Chat.Electron";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
-    maintainers = with maintainers; [ gbtb ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/by-name/ro/rosa/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "rosa";
-  version = "1.2.50";
+  version = "1.2.51";
 
   src = fetchFromGitHub {
     owner = "openshift";
     repo = "rosa";
     rev = "v${version}";
-    hash = "sha256-+jJbfU1DAgFNrYVA2Q1khUQKA64WOg/3H4zmX8KCg7w=";
+    hash = "sha256-tZwIySYY/0QBi2Vv1omV3ZcK3DD5SRUNaQKClX2QeUw=";
   };
   vendorHash = null;
 

pkgs/by-name/sc/schemacrawler/package.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemacrawler";
-  version = "16.25.1";
+  version = "16.25.2";
 
   src = fetchzip {
     url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
-    hash = "sha256-IWVkLSYErfyw4D4GYf+36QTpUQLhWm1DNrhwlPbIuR8=";
+    hash = "sha256-pFOe+IgkPrIAFpZW6O4Mgt77EFDlz4F/xO+WYjBvHrs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/by-name/sd/SDL2_ttf/package.nix

@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL2_ttf";
-  version = "2.22.0";
+  version = "2.24.0";
 
   src = fetchurl {
     url = "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1Iy9HOR1ueF4IGvzty1Wtm2E1E9krAWAMyg5YjTWdyM=";
+    hash = "sha256-Cyvx57ZWitvbybuSRkP3nZ3tr+Bh+h7Wh9HZrE5FO/0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/se/serial-studio/package.nix

@@ -42,12 +42,18 @@ stdenv.mkDerivation rec {
     ./0002-Connect-Button-Fix.patch
   ];
 
-  meta = with lib; {
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/Serial-Studio.app $out/Applications
+    makeWrapper $out/Applications/Serial-Studio.app/Contents/MacOS/Serial-Studio $out/bin/serial-studio
+  '';
+
+  meta = {
     description = "Multi-purpose serial data visualization & processing program";
     mainProgram = "serial-studio";
     homepage = "https://serial-studio.github.io/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
+    maintainers = with lib.maintainers; [ sikmir ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/by-name/si/signalbackup-tools/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250304-1";
+  version = "20250305-2";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     rev = version;
-    hash = "sha256-rm3mzQTQCMBia7xexo+fC4sD+ufevbltSA46GsgQAXs=";
+    hash = "sha256-y655shDg3gnm5V1qhEbw6l0JzabhALXPeRQxyFhq2Cs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/so/socat/package.nix

@@ -25,9 +25,13 @@ stdenv.mkDerivation rec {
       --replace /sbin/ifconfig ifconfig
   '';
 
-  configureFlags = lib.optionals (!stdenv.hostPlatform.isLinux) [
+  configureFlags =
-    "--disable-posixmq"
+    lib.optionals (!stdenv.hostPlatform.isLinux) [
-  ];
+      "--disable-posixmq"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isFreeBSD [
+      "--disable-dccp"
+    ];
 
   buildInputs = [
     openssl

pkgs/by-name/sw/swayws/package.nix

@@ -4,31 +4,31 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "swayws";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     owner = "w0lff";
-    repo = pname;
+    repo = "swayws";
     # Specifying commit hash rather than tag because upstream has
     # rewritten a tag before:
     # https://gitlab.com/w0lff/swayws/-/issues/1#note_1342349382
-    rev = "98f0d5c1896b10e890e1727654f1cf3b34a2371e";
+    rev = "0c125d65f9fe9269f78ddaf575cd39f00f749659";
-    hash = "sha256-zeM6/x2vjZ2IL+nZz1WBf5yY4C6ovmxyvgVLD54BKVc=";
+    hash = "sha256-ILS7r1gL6fXeX58CJ+gHvQ5Cst7PbK4yNw2Dh5l9IEc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/n41JGypLsFd02tW5WuxXsATn7/I09N+dOiq0H0QDug=";
+  cargoHash = "sha256-AS1vEnNLDLsNaIZ6pLrsQpQy9+bSoCn5oyj8SXjJ+OE=";
 
   # swayws does not have any tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Sway workspace tool which allows easy moving of workspaces to and from outputs";
     mainProgram = "swayws";
     homepage = "https://gitlab.com/w0lff/swayws";
-    license = licenses.mit;
+    license = lib.licenses.mit;
-    maintainers = [ maintainers.atila ];
+    maintainers = [ lib.maintainers.atila ];
   };
 }

pkgs/by-name/ta/tahoe-lafs/package.nix

@@ -1,52 +1,21 @@
 {
   lib,
-  nettools,
+  python3Packages,
-  python311,
-  texinfo,
   fetchFromGitHub,
+  texinfo,
+  versionCheckHook,
 }:
 
-# FAILURES: The "running build_ext" phase fails to compile Twisted
-# plugins, because it tries to write them into Twisted's (immutable)
-# store path. The problem appears to be non-fatal, but there's probably
-# some loss of functionality because of it.
-
-let
-  # Tahoe-LAFS unstable-2021-07-09 is incompatible with Python 3.12, and
-  # uses eliot in a way incompatible after version 1.14.0.
-  # These versions should be unpinned, when updating Tahoe-LAFS to a more recent version.
-  python = python311.override {
-    self = python;
-    packageOverrides = self: super: {
-      eliot = super.eliot.overridePythonAttrs (oldAttrs: rec {
-        version = "1.14.0";
-
-        src = fetchFromGitHub {
-          owner = "itamarst";
-          repo = "eliot";
-          rev = "refs/tags/${version}";
-          hash = "sha256-1QE/s8P2g7DGIcuT+/AikAaWMTafNWn4BRZqpBn5ghk=";
-        };
-
-        disabledTests = [
-          "test_default"
-          "test_large_numpy_array"
-          "test_numpy"
-        ];
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication rec {
   pname = "tahoe-lafs";
-  version = "unstable-2021-07-09";
+  version = "1.20.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
     repo = "tahoe-lafs";
-    rev = "8e28a9d0e02fde2388aca549da2b5c452ac4337f";
+    tag = "tahoe-lafs-${version}";
-    sha256 = "sha256-MuD/ZY+die7RCsuVdcePSD0DdwatXRi7CxW2iFt22L0=";
+    hash = "sha256-9qaL4GmdjClviKTnwAxaTywvJChQ5cVVgWs1IkFxhIY=";
   };
 
   outputs = [
@@ -55,86 +24,65 @@ python3Packages.buildPythonApplication rec {
     "info"
   ];
 
-  postPatch = ''
-    sed -i "src/allmydata/util/iputil.py" \
-        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
-
-    # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
-    # that.
-    for i in $(find src/allmydata/test -type f)
-    do
-      sed -i "$i" -e"s/localhost/127.0.0.1/g"
-    done
-
-    sed -i 's/"zope.interface.*"/"zope.interface"/' src/allmydata/_auto_deps.py
-    sed -i 's/"pycrypto.*"/"pycrypto"/' src/allmydata/_auto_deps.py
-
-    # incompatible with latest autobahn
-    rm src/allmydata/test/web/test_logs.py
-  '';
-
   # Remove broken and expensive tests.
   preConfigure = ''
     (
       cd src/allmydata/test
 
       # Buggy?
-      rm cli/test_create.py test_client.py
+      rm cli/test_create.py
 
       # These require Tor and I2P.
       rm test_connections.py test_iputil.py test_hung_server.py test_i2p_provider.py test_tor_provider.py
-
-      # Fails due to the above tests missing
-      rm test_python3.py
-
-      # Expensive
-      rm test_system.py
     )
   '';
 
+  build-system = with python3Packages; [
+    hatch-vcs
+    hatchling
+  ];
+
   nativeBuildInputs = with python3Packages; [
+    # docs
+    recommonmark
     sphinx
+    sphinx-rtd-theme
     texinfo
   ];
 
-  # The `backup' command requires `sqlite3'.
+  dependencies =
-  propagatedBuildInputs =
     with python3Packages;
     [
-      appdirs
+      attrs
-      beautifulsoup4
+      autobahn
-      characteristic
+      cbor2
+      click
+      collections-extended
+      cryptography
       distro
       eliot
-      fixtures
+      filelock
       foolscap
       future
-      html5lib
+      klein
       magic-wormhole
       netifaces
-      pyasn1
+      psutil
-      pycrypto
+      pycddl
+      pyopenssl
+      pyrsistent
       pyutil
       pyyaml
-      recommonmark
+      six
-      service-identity
-      simplejson
-      sphinx-rtd-theme
-      testtools
       treq
       twisted
+      werkzeug
       zfec
       zope-interface
     ]
     ++ twisted.optional-dependencies.tls
     ++ twisted.optional-dependencies.conch;
 
-  nativeCheckInputs = with python3Packages; [
-    mock
-    hypothesis
-    twisted
-  ];
-
   # Install the documentation.
   postInstall = ''
     (
@@ -150,11 +98,34 @@ python3Packages.buildPythonApplication rec {
     )
   '';
 
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      beautifulsoup4
+      fixtures
+      html5lib
+      hypothesis
+      mock
+      prometheus-client
+      testtools
+      twisted
+    ]
+    ++ [
+      versionCheckHook
+    ];
+  versionCheckProgram = "${placeholder "out"}/bin/tahoe";
+  versionCheckProgramArg = "--version";
+
   checkPhase = ''
+    runHook preCheck
+
+    runHook versionCheckHook
     trial --rterrors allmydata
+
+    runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tahoe-LAFS, a decentralized, fault-tolerant, distributed storage system";
     mainProgram = "tahoe";
     longDescription = ''
@@ -165,10 +136,10 @@ python3Packages.buildPythonApplication rec {
     '';
     homepage = "https://tahoe-lafs.org/";
     license = [
-      licenses.gpl2Plus # or
+      lib.licenses.gpl2Plus # or
       "TGPPLv1+"
     ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/to/top-git/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "topgit";
-  version = "0.19.13";
+  version = "0.19.14";
 
   src = fetchFromGitHub {
     owner = "mackyle";
     repo = "topgit";
     rev = "${pname}-${version}";
-    sha256 = "sha256-K0X1DGc1LQsoteUhoHLxVJRrZaaPLKSSF61OKyGB5Qg=";
+    sha256 = "sha256-FMrkoJwgBkFvi3tewtqu+b9sRuNPCNCG6BrcnAbx0sk=";
   };
 
   makeFlags = [ "prefix=${placeholder "out"}" ];

pkgs/by-name/vc/vcpkg/package.nix

@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2025.01.13";
+  version = "2025.02.14";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     rev = finalAttrs.version;
-    hash = "sha256-T4ihf3PC53Ch33E/MF5VR3DWKHty4PryInnkiQdHdGM=";
+    hash = "sha256-HmaP1WKl8s5eKAC32nTALFd4gbqKnzWnJn6L0/fFmqk=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

pkgs/by-name/wh/whitesur-cursors/package.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "whitesur-cursors";
-  version = "0-unstable-2022-06-17";
+  version = "0-unstable-2025-01-13";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "WhiteSur-cursors";
-    rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
+    rev = "c8759f13de18612051e7c1250946f54e49128b61";
-    hash = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
+    hash = "sha256-xzqX/Xa+SEJ6t5T6LMe4m0RBcwioX2B/DHUa6kigzm4=";
   };
 
   installPhase = ''

pkgs/by-name/x2/x265/package.nix

@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
     ]
     # Clang does not support the endfunc directive so use GCC.
     ++ lib.optional (
-      stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin
+      stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
     ) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc";
 
   cmakeStaticLibFlags =

pkgs/by-name/xa/xavs/package.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xavs";
     homepage = "https://xavs.sourceforge.net/";
     license = licenses.lgpl2;
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ codyopel ];
   };
 }

pkgs/development/compilers/llvm/default.nix

@@ -32,9 +32,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.0-rc3".officialRelease.sha256 = "sha256-mLSBoyq24FD+khynC6sC5IkDFqizgAn07lR9+ZRXlV0=";
     "21.0.0-git".gitRelease = {
-      rev = "4d928d5b5858de18f47f68c0d309dafd24cea875";
+      rev = "71f4c7dabec0f32b2d475e8e08f0da99628a067c";
-      rev-version = "21.0.0-unstable-2025-02-23";
+      rev-version = "21.0.0-unstable-2025-03-02";
-      sha256 = "sha256-wR/PuKdQhCVC0ONnJ/KUIcE6fUSkm0ZEeyhF4B9ZFA4=";
+      sha256 = "sha256-RNqQMVs0syNEXPNW6qOlvXGXYhZnN4s91Wc5vGcSuZM=";
     };
   } // llvmVersions;
 

pkgs/development/embedded/platformio/core.nix

@@ -12,7 +12,7 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "platformio";
-  version = "6.1.16";
+  version = "6.1.17";
   pyproject = true;
 
   # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964
@@ -20,7 +20,7 @@ buildPythonApplication rec {
     owner = "platformio";
     repo = "platformio-core";
     tag = "v${version}";
-    hash = "sha256-hZgbLUk2Krynut5uD6GMxWA+95y8ONNUmv4kaAltumk=";
+    hash = "sha256-OQEbEAVLS4DdbdBf4S9KS1RVHCC91vFtX6lz2u6Xouc=";
   };
 
   outputs = [

pkgs/development/embedded/platformio/use-local-spdx-license-list.patch

@@ -6,7 +6,7 @@ index 47efae59..6c2cfaed 100644
      @staticmethod
      @memoized(expire="1h")
      def load_spdx_licenses():
--        version = "3.24.0"
+-        version = "3.26.0"
 -        spdx_data_url = (
 -            "https://raw.githubusercontent.com/spdx/license-list-data/"
 -            f"v{version}/json/licenses.json"

pkgs/development/interpreters/erlang/27.nix

@@ -1,6 +1,6 @@
 { mkDerivation }:
 
 mkDerivation {
-  version = "27.2.4";
+  version = "27.3";
-  sha256 = "sha256-0Oj5rU3mUgeYlaHoiOknJz4JsAlQUk1dEgZzYB6xMl0=";
+  sha256 = "sha256-ZT+d2altco156Bsk/n+Nk9P6Npg0zQIO+nY+I7CGtrw=";
 }

pkgs/development/libraries/libdvdcss/default.nix

@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.videolan.org/developers/libdvdcss.html";
     description = "Library for decrypting DVDs";
     license = licenses.gpl2;
-    platforms = with platforms; linux ++ darwin;
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libdvdread/default.nix

@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Library for reading DVDs";
     license = lib.licenses.gpl2;
     maintainers = [ lib.maintainers.wmertens ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/development/libraries/opencv/4.x.nix

@@ -1,105 +1,113 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchurl
+  stdenv,
-, fetchFromGitHub
+  fetchurl,
-, cmake
+  fetchFromGitHub,
-, pkg-config
+  cmake,
-, unzip
+  pkg-config,
-, zlib
+  unzip,
-, pcre2
+  zlib,
-, hdf5
+  pcre2,
-, boost
+  hdf5,
-, glib
+  boost,
-, glog
+  glib,
-, gflags
+  glog,
-, protobuf_29
+  gflags,
-, config
+  protobuf_29,
-, ocl-icd
+  config,
-, qimgv
+  ocl-icd,
-, opencv4
+  qimgv,
+  opencv4,
 
-, enableJPEG ? true
+  enableJPEG ? true,
-, libjpeg
+  libjpeg,
-, enablePNG ? true
+  enablePNG ? true,
-, libpng
+  libpng,
-, enableTIFF ? true
+  enableTIFF ? true,
-, libtiff
+  libtiff,
-, enableWebP ? true
+  enableWebP ? true,
-, libwebp
+  libwebp,
-, enableEXR ? !stdenv.hostPlatform.isDarwin
+  enableEXR ? !stdenv.hostPlatform.isDarwin,
-, openexr
+  openexr,
-, ilmbase
+  ilmbase,
-, enableJPEG2000 ? true
+  enableJPEG2000 ? true,
-, openjpeg
+  openjpeg,
-, enableEigen ? true
+  enableEigen ? true,
-, eigen
+  eigen,
-, enableBlas ? true
+  enableBlas ? true,
-, blas
+  blas,
-, enableVA ? !stdenv.hostPlatform.isDarwin
+  enableVA ? !stdenv.hostPlatform.isDarwin,
-, libva
+  libva,
-, enableContrib ? true
+  enableContrib ? true,
 
-, enableCuda ? config.cudaSupport
+  enableCuda ? config.cudaSupport,
-, enableCublas ? enableCuda
+  enableCublas ? enableCuda,
-, enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default
+  enableCudnn ? false, # NOTE: CUDNN has a large impact on closure size so we disable it by default
-, enableCufft ? enableCuda
+  enableCufft ? enableCuda,
-, cudaPackages
+  cudaPackages,
-, nvidia-optical-flow-sdk
+  nvidia-optical-flow-sdk,
 
-, enableLto ? true
+  enableLto ? true,
-, enableUnfree ? false
+  enableUnfree ? false,
-, enableIpp ? false
+  enableIpp ? false,
-, enablePython ? false
+  enablePython ? false,
-, pythonPackages
+  pythonPackages,
-, enableGtk2 ? false
+  enableGtk2 ? false,
-, gtk2
+  gtk2,
-, enableGtk3 ? false
+  enableGtk3 ? false,
-, gtk3
+  gtk3,
-, enableVtk ? false
+  enableVtk ? false,
-, vtk
+  vtk,
-, enableFfmpeg ? true
+  enableFfmpeg ? true,
-, ffmpeg
+  ffmpeg,
-, enableGStreamer ? true
+  enableGStreamer ? true,
-, elfutils
+  elfutils,
-, gst_all_1
+  gst_all_1,
-, orc
+  orc,
-, libunwind
+  libunwind,
-, zstd
+  zstd,
-, enableTesseract ? false
+  enableTesseract ? false,
-, tesseract
+  tesseract,
-, leptonica
+  leptonica,
-, enableTbb ? false
+  enableTbb ? false,
-, tbb
+  tbb,
-, enableOvis ? false
+  enableOvis ? false,
-, ogre
+  ogre,
-, enableGPhoto2 ? false
+  enableGPhoto2 ? false,
-, libgphoto2
+  libgphoto2,
-, enableDC1394 ? false
+  enableDC1394 ? false,
-, libdc1394
+  libdc1394,
-, enableDocs ? false
+  enableDocs ? false,
-, doxygen
+  doxygen,
-, graphviz-nox
+  graphviz-nox,
 
-, runAccuracyTests ? true
+  runAccuracyTests ? true,
-, runPerformanceTests ? false
+  runPerformanceTests ? false,
-# Modules to enable via BUILD_LIST to build a customized opencv.
+  # Modules to enable via BUILD_LIST to build a customized opencv.
-# An empty lists means this setting is omitted which matches upstreams default.
+  # An empty lists means this setting is omitted which matches upstreams default.
-, enabledModules ? [ ]
+  enabledModules ? [ ],
 
-, AVFoundation
+  AVFoundation,
-, Cocoa
+  Cocoa,
-, VideoDecodeAcceleration
+  VideoDecodeAcceleration,
-, CoreMedia
+  CoreMedia,
-, MediaToolbox
+  MediaToolbox,
-, Accelerate
+  Accelerate,
-, bzip2
+  bzip2,
-, callPackage
+  callPackage,
 }@inputs:
 
 let
   inherit (lib.attrsets) mapAttrsToList optionalAttrs;
   inherit (lib.lists) last optionals;
-  inherit (lib.strings) cmakeBool cmakeFeature cmakeOptionType concatStrings concatStringsSep optionalString;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    cmakeOptionType
+    concatStrings
+    concatStringsSep
+    optionalString
+    ;
   inherit (lib.trivial) flip;
 
   version = "4.11.0";
@@ -135,13 +143,18 @@ let
 
   # See opencv/3rdparty/ippicv/ippicv.cmake
   ippicv = {
-    src = fetchFromGitHub {
+    src =
-      owner = "opencv";
+      fetchFromGitHub {
-      repo = "opencv_3rdparty";
+        owner = "opencv";
-      rev = "7f55c0c26be418d494615afca15218566775c725";
+        repo = "opencv_3rdparty";
-      hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY=";
+        rev = "7f55c0c26be418d494615afca15218566775c725";
-    } + "/ippicv";
+        hash = "sha256-XbmS+FXUL8MAG7kawbDkb2XHG9R0DpPhiYhq/18eTnY=";
-    files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in
+      }
+      + "/ippicv";
+    files =
+      let
+        name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz";
+      in
       if effectiveStdenv.hostPlatform.system == "x86_64-linux" then
         { ${name "lnx_intel64"} = ""; }
       else if effectiveStdenv.hostPlatform.system == "i686-linux" then
@@ -233,15 +246,35 @@ let
   };
 
   # See opencv/cmake/OpenCVDownload.cmake
-  installExtraFiles = {dst, files, src, ...}: ''
+  installExtraFiles =
-    mkdir -p "${dst}"
+    {
-  '' + concatStrings (flip mapAttrsToList files (name: md5: ''
+      dst,
-    ln -s "${src}/${name}" "${dst}/${md5}-${name}"
+      files,
-  ''));
+      src,
-  installExtraFile = {dst, md5, name, src, ...}: ''
+      ...
-    mkdir -p "${dst}"
+    }:
-    ln -s "${src}" "${dst}/${md5}-${name}"
+    ''
-  '';
+      mkdir -p "${dst}"
+    ''
+    + concatStrings (
+      flip mapAttrsToList files (
+        name: md5: ''
+          ln -s "${src}/${name}" "${dst}/${md5}-${name}"
+        ''
+      )
+    );
+  installExtraFile =
+    {
+      dst,
+      md5,
+      name,
+      src,
+      ...
+    }:
+    ''
+      mkdir -p "${dst}"
+      ln -s "${src}" "${dst}/${md5}-${name}"
+    '';
 
   withOpenblas = (enableBlas && blas.provider.pname == "openblas");
   #multithreaded openblas conflicts with opencv multithreading, which manifest itself in hung tests
@@ -257,12 +290,14 @@ effectiveStdenv.mkDerivation {
   pname = "opencv";
   inherit version src;
 
-  outputs = [
+  outputs =
-    "out"
+    [
-    "cxxdev"
+      "out"
-  ] ++ optionals (runAccuracyTests || runPerformanceTests) [
+      "cxxdev"
-    "package_tests"
+    ]
-  ];
+    ++ optionals (runAccuracyTests || runPerformanceTests) [
+      "package_tests"
+    ];
   cudaPropagateToOutput = "cxxdev";
 
   postUnpack = optionalString buildContrib ''
@@ -270,11 +305,13 @@ effectiveStdenv.mkDerivation {
   '';
 
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
-  patches = [
+  patches =
-    ./cmake-don-t-use-OpenCVFindOpenEXR.patch
+    [
-  ] ++ optionals enableCuda [
+      ./cmake-don-t-use-OpenCVFindOpenEXR.patch
-    ./cuda_opt_flow.patch
+    ]
-  ];
+    ++ optionals enableCuda [
+      ./cuda_opt_flow.patch
+    ];
 
   # This prevents cmake from using libraries in impure paths (which
   # causes build failure on non NixOS)
@@ -283,129 +320,163 @@ effectiveStdenv.mkDerivation {
   '';
 
   preConfigure =
-    installExtraFile ade +
+    installExtraFile ade
-    optionalString enableIpp (installExtraFiles ippicv) + (
+    + optionalString enableIpp (installExtraFiles ippicv)
-      optionalString buildContrib ''
+    + (optionalString buildContrib ''
-        cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
+      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
 
-        ${installExtraFiles vgg}
+      ${installExtraFiles vgg}
-        ${installExtraFiles boostdesc}
+      ${installExtraFiles boostdesc}
-        ${installExtraFiles face}
+      ${installExtraFiles face}
-        ${installExtraFiles wechat_qrcode}
+      ${installExtraFiles wechat_qrcode}
-      ''
+    '');
-    );
 
   postConfigure = ''
     [ -e modules/core/version_string.inc ]
     echo '"(build info elided)"' > modules/core/version_string.inc
   '';
 
-  buildInputs = [
+  buildInputs =
-    boost
+    [
-    gflags
+      boost
-    glib
+      gflags
-    glog
+      glib
-    pcre2
+      glog
-    protobuf_29
+      pcre2
-    zlib
+      protobuf_29
-  ] ++ optionals enablePython [
+      zlib
-    pythonPackages.python
+    ]
-  ] ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
+    ++ optionals enablePython [
-    hdf5
+      pythonPackages.python
-  ] ++ optionals enableGtk2 [
+    ]
-    gtk2
+    ++ optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [
-  ] ++ optionals enableGtk3 [
+      hdf5
-    gtk3
+    ]
-  ] ++ optionals enableVtk [
+    ++ optionals enableGtk2 [
-    vtk
+      gtk2
-  ] ++ optionals enableJPEG [
+    ]
-    libjpeg
+    ++ optionals enableGtk3 [
-  ] ++ optionals enablePNG [
+      gtk3
-    libpng
+    ]
-  ] ++ optionals enableTIFF [
+    ++ optionals enableVtk [
-    libtiff
+      vtk
-  ] ++ optionals enableWebP [
+    ]
-    libwebp
+    ++ optionals enableJPEG [
-  ] ++ optionals enableEXR [
+      libjpeg
-    openexr
+    ]
-    ilmbase
+    ++ optionals enablePNG [
-  ] ++ optionals enableJPEG2000 [
+      libpng
-    openjpeg
+    ]
-  ] ++ optionals enableFfmpeg [
+    ++ optionals enableTIFF [
-    ffmpeg
+      libtiff
-  ] ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [
+    ]
-    bzip2
+    ++ optionals enableWebP [
-    VideoDecodeAcceleration
+      libwebp
-  ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
+    ]
-    elfutils
+    ++ optionals enableEXR [
-    gst_all_1.gst-plugins-base
+      openexr
-    gst_all_1.gst-plugins-good
+      ilmbase
-    gst_all_1.gstreamer
+    ]
-    libunwind
+    ++ optionals enableJPEG2000 [
-    orc
+      openjpeg
-    zstd
+    ]
-  ] ++ optionals enableOvis [
+    ++ optionals enableFfmpeg [
-    ogre
+      ffmpeg
-  ] ++ optionals enableGPhoto2 [
+    ]
-    libgphoto2
+    ++ optionals (enableFfmpeg && effectiveStdenv.hostPlatform.isDarwin) [
-  ] ++ optionals enableDC1394 [
+      bzip2
-    libdc1394
+      VideoDecodeAcceleration
-  ] ++ optionals enableEigen [
+    ]
-    eigen
+    ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [
-  ] ++ optionals enableVA [
+      elfutils
-    libva
+      gst_all_1.gst-plugins-base
-  ] ++ optionals enableBlas [
+      gst_all_1.gst-plugins-good
-    blas.provider
+      gst_all_1.gstreamer
-  ] ++ optionals enableTesseract [
+      libunwind
-    # There is seemingly no compile-time flag for Tesseract.  It's
+      orc
-    # simply enabled automatically if contrib is built, and it detects
+      zstd
-    # tesseract & leptonica.
+    ]
-    tesseract
+    ++ optionals enableOvis [
-    leptonica
+      ogre
-  ] ++ optionals enableTbb [
+    ]
-    tbb
+    ++ optionals enableGPhoto2 [
-  ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+      libgphoto2
-    bzip2
+    ]
-    AVFoundation
+    ++ optionals enableDC1394 [
-    Cocoa
+      libdc1394
-    VideoDecodeAcceleration
+    ]
-    CoreMedia
+    ++ optionals enableEigen [
-    MediaToolbox
+      eigen
-    Accelerate
+    ]
-  ] ++ optionals enableDocs [
+    ++ optionals enableVA [
-    doxygen
+      libva
-    graphviz-nox
+    ]
-  ] ++ optionals enableCuda [
+    ++ optionals enableBlas [
-    cudaPackages.cuda_cudart
+      blas.provider
-    cudaPackages.cuda_cccl # <thrust/*>
+    ]
-    cudaPackages.libnpp # npp.h
+    ++ optionals enableTesseract [
-    nvidia-optical-flow-sdk
+      # There is seemingly no compile-time flag for Tesseract.  It's
-  ] ++ optionals enableCublas [
+      # simply enabled automatically if contrib is built, and it detects
-    # May start using the default $out instead once
+      # tesseract & leptonica.
-    # https://github.com/NixOS/nixpkgs/issues/271792
+      tesseract
-    # has been addressed
+      leptonica
-    cudaPackages.libcublas # cublas_v2.h
+    ]
-  ] ++ optionals enableCudnn [
+    ++ optionals enableTbb [
-    cudaPackages.cudnn # cudnn.h
+      tbb
-  ] ++ optionals enableCufft [
+    ]
-    cudaPackages.libcufft # cufft.h
+    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-  ];
+      bzip2
+      AVFoundation
+      Cocoa
+      VideoDecodeAcceleration
+      CoreMedia
+      MediaToolbox
+      Accelerate
+    ]
+    ++ optionals enableDocs [
+      doxygen
+      graphviz-nox
+    ]
+    ++ optionals enableCuda [
+      cudaPackages.cuda_cudart
+      cudaPackages.cuda_cccl # <thrust/*>
+      cudaPackages.libnpp # npp.h
+      nvidia-optical-flow-sdk
+    ]
+    ++ optionals enableCublas [
+      # May start using the default $out instead once
+      # https://github.com/NixOS/nixpkgs/issues/271792
+      # has been addressed
+      cudaPackages.libcublas # cublas_v2.h
+    ]
+    ++ optionals enableCudnn [
+      cudaPackages.cudnn # cudnn.h
+    ]
+    ++ optionals enableCufft [
+      cudaPackages.libcufft # cufft.h
+    ];
 
   propagatedBuildInputs = optionals enablePython [ pythonPackages.numpy ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs =
-    cmake
+    [
-    pkg-config
+      cmake
-    unzip
+      pkg-config
-  ] ++ optionals enablePython ([
+      unzip
-    pythonPackages.pip
+    ]
-    pythonPackages.wheel
+    ++ optionals enablePython (
-    pythonPackages.setuptools
+      [
-  ] ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
+        pythonPackages.pip
-    pythonPackages.pythonImportsCheckHook
+        pythonPackages.wheel
-  ]) ++ optionals enableCuda [
+        pythonPackages.setuptools
-    cudaPackages.cuda_nvcc
+      ]
-  ];
+      ++ optionals (effectiveStdenv.hostPlatform == effectiveStdenv.buildPlatform) [
+        pythonPackages.pythonImportsCheckHook
+      ]
+    )
+    ++ optionals enableCuda [
+      cudaPackages.cuda_nvcc
+    ];
 
   env.NIX_CFLAGS_COMPILE = optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
 
@@ -413,78 +484,86 @@ effectiveStdenv.mkDerivation {
   OpenBLAS_HOME = optionalString withOpenblas openblas_.dev;
   OpenBLAS = optionalString withOpenblas openblas_;
 
-  cmakeFlags = [
+  cmakeFlags =
-    (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
+    [
-    (cmakeBool "WITH_OPENMP" true)
+      (cmakeBool "OPENCV_GENERATE_PKGCONFIG" true)
-    (cmakeBool "BUILD_PROTOBUF" false)
+      (cmakeBool "WITH_OPENMP" true)
-    (cmakeBool "PROTOBUF_UPDATE_FILES" true)
+      (cmakeBool "BUILD_PROTOBUF" false)
-    (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
+      (cmakeBool "PROTOBUF_UPDATE_FILES" true)
-    (cmakeBool "BUILD_TESTS" runAccuracyTests)
+      (cmakeBool "OPENCV_ENABLE_NONFREE" enableUnfree)
-    (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
+      (cmakeBool "BUILD_TESTS" runAccuracyTests)
-    (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
+      (cmakeBool "BUILD_PERF_TESTS" runPerformanceTests)
-    (cmakeBool "BUILD_DOCS" enableDocs)
+      (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-    # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
+      (cmakeBool "BUILD_DOCS" enableDocs)
-    # but we have proper separation of build and host libs :), fixes cross
+      # "OpenCV disables pkg-config to avoid using of host libraries. Consider using PKG_CONFIG_LIBDIR to specify target SYSROOT"
-    (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
+      # but we have proper separation of build and host libs :), fixes cross
-    (cmakeBool "WITH_IPP" enableIpp)
+      (cmakeBool "OPENCV_ENABLE_PKG_CONFIG" true)
-    (cmakeBool "WITH_TIFF" enableTIFF)
+      (cmakeBool "WITH_IPP" enableIpp)
-    (cmakeBool "WITH_WEBP" enableWebP)
+      (cmakeBool "WITH_TIFF" enableTIFF)
-    (cmakeBool "WITH_JPEG" enableJPEG)
+      (cmakeBool "WITH_WEBP" enableWebP)
-    (cmakeBool "WITH_PNG" enablePNG)
+      (cmakeBool "WITH_JPEG" enableJPEG)
-    (cmakeBool "WITH_OPENEXR" enableEXR)
+      (cmakeBool "WITH_PNG" enablePNG)
-    (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
+      (cmakeBool "WITH_OPENEXR" enableEXR)
-    (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
+      (cmakeBool "WITH_OPENJPEG" enableJPEG2000)
-    (cmakeBool "WITH_TBB" enableTbb)
+      (cmakeBool "WITH_JASPER" false) # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled
+      (cmakeBool "WITH_TBB" enableTbb)
 
-    # CUDA options
+      # CUDA options
-    (cmakeBool "WITH_CUDA" enableCuda)
+      (cmakeBool "WITH_CUDA" enableCuda)
-    (cmakeBool "WITH_CUBLAS" enableCublas)
+      (cmakeBool "WITH_CUBLAS" enableCublas)
-    (cmakeBool "WITH_CUDNN" enableCudnn)
+      (cmakeBool "WITH_CUDNN" enableCudnn)
-    (cmakeBool "WITH_CUFFT" enableCufft)
+      (cmakeBool "WITH_CUFFT" enableCufft)
 
-    # LTO options
+      # LTO options
-    (cmakeBool "ENABLE_LTO" enableLto)
+      (cmakeBool "ENABLE_LTO" enableLto)
-    (cmakeBool "ENABLE_THIN_LTO" (
+      (cmakeBool "ENABLE_THIN_LTO" (
-      enableLto && (
+        enableLto
-        # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
+        && (
-        effectiveStdenv.cc.isClang ||
+          # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
-          # or through the backend effectiveStdenv.
+          effectiveStdenv.cc.isClang
-          (enableCuda && effectiveStdenv.cc.isClang)
+          ||
-      )
+            # or through the backend effectiveStdenv.
-    ))
+            (enableCuda && effectiveStdenv.cc.isClang)
-  ] ++ optionals enableCuda [
+        )
-    (cmakeBool "CUDA_FAST_MATH" true)
+      ))
-    (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
+    ]
+    ++ optionals enableCuda [
+      (cmakeBool "CUDA_FAST_MATH" true)
+      (cmakeFeature "CUDA_NVCC_FLAGS" "--expt-relaxed-constexpr")
 
-    # OpenCV respects at least three variables:
+      # OpenCV respects at least three variables:
-    # -DCUDA_GENERATION takes a single arch name, e.g. Volta
+      # -DCUDA_GENERATION takes a single arch name, e.g. Volta
-    # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
+      # -DCUDA_ARCH_BIN takes a semi-colon separated list of real arches, e.g. "8.0;8.6"
-    # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
+      # -DCUDA_ARCH_PTX takes the virtual arch, e.g. "8.6"
-    (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
+      (cmakeFeature "CUDA_ARCH_BIN" cmakeCudaArchitecturesString)
-    (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
+      (cmakeFeature "CUDA_ARCH_PTX" (last cudaCapabilities))
 
-    (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
+      (cmakeOptionType "path" "NVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH" nvidia-optical-flow-sdk.outPath)
-  ] ++ optionals effectiveStdenv.hostPlatform.isDarwin [
+    ]
-    (cmakeBool "WITH_OPENCL" false)
+    ++ optionals effectiveStdenv.hostPlatform.isDarwin [
-    (cmakeBool "WITH_LAPACK" false)
+      (cmakeBool "WITH_OPENCL" false)
+      (cmakeBool "WITH_LAPACK" false)
 
-    # Disable unnecessary vendoring that's enabled by default only for Darwin.
+      # Disable unnecessary vendoring that's enabled by default only for Darwin.
-    # Note that the opencvFlag feature flags listed above still take
+      # Note that the opencvFlag feature flags listed above still take
-    # precedence, so we can safely list everything here.
+      # precedence, so we can safely list everything here.
-    (cmakeBool "BUILD_ZLIB" false)
+      (cmakeBool "BUILD_ZLIB" false)
-    (cmakeBool "BUILD_TIFF" false)
+      (cmakeBool "BUILD_TIFF" false)
-    (cmakeBool "BUILD_OPENJPEG" false)
+      (cmakeBool "BUILD_OPENJPEG" false)
-    (cmakeBool "BUILD_JASPER" false)
+      (cmakeBool "BUILD_JASPER" false)
-    (cmakeBool "BUILD_JPEG" false)
+      (cmakeBool "BUILD_JPEG" false)
-    (cmakeBool "BUILD_PNG" false)
+      (cmakeBool "BUILD_PNG" false)
-    (cmakeBool "BUILD_WEBP" false)
+      (cmakeBool "BUILD_WEBP" false)
-  ] ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
+    ]
-    (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
+    ++ optionals (!effectiveStdenv.hostPlatform.isDarwin) [
-  ] ++ optionals enablePython [
+      (cmakeOptionType "path" "OPENCL_LIBRARY" "${ocl-icd}/lib/libOpenCL.so")
-    (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
+    ]
-  ] ++ optionals (enabledModules != [ ]) [
+    ++ optionals enablePython [
-    (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
+      (cmakeOptionType "path" "OPENCV_PYTHON_INSTALL_PATH" pythonPackages.python.sitePackages)
-  ];
+    ]
+    ++ optionals (enabledModules != [ ]) [
+      (cmakeFeature "BUILD_LIST" (concatStringsSep "," enabledModules))
+    ];
 
   postBuild = optionalString enableDocs ''
     make doxygen
@@ -494,9 +573,11 @@ effectiveStdenv.mkDerivation {
     optionalString (runAccuracyTests || runPerformanceTests) ''
       mkdir $package_tests
       cp -R $src/samples $package_tests/
-    '' + optionalString runAccuracyTests ''
+    ''
+    + optionalString runAccuracyTests ''
       mv ./bin/*test* $package_tests/
-    '' + optionalString runPerformanceTests ''
+    ''
+    + optionalString runPerformanceTests ''
       mv ./bin/*perf* $package_tests/
     '';
 
@@ -512,62 +593,74 @@ effectiveStdenv.mkDerivation {
   # Note that ${exec_prefix} is set to $out but that $out is also appended to
   # ${exec_prefix}. This causes linker errors in downstream packages so we strip
   # of $out after the ${exec_prefix} and ${prefix} prefixes:
-  postInstall = ''
+  postInstall =
-    sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
+    ''
-      "$out/lib/pkgconfig/opencv4.pc"
+      sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
-    mkdir "$cxxdev"
+        "$out/lib/pkgconfig/opencv4.pc"
-  ''
+      mkdir "$cxxdev"
-  # fix deps not propagating from opencv4.cxxdev if cuda is disabled
+    ''
-  # see https://github.com/NixOS/nixpkgs/issues/276691
+    # fix deps not propagating from opencv4.cxxdev if cuda is disabled
-  + optionalString (!enableCuda) ''
+    # see https://github.com/NixOS/nixpkgs/issues/276691
-    mkdir -p "$cxxdev/nix-support"
+    + optionalString (!enableCuda) ''
-    echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
+      mkdir -p "$cxxdev/nix-support"
-  ''
+      echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
-  # remove the requirement that the exact same version of CUDA is used in packages
+    ''
-  # consuming OpenCV's CMakes files
+    # remove the requirement that the exact same version of CUDA is used in packages
-  + optionalString enableCuda ''
+    # consuming OpenCV's CMakes files
-    substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
+    + optionalString enableCuda ''
-      --replace-fail \
+      substituteInPlace "$out/lib/cmake/opencv4/OpenCVConfig.cmake" \
-        'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
+        --replace-fail \
-        'find_host_package(CUDA REQUIRED)' \
+          'find_host_package(CUDA ''${OpenCV_CUDA_VERSION} EXACT REQUIRED)' \
-      --replace-fail \
+          'find_host_package(CUDA REQUIRED)' \
-        'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
+        --replace-fail \
-        'message("OpenCV static library was compiled with CUDA'
+          'message(FATAL_ERROR "OpenCV static library was compiled with CUDA' \
-  ''
+          'message("OpenCV static library was compiled with CUDA'
-  # install python distribution information, so other packages can `import opencv`
+    ''
-  + optionalString enablePython ''
+    # install python distribution information, so other packages can `import opencv`
-    pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
+    + optionalString enablePython ''
-    python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
+      pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
+      python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
 
-    pushd dist
+      pushd dist
-    python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
+      python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
 
-    popd
+      popd
-    popd
+      popd
-  '';
+    '';
 
-  pythonImportsCheck = [ "cv2" "cv2.sfm" ];
+  pythonImportsCheck = [
+    "cv2"
+    "cv2.sfm"
+  ];
 
   passthru = {
     cudaSupport = enableCuda;
 
-    tests = {
+    tests =
-      inherit (gst_all_1) gst-plugins-bad;
+      {
-    }
+        inherit (gst_all_1) gst-plugins-bad;
-    // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
+      }
-      inherit qimgv;
+      // optionalAttrs (!effectiveStdenv.hostPlatform.isDarwin) {
-      withIpp = opencv4.override { enableIpp = true; };
+        inherit qimgv;
-    }
+        withIpp = opencv4.override { enableIpp = true; };
-    // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
+      }
-    // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
+      // optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
-      opencv4-tests = callPackage ./tests.nix {
+      // optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
-        inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc;
+        opencv4-tests = callPackage ./tests.nix {
-        inherit opencv4;
+          inherit
+            enableGStreamer
+            enableGtk2
+            enableGtk3
+            runAccuracyTests
+            runPerformanceTests
+            testDataSrc
+            ;
+          inherit opencv4;
+        };
+      }
+      // optionalAttrs (enableCuda) {
+        no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
       };
-    }
-    // optionalAttrs (enableCuda) {
-      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
-    };
   } // optionalAttrs enablePython { pythonPath = [ ]; };
 
   meta = {
@@ -575,6 +668,6 @@ effectiveStdenv.mkDerivation {
     homepage = "https://opencv.org/";
     license = if enableUnfree then lib.licenses.unfree else lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ basvandijk ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/development/libraries/science/math/openblas/default.nix

@@ -128,6 +128,14 @@ let
       DYNAMIC_ARCH = setDynamicArch true;
       USE_OPENMP = true;
     };
+
+    x86_64-freebsd = {
+      BINARY = 64;
+      TARGET = setTarget "ATHLON";
+      DYNAMIC_ARCH = setDynamicArch true;
+      NO_AVX512 = !enableAVX512;
+      USE_OPENMP = true;
+    };
   };
 in
 

pkgs/development/ocaml-modules/miou/default.nix

@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "miou";
-  version = "0.3.0";
+  version = "0.3.1";
 
   minimalOCamlVersion = "5.0.0";
 
   src = fetchurl {
     url = "https://github.com/robur-coop/miou/releases/download/v${version}/miou-${version}.tbz";
-    hash = "sha256-kjGAbm1glF427gYOXKSogb+HpgUQqK5fqL9F06FtC4Q=";
+    hash = "sha256-K3otUuwFmRVrbnxYYZDMmd2WTYQHmXY/byQHu4PjlHE=";
   };
 
   meta = {

pkgs/development/ocaml-modules/ocaml-version/default.nix

@@ -7,11 +7,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "3.7.2";
+  version = "3.7.3";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-fTbh4fAJkkQr8Az6Limt5i8/zQnxTZSrhbfK8i08da0=";
+    hash = "sha256-LVbB4RwjbRoXy/Mxmr16WJTyLnM08PzLot1HPKWXGt4=";
   };
 
   checkInputs = [ alcotest ];

pkgs/development/ocaml-modules/spdx_licenses/default.nix

@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "spdx_licenses";
-  version = "1.2.0";
+  version = "1.3.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/kit-ty-kate/spdx_licenses/releases/download/v${version}/spdx_licenses-${version}.tar.gz";
-    hash = "sha256-9ViB7PRDz70w3RJczapgn2tJx9wTWgAbdzos6r3J2r4=";
+    hash = "sha256-UkKAJ+MCCKr68p4sgTZ8/6NMJibWGCG6tQruMpMsjzA=";
   };
 
   meta = {

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

@@ -18,16 +18,16 @@
 
 buildPythonPackage rec {
   pname = "aiodiscover";
-  version = "2.2.0";
+  version = "2.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodiscover";
     tag = "v${version}";
-    hash = "sha256-A12YeNIm9Pv4zpzaejTk8VvLzKLHxZV2EzVpchLX1k8=";
+    hash = "sha256-dgmRgokHDw0ooxD8Ksxb8QKeAdUhYj/WO85EC57MeNg=";
   };
 
   build-system = [ poetry-core ];

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

@@ -12,21 +12,21 @@
 
 buildPythonPackage rec {
   pname = "aioecowitt";
-  version = "2024.2.2";
+  version = "2025.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
-    repo = pname;
+    repo = "aioecowitt";
     tag = version;
-    hash = "sha256-QfUawUtkNl2molropV8NSU7Kfm/D5/xuaPCjgm2TVOs=";
+    hash = "sha256-BAiRonfu3tFf5ZERbWO+MuEsefrOIaGxUExYx5fXZIM=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     meteocalc
   ];

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

@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "29.2.0";
+  version = "29.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-NK83VZBBMLBkQOb7Z4yVL6GImdNspgF9YIAy8HlktrA=";
+    hash = "sha256-Gv3uM3ZKxcU5BA8HfzHJqTEODM8sfcKbLGfk96yb8u4=";
   };
 
   build-system = [

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

@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.16.0";
+  version = "0.16.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-xnihwHtU39OQDk/DgUXkUy6/4GrlFLgjK2via7ELedU=";
+    hash = "sha256-AlmlZoqQxd4RE667rBYFzyAhFN9GJ0Rmk1lniDZKRnM=";
   };
 
   build-system = [ setuptools ];

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "4.7.3";
+  version = "4.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aiohue";
     tag = version;
-    hash = "sha256-uS6pyJOntjbGa9UU1g53nuzgfP6AKAzN4meHrZY6Uic=";
+    hash = "sha256-+vvdv8/rAoMdtH6XN9tq4zOLboTuz3CqruN2KkEMv+c=";
   };
 
   postPatch = ''

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

@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "12.4.2";
+  version = "13.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-QwO1Vi69rj4tCSSkp/j3vtdV6zpgkgM33waDw7ZjApw=";
+    hash = "sha256-Wh4kwyNi0ql0plymkE6XM54SQug9BRvXcI0oEMI2ajA=";
   };
 
   build-system = [ setuptools ];

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

@@ -0,0 +1,55 @@
+{
+  aiofiles,
+  aiohttp,
+  aioresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  lxml,
+  poetry-core,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  python-dateutil,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "aiowebdav2";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jpbede";
+    repo = "aiowebdav2";
+    tag = "v${version}";
+    hash = "sha256-421c/3UYq/xtv5Zm4j2dje1KH2HOvPrVlmfMA4NX4pA=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiofiles
+    aiohttp
+    lxml
+    python-dateutil
+    yarl
+  ];
+
+  pythonImportsCheck = [ "aiowebdav2" ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/jpbede/aiowebdav2/releases/tag/${src.tag}";
+    description = "Async Python 3 client for WebDAV";
+    homepage = "https://github.com/jpbede/aiowebdav2";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

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

@@ -9,16 +9,16 @@
 
 buildPythonPackage rec {
   pname = "aiowebostv";
-  version = "0.6.2";
+  version = "0.7.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "aiowebostv";
     tag = "v${version}";
-    hash = "sha256-H5ZhG69F5w1fZBepxqWGo29XnK3Tn6dgota64k2GJbw=";
+    hash = "sha256-ssoWWLGP+0WGGtvOB0Pr1LMzAOh3qK1PHA99D16azeI=";
   };
 
   build-system = [ setuptools ];
@@ -33,8 +33,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to interact with LG webOS based TV devices";
     homepage = "https://github.com/home-assistant-libs/aiowebostv";
-    changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/v${version}";
+    changelog = "https://github.com/home-assistant-libs/aiowebostv/releases/tag/${src.tag}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

pkgs/development/python-modules/arcam-fmj/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "arcam-fmj";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "elupus";
     repo = "arcam_fmj";
     tag = version;
-    hash = "sha256-G+TbZ95KiAunvzhpY6IRZy6xrBn4ceZwixZw37KB298=";
+    hash = "sha256-sNV2k3cbQe60Jpq1J2T6TQAz+NEyLXvS97//vXJ17TM=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/async-interrupt/default.nix

@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "async-interrupt";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,10 +20,10 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "async_interrupt";
     tag = "v${version}";
-    hash = "sha256-opV5h3aLDDpjlRZRZ9OnrPjUOf/i7g+B9T6msk8wtgI=";
+    hash = "sha256-M0ftyHstBP7+6M2b6yV33mSuO4B8QF3ixRvNJ/WeSEA=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Context manager to raise an exception when a future is done";
     homepage = "https://github.com/bdraco/async_interrupt";
-    changelog = "https://github.com/bdraco/async_interrupt/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/bdraco/async_interrupt/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -2,6 +2,7 @@
   lib,
   aioesphomeapi,
   bleak,
+  bleak-retry-connector,
   bluetooth-data-tools,
   buildPythonPackage,
   fetchFromGitHub,
@@ -12,21 +13,18 @@
   pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "bleak-esphome";
-  version = "2.7.1";
+  version = "2.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "bluetooth-devices";
     repo = "bleak-esphome";
     tag = "v${version}";
-    hash = "sha256-AZkSWBMyTl2NgqmhVG4sE/N1AQGd6x4CZVYMgRKxlOQ=";
+    hash = "sha256-KuaaZXABR/jbC9ZNbVOyrezUZzb6w7Tn7s3VuVuAtfI=";
   };
 
   build-system = [ poetry-core ];
@@ -34,6 +32,7 @@ buildPythonPackage rec {
   dependencies = [
     aioesphomeapi
     bleak
+    bleak-retry-connector
     bluetooth-data-tools
     habluetooth
     lru-dict

pkgs/development/python-modules/bleak-retry-connector/default.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   bleak,
   bluetooth-adapters,
   dbus-fast,
@@ -8,29 +7,25 @@
   fetchFromGitHub,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   pytest-asyncio,
   pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "bleak-retry-connector";
-  version = "3.8.1";
+  version = "3.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bleak-retry-connector";
     tag = "v${version}";
-    hash = "sha256-Vkmn+CKQm+i+MRx12U6AmDGUyhtagoXbpeC/uou311o=";
+    hash = "sha256-weZ44YhbCoDRByzta/tkl1maEuxewS+53jxFRDHK6so=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
-    async-timeout
     bleak
     bluetooth-adapters
     dbus-fast
@@ -42,13 +37,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # broken mocking
-    "test_establish_connection_can_cache_services_services_missing"
-    "test_establish_connection_with_dangerous_use_cached_services"
-    "test_establish_connection_without_dangerous_use_cached_services"
-  ];
-
   pythonImportsCheck = [ "bleak_retry_connector" ];
 
   meta = with lib; {

pkgs/development/python-modules/bluetooth-auto-recovery/default.nix

@@ -7,6 +7,8 @@
   fetchFromGitHub,
   poetry-core,
   pyric,
+  pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   usb-devices,
@@ -14,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-auto-recovery";
-  version = "1.4.2";
+  version = "1.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,14 +25,9 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-auto-recovery";
     tag = "v${version}";
-    hash = "sha256-JaFazXjbHohj4+rPkQA/SaBP0irHrre3vaCqz7T2bwE=";
+    hash = "sha256-Sm3VLgWttMVXH+s1m1ab8kE6dHPit0GY4FVAld5Yg88=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=bluetooth_auto_recovery --cov-report=term-missing:skip-covered" ""
-  '';
-
   build-system = [ poetry-core ];
 
   dependencies = [
@@ -41,7 +38,11 @@ buildPythonPackage rec {
     usb-devices
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "bluetooth_auto_recovery" ];
 

pkgs/development/python-modules/cached-ipaddress/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "cached-ipaddress";
-  version = "0.8.0";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "cached-ipaddress";
     tag = "v${version}";
-    hash = "sha256-VD5z9lKECglx77VYDUeI4iD6mbncSutSlavxY+f3OVo=";
+    hash = "sha256-ojPza3DeeAJgUO0OS1J5YXTtzNWqLUf6YiOG9hohc+A=";
   };
 
   build-system = [

pkgs/development/python-modules/collections-extended/default.nix

@@ -5,26 +5,29 @@
   hypothesis,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
-  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
   pname = "collections-extended";
   version = "2.0.2";
-  format = "pyproject";
+  pyproject = true;
-
-  # https://github.com/mlenzen/collections-extended/issues/198
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchFromGitHub {
     owner = "mlenzen";
-    repo = pname;
+    repo = "collections-extended";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-cK13+CQUELKSiLpG747+C+RB5b6luu0mWLLXTT+uGH4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  # shuffle's random option has been removed in python 3.11
+  postPatch = ''
+    substituteInPlace collections_extended/setlists.py \
+      --replace-fail \
+        "random_.shuffle(self._list, random=random)" \
+        "random_.shuffle(self._list)"
+  '';
+
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     hypothesis
@@ -33,10 +36,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "collections_extended" ];
 
-  meta = with lib; {
+  meta = {
     description = "Extra Python Collections - bags (multisets), setlists (unique list/indexed set), RangeMap and IndexedDict";
     homepage = "https://github.com/mlenzen/collections-extended";
-    license = licenses.asl20;
+    changelog = "https://github.com/mlenzen/collections-extended/releases/tag/v${version}";
-    maintainers = with maintainers; [ exarkun ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ exarkun ];
   };
 }

pkgs/development/python-modules/deebot-client/default.nix

@@ -7,8 +7,6 @@
   defusedxml,
   docker,
   fetchFromGitHub,
-  numpy,
-  pillow,
   pkg-config,
   pycountry,
   pytest-asyncio,
@@ -16,7 +14,6 @@
   pytestCheckHook,
   pythonOlder,
   rustPlatform,
-  svg-py,
   testfixtures,
   xz,
 }:
@@ -26,7 +23,7 @@ buildPythonPackage rec {
   version = "12.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
+  disabled = pythonOlder "3.13";
 
   src = fetchFromGitHub {
     owner = "DeebotUniverse";
@@ -45,13 +42,12 @@ buildPythonPackage rec {
     "defusedxml"
   ];
 
-  build-system = with rustPlatform; [
+  nativeBuildInputs = [
-    cargoSetupHook
+    pkg-config
-    maturinBuildHook
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
   ];
 
-  nativeBuildInputs = [ pkg-config ];
-
   buildInputs = [ xz ];
 
   dependencies = [
@@ -59,9 +55,6 @@ buildPythonPackage rec {
     aiomqtt
     cachetools
     defusedxml
-    numpy
-    pillow
-    svg-py
   ];
 
   nativeCheckInputs = [

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

@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   bleak,
-  construct,
   construct-typing,
   pytest-asyncio,
   pytestCheckHook,
@@ -26,7 +25,6 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
-    construct
     construct-typing
   ];
 

pkgs/development/python-modules/evohome-async/default.nix

@@ -1,45 +1,69 @@
 {
   lib,
+  aiofiles,
   aiohttp,
+  aioresponses,
+  aiozoneinfo,
+  asyncclick,
   buildPythonPackage,
-  click,
+  debugpy,
   fetchFromGitHub,
   hatchling,
+  pytest-asyncio,
+  pytest-freezer,
+  pytestCheckHook,
   pythonOlder,
+  pyyaml,
+  syrupy,
   voluptuous,
 }:
 
 buildPythonPackage rec {
   pname = "evohome-async";
-  version = "0.4.21";
+  version = "1.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "zxdavb";
     repo = "evohome-async";
     tag = version;
-    hash = "sha256-+tBqyg7E9wRC6oHq6Fv2vzIGtrHqZp8w/3x/xbacqWI=";
+    hash = "sha256-CpN0QAlUqCDy6hNkuNvbjQUee40BA0UqAleR+Omm9bA=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
-    click
+    aiozoneinfo
     voluptuous
   ];
 
-  # Project has no tests
+  optional-dependencies = {
-  doCheck = false;
+    cli = [
+      aiofiles
+      asyncclick
+      debugpy
+    ];
+  };
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-freezer
+    pytestCheckHook
+    pyyaml
+    syrupy
+  ] ++ optional-dependencies.cli;
 
   pythonImportsCheck = [ "evohomeasync2" ];
 
   meta = with lib; {
     description = "Python client for connecting to Honeywell's TCC RESTful API";
     homepage = "https://github.com/zxdavb/evohome-async";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/zxdavb/evohome-async/releases/tag/${version}";
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "evo-client";
   };

pkgs/development/python-modules/fnv-hash-fast/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "fnv-hash-fast";
-  version = "1.2.3";
+  version = "1.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "fnv-hash-fast";
     tag = "v${version}";
-    hash = "sha256-x1NiDHqXJb2tbsWBFS1xR+gM4LLpbCc6E8w1kTObSWA=";
+    hash = "sha256-u4DKOJcE/0bRZ+0kcdVoDx7e4HOA4VH8V0DzxQ/SZCo=";
   };
 
   build-system = [