Merge master into staging-next

2025-02-12 00:14:36 +00:00
parent a8ea01bdd0 83a2581c81
commit 696a86490d
94 changed files with 3011 additions and 8905 deletions
@@ -9,8 +9,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; };

 let
  packages = with pkgs; {
-    "default" = teleport;
    "15" = teleport_15;
+    "16" = teleport_16;
+    "17" = teleport_17;
  };

  minimal = package: {
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  SDL2,
+  xorg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "anarch";
+  version = "1.0-unstable-2023-09-08";
+
+  src = fetchFromGitLab {
+    owner = "drummyfish";
+    repo = "anarch";
+    rev = "6f90562161200682459e772f1dacb747f23c5f95";
+    hash = "sha256-KmuJruzQRFunhwUGz3bHhXgtD2m4+5Vk0n7xhzVBMWs=";
+  };
+
+  buildInputs = [
+    SDL2
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXfixes
+    xorg.libXext
+    xorg.libXi
+    xorg.libXScrnSaver
+  ];
+
+  # upstream is an error-prone make/build script
+  buildPhase = ''
+    runHook preBuild
+
+    $CC -O3 -o anarch main_sdl.c $(sdl2-config --cflags --libs)
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 anarch $out/bin/anarch
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://drummyfish.gitlab.io/anarch/";
+    description = "Suckless FPS game";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    license = lib.licenses.cc0;
+    platforms = lib.platforms.unix;
+    mainProgram = "anarch";
+  };
+})
@@ -0,0 +1,89 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchFromGitHub,
+  buildGoModule,
+  protoc-gen-grpc-web,
+  protoc-gen-js,
+  protobuf,
+}:
+
+let
+  tantivy-go = callPackage ../tantivy-go { };
+  pname = "anytype-heart";
+  version = "0.38.9";
+  src = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "anytype-heart";
+    tag = "v${version}";
+    hash = "sha256-0MRtzPSUxbCBJQLJbHsdEpf6GEFoS4ud1S6j9GZWzAE=";
+  };
+
+  arch =
+    {
+      # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3
+      x86_64-linux = "linux-amd64-musl";
+      aarch64-linux = "linux-arm64-musl";
+      x86_64-darwin = "darwin-amd64";
+      aarch64-darwin = "darwin-arm64";
+    }
+    .${stdenv.hostPlatform.system};
+in
+buildGoModule {
+  inherit pname version src;
+
+  vendorHash = "sha256-8QN7SipgkoJ9yRCl1Hv8ZIkeEwbWcFS6QiumXIIN1Bg=";
+
+  subPackages = [ "cmd/grpcserver" ];
+  tags = [
+    "nosigar"
+    "nowatchdog"
+  ];
+
+  env.CGO_ENABLED = 1;
+  proxyVendor = true;
+
+  nativeBuildInputs = [
+    protoc-gen-grpc-web
+    protoc-gen-js
+    protobuf
+  ];
+
+  preBuild = ''
+    mkdir -p deps/libs/${arch}
+    cp ${tantivy-go}/lib/libtantivy_go.a deps/libs/${arch}
+  '';
+
+  postBuild = ''
+    protoc -I ./  --js_out=import_style=commonjs,binary:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto
+    protoc -I ./  --grpc-web_out=import_style=commonjs+dts,mode=grpcwebtext:./dist/js/pb pb/protos/service/*.proto pb/protos/*.proto pkg/lib/pb/model/protos/*.proto
+  '';
+
+  postInstall = ''
+    mv $out/bin/grpcserver $out/bin/anytypeHelper
+    mkdir -p $out/lib
+    cp -r dist/js/pb/* $out/lib
+    cp -r dist/js/pb/* $out/lib
+
+    mkdir -p $out/lib/json/generated
+    cp pkg/lib/bundle/system*.json $out/lib/json/generated
+    cp pkg/lib/bundle/internal*.json $out/lib/json/generated
+
+    mkdir -p $out/share
+    cp LICENSE.md $out/share
+  '';
+
+  meta = {
+    description = "Shared library for Anytype clients";
+    homepage = "https://anytype.io/";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ autrimpo ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+  };
+}
@@ -1,42 +1,106 @@
 {
  lib,
-  fetchurl,
-  appimageTools,
-  makeWrapper,
-  nix-update-script,
+  callPackage,
+  fetchFromGitHub,
+  buildNpmPackage,
+  pkg-config,
+  libsecret,
+  electron,
+  makeDesktopItem,
+  copyDesktopItems,
  commandLineArgs ? "",
+  nix-update-script,
 }:

 let
+  anytype-heart = callPackage ./anytype-heart { };
  pname = "anytype";
  version = "0.44.0";
-  name = "Anytype-${version}";
-  src = fetchurl {
-    url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
-    hash = "sha256-+Ae0xH6ipNZgIVrrAmgeG8bibm/I3NLiDMzS+fwf9RQ=";
+
+  src = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "anytype-ts";
+    tag = "v${version}";
+    hash = "sha256-a2ZnTEAFzzTb+lxtQkC6QLG5SP1+gDSjI9dqUNZWfCg=";
+  };
+  description = "P2P note-taking tool";
+
+  locales = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "l10n-anytype-ts";
+    rev = "a5c81ad55383c4e6e9bb7893ecfcb879bac87bea";
+    hash = "sha256-evSB0ohHm++tZiazXRMR4vj34IfW3HIkfZ2gwsi/2dk=";
  };
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
-appimageTools.wrapType2 {
+buildNpmPackage {
  inherit pname version src;

-  nativeBuildInputs = [ makeWrapper ];
+  npmDepsHash = "sha256-DDVsrXgijYYOeCc1gIe2nVb+oL8v4Hqq80d7l5b6MR0=";

-  extraPkgs = pkgs: [ pkgs.libsecret ];
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  };

-  extraInstallCommands = ''
-    wrapProgram $out/bin/${pname} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
-      --add-flags ${lib.escapeShellArg commandLineArgs}
-    install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications
-    substituteInPlace $out/share/applications/anytype.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
-    for size in 16 32 64 128 256 512 1024; do
-      install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/anytype.png \
-        $out/share/icons/hicolor/''${size}x''${size}/apps/anytype.png
+  nativeBuildInputs = [
+    pkg-config
+    copyDesktopItems
+  ];
+  buildInputs = [ libsecret ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    cp -r ${anytype-heart}/lib dist/
+    cp -r ${anytype-heart}/bin/anytypeHelper dist/
+
+    for lang in ${locales}/locales/*; do
+      cp "$lang" "dist/lib/json/lang/$(basename $lang)"
    done
+
+    npm run build
+
+    runHook postBuild
  '';

+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/anytype
+    cp -r electron.js electron dist node_modules package.json $out/lib/node_modules/anytype/
+
+    for icon in $out/lib/node_modules/anytype/electron/img/icons/*.png; do
+      mkdir -p "$out/share/icons/hicolor/$(basename $icon .png)/apps"
+      ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png)/apps/anytype.png"
+    done
+
+    cp LICENSE.md $out/share
+
+    makeWrapper '${lib.getExe electron}' $out/bin/anytype \
+      --set-default ELECTRON_IS_DEV 0 \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags $out/lib/node_modules/anytype/ \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Anytype";
+      exec = "anytype";
+      icon = "anytype";
+      desktopName = "Anytype";
+      comment = description;
+      categories = [
+        "Utility"
+        "Office"
+        "Calendar"
+        "ProjectManagement"
+      ];
+      startupWMClass = "anytype";
+    })
+  ];
+
  passthru.updateScript = nix-update-script {
    # Prevent updating to versions with '-' in them.
    # Necessary since Anytype uses Electron-based 'MAJOR.MINOR.PATCH(-{alpha,beta})?' versioning scheme where each
@@ -48,12 +112,20 @@ appimageTools.wrapType2 {
    ];
  };

-  meta = with lib; {
-    description = "P2P note-taking tool";
+  meta = {
+    inherit description;
    homepage = "https://anytype.io/";
-    license = licenses.unfree;
+    license = lib.licenses.unfreeRedistributable;
    mainProgram = "anytype";
-    maintainers = with maintainers; [ running-grass ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [
+      running-grass
+      autrimpo
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
  };
 }
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tantivy-go";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "anyproto";
+    repo = "tantivy-go";
+    tag = "v${version}";
+    hash = "sha256-IlGtyTjOAvmrbgmvy4NelTOgOWopxNta3INq2QcMEqY=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-3+HtZ7SAnvTNXtYlokX/Z9VD1lDw+nh6R/njYOZeGoE=";
+
+  cargoPatches = [
+    ./add-Cargo.lock.patch
+  ];
+
+  cargoRoot = "rust";
+  buildAndTestSubdir = cargoRoot;
+
+  meta = {
+    description = "Tantivy go bindings";
+    homepage = "https://github.com/anyproto/tantivy-go";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ autrimpo ];
+  };
+}
@@ -6,15 +6,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-hack";
-  version = "0.6.34";
+  version = "0.6.35";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-FAcKzLr835FxgcnWmAe1JirzlRc3fvxGXMKxnSmgCzA=";
+    hash = "sha256-6C3YiPgoszEvJBkaOg7URYxnEl17oGLYzl0P+m3VAAI=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-3M+UK0+lvnRH7j1vbqMgpE7mnz8YnPO3MEjQWnPRy8c=";
+  cargoHash = "sha256-pRZ6mmCQCaio7aW55dKSAEHeGNJoFJNUnnUGoBlmZ6w=";

  # some necessary files are absent in the crate version
  doCheck = false;
@@ -2,32 +2,21 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
-  fetchpatch2,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-spellcheck";
-  version = "0.15.1";
+  version = "0.15.2";

  src = fetchFromGitHub {
    owner = "drahnr";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-o4gvTF9Zb6bZ9443zos4bz37w3bXKumW2x425MM5/FY=";
+    hash = "sha256-KiulbQhSg5CCZlts8FLsfOrN7nz16u3gRnQrWTFAzdc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-wEcHMzeSj/JO/ZBPmQAiHaixtOTCT2+rTd1LDCY9wqc=";
-
-  patches = [
-    # fixes compilation of tests
-    # https://github.com/drahnr/cargo-spellcheck/pull/342
-    (fetchpatch2 {
-      name = "fix-test-compilation.patch";
-      url = "https://github.com/drahnr/cargo-spellcheck/pull/342/commits/aed8f3ca7a50fae38a5c6e0b974ed9773cd6c659.patch";
-      hash = "sha256-840t8uPg0EiiVppmMT38C1P16vps7F+g0o313tzghjE=";
-    })
-  ];
+  cargoHash = "sha256-iDulfKsw3Ui5b1v7QakIcf7HXNEBlMbhbzqLekuSsUU=";

  nativeBuildInputs = [ rustPlatform.bindgenHook ];

@@ -35,6 +24,8 @@ rustPlatform.buildRustPackage rec {

  checkFlags = [
    "--skip=checker::hunspell::tests::hunspell_binding_is_sane"
+    # requires dictionaries
+    "--skip=tests::e2e::issue_226"
  ];

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

 python3Packages.buildPythonApplication rec {
  pname = "charmcraft";
-  version = "3.2.2";
+  version = "3.4.2";

  pyproject = true;

@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
    owner = "canonical";
    repo = "charmcraft";
    tag = version;
-    hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";
+    hash = "sha256-6ucF0iQxQrFFz7jlaktYsB538W8jbX+Sw5hP0/VoYsk=";
  };

  postPatch = ''
@@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec {
    humanize
    jinja2
    jsonschema
+    pip
    pydantic
    python-dateutil
    pyyaml
@@ -51,11 +52,14 @@ python3Packages.buildPythonApplication rec {
  pythonRelaxDeps = [
    "urllib3"
    "craft-application"
+    "pip"
+    "pydantic"
  ];

  nativeCheckInputs =
    with python3Packages;
    [
+      freezegun
      hypothesis
      pyfakefs
      pytest-check
@@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "cue";
-  version = "0.11.2";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "cue-lang";
    repo = "cue";
-    rev = "v${version}";
-    hash = "sha256-OSsDgwjtjQw5YRuXi1K/HQtHyLh1aHtYDlQDAtdYeZM=";
+    tag = "v${version}";
+    hash = "sha256-/2oVu1zij+8/qdDl4gApsNqdKwb1O7q5Xcdc3/djGn8=";
  };

-  vendorHash = "sha256-jl8TR1kxame30l7DkfOEioWA9wK/ACTNofiTi++vjuI=";
+  vendorHash = "sha256-vkfXT8mAomQml/kQRb2VIi+D+jpc0qgE2AsJ8jK6LRQ=";

  subPackages = [ "cmd/*" ];

@@ -27,7 +27,7 @@ let
    doInstallCheck = false;
  });

-  version = "1.3.1";
+  version = "1.4";
 in
 rustPlatform.buildRustPackage {
  pname = "devenv";
@@ -37,11 +37,11 @@ rustPlatform.buildRustPackage {
    owner = "cachix";
    repo = "devenv";
    rev = "v${version}";
-    hash = "sha256-FhlknassIb3rKEucqnfFAzgny1ANmenJcTyRaXYwbA0=";
+    hash = "sha256-ax0264nOyPcTJvIJAnPKGfkfXQ8Oe8ZVFziKf3UV26o=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-8FuRxs4wRdMT/0ZGD1Cj12f0igzlAx3G5OW4IhB9hYk=";
+  cargoHash = "sha256-K06D4tD3IOCA7/iqQ7fhybsgcSmMxPUcoUi+VNPtgAY=";

  buildAndTestSubdir = "devenv";

@@ -45,13 +45,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.36.0";
+  version = "2.36.1";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    tag = finalAttrs.version;
-    hash = "sha256-pSPXSvomvQBps8ctF/PXaOP+7xBIRxNlRVIFVy8nxwY=";
+    hash = "sha256-gvhhYZ6wp3t+GNL8lyKaC6IHZXxu+CQo40rsJARNKY0=";
  };

  outputs = [
@@ -13,13 +13,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "firefly-iii";
-  version = "6.2.4";
+  version = "6.2.5";

  src = fetchFromGitHub {
    owner = "firefly-iii";
    repo = "firefly-iii";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-IBf34RPpQUH3U0tl8ljJpL9of6QNDOTyBg7Hc1ae+W8=";
+    hash = "sha256-EHxvp5L2/erFgXC9YkecWdMLP4KnTDbXzduFnED/6f0=";
  };

  buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  composerStrictValidation = true;
  strictDeps = true;

-  vendorHash = "sha256-LRcgWQPDLNCMbaJhaySDrcw95fXF4yVUc03SFnrteeM=";
+  vendorHash = "sha256-rhN5YMlzoGFZNYCNhG3OXFnGEPpGrbVAxCg4maF5/+c=";

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
    name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-K8zoX4UsD/hOpMZ5JCH3G9WBTUpJcXAertEaXaUGcys=";
+    hash = "sha256-PAAauxUJDDinGa2yQJmunyLMbDO2a3Whi2N7mEXyJ1s=";
  };

  composerRepository = php84.mkComposerRepository {
@@ -0,0 +1,13 @@
+{
+  "flet_ads": "sha256-uvfhwfuhw0by5CN9Z9VAUKrH9s2S4ltOf/93PDdGGKM=",
+  "flet_audio": "sha256-3xr0pYUylBNvswNvRath10A/EuCr4mTrTFjvlUAVgJQ=",
+  "flet_audio_recorder": "sha256-gOgd+6XZ0KJUG7bvxqyr5IjsNL/dy9RsJ0wbtMVr3bM=",
+  "flet_flashlight": "sha256-a/WnJdrSjM0FrYm/HghbocyGTMpT2xfa90z/Zv+Bp1Y=",
+  "flet_geolocator": "sha256-ZXt9rYWHr27FBzlQT1uxg5/l2E7JX1tDI3WgChx9DAs=",
+  "flet_lottie": "sha256-tpoMiI+rpD5HSqIsDvo0QNkwN4nifG3rJkUlVSHWNzM=",
+  "flet_map": "sha256-k42GK37MGdMI/QM04GuF0LQ6AAaL7mrZ6z9IGObYhYM=",
+  "flet_permission_handler": "sha256-Lj0bHcERjdfgUAbvPW7z58fAWT/BfKEJkBhNUrNVG9o=",
+  "flet_rive": "sha256-X8MRlnktjd5v0dfi9wvPvgl8lTgexfocgf5/ja7UpWk=",
+  "flet_video": "sha256-IfUkld4TZgtkIL1l1vmWFoCAzgVOEtALosmvkBZVq1M=",
+  "flet_webview": "sha256-wvypCJx5OuNYWcJMiW3L05PQI9ZY1tONebujI+EJu4E="
+}
@@ -1,35 +1,37 @@
 { lib
 , fetchFromGitHub
 , pkg-config
-, flutter324
+, flutter327
 , gst_all_1
 , libunwind
 , makeWrapper
 , mimalloc
 , orc
-, yq
-, runCommand
+, python3
+, nix
 , gitUpdater
+, nix-prefetch-git
 , mpv-unwrapped
 , libplacebo
 , _experimental-update-script-combinators
-, flet-client-flutter
 , fletTarget ? "linux"
 }:

-flutter324.buildFlutterApplication rec {
+flutter327.buildFlutterApplication rec {
  pname = "flet-client-flutter";
-  version = "0.25.2";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "flet-dev";
    repo = "flet";
    tag = "v${version}";
-    hash = "sha256-bD44MCRZPXB/xuw2vBCzNbRNSVgdc4GyyWg3F2adxKk=";
+    hash = "sha256-KmZ13QiZeZ6jljs2wibetbACfNODGJ47II8XcRAxoX4=";
  };

  sourceRoot = "${src.name}/client";

+  gitHashes = lib.importJSON ./git_hashes.json;
+
  cmakeFlags = [
    "-DMIMALLOC_LIB=${mimalloc}/lib/mimalloc.o"
  ];
@@ -59,16 +61,12 @@ flutter324.buildFlutterApplication rec {
  ;

  passthru = {
-    pubspecSource = runCommand "pubspec.lock.json" {
-        buildInputs = [ yq ];
-        inherit (flet-client-flutter) src;
-      } ''
-      cat $src/client/pubspec.lock | yq > $out
-    '';
-
    updateScript = _experimental-update-script-combinators.sequence [
      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "flet-client-flutter.pubspecSource" ./pubspec.lock.json)
+      {
+        command = ["env" "PATH=${lib.makeBinPath [(python3.withPackages (p: [p.pyyaml])) nix-prefetch-git nix]}" "python3" ./update-lockfiles.py ];
+        supportedFeatures = ["silent"];
+      }
    ];
  };

@@ -154,11 +154,11 @@
      "dependency": "transitive",
      "description": {
        "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.0"
    },
    "cross_file": {
      "dependency": "transitive",
@@ -210,6 +210,26 @@
      "source": "hosted",
      "version": "0.7.10"
    },
+    "device_info_plus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "device_info_plus",
+        "sha256": "b37d37c2f912ad4e8ec694187de87d05de2a3cb82b465ff1f65f65a2d05de544",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "11.2.1"
+    },
+    "device_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "device_info_plus_platform_interface",
+        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.2"
+    },
    "dio": {
      "dependency": "transitive",
      "description": {
@@ -301,112 +321,134 @@
      "version": "0.69.0"
    },
    "flet": {
-      "dependency": "direct main",
+      "dependency": "direct overridden",
      "description": {
        "path": "../packages/flet",
        "relative": true
      },
      "source": "path",
-      "version": "0.25.1"
+      "version": "0.26.0"
    },
    "flet_ads": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_ads",
-        "relative": true
+        "path": "src/flutter/flet_ads",
+        "ref": "0.1.0",
+        "resolved-ref": "01e7065fcbebb1317b3f16951e6cf0c5fcff658b",
+        "url": "https://github.com/flet-dev/flet-ads.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_audio": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_audio",
-        "relative": true
+        "path": "src/flutter/flet_audio",
+        "ref": "0.1.0",
+        "resolved-ref": "a146bf580a211c6d1f5c45070d15532ea2e92af7",
+        "url": "https://github.com/flet-dev/flet-audio.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_audio_recorder": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_audio_recorder",
-        "relative": true
+        "path": "src/flutter/flet_audio_recorder",
+        "ref": "0.1.0",
+        "resolved-ref": "eb186cd49fde3136f65d0d074bca5ca688260e53",
+        "url": "https://github.com/flet-dev/flet-audio-recorder.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_flashlight": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_flashlight",
-        "relative": true
+        "path": "src/flutter/flet_flashlight",
+        "ref": "0.1.0",
+        "resolved-ref": "a12a12259eaac801ee99d465727ec4a9fe50121e",
+        "url": "https://github.com/flet-dev/flet-flashlight.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_geolocator": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_geolocator",
-        "relative": true
+        "path": "src/flutter/flet_geolocator",
+        "ref": "0.1.0",
+        "resolved-ref": "7b17d7aab169a7488da90fd73b3acd8e568f4f03",
+        "url": "https://github.com/flet-dev/flet-geolocator.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.25.2"
    },
    "flet_lottie": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_lottie",
-        "relative": true
+        "path": "src/flutter/flet_lottie",
+        "ref": "0.1.0",
+        "resolved-ref": "f28c767b5d43de650155a5a97e2d971fb833c9f8",
+        "url": "https://github.com/flet-dev/flet-lottie.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_map": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_map",
-        "relative": true
+        "path": "src/flutter/flet_map",
+        "ref": "0.1.0",
+        "resolved-ref": "dfa3cf6776b0dc5f238227d5f378cda7be190eaf",
+        "url": "https://github.com/flet-dev/flet-map.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_permission_handler": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_permission_handler",
-        "relative": true
+        "path": "src/flutter/flet_permission_handler",
+        "ref": "0.1.0",
+        "resolved-ref": "4ead86b6c7e54b914215b6087fcb17b7e921d75c",
+        "url": "https://github.com/flet-dev/flet-permission-handler.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_rive": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_rive",
-        "relative": true
+        "path": "src/flutter/flet_rive",
+        "ref": "0.1.0",
+        "resolved-ref": "089f7ad923f747ad764aa2781eca9a36382bb912",
+        "url": "https://github.com/flet-dev/flet-rive.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_video": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_video",
-        "relative": true
+        "path": "src/flutter/flet_video",
+        "ref": "0.1.0",
+        "resolved-ref": "76f3f76f04c7573e047204648378ee2f31db7a15",
+        "url": "https://github.com/flet-dev/flet-video.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flet_webview": {
      "dependency": "direct main",
      "description": {
-        "path": "../packages/flet_webview",
-        "relative": true
+        "path": "src/flutter/flet_webview",
+        "ref": "0.1.0",
+        "resolved-ref": "b1cfb3155469bc0a9a7578afcd58e7f32669b164",
+        "url": "https://github.com/flet-dev/flet-webview.git"
      },
-      "source": "path",
-      "version": "0.25.1"
+      "source": "git",
+      "version": "0.1.0"
    },
    "flutter": {
      "dependency": "direct main",
@@ -714,21 +756,21 @@
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.7"
    },
    "leak_tracker_flutter_testing": {
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.8"
    },
    "leak_tracker_testing": {
      "dependency": "transitive",
@@ -1234,21 +1276,21 @@
      "dependency": "transitive",
      "description": {
        "name": "rive",
-        "sha256": "b44b62feb908610ca6c85e05f4573a66118a23867425926cf06152d171236141",
+        "sha256": "2551a44fa766a7ed3f52aa2b94feda6d18d00edc25dee5f66e72e9b365bb6d6c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.13.17"
+      "version": "0.13.20"
    },
    "rive_common": {
      "dependency": "transitive",
      "description": {
        "name": "rive_common",
-        "sha256": "a3e5786f8d85c89977062b9ceeb3b72a7c28f81e32fb68497744042ce20bee2f",
+        "sha256": "2ba42f80d37a4efd0696fb715787c4785f8a13361e8aea9227c50f1e78cf763a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.4.12"
+      "version": "0.4.15"
    },
    "safe_local_storage": {
      "dependency": "transitive",
@@ -1464,7 +1506,7 @@
      "dependency": "transitive",
      "description": "flutter",
      "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
    },
    "source_span": {
      "dependency": "transitive",
@@ -1490,11 +1532,11 @@
      "dependency": "transitive",
      "description": {
        "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.0"
    },
    "stream_channel": {
      "dependency": "transitive",
@@ -1510,11 +1552,11 @@
      "dependency": "transitive",
      "description": {
        "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
    },
    "sync_http": {
      "dependency": "transitive",
@@ -1550,11 +1592,11 @@
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.3"
    },
    "torch_light": {
      "dependency": "transitive",
@@ -1750,11 +1792,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "14.2.5"
+      "version": "14.3.0"
    },
    "volume_controller": {
      "dependency": "transitive",
@@ -1810,11 +1852,11 @@
      "dependency": "transitive",
      "description": {
        "name": "webdriver",
-        "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e",
+        "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.3"
+      "version": "3.0.4"
    },
    "webview_flutter": {
      "dependency": "transitive",
@@ -1876,6 +1918,16 @@
      "source": "hosted",
      "version": "5.5.3"
    },
+    "win32_registry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32_registry",
+        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.4"
+    },
    "window_manager": {
      "dependency": "transitive",
      "description": {
@@ -0,0 +1,42 @@
+from argparse import ArgumentParser
+from pathlib import Path
+import json
+import subprocess
+import yaml
+
+THIS_FOLDER = Path(__file__).parent
+FLAKE_DIR = THIS_FOLDER
+while True:
+    assert str(FLAKE_DIR) != '/'
+    if (FLAKE_DIR / "flake.nix").exists():
+        break
+    FLAKE_DIR = FLAKE_DIR.parent
+
+source = Path(subprocess.run(['nix-build', FLAKE_DIR, '-A', 'flet-client-flutter.src', '--no-out-link'], stdout=subprocess.PIPE).stdout.decode('utf-8').strip())
+assert source.is_absolute()
+
+source_pubspec_lock = source / "client" / "pubspec.lock"
+
+output_pubspec = THIS_FOLDER / "pubspec.lock.json"
+output_git_hashes = THIS_FOLDER / "git_hashes.json"
+
+data = yaml.safe_load(source_pubspec_lock.open('r'))
+output_pubspec.write_text(json.dumps(data, indent=2) + "\n")
+
+output_data = {}
+
+def hash_git(package):
+    print(package)
+    resolved_ref = package['resolved-ref']
+    url = package['url']
+    full_output = subprocess.run(['nix-prefetch-git', '--url', url, '--rev', resolved_ref], stdout=subprocess.PIPE).stdout.decode('utf-8')
+    json_output = json.loads(full_output)
+    return json_output['hash']
+
+for name, package in data['packages'].items():
+    if package['source'] != 'git':
+        continue
+    hash = hash_git(package['description'])
+    output_data[name] = hash
+
+output_git_hashes.write_text(json.dumps(output_data, indent=2) + "\n")
@@ -97,19 +97,19 @@ linkFarm name [
    };
  }
  {
-    name = "1220a2c8f8db1b5265458ac967ea1f7cc0a8ddcd1d774df3b73d86c4f529aadbfb94";
+    name = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f";
    path = fetchZigArtifact {
      name = "tracy";
-      url = "https://github.com/neurocyte/zig-tracy/archive/58999b786089e5319dd0707f6afbfca04c6340e7.tar.gz";
-      hash = "sha256-4q1UD2hRtp9mUPL5wIKzk8AhnAoVkl9xpaUN5sp4mWA=";
+      url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz";
+      hash = "sha256-otvs9tKc8zMRFng0VJDn5iNf7lvbozjrtH0q8IFnP0w=";
    };
  }
  {
-    name = "12202aac930cebaf2b57f443cacc2483478580a72f1316b4f0a720ddd91246fce69d";
+    name = "122051b30656170b4628580e571d98b1fe45d7c0d581bc2d45e894c75c6376294ede";
    path = fetchZigArtifact {
      name = "tracy_src";
-      url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.10.tar.gz";
-      hash = "sha256-p2AX2Sjz8nJ1QPuVDt07c2yql7Etu05e3OZlQsvqZgA=";
+      url = "https://github.com/neurocyte/tracy/archive/0ff0a1b324f497cf313a445637b7df25aabefb47.tar.gz";
+      hash = "sha256-dzMilJsOSdjNyvhyDb1v5dPWcR5uvhnQmsBynAJH74I=";
    };
  }
  {
@@ -121,11 +121,11 @@ linkFarm name [
    };
  }
  {
-    name = "1220f6fdc977fff899aaf624afc8cf01e29a0e100dbb52860902a3bc256f4ddd687b";
+    name = "1220bbfd147f41fa49d2e5406096f3529c62e9335f4d2a89ae381e679a76ce398f1f";
    path = fetchZigArtifact {
      name = "thespian";
-      url = "https://github.com/neurocyte/thespian/archive/9df7beb192dd0db647e55fe44272b77ca687f6cd.tar.gz";
-      hash = "sha256-b8PPqmiURT9bOaa2ubz/v0J2WEyRmtL6iL4nBDkvgeQ=";
+      url = "https://github.com/neurocyte/thespian/archive/db3ad5f45e707a04eaa51aa657995abe43ce967a.tar.gz";
+      hash = "sha256-La5pv08xPAnkNxBHjpTmLpKxrcifRFWcqm8NYp92iRA=";
    };
  }
  {
@@ -137,11 +137,11 @@ linkFarm name [
    };
  }
  {
-    name = "1220b2109e0aadf85e4ac5e1cd084e321fe50f1e59cea690c022a7a8f7eb6021eadb";
+    name = "1220e4f3baf09dc23e48616f7dbf00bd45c3034faa2eddede7bb45ef4c23a19b962b";
    path = fetchZigArtifact {
      name = "themes";
-      url = "https://github.com/neurocyte/flow-themes/releases/download/master-0c2a187c604c63031225847a966b6ca279b2be91/flow-themes.tar.gz";
-      hash = "sha256-8zumZneeSPVrpw2wAQwKoEOXCLYqkKQFVXQ8oum08Hw=";
+      url = "https://github.com/neurocyte/flow-themes/releases/download/master-8b79cf6d79373c142393ec26a81b19f4701f4372/flow-themes.tar.gz";
+      hash = "sha256-xy0cTVc85U6JpI+oca2XKXE7GAs0EId21DeQCDa8+n0=";
    };
  }
  {
@@ -153,11 +153,11 @@ linkFarm name [
    };
  }
  {
-    name = "12202ee9842d28927674e552f1ea41e2c41e59f6b4b5d290de9b6fd626fd332ac627";
+    name = "12207e33747072d878fce61f587c133124dc95f4ae8aab7d2b3f467699586af07c77";
    path = fetchZigArtifact {
      name = "vaxis";
-      url = "https://github.com/neurocyte/libvaxis/archive/ffe35b4342bd2913efd46c35c0ccd15544ac87e6.tar.gz";
-      hash = "sha256-AQpYS1WnHLzcUMhD8BaCd+Dh+nqY5umL6KCBTuVlSQw=";
+      url = "https://github.com/neurocyte/libvaxis/archive/d899244bc0a3775b59c18e90eb41acee11675f96.tar.gz";
+      hash = "sha256-8bK0zM6rD/mqTaHDZKMgS3+qV1VviImM9jr9D0lkPdw=";
    };
  }
  {
@@ -185,11 +185,19 @@ linkFarm name [
    };
  }
  {
-    name = "12204c99c6093230023380068f386f7eb32ab83df9a8eb8b586ffe5aa44afa34ff0e";
+    name = "1220925614447b54ccc9894bbba8b202c6a8b750267890edab7732064867e46f3217";
+    path = fetchZigArtifact {
+      name = "win32";
+      url = "https://github.com/marlersoft/zigwin32/archive/259b6f353a48968d7e3171573db4fd898b046188.tar.gz";
+      hash = "sha256-N9Jp2vmq1+xPWByb+VZkbS2lm9FCrUW4UBAPhSP+dUw=";
+    };
+  }
+  {
+    name = "1220f9702ca6257f5464b31e576b1e92b0f441bf0e61733c4a2fbf95b7c0c55a3e22";
    path = fetchZigArtifact {
      name = "tree-sitter";
-      url = "https://github.com/neurocyte/tree-sitter/releases/download/master-aea6072c6178d5cd0c97fff33e130f632f355bc2/source.tar.gz";
-      hash = "sha256-eqJc3lx+tnbiqcD8R0u4+sH7wKOr4McYiZNUfPTNbRc=";
+      url = "https://github.com/neurocyte/tree-sitter/releases/download/master-69775ce3ba8a5e331bba9feb760d1ba31394eea7/source.tar.gz";
+      hash = "sha256-0ZLcPuhUV6Z3EsXfU7gXRrG/nRP9zuLRSL00Q5OGnus=";
    };
  }
 ]
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "flow";
-  version = "0.2.1";
+  version = "0.3.2";

  src = fetchFromGitHub {
    owner = "neurocyte";
    repo = "flow";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dXWqxV66BwtjOvmreq4+u5+xBI+1v1PAep8RQBK3rlA=";
+    hash = "sha256-D1pFP5tw323UJgWvLvh2sTiZG1hq5DP0FakdXEISRxs=";
  };
  postPatch = ''
    ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
@@ -24,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: {
    zig_0_13.hook
  ];

+  passthru.updateScript = ./update.sh;
+
  env.VERSION = finalAttrs.version;

  meta = {
@@ -0,0 +1,19 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash common-updater-scripts gnused nixfmt-rfc-style
+
+latest_tag=$(list-git-tags --url=https://github.com/neurocyte/flow | sed 's/^v//' | tail -n 1)
+
+update-source-version flow-editor "$latest_tag"
+
+mkdir -p src/syntax
+
+wget "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/build.zig.zon"
+wget -P src/syntax "https://raw.githubusercontent.com/neurocyte/flow/v${latest_tag}/src/syntax/build.zig.zon"
+
+nix --extra-experimental-features 'nix-command flakes' run github:Cloudef/zig2nix#zon2nix -- build.zig.zon >pkgs/by-name/fl/flow-editor/build.zig.zon.nix
+
+# strip file protocol
+sed -i '\|file = unpackZigArtifact { inherit name; artifact = /. + path; };|d' pkgs/by-name/fl/flow-editor/build.zig.zon.nix
+nixfmt pkgs/by-name/fl/flow-editor/build.zig.zon.nix
+
+rm -rf build.zig.zon build.zig.zon2json-lock src/
@@ -6,7 +6,7 @@
 }:
 let
  pname = "git-upstream";
-  version = "1.2.0";
+  version = "1.5.0";
 in
 rustPlatform.buildRustPackage {
  inherit pname version;
@@ -15,11 +15,11 @@ rustPlatform.buildRustPackage {
    owner = "9999years";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-GnsqZSztDLXMO4T16nfcOKMKXap88CJzJ5nObzGwhMA=";
+    hash = "sha256-ooqz2Xp/nljx2+zQsc/RjVbGG/5YTeggU6pB8lGK0o8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-DzRiRUCsTslldnSNByaCr5eQGKxyTSifL2duZnMTmNk=";
+  cargoHash = "sha256-oIrUjb+yJgDR5GYrG3hPLpXYJynR9eeX00emcrcjmZY=";

  meta = {
    homepage = "https://github.com/9999years/git-upstream";
@@ -4,27 +4,38 @@
  fetchFromGitHub,
  makeWrapper,
  hyprland-workspaces,
+  installShellFiles,
  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
  pname = "hyprland-workspaces-tui";
-  version = "1.0.2";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "Levizor";
    repo = "hyprland-workspaces-tui";
    tag = version;
-    hash = "sha256-3QmqoyWmtC4ps8dtIWEoLjzdzKAXOujyz+GgOlo172Q=";
+    hash = "sha256-QMwiBQGAybdL8FaUil6tFzSFg4nN/9mGVoqiDFwGZec=";
  };

  useFetchCargoVendor = true;

-  cargoHash = "sha256-VjYLqRXJhR8MZD+qcwqgw36Xh0RafJeAnuHzO+pab4s=";
+  cargoHash = "sha256-aT8LfBVOEVUvzgPlBIOXTgT+WXEt3vHMDyCcl9jT5/E=";

-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];

  buildInputs = [ hyprland-workspaces ];

+  postInstall = ''
+    installShellCompletion --cmd hyprland-workspaces-tui \
+      --bash <($out/bin/hyprland-workspaces-tui --completions bash) \
+      --zsh <($out/bin/hyprland-workspaces-tui --completions zsh) \
+      --fish <($out/bin/hyprland-workspaces-tui --completions fish)
+  '';
+
  postFixup = ''
    wrapProgram $out/bin/hyprland-workspaces-tui \
      --suffix PATH : ${lib.makeBinPath [ hyprland-workspaces ]}
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ncurses,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "msnake";
+  # last release tag was 13 years ago
+  version = "0.1.1-unstable-2020-02-01";
+
+  src = fetchFromGitHub {
+    owner = "mogria";
+    repo = "msnake";
+    rev = "830967fc8195216120fedcac1574113b367a0f9a";
+    hash = "sha256-5q3yT7amPF+SSvO6/eUU7IiK0k6f3nme9YYBUobSuuo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    ncurses
+  ];
+
+  meta = {
+    description = "Multiplatform command line snake game";
+    homepage = "https://github.com/mogria/msnake";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    mainProgram = "msnake";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+  };
+})
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ndpi";
-  version = "4.12";
+  version = "4.10";

  src = fetchFromGitHub {
    owner = "ntop";
    repo = "nDPI";
    tag = finalAttrs.version;
-    hash = "sha256-jdyKvM/Tb9pRWQPxpB/UQOOKamWrTS24Ofc3M5M1Zso=";
+    hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
  };

  nativeBuildInputs = [
@@ -81,6 +81,16 @@ stdenv.mkDerivation (finalAttrs: {
        -i include/ntop_defines.h
  '';

+  # Upstream build system makes
+  # $out/share/ntopng/httpdocs/geoip/README.geolocation.md a dangling symlink
+  # to ../../doc/README.geolocation.md. Copying the whole doc/ tree adds over
+  # 70 MiB to the output size, so only copy the files we need for now.
+  # (Ref. noBrokenSymlinks.)
+  postInstall = ''
+    mkdir -p "$out/share/ntopng/doc"
+    cp -r doc/README.geolocation.md "$out/share/ntopng/doc/"
+  '';
+
  enableParallelBuilding = true;

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

 buildGoModule rec {
  pname = "patch2pr";
-  version = "0.31.0";
+  version = "0.32.0";

  src = fetchFromGitHub {
    owner = "bluekeyes";
    repo = "patch2pr";
    rev = "v${version}";
-    hash = "sha256-DiPgfpXXp8uB3PTjtSIN+1eKLBqy0AcNVQDnBmHM2u4=";
+    hash = "sha256-WYNvHwikY6ULEar2ZBvsALEgHuZarrwBjk3ZaGhvlk8=";
  };

-  vendorHash = "sha256-nn/jCMLw77KOegcEOLCdZVc9wcmrMnVkEkmSUkNan2s=";
+  vendorHash = "sha256-Y7WpJ6h76+5BJonmDldXYzUxLH6YYl9zlitoqX3H/mk=";

  ldflags = [
    "-X main.version=${version}"
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "pik";
-  version = "0.15.0";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "jacek-kurlit";
    repo = "pik";
    rev = version;
-    hash = "sha256-iXLAV4VWJczdxrfevxaRxYTAL+d/VRQ61zc0B4UNbPM=";
+    hash = "sha256-L5r8ds5Avh6WqiYYg/0hVDjdp/TBGgCZgKnJoDzs7Rw=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-nTx44lQFd1GSVNyCtiShml4+ho4k+o0m8zmMV9xLVSs=";
+  cargoHash = "sha256-d2I4RDo/U+69WwXjxHRsRNUxY2ymxzHqObR6X68xXRo=";

  passthru.tests.version = testers.testVersion { package = pik; };

@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "Reposilite";
-  version = "3.5.20";
+  version = "3.5.21";

  src = fetchurl {
    url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-IdUHtulkSKvXatAs+BmzXgwv9oJz1XeRVtpEyIZ7BY4=";
+    hash = "sha256-jE9wCShscLp3rUbybd35kBL4UvvENExuUlJXr55qnow=";
  };

  dontUnpack = true;
@@ -40,10 +40,10 @@ makeScopeWithSplicing' {
      ) { };
    }
    // builtins.mapAttrs (name: hash: self.fetchPlugin { inherit name hash; }) {
-      checksum = "sha256-k9JWyDj7wMB8kLihqR7gB5N//NKxTrDWoFQ4Jt422I0=";
-      groovy = "sha256-iwlLMHh9A6WIHYo4sN2TIISif9pWbe6i1Hofd4D3BsI=";
-      migration = "sha256-0p4DQeaCH/i2e8MESPIbOgaSPF0pHIbs1rXiZcSCJso=";
-      prometheus = "sha256-bCJvTQPXW3mydOqz5Tug6MyIEonrRiJ9NkIYy9OviDc=";
-      swagger = "sha256-akKRMibzA4UtGpwcHvmjXKPLzpA2pcGPpaBkDsdvcK0=";
+      checksum = "sha256-s7GADQqFsoEDM2vtJFE/C/F5jGyQeYlT3BntvHS4DtQ=";
+      groovy = "sha256-8HWMqZZNIqCBpkMuCjKxqTLcQ2dYaOAAYON9QrXYEyo=";
+      migration = "sha256-Xv0+RsXZzyGV/4v0IT3hfNANiC1OWVYFoTZHDxduKh0=";
+      prometheus = "sha256-F5fSUo6wt7L3R/xCike0SlfG3CyxHKrlrg+SNrUYtm4=";
+      swagger = "sha256-wyXKrYBhigHVtxq/RZiJhnigc3Z/UCbYotrF6VLLTGA=";
    };
 }
@@ -11,13 +11,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "rockcraft";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "canonical";
    repo = "rockcraft";
    rev = version;
-    hash = "sha256-2Bo3qtpSSfNvqszlt9cCc9/rurDNDMySAaqLbvRmjjw=";
+    hash = "sha256-v7biDGgJoQO6cKRXG8xosCgd/mlOUEwHrqcgtL2R5L4=";
  };

  pyproject = true;
@@ -14,13 +14,13 @@
 let
  drv = stdenv.mkDerivation (finalAttrs: {
    pname = "sasquatch";
-    version = "4.5.1-4";
+    version = "4.5.1-5";

    src = fetchFromGitHub {
      owner = "onekey-sec";
      repo = "sasquatch";
      rev = "sasquatch-v${finalAttrs.version}";
-      hash = "sha256-0itva+j5WMKvueiUaO253UQ1S6W29xgtFvV4i3yvMtU=";
+      hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
    };

    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
@@ -4,17 +4,46 @@
  fetchFromGitHub,
  nixosTests,
 }:
+let
+  python = python3.override {
+    packageOverrides = final: prev: {
+      httpx = prev.httpx.overridePythonAttrs (old: rec {
+        version = "0.27.2";
+        src = old.src.override {
+          tag = version;
+          hash = "sha256-N0ztVA/KMui9kKIovmOfNTwwrdvSimmNkSvvC+3gpck=";
+        };
+      });

-python3.pkgs.toPythonModule (
-  python3.pkgs.buildPythonApplication rec {
+      httpx-socks = prev.httpx-socks.overridePythonAttrs (old: rec {
+        version = "0.9.2";
+        src = old.src.override {
+          tag = "v${version}";
+          hash = "sha256-PUiciSuDCO4r49st6ye5xPLCyvYMKfZY+yHAkp5j3ZI=";
+        };
+      });
+
+      starlette = prev.starlette.overridePythonAttrs (old: {
+        disabledTests = old.disabledTests or [ ] ++ [
+          # fails in assertion with spacing issue
+          "test_request_body"
+          "test_request_stream"
+          "test_wsgi_post"
+        ];
+      });
+    };
+  };
+in
+python.pkgs.toPythonModule (
+  python.pkgs.buildPythonApplication rec {
    pname = "searxng";
-    version = "0-unstable-2025-01-10";
+    version = "0-unstable-2025-02-09";

    src = fetchFromGitHub {
      owner = "searxng";
      repo = "searxng";
-      rev = "94a0b415ef587e013df9e7350667b752a3822e90";
-      hash = "sha256-ZeFHsoQXmG2sZXhPY7aRTsAXmFGHNT5ig0c2Hy344vw=";
+      rev = "a1e2b254677a22f1f8968a06564661ac6203c162";
+      hash = "sha256-DrSj1wQUWq9xVuQqt0BZ79JgyRS9qJqg1cdYTIBb1A8=";
    };

    postPatch = ''
@@ -41,7 +70,7 @@ python3.pkgs.toPythonModule (
      '';

    dependencies =
-      with python3.pkgs;
+      with python.pkgs;
      [
        babel
        brotli
@@ -73,10 +102,10 @@ python3.pkgs.toPythonModule (
    postInstall = ''
      # Create a symlink for easier access to static data
      mkdir -p $out/share
-      ln -s ../${python3.sitePackages}/searx/static $out/share/
+      ln -s ../${python.sitePackages}/searx/static $out/share/

      # copy config schema for the limiter
-      cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml
+      cp searx/limiter.toml $out/${python.sitePackages}/searx/limiter.toml
    '';

    passthru = {
@@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "sing-box";
-  version = "1.11.1";
+  version = "1.11.3";

  src = fetchFromGitHub {
    owner = "SagerNet";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-W/b3pAyeTQiBZ5T8u74JITlAfJ5fmWn8DUUTw9tAZTk=";
+    hash = "sha256-TaCz3IS+t4v7p/gT19DCP5ARM3nvFqDPGtMv/Vvwmtk=";
  };

-  vendorHash = "sha256-NWHDEN7aQWR3DXp9nFNhxDXFMeBsCk8/ZzCcT/zgwmI=";
+  vendorHash = "sha256-Ix4Pzq+yGfaJNPJnhLGgcCzZ85hGjSU24NffMR3ZSxQ=";

  tags = [
    "with_quic"
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "slirp4netns";
-  version = "1.3.1";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "rootless-containers";
    repo = "slirp4netns";
    rev = "v${version}";
-    sha256 = "sha256-dXz5gNALrVjaFGUgEFp0k47c7aWDzwLMflphe6R6GaM=";
+    sha256 = "sha256-1OiomraQ4wfrBPihGrf9sq8hPJUB45gvf7Y5j7iN8/E=";
  };

  nativeBuildInputs = [
@@ -19,13 +19,13 @@ let
 in
 buildDotnetModule rec {
  pname = "slskd";
-  version = "0.22.1";
+  version = "0.22.2";

  src = fetchFromGitHub {
    owner = "slskd";
    repo = "slskd";
    tag = version;
-    hash = "sha256-2IMEkNc7LqevTwsW6r6WR+2xH760wFYT5/S8dvjOz4o=";
+    hash = "sha256-Arf/QOq0wYely+CYwb4sJXsxB2BbEHZ2bUNyqeGbFdg=";
  };

  nativeBuildInputs = [
@@ -1,13 +0,0 @@
-diff --git a/snapcraft/utils.py b/snapcraft/utils.py
-index 999a64ec..4f38b4cd 100644
--- a/snapcraft/utils.py
-+++ b/snapcraft/utils.py
-@@ -94,7 +94,7 @@ def get_os_platform(
-     release = platform.release()
-     machine = platform.machine()
- 
-    if system == "Linux":
-+    if system == "Linux" and "NixOS" not in platform.version():
-         try:
-             with filepath.open("rt", encoding="utf-8") as release_file:
-                 lines = release_file.readlines()
@@ -13,7 +13,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "snapcraft";
-  version = "8.5.1";
+  version = "8.6.1";

  pyproject = true;

@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
    owner = "canonical";
    repo = "snapcraft";
    tag = version;
-    hash = "sha256-7kIVWbVj5qse3JIdlCvRtVUfSa/rSjn4e8HJdVY3sOA=";
+    hash = "sha256-SbxsgvDptkUl8gHAIrJvnzIPOh0/R81n8cgJWBH7BXQ=";
  };

  patches = [
@@ -29,11 +29,6 @@ python3Packages.buildPythonApplication rec {
    # path for LXD must be adjusted so that it's at the correct location for LXD
    # on NixOS. This patch will likely never be accepted upstream.
    ./lxd-socket-path.patch
-    # In certain places, Snapcraft expects an /etc/os-release file to determine
-    # host info which doesn't exist in our test environment. This is a
-    # relatively naive patch which helps the test suite pass - without it *many*
-    # of the tests fail. This patch will likely never be accepted upstream.
-    ./os-platform.patch
    # Snapcraft will try to inject itself as a snap *from the host system* into
    # the build system. This patch short-circuits that logic and ensures that
    # Snapcraft is installed on the build system from the snap store - because
@@ -118,6 +113,7 @@ python3Packages.buildPythonApplication rec {
  build-system = with python3Packages; [ setuptools ];

  pythonRelaxDeps = [
+    "craft-parts"
    "docutils"
    "jsonschema"
    "pygit2"
@@ -17,17 +17,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "uv";
-  version = "0.5.29";
+  version = "0.5.30";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    tag = version;
-    hash = "sha256-EWm1sjmDAmMQoGoRqgtFMlXwi8n/iCdahsoRERhhulc=";
+    hash = "sha256-a56y7sf2Os5ygTSu+iNZFjWwKi3HQ9VKo7p7e6LXmUc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-gBygAspjCzZqDnjHH4J1WUsrIjpiB55Vr33qj1nv+FM=";
+  cargoHash = "sha256-rodzLpaCuokvHWvwXLB2qgPnDJaP+Qff1T4LfNCQsYM=";

  nativeBuildInputs = [
    cmake
@@ -9,14 +9,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "waypaper";
-  version = "2.4";
+  version = "2.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anufrievroman";
    repo = "waypaper";
    tag = version;
-    hash = "sha256-bNh8WWSLgCV8PLFvDn/+AEcNOazxMEKEYv7n+L9ABTA=";
+    hash = "sha256-g1heJUBVJzRZXcNQCwRcqp6cTUaroKVpcTjG0KldlxU=";
  };

  nativeBuildInputs = [
@@ -29,7 +29,6 @@ python3.pkgs.buildPythonApplication rec {
  dependencies = [
    python3.pkgs.pygobject3
    python3.pkgs.platformdirs
-    python3.pkgs.importlib-metadata
    python3.pkgs.pillow
    python3.pkgs.imageio
    python3.pkgs.imageio-ffmpeg
@@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "wxsqlite3";
-  version = "4.10.2";
+  version = "4.10.3";

  src = fetchFromGitHub {
    owner = "utelle";
    repo = "wxsqlite3";
    rev = "v${version}";
-    hash = "sha256-i9f6rzydsdh5wIkSUp1ZSzH1z08B9S8kpWLdElaAv9M=";
+    hash = "sha256-XoGysM5Btm9MdeaS2eAOEn7j/Do0+1sqC/tGIkWnkxw=";
  };

  nativeBuildInputs = [
@@ -13,13 +13,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "xwayland-satellite";
-  version = "0.5";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "Supreeeme";
    repo = "xwayland-satellite";
    tag = "v${version}";
-    hash = "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=";
+    hash = "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=";
  };

  postPatch = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
  '';

  useFetchCargoVendor = true;
-  cargoHash = "sha256-1IsKt+OfezILaDklHts74TnS0/FVogu6Ds/7JG+ataY=";
+  cargoHash = "sha256-1tt7YNornw9U9FRdsRkdWx3Al3FZtvtCBXn9Pln+gk4=";

  nativeBuildInputs = [
    makeBinaryWrapper
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "zsh-abbr";
-  version = "6.0.1";
+  version = "6.1.0";

  src = fetchFromGitHub {
    owner = "olets";
    repo = "zsh-abbr";
    rev = "v${version}";
-    hash = "sha256-PWr8o0so2ZfQJkinkLRa4bFxZtw0Lgs7UXVWvd/rWF0";
+    hash = "sha256-M2HBVC72RA0OUBUz8AaJMEsGMNrRzS2Kz8QLSplxP9o=";
    fetchSubmodules = true;
  };

@@ -1,10 +1,10 @@
 { callPackage, flutterPackages }:
 {
  calculator = callPackage ./calculator {
-    flutter = flutterPackages.v3_19;
+    flutter = flutterPackages.v3_24;
  };

  file-manager = callPackage ./file-manager {
-    flutter = flutterPackages.v3_19;
+    flutter = flutterPackages.v3_24;
  };
 }
@@ -1,41 +0,0 @@
-From dd74740ddceac81e748a7e7834c28135abc59454 Mon Sep 17 00:00:00 2001
-From: Brandon DeRosier <bdero@google.com>
-Date: Tue, 16 Jan 2024 11:00:34 -0800
-Subject: [PATCH] [Flutter GPU] Fix playground shader paths. (#49790)
-
-Resolves https://github.com/flutter/flutter/issues/140969.
-
-Makes the shader paths absolute to prevent issues caused by the working
-directory differing across build environments.
---
- impeller/fixtures/BUILD.gn  | 3 ++-
- impeller/tools/impeller.gni | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/impeller/fixtures/BUILD.gn b/impeller/fixtures/BUILD.gn
-index 9165f06542a2a..5ea90ab3969f3 100644
--- a/impeller/fixtures/BUILD.gn
-+++ b/impeller/fixtures/BUILD.gn
-@@ -131,7 +131,8 @@
-     "flutter_gpu_texture.vert",
-   ]
-   shader_target_flags = [ "--runtime-stage-metal" ]
-  shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"../../flutter/impeller/fixtures/flutter_gpu_texture.vert\"}}"
-+  fixtures = rebase_path("//flutter/impeller/fixtures")
-+  shader_bundle = "{\"UnlitFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_unlit.frag\"}, \"UnlitVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_unlit.vert\"}, \"TextureFragment\": {\"type\": \"fragment\", \"file\": \"${fixtures}/flutter_gpu_texture.frag\"}, \"TextureVertex\": {\"type\": \"vertex\", \"file\": \"${fixtures}/flutter_gpu_texture.vert\"}}"
-   shader_bundle_output = "playground.shaderbundle"
- }
-
-diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
-index 6541c3b12173b..2ab7ec0f0b07a 100644
--- a/impeller/tools/impeller.gni
-+++ b/impeller/tools/impeller.gni
-@@ -313,7 +313,7 @@
-   if (defined(invoker.shader_bundle)) {
-     assert(
-         defined(invoker.shader_bundle_output),
-        "When shader_bundle is specified, shader_output_bundle must also be specified.")
-+        "When shader_bundle is specified, shader_bundle_output must also be specified.")
-   }
- 
-   sksl = false
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
--- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
-    registerArtifact(PubDependencies(
-      logger: logger,
-      // flutter root and pub must be lazily initialized to avoid accessing
-      // before the version is determined.
-      flutterRoot: () => Cache.flutterRoot!,
-      pub: () => pub,
-      projectFactory: projectFactory,
-    ));
-   }
- }
- 
@@ -1,13 +0,0 @@
-diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
-index 75d9d3013e..657ad3cb78 100644
--- a/bin/internal/shared.sh
-+++ b/bin/internal/shared.sh
-@@ -245,7 +245,7 @@ function shared::execute() {
-   # and will corrupt each others' downloads.
-   #
-   # SHARED_NAME itself is prepared by the caller script.
-  upgrade_flutter 7< "$SHARED_NAME"
-+  # upgrade_flutter 7< "$SHARED_NAME"
- 
-   BIN_NAME="$(basename "$PROG_NAME")"
-   case "$BIN_NAME" in
@@ -1,37 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-index b7e624b4e2..edfdde118b 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-@@ -1554,7 +1554,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
- 
-     // Populate the cache. We call this before pub get below so that the
-     // sky_engine package is available in the flutter cache for pub to find.
-    if (shouldUpdateCache) {
-+    if (false) {
-       // First always update universal artifacts, as some of these (e.g.
-       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
-       final bool offline;
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 5d6d78639f..90a4dfa555 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -297,7 +297,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.flutterUsage.suppressAnalytics = true;
-         }
- 
-        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
-         final bool ci = await globals.botDetector.isRunningOnBot;
-         final bool redirectedCompletion = !globals.stdio.hasTerminal &&
-@@ -306,11 +305,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-         final bool versionCheckFlag = topLevelResults[FlutterGlobalOptions.kVersionCheckFlag] as bool? ?? false;
-         final bool explicitVersionCheckPassed = topLevelResults.wasParsed(FlutterGlobalOptions.kVersionCheckFlag) && versionCheckFlag;
- 
-        if (topLevelResults.command?.name != 'upgrade' &&
-            (explicitVersionCheckPassed || (versionCheckFlag && !isMachine))) {
-          await globals.flutterVersion.checkFlutterVersionFreshness();
-        }
-
-         // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-         if (specifiedDeviceId != null) {
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
--- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
@@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "gleam";
-  version = "1.8.0";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "gleam-lang";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-gBVr4kAec8hrDBiRXa/sQUNYvgSX3nTVMwFGYRFCbSA=";
+    hash = "sha256-Qt2VQhbiNNORrGUR5LHeBb0q/EIqPNPz/adljj6xpS4=";
  };

  nativeBuildInputs = [
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
    ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-tYSqE+bn0GUQe/xVBZTh37XsMyzFnmxgVCL0II2/3jQ=";
+  cargoHash = "sha256-7oawxv1s8BJsOxGuADKjf4XqJ/UT+zYOrPQCbQljArM=";

  passthru.updateScript = nix-update-script { };

@@ -49,11 +49,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "go";
-  version = "1.24rc3";
+  version = "1.24.0";

  src = fetchurl {
    url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-LHEopY9iz9706vaOe5vxh/P/6i7AZ1SmTW7ja/6j1pE=";
+    hash = "sha256-0UEgYUrLKdEryrcr1onyV+tL6eC2+IqPt+Qaxl+FVuU=";
  };

  strictDeps = true;
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildDunePackage,
+  fetchurl,
+  angstrom,
+  base64,
+  bigstringaf,
+  fmt,
+  ke,
+  logs,
+  pecu,
+  prettym,
+  unstrctrd,
+  uutf,
+}:
+
+buildDunePackage rec {
+  pname = "multipart_form";
+  version = "0.6.0";
+
+  src = fetchurl {
+    url = "https://github.com/dinosaure/multipart_form/releases/download/v${version}/multipart_form-${version}.tbz";
+    hash = "sha256-oOMpwyPP+q1BZ81a+HpooeaglUZgDxdz2MDNLygGIRY=";
+  };
+
+  propagatedBuildInputs = [
+    angstrom
+    base64
+    bigstringaf
+    fmt
+    ke
+    logs
+    pecu
+    prettym
+    unstrctrd
+    uutf
+  ];
+
+  meta = {
+    description = "Implementation of RFC7578 in OCaml";
+    homepage = "https://github.com/dinosaure/multipart_form";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
@@ -0,0 +1,17 @@
+{
+  buildDunePackage,
+  multipart_form,
+  lwt,
+}:
+
+buildDunePackage {
+  pname = "multipart_form-lwt";
+
+  inherit (multipart_form) version src meta;
+
+  propagatedBuildInputs = [
+    lwt
+    multipart_form
+
+  ];
+}
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "cart";
-  version = "1.2.2";
+  version = "1.2.3";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "CybercentreCanada";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-0dHdXb4v92681xL21FsrIkNgNQ9R5ULV1lnSCITZzP8=";
+    hash = "sha256-oeWeay1Pr9T4oR3XSrwv9hRr/sLTel1Bt6BG6jHXxIA=";
  };

  propagatedBuildInputs = [ pycryptodome ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
    description = "Python module for the CaRT Neutering format";
    mainProgram = "cart";
    homepage = "https://github.com/CybercentreCanada/cart";
-    changelog = "https://github.com/CybercentreCanada/cart/releases/tag/v${version}";
+    changelog = "https://github.com/CybercentreCanada/cart/releases/tag/${src.tag}";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
@@ -12,11 +12,10 @@
 buildPythonPackage rec {
  pname = "castepxbin";
  version = "0.3.0";
+  pyproject = true;

  disabled = pythonOlder "3.7";

-  format = "pyproject";
-
  src = fetchFromGitHub {
    owner = "zhubonan";
    repo = "castepxbin";
@@ -24,9 +23,13 @@ buildPythonPackage rec {
    hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE=";
  };

-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];

-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
    numpy
    scipy
  ];
@@ -22,7 +22,6 @@ buildPythonPackage rec {
    pname
    version
    src
-    meta
    ;
  pyproject = true;

@@ -55,4 +54,9 @@ buildPythonPackage rec {
  doCheck = false;

  pythonImportsCheck = [ "catboost" ];
+
+  meta = catboost.meta // {
+    # https://github.com/catboost/catboost/issues/2671
+    broken = lib.versionAtLeast numpy.version "2";
+  };
 }
@@ -30,21 +30,19 @@

 buildPythonPackage rec {
  pname = "craft-application";
-  version = "4.8.2";
+  version = "4.9.0";
  pyproject = true;

-  disabled = pythonOlder "3.10";
-
  src = fetchFromGitHub {
    owner = "canonical";
    repo = "craft-application";
    tag = version;
-    hash = "sha256-rKeEi9z5eQfjn0Q4FR6CVIz9YDS7Ejg4cqcor5wtz0s=";
+    hash = "sha256-DprItAuGjw8AACeJDrIa6KIWLSyImuWI0qeROpPohtM=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==75.2.0" "setuptools"
+      --replace-fail "setuptools==75.8.0" "setuptools"
  '';

  build-system = [ setuptools-scm ];
@@ -4,6 +4,8 @@
  fetchFromGitHub,
  nix-update-script,
  platformdirs,
+  jinja2,
+  overrides,
  pyyaml,
  setuptools-scm,
  pytest-check,
@@ -13,7 +15,7 @@

 buildPythonPackage rec {
  pname = "craft-cli";
-  version = "2.13.0";
+  version = "2.15.0";

  pyproject = true;

@@ -21,7 +23,7 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-cli";
    tag = version;
-    hash = "sha256-IqK+eU2z63yDMJrHAhETHWoTz5lWK1er9bwYH9Oml18=";
+    hash = "sha256-L8hOQJhjVAMo/WxEHHEk2QorlSdDFMGdcL/Q3Pv6mT4=";
  };

  postPatch = ''
@@ -32,6 +34,8 @@ buildPythonPackage rec {
  build-system = [ setuptools-scm ];

  dependencies = [
+    jinja2
+    overrides
    platformdirs
    pyyaml
  ];
@@ -1,19 +1,8 @@
 diff --git a/craft_parts/executor/step_handler.py b/craft_parts/executor/step_handler.py
-index 404df69..f90e2ac 100644
+index 5eab915..bc26252 100644
 --- a/craft_parts/executor/step_handler.py
 +++ b/craft_parts/executor/step_handler.py
-@@ -243,8 +243,9 @@ class StepHandler:
-                 print(script, file=script_file)
-                 script_file.flush()
-                 script_file.seek(0)
-+                import shutil
-                 process = subprocess.Popen(  # pylint: disable=consider-using-with
-                    ["/bin/bash"],
-+                    [shutil.which("bash")],
-                     stdin=script_file,
-                     cwd=work_dir,
-                     stdout=self._stdout,
-@@ -394,7 +395,8 @@ def _create_and_run_script(
+@@ -445,7 +445,8 @@ def _create_and_run_script(
 ) -> None:
     """Create a script with step-specific commands and execute it."""
     with script_path.open("w") as run_file:
@@ -22,12 +11,28 @@ index 404df69..f90e2ac 100644
 +        print(f"#!{shutil.which('bash')}", file=run_file)
         print("set -euo pipefail", file=run_file)
 
-         if build_environment_script_path:
+         if environment_script_path:
+diff --git a/craft_parts/plugins/java_plugin.py b/craft_parts/plugins/java_plugin.py
+index f2b4064..cb4e9e8 100644
+--- a/craft_parts/plugins/java_plugin.py
+++ b/craft_parts/plugins/java_plugin.py
+@@ -71,9 +71,8 @@ class JavaPlugin(Plugin):
+         return None, ""
+ 
+     def _find_javac(self) -> list[str]:
+-        cmd = ["find", "/usr/lib/jvm", "-path", "*/bin/javac", "-print"]
+-        output = subprocess.check_output(cmd, text=True)
+-        return [x for x in output.split("\n") if len(x) > 0]
+        import shutil
+        return [shutil.which("javac")]
+ 
+     @override
+     def get_build_environment(self) -> dict[str, str]:
 diff --git a/craft_parts/plugins/validator.py b/craft_parts/plugins/validator.py
-index b8d8f11..fce0e72 100644
+index 5b4c735..8ff30c2 100644
 --- a/craft_parts/plugins/validator.py
 +++ b/craft_parts/plugins/validator.py
-@@ -142,9 +142,9 @@ class PluginEnvironmentValidator:
+@@ -141,9 +141,9 @@ class PluginEnvironmentValidator:
             print(self._env, file=env_file)
             print(cmd, file=env_file)
             env_file.flush()
@@ -39,3 +44,56 @@ index b8d8f11..fce0e72 100644
                 check=True,
                 capture_output=True,
                 text=True,
+diff --git a/tests/unit/executor/test_step_handler.py b/tests/unit/executor/test_step_handler.py
+index 4e73c2b..b762fb8 100644
+--- a/tests/unit/executor/test_step_handler.py
+++ b/tests/unit/executor/test_step_handler.py
+@@ -209,9 +209,10 @@ class TestStepHandlerBuiltins:
+ 
+         assert get_mode(build_script_path) == 0o755
+         with open(build_script_path) as file:
+            import shutil
+             assert file.read() == dedent(
+                 f"""\
+-                #!/bin/bash
+                #!{shutil.which('bash')}
+                 set -euo pipefail
+                 source {environment_script_path}
+                 set -x
+diff --git a/tests/unit/utils/test_process.py b/tests/unit/utils/test_process.py
+index 84b29ad..dc2d772 100644
+--- a/tests/unit/utils/test_process.py
+++ b/tests/unit/utils/test_process.py
+@@ -33,7 +33,8 @@ _RUN_TEST_CASES = [
+ 
+ @pytest.mark.parametrize(("out", "err"), _RUN_TEST_CASES)
+ def test_run(out, err):
+-    result = process.run(["/usr/bin/sh", "-c", f"echo {out};sleep 0;echo {err} >&2"])
+    import shutil
+    result = process.run([shutil.which("sh"), "-c", f"echo {out};sleep 0;echo {err} >&2"])
+     assert result.returncode == 0
+     assert result.stdout == (out + "\n").encode()
+     assert result.stderr == (err + "\n").encode()
+@@ -42,8 +43,9 @@ def test_run(out, err):
+ 
+ @pytest.mark.parametrize(("out", "err"), _RUN_TEST_CASES)
+ def test_run_devnull(out, err):
+    import shutil
+     result = process.run(
+-        ["/usr/bin/sh", "-c", f"echo {out};echo {err} >&2"],
+        [shutil.which("sh"), "-c", f"echo {out};echo {err} >&2"],
+         stdout=subprocess.DEVNULL,
+         stderr=subprocess.DEVNULL,
+     )
+@@ -78,9 +80,10 @@ def test_run_selector(out, err, new_dir):
+ 
+     selector.register(sock, selectors.EVENT_READ, accept)
+ 
+    import shutil
+     result = process.run(
+         [
+-            "/usr/bin/sh",
+            shutil.which("sh"),
+             "-c",
+             f"echo {out};sleep 0;echo {err} >&2; echo -n {out}|socat - UNIX-CONNECT:{new_dir}/test.socket",
+         ],
@@ -18,13 +18,17 @@
  jsonschema,
  git,
  squashfsTools,
+  socat,
  setuptools-scm,
  stdenv,
+  ant,
+  maven,
+  jdk,
 }:

 buildPythonPackage rec {
  pname = "craft-parts";
-  version = "2.2.2";
+  version = "2.6.0";

  pyproject = true;

@@ -32,7 +36,7 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-parts";
    tag = version;
-    hash = "sha256-6ufcay1C2Qv3nnG0augnPWzwBVDMj1ypRwzHRAhHARA=";
+    hash = "sha256-SybDzprUrKeL+Jl7Gm4XYLlvmy056D1OtJB7v/W2flY=";
  };

  patches = [ ./bash-path.patch ];
@@ -57,14 +61,18 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "craft_parts" ];

  nativeCheckInputs = [
+    ant
    git
    hypothesis
+    jdk
    jsonschema
+    maven
    pytest-check
    pytest-mock
    pytest-subprocess
    pytestCheckHook
    requests-mock
+    socat
    squashfsTools
  ];

@@ -80,6 +88,8 @@ buildPythonPackage rec {
    "test_run_prime"
    "test_get_build_packages_with_source_type"
    "test_get_build_packages"
+    # Relies upon certain paths being present that don't make sense on Nix.
+    "test_java_plugin_jre_not_17"
  ];

  disabledTestPaths =
@@ -15,12 +15,12 @@
  responses,
  freezegun,
  pytest-subprocess,
-  pytest-logdog,
+  logassert,
 }:

 buildPythonPackage rec {
  pname = "craft-providers";
-  version = "2.1.0";
+  version = "2.1.1";

  pyproject = true;

@@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-providers";
    tag = version;
-    hash = "sha256-+j3uwvecffl8cK+yNidWbL243VnPkX72DMYv8RXMaXE=";
+    hash = "sha256-aW3efKy3c7ZGXS4wsvby0ww3Gwjt+1tMKsJCGprkcZo=";
  };

  patches = [
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    # The urllib3 incompat: https://github.com/msabramo/requests-unixsocket/pull/69
    # This is already patched in nixpkgs.
    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==73.0.1" "setuptools"
+      --replace-fail "setuptools==75.2.0" "setuptools"
  '';

  pythonRelaxDeps = [ "requests" ];
@@ -69,10 +69,10 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    freezegun
+    logassert
    pytest-check
    pytest-mock
    pytest-subprocess
-    pytest-logdog
    pytestCheckHook
    responses
  ];
@@ -25,7 +25,7 @@

 buildPythonPackage rec {
  pname = "craft-store";
-  version = "3.1.0";
+  version = "3.2.1";

  pyproject = true;

@@ -33,12 +33,12 @@ buildPythonPackage rec {
    owner = "canonical";
    repo = "craft-store";
    tag = version;
-    hash = "sha256-pTG0JJRoHjmcLg+lAgg53rvC+7d3TLlTLe+Rxhy8wqg=";
+    hash = "sha256-rJ7FXHDrJ7w+dFPBs7MhT4iqN6KCWaqrmlCni5kUEKI=";
  };

  postPatch = ''
    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==75.6.0" "setuptools"
+      --replace-fail "setuptools==75.8.0" "setuptools"
  '';

  build-system = [
@@ -1,27 +1,32 @@
 {
  lib,
  stdenv,
-  anytree,
  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
  setuptools,
+
+  # dependencies
+  anytree,
  cached-property,
  cgen,
  click,
  codepy,
  distributed,
-  fetchFromGitHub,
-  gcc,
  llvmPackages,
-  matplotlib,
  multidict,
  nbval,
  psutil,
  py-cpuinfo,
-  pytest-xdist,
-  pytestCheckHook,
-  pythonOlder,
  scipy,
  sympy,
+
+  # tests
+  gcc,
+  matplotlib,
+  pytest-xdist,
+  pytestCheckHook,
 }:

 buildPythonPackage rec {
@@ -29,8 +34,6 @@ buildPythonPackage rec {
  version = "4.8.11";
  pyproject = true;

-  disabled = pythonOlder "3.8";
-
  src = fetchFromGitHub {
    owner = "devitocodes";
    repo = "devito";
@@ -42,6 +45,9 @@ buildPythonPackage rec {
  postPatch = ''
    substituteInPlace requirements-testing.txt \
      --replace-fail 'pooch; python_version >= "3.8"' "pooch"
+
+    substituteInPlace tests/test_builtins.py \
+      --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent"
  '';

  pythonRemoveDeps = [ "pip" ];
@@ -99,6 +105,10 @@ buildPythonPackage rec {
      "test_stability_mpi"
      "test_subdomainset_mpi"
      "test_subdomains_mpi"
+
+      # Download dataset from the internet
+      "test_gs_2d_float"
+      "test_gs_2d_int"
    ]
    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
      # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
@@ -5,7 +5,7 @@
  fetchFromGitHub,

  # build-system
-  jaxlib,
+  setuptools,
  setuptools-scm,

  # dependencies
@@ -19,42 +19,43 @@
  tensorstore,
  typing-extensions,

-  # checks
+  # optional-dependencies
+  matplotlib,
+
+  # dependencies
  cloudpickle,
+  keras,
  einops,
  flaxlib,
-  keras,
  pytestCheckHook,
  pytest-xdist,
  sphinx,
  tensorflow,
  treescope,

-  # optional-dependencies
-  matplotlib,
-
  writeScript,
  tomlq,
 }:

 buildPythonPackage rec {
  pname = "flax";
-  version = "0.10.1";
+  version = "0.10.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "google";
    repo = "flax";
    tag = "v${version}";
-    hash = "sha256-+URbQGnmqmSNgucEyWvI5DMnzXjpmJzLA+Pho2lX+S4=";
+    hash = "sha256-PRKdtltiBVX9p6Sjw4sCDghqxYRxq4L9TLle1vy5dkk=";
  };

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

  dependencies = [
+    flaxlib
    jax
    msgpack
    numpy
@@ -63,6 +64,7 @@ buildPythonPackage rec {
    pyyaml
    rich
    tensorstore
+    treescope
    typing-extensions
  ];

@@ -74,24 +76,18 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    cloudpickle
-    einops
-    flaxlib
    keras
+    einops
    pytestCheckHook
    pytest-xdist
    sphinx
    tensorflow
-    treescope
-  ];
-
-  pytestFlagsArray = [
-    "-W ignore::FutureWarning"
-    "-W ignore::DeprecationWarning"
  ];

  disabledTestPaths = [
    # Docs test, needs extra deps + we're not interested in it.
    "docs/_ext/codediff_test.py"
+
    # The tests in `examples` are not designed to be executed from a single test
    # session and thus either have the modules that conflict with each other or
    # wrong import paths, depending on how they're invoked. Many tests also have
@@ -99,23 +95,16 @@ buildPythonPackage rec {
    # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them
    # would be limited anyway.
    "examples/*"
+
    # See https://github.com/google/flax/issues/3232.
    "tests/jax_utils_test.py"
  ];

-  disabledTests =
-    [
-      # Failing with AssertionError since the jax update to 0.5.0
-      "test_basic_demo_single"
-      "test_batch_norm_multi_init"
-      "test_multimetric"
-      "test_split_merge"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
-      "test_ref_changed"
-      "test_structure_changed"
-    ];
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
+    "test_ref_changed"
+    "test_structure_changed"
+  ];

  passthru = {
    updateScript = writeScript "update.sh" ''
@@ -1,12 +1,37 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  flax,
  tomlq,
-  rustPlatform,
-  pytestCheckHook,
+  python,
+
+  # build-system
+  meson-python,
+  nanobind,
+  ninja,
+
+  # nativeBuildInputs
+  cmake,
+  pkg-config,
 }:

+let
+  nanobind-wrapper = stdenv.mkDerivation {
+    pname = "nanobind-wrapper";
+    inherit (nanobind) version;
+
+    src = ./nanobind-wrapper;
+
+    nativeBuildInputs = [
+      cmake
+    ];
+
+    buildFlags = [ "nanobind-static" ];
+
+    env.CMAKE_PREFIX_PATH = "${nanobind}/${python.sitePackages}/nanobind";
+  };
+in
 buildPythonPackage rec {
  pname = "flaxlib";
  version = "0.0.1-a1";
@@ -14,7 +39,7 @@ buildPythonPackage rec {

  inherit (flax) src;

-  sourceRoot = "${src.name}/flaxlib";
+  sourceRoot = "${src.name}/flaxlib_src";

  postPatch = ''
    expected_version="$version"
@@ -28,34 +53,21 @@ buildPythonPackage rec {
    fi
  '';

-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit
-      pname
-      version
-      src
-      sourceRoot
-      ;
-    hash = "sha256-CN/ZbDxdCQPEuLfxPh/m+JtlFDkerO8aWgAaUwhixjQ=";
-  };
+  dontUseCmakeConfigure = true;

-  nativeBuildInputs = [
-    rustPlatform.maturinBuildHook
-    rustPlatform.cargoSetupHook
+  build-system = [
+    meson-python
+    nanobind
+    ninja
  ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+  buildInputs = [ nanobind-wrapper ];

  pythonImportsCheck = [ "flaxlib" ];

-  nativeCheckInputs = [
-    pytestCheckHook
-  ];
-
-  env = {
-    # https://github.com/google/flax/issues/4491
-    # Upstream should update Cargo.lock
-    # Enabling `PYO3_USE_ABI3_FORWARD_COMPATIBILITY` allows us to temporarily avoid the issue
-    PYO3_USE_ABI3_FORWARD_COMPATIBILITY = true;
-  };
-
  # This package does not have tests (yet ?)
  doCheck = false;

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.31)
+project(nanobind-wrapper)
+
+find_package(Python COMPONENTS Interpreter Development REQUIRED)
+find_package(nanobind CONFIG REQUIRED)
+nanobind_build_library(nanobind-static)
+set_property(TARGET nanobind-static PROPERTY EXPORT_NAME nanobind)
+install(TARGETS nanobind-static EXPORT nanobind-static)
+install(EXPORT nanobind-static FILE nanobindConfig.cmake DESTINATION lib/nanobind/cmake)
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  flake8,
+  structlog,
+}:
+
+buildPythonPackage rec {
+  pname = "logassert";
+  version = "8.2";
+
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "facundobatista";
+    repo = "logassert";
+    tag = version;
+    hash = "sha256-wtSX1jAHanHCF58cSNluChWY3lrrsgludnnW+xVJuOo=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "logassert" ];
+
+  nativeCheckInputs = [
+    flake8
+    pytestCheckHook
+    structlog
+  ];
+
+  meta = {
+    description = "A simple Log Assertion mechanism for Python unittests";
+    homepage = "https://github.com/facundobatista/logassert";
+    changelog = "https://github.com/facundobatista/logassert/releases/tag/${version}";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ jnsgruk ];
+    platforms = lib.platforms.linux;
+  };
+}
@@ -44,6 +44,8 @@ buildPythonPackage rec {
    requests
  ];

+  pythonRelaxDeps = true;
+
  pythonImportsCheck = [ "macaroonbakery" ];

  nativeCheckInputs = [
@@ -10,14 +10,14 @@

 buildPythonPackage {
  pname = "migen";
-  version = "0.9.2-unstable-2025-01-16";
+  version = "0.9.2-unstable-2025-02-07";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "m-labs";
    repo = "migen";
-    rev = "28e913e7114dae485747ccd8f9fd436ada2195f0";
-    hash = "sha256-5Rv7R8OO/CsjdDreo+vCUO7dIrTD+70meV5rIvHOGDk=";
+    rev = "2828df54594673653a641ab551caf6c6b1bfeee5";
+    hash = "sha256-GproDJowtcgbccsT+I0mObzFhE483shcS8MSszKXwlc=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -10,16 +10,16 @@

 buildPythonPackage rec {
  pname = "objsize";
-  version = "0.7.0";
+  version = "0.7.1";
  pyproject = true;

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "liran-funaro";
    repo = "objsize";
    tag = version;
-    hash = "sha256-wy4Tj+Q+4zymRdoN8Z7wcazJTb2lQ+XHY1Kta02R3R0=";
+    hash = "sha256-l0l80dMVWZqWBK4z53NCU+rKOQl6jRZ1zb2SmMnhs1k=";
  };

  nativeBuildInputs = [
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "prometheus-api-client";
-  version = "0.5.5";
+  version = "0.5.6";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "4n4nd";
    repo = "prometheus-api-client-python";
    tag = "v${version}";
-    hash = "sha256-tUu0+ZUOFxBCj//lHhNm88rhFbS01j1x508+nqIkCfQ=";
+    hash = "sha256-0vnG0m+RV2Z9GIMJ/R0edjcjyPH1OvB8zERCMeyRuRg=";
  };

  propagatedBuildInputs = [
@@ -47,7 +47,7 @@ buildPythonPackage rec {
      and performing various aggregation operations on the time series data.
    '';
    homepage = "https://github.com/4n4nd/prometheus-api-client-python";
-    changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.tag}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ azahi ];
  };
@@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "publicsuffixlist";
-  version = "1.0.2.20250207";
+  version = "1.0.2.20250211";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-wYOFcyEO9wH0lpEtrTCCDJKb4NQJ51BnJ8dysjsZwSM=";
+    hash = "sha256-ujbidDxlKcthvB90O2WJLLBRtmT69+rgzha4wAGJue8=";
  };

  build-system = [ setuptools ];
@@ -2,28 +2,39 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  pytest,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
 }:

 buildPythonPackage rec {
  pname = "py2bit";
-  version = "0.3.0";
-  format = "setuptools";
-
-  checkInput = [ pytest ];
+  version = "0.3.3";
+  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1vw2nvw1yrl7ikkqsqs1pg239yr5nspvd969r1x9arms1k25a1a5";
+    hash = "sha256-Jk9b/DnXKfGsrVTHYKwE+oog1BhPS1BdnDM9LgMlN3A=";
  };

-  meta = with lib; {
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "py2bitTest/test.py" ];
+
+  meta = {
    homepage = "https://github.com/deeptools/py2bit";
    description = "File access to 2bit files";
    longDescription = ''
      A python extension, written in C, for quick access to 2bit files. The extension uses lib2bit for file access.
    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ scalavision ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ scalavision ];
  };
 }
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "pyexcel-io";
-  version = "0.6.7";
+  version = "0.6.7.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pyexcel";
    repo = "pyexcel-io";
    tag = "v${version}";
-    hash = "sha256-fRayB+XKWpPson64lbJ0KvCK75+H2H2Kd18Jc7ocJPU=";
+    hash = "sha256-DBiHHiKXR26/WPJDmEZpRgjvJitFaidbV41Tvn0etLY=";
  };

  build-system = [ setuptools ];
@@ -1,15 +1,21 @@
 {
  lib,
  buildPythonPackage,
-  dask,
-  fetchPypi,
-  numba,
-  numpy,
-  pytest7CheckHook,
-  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
  setuptools,
  setuptools-scm,
+
+  # dependencies
+  numba,
+  numpy,
  scipy,
+
+  # tests
+  dask,
+  pytest-cov-stub,
+  pytestCheckHook,
 }:

 buildPythonPackage rec {
@@ -17,18 +23,13 @@ buildPythonPackage rec {
  version = "0.15.5";
  pyproject = true;

-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY=";
+  src = fetchFromGitHub {
+    owner = "pydata";
+    repo = "sparse";
+    tag = version;
+    hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs=";
  };

-  postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" ""
-  '';
-
  build-system = [
    setuptools
    setuptools-scm
@@ -42,22 +43,23 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    dask
-    pytest7CheckHook
+    pytest-cov-stub
+    pytestCheckHook
  ];

  pythonImportsCheck = [ "sparse" ];

-  pytestFlagsArray = [
-    "-W"
-    "ignore::pytest.PytestRemovedIn8Warning"
-  ];
-
-  meta = with lib; {
+  meta = {
    description = "Sparse n-dimensional arrays computations";
    homepage = "https://sparse.pydata.org/";
    changelog = "https://sparse.pydata.org/en/stable/changelog.html";
    downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    badPlatforms = [
+      # Most tests fail with: Fatal Python error: Segmentation fault
+      # numba/typed/typedlist.py", line 344 in append
+      "aarch64-linux"
+    ];
  };
 }
@@ -20,8 +20,8 @@
        "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc"
    },
    "6.6": {
-        "version": "6.6.76",
-        "hash": "sha256:180kxgacwx7kr76gls8gw4zrrdrqb9xf6fjmmfi38h66y0aqn5l1"
+        "version": "6.6.77",
+        "hash": "sha256:0km855dnimg1clilnpcz293bd2gpbycvn3llm9kyynhjrzgqj408"
    },
    "6.11": {
        "version": "6.11.11",
@@ -18,20 +18,20 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
  pname = "matrix-synapse";
-  version = "1.123.0";
+  version = "1.124.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "element-hq";
    repo = "synapse";
    rev = "v${version}";
-    hash = "sha256-fbT0DMz6F76e/IRb0e1nFEOxmtIDQ53it8zi88jiUDU=";
+    hash = "sha256-hL1MdngaAVqgdN8GS9m3jn4twsbX0GPFa5cq+SCJ1oI=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-Lfs7myNxWoPZI4USoK+aaTPLjT2EoEvnVnXFwdcKofE=";
+    hash = "sha256-OIrjBhjSavJubpcMtHLrfuK7uhfNd+AHKUmHno32yo4=";
  };

  postPatch = ''
@@ -2,34 +2,48 @@
 , stdenv
 , rustPlatform
 , fetchFromGitHub
+, installShellFiles
 , IOKit
 , Security
 }:

 rustPlatform.buildRustPackage rec {
  pname = "oxigraph";
-  version = "0.3.22";
+  version = "0.4.7";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8=";
+    hash = "sha256-xkmCfOLlNvQe8VwUS/jFHACxzo8RwIvX3jGGarj1LSg=";
    fetchSubmodules = true;
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-UnXWBq+oS7tXFCsOhlTkq0L1j8pqzXZ0QKrdYayLunA=";
+  cargoHash = "sha256-sAAwQnV7p7x0bQb/VIJ9hh+UncYB6aGRorjhD2wgosk=";

  nativeBuildInputs = [
    rustPlatform.bindgenHook
+    installShellFiles
  ];
  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Security ];

-  cargoBuildFlags = [ "--package" "oxigraph_server" ];
+  buildAndTestSubdir = "cli";
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ "rustls-webpki" "geosparql" ];

-  # requires packaging of the associated python modules
-  doCheck = false;
+  # Man pages and autocompletion
+  postInstall = ''
+    MAN_DIR="$(find target/*/release -name man)"
+    installManPage "$MAN_DIR"/*.1
+    COMPLETE_DIR="$(find target/*/release -name complete)"
+    installShellCompletion --bash --name oxigraph.bash "$COMPLETE_DIR/oxigraph.bash"
+    installShellCompletion --fish --name oxigraph.fish "$COMPLETE_DIR/oxigraph.fish"
+    installShellCompletion --zsh --name _oxigraph "$COMPLETE_DIR/_oxigraph"
+  '';
+
+  cargoCheckNoDefaultFeatures = true;
+  cargoCheckFeatures = buildFeatures;

  meta = with lib; {
    homepage = "https://github.com/oxigraph/oxigraph";
@@ -37,6 +51,6 @@ rustPlatform.buildRustPackage rec {
    platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ];
    maintainers = with maintainers; [ astro ];
    license = with licenses; [ asl20 mit ];
-    mainProgram = "oxigraph_server";
+    mainProgram = "oxigraph";
  };
 }
@@ -6,13 +6,6 @@ import ../generic.nix (
    hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o=";
    vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA=";
    yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY=";
-    cargoLock = {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "boring-4.4.0" = "sha256-4wdl2kIA5oHQ0H6IddKQ+B5kRwrTeMbKe1+tAYZt2uw=";
-        "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA=";
-        "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
-      };
-    };
+    cargoHash = "sha256-IQi11Hpavj4pImwjxU6uoHQ+vjwc/++NuWXREcIKH3s=";
  }
 )
@@ -6,12 +6,6 @@ import ../generic.nix (
    hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA=";
    vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI=";
    pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE=";
-    cargoLock = {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8=";
-        "ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0=";
-      };
-    };
+    cargoHash = "sha256-6JYSW65ou8iC4/7AJVZ9+vpItxpJtaGFA4Nm3fgyHIs=";
  }
 )
@@ -0,0 +1,11 @@
+{ wasm-bindgen-cli, ... }@args:
+import ../generic.nix (
+  args
+  // {
+    version = "17.2.1";
+    hash = "sha256-QlBj3zGnELgQJMIMSZK1YVE3H2hO09Xgdtcw0BML7KQ=";
+    vendorHash = "sha256-Y3og6oifpQIZxkKR1qgD3l06YaCFpSlh/+jN3w0gq7M=";
+    pnpmHash = "sha256-ChRWq0acDzHhm6JK2W3V6LZHlq4vXMxa1AMqiCPIouc=";
+    cargoHash = "sha256-GDwH/2aiqvTbLC8/x/n0yLuU8IEBVpyacN2B+EGwBgE=";
+  }
+)
@@ -3,6 +3,8 @@
  lib,
  wasm-bindgen-cli_0_2_92,
  wasm-bindgen-cli_0_2_95,
+  buildGo122Module,
+  buildGo123Module,
  ...
 }@args:
 let
@@ -12,15 +14,24 @@ let
      args
      // {
        wasm-bindgen-cli = wasm-bindgen-cli_0_2_92;
+        buildGoModule = buildGo122Module;
      }
    );
    teleport_16 = import ./16 (
      args
      // {
        wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
+        buildGoModule = buildGo122Module;
      }
    );
    teleport = teleport_16;
+    teleport_17 = import ./17 (
+      args
+      // {
+        wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
+        buildGoModule = buildGo123Module;
+      }
+    );
  };
  # Ensure the following callPackages invocation includes everything 'generic' needs.
  f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));
@@ -30,5 +41,7 @@ callPackages f' (
    "callPackages"
    "wasm-bindgen-cli_0_2_92"
    "wasm-bindgen-cli_0_2_95"
+    "buildGo122Module"
+    "buildGo123Module"
  ]
 )
@@ -32,7 +32,6 @@
  vendorHash,
  extPatches ? [ ],
  cargoHash ? null,
-  cargoLock ? null,
  yarnHash ? null,
  pnpmHash ? null,
 }:
@@ -50,7 +49,8 @@ let

  rdpClient = rustPlatform.buildRustPackage rec {
    pname = "teleport-rdpclient";
-    inherit cargoHash cargoLock;
+    useFetchCargoVendor = true;
+    inherit cargoHash;
    inherit version src;

    buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
@@ -84,7 +84,10 @@ let
    pname = "teleport-webassets";
    inherit src version;

-    cargoDeps = rustPlatform.importCargoLock cargoLock;
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      inherit src;
+      hash = cargoHash;
+    };

    pnpmDeps =
      if pnpmHash != null then
@@ -1,16 +1,16 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.149.0";
+  version = "3.150.0";
  pulumiPkgs = {
    x86_64-linux = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-x64.tar.gz";
-        sha256 = "01q8q78q4f5d3nrv419lwsjrcvb1rbpjb2khwnrnijy808jgm5pz";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-linux-x64.tar.gz";
+        sha256 = "0pdr4przwkbr10c4cyfcvsh0x5lsmdvqcxdifnl7la04si6mla3b";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-amd64.tar.gz";
-        sha256 = "0zqzlxmrz3ifs7dazhgjzmphdmg5g56kz1bi9s2iajhm22bxy7qm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-linux-amd64.tar.gz";
+        sha256 = "1k78fsnifcrknr4xlzy30j4rjcz8811h7pnw1dsnqvqzcrjs9zas";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-amd64.tar.gz";
@@ -41,8 +41,8 @@
        sha256 = "0h3zym30gj8lyj294zj3dimdl2wdir2vmymvv6wr392f9i22m2yn";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-amd64.tar.gz";
-        sha256 = "1brri4avf40fsa4374xil103mw9xm9s7vlcg6b44p9m3a9pczm5s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-linux-amd64.tar.gz";
+        sha256 = "19d2q12zs0dmsr6djhy7y35bqjax9mhixa4gz8lv4g78zc9vfkkx";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-amd64.tar.gz";
@@ -163,12 +163,12 @@
    ];
    x86_64-darwin = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-x64.tar.gz";
-        sha256 = "17j0ilhqx08avrllkf72lfrzzhrv6k551a1vdag5xvkcsakcy9ik";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-darwin-x64.tar.gz";
+        sha256 = "1c07s1xcys8r7jdnikkv0s03b7y003cvybijqmwxfq89wn95g5x9";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-amd64.tar.gz";
-        sha256 = "16364hqjbdy6zjrvmkz1ry434y1fblcbzyrlc0cipjb1nwf92yhp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-darwin-amd64.tar.gz";
+        sha256 = "1hxyr5wzasqr7spxvw450vz82ckf9g53zhz9dkzj6yzpg1dbw8qd";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-amd64.tar.gz";
@@ -199,8 +199,8 @@
        sha256 = "1j952sjqhp42a1s8fxn5li8mjfvl9as3ydhwdpslx8pzc8ykr2zj";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-amd64.tar.gz";
-        sha256 = "0m7h5dgwh2bz14lmncxaa7n97vgrp0fy65ll5q8jjw49s5a7jrnh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-darwin-amd64.tar.gz";
+        sha256 = "1038d064l47m2058d9vpbl81d793h9q58whhxqs7vmc2wg99050c";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-amd64.tar.gz";
@@ -321,12 +321,12 @@
    ];
    aarch64-linux = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-linux-arm64.tar.gz";
-        sha256 = "09yvl92bxdnz1796rsqjw0dxkw84s4c0gv69acd358wc1lv6ff2m";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-linux-arm64.tar.gz";
+        sha256 = "1dyw5yfxb5l9bbjafdr5x5sm6j045cj44gigr50px5gci7h7cy3c";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-linux-arm64.tar.gz";
-        sha256 = "06w7740rf3nz36zi1pzpvz1nj36k36kqxiahl7zndw8zbbjq7sda";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-linux-arm64.tar.gz";
+        sha256 = "06sxs66cdavs7bgs3b0mr1ywlsfgbdf1ikhyicllq9nnf8hw11ca";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-linux-arm64.tar.gz";
@@ -357,8 +357,8 @@
        sha256 = "1d4a5xyx55mscqq4wqgvilfagk8mg49xnhwp5vx1i274kgdq7a7z";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-linux-arm64.tar.gz";
-        sha256 = "0m93phlw0ixxvlsnv3g425clh4bf0j14w409pgkzig23zjanxrr0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-linux-arm64.tar.gz";
+        sha256 = "1xcv4py5g7wdah5xdfz01ppp5x9wa8ha27zi3afx83d5anz3g49n";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-linux-arm64.tar.gz";
@@ -479,12 +479,12 @@
    ];
    aarch64-darwin = [
      {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.149.0-darwin-arm64.tar.gz";
-        sha256 = "0k01fdxydlw488wqvisxabp82z0a954g8zzjyavi06lik5qkab7y";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.150.0-darwin-arm64.tar.gz";
+        sha256 = "0hbc63ki7h7m99f2v83rg1kicsl3jd4pjvc1fcmvs4zfzhwyvxl3";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.0-darwin-arm64.tar.gz";
-        sha256 = "15771vs6kvb031z5d66x6ii77aqwq3i79qr8k1h6dl6v807dgcgc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.33.1-darwin-arm64.tar.gz";
+        sha256 = "1inxcss49ikfmxsyvv30c3ikqzzmr2p4643y40mv4fri6dnbk9dp";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.6.1-darwin-arm64.tar.gz";
@@ -515,8 +515,8 @@
        sha256 = "1x4ij8qv9jq39fbacirjvk96hc117da5ll3fzrmgpkvjc1mall01";
      }
      {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.18.0-darwin-arm64.tar.gz";
-        sha256 = "095lx9kxhq564wlp4q7d58ma2llx3daiiq8q2svn25nc6gs527fx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.19.0-darwin-arm64.tar.gz";
+        sha256 = "065600j782v38w4hrbyqn0l6871s2j8s08xk560m145jnzza9p4x";
      }
      {
        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.49.0-darwin-arm64.tar.gz";
@@ -12,7 +12,12 @@ let
    oldMeta:
    oldMeta
    // {
-      maintainers = (oldMeta.maintainers or [ ]) ++ (with lib.maintainers; [ vringar ]);
+      maintainers =
+        (oldMeta.maintainers or [ ])
+        ++ (with lib.maintainers; [
+          vringar
+          ivyfanchiang
+        ]);
      platforms = oldMeta.platforms or ghidra.meta.platforms;
    };

@@ -23,6 +23,8 @@ lib.makeScope newScope (self: {

  gnudisassembler = self.callPackage ./extensions/gnudisassembler { inherit ghidra; };

+  kaiju = self.callPackage ./extensions/kaiju { };
+
  lightkeeper = self.callPackage ./extensions/lightkeeper { };

  machinelearning = self.callPackage ./extensions/machinelearning { inherit ghidra; };
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGhidraExtension,
+  z3,
+  gradle,
+}:
+let
+  ghidraPlatformName =
+    {
+      x86_64-linux = "linux_x86_64";
+      aarch64-linux = "linux_x86_64";
+      x86_64-darwin = "mac_x86_64";
+      aarch64-darwin = "mac_arm_64";
+    }
+    .${stdenv.hostPlatform.system}
+      or (throw "${stdenv.hostPlatform.system} is an unsupported platform");
+
+  z3_lib = (
+    z3.override {
+      javaBindings = true;
+      jdk = gradle.jdk;
+    }
+  );
+
+  self = buildGhidraExtension rec {
+    pname = "kaiju";
+    version = "241204";
+
+    src = fetchFromGitHub {
+      owner = "CERTCC";
+      repo = "kaiju";
+      rev = version;
+      hash = "sha256-xJLdazqPQISB58Pfj4eQzdnTNhiuzO2Qwo61Q4L1m6M=";
+    };
+
+    buildInputs = [
+      z3_lib
+    ];
+
+    # used to copy java bindings from nixpkgs z3 package instead of having kaiju's build.gradle build gradle from source
+    # https://github.com/CERTCC/kaiju/blob/c9dbb55484b3d2a6abd9dfca2197cd00fb7ee3c1/build.gradle#L189
+    preBuild = ''
+      mkdir -p build/cmake/z3/java-bindings
+      ln -s ${lib.getOutput "lib" z3_lib}/lib/com.microsoft.z3.jar build/cmake/z3/java-bindings
+      mkdir -p os/${ghidraPlatformName}
+      cp ${lib.getOutput "lib" z3_lib}/lib/* os/${ghidraPlatformName}
+    '';
+
+    gradleFlags = [ "-PKAIJU_SKIP_Z3_BUILD=true" ];
+
+    mitmCache = gradle.fetchDeps {
+      pkg = self;
+      data = ./deps.json;
+    };
+
+    meta = {
+      description = "A Java implementation of some features of the CERT Pharos Binary Analysis Framework for Ghidra";
+      homepage = "https://github.com/CERTCC/kaiju";
+      downloadPage = "https://github.com/CERTCC/kaiju/releases/tag/${version}";
+      license = lib.licenses.bsd3;
+      maintainers = [ lib.maintainers.ivyfanchiang ];
+      platforms = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+    };
+  };
+in
+self
@@ -0,0 +1,163 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/adarshr#gradle-test-logger-plugin/4.0.0": {
+   "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=",
+   "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=",
+   "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE="
+  },
+  "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": {
+   "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc="
+  },
+  "com/github/tomtzook#castle/2.0.0": {
+   "jar": "sha256-00zgaBUmlsBRQcXYStVP4PhRNglOxFNf7P+kBr0A7hg=",
+   "pom": "sha256-3uocEIH4TsePK074yLEPseyHxbdkreKq1Uelx+60//0="
+  },
+  "com/google/code/gson#gson-parent/2.8.5": {
+   "pom": "sha256-jx/scrkaceo57Dn193jE0RJLawl8bVWzpQtVSlIjeyc="
+  },
+  "com/google/code/gson#gson/2.8.5": {
+   "jar": "sha256-IzoBSfw2XJ9u29aDz+JmsZvcdzvpjqva9rPJJLSOfYE=",
+   "pom": "sha256-uDCFV6f8zJLZ/nyM0FmSWLNhKF0uzedontqYhDJVoJI="
+  },
+  "de/undercouch#gradle-download-task/5.5.0": {
+   "jar": "sha256-q/7DKUbJfz8N62qP5HDon99K7FYneLm/bPp8RAehPiI=",
+   "module": "sha256-5q+RV5vPUg0udBmtEPB4j13RBsCLzLCc40sNB3UvlEc=",
+   "pom": "sha256-HXoKzY/wjdfQnruzxz1j1mYYyFGNudC9J0J7/BjL9Hs="
+  },
+  "de/undercouch/download#de.undercouch.download.gradle.plugin/5.5.0": {
+   "pom": "sha256-WNFNTmP4TrzAgj/2tk1804/2bFRtUp9gLj3ML1xPEZk="
+  },
+  "io/github/tomtzook#plugin/1.2.2": {
+   "jar": "sha256-tTNTLIWad6fNX4McGhtFiTkQqujQ14MXhv4llB2TjYs=",
+   "module": "sha256-91tklOgQk0ObuwzAs8+kumszoLjzK36bNUIChrb91Cc=",
+   "pom": "sha256-HliRlUYwjo3HQu/JqktYsiJy/TJTdvYTSuyHPH/3xys="
+  },
+  "io/github/tomtzook/gradle-cmake#io.github.tomtzook.gradle-cmake.gradle.plugin/1.2.2": {
+   "pom": "sha256-xqnleYCaGEjSEkRXp5CwK67T9sAJaxIIliGoxZTnDJo="
+  },
+  "org/fusesource#fusesource-pom/1.12": {
+   "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
+  },
+  "org/fusesource/jansi#jansi/2.4.0": {
+   "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=",
+   "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU="
+  },
+  "org/slf4j#slf4j-api/1.7.25": {
+   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
+   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
+  },
+  "org/slf4j#slf4j-parent/1.7.25": {
+   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/code/gson#gson-parent/2.8.6": {
+   "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q="
+  },
+  "com/google/code/gson#gson/2.8.6": {
+   "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=",
+   "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE="
+  },
+  "junit#junit/4.12": {
+   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
+  },
+  "junit#junit/4.13.2": {
+   "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
+   "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/commonmark#commonmark-parent/0.17.1": {
+   "pom": "sha256-VQ6X1IOuWsZblW66NsnxqdlIV/bHs+qVmta7R2N4DiI="
+  },
+  "org/commonmark#commonmark/0.17.1": {
+   "jar": "sha256-5jrQgyZPWHdSJ0c8NduGbs3DhDxHvSvy8kdan65e938=",
+   "pom": "sha256-UFfBCkUrXNVyngvDZU+0vAx+VGAgCv/BqN1PfGOWPXI="
+  },
+  "org/hamcrest#hamcrest-core/1.3": {
+   "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
+   "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
+  },
+  "org/hamcrest#hamcrest-parent/1.3": {
+   "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
+  },
+  "org/junit#junit-bom/5.9.2": {
+   "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=",
+   "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.9.2": {
+   "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=",
+   "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=",
+   "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.9.2": {
+   "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=",
+   "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=",
+   "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8="
+  },
+  "org/junit/jupiter#junit-jupiter-migrationsupport/5.9.2": {
+   "jar": "sha256-1DTOe1gzyuX+9ovSfSfyABPrJ9U7bcl9eL8yS7YaDgQ=",
+   "module": "sha256-0tnRvL9p+RLgxT3fNO/HonM/0gCAhCA0d3Sig2ZFVZM=",
+   "pom": "sha256-KkAZMJh5lh9z788rZrJsF3TSjqF1U/72qAbA9sNbgqY="
+  },
+  "org/junit/platform#junit-platform-commons/1.9.2": {
+   "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=",
+   "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=",
+   "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck="
+  },
+  "org/junit/platform#junit-platform-engine/1.9.2": {
+   "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=",
+   "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=",
+   "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ="
+  },
+  "org/junit/vintage#junit-vintage-engine/5.9.2": {
+   "jar": "sha256-QeFt0yyPRiu8AysrefI5RBkbMuw5jQWFi6212r/9BhI=",
+   "module": "sha256-jMz93WRdDOdyFmeJhOtqEruXJQk0SVgOepIxTIxj0qQ=",
+   "pom": "sha256-n0TiazxEQSZXNjh58YscZBQX6nrCm66O5yfi8g2w9Ck="
+  },
+  "org/opentest4j#opentest4j/1.2.0": {
+   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "systems/manifold#manifold-core-parent/2023.1.28": {
+   "pom": "sha256-ahN15Fn/32/sBPQOta1Tp+cScHjqREz7iUUTtPCfdJA="
+  },
+  "systems/manifold#manifold-deps-parent/2023.1.28": {
+   "pom": "sha256-DE+CPr0aN18k0zh2D7G5WreDvyrnO5Wd0wDt88AJbkY="
+  },
+  "systems/manifold#manifold-parent/2023.1.28": {
+   "pom": "sha256-J0ChX+GyGJ9xJMda85n+tR1IfdE6Ij0hhtaHYSOtU6w="
+  },
+  "systems/manifold#manifold-preprocessor/2023.1.28": {
+   "jar": "sha256-vRIrrVT6SX3zuMVcfSwhL9nHE0oqfrtMNXuKzli2UB8=",
+   "pom": "sha256-Ov7/Z6wWQo+0mSc5K9t4Yw0aehDcnQEBDSpy9fnGMiU="
+  },
+  "systems/manifold#manifold-rt/2023.1.28": {
+   "jar": "sha256-4cn28jDYci2C2tUEizvJkdv6LRe/BrLwypEC6N0sGl0=",
+   "pom": "sha256-SAJid1Td0/ltrFi7w2YDNDlWhggDxFB+jynCG/rYaok="
+  },
+  "systems/manifold#manifold-util/2023.1.28": {
+   "jar": "sha256-WjY+1jmh4gvUHjvEbreQqoIB54HBfoNoOIILZs3IT80=",
+   "pom": "sha256-CF4FlMbIuKBRMfa1OjcnIQ7EVgulP739XXFkui2/JR0="
+  },
+  "systems/manifold#manifold/2023.1.28": {
+   "jar": "sha256-kPQeNEgFGZkZPz3zejWHU9+npn6RYRpMgOftt+bksRw=",
+   "pom": "sha256-R2kHxQVkoYLTSSIm/jJhjeRx4uObTuHlTSWVp+jBkpw="
+  }
+ }
+}
@@ -416,6 +416,7 @@ mapAliases {
  flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25
  flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
  flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
+  flutter319 = throw "flutter319 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-12-03
  flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
  flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
  fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06
@@ -5134,8 +5134,7 @@ with pkgs;

  inherit (callPackages ../servers/teleport {
    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
-    buildGoModule = buildGo122Module;
-  }) teleport_15 teleport_16 teleport;
+  }) teleport_15 teleport_16 teleport_17 teleport;

  telepresence = callPackage ../tools/networking/telepresence {
    pythonPackages = python3Packages;
@@ -5794,7 +5793,6 @@ with pkgs;
  flutter327 = flutterPackages.v3_27;
  flutter326 = flutterPackages.v3_26;
  flutter324 = flutterPackages.v3_24;
-  flutter319 = flutterPackages.v3_19;

  fnm = callPackage ../development/tools/fnm { };

@@ -1246,6 +1246,10 @@ let

    multicore-magic =  callPackage ../development/ocaml-modules/multicore-magic { };

+    multipart_form =  callPackage ../development/ocaml-modules/multipart_form { };
+
+    multipart_form-lwt =  callPackage ../development/ocaml-modules/multipart_form/lwt.nix { };
+
    multipart-form-data =  callPackage ../development/ocaml-modules/multipart-form-data { };

    mustache =  callPackage ../development/ocaml-modules/mustache { };
@@ -7748,6 +7748,8 @@ self: super: with self; {

  log-symbols = callPackage ../development/python-modules/log-symbols { };

+  logassert = callPackage ../development/python-modules/logassert { };
+
  logbook = callPackage ../development/python-modules/logbook { };

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