Merge staging-next into staging

2026-03-05 00:23:59 +00:00
parent 00a88568f7 8bc4045c48
commit 40c05cb7c7
75 changed files with 849 additions and 541 deletions
@@ -36,19 +36,19 @@ Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types
  fetchFromGitHub,
 }:

-buildDartApplication rec {
+buildDartApplication (finalAttrs: {
  pname = "dart-sass";
  version = "1.62.1";

  src = fetchFromGitHub {
    owner = "sass";
    repo = "dart-sass";
-    tag = version;
+    tag = finalAttrs.version;
    hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
-}
+})
 ```

 ### Patching dependencies {#ssec-dart-applications-patching-dependencies}
@@ -102,14 +102,14 @@ The function `buildFlutterApplication` builds Flutter applications.

 See the [Dart documentation](#ssec-dart-applications) for more details on required files and arguments.

-`flutter` in Nixpkgs always points to `flutterPackages.stable`, which is the latest packaged version. To avoid unforeseen breakage during upgrade, packages in Nixpkgs should use a specific flutter version, such as `flutter319` and `flutter322`, instead of using `flutter` directly.
+`flutter` in Nixpkgs always points to `flutterPackages.stable`, which is the latest packaged version. To avoid unforeseen breakage during upgrade, packages in Nixpkgs should use a specific flutter version, such as `flutter335` and `flutter338`, instead of using `flutter` directly.

 ```nix
-{ flutter322, fetchFromGitHub }:
+{ flutter335, fetchFromGitHub }:

-flutter322.buildFlutterApplication {
+flutter335.buildFlutterApplication (finalAttrs: {
  pname = "firmware-updater";
-  version = "0-unstable-2023-04-30";
+  version = "0-unstable-2025-09-09";

  # To build for the Web, use the targetFlutterPlatform argument.
  # targetFlutterPlatform = "web";
@@ -117,13 +117,17 @@ flutter322.buildFlutterApplication {
  src = fetchFromGitHub {
    owner = "canonical";
    repo = "firmware-updater";
-    rev = "6e7dbdb64e344633ea62874b54ff3990bd3b8440";
-    hash = "sha256-s5mwtr5MSPqLMN+k851+pFIFFPa0N1hqz97ys050tFA=";
+    rev = "402e97254b9d63c8d962c46724995e377ff922c8";
+    hash = "sha256-nQn5mlgNj157h++67+mhez/F1ALz4yY+bxiGsi0/xX8=";
    fetchSubmodules = true;
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;
-}
+
+  sourceRoot = "${finalAttrs.src.name}/apps/firmware_updater";
+
+  gitHashes.fwupd = "sha256-l/+HrrJk1mE2Mrau+NmoQ7bu9qhHU6wX68+m++9Hjd4=";
+})
 ```

 ### Usage with nix-shell {#ssec-dart-flutter-nix-shell}
@@ -13134,6 +13134,12 @@
    githubId = 752510;
    name = "Martin Potier";
  };
+  jpteb = {
+    name = "Jan Philipp Tebernum";
+    github = "jpteb";
+    githubId = 13502853;
+    email = "jpteb@pm.me";
+  };
  jpts = {
    email = "james+nixpkgs@cleverley-prance.uk";
    github = "jpts";
@@ -13189,13 +13195,6 @@
    githubId = 1186444;
    name = "James Short";
  };
-  jsierles = {
-    email = "joshua@hey.com";
-    matrix = "@jsierles:matrix.org";
-    name = "Joshua Sierles";
-    github = "jsierles";
-    githubId = 82;
-  };
  jsimonetti = {
    email = "jeroen+nixpkgs@simonetti.nl";
    matrix = "@jeroen:simonetti.nl";
@@ -27919,12 +27918,6 @@
    githubId = 771193;
    name = "Matej Urbas";
  };
-  urlordjames = {
-    email = "urlordjames@gmail.com";
-    github = "urlordjames";
-    githubId = 32751441;
-    name = "urlordjames";
-  };
  ursi = {
    email = "masondeanm@aol.com";
    github = "ursi";
@@ -16,7 +16,7 @@ let
      (oldAttrs: {
        inherit (python3.pkgs.notebook) version;
        pname = "jupyter";
-        meta = oldAttrs.meta // {
+        meta = python3.pkgs.notebook.meta // {
          mainProgram = "jupyter";
        };
      });
@@ -16529,6 +16529,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  unclash-nvim = buildVimPlugin {
+    pname = "unclash.nvim";
+    version = "0-unstable-2026-01-28";
+    src = fetchFromGitHub {
+      owner = "madmaxieee";
+      repo = "unclash.nvim";
+      rev = "04f6aba5e2eea8b665cba88f21082e33a7cb6e59";
+      hash = "sha256-Rd+U0WtVCV2D0rsL8Sm5B4NRK2t4W5M7n/CH1I0w6s4=";
+    };
+    meta.homepage = "https://github.com/madmaxieee/unclash.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  undotree = buildVimPlugin {
    pname = "undotree";
    version = "0-unstable-2026-02-12";
@@ -10,13 +10,13 @@
 }:
 vimUtils.buildVimPlugin rec {
  pname = "codediff.nvim";
-  version = "2.33.0";
+  version = "2.41.1";

  src = fetchFromGitHub {
    owner = "esmuellert";
    repo = "codediff.nvim";
    tag = "v${version}";
-    hash = "sha256-bgWalQ1S0kcKAHU1vCDEHdvswhDziz10HARk/0zMN+Y=";
+    hash = "sha256-JOlBmzdKVfU7HLVXyCbxwrARLFAiW/p7xFMlafpIKCY=";
  };

  dependencies = [ vimPlugins.nui-nvim ];
@@ -1269,6 +1269,7 @@ https://github.com/kaarmu/typst.vim/,HEAD,
 https://github.com/J0schu/typstwatch.nvim/,HEAD,
 https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
 https://github.com/SirVer/ultisnips/,,
+https://github.com/madmaxieee/unclash.nvim/,HEAD,
 https://github.com/mbbill/undotree/,,
 https://github.com/chrisbra/unicode.vim/,,
 https://github.com/axkirillov/unified.nvim/,HEAD,
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2026-01-30";
+  version = "0-unstable-2026-02-27";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-psx-libretro";
-    rev = "d5e2d68065e644a5e807c14419411039c78731df";
-    hash = "sha256-MDTpYTOD1Zf1Smv+JQZARaeldYiTv2vA/buFC709ZpE=";
+    rev = "fe0b72c4b93e42a46cd062febd7de292d828248e";
+    hash = "sha256-2uR5zULgWuT0sUY1KZ//RPZaIOg2LlAqX+Z5QhnvLg0=";
  };

  extraBuildInputs = lib.optionals withHw [
@@ -823,7 +823,7 @@
    }
  },
  "ungoogled-chromium": {
-    "version": "145.0.7632.116",
+    "version": "145.0.7632.159",
    "deps": {
      "depot_tools": {
        "rev": "fb0b652edba70f5c4ac867f3beca9e535f905b4c",
@@ -835,16 +835,16 @@
        "hash": "sha256-SoXVnpCuNee80N4YdsTEHQd3jZNoHOwKVP6O8a67Ym0="
      },
      "ungoogled-patches": {
-        "rev": "145.0.7632.116-1",
-        "hash": "sha256-5rixK6Hp5Czz0I+UISyhi2hPgPhgt+f4JFqd8ERvCV0="
+        "rev": "145.0.7632.159-1",
+        "hash": "sha256-RrVYjqeP/0pko3LCQSe0uejENSdd4MFu4UQuwKYNS+k="
      },
      "npmHash": "sha256-13sgV/5BD7QvDLBAEmoLN5vongw+S5v5znvZcctxhWc="
    },
    "DEPS": {
      "src": {
        "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "7d28075c6a9ba147e6df449209001258bb82a122",
-        "hash": "sha256-ljqK297kBByDGHKwH+yz6XcLO7l0+GDIrR0Hznh6X8c=",
+        "rev": "838c69b2e5b8cd00a916e35097249bc20eb25a0a",
+        "hash": "sha256-lWw909vzUiAo0yzx3sZqEEWf9fpZkIxArP6G7+6ImXM=",
        "recompress": true
      },
      "src/third_party/clang-format/script": {
@@ -914,8 +914,8 @@
      },
      "src/third_party/angle": {
        "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "4c0ae3917d4feab6ae1c99d7b750a69cdf3cc96c",
-        "hash": "sha256-Gq2hzttb5x6DyzeU6bXxEZ9QpZgfGODhiUFCivqSjZ4="
+        "rev": "2d051d9cef02bca69a97749a995b138e3dec0e1f",
+        "hash": "sha256-m/9vp7BAhRvVVOyRT6jCoNKP5PbiAZlCpqUHvFu1byA="
      },
      "src/third_party/angle/third_party/glmark2/src": {
        "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -1079,8 +1079,8 @@
      },
      "src/third_party/devtools-frontend/src": {
        "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88",
-        "hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0="
+        "rev": "b1eec47965f0f0bed968133496c5c097fb41cc0e",
+        "hash": "sha256-Ol7VWhAxk95jQE8umtvZxhJNtYIQDNj9DHSoEWs765I="
      },
      "src/third_party/dom_distiller_js/dist": {
        "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1474,8 +1474,8 @@
      },
      "src/third_party/skia": {
        "url": "https://skia.googlesource.com/skia.git",
-        "rev": "2ab8add5be2c46eb6238f4c217f6d6dbc9bccd23",
-        "hash": "sha256-pxFlBc6nGkfWsvSYgy5WuNjTEA/BomYHCvT+1yC2bQg="
+        "rev": "fba326b8829e469ac02e5a68a0d36982ef1975bc",
+        "hash": "sha256-nh7zr1piXYNMyVcqswRqhepF89TF0rKASYM0QuJIof0="
      },
      "src/third_party/smhasher/src": {
        "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1639,8 +1639,8 @@
      },
      "src/v8": {
        "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ce21eb288e9b86bf6a294968a5113a2646d7b8dd",
-        "hash": "sha256-ayAzZOrJYOLqGunDs9t/x6HBUy32y+0ISjaGkEUK+hk="
+        "rev": "1e1e0c88c55414e3ab7f98629a0233d3dc77fca0",
+        "hash": "sha256-iIrMXGer1CBX4MxOi56fKdzohiyv4bGKKnKOE3GZC1Y="
      }
    }
  }
@@ -373,13 +373,13 @@
    "vendorHash": "sha256-dzgI9WOABHVv8bJ1p36RAty4/2UAqDHagVJFPdEAnRU="
  },
  "equinix_equinix": {
-    "hash": "sha256-F9WKIO8msltYTmxVjbF5FXkUX1jLK91zecOIq6xrGqY=",
+    "hash": "sha256-92GuIkgzCbH3A/oRsjblE7Efk95FBjEaTaIBBm2BZdg=",
    "homepage": "https://registry.terraform.io/providers/equinix/equinix",
    "owner": "equinix",
    "repo": "terraform-provider-equinix",
-    "rev": "v4.12.1",
+    "rev": "v4.13.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q="
+    "vendorHash": "sha256-WFlKj1IO9ylXn5frdnLcctQawjUXBTqcoMhQUQTU06A="
  },
  "exoscale_exoscale": {
    "hash": "sha256-qjevix8bIRY3MKLlTZK/uUHS8nmKgjPk/rgqNWRdKes=",
@@ -14,123 +14,137 @@
  yq,
 }:

-{
-  src,
-  sourceRoot ? "source",
-  packageRoot ? (lib.removePrefix "/" (lib.removePrefix "source" sourceRoot)),
-  gitHashes ? { },
-  sdkSourceBuilders ? { },
-  customSourceBuilders ? { },
+lib.extendMkDerivation {
+  constructDrv = stdenv.mkDerivation;

-  sdkSetupScript ? "",
-  extraPackageConfigSetup ? "",
+  excludeDrvArgNames = [
+    "gitHashes"
+    "sdkSourceBuilders"
+    "pubspecLock"
+    "customSourceBuilders"
+  ];

-  # Output type to produce. Can be any kind supported by dart
-  # https://dart.dev/tools/dart-compile#types-of-output
-  # If using jit, you might want to pass some arguments to `dartJitFlags`
-  dartOutputType ? "exe",
-  dartCompileCommand ? "dart compile",
-  dartCompileFlags ? [ ],
-  # These come at the end of the command, useful to pass flags to the jit run
-  dartJitFlags ? [ ],
-
-  # Attrset of entry point files to build and install.
-  # Where key is the final binary path and value is the source file path
-  # e.g. { "bin/foo" = "bin/main.dart";  }
-  # Set to null to read executables from pubspec.yaml
-  dartEntryPoints ? null,
-  # Used when wrapping aot, jit, kernel, and js builds.
-  # Set to null to disable wrapping.
-  dartRuntimeCommand ?
-    if dartOutputType == "aot-snapshot" then
-      "${dart}/bin/dartaotruntime"
-    else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then
-      "${dart}/bin/dart"
-    else if dartOutputType == "js" then
-      "${nodejs}/bin/node"
-    else
-      null,
-
-  runtimeDependencies ? [ ],
-  extraWrapProgramArgs ? "",
-
-  autoPubspecLock ? null,
-  pubspecLock ?
-    if autoPubspecLock == null then
-      throw "The pubspecLock argument is required. If import-from-derivation is allowed (it isn't in Nixpkgs), you can set autoPubspecLock to the path to a pubspec.lock instead."
-    else
-      assert lib.assertMsg (builtins.pathExists autoPubspecLock)
-        "The pubspec.lock file could not be found!";
-      lib.importJSON (
-        runCommand "${lib.getName args}-pubspec-lock-json" {
-          nativeBuildInputs = [ yq ];
-        } ''yq . '${autoPubspecLock}' > "$out"''
-      ),
-  ...
-}@args:
-
-let
-  generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };
-
-  pubspecLockFile = builtins.toJSON pubspecLock;
-  pubspecLockData = pub2nix.readPubspecLock {
-    inherit
-      src
-      packageRoot
-      pubspecLock
-      gitHashes
-      customSourceBuilders
-      ;
-    sdkSourceBuilders = {
-      # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80
-      "dart" =
-        name:
-        runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''
-          for path in '${dart}/pkg/${name}'; do
-            if [ -d "$path" ]; then
-              ln -s "$path" "$out"
-              break
-            fi
-          done
-
-          if [ ! -e "$out" ]; then
-            echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'
-            exit 1
-          fi
-        '';
-    }
-    // sdkSourceBuilders;
-  };
-  packageConfig = generators.linkPackageConfig {
-    inherit pubspecLock;
-    packageConfig = pub2nix.generatePackageConfig {
-      pname = if args.pname != null then "${args.pname}-${args.version}" else null;
-
-      dependencies =
-        # Ideally, we'd only include the main dependencies and their transitive
-        # dependencies.
-        #
-        # The pubspec.lock file does not contain information about where
-        # transitive dependencies come from, though, and it would be weird to
-        # include the transitive dependencies of dev and override dependencies
-        # without including the dev and override dependencies themselves.
-        builtins.concatLists (builtins.attrValues pubspecLockData.dependencies);
-
-      inherit (pubspecLockData) dependencySources;
-    };
-    extraSetupCommands = extraPackageConfigSetup;
-  };
-
-  inherit (dartHooks.override { inherit dart; })
-    dartConfigHook
-    dartBuildHook
-    dartInstallHook
-    dartFixupHook
-    ;
-
-  baseDerivation = stdenv.mkDerivation (
+  extendDrvArgs =
    finalAttrs:
-    (removeAttrs args [
+    args@{
+      src,
+      sourceRoot ? "source",
+      packageRoot ? (lib.removePrefix "/" (lib.removePrefix "source" sourceRoot)),
+      gitHashes ? { },
+      sdkSourceBuilders ? { },
+      customSourceBuilders ? { },
+
+      sdkSetupScript ? "",
+      extraPackageConfigSetup ? "",
+
+      # Output type to produce. Can be any kind supported by dart
+      # https://dart.dev/tools/dart-compile#types-of-output
+      # If using jit, you might want to pass some arguments to `dartJitFlags`
+      dartOutputType ? "exe",
+      dartCompileCommand ? "dart compile",
+      dartCompileFlags ? [ ],
+      # These come at the end of the command, useful to pass flags to the jit run
+      dartJitFlags ? [ ],
+
+      # Attrset of entry point files to build and install.
+      # Where key is the final binary path and value is the source file path
+      # e.g. { "bin/foo" = "bin/main.dart";  }
+      # Set to null to read executables from pubspec.yaml
+      dartEntryPoints ? null,
+      # Used when wrapping aot, jit, kernel, and js builds.
+      # Set to null to disable wrapping.
+      dartRuntimeCommand ?
+        if dartOutputType == "aot-snapshot" then
+          "${dart}/bin/dartaotruntime"
+        else if (dartOutputType == "jit-snapshot" || dartOutputType == "kernel") then
+          "${dart}/bin/dart"
+        else if dartOutputType == "js" then
+          "${nodejs}/bin/node"
+        else
+          null,
+
+      runtimeDependencies ? [ ],
+      extraWrapProgramArgs ? "",
+
+      autoPubspecLock ? null,
+      pubspecLock ?
+        if autoPubspecLock == null then
+          throw "The pubspecLock argument is required. If import-from-derivation is allowed (it isn't in Nixpkgs), you can set autoPubspecLock to the path to a pubspec.lock instead."
+        else
+          assert lib.assertMsg (builtins.pathExists autoPubspecLock)
+            "The pubspec.lock file could not be found!";
+          lib.importJSON (
+            runCommand "${lib.getName args}-pubspec-lock-json" {
+              nativeBuildInputs = [ yq ];
+            } ''yq . '${autoPubspecLock}' > "$out"''
+          ),
+      ...
+    }:
+    let
+      generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; };
+
+      pubspecLockFile = builtins.toJSON pubspecLock;
+      pubspecLockData = pub2nix.readPubspecLock {
+        inherit
+          src
+          packageRoot
+          pubspecLock
+          gitHashes
+          customSourceBuilders
+          ;
+        sdkSourceBuilders = {
+          # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80
+          "dart" =
+            name:
+            runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } ''
+              for path in '${dart}/pkg/${name}'; do
+                if [ -d "$path" ]; then
+                  ln -s "$path" "$out"
+                  break
+                fi
+              done
+
+              if[ ! -e "$out" ]; then
+                echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!'
+                exit 1
+              fi
+            '';
+        }
+        // sdkSourceBuilders;
+      };
+      packageConfig = generators.linkPackageConfig {
+        inherit pubspecLock;
+        packageConfig = pub2nix.generatePackageConfig {
+          pname = if args.pname != null then "${args.pname}-${args.version}" else null;
+
+          dependencies =
+            # Ideally, we'd only include the main dependencies and their transitive
+            # dependencies.
+            #
+            # The pubspec.lock file does not contain information about where
+            # transitive dependencies come from, though, and it would be weird to
+            # include the transitive dependencies of dev and override dependencies
+            # without including the dev and override dependencies themselves.
+            builtins.concatLists (builtins.attrValues pubspecLockData.dependencies);
+
+          inherit (pubspecLockData) dependencySources;
+        };
+        extraSetupCommands = extraPackageConfigSetup;
+      };
+
+      inherit (dartHooks.override { inherit dart; })
+        dartConfigHook
+        dartBuildHook
+        dartInstallHook
+        dartFixupHook
+        ;
+
+    in
+    assert
+      !(builtins.isString dartOutputType && dartOutputType != "")
+      -> throw "dartOutputType must be a non-empty string";
+
+    (builtins.removeAttrs args [
      "gitHashes"
      "sdkSourceBuilders"
      "pubspecLock"
@@ -198,10 +212,5 @@ let
      meta = (args.meta or { }) // {
        platforms = args.meta.platforms or dart.meta.platforms;
      };
-    }
-  );
-in
-assert
-  !(builtins.isString dartOutputType && dartOutputType != "")
-  -> throw "dartOutputType must be a non-empty string";
-baseDerivation
+    };
+}
@@ -0,0 +1,41 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  libx11,
+  cairo,
+  lv2,
+  libsndfile,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bangr";
+  version = "1.6.2";
+
+  src = fetchFromGitHub {
+    owner = "sjaehn";
+    repo = "BAngr";
+    tag = finalAttrs.version;
+    fetchSubmodules = true;
+    sha256 = "sha256-tit0lF/LqHu3eAtkJj4lo3FfvArOy56JqjtxrzCLJdo=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    libx11
+    cairo
+    lv2
+    libsndfile
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/sjaehn/BAngr";
+    description = "Multi-dimensional dynamically distorted staggered multi-bandpass LV2 plugin";
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+  };
+})
@@ -21,13 +21,13 @@

 buildNpmPackage rec {
  pname = "bruno";
-  version = "3.1.3";
+  version = "3.1.4";

  src = fetchFromGitHub {
    owner = "usebruno";
    repo = "bruno";
    tag = "v${version}";
-    hash = "sha256-6YC4+gQDqo66mZjV4mVLPTdOaEUXxn+0PpZ0Gd8aeqU=";
+    hash = "sha256-BKrDJc0koOPHno+VOgfsUvvImJuKEkWdZvmCVffSRX8=";

    postFetch = ''
      ${lib.getExe npm-lockfile-fix} $out/package-lock.json
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  libx11,
+  cairo,
+  cpio,
+  lv2,
+  libsndfile,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bvibratr";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "sjaehn";
+    repo = "BVibratr";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    sha256 = "sha256-bm4RKyLPR5WL52wXJ8w4YUZ1t9WoqYAw5ApMASVmiAQ=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    libx11
+    cairo
+    cpio
+    lv2
+    libsndfile
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/sjaehn/BVibratr";
+    description = "Flavoured vibrato as an instrument LV2 plugin";
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+  };
+})
@@ -10,10 +10,10 @@

 let
  pname = "chatzone-desktop";
-  version = "5.5.0";
+  version = "5.6.0";
  src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.5.0/925/chatzone-desktop-linux-5.5.0.AppImage";
-    hash = "sha256-2Ly0qABTqleqH0AoAIJ+JNYFyoikxZroiFrYwSxBtdw=";
+    url = "https://ir.ozone.ru/s3/chatzone-clients/ci/5.6.0/1111/chatzone-desktop-linux-5.6.0.AppImage";
+    hash = "sha256-cMXdCXYUpgdmZntKS4YOLSJ84VVx7O83Kxa3jM+AWvI=";
  };
  appimageContents = appimageTools.extract { inherit pname version src; };
 in
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "cloudflare-dynamic-dns";
-  version = "4.4.1";
+  version = "4.4.2";

  src = fetchFromGitHub {
    owner = "zebradil";
    repo = "cloudflare-dynamic-dns";
    tag = finalAttrs.version;
-    hash = "sha256-G3msehvCZPm5WZTVCN0NnVEApZBQtqxJKCt0SFWb6xk=";
+    hash = "sha256-Ko69QXKQczt/H9Stl9Q0lUlhjfJ1SxoF1MGA2tO3UMg=";
  };

-  vendorHash = "sha256-Zdr6XTcblCi+YGhAgo0VqyN25jTGC5yA6YpQJXBCPGc=";
+  vendorHash = "sha256-rqp+K5pnslgfwpVxK/Ul3g1MGRKsWl8lpeMsS5Qqk10=";

  subPackages = ".";

@@ -1,7 +1,7 @@
 {
  lib,
+  stdenv,
  fetchFromGitHub,
-  fetchpatch2,
  gitMinimal,
  makeBinaryWrapper,
  installShellFiles,
@@ -11,50 +11,34 @@
  nixVersions,
  openssl,
  dbus,
+  protobuf,
+  sqlite,
  pkg-config,
  glibcLocalesUtf8,
+  boehmgc,
+  llvmPackages,
+  nixd,
+  bash,
  devenv, # required to run version test
 }:

 let
-  version = "1.11.2";
-  devenvNixVersion = "2.30.4";
+  version = "2.0.1";
+  devenvNixVersion = "2.32";
+  devenvNixRev = "7eb6c427c7a86fdc3ebf9e6cbf2a84e80e8974fd";

-  devenv_nix =
-    let
-      components = (
-        nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
-          owner = "cachix";
-          repo = "nix";
-          rev = "devenv-${devenvNixVersion}";
-          hash = "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=";
-        })
-      );
-    in
-    # Support for mdbook >= 0.5, https://github.com/NixOS/nix/issues/14628
-    (
-      (components.appendPatches [
-        (fetchpatch2 {
-          name = "nix-2.30-14695-mdbook-0.5-support.patch";
-          url = "https://github.com/NixOS/nix/commit/5cbd7856de0a9c13351f98e32a1e26d0854d87fd.patch";
-          excludes = [ "doc/manual/package.nix" ];
-          hash = "sha256-GYaTOG9wZT9UI4G6za535PkLyjHKSxwBjJsXbjmI26g=";
-        })
-      ]).overrideScope
+  nix_components =
+    (nixVersions.nixComponents_git.overrideSource (fetchFromGitHub {
+      owner = "cachix";
+      repo = "nix";
+      rev = devenvNixRev;
+      hash = "sha256-H26FQmOyvIGnedfAioparJQD8Oe+/byD6OpUpnI/hkE=";
+    })).overrideScope
      (
        finalScope: prevScope: {
          version = devenvNixVersion;
        }
-      )
-    ).nix-everything.overrideAttrs
-      (old: {
-        pname = "devenv-nix";
-        version = devenvNixVersion;
-        doCheck = false;
-        doInstallCheck = false;
-        # do override src, but the Nix way so the warning is unaware of it
-        __intentionallyOverridingVersion = true;
-      });
+      );
 in
 rustPlatform.buildRustPackage {
  pname = "devenv";
@@ -64,34 +48,61 @@ rustPlatform.buildRustPackage {
    owner = "cachix";
    repo = "devenv";
    tag = "v${version}";
-    hash = "sha256-8Ivbm9ltg0hUGQYMuRDOI8hbHUzqB9xKZ9ubKAzzwE8=";
+    hash = "sha256-cZRSu+XbZ2P91cKsjHBAc5uu6fblUyBVE1Cvk3ywPaM=";
  };

-  cargoHash = "sha256-mMmobDZeNqrByowwrDXojVnHeUyC/YbhERpF8iOCZ0s=";
+  cargoHash = "sha256-dzho5gZmfji4n+zHwr2uCqOijCFpVj9loYr8VQNil3g=";

-  buildAndTestSubdir = "devenv";
+  RUSTFLAGS = "--cfg tracing_unstable";
+  LIBSQLITE3_SYS_USE_PKG_CONFIG = "1";
+  VERGEN_IDEMPOTENT = "1";
+
+  cargoBuildFlags = [ "-p devenv -p devenv-run-tests" ];

  nativeBuildInputs = [
    installShellFiles
    makeBinaryWrapper
    pkg-config
+    protobuf
+    rustPlatform.bindgenHook
  ];

  buildInputs = [
    openssl
+    sqlite
    dbus
+    boehmgc
+    llvmPackages.clang-unwrapped
+    nix_components.nix-expr-c
+    nix_components.nix-store-c
+    nix_components.nix-util-c
+    nix_components.nix-flake-c
+    nix_components.nix-cmd-c
+    nix_components.nix-fetchers-c
+    nix_components.nix-main-c
  ];

  nativeCheckInputs = [
    gitMinimal
+    bash
  ];

  preCheck = ''
-    git init
+    # Initialize git repo for tests that use git-root-relative imports
+    pushd $NIX_BUILD_TOP/source
+    git init -b main
    git config user.email "test@example.com"
    git config user.name "Test User"
+    git add -A
+    popd
  '';

+  useNextest = true;
+  cargoTestFlags = [
+    "-p"
+    "devenv"
+  ];
+
  postInstall =
    let
      setDefaultLocaleArchive = lib.optionalString (glibcLocalesUtf8 != null) ''
@@ -100,16 +111,20 @@ rustPlatform.buildRustPackage {
    in
    ''
      wrapProgram $out/bin/devenv \
-        --prefix PATH ":" "$out/bin:${cachix}/bin" \
-        --set DEVENV_NIX ${devenv_nix} \
+        --prefix PATH ":" "$out/bin:${lib.getBin cachix}/bin:${lib.getBin nixd}/bin" \
+        ${setDefaultLocaleArchive}
+
+      wrapProgram $out/bin/devenv-run-tests \
+        --prefix PATH ":" "$out/bin:${lib.getBin cachix}/bin:${lib.getBin nixd}/bin" \
        ${setDefaultLocaleArchive}

      # Generate manpages
      cargo xtask generate-manpages --out-dir man
      installManPage man/*

-      # Generate shell completions
+      # Generate shell completions (devenv must be in PATH)
      compdir=./completions
+      export PATH="$out/bin:$PATH"
      for shell in bash fish zsh; do
        cargo xtask generate-shell-completion $shell --out-dir $compdir
      done
@@ -128,7 +143,7 @@ rustPlatform.buildRustPackage {
  };

  meta = {
-    changelog = "https://github.com/cachix/devenv/releases/tag/v${version}";
+    changelog = "https://github.com/cachix/devenv/releases";
    description = "Fast, Declarative, Reproducible, and Composable Developer Environments";
    homepage = "https://github.com/cachix/devenv";
    license = lib.licenses.asl20;
@@ -34,6 +34,6 @@ python3.pkgs.buildPythonApplication {
    description = "Set of interactive command line tools for Dungeons and Dragons 5th Edition";
    mainProgram = "dnd-tools";
    license = lib.licenses.agpl3Only;
-    maintainers = [ lib.maintainers.urlordjames ];
+    maintainers = [ ];
  };
 }
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/drogonframework/drogon";
    description = "C++14/17 based HTTP web application framework";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ urlordjames ];
+    maintainers = [ ];
    platforms = lib.platforms.all;
  };
 })
@@ -27,13 +27,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "en-croissant";
-  version = "0.14.1";
+  version = "0.14.2";

  src = fetchFromGitHub {
    owner = "franciscoBSalgueiro";
    repo = "en-croissant";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-S1ObsGpLxNzr0+bFEuPAe3PCHQc1k0QavgKD6YDffIc=";
+    hash = "sha256-iihAanR0kYkniO3NeWleYz3QyszeJKiJoFLHH+712d8=";
  };

  pnpmDeps = fetchPnpmDeps {
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      ;
    inherit pnpm;
    fetcherVersion = 3;
-    hash = "sha256-hkI1TQeOHKQdsnq1pYIeeU+GYFMIxbyNoZY5Wuxj4UU=";
+    hash = "sha256-Y452U+Y0deicZjOyoDiJqEICdFrWsg4LF8p4jSmPa84=";
  };

  postPatch = ''
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoRoot = "src-tauri";

-  cargoHash = "sha256-trQzf5x/sIxkEYQOQKAq1y2GrT3VoQ/ZWCFncb2dNvs=";
+  cargoHash = "sha256-5TDG5HT0zxu4UuGqfFGhw1HUkuu3gbBtiKKgU92TM8k=";

  buildAndTestSubdir = finalAttrs.cargoRoot;

@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "exploitdb";
-  version = "2026-02-12";
+  version = "2026-03-04";

  src = fetchFromGitLab {
    owner = "exploit-database";
    repo = "exploitdb";
    tag = finalAttrs.version;
-    hash = "sha256-K7C4NZmeKRpKT5yJH5rvq678sd4xSWnb5nUSZFqO+9I=";
+    hash = "sha256-vAIQnjdlBWAP7dFeFGkW7F48tCH3sj9Ew5tjfRcQCmo=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  zig,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  # fast-cli existed, was removed as noted in aliasses.nix on 2025-11-17. Consider to rename this package after 1 to 2 releases of nixos
+  pname = "fast-cli-zig";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "mikkelam";
+    repo = "fast-cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KKjxKQHiSYMaGCfX1+h6DQ809xHh9Yfv8B4PXvr3CwQ=";
+  };
+
+  zigDeps = zig.fetchDeps {
+    inherit (finalAttrs) src pname version;
+    hash = "sha256-89ig8lO5Yb9qFlJ1yL3NDDfKeZDl/CeM6qFxT40eOf8=";
+  };
+
+  nativeBuildInputs = [ zig.hook ];
+
+  postConfigure = ''
+    ln -s ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p"
+  '';
+
+  doCheck = true;
+  # Tests create a local http server to check the latency functionality
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Command line version of fast.com in ~1.2 MB";
+    homepage = "https://github.com/mikkelam/fast-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dwt ];
+    mainProgram = "fast-cli";
+    inherit (zig.meta) platforms;
+  };
+})
@@ -1,17 +0,0 @@
-    Fix gradle error
-    
-    https://docs.gradle.org/9.1.0/userguide/validation_problems.html#private_method_must_not_be_annotated
-
-diff --git a/build.gradle b/build.gradle
-index c6d537e..9029aae 100644
--- a/build.gradle
-+++ b/build.gradle
-@@ -69,7 +69,7 @@ public abstract class InstallPath extends DefaultTask {
-      * Install Task Action that copies the script and jar files
-      */
-     @TaskAction
-    private void install() {
-+    public void install() {
-         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-             final String install_path = (path != null && !path.isEmpty()) ? path : "C:\\Program Files\\fastddsgen\\";
- 
@@ -21,44 +21,69 @@
   "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=",
   "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU="
  },
-  "org/antlr#antlr4-master/4.13.0": {
-   "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8="
+  "org/antlr#antlr4-master/4.13.2": {
+   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
  },
-  "org/antlr#antlr4-runtime/4.13.0": {
-   "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=",
-   "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8="
+  "org/antlr#antlr4-runtime/4.13.2": {
+   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",
+   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
  },
-  "org/antlr#antlr4/4.13.0": {
-   "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=",
-   "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k="
+  "org/antlr#antlr4/4.13.2": {
+   "jar": "sha256-5vCxDSrSBvM4r+FoZ/xHFItnKdbjomDqKDebkfA6Nlc=",
+   "pom": "sha256-gJ7klwbc42dJiLq/ytNrPFoOL9XPoKUSCRA5Y+hXJhs="
  },
-  "org/apiguardian#apiguardian-api/1.1.0": {
-   "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=",
-   "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE="
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
  },
-  "org/junit/jupiter#junit-jupiter-api/5.5.2": {
-   "jar": "sha256-JJov29OTGYfAKY0AygjtJISW4PwR4EY8CMT4LgzHmxw=",
-   "pom": "sha256-dqFdgNhYehpaOlsULSzrNzBPvZEZi6QlSG5X920IiGA="
+  "org/junit#junit-bom/5.14.1": {
+   "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",
+   "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="
  },
-  "org/junit/jupiter#junit-jupiter-engine/5.5.2": {
-   "jar": "sha256-bXd9qYduLvegM26PCY+NdKWmT4EKo6Si9fO3Zs6Xg3s=",
-   "pom": "sha256-Ay/vTiVjCE05fq5IGjiAEPRDQBr2JSv9N312MH9vi/4="
+  "org/junit/jupiter#junit-jupiter-api/5.14.1": {
+   "jar": "sha256-FvFvDDwe+XrbgwSEGUZp7ZaDtDTObzj+OgG9KQaubFk=",
+   "module": "sha256-HqGu5CCahEG/xHY0pqTWaNN/EHLJwk1y4znUcSjmHaI=",
+   "pom": "sha256-l4D8P9mTDQcs9gyFmJl286lLgBStYZGLdQqMiPG3THM="
  },
-  "org/junit/platform#junit-platform-commons/1.5.2": {
-   "jar": "sha256-/ESv38DyDIXnGmbnlDKBrvO8Hg/WLS1po2y2kB5oLBA=",
-   "pom": "sha256-O9DU3tYyqK+MpYf7Z2QBnedxsda8uJrNViQ1oQCfqto="
+  "org/junit/jupiter#junit-jupiter-engine/5.14.1": {
+   "jar": "sha256-30SqGNBc7RP6aDbKIUwiTK8//95N8g6c5936+1ydAvg=",
+   "module": "sha256-5atm8Uf7UmGRL5hwCi+EbAUqGumalvqK25oF+JzuajE=",
+   "pom": "sha256-tEleIOlqHWjoGA7m2QCdJ8QujM8zUr2X3QGe87VZGxw="
  },
-  "org/junit/platform#junit-platform-engine/1.5.2": {
-   "jar": "sha256-/yC6StjADvF7rvnFVRL5wC2aaHQPfxrAGppqoCOZMfg=",
-   "pom": "sha256-LUuVVVwh4IXrwd299C156x1VZA3Bk7G35hACQP0vGJ8="
+  "org/junit/jupiter#junit-jupiter-params/5.14.1": {
+   "jar": "sha256-wHbjII28Ix0et+LZaVeMMUwWWPoaKcyPBEfIBPKTJ/o=",
+   "module": "sha256-/LLdLoK/0NxV5iKeEF6APkq0s7khNi7nbyMT0Lf2vUc=",
+   "pom": "sha256-UpQwRppD+ZAI/Em4+p8CjYa+aWvqubNt3rOqleGdBrY="
+  },
+  "org/junit/jupiter#junit-jupiter/5.14.1": {
+   "jar": "sha256-S7MGsRm8a4fIdNXOuqJajClWslSMsMakHop1a9HcYyc=",
+   "module": "sha256-aATtQZjfYJXpg3OSCieY4Xrh4JLqyLzHco1KjGuX3Ss=",
+   "pom": "sha256-JgudHCrOu1X3sOutbcSgD4JpT030o4DGgMLDt4clJmY="
+  },
+  "org/junit/platform#junit-platform-commons/1.14.1": {
+   "jar": "sha256-OaHyR6ujNGvgtORtuzwJAxwM/K0RHX2ZBHlbkX6MHHo=",
+   "module": "sha256-SuQSly6ZIp5QFsuYmrio5gGHRdA4kM7DfcBAr4f0dIA=",
+   "pom": "sha256-AFNyKBaiOCD49xkGajg8/6LbksfbUhEok8nEc790Bhg="
+  },
+  "org/junit/platform#junit-platform-engine/1.14.1": {
+   "jar": "sha256-qJMQ3WndmscDHbmZfcq5oUgVEvpUYHfkIZzvouKH68c=",
+   "module": "sha256-EyNTFL5HT0GAeK3pdyMBWxaR7uN25Ce+j4GfBUCV5CY=",
+   "pom": "sha256-REQYxkZ2Eo3MTsfMtmbIChg3cKXZ8eQ/gxD3kTwR3cA="
+  },
+  "org/junit/platform#junit-platform-launcher/1.14.1": {
+   "jar": "sha256-w6L9iZpsGZZGeIVFD4o5C/XKmaJGG1WJF+OjjXHqB7c=",
+   "module": "sha256-eI2j5KuAQTvLYylRt/cNtrhRrynQskIowFIcKue1cAI=",
+   "pom": "sha256-5AYKI9RxXTF6it+vKcZC1O+pgxhANROv0u7pklwAJYs="
  },
  "org/openjdk/nashorn#nashorn-core/15.4": {
   "jar": "sha256-b4FuhN/WOoHU6qeCnAgze7r/PsaD/zv2u9kNAXoA3G8=",
   "pom": "sha256-aan3ueR+zPR7vO5yGtT7A5yn2bZQF05thgKq23flrCM="
  },
-  "org/opentest4j#opentest4j/1.2.0": {
-   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
-   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
  },
  "org/ow2#ow2/1.5": {
   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
@@ -3,7 +3,6 @@
  stdenv,
  makeWrapper,
  fetchFromGitHub,
-  fetchpatch2,
  gradle,
  openjdk,
  testers,
@@ -11,37 +10,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fastddsgen";
-  version = "4.2.0";
+  version = "4.3.0";

  src = fetchFromGitHub {
    owner = "eProsima";
    repo = "Fast-DDS-Gen";
-    tag = "v${finalAttrs.version}";
+    # Version 4.3.0 has an extra .0 in the git tag.
+    # TODO Remove .0 for later releases if needed.
+    tag = "v${finalAttrs.version}.0";
    fetchSubmodules = true;
-    hash = "sha256-weGS340MvPitWMgWx1cWTgYgGcQfJSTUus8EcBob7hY=";
+    hash = "sha256-yh92JYJFJVp2/rDpz9eAUlNDhtRoRHgCIRYfrADfA/c=";
  };

-  patches = [
-    # Note: PR is not yet merged
-    # Select commit from https://github.com/eProsima/IDL-Parser/pull/179
-    (fetchpatch2 {
-      url = "https://github.com/eProsima/IDL-Parser/commit/801ed2f671322c0134b8db180529c9a400d5ed2b.patch";
-      stripLen = 1;
-      extraPrefix = "thirdparty/idl-parser/";
-      includes = [ "thirdparty/idl-parser/build.gradle" ];
-      hash = "sha256-OzywQ02yaMnya+536DeHWeKwZefI4meYqmZcp3onwR8=";
-    })
-
-    # Note: PR is not yet merged
-    # Select commit from https://github.com/eProsima/Fast-DDS-Gen/pull/493
-    (fetchpatch2 {
-      url = "https://github.com/eProsima/Fast-DDS-Gen/commit/b1b66d587f38d4fd6227aa1969c3a10c2095ae7d.patch";
-      hash = "sha256-qVp9Xk8og8Ga2BMiqt2BFM0lAtDnmmwzteceievfcXE=";
-    })
-
-    ./493-addendum.patch
-  ];
-
  nativeBuildInputs = [
    gradle
    openjdk
@@ -22,14 +22,14 @@ let
  media_kit_hash = "sha256-oJQ9sRQI4HpAIzoS995yfnzvx5ZzIubVANzbmxTt6LE=";
 in

-flutter.buildFlutterApplication rec {
+flutter.buildFlutterApplication (finalAttrs: {
  pname = "fladder";
  version = "0.10.1";

  src = fetchFromGitHub {
    owner = "DonutWare";
    repo = "Fladder";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-lmtEgBxCmEYcckhSAXhMPDzNQBluTyW0yjkt6Rr9byA=";
  };

@@ -107,4 +107,4 @@ flutter.buildFlutterApplication rec {
    ];
    mainProgram = "Fladder";
  };
-}
+})
@@ -93,7 +93,6 @@ buildGoModule rec {
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [
      adtya
-      jsierles
      techknowlogick
      RaghavSood
      SchahinRohani
@@ -3,6 +3,7 @@
  stdenv,
  fetchurl,
  replaceVars,
+  fetchFromGitHub,
  fetchDebianPatch,
  copyDesktopItems,
  pkg-config,
@@ -19,8 +20,16 @@
 }:

 let
-  wxwidgets_3_3' = wxwidgets_3_3.overrideAttrs (
+  wxwidgets_3_3_1 = wxwidgets_3_3.overrideAttrs (
    finalAttrs: previousAttrs: {
+      version = "3.3.1";
+      src = fetchFromGitHub {
+        owner = "wxWidgets";
+        repo = "wxWidgets";
+        tag = "v${finalAttrs.version}";
+        fetchSubmodules = true;
+        hash = "sha256-eYmZrh9lvDnJ3VAS+TllT21emtKBPAOhqIULw1dTPhk=";
+      };
      patches = [
        ./wxcolorhook.patch
      ];
@@ -78,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
    libidn2
    libssh2
    openssl
-    wxwidgets_3_3'
+    wxwidgets_3_3_1
  ];

  env.NIX_CFLAGS_COMPILE = toString [
@@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "gh-token";
-  version = "2.0.7";
+  version = "2.0.8";

  src = fetchFromGitHub {
    owner = "Link-";
    repo = "gh-token";
    rev = "v${version}";
-    hash = "sha256-ufpQQgXaL28lPPLotZZneJPWWAy80Jd6hNeKX81aa98=";
+    hash = "sha256-aoi5w2iryz8bbzt6ZQ9t7nR0Kh7mXdYbZBjpyoivEYw=";
  };

-  vendorHash = "sha256-gUPNHSeI8B5hwnIo7gwGo5aP4j7rzgveZIksyNe65jM=";
+  vendorHash = "sha256-brAFqWdvaJwURdWb9m8x21nhuXeRxIJX6FsUfGiFIWQ=";

  ldflags = [
    "-s"
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
  installPhase = ''
    runHook preInstall
    install -m755 -D hterm $out/bin/hterm
-    install -m644 -D desktop/hterm.png $out/share/pixmaps/hterm.png
+    install -m644 -D desktop/hterm.png -t $out/share/icons/hicolor/32x32/apps
    install -m644 -D desktop/hterm.desktop $out/share/applications/hterm.desktop
    runHook postInstall
  '';
@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jujutsu";
-  version = "0.38.0";
+  version = "0.39.0";

  src = fetchFromGitHub {
    owner = "jj-vcs";
    repo = "jj";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FXbQyKmh/CG/TsRi9yq9L8bVbQ39u6PRLZIet3d/bjA=";
+    hash = "sha256-rcmiBDDQaJYpESJt/gWkcitWtcvQosDY9pUbX5YpFjA=";
  };

-  cargoHash = "sha256-VvgGnAPCvcBmbP2Aw7tdJcjfo+011u4Pqx1pKiiWISA=";
+  cargoHash = "sha256-WqM9NJQIrbu+ynhh1pq9nXjoL30A56vIE2lHi7ZUQoc=";

  nativeBuildInputs = [
    installShellFiles
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "llmfit";
-  version = "0.4.3";
+  version = "0.6.1";

  src = fetchFromGitHub {
    owner = "AlexsJones";
    repo = "llmfit";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-m3JV7lF/YuxtPMsUvGNQd4VjLw4KFuBM5jQYjnC+2Hs=";
+    sha256 = "sha256-FtndcSIPQHoAOGhESKXqroFpuYvmGDoK/ns+W0DsHsk=";
  };

-  cargoHash = "sha256-Ue09DBvcqyvQDQ23yAUa6Fo56AWn5pxAl2XYiVLrUYI=";
+  cargoHash = "sha256-LJz4rxdDm8FD+8by8H0/AgkMc6zH5pqc3qC+rtmfBAU=";

  meta = {
    description = "Find what runs on your hardware";
@@ -51,6 +51,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
    description = "Intelligent and highly configurable media organization utility";
    mainProgram = "mnamer";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ urlordjames ];
+    maintainers = [ ];
  };
 })
@@ -10,13 +10,13 @@

 buildGoModule (finalAttrs: {
  pname = "moor";
-  version = "2.10.5";
+  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "walles";
    repo = "moor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ib1+lPxTKBqW/I+zP+G0VHWbVQiMdKZ03MWBzOVPK0c=";
+    hash = "sha256-sfeYr3lf9QvRb9TfVQSe1IU8/uX4ypw2CCQmyWMhPqw=";
  };

  vendorHash = "sha256-lz3cq2xL9byhLNbAwEvYOsP9WQsu0hqrWe2EDaLSeOQ=";
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "opencode";
-  version = "1.2.13";
+  version = "1.2.17";
  src = fetchFromGitHub {
    owner = "anomalyco";
    repo = "opencode";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Svup7XCVQuIb5Ye7fb90L7dy3VcDy1gBBrqZ5ikOOC4=";
+    hash = "sha256-4I243hvqQjPU09GsIyQu/3Cv+THKFf5QTbC3x0aO83Q=";
  };

  node_modules = stdenvNoCC.mkDerivation {
@@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    # NOTE: Required else we get errors that our fixed-output derivation references store paths
    dontFixup = true;

-    outputHash = "sha256-Diu/C8b5eKUn7MRTFBcN5qgJZTp0szg0ECkgEaQZ87Y=";
+    outputHash = "sha256-orNyesv8Y3vooV1upr+X1CKHUdygyDQ3hmyPVlHC6Zk=";
    outputHashAlgo = "sha256";
    outputHashMode = "recursive";
  };
@@ -1,45 +0,0 @@
-From 14311f18ae9427a0baa1e0cb67198580d9d2dc69 Mon Sep 17 00:00:00 2001
-From: averyvigolo <avery@averyv.me>
-Date: Sun, 24 Aug 2025 18:35:37 +0100
-Subject: [PATCH] Only use redirect_root_handler if webhome is set (fixes
- #2518)
-
-This fixes an infinite redirect on the home page when authentication is enabled.
-The redirects are caused by XHR calls to the API, which receive a 401 response, and
-the error handlers simply reload the page.
-
-If webhome is not set, the default request handler should be used to properly
-handle authentication. So, conditionally enable redirect_root_handler, if
-webhome is not empty or `/`. This fixes the problem, as there's an immediate
-redirect to /login, before any XHR calls.
-
-Remove the initial fix in https://github.com/pi-hole/FTL/pull/2521, as it is no
-longer necessary. That fix involved checking in redirect_root_handler, if the
-redirect destination is the same as the request URI.
-
-Signed-off-by: averyvigolo <avery@averyv.me>
---
- src/webserver/webserver.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/webserver/webserver.c b/src/webserver/webserver.c
-index e0999d230..c3e32a35c 100644
--- a/src/webserver/webserver.c
-+++ b/src/webserver/webserver.c
-@@ -720,7 +714,14 @@ void http_init(void)
- 	// prefix should be stripped away by the reverse proxy
- 	mg_set_request_handler(ctx, "/api", api_handler, NULL);
- 
-	mg_set_request_handler(ctx, "/$", redirect_root_handler, NULL);
-+	if(strcmp(prefix_webhome, "/") == 0 || strlen(prefix_webhome) == 0)
-+	{
-+		log_debug(DEBUG_API, "Not redirecting root since webhome is '%s'",
-+			  prefix_webhome);
-+	} else {
-+		// Redirect requests to / to the webhome path.
-+		mg_set_request_handler(ctx, "/$", redirect_root_handler, NULL);
-+	}
- 
- 	if(strcmp(config.webserver.paths.webhome.v.s, "/") == 0 &&
- 	   config.dns.blocking.mode.v.blocking_mode == MODE_IP)
-
@@ -1,18 +1,19 @@
 {
-  lib,
-  stdenv,
-  nixosTests,
-  fetchFromGitHub,
  cmake,
+  fetchFromGitHub,
  gmp,
+  lib,
  libidn2,
  libunistring,
  mbedtls,
  ncurses,
  nettle,
+  nix-update-script,
+  nixosTests,
  readline,
+  stdenv,
+  versionCheckHook,
  xxd,
-  iproute2,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -26,11 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-OpbBd+HS/gwcWNe/6VB3glout1sifJ8o5EnKuXfyZ/o=";
  };

-  patches = [
-    # https://github.com/pi-hole/FTL/pull/2610: Fix authentication redirect when webhome is /
-    ./disable-redirect-root.patch
-  ];
-
  nativeBuildInputs = [
    cmake
    xxd
@@ -52,37 +48,37 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    substituteInPlace src/version.c.in \
-      --replace-quiet "@GIT_VERSION@" "v${finalAttrs.version}" \
-      --replace-quiet "@GIT_DATE@" "1970-01-01" \
-      --replace-quiet "@GIT_BRANCH@" "master" \
-      --replace-quiet "@GIT_TAG@" "v${finalAttrs.version}" \
-      --replace-quiet "@GIT_HASH@" "builtfromreleasetarball"
+      --replace-fail "@GIT_VERSION@" "v${finalAttrs.version}" \
+      --replace-fail "@GIT_DATE@" "1970-01-01" \
+      --replace-fail "@GIT_BRANCH@" "master" \
+      --replace-fail "@GIT_TAG@" "v${finalAttrs.version}" \
+      --replace-fail "@GIT_HASH@" "builtfromreleasetarball"

-    # Remove hard-coded absolute path to the pihole script, rely on it being provided by $PATH
-    # Use execvp instead of execv so PATH is followed
+    # Remove hard-coded absolute path to the pihole script, rely on it
+    # being provided by $PATH.  Use execvp instead of execv so PATH is
+    # followed.
    substituteInPlace src/api/action.c \
      --replace-fail "/usr/local/bin/pihole" "pihole" \
      --replace-fail "execv" "execvp"
-
-    substituteInPlace src/database/network-table.c \
-      --replace-fail "ip neigh show" "${lib.getExe' iproute2 "ip"} neigh show" \
-      --replace-fail "ip address show" "${lib.getExe' iproute2 "ip"} address show"
  '';

  installPhase = ''
    runHook preInstall

-    install -Dm 555 -t $out/bin pihole-FTL
+    install -D pihole-FTL $out/bin/${finalAttrs.meta.mainProgram}

    runHook postInstall
  '';

  passthru = {
    settingsTemplate = ./pihole.toml;
-
    tests = nixosTests.pihole-ftl;
+    updateScript = nix-update-script { };
  };

+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
  meta = {
    description = "Pi-hole FTL engine";
    homepage = "https://github.com/pi-hole/FTL";
@@ -5,7 +5,6 @@
  dart-sass,
  electron,
  fetchFromGitHub,
-  fetchurl,
  makeDesktopItem,
  makeWrapper,
  nix-update-script,
@@ -15,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "r2modman";
-  version = "3.2.13";
+  version = "3.2.14";

  src = fetchFromGitHub {
    owner = "ebkr";
    repo = "r2modmanPlus";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dy+xVGh5VNGXI34ecglLFl/h6SXyUdfzyvLCjXYmC/w=";
+    hash = "sha256-iB4qUFiXFT+n9lczA1kvMW/IHRuB0H44fg43v//AzKA=";
  };

  missingHashes = ./missing-hashes.json;
@@ -32,12 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
  };

  patches = [
-    # Temporary fix for MiSide cover image https://github.com/ebkr/r2modmanPlus/pull/2024
-    (fetchurl {
-      url = "https://github.com/ebkr/r2modmanPlus/commit/24a2b8386c7fe9a6856cea06967c96aa685d3660.patch";
-      hash = "sha256-6NmwFRtn8+t9XRPHHVLM05idbCSYcBG0VmUOd8fZKs0=";
-    })
-
    # Make it possible to launch Steam games from r2modman.
    ./steam-launch-fix.patch
  ];
@@ -118,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
    mainProgram = "r2modman";
    maintainers = with lib.maintainers; [
      huantian
+      hythera
    ];
    inherit (electron.meta) platforms;
  };
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  flac2mp3,
+  ffmpeg,
+  sox,
+}:
+
+let
+  runtimeDeps = [
+    ffmpeg
+    flac2mp3
+    sox
+  ];
+in
+buildNpmPackage (finalAttrs: {
+  pname = "red-trul";
+  version = "2.3.13";
+
+  src = fetchFromGitHub {
+    owner = "lfence";
+    repo = "red-trul";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-t8P59diMwYKaGuPuNajWDmRU0fBNT6yRwMBLIRfUhTk";
+  };
+
+  npmDepsHash = "sha256-BYgNgV0hTkfDByi/86X7ZLcAYKveVDiSKnvUfdjyfHc=";
+  dontNpmBuild = true;
+
+  postPatch = ''
+    substituteInPlace config.js \
+      --replace-fail '`''${__dirname}/flac2mp3/flac2mp3.pl`' '"flac2mp3"'
+    substituteInPlace trul.js \
+      --replace-fail "  await fs.access(FLAC2MP3)" ""
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/red-trul \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.passthru.runtimeDeps}
+  '';
+
+  passthru = {
+    inherit runtimeDeps;
+  };
+
+  meta = {
+    mainProgram = "red-trul";
+    description = "Lightweight utility to transcode FLAC releases";
+    homepage = "https://github.com/lfence/red-trul";
+    changelog = "https://github.com/lfence/red-trul/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [ isc ];
+    maintainers = with lib.maintainers; [ lilahummel ];
+  };
+})
@@ -35,7 +35,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rerun";
-  version = "0.30.0";
+  version = "0.30.1";

  outputs = [
    "out"
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "rerun-io";
    repo = "rerun";
    tag = finalAttrs.version;
-    hash = "sha256-ZSAcKb6MZUGVOn8a9nEGT3hYr0zRuZ3R53+hNgYBc4Q=";
+    hash = "sha256-6TZTZ5bQ9eM93tKZAn82GUmSdq48qxoK+Z6cjAPLa0U=";
  };

  # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
  '';

-  cargoHash = "sha256-QGDmJJaYCeaLKONvIA+vt5lolMLRr/fEhui1xxVkpEM=";
+  cargoHash = "sha256-yum+14912Jlmr+b3y4E7EoyWn/Sbx2t3uqlg7t0EFME=";

  cargoBuildFlags = [
    "--package"
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rumdl";
-  version = "0.1.28";
+  version = "0.1.39";

  src = fetchFromGitHub {
    owner = "rvben";
    repo = "rumdl";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-cf55SEIeN8aGHfz9mcsqaW+uh9KXId+17v4X4t2KHgU=";
+    hash = "sha256-yhwBmzAuBVbZP8cYJvnqgFyicggxLwSPYw/e9q03akA=";
  };

-  cargoHash = "sha256-IE7FDdSIIvYKhXBp6+EaNX3Y8tewU06ufiPUaOU/oIs=";
+  cargoHash = "sha256-rkb5QMnELa3XQXvt8BxrseyDVg+qoETZtTbbfGkPyME=";

  cargoBuildFlags = [
    "--bin=rumdl"
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rust-rpxy";
+  version = "0.10.4";
+
+  src = fetchFromGitHub {
+    owner = "junkurihara";
+    repo = "rust-rpxy";
+    tag = finalAttrs.version;
+    hash = "sha256-KGg+OtQj1PIp/zbViPTyAUvm6bRzWB1l6ktpDEOIDYM=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-Fe/64ytHYBf1/VvWVGWrXiqHwAcoUh76zgHJ8FbTbzE=";
+
+  meta = {
+    description = "Http reverse proxy serving multiple domain names and terminating TLS for http/1.1, 2 and 3, written in Rust";
+    homepage = "https://github.com/junkurihara/rust-rpxy";
+    changelog = "https://github.com/junkurihara/rust-rpxy/releases/tag/${finalAttrs.version}";
+    license = with lib.licenses; [
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      jpteb
+    ];
+    mainProgram = "rpxy";
+    platforms = lib.platforms.all;
+  };
+})
@@ -10,14 +10,14 @@ let
  platform =
    if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
  hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-93ELKDCjdEPnQO71CiwoeiVfNNVPbMAyXxeOG+1DY1E=";
-    "x86_64-linux" = "sha256-+5Ldd6APomJQZdahEywOGthmUyb89wpQrWrQ8pSU1yk=";
-    "aarch64-linux" = "sha256-VfJ8VthOi038zZSu7MwbOOP8FdTZnoYSU65TLZYyUSs=";
+    "universal-macos" = "sha256-zunGCwesR0Twx83q0/2xj1z0ejVJ/7wseR65udTe9Jg=";
+    "x86_64-linux" = "sha256-31RabUcONzxt4E3FkHXHjuq9cCYYjlYt/8C7ElWO8zo=";
+    "aarch64-linux" = "sha256-rAgXpuWHcQL3bUcqKKfmCC+Zq4XoegDUyYn0TrVBgk4=";
  };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tigerbeetle";
-  version = "0.16.74";
+  version = "0.16.75";

  src = fetchzip {
    url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "vencord";
-  version = "1.14.2";
+  version = "1.14.3";

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-1459x8G0++jH6NO5n4B5LVjDFjAFkLKFAQygVdqgOAk=";
+    hash = "sha256-Dqw2VPL1E4tu4m/oe2FVdWr9O1cqdsuMsoFFcosldCc=";
  };

  patches = [ ./fix-deps.patch ];
@@ -32,14 +32,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "wxwidgets";
-  version = "3.3.1";
+  version = "3.3.2";

  src = fetchFromGitHub {
    owner = "wxWidgets";
    repo = "wxWidgets";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-eYmZrh9lvDnJ3VAS+TllT21emtKBPAOhqIULw1dTPhk=";
+    hash = "sha256-UL1NuByKFGMQ/dhjuWRdnWTgdy4+1cD9pSls3e1mur8=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -107,7 +107,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
-  version = "0.225.13";
+  version = "0.226.4";

  outputs = [
    "out"
@@ -120,7 +120,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ozuycL8dnBtgyYYjsz9C+CDtZQzbXWWZVOkxbOs7hho=";
+    hash = "sha256-vF/vvEJKl1mUcF6TMif5G9rQPjt+2RWImWy1f7RxgfE=";
  };

  postPatch = ''
@@ -140,7 +140,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    rm -r $out/git/*/candle-book/
  '';

-  cargoHash = "sha256-G5U0APQNNEe2qpshqX4QpQGbqIAHllatbbsaVAhDoG0=";
+  cargoHash = "sha256-IH/FEC52VudtXsSHiju6T7H9E2kblJ0RyiUoQR391cc=";

  nativeBuildInputs = [
    cmake
@@ -192,25 +192,17 @@ rustPlatform.buildRustPackage (finalAttrs: {

  # Required on darwin because we don't have access to the
  # proprietary Metal shader compiler.
-  buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ];
+  buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui_platform/runtime_shaders" ];

  # Some crates define extra types or enum values in test configuration which then lead
  # to type checking errors in other crates unless this feature is enabled.
-  # gpui/runtime_shaders is required on darwin for the same reason as buildFeatures above:
+  # gpui_platform/runtime_shaders is required on darwin for the same reason as buildFeatures above:
  # without it, build.rs invokes the proprietary Metal shader compiler.
  checkFeatures = [
    "visual-tests"
  ]
  ++ finalAttrs.buildFeatures;

-  # cargo-nextest does not support the `=` syntax for parameters, so all test skips must be defined
-  # as two separate arguments
-  checkFlags = lib.optionals stdenv.hostPlatform.isLinux [
-    # Fails on Linux since v0.225, possibly related to https://github.com/zed-industries/zed/pull/48800
-    "--skip"
-    "zed::tests::test_window_edit_state_restoring_enabled"
-  ];
-
  env = {
    ALLOW_MISSING_LICENSES = true;
    ZSTD_SYS_USE_PKG_CONFIG = true;
@@ -7,15 +7,15 @@

 buildNpmPackage rec {
  pname = "zwave-js-ui";
-  version = "11.12.0";
+  version = "11.13.0";

  src = fetchFromGitHub {
    owner = "zwave-js";
    repo = "zwave-js-ui";
    tag = "v${version}";
-    hash = "sha256-ewJJCeGR2jmw0CeEB4Ip4wkQ0V+NDwkqOAr/1wGiULI=";
+    hash = "sha256-XRoOOuIkBaHC7oXBA1r2TzgTTYxluE7+YtgnXGsAbkw=";
  };
-  npmDepsHash = "sha256-IKZTmA410mFLZuf2AgPI8P8csBNI+Nx1+P8WGqk3fQ8=";
+  npmDepsHash = "sha256-OOmJQJf8PTAaUmM7r9KGBaS5sk/uy3OI92jLj7JYhcg=";

  passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;

@@ -14,33 +14,63 @@

 # absolutely no mac support for now

-{
-  pubGetScript ? null,
-  flutterBuildFlags ? [ ],
-  targetFlutterPlatform ? "linux",
-  extraWrapProgramArgs ? "",
-  flutterMode ? null,
-  ...
-}@args:
-
-let
-  hasEngine = flutter ? engine && flutter.engine != null && flutter.engine.meta.available;
-  flutterMode = args.flutterMode or (if hasEngine then flutter.engine.runtimeMode else "release");
-
-  flutterFlags = lib.optional hasEngine "--local-engine host_${flutterMode}${
-    lib.optionalString (!flutter.engine.isOptimized) "_unopt"
-  }";
-
-  flutterBuildFlags = [
-    "--${flutterMode}"
-  ]
-  ++ (args.flutterBuildFlags or [ ])
-  ++ flutterFlags;
-
-  builderArgs =
+lib.extendMkDerivation {
+  constructDrv =
+    argsFn:
    let
+      evalArgs = lib.fix argsFn;
+      targetFlutterPlatform = evalArgs.targetFlutterPlatform or "linux";
+
+      minimalFlutter = flutter.override {
+        supportedTargetFlutterPlatforms = [
+          "universal"
+          targetFlutterPlatform
+        ];
+      };
+
+      buildAppWith = flutter: buildDartApplication.override { dart = flutter; };
+    in
+    buildAppWith minimalFlutter (
+      finalAttrs:
+      let
+        args = argsFn finalAttrs;
+      in
+      args
+      // {
+        passthru = (args.passthru or { }) // {
+          multiShell = buildAppWith flutter args;
+        };
+      }
+    );
+
+  extendDrvArgs =
+    finalAttrs:
+    args@{
+      pubGetScript ? null,
+      flutterBuildFlags ? [ ],
+      targetFlutterPlatform ? "linux",
+      extraWrapProgramArgs ? "",
+      flutterMode ? null,
+      ...
+    }:
+    let
+      hasEngine = flutter ? engine && flutter.engine != null && flutter.engine.meta.available;
+      flutterMode' = args.flutterMode or (if hasEngine then flutter.engine.runtimeMode else "release");
+
+      flutterFlags = lib.optional hasEngine "--local-engine host_${flutterMode'}${
+        lib.optionalString (!flutter.engine.isOptimized) "_unopt"
+      }";
+
+      flutterBuildFlags' = [
+        "--${flutterMode'}"
+      ]
+      ++ (args.flutterBuildFlags or [ ])
+      ++ flutterFlags;
+
      universal = args // {
-        inherit flutterMode flutterFlags flutterBuildFlags;
+        flutterMode = flutterMode';
+        flutterFlags = flutterFlags;
+        flutterBuildFlags = flutterBuildFlags';

        sdkSetupScript = ''
          # Pub needs SSL certificates. Dart normally looks in a hardcoded path.
@@ -128,8 +158,6 @@ let
      };
    in
    {
-      inherit universal;
-
      linux = universal // {
        outputs = universal.outputs or [ ] ++ [ "debug" ];

@@ -225,21 +253,4 @@ let
      };
    }
    .${targetFlutterPlatform} or (throw "Unsupported Flutter host platform: ${targetFlutterPlatform}");
-
-  minimalFlutter = flutter.override {
-    supportedTargetFlutterPlatforms = [
-      "universal"
-      targetFlutterPlatform
-    ];
-  };
-
-  buildAppWith = flutter: buildDartApplication.override { dart = flutter; };
-in
-buildAppWith minimalFlutter (
-  builderArgs
-  // {
-    passthru = builderArgs.passthru or { } // {
-      multiShell = buildAppWith flutter builderArgs;
-    };
-  }
-)
+}
@@ -16,7 +16,6 @@
  jiter,
  pydantic,
  sniffio,
-  tokenizers,
  typing-extensions,

  # optional dependencies
@@ -28,6 +27,7 @@

  # test
  dirty-equals,
+  http-snapshot,
  inline-snapshot,
  nest-asyncio,
  pytest-asyncio,
@@ -38,14 +38,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "anthropic";
-  version = "0.79.0";
+  version = "0.84.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anthropics";
    repo = "anthropic-sdk-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-//VKkn9M2uOj8PBoWTY872ZOyTc+OjBgEUGtKsYDWpk=";
+    hash = "sha256-03nvs97JNQrOu2rxOXWpJiUj+DCI5I/PTcKLuZUZ3t0=";
  };

  postPatch = ''
@@ -66,7 +66,6 @@ buildPythonPackage (finalAttrs: {
    jiter
    pydantic
    sniffio
-    tokenizers
    typing-extensions
  ];

@@ -84,6 +83,7 @@ buildPythonPackage (finalAttrs: {

  nativeCheckInputs = [
    dirty-equals
+    http-snapshot
    inline-snapshot
    nest-asyncio
    pytest-asyncio
@@ -358,13 +358,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "boto3-stubs";
-  version = "1.42.59";
+  version = "1.42.60";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit (finalAttrs) version;
-    hash = "sha256-Sm/FIFYO5qLLngW9/NRdTgfZ+5HPSD3706Wrh+/muGA=";
+    hash = "sha256-a20mFPRNBCJ11QcLsNWQAbtmWt41OqSarbNJ94B38Ig=";
  };

  build-system = [ setuptools ];
@@ -24,6 +24,7 @@
  pillow,
  pytest-asyncio,
  pytest-snapshot,
+  pytest-vcr,
  pytestCheckHook,
  tenacity,
 }:
@@ -64,6 +65,7 @@ buildPythonPackage rec {
    pillow
    pytest-asyncio
    pytest-snapshot
+    pytest-vcr
    pytestCheckHook
    tenacity
  ];
@@ -44,7 +44,7 @@

 buildPythonPackage rec {
  pname = "django";
-  version = "4.2.28";
+  version = "4.2.29";
  pyproject = true;

  disabled = pythonAtLeast "3.13";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
    owner = "django";
    repo = "django";
    tag = version;
-    hash = "sha256-dxlTonT8zFIFGFrrOW4GFKOy5b0chcESxt9i9xHO8h4=";
+    hash = "sha256-30OcLxtACSxLJ1jT+k7fmM8CyMyleXSPc+l7/3JZKzI=";
  };

  patches = [
@@ -42,7 +42,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "django";
-  version = "6.0.2";
+  version = "6.0.3";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: {
    owner = "django";
    repo = "django";
    tag = finalAttrs.version;
-    hash = "sha256-59zbILbU+G9q7hwF8IbipykZLCWEHEx+cLRglJpvuQw=";
+    hash = "sha256-FXaK9e2/grRH0c4r/t+Sm9uyYHlSUx6S0klnYTW/8KQ=";
  };

  patches = [
@@ -0,0 +1,58 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  httpx,
+  inline-snapshot,
+  lib,
+  pytest,
+  pytestCheckHook,
+  requests,
+  setuptools,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "http-snapshot";
+  version = "0.1.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "karpetrosyan";
+    repo = "http-snapshot";
+    tag = finalAttrs.version;
+    hash = "sha256-4roxtwzB3HXwvlBqjdHEit4flXlogVwzlYNgQE8vFwE=";
+  };
+
+  build-system = [ setuptools ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  dependencies = [
+    inline-snapshot
+  ];
+
+  optional-dependencies = {
+    httpx = [ httpx ];
+    requests = [ requests ];
+  };
+
+  pythonImportsCheck = [ "http_snapshot" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  pytestFlags = [
+    "--inline-snapshot=disable"
+  ];
+
+  meta = {
+    changelog = "https://github.com/karpetrosyan/http-snapshot/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    description = "Pytest plugin that snapshots requests made with popular Python HTTP clients";
+    homepage = "https://github.com/karpetrosyan/http-snapshot";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+})
@@ -8,14 +8,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "iamdata";
-  version = "0.1.202603031";
+  version = "0.1.202603041";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/kSoNHtnhdczU9gos+FY46ILx9OcjhBHTNDVv7T8LDY=";
+    hash = "sha256-LsBAC6EAHl/vrGmiOy/fJoUhq5a73Qs07M7Fh7bF6mY=";
  };

  __darwinAllowLocalNetworking = true;
@@ -30,6 +30,6 @@ buildPythonPackage rec {
    description = "Utility to encode and decode Little Endian Base 128";
    homepage = "https://github.com/mohanson/leb128";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ urlordjames ];
+    maintainers = [ ];
  };
 }
@@ -2,32 +2,30 @@
  lib,
  buildPythonPackage,
  click,
-  deepdiff,
  eval-type-backport,
  fetchFromGitHub,
+  gitUpdater,
  llama-cloud,
  llama-index-core,
  platformdirs,
  hatchling,
  pydantic,
-  pytest-asyncio,
-  pytestCheckHook,
  python-dotenv,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "llama-cloud-services";
-  version = "0.6.79";
+  version = "0.6.94";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "run-llama";
    repo = "llama_cloud_services";
-    tag = "llama-cloud-services-py%40${version}";
+    tag = "llama-cloud-services-py%40${finalAttrs.version}";
    hash = "sha256-BjwXdv7ekehYGGnKk0ElVlxmGkmtam9RLECgxfM7lYc=";
  };

-  sourceRoot = "${src.name}/py";
+  sourceRoot = "${finalAttrs.src.name}/py";

  pythonRelaxDeps = [ "llama-cloud" ];

@@ -48,11 +46,19 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "llama_cloud_services" ];

+  # update script sets wrong version
+  passthru = {
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "llama-cloud-services-py@";
+    };
+  };
+
  meta = {
    description = "Knowledge Agents and Management in the Cloud";
    homepage = "https://github.com/run-llama/llama_cloud_services";
-    changelog = "https://github.com/run-llama/llama_cloud_services/releases/tag/${src.tag}";
+    changelog = "https://github.com/run-llama/llama_cloud_services/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
@@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  deprecated,
  hatchling,
  llama-cloud,
  llama-index-core,
@@ -18,11 +19,15 @@ buildPythonPackage rec {
    hash = "sha256-teAHUqswVkq/GcV1laIQf1aXw7A7CFgXtPyoSjjrvVk=";
  };

-  pythonRelaxDeps = [ "llama-cloud" ];
+  pythonRelaxDeps = [
+    "deprecated"
+    "llama-cloud"
+  ];

  build-system = [ hatchling ];

  dependencies = [
+    deprecated
    llama-cloud
    llama-index-core
  ];
@@ -21,6 +21,9 @@ buildPythonPackage rec {

  dependencies = [ llama-cloud-services ];

+  # llama-cloud-services fails to read
+  pythonRelaxDeps = [ "llama-cloud-services" ];
+
  pythonImportsCheck = [ "llama_parse" ];

  meta = {
@@ -1,7 +1,6 @@
 {
  lib,
  buildPythonPackage,
-  fetchpatch2,
  fetchPypi,

  # build-system
@@ -14,6 +13,7 @@
  jedi,
  loro,
  markdown,
+  msgspec,
  narwhals,
  packaging,
  psutil,
@@ -29,27 +29,17 @@
  # tests
  versionCheckHook,
 }:
-
 buildPythonPackage rec {
  pname = "marimo";
-  version = "0.19.4";
+  version = "0.20.4";
  pyproject = true;

  # The github archive does not include the static assets
  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-7sO3ZcP9mNY+IBfFagJOd5ppI8tW52gueIdtT+SUCbc=";
+    hash = "sha256-f0bOg3lTcXUEZz4z5H+0KmGb9fnSAA0aOjsWY6R8VJg=";
  };

-  patches = [
-    # https://github.com/marimo-team/marimo/pull/6714
-    (fetchpatch2 {
-      name = "uv-build.patch";
-      url = "https://github.com/Prince213/marimo/commit/b1c690e82e8117c451a74fdf172eb51a4861853d.patch?full_index=1";
-      hash = "sha256-iFS5NSGjaGdECRk0LCRSA8XzRb1/sVSZCTRLy6taHNU=";
-    })
-  ];
-
  build-system = [ uv-build ];

  dependencies = [
@@ -59,6 +49,7 @@ buildPythonPackage rec {
    jedi
    loro
    markdown
+    msgspec
    narwhals
    packaging
    psutil
@@ -7,14 +7,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "mitogen";
-  version = "0.3.42";
+  version = "0.3.43";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mitogen-hq";
    repo = "mitogen";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-gDcOzAy8e2/rLHET4wOidKOTMWFD3LDq+ubRrxm3+ao=";
+    hash = "sha256-x7ENU1uopE4sf/W52ILBfArhDc83ScePBolTN03dmYg=";
  };

  build-system = [ setuptools ];
@@ -806,8 +806,8 @@ in
      "sha256-VGQzgnrUynTDjfYpEk+FR+PrljbULl0UpbeqbaPKqSc=";

  mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.42.10"
-      "sha256-Or5B12+lM/6CJUtOAIEjcv2PJA3/18Dd1L40UD0feD8=";
+    buildMypyBoto3Package "logs" "1.42.60"
+      "sha256-CBENMtkzLXqgjCy6D1w4E+0b63TGgudAdRn+Tz0bK/8=";

  mypy-boto3-lookoutequipment =
    buildMypyBoto3Package "lookoutequipment" "1.42.3"
@@ -1170,8 +1170,8 @@ in
      "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw=";

  mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.42.49"
-      "sha256-mRYxS3oZYjViDoCQEcdBiujOXEMUw/GaeXpO/sAO4EI=";
+    buildMypyBoto3Package "sagemaker" "1.42.60"
+      "sha256-YSUncXOtyOaOCp46gXsLD8MyOm01fVjqlVZBDNthE94=";

  mypy-boto3-sagemaker-a2i-runtime =
    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3"
@@ -13,14 +13,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "oelint-parser";
-  version = "8.8.2";
+  version = "8.9.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "priv-kweihmann";
    repo = "oelint-parser";
    tag = finalAttrs.version;
-    hash = "sha256-Oy9Mzz5/UUgUyoZFuSgjJhDlOmrqrK5Fc4pBmjxlllw=";
+    hash = "sha256-STWfz2qdQPOFWmNZJkgGNBDFAeQwEj+g6pZgLJf++ps=";
  };

  pythonRelaxDeps = [ "regex" ];
@@ -4,19 +4,20 @@
  fetchFromGitHub,
  lib,
  mashumaro,
+  numpy,
  setuptools,
 }:

 buildPythonPackage rec {
  pname = "onedrive-personal-sdk";
-  version = "0.1.2";
+  version = "0.1.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "zweckj";
    repo = "onedrive-personal-sdk";
    tag = "v${version}";
-    hash = "sha256-EiIDxgfYqumHdLskF1LJGelQ2omXbuHZ/+qyVy1SZZU=";
+    hash = "sha256-+TfBc8SPzeVIXnocOZBvVd4LI37+fQBaKvnDz7X2iqo=";
  };

  build-system = [ setuptools ];
@@ -24,6 +25,7 @@ buildPythonPackage rec {
  dependencies = [
    aiohttp
    mashumaro
+    numpy
  ];

  pythonImportsCheck = [ "onedrive_personal_sdk" ];
@@ -5,30 +5,30 @@
  buildPythonPackage,
  deepdiff,
  fetchFromGitHub,
-  poetry-core,
-  poetry-dynamic-versioning,
+  hatchling,
  pycognito,
  pyjwt,
  pytest-aiohttp,
  pytest-freezegun,
  pytestCheckHook,
+  uv-dynamic-versioning,
 }:

 buildPythonPackage rec {
  pname = "pylitterbot";
-  version = "2025.0.0";
+  version = "2025.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "natekspencer";
    repo = "pylitterbot";
-    tag = "v${version}";
-    hash = "sha256-Rr7QseViy6i13QbZVb8BxMWDsE9meG4NqT5B1Z+TZbc=";
+    tag = version;
+    hash = "sha256-pQnrmH/mfh7cwEnL/qoG3dN638HsP9w5zK0CgarGstE=";
  };

  build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    uv-dynamic-versioning
  ];

  dependencies = [
@@ -10,19 +10,20 @@
  pytest-cov-stub,
  pytestCheckHook,
  syrupy,
+  tenacity,
  yarl,
 }:

 buildPythonPackage (finalAttrs: {
  pname = "pyportainer";
-  version = "1.0.29";
+  version = "1.0.31";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "erwindouna";
    repo = "pyportainer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-NfK6Ce99bXtI0QgObdsalpTf9MiaOBdWOp6nTrAipY4=";
+    hash = "sha256-s+F+V6vJr1Y7Xark/XAthwrVi6prp8hK6vyAzpdm/54=";
  };

  build-system = [ hatchling ];
@@ -31,6 +32,7 @@ buildPythonPackage (finalAttrs: {
    aiohttp
    mashumaro
    orjson
+    tenacity
    yarl
  ];

@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pysmartthings";
-  version = "3.5.3";
+  version = "3.6.1";
  pyproject = true;

  disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "andrewsayre";
    repo = "pysmartthings";
    tag = "v${version}";
-    hash = "sha256-60d3Posb1/WBad0C0Xj8V7nrj5CV2bH3c3KjHMvGY6c=";
+    hash = "sha256-tWWrx5gOpvTXBdlDfE13NwDTNemBW6kwhdSjHLJSXnw=";
  };

  build-system = [ poetry-core ];
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "pytest-check";
-  version = "2.6.2";
+  version = "2.7.1";
  pyproject = true;

  src = fetchPypi {
    pname = "pytest_check";
    inherit version;
-    hash = "sha256-XiEoQFsUl4rXTyHzIl/MUruxzHxBpV1eqtnx480n5C4=";
+    hash = "sha256-7jTNoczFAF3inFP7ztPWXXFLtTbZD1aSdI8fFN+p90U=";
  };

  build-system = [ hatchling ];
@@ -15,12 +15,12 @@

 buildPythonPackage rec {
  pname = "pywebpush";
-  version = "2.2.0";
+  version = "2.3.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-1MDuSYHnrAjPFHKf7ItsOu7FjVTm2jiGNcVwb8wts/Y=";
+    hash = "sha256-0eJ9uN6eZ1fBh19nKSVUvVTEGHTDb0tcTrtUQtziBPI=";
  };

  build-system = [ setuptools ];
@@ -12,14 +12,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "reolink-aio";
-  version = "0.19.0";
+  version = "0.19.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "starkillerOG";
    repo = "reolink_aio";
    tag = finalAttrs.version;
-    hash = "sha256-ZYtqvfXVCPRQSHR74ZL9uT3C/p9R9OZom/zMj5onE+0=";
+    hash = "sha256-sHQ6lReLg2QnnTwjcPUulvVPsJDEzjoMFnBz6Ubdlq8=";
  };

  build-system = [ setuptools ];
@@ -2,27 +2,29 @@
  lib,
  attrs,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  mock,
  repeated-test,
  setuptools-scm,
  sphinx,
  unittestCheckHook,
+  pythonAtLeast,
 }:
-
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "sigtools";
  version = "4.0.1";
  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-S44TWpzU0uoA2mcMCTNy105nK6OruH9MmNjnPepURFw=";
+  src = fetchFromGitHub {
+    owner = "epsy";
+    repo = "sigtools";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-q5Bzc6fgDJCqt0SA/C/mg2fbUFyXLcsRU+tSl8FdZdI=";
  };

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

-  propagatedBuildInputs = [ attrs ];
+  dependencies = [ attrs ];

  nativeCheckInputs = [
    mock
@@ -31,6 +33,12 @@ buildPythonPackage rec {
    unittestCheckHook
  ];

+  unittestFlags = lib.optionals (pythonAtLeast "3.14") [
+    "-s sigtools/tests"
+    # python314 only: NameError: name 'o' is not defined
+    "-k [!RoundTripTests.test_locals]"
+  ];
+
  pythonImportsCheck = [ "sigtools" ];

  meta = {
@@ -39,4 +47,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
@@ -26,6 +26,6 @@ buildPythonPackage rec {
    description = "High-level cross platform tty library";
    homepage = "https://github.com/jkwill87/teletype";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ urlordjames ];
+    maintainers = [ ];
  };
 }
@@ -38,14 +38,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "uiprotect";
-  version = "10.2.1";
+  version = "10.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "uilibs";
    repo = "uiprotect";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-4zgE5XbjCZzu+Ug66cgKy/Zqy1oyTDIVsPpyDrcra24=";
+    hash = "sha256-C0daz9PY7UI/jUo1zZvvT7qN6YRp+VXiNl+Rm5H7uac=";
  };

  build-system = [ poetry-core ];
@@ -368,6 +368,8 @@ in
  nix-main-c = callPackage ../src/libmain-c/package.nix { };

  nix-cmd = callPackage ../src/libcmd/package.nix { };
+  # TODO: upstream nix-cmd-c to Nix from devenv
+  nix-cmd-c = callPackage ../src/libcmd-c/package.nix { };

  nix-cli = callPackage ../src/nix/package.nix { };
  ${whenAtLeast "2.34pre" "nix-nswrapper"} = callPackage ../src/nswrapper/package.nix { };
@@ -0,0 +1,34 @@
+{
+  lib,
+  mkMesonLibrary,
+
+  nix-util-c,
+  nix-store-c,
+  nix-expr-c,
+  nix-cmd,
+
+  # Configuration Options
+
+  version,
+}:
+
+mkMesonLibrary (finalAttrs: {
+  pname = "nix-cmd-c";
+  inherit version;
+
+  workDir = ./.;
+
+  propagatedBuildInputs = [
+    nix-util-c
+    nix-store-c
+    nix-expr-c
+    nix-cmd
+  ];
+
+  mesonFlags = [ ];
+
+  meta = {
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+
+})
@@ -7156,6 +7156,8 @@ self: super: with self; {

  http-sfv = callPackage ../development/python-modules/http-sfv { };

+  http-snapshot = callPackage ../development/python-modules/http-snapshot { };
+
  httpagentparser = callPackage ../development/python-modules/httpagentparser { };

  httpauth = callPackage ../development/python-modules/httpauth { };