Merge master into staging-next

2026-04-18 00:28:39 +00:00
parent 802fb99f64 025c852a89
commit 4796c15a0d
97 changed files with 633 additions and 1580 deletions
@@ -21632,12 +21632,6 @@
    githubId = 579773;
    name = "Philip Nelson";
  };
-  pneumaticat = {
-    email = "kevin@potatofrom.space";
-    github = "kliu128";
-    githubId = 11365056;
-    name = "Kevin Liu";
-  };
  pnmadelaine = {
    name = "Paul-Nicolas Madelaine";
    email = "pnm@pnm.tf";
@@ -1544,6 +1544,21 @@
  "module-services-emacs-man-pages": [
    "index.html#module-services-emacs-man-pages"
  ],
+  "module-services-ente": [
+    "index.html#module-services-ente"
+  ],
+  "module-services-ente-quickstart": [
+    "index.html#module-services-ente-quickstart"
+  ],
+  "module-services-ente-registering-users": [
+    "index.html#module-services-ente-registering-users"
+  ],
+  "module-services-ente-increasing-storage-limit": [
+    "index.html#module-services-ente-increasing-storage-limit"
+  ],
+  "module-services-ente-ios-background-sync": [
+    "index.html#module-services-ente-ios-background-sync"
+  ],
  "module-services-livebook": [
    "index.html#module-services-livebook"
  ],
@@ -453,6 +453,8 @@ in
        users.groups.slurmrestd = lib.mkIf (cfg.rest.enable) { };

        systemd.services.slurmd = lib.mkIf (cfg.client.enable) {
+
+          environment.LD_LIBRARY_PATH = lib.mkIf config.hardware.nvidia.datacenter.enable "/run/opengl-driver/lib";
          path =
            with pkgs;
            [
@@ -6,57 +6,20 @@ end-to-end encrypted platform for photos and videos.
 ## Quickstart {#module-services-ente-quickstart}

 To host ente, you need the following things:
- S3 storage server (either external or self-hosted like [minio](https://github.com/minio/minio))
+- An S3-compatible object storage server (either an external provider or a
+  self-hosted one such as [garage](#module-services-garage)). From your
+  storage provider you will need:
+  - the S3 endpoint URL
+  - a bucket name
+  - an access key ID and secret access key with read/write access to the bucket
 - Several subdomains pointing to your server:
  - accounts.example.com
  - albums.example.com
  - api.example.com
  - cast.example.com
  - photos.example.com
-  - s3.example.com

-The following example shows how to setup ente with a self-hosted S3 storage via minio.
-You can host the minio s3 storage on the same server as ente, but as this isn't
-a requirement the example shows the minio and ente setup separately.
-We assume that the minio server will be reachable at `https://s3.example.com`.
-
-```nix
-{
-  services.minio = {
-    enable = true;
-    # ente's config must match this region!
-    region = "us-east-1";
-    # Please use a file, agenix or sops-nix to securely store your root user password!
-    # MINIO_ROOT_USER=your_root_user
-    # MINIO_ROOT_PASSWORD=a_randomly_generated_long_password
-    rootCredentialsFile = "/run/secrets/minio-credentials-full";
-  };
-
-  systemd.services.minio.environment.MINIO_SERVER_URL = "https://s3.example.com";
-
-  # Proxy for minio
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-  ];
-  services.nginx = {
-    recommendedProxySettings = true;
-    virtualHosts."s3.example.com" = {
-      forceSSL = true;
-      useACME = true;
-      locations."/".proxyPass = "http://localhost:9000";
-      # determine max file upload size
-      extraConfig = ''
-        client_max_body_size 16G;
-        proxy_buffering off;
-        proxy_request_buffering off;
-      '';
-    };
-  };
-}
-```
-
-And the configuration for ente:
+Once you have an S3 endpoint, bucket and credentials, configure ente as follows:

 ```nix
 {
@@ -84,11 +47,13 @@ And the configuration for ente:
        s3 = {
          use_path_style_urls = true;
          b2-eu-cen = {
+            # The S3 endpoint, bucket and credentials from your storage provider
            endpoint = "https://s3.example.com";
+            # Must be us-east-1 as it is required internally by ente
            region = "us-east-1";
            bucket = "ente";
-            key._secret = pkgs.writeText "minio_user" "minio_user";
-            secret._secret = pkgs.writeText "minio_pw" "minio_pw";
+            key._secret = "/run/secrets/s3-access-key-id";
+            secret._secret = "/run/secrets/s3-secret-access-key";
          };
        };
        key = {
@@ -122,13 +87,6 @@ If you have a mail server or smtp relay, you can optionally configure
 `services.ente.api.settings.smtp` so ente can send you emails (registration code and possibly
 other events). This is optional.

-After starting the minio server, make sure the bucket exists:
-
-```
-mc alias set minio https://s3.example.com root_user root_password --api s3v4
-mc mb -p minio/ente
-```
-
 Now ente should be ready to go under `https://photos.example.com`.

 ## Registering users {#module-services-ente-registering-users}
@@ -157,7 +115,7 @@ available. While adding new plans is possible in theory, it requires some
 manual database operations which isn't worthwhile. Instead, use `ente-cli`
 with your admin user to modify the storage limit.

-## iOS background sync
+## iOS background sync {#module-services-ente-ios-background-sync}

 On iOS, background sync is achived via a silent notification sent by the server
 every 30 minutes that allows the phone to sync for about 30 seconds, enough for
@@ -359,5 +359,8 @@ in
    })
  ];

-  meta.maintainers = with lib.maintainers; [ oddlama ];
+  meta = {
+    doc = ./ente.md;
+    maintainers = with lib.maintainers; [ oddlama ];
+  };
 }
@@ -1,11 +1,7 @@
 { lib, pkgs, ... }:
 let
-  accessKey = "BKIKJAA5BMMU2RHO6IBB";
-  secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
-  rootCredentialsFile = pkgs.writeText "minio-credentials-full" ''
-    MINIO_ROOT_USER=${accessKey}
-    MINIO_ROOT_PASSWORD=${secretKey}
-  '';
+  garageAccessKey = "GKaaaaaaaaaaaaaaaaaaaaaaaa";
+  garageSecretKey = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";

  certs = import ./snakeoil-certs.nix;
  domain = certs.domain;
@@ -14,22 +10,29 @@ in
  name = "ente";
  meta.maintainers = [ lib.maintainers.oddlama ];

-  nodes.minio =
+  nodes.garage =
    { ... }:
    {
-      environment.systemPackages = [ pkgs.minio-client ];
-      services.minio = {
+      services.garage = {
        enable = true;
-        inherit rootCredentialsFile;
+        package = pkgs.garage_2;
+        settings = {
+          replication_factor = 1;
+          consistency_mode = "consistent";
+          rpc_bind_addr = "[::]:3901";
+          rpc_public_addr = "[::1]:3901";
+          rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c";
+          s3_api = {
+            s3_region = "us-east-1";
+            api_bind_addr = "[::]:3900";
+          };
+        };
      };

-      networking.firewall.allowedTCPPorts = [
-        9000
-      ];
+      networking.firewall.allowedTCPPorts = [ 3900 ];

-      systemd.services.minio.environment = {
-        MINIO_SERVER_URL = "https://s3.${domain}";
-      };
+      # Garage requires at least 1GiB of free disk space to run.
+      virtualisation.diskSize = 2 * 1024;
    };

  nodes.ente =
@@ -71,7 +74,7 @@ in
              forceSSL = true;
              sslCertificate = certs.${domain}.cert;
              sslCertificateKey = certs.${domain}.key;
-              locations."/".proxyPass = "http://${nodes.minio.networking.primaryIPAddress}:9000";
+              locations."/".proxyPass = "http://${nodes.garage.networking.primaryIPAddress}:3900";
              extraConfig = ''
                client_max_body_size 32M;
                proxy_buffering off;
@@ -103,8 +106,8 @@ in
                endpoint = "https://s3.${domain}";
                region = "us-east-1";
                bucket = "ente";
-                key._secret = pkgs.writeText "accesskey" accessKey;
-                secret._secret = pkgs.writeText "secretkey" secretKey;
+                key._secret = pkgs.writeText "accesskey" garageAccessKey;
+                secret._secret = pkgs.writeText "secretkey" garageSecretKey;
              };
            };
            key = {
@@ -118,13 +121,19 @@ in
    };

  testScript = ''
-    minio.start()
-    minio.wait_for_unit("minio.service")
-    minio.wait_for_open_port(9000)
+    garage.start()
+    garage.wait_for_unit("garage.service")
+    garage.wait_for_open_port(3900)

-    # Create a test bucket on the server
-    minio.succeed("mc alias set minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4")
-    minio.succeed("mc mb -p minio/ente")
+    # Configure the cluster layout
+    garage_node_id = garage.succeed("garage status | tail -n1 | awk '{ print $1 }'")
+    garage.succeed(f"garage layout assign -c 1G -z garage {garage_node_id}")
+    garage.succeed("garage layout apply --version 1")
+
+    # Import the predefined API key and create the bucket
+    garage.succeed("garage key import ${garageAccessKey} ${garageSecretKey} --yes")
+    garage.succeed("garage bucket create ente")
+    garage.succeed("garage bucket allow --read --write ente --key ${garageAccessKey}")

    # Start ente
    ente.start()
@@ -58,9 +58,9 @@ let
  patchSharedLibs = lib.optionalString stdenv.hostPlatform.isLinux ''
    ls -d \
      $out/*/bin/*/linux/*/lib/liblldb.so \
-      $out/*/bin/*/linux/*/lib/python3.8/lib-dynload/* \
+      $out/*/bin/*/linux/*/lib/python3.*/lib-dynload/* \
      $out/*/plugins/*/bin/*/linux/*/lib/liblldb.so \
-      $out/*/plugins/*/bin/*/linux/*/lib/python3.8/lib-dynload/* |
+      $out/*/plugins/*/bin/*/linux/*/lib/python3.*/lib-dynload/* |
    xargs patchelf \
      --replace-needed libssl.so.10 libssl.so \
      --replace-needed libssl.so.1.1 libssl.so \
@@ -21,20 +21,20 @@ let
  # update-script-start: urls
  urls = {
    x86_64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2025.3.4.tar.gz";
-      hash = "sha256-Ii6ppV3Hy0DpTj2mo+cUpLrIoNxeHzcAJ7PBSayQcW0=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.tar.gz";
+      hash = "sha256-r5flY2u6aCkI8q7ZcGWYLLxxcWWp3gtTkdBdKoacIB0=";
    };
    aarch64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2025.3.4-aarch64.tar.gz";
-      hash = "sha256-I17oA1RNeITPu1xxvyR1Y2+toHfSWj6BxamA+84cF9g=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1-aarch64.tar.gz";
+      hash = "sha256-1N1JLpHBAFSDOYLl98KxDBpGmgVMlRFuV49/a2jGHfQ=";
    };
    x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2025.3.4.dmg";
-      hash = "sha256-pdJXd5Vgn8qiKzC1Q0rVJMpuITWyZU+pl+NLKVsnSA8=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.dmg";
+      hash = "sha256-m3AEgpDjUDMJQ7320XuqpEHwe4ItYX8JYq0ZpITaKcs=";
    };
    aarch64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2025.3.4-aarch64.dmg";
-      hash = "sha256-WWl2JfK5zJzmrIKFUxHPCkCzRkzVq8IQEWlqDvIxlSg=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1-aarch64.dmg";
+      hash = "sha256-Crx63jFbJbCX1/XIZg22Oxd7HxFWmB3iXlJofzv03vA=";
    };
  };
  # update-script-end: urls
@@ -48,8 +48,8 @@ in
  product = "CLion";

  # update-script-start: version
-  version = "2025.3.4";
-  buildNumber = "253.32098.68";
+  version = "2026.1";
+  buildNumber = "261.22158.273";
  # update-script-end: version

  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -24,20 +24,20 @@ let
  # update-script-start: urls
  urls = {
    x86_64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.3.tar.gz";
-      hash = "sha256-sBF/XA52oSFD1dEmzhvo7cwf5EGTi0mx1x3PcobQVAs=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.tar.gz";
+      hash = "sha256-moIysTTsq7abpQfNh1Bc5Pk6VQgJIT6erbyHsUXf15Y=";
    };
    aarch64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.3-aarch64.tar.gz";
-      hash = "sha256-QKBzusZRTOq+2Pte+SEggN/odpJoHKaIwBGpLe9jqmU=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.tar.gz";
+      hash = "sha256-0gEmWObwCio3aBqmUh2u5adWO3fFJV8uFwUTT31KsMI=";
    };
    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.3.dmg";
-      hash = "sha256-BmKP6puShOwnwa6BzhF5mjDEBZM8gew27szQm6WIdCc=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1.dmg";
+      hash = "sha256-s/lppcf2gfwmFYeHjWtk2NGPAjo/PAEnaGNWhDOkKOM=";
    };
    aarch64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2025.3.3-aarch64.dmg";
-      hash = "sha256-6AMcnhZH8h3jUz6+goycMY39vkyoWQh/zm2a/9Kgt1E=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.0.1-aarch64.dmg";
+      hash = "sha256-BHHrO4DLfw4cdbrJCH1uqX2qdm/ijyFnj32WQ8rpVhI=";
    };
  };
  # update-script-end: urls
@@ -51,8 +51,8 @@ in
  product = "Rider";

  # update-script-start: version
-  version = "2025.3.3";
-  buildNumber = "253.31033.136";
+  version = "2026.1.0.1";
+  buildNumber = "261.22158.394";
  # update-script-end: version

  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -12,20 +12,20 @@ let
  # update-script-start: urls
  urls = {
    x86_64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.4.tar.gz";
-      hash = "sha256-i96xMtC10f1V55WvF5iovk0JtixILe5r2snX0iCWH8A=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.tar.gz";
+      hash = "sha256-BZsRMuFek5UEo16GHFcEd6gki1IaftWPA692mgefOXo=";
    };
    aarch64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.4-aarch64.tar.gz";
-      hash = "sha256-lApU0A1aFqAU7+mT1etk7P+2IsSOBhrJgYUx9SYEpms=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1-aarch64.tar.gz";
+      hash = "sha256-0bPG2f/RmUO8ZmxNtsEiXGdSahn4aVw/0OHCuGuMJDY=";
    };
    x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.4.dmg";
-      hash = "sha256-1Yf50KibE5b83wiuNmEwe+YknSRCZ9ANAoi4jU/vyDk=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.dmg";
+      hash = "sha256-3FC80XSQ/zLPGLw/ois45ikZ2Y0a25/eWEqlbd1TyI8=";
    };
    aarch64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2025.3.4-aarch64.dmg";
-      hash = "sha256-mI3b1xu/fWbWBbb9/2TIhFSuSXvzYGCmQEgSQp8BaHg=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1-aarch64.dmg";
+      hash = "sha256-xD+JYmiudMJGCCJB3Pf8+mNGURJFRxMDh+Nj7xUrfz8=";
    };
  };
  # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
  product = "RubyMine";

  # update-script-start: version
-  version = "2025.3.4";
-  buildNumber = "253.32098.44";
+  version = "2026.1";
+  buildNumber = "261.22158.284";
  # update-script-end: version

  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -18,20 +18,20 @@ let
  # update-script-start: urls
  urls = {
    x86_64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5.tar.gz";
-      hash = "sha256-2yEZOWUoD6ELs0WSvdMSZSVAmA/LsoKyfJiR20I86aQ=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.tar.gz";
+      hash = "sha256-qiOgAHz/tCnyEwljTy1D0sJBhWpOXZCCf5Uq66PZjzk=";
    };
    aarch64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5-aarch64.tar.gz";
-      hash = "sha256-tl8lxMH6XH+2VGqv6vxGEjjALevaEl7VAzs9LAjwtPQ=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1-aarch64.tar.gz";
+      hash = "sha256-jU61XQ+3zliH3y6nz6o8U/DrRkZ2vs4ff8Fd/RPb0a0=";
    };
    x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5.dmg";
-      hash = "sha256-8ONWTld29DJjaDH4ubsBRmYYosQ6wTAQInuko76Ucoc=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.dmg";
+      hash = "sha256-VwVvTSUdFpPhAeWyzkID6TFNE0S1vVeR82FRfU2v3s4=";
    };
    aarch64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2025.3.5-aarch64.dmg";
-      hash = "sha256-N3D6YE6vV8x+slvphyqzDu2mTp8y2uAeSZTZg0pMABQ=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1-aarch64.dmg";
+      hash = "sha256-DeLkwKq01M3zmr2yZnOYXCn0CZ+0P9MtWC9bMIzKrVE=";
    };
  };
  # update-script-end: urls
@@ -45,8 +45,8 @@ in
  product = "RustRover";

  # update-script-start: version
-  version = "2025.3.5";
-  buildNumber = "253.31033.204";
+  version = "2026.1";
+  buildNumber = "261.22158.331";
  # update-script-end: version

  src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));
@@ -3861,8 +3861,8 @@ let
        mktplcRef = {
          name = "ansible";
          publisher = "redhat";
-          version = "26.3.5";
-          hash = "sha256-IKSozGy4S04pSsbhpXVgsqQvJNzaxVkoSrLwhFb4Ag4=";
+          version = "26.4.2";
+          hash = "sha256-mSsCeUMEmLkEuxQIBQZaVzOpOwZ7b4SaiPwOJdVuIJk=";
        };
        meta = {
          description = "Ansible language support";
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "kubernetes-helm";
-  version = "3.20.1";
+  version = "3.20.2";

  src = fetchFromGitHub {
    owner = "helm";
    repo = "helm";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-fSMfHJCl2/Lc6mcYn/m0kR0viH88rRgRTMOoJjFVERQ=";
+    sha256 = "sha256-YF5djCmCoPdLlEa/cksQgGtscEmIsQTiRqYZNyFjsEY=";
  };
  vendorHash = "sha256-kqx23LekpuZJFisVZUoXBY9vHh9zviKyaW5NSa4ecxM=";

@@ -108,6 +108,15 @@ let
      propagatedBuildInputs = [ cdrtools ];
    });
    aminueza_minio = automated-providers.aminueza_minio.override { spdx = "AGPL-3.0-only"; };
+    # proxyVendor is necessary because enabling CGO causes `go mod vendor` to include
+    # platform-specific files leading to vendorHash varying across platforms.
+    "1password_onepassword" =
+      (automated-providers."1password_onepassword".override { proxyVendor = true; }).overrideAttrs
+        (finalAttrs: {
+          env = finalAttrs.env // {
+            CGO_ENABLED = "1";
+          };
+        });
  };

  # Put all the providers we not longer support in this list.
@@ -1,12 +1,12 @@
 {
  "1password_onepassword": {
-    "hash": "sha256-4wEKPTBt9F8N9jPk/PUu+ewrCJ8IztU9CblfJxA7h1k=",
+    "hash": "sha256-BK6rKoEva8ChSARBXZNUAAphjG+Y+eeje8Gdi4DAJoc=",
    "homepage": "https://registry.terraform.io/providers/1Password/onepassword",
    "owner": "1Password",
    "repo": "terraform-provider-onepassword",
-    "rev": "v2.2.0",
+    "rev": "v3.3.1",
    "spdx": "MIT",
-    "vendorHash": "sha256-n01cHzyG9FvxCb92sFccKY1h7Pa0zmi+CUxSYHM5Elc="
+    "vendorHash": "sha256-RTfj2Omiqe92Ad0swEY/aGIMvcXb39bdQoObYKiekiw="
  },
  "a10networks_thunder": {
    "hash": "sha256-RX3mP5btzyvuBjoMNiUL6ZeFLEo5SqmwwSK/eE0gWEw=",
@@ -54,13 +54,13 @@
    "vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE="
  },
  "aminueza_minio": {
-    "hash": "sha256-Qt51J0DcwrpJ9+8s8KwngGhhFhZQQYv3dAwFGOYvavo=",
+    "hash": "sha256-rAdHPVw/G5uO/67yLOohHvO3/KxjyQkIpagKPd0vMOQ=",
    "homepage": "https://registry.terraform.io/providers/aminueza/minio",
    "owner": "aminueza",
    "repo": "terraform-provider-minio",
-    "rev": "v3.30.0",
+    "rev": "v3.32.1",
    "spdx": "AGPL-3.0",
-    "vendorHash": "sha256-Mm7IwFX51hsG3ducCbanRoelgkyK6pe+9K8d18U01Z8="
+    "vendorHash": "sha256-4Jsi6YkjWakH53Ub/CALDYfL1UC/xWRBvAmJTpHTVtk="
  },
  "argoproj-labs_argocd": {
    "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=",
@@ -191,11 +191,11 @@
    "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
  },
  "cloudamqp_cloudamqp": {
-    "hash": "sha256-WVEGtD5Hfb8xu/GymHMknK8n2KgOMW2EzBMvRmbKJug=",
+    "hash": "sha256-bkd0q7S/AtsX0q/sHGiwGql6xcjgH9WIM40FFzQSei8=",
    "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
    "owner": "cloudamqp",
    "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.44.0",
+    "rev": "v1.44.4",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-sagrygtfsZWQUuIuGTUldZYYR5OhQfpZDxDKZAaIR4Y="
  },
@@ -274,13 +274,13 @@
    "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
  },
  "datadog_datadog": {
-    "hash": "sha256-WMggvZAgj36OyelTSE8I/1GRoTivs7q9szUbAFi6XdY=",
+    "hash": "sha256-QAmtZnmdHlKI+lLqBsH6SpshxwpBvAaXWspj/a4vlpI=",
    "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
    "owner": "DataDog",
    "repo": "terraform-provider-datadog",
-    "rev": "v4.4.0",
+    "rev": "v4.5.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2uj7Ff8g43s2T+zQIbTYFxxuaLpFxPQRo2z/0HNmh9k="
+    "vendorHash": "sha256-RVDQ7HeZkSryb6ocZJeEx2iIgw411+SByEopg7Q+b1c="
  },
  "datadrivers_nexus": {
    "hash": "sha256-yfxlDln4brI8QTFnhVsNOO3vRiqft3YWytvy2GMNBdY=",
@@ -1310,11 +1310,11 @@
    "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
  },
  "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-JA8urZd08fyGkFZMCF9aVJ9UEGx+aPreGqiAuFTqA84=",
+    "hash": "sha256-tbXhMSoZ9e3md+M8Vtt/m0oPyCjFpGcJXZw49A/UFwI=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.84",
+    "rev": "v1.82.88",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1499,12 +1499,12 @@
    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
  },
  "yandex-cloud_yandex": {
-    "hash": "sha256-gCzM7pfQaez/Zw6JAJcw4bVSpqVhxxiQyjqP/FeldJQ=",
+    "hash": "sha256-xRpxl65jB4pqMM7pf7SWF7XRvqhgTV3kYWx7sxAQj/A=",
    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
    "owner": "yandex-cloud",
    "repo": "terraform-provider-yandex",
-    "rev": "v0.197.0",
+    "rev": "v0.199.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Prtwe3JPfWpx+yO37lT31VsqQ6E2aDLI7fAbYYq7gSE="
+    "vendorHash": "sha256-76prUN1Qv5sP0tDj5bwnyt6KFl+aeY36wsWhLF4sWE8="
  }
 }
@@ -86,7 +86,7 @@ update_attr() {
 repo_root=$(git rev-parse --show-toplevel)

 generate_hash() {
-  nurl --expr "(import ${repo_root} {}).terraform-providers.${provider}.$1"
+  nurl --expr "(import ${repo_root} {}).terraform-providers.\"${provider}\".$1"
 }

 echo_provider() {
@@ -167,7 +167,7 @@ fi
 # Check that the provider builds
 if [[ ${build} == 1 ]]; then
  echo_provider "building"
-  nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}"
+  nix-build --no-out-link "${repo_root}" -A "terraform-providers.\"${provider}\""
 fi

 popd >/dev/null
@@ -8,15 +8,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "aegis-rs";
-  version = "0.5.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "Granddave";
    repo = "aegis-rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-V6b9CDLjpyRb/MlbAswQ2kJFGeYDu9r2Y/8lBB+kLGc=";
+    hash = "sha256-XJmStg3SoT+vYVz7twCPjVLr0ayvF08h4WJfwY1qsYk=";
  };
-  cargoHash = "sha256-QYTmTJiwqslFM1VT+B+HtA8idvhKOPY4+ip/FqQGZ34=";
+  cargoHash = "sha256-4Uzar6NHC4RwnHvn9c/u+uU45EzXFvMBwjP60JOwcog=";

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

@@ -9,19 +9,19 @@

 buildGoModule (finalAttrs: {
  pname = "atlas";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "ariga";
    repo = "atlas";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ke7XT1ZRJbYnTMjMFEUcF3jOuvcTjYAX7H+nJxHrU5E=";
+    hash = "sha256-fiAQ6FjjjbRB6Ngv8BgO+fvLiEZzRnldB/SLqBINubE=";
  };

  modRoot = "cmd/atlas";

  proxyVendor = true;
-  vendorHash = "sha256-ksSvW+Sc1iQlMf9i6GWMjq4hISdAD3t/uAPlQ3x7wHU=";
+  vendorHash = "sha256-P/puTKxZpxrwUfbZH7tBTGoUvUkCy039ZsTejjCKs9Y=";

  nativeBuildInputs = [ installShellFiles ];

@@ -70,7 +70,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    homepage = "https://github.com/autokey/autokey";
    description = "Desktop automation utility for Linux and X11";
    license = with lib.licenses; [ gpl3 ];
-    maintainers = with lib.maintainers; [ pneumaticat ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
  };
 })
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "az-pim-cli";
-  version = "1.13.0";
+  version = "1.14.0";

  src = fetchFromGitHub {
    owner = "netr0m";
    repo = "az-pim-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-3SC3iYW5TN5ljUr1g7aBXJsdAD03C4M+99Wtue8Sm7Y=";
+    hash = "sha256-2WhinTxFCNLgw2TejoulhGXJwnUHP/CyC/Gwedv/8Xw=";
  };

  patches = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
    ./version-build-info.patch
  ];

-  vendorHash = "sha256-ucsTrouw0/MAVzrXb2mot9ccD5v6scu8SJMJR51R48E=";
+  vendorHash = "sha256-K4tv3IlVygV/aDR9twh60FX8pe4f0sXxoGNIsIV2oUA=";

  nativeBuildInputs = [
    installShellFiles
@@ -0,0 +1,13 @@
+diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc
+index 850e7808ae7..3478d4907f2 100644
+--- a/source/blender/gpu/vulkan/vk_texture_pool.cc
+++ b/source/blender/gpu/vulkan/vk_texture_pool.cc
+@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data()
+     log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size);
+   }
+ 
+-  CLOG_TRACE(&LOG, log_message.c_str());
+  CLOG_TRACE(&LOG, "%s", log_message.c_str());
+ }
+ 
+ }  // namespace gpu
@@ -118,12 +118,12 @@ in

 stdenv'.mkDerivation (finalAttrs: {
  pname = "blender";
-  version = "5.1.0";
+  version = "5.1.1";

  src = fetchzip {
    name = "source";
    url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-    hash = "sha256-knXAK3mW0tDz5ukuYkAZMv/zF9NLR8pofc3ujabcsys=";
+    hash = "sha256-iJolR8iS2go0doO96ibyseCeMunFL+XPoQ25NbX6oOA=";
  };

  patches = [
@@ -131,6 +131,9 @@ stdenv'.mkDerivation (finalAttrs: {
    # ceres-solver dependency propagates eigen 3 and appears to be incompatible
    # with more recent versions.
    ./eigen-3-compat.patch
+    # Required due to `-Werror=format-security` in nixpkgs
+    # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596
+    ./fix-quite-clog-warning.patch
  ]
  # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889
  ++ lib.optionals rocmSupport [
@@ -216,6 +219,8 @@ stdenv'.mkDerivation (finalAttrs: {
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    (lib.cmakeFeature "LIBDIR" "/does-not-exist")
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
    (lib.cmakeFeature "SSE2NEON_INCLUDE_DIR" "${sse2neon}/include")
  ];

@@ -307,9 +312,9 @@ stdenv'.mkDerivation (finalAttrs: {
        apple-sdk_15
        brotli
        llvmPackages.openmp
-        sse2neon
      ]
  )
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [ sse2neon ]
  ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]
  ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ]
  ++ lib.optionals waylandSupport [
@@ -8,15 +8,15 @@
 }:

 let
-  version = "7.1.140";
+  version = "7.1.150";
  srcs = {
    x86_64-linux = fetchurl {
      url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-x64.tar.xz";
-      hash = "sha256-e7wgUH7sh8SwyRq/llCBu8ZuB74LTPiDEW35dfX8da4=";
+      hash = "sha256-/q3qm+GBKVPNp+foeNQCE+0vr3bCFbfp1qKGtrwpUfM=";
    };
    aarch64-linux = fetchurl {
      url = "https://github.com/aunetx/deezer-linux/releases/download/v${version}/deezer-desktop-${version}-arm64.tar.xz";
-      hash = "sha256-6PA/f7QOXR9BZGtINtNW00BRQ6ghWVIJudQ+/lx7kZc=";
+      hash = "sha256-QL8tLWUmBLfFSHBI7tJN19KmeoOmA2SR8OHMhGpL/Dk=";
    };
  };

@@ -21,37 +21,37 @@

 let
  deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "2.48.0";
+    version = "2.49.0";
    src = fetchFromGitHub {
      owner = "chatmail";
      repo = "core";
      tag = "v${version}";
-      hash = "sha256-9qrxzAoBdCzDaMWZnCPxKy9bISd19aI4U1kRcK85Mzg=";
+      hash = "sha256-iMgWXlffbGG25iM/SMCQzer1J6clDWwP0hURloL3n2k=";
    };
    cargoDeps = rustPlatform.fetchCargoVendor {
      pname = "chatmail-core";
      inherit version src;
-      hash = "sha256-UcQoY2NvnvWmGjHn1xwi0deyPZjtnbfQJJo32K7TX38=";
+      hash = "sha256-0QhMJis1Hbl/Tn3Rwiz+UjCSieodfYhgL060DWjEOIM=";
    };
  };
  electron = electron_41;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "deltachat-desktop";
-  version = "2.48.0";
+  version = "2.49.0";

  src = fetchFromGitHub {
    owner = "deltachat";
    repo = "deltachat-desktop";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7LCaZOI9fBzVMyT0RqgGykDvN0eSTz2h6fRXK2kyRDk=";
+    hash = "sha256-8LMSMLS908uOv8muQKPKAHNDZBBKKZtyYJAT9QJdI4k=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_9;
    fetcherVersion = 2;
-    hash = "sha256-1R8vCGQlT3pvybrcPc2SKbmezprgvrIt0J+BsZHPJ7c=";
+    hash = "sha256-+Mxf/D66EoE/axKg5+TSaLFPSpUEDZNtSNH4zklxV5s=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "dgraph";
-  version = "25.3.1";
+  version = "25.3.2";

  src = fetchFromGitHub {
    owner = "dgraph-io";
    repo = "dgraph";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-M12/HtOtY3AMUb5HiFLf0PGV5IEfDOUh6KMXhacHdGg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tKKDCYaQxIW8JFKLUxg8i+QVDu4H+9GZOYTHB51YRn4=";
  };

  vendorHash = "sha256-C7wJ12OjCc7WzxpVtsAsaj7leRLfcVFmp1xHcaNAsQw=";
@@ -11,16 +11,16 @@

 buildGoModule (finalAttrs: {
  pname = "discordo";
-  version = "0-unstable-2026-04-09";
+  version = "0-unstable-2026-04-14";

  src = fetchFromGitHub {
    owner = "ayn2op";
    repo = "discordo";
-    rev = "d804e0271c51239e18109dd786be73347cf21dfd";
-    hash = "sha256-dgj3JWJ3NGwBvvHV/phfjIHa612XNUfYArXXpzJ0Mf4=";
+    rev = "73dbd1b315a393890ca7c634683017a188dac90c";
+    hash = "sha256-oXrksRVwJHwS0f1jSqZ0nFjNjIej3XM8bClfcI6RDfM=";
  };

-  vendorHash = "sha256-BSYPEUE6qyNY4+ur+uVB66ogYVktm9AUCzLTMiJMmKQ=";
+  vendorHash = "sha256-myXKkOeH8w+vjNbrPpw/J97mIT42Ema5XiSqHFpz8Vs=";

  env.CGO_ENABLED = 1;

@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "editorconfig-core-c";
-  version = "0.12.9";
+  version = "0.12.11";

  outputs = [
    "out"
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "editorconfig";
    repo = "editorconfig-core-c";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo=";
+    hash = "sha256-BLx04SGcfkSFR3GfcZGDle1RVvC9M0juTmpnxxMlDGk=";
    fetchSubmodules = true;
  };

@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "egctl";
-  version = "1.7.1";
+  version = "1.7.2";

  src = fetchFromGitHub {
    owner = "envoyproxy";
    repo = "gateway";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-QvB6fkNULhT2BSiE/E4EGkMgmPSGsD/Npi/LIEp0qpE=";
+    hash = "sha256-EI/7vNNi3RbG7/WdBlpvjM/LRUq9m3rYvH2yVSq5bPo=";
  };

  vendorHash = "sha256-jEPvLDuu3ykuVPs8skByeTHYIrodp9xP2FqVex4McQ8=";
@@ -8,6 +8,7 @@
  nodejs,
  rustPlatform,
  rustc,
+  sd,
  wasm-bindgen-cli_0_2_108,
  wasm-pack,
  yarnConfigHook,
@@ -21,6 +22,7 @@
  # can set this parameter to override these occurrences with your own url. Must include the schema.
  # Example: https://my-ente.example.com
  enteMainUrl ? null,
+  nixosTests,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -81,16 +83,13 @@ stdenv.mkDerivation (finalAttrs: {
        packages/wasm/package.json \
        --replace-fail "wasm-pack " ${lib.escapeShellArg "${wasm-pack}/bin/wasm-pack "}
    ''
-    # Replace hardcoded ente.io urls if desired
+    # Replace hardcoded links pointing to the public ente instance so that
+    # users of a self-hosted instance are not accidentally redirected there
    + lib.optionalString (enteMainUrl != null) ''
-      substituteInPlace \
-        apps/payments/src/services/billing.ts \
-        apps/photos/src/pages/shared-albums.tsx \
-        --replace-fail "https://ente.io" ${lib.escapeShellArg enteMainUrl}
-
-      substituteInPlace \
-        apps/accounts/src/pages/index.tsx \
-        --replace-fail "https://web.ente.io" ${lib.escapeShellArg enteMainUrl}
+      for pattern in "https://web.ente.io" "https://ente.com" "https://ente.io"; do
+        mapfile -d "" -t files < <(grep -rlFZ -- "$pattern" apps/)
+        ${lib.getExe sd} -F -- "$pattern" ${lib.escapeShellArg enteMainUrl} "''${files[@]}"
+      done
    '';

  yarnBuildScript = "build:${enteApp}";
@@ -106,57 +105,60 @@ stdenv.mkDerivation (finalAttrs: {
      runHook postInstall
    '';

-  passthru.updateScript = writeScript "update-ente-web" ''
-    #!/usr/bin/env nix-shell
-    #!nix-shell -i bash -p coreutils nix-update gnugrep gnused curl
+  passthru = {
+    tests = { inherit (nixosTests) ente; };
+    updateScript = writeScript "update-ente-web" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p coreutils nix-update gnugrep gnused curl

-    set -eu -o pipefail
+      set -eu -o pipefail

-    # Assume the current working directory is Nixpkgs
-    file_path="./pkgs/by-name/en/ente-web/package.nix"
+      # Assume the current working directory is Nixpkgs
+      file_path="./pkgs/by-name/en/ente-web/package.nix"

-    # Extract version, then update
-    old_version=$(grep -oP 'version = "\K[^"]+' "$file_path" | head -n1)
-    if [[ -z "$old_version" ]]; then
-      echo "Failed to extract old version from $file_path"
-      exit 1
-    fi
+      # Extract version, then update
+      old_version=$(grep -oP 'version = "\K[^"]+' "$file_path" | head -n1)
+      if [[ -z "$old_version" ]]; then
+        echo "Failed to extract old version from $file_path"
+        exit 1
+      fi

-    nix-update ente-web --version-regex 'photos-v(.*)'
+      nix-update ente-web --version-regex 'photos-v(.*)'

-    new_version=$(grep -oP 'version = "\K[^"]+' "$file_path" | head -n1)
-    if [[ -z "$new_version" ]]; then
-      echo "Failed to extract new version from $file_path"
-      exit 1
-    fi
+      new_version=$(grep -oP 'version = "\K[^"]+' "$file_path" | head -n1)
+      if [[ -z "$new_version" ]]; then
+        echo "Failed to extract new version from $file_path"
+        exit 1
+      fi

-    if [[ "$old_version" == "$new_version" ]]; then
-      echo "No update"
-      exit 0
-    fi
+      if [[ "$old_version" == "$new_version" ]]; then
+        echo "No update"
+        exit 0
+      fi

-    echo "Updated to version $new_version, checking wasm-bindgen..."
+      echo "Updated to version $new_version, checking wasm-bindgen..."

-    # Fetch Cargo.lock from GitHub instead of cloning repository
-    cargo_lock_url="https://raw.githubusercontent.com/ente-io/ente/photos-v$new_version/web/packages/wasm/Cargo.lock"
+      # Fetch Cargo.lock from GitHub instead of cloning repository
+      cargo_lock_url="https://raw.githubusercontent.com/ente-io/ente/photos-v$new_version/web/packages/wasm/Cargo.lock"

-    wasm_bindgen_version=$(curl -s "$cargo_lock_url" | tr -d '\r' | grep -A1 '^name = "wasm-bindgen"$' | grep -oP 'version = "\K[^"]+' | head -n1)
+      wasm_bindgen_version=$(curl -s "$cargo_lock_url" | tr -d '\r' | grep -A1 '^name = "wasm-bindgen"$' | grep -oP 'version = "\K[^"]+' | head -n1)

-    if [[ -z "$wasm_bindgen_version" ]]; then
-      echo "Failed to find wasm-bindgen version in Cargo.lock from $cargo_lock_url"
-      exit 1
-    fi
+      if [[ -z "$wasm_bindgen_version" ]]; then
+        echo "Failed to find wasm-bindgen version in Cargo.lock from $cargo_lock_url"
+        exit 1
+      fi

-    echo "Found wasm-bindgen version: $wasm_bindgen_version"
+      echo "Found wasm-bindgen version: $wasm_bindgen_version"

-    # Construct new attribute name
-    wasm_bindgen_attr="wasm-bindgen-cli_''${wasm_bindgen_version//./_}"
+      # Construct new attribute name
+      wasm_bindgen_attr="wasm-bindgen-cli_''${wasm_bindgen_version//./_}"

-    # Replace old attribute name in file
-    sed -i "s/wasm-bindgen-cli_[0-9_]\+/$wasm_bindgen_attr/g" "$file_path"
+      # Replace old attribute name in file
+      sed -i "s/wasm-bindgen-cli_[0-9_]\+/$wasm_bindgen_attr/g" "$file_path"

-    echo "Successfully updated wasm-bindgen-cli to $wasm_bindgen_attr"
-  '';
+      echo "Successfully updated wasm-bindgen-cli to $wasm_bindgen_attr"
+    '';
+  };

  meta = {
    description = "Ente application web frontends";
@@ -16,16 +16,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "espup";
-  version = "0.16.0";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "esp-rs";
    repo = "espup";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-blEjUFBzkwplwZgTAtI84MCHvxujNF1WsPJJezRNjxQ=";
+    hash = "sha256-jhVUGbCxhYmWNtWoqSiuDgJBz5A/j+121E2tPmaQJx0=";
  };

-  cargoHash = "sha256-Y6Y+62lJ3k6GMkU82CDkTt1Prd3UrtBKqA5Spctochw=";
+  cargoHash = "sha256-9CzKv8NBzg+e/TjX97rqqXkLZP5CsCaN+dxqh1m/IXc=";

  nativeBuildInputs = [
    pkg-config
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  python3,
+  python3Packages,
  replaceVars,
  macmon,

@@ -18,56 +18,15 @@
  nix-update-script,
 }:
 let
-  version = "1.0.69";
+  version = "1.0.70";
  src = fetchFromGitHub {
    name = "exo";
    owner = "exo-explore";
    repo = "exo";
    tag = "v${version}";
-    hash = "sha256-xHEvjztTSDMwfxdNt16Yo/hX1Fhpwz/zF7mnQsIOteY=";
+    hash = "sha256-ytxP5x8PyAPVne2c6OIvhdCuF68zffxypXSTlDAFnro=";
  };

-  python = python3.override {
-    packageOverrides = _final: prev: {
-      # https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L63
-      mlx = prev.mlx.overridePythonAttrs (old: {
-        version = "custom";
-
-        src = fetchFromGitHub {
-          owner = "rltakashige";
-          repo = "mlx-jaccl-fix-small-recv";
-          rev = "address-rdma-gpu-locks";
-          hash = "sha256-GosFIWxIB48Egb1MqJrR3xhsUsQeWdRk5rV93USY6wQ=";
-        };
-
-        # mlx.meta.changelog fails to evaluate as it depends on mlx.src.tag which is not defined in
-        # this override
-        meta = old.meta // {
-          changelog = "";
-        };
-      });
-
-      # https://github.com/exo-explore/exo/blob/v1.0.69/pyproject.toml#L64
-      mlx-lm = prev.mlx-lm.overridePythonAttrs (old: {
-        version = "custom";
-
-        src = fetchFromGitHub {
-          owner = "rltakashige";
-          repo = "mlx-lm";
-          rev = "leo/fix-deepseek-v32-indexer";
-          hash = "sha256-sRMykX0hd15VF8tdO5MCjuVxkQvpjeluaS8U+wQvP4Q=";
-        };
-
-        # mlx-lm.meta.changelog fails to evaluate as it depends on mlx-lm.src.tag which is not
-        # defined in this override
-        meta = old.meta // {
-          changelog = "";
-        };
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-
  pyo3-bindings = python3Packages.buildPythonPackage (finalAttrs: {
    pname = "exo-pyo3-bindings";
    inherit version src;
@@ -107,7 +66,7 @@ let
        sourceRoot
        ;
      fetcherVersion = 3;
-      hash = "sha256-eMmzWwsebwvrpNLqs+4iyiPsDFvwRlk+LaiKQ0SZmt8=";
+      hash = "sha256-gBWJP0dF2zDEWLYxfKYQSn9O5hVRkcviDv9oP267pQQ=";
    };
  });
 in
@@ -171,6 +130,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
      mflux
      mlx
      mlx-lm
+      mlx-vlm
      msgspec
      nvidia-ml-py
      openai
@@ -196,7 +156,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
  # 'resources' are not getting copied to the installation directory, so we do it manually
  # FileNotFoundError: Unable to locate resources. Did you clone the repo properly?
  postInstall = ''
-    cp -r resources $out/${python.sitePackages}/exo/
+    cp -r resources $out/${python3Packages.python.sitePackages}/exo/
  '';

  pythonImportsCheck = [
@@ -225,6 +185,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
    "test_both_formats_produce_identical_tool_calls"
    "test_format_a_yields_tool_call"
    "test_format_b_yields_tool_call"
+    "test_thinking_then_text_counts_reasoning_tokens"
    "test_thinking_then_tool_call"
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fast-float";
-  version = "8.2.4";
+  version = "8.2.5";

  src = fetchFromGitHub {
    owner = "fastfloat";
    repo = "fast_float";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-VuiOuslq9BpATlMgcoIJSDC1Y4unF0GAs1ypnMMfrQU=";
+    hash = "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A=";
  };

  nativeBuildInputs = [ cmake ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/nspire-emus/firebird/releases/tag/v${finalAttrs.version}";
    description = "Third-party multi-platform emulator of the ARM-based TI-Nspire™ calculators";
    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ pneumaticat ];
+    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
 })
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ft2-clone";
-  version = "2.14";
+  version = "2.16";

  src = fetchFromGitHub {
    owner = "8bitbubsy";
    repo = "ft2-clone";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-JfATinxTuc8SCdLPxTwY/NL05UP34k5gFpcurI2TG1U=";
+    hash = "sha256-+ifMydkwMmJ2d5DcYEaDzaX12JAHGAVCZLSBPrBDLFg=";
  };

  nativeBuildInputs = [ cmake ];
@@ -16,13 +16,13 @@

 stdenv.mkDerivation {
  pname = "gf";
-  version = "0-unstable-2025-12-31";
+  version = "0-unstable-2026-04-11";

  src = fetchFromGitHub {
    repo = "gf";
    owner = "nakst";
-    rev = "9a5dbcc90dc9ca9580f6ce2854cd67e2e507b0c1";
-    hash = "sha256-+1ERc7mQCwaov+NdL1cdIZeDtHr4wkuLHaSdR8w5u40=";
+    rev = "93066aae8d7328c41f0da9985c680691fafa3fab";
+    hash = "sha256-2nA9c8PAIr8o/of//WUI9XHZgVNtXYsnMaaTOdAMTwc=";
  };

  nativeBuildInputs = [
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "gh-skyline";
-  version = "0.1.7";
+  version = "0.1.8";

  src = fetchFromGitHub {
    owner = "github";
    repo = "gh-skyline";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-yc9NaWx1jV2YUpPz2u9irikkLw1cnManq+AXREvCfII=";
+    hash = "sha256-LuBmz/gK1zT9y2eWrwxYWItxFftu2X3cjMBi7kvhAoI=";
  };

-  vendorHash = "sha256-fPXpgiCA9k8tYQ2leCb+XR34OGJZ6YWCFAxG9mTeXoI=";
+  vendorHash = "sha256-4irClPrNagFA2fee+QmxlPn8Xg2WlFupaflmR0/+UOY=";

  ldflags = [
    "-s"
@@ -7,7 +7,7 @@
 }:

 let
-  version = "2.7.2";
+  version = "2.9.0";
 in
 buildNpmPackage {
  pname = "git-conventional-commits";
@@ -17,10 +17,10 @@ buildNpmPackage {
    owner = "qoomon";
    repo = "git-conventional-commits";
    tag = "v${version}";
-    hash = "sha256-3X5AnpIzqszKjMqFgUr9wzyzDpnRJ94hcBJpQ8J9H/c=";
+    hash = "sha256-Mt99QTrWv+uuThL7tyM2wyOFj6/MrSKXg5ai0RNyyDE=";
  };

-  npmDepsHash = "sha256-XUDWvoJTpOQZCUyYbijD/hA1HVseHO19vAheJrPd1Gk=";
+  npmDepsHash = "sha256-6Dgf6wx0G0Ev8IPrgHU/dTdRNvrtKa+Shdvv1IJolN4=";

  dontNpmBuild = true;

@@ -57,7 +57,6 @@ buildGoModule (finalAttrs: {
    homepage = "https://helmfile.readthedocs.io/";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
-      pneumaticat
      yurrriq
    ];
  };
@@ -42,16 +42,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "liana";
-  version = "13.1"; # keep in sync with lianad
+  version = "14.0"; # keep in sync with lianad

  src = fetchFromGitHub {
    owner = "wizardsardine";
    repo = "liana";
    tag = "v${version}";
-    hash = "sha256-WrVvirqcseUZbuDHlABw6sFgdohbv/JQ/RB4j2hO+QQ=";
+    hash = "sha256-1d+icjk1NamlvEx4Xb1Ao4d1hb/t5aBwho+yCtHF9y4=";
  };

-  cargoHash = "sha256-AkDMLgRuSYmi4IvCSNM4ow6K8KvtJWaD2SOoNqyh774=";
+  cargoHash = "sha256-9CWJIRby6QWJmkYSHj2lFfEj0plX5iWxsdQs5sYww7Q=";

  nativeBuildInputs = [
    pkg-config
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "lianad";
-  version = "13.1"; # keep in sync with liana
+  version = "14.0"; # keep in sync with liana

  src = fetchFromGitHub {
    owner = "wizardsardine";
    repo = "liana";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-WrVvirqcseUZbuDHlABw6sFgdohbv/JQ/RB4j2hO+QQ=";
+    hash = "sha256-1d+icjk1NamlvEx4Xb1Ao4d1hb/t5aBwho+yCtHF9y4=";
  };

-  cargoHash = "sha256-AkDMLgRuSYmi4IvCSNM4ow6K8KvtJWaD2SOoNqyh774=";
+  cargoHash = "sha256-9CWJIRby6QWJmkYSHj2lFfEj0plX5iWxsdQs5sYww7Q=";

  buildInputs = [ udev ];

@@ -11,8 +11,8 @@
  },
  {
    "pname": "AudibleApi",
-    "version": "10.1.4.1",
-    "hash": "sha256-5sHQ7IwVTL+GsX0bp7H3imKxIAfngM9SiNC65hc3+8Y="
+    "version": "10.1.5.1",
+    "hash": "sha256-XSLNUNXlOj0YCqe4Ix+mvbR64Mr/mQgeXTif0q+OSCo="
  },
  {
    "pname": "Avalonia",
@@ -766,8 +766,8 @@
  },
  {
    "pname": "Tmds.DBus.Protocol",
-    "version": "0.21.2",
-    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+    "version": "0.21.3",
+    "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI="
  },
  {
    "pname": "WebViewControlAvaloniaFree",
@@ -16,13 +16,13 @@

 buildDotnetModule rec {
  pname = "libation";
-  version = "13.3.3";
+  version = "13.3.4";

  src = fetchFromGitHub {
    owner = "rmcrackan";
    repo = "Libation";
    tag = "v${version}";
-    hash = "sha256-nWmTk3oMuTcSvEzN/+2BnRWEqwLecRy2mS6uPNUP9UI=";
+    hash = "sha256-GCPAUbi8VWV/EmhEoEgjf5QdNbuuVGBMnvFQ8G6+kmk=";
  };

  sourceRoot = "${src.name}/Source";
@@ -14,17 +14,17 @@
 }:
 buildGoModule rec {
  pname = "mautrix-slack";
-  version = "26.03";
-  tag = "v0.2603.0";
+  version = "26.04";
+  tag = "v0.2604.0";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "slack";
    inherit tag;
-    hash = "sha256-YR8t8UNKkMS8cn5rJa2NaRRkJlzwb45O+dWOyDp8qi8=";
+    hash = "sha256-1BWzKqYNI4QftROuGOjPBNb0qOBQ0gLYkv5zTPsNesU=";
  };

-  vendorHash = "sha256-qkEoG4J+dS9jkgmgF3Ztm5Q68YB2uSUMCPcKYuU5PWc=";
+  vendorHash = "sha256-w9N7gpO0KTFwawFKsmxdXZGrLLEYkjfbenP7G6hkJk4=";

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";
@@ -14,20 +14,20 @@

 buildGoModule rec {
  pname = "mautrix-whatsapp";
-  version = "26.03";
-  tag = "v0.2603.0";
+  version = "26.04";
+  tag = "v0.2604.0";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "whatsapp";
    inherit tag;
-    hash = "sha256-iLPcMi/6262r+jq3RIkiUckniwTFsaajy5EwYFRaenU=";
+    hash = "sha256-y5oApQXQBy+ksU/03RxixBlmv+qNaKyJvgFQVfurIBs=";
  };

  buildInputs = lib.optional (!withGoolm) olm;
  tags = lib.optional withGoolm "goolm";

-  vendorHash = "sha256-+B/WF0tt7cqfvM07jHpPZHzI5frQOKhxYMFl4asSPqg=";
+  vendorHash = "sha256-idjQryuyPCrCoaebJ7itAwUrGRpg9rWkOVK/GY/CBkg=";

  ldflags = [
    "-s"
@@ -11,12 +11,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "nh-unwrapped";
-  version = "4.3.0";
+  version = "4.3.1";
  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "nh";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-A3bEBKJlWYqsw41g4RaTwSLUWq8Mw/zz4FpMj4Lua+c=";
+    hash = "sha256-8W7devMLhnnQcb2C8TDA6FoXlPR2RRN/zpB6C4ZIa3E=";
  };

  strictDeps = true;
@@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      rm $out/bin/xtask
    '';

-  cargoHash = "sha256-BLv69rL5L84wNTMiKHbSumFU4jVQqAiI1pS5oNLY9yE=";
+  cargoHash = "sha256-TpfxtTVZJhbJtPTPaTrUTTZmB+ZMdcB67kqid87vlOY=";

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

@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "odiff";
-  version = "4.3.3";
+  version = "4.3.8";

  src = fetchFromGitHub {
    owner = "dmtrKovalenko";
    repo = "odiff";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5x03mpqBllfEVBGMspcC/ljC6PrSXQgU2j+eKfHu6PM=";
+    hash = "sha256-YiyhhVV73XfVoYCRcYU7PL+Vrcwaf2FINH0W+Ejcu4Q=";
  };

  postConfigure = ''
@@ -104,6 +104,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  '';

  env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+  env.OPENCODE_DISABLE_MODELS_FETCH = true;
  env.OPENCODE_VERSION = finalAttrs.version;
  env.OPENCODE_CHANNEL = "stable";

@@ -150,7 +151,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    writableTmpDirAsHomeHook
  ];
  doInstallCheck = true;
-  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckKeepEnvironment = [
+    "HOME"
+    "OPENCODE_DISABLE_MODELS_FETCH"
+  ];
  versionCheckProgramArg = "--version";

  passthru = {
@@ -1,200 +0,0 @@
-From 11711398a1ec16f4eaeac8523b77165a560b69cc Mon Sep 17 00:00:00 2001
-From: OPNA2608 <christoph.neidahl@gmail.com>
-Date: Sun, 13 Jun 2021 13:55:53 +0200
-Subject: [PATCH] Look for system-installed Rt libs
-
---
- CMakeLists.txt | 159 +++++++++++++++++++++++++++++++------------------
- 1 file changed, 102 insertions(+), 57 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3e53c3..027c1b1 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,15 +50,6 @@ message("!! Optional feature summary:")
- message("!!   RtMidi: ${USE_RTMIDI}")
- message("!!   RtAudio: ${USE_RTAUDIO}")
- 
-if(USE_RTAUDIO)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    pkg_check_modules(JACK "jack")
-    message("!!   -- Jack driver: ${JACK_FOUND}")
-    pkg_check_modules(PULSEAUDIO "libpulse-simple")
-    message("!!   -- Pulseaudio driver: ${PULSEAUDIO_FOUND}")
-  endif()
-endif()
-
- if(ENABLE_PLOTS)
-   message("!!   Qwt: ${QWT_LIBRARY}")
- endif()
-@@ -250,65 +241,119 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- endif()
- 
- if(USE_RTMIDI)
-  add_library(RtMidi STATIC "src/midi/external/rtmidi/RtMidi.cpp")
-  target_include_directories(RtMidi PUBLIC "src/midi/external/rtmidi")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    target_compile_definitions(RtMidi PUBLIC "__LINUX_ALSA__")
-    target_link_libraries(RtMidi PUBLIC "asound")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    target_compile_definitions(RtMidi PUBLIC "__WINDOWS_MM__")
-    target_link_libraries(RtMidi PUBLIC "winmm")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    target_compile_definitions(RtMidi PUBLIC "__MACOSX_CORE__")
-    find_library(COREMIDI_LIBRARY "CoreMIDI")
-    target_link_libraries(RtMidi PUBLIC "${COREMIDI_LIBRARY}")
-+  if(PKG_CONFIG_FOUND)
-+    pkg_check_modules(RTMIDI rtmidi)
-+    if(RTMIDI_FOUND)
-+      message("Using system-installed RtMidi found by pkg-config.")
-+      target_link_libraries(OPL3BankEditor PUBLIC ${RTMIDI_LDFLAGS})
-+      target_include_directories(OPL3BankEditor PUBLIC ${RTMIDI_INCLUDE_DIRS})
-+      target_compile_options(OPL3BankEditor PUBLIC ${RTMIDI_CFLAGS})
-+    endif()
-   endif()
-+
-+  if(NOT RTMIDI_FOUND)
-+    find_library(RTMIDI_LIBRARY "rtmidi")
-+    find_path(RTMIDI_INCLUDE_DIRS "RtMidi.h")
-+    message("RtMidi library: ${RTMIDI_LIBRARY}")
-+    message("RtMidi header directory: ${RTMIDI_INCLUDE_DIRS}")
-+    if(NOT RTMIDI_LIBRARY-NOTFOUND AND NOT RTMIDI_INCLUDE_DIRS STREQUAL RTMIDI_INCLUDE_DIRS-NOTFOUND)
-+      message("Using system-installed RtMidi.")
-+      set(RTMIDI_FOUND TRUE)
-+      target_link_libraries(OPL3BankEditor PUBLIC ${RTMIDI_LIBRARY})
-+      target_include_directories(OPL3BankEditor PUBLIC ${RTMIDI_INCLUDE_DIRS})
-+    endif()
-+  endif()
-+
-+  if(NOT RTMIDI_FOUND)
-+    message("Using bundled RtMidi.")
-+    add_library(RtMidi STATIC "src/midi/external/rtmidi/RtMidi.cpp")
-+    target_include_directories(RtMidi PUBLIC "src/midi/external/rtmidi")
-+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+      target_compile_definitions(RtMidi PUBLIC "__LINUX_ALSA__")
-+      target_link_libraries(RtMidi PUBLIC "asound")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-+      target_compile_definitions(RtMidi PUBLIC "__WINDOWS_MM__")
-+      target_link_libraries(RtMidi PUBLIC "winmm")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+      target_compile_definitions(RtMidi PUBLIC "__MACOSX_CORE__")
-+      find_library(COREMIDI_LIBRARY "CoreMIDI")
-+      target_link_libraries(RtMidi PUBLIC "${COREMIDI_LIBRARY}")
-+    endif()
-+    target_link_libraries(OPL3BankEditor PRIVATE RtMidi)
-+  endif()
-+
-   target_sources(OPL3BankEditor PRIVATE "src/midi/midi_rtmidi.cpp")
-   target_compile_definitions(OPL3BankEditor PRIVATE "ENABLE_MIDI")
-  target_link_libraries(OPL3BankEditor PRIVATE RtMidi)
- endif()
- 
- if(USE_RTAUDIO)
-  add_library(RtAudio STATIC "src/audio/external/rtaudio/RtAudio.cpp")
-  target_include_directories(RtAudio PUBLIC "src/audio/external/rtaudio")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    target_compile_definitions(RtAudio PUBLIC "__LINUX_ALSA__")
-    target_link_libraries(RtAudio PUBLIC "asound")
-    if(JACK_FOUND)
-      target_compile_definitions(RtAudio PUBLIC "__UNIX_JACK__")
-      target_include_directories(RtAudio PUBLIC ${JACK_INCLUDE_DIRS})
-      link_directories(${JACK_LIBRARY_DIRS})
-      target_link_libraries(RtAudio PUBLIC ${JACK_LIBRARIES})
-+  if(PKG_CONFIG_FOUND)
-+    pkg_check_modules(RTAUDIO rtaudio)
-+    if(RTAUDIO_FOUND)
-+      message("Using system-installed RtAudio found by pkg-config.")
-+      target_link_libraries(OPL3BankEditor PUBLIC ${RTAUDIO_LDFLAGS})
-+      target_include_directories(OPL3BankEditor PUBLIC ${RTAUDIO_INCLUDE_DIRS})
-+      target_compile_options(OPL3BankEditor PUBLIC ${RTAUDIO_CFLAGS})
-+    endif()
-+  endif()
-+
-+  if(NOT RTAUDIO_FOUND)
-+    find_library(RTAUDIO_LIBRARY "rtaudio")
-+    find_path(RTAUDIO_INCLUDE_DIRS "RtAudio.h")
-+    message("RtAudio library: ${RTAUDIO_LIBRARY}")
-+    message("RtAudio header directory: ${RTAUDIO_INCLUDE_DIRS}")
-+    if(NOT RTAUDIO_LIBRARY-NOTFOUND AND NOT RTAUDIO_INCLUDE_DIRS STREQUAL RTAUDIO_INCLUDE_DIRS-NOTFOUND)
-+      message("Using system-installed RtAudio.")
-+      set(RTAUDIO_FOUND TRUE)
-+      target_link_libraries(OPL3BankEditor PUBLIC ${RTAUDIO_LIBRARY})
-+      target_include_directories(OPL3BankEditor PUBLIC ${RTAUDIO_INCLUDE_DIRS})
-     endif()
-    if(PULSEAUDIO_FOUND)
-      target_compile_definitions(RtAudio PUBLIC "__LINUX_PULSE__")
-      target_include_directories(RtAudio PUBLIC ${PULSEAUDIO_INCLUDE_DIRS})
-      link_directories(${PULSEAUDIO_LIBRARY_DIRS})
-      target_link_libraries(RtAudio PUBLIC ${PULSEAUDIO_LIBRARIES})
-+  endif()
-+
-+  if(NOT RTAUDIO_FOUND)
-+    message("Using bundled RtAudio.")
-+    add_library(RtAudio STATIC "src/audio/external/rtaudio/RtAudio.cpp")
-+    target_include_directories(RtAudio PUBLIC "src/audio/external/rtaudio")
-+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+      target_compile_definitions(RtAudio PUBLIC "__LINUX_ALSA__")
-+      target_link_libraries(RtAudio PUBLIC "asound")
-+      if(JACK_FOUND)
-+        target_compile_definitions(RtAudio PUBLIC "__UNIX_JACK__")
-+        target_include_directories(RtAudio PUBLIC ${JACK_INCLUDE_DIRS})
-+        link_directories(${JACK_LIBRARY_DIRS})
-+        target_link_libraries(RtAudio PUBLIC ${JACK_LIBRARIES})
-+      endif()
-+      if(PULSEAUDIO_FOUND)
-+        target_compile_definitions(RtAudio PUBLIC "__LINUX_PULSE__")
-+        target_include_directories(RtAudio PUBLIC ${PULSEAUDIO_INCLUDE_DIRS})
-+        link_directories(${PULSEAUDIO_LIBRARY_DIRS})
-+        target_link_libraries(RtAudio PUBLIC ${PULSEAUDIO_LIBRARIES})
-+      endif()
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_DS__")
-+      target_link_libraries(RtAudio PUBLIC "dsound" "ole32")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_WASAPI__")
-+      target_link_libraries(RtAudio PUBLIC "ksguid")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_ASIO__")
-+      target_include_directories(RtAudio PRIVATE
-+        "src/audio/external/rtaudio/include")
-+      target_sources(RtAudio PRIVATE
-+        "src/audio/external/rtaudio/include/asio.cpp"
-+        "src/audio/external/rtaudio/include/asiodrivers.cpp"
-+        "src/audio/external/rtaudio/include/asiolist.cpp"
-+        "src/audio/external/rtaudio/include/iasiothiscallresolver.cpp")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+      target_compile_definitions(RtAudio PUBLIC "__MACOSX_CORE__")
-+      find_library(COREAUDIO_LIBRARY "CoreAudio")
-+      target_link_libraries(RtAudio PUBLIC "${COREAUDIO_LIBRARY}")
-+      find_library(COREFOUNDATION_LIBRARY "CoreFoundation")
-+      target_link_libraries(RtAudio PUBLIC "${COREFOUNDATION_LIBRARY}")
-     endif()
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_DS__")
-    target_link_libraries(RtAudio PUBLIC "dsound" "ole32")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_WASAPI__")
-    target_link_libraries(RtAudio PUBLIC "ksguid")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_ASIO__")
-    target_include_directories(RtAudio PRIVATE
-      "src/audio/external/rtaudio/include")
-    target_sources(RtAudio PRIVATE
-      "src/audio/external/rtaudio/include/asio.cpp"
-      "src/audio/external/rtaudio/include/asiodrivers.cpp"
-      "src/audio/external/rtaudio/include/asiolist.cpp"
-      "src/audio/external/rtaudio/include/iasiothiscallresolver.cpp")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    target_compile_definitions(RtAudio PUBLIC "__MACOSX_CORE__")
-    find_library(COREAUDIO_LIBRARY "CoreAudio")
-    target_link_libraries(RtAudio PUBLIC "${COREAUDIO_LIBRARY}")
-    find_library(COREFOUNDATION_LIBRARY "CoreFoundation")
-    target_link_libraries(RtAudio PUBLIC "${COREFOUNDATION_LIBRARY}")
-+    target_link_libraries(OPL3BankEditor PRIVATE RtAudio)
-   endif()
-+
-   target_sources(OPL3BankEditor PRIVATE "src/audio/ao_rtaudio.cpp")
-   target_compile_definitions(OPL3BankEditor PRIVATE "ENABLE_AUDIO_TESTING")
-  target_link_libraries(OPL3BankEditor PRIVATE RtAudio)
- endif()
- 
- add_executable(measurer_tool
-- 
-2.29.3
-
@@ -2,62 +2,62 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  dos2unix,
+  unstableGitUpdater,
  cmake,
  pkg-config,
-  libsForQt5,
+  qt6Packages,
  rtaudio,
  rtmidi,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "opl3bankeditor";
-  version = "1.5.1";
+  version = "1.5.1-unstable-2026-01-03";

  src = fetchFromGitHub {
    owner = "Wohlstand";
    repo = "opl3bankeditor";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-So9g+BDgTvJnEK4DIweEaJoK4uOmmSmyiIfV12lfeSI=";
+    rev = "9d0084cc7073ca911446257c7b937901267c3243";
+    fetchSubmodules = true;
+    hash = "sha256-wUHpXZ0McL6WLqogXaA+HtVpKxC/Dc5Ji4PnjCksoGE=";
  };

-  prePatch = ''
-    dos2unix CMakeLists.txt
-  '';
-
-  patches = [
-    ./0001-opl3bankeditor-Look-for-system-installed-Rt-libs.patch
-  ];
-
  nativeBuildInputs = [
-    dos2unix
    cmake
    pkg-config
-    libsForQt5.qttools
-    libsForQt5.wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
  ];

  buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qwt6_1
+    qt6Packages.qtbase
+    qt6Packages.qwt
    rtaudio
    rtmidi
  ];

-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
-  '';
+  cmakeFlags = [
+    (lib.strings.cmakeFeature "BUILD_MAJOR_QT" "6")
+    (lib.strings.cmakeBool "FORCE_EXEC_NO_PIE" false)
+    (lib.strings.cmakeBool "USE_RTAUDIO" true)
+    (lib.strings.cmakeBool "USE_RTMIDI" true)
+    (lib.strings.cmakeBool "USE_VENDORED_RTAUDIO" false)
+    (lib.strings.cmakeBool "USE_VENDORED_RTMIDI" false)
+  ];

  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
    mkdir $out/{bin,Applications}
    mv "OPL3 Bank Editor.app" $out/Applications/

-    install_name_tool -change {,${libsForQt5.qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/OPL3 Bank Editor.app/Contents/MacOS/OPL3 Bank Editor"
+    install_name_tool -change {,${qt6Packages.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPL3 Bank Editor.app/Contents/MacOS/OPL3 Bank Editor"

    ln -s "$out/Applications/OPL3 Bank Editor.app/Contents/MacOS/OPL3 Bank Editor" $out/bin/opl3_bank_editor
  '';

+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
+
  meta = {
    mainProgram = "opl3_bank_editor";
    description = "Small cross-platform editor of the OPL3 FM banks of different formats";
@@ -1,200 +0,0 @@
-From 69c993dacc7dc0cb9d105c3dfa764cd7be5c343e Mon Sep 17 00:00:00 2001
-From: OPNA2608 <christoph.neidahl@gmail.com>
-Date: Sun, 13 Jun 2021 14:21:17 +0200
-Subject: [PATCH] Look for system-installed Rt libs
-
---
- CMakeLists.txt | 159 +++++++++++++++++++++++++++++++------------------
- 1 file changed, 102 insertions(+), 57 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f428dc4..18ba8c3 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,15 +41,6 @@ message("!! Optional feature summary:")
- message("!!   RtMidi: ${USE_RTMIDI}")
- message("!!   RtAudio: ${USE_RTAUDIO}")
- 
-if(USE_RTAUDIO)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    pkg_check_modules(JACK "jack")
-    message("!!   -- Jack driver: ${JACK_FOUND}")
-    pkg_check_modules(PULSEAUDIO "libpulse-simple")
-    message("!!   -- Pulseaudio driver: ${PULSEAUDIO_FOUND}")
-  endif()
-endif()
-
- if(ENABLE_PLOTS)
-   message("!!   Qwt: ${QWT_LIBRARY}")
- endif()
-@@ -198,65 +189,119 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- endif()
- 
- if(USE_RTMIDI)
-  add_library(RtMidi STATIC "src/midi/external/rtmidi/RtMidi.cpp")
-  target_include_directories(RtMidi PUBLIC "src/midi/external/rtmidi")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    target_compile_definitions(RtMidi PUBLIC "__LINUX_ALSA__")
-    target_link_libraries(RtMidi PUBLIC "asound")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    target_compile_definitions(RtMidi PUBLIC "__WINDOWS_MM__")
-    target_link_libraries(RtMidi PUBLIC "winmm")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    target_compile_definitions(RtMidi PUBLIC "__MACOSX_CORE__")
-    find_library(COREMIDI_LIBRARY "CoreMIDI")
-    target_link_libraries(RtMidi PUBLIC "${COREMIDI_LIBRARY}")
-+  if(PKG_CONFIG_FOUND)
-+    pkg_check_modules(RTMIDI rtmidi)
-+    if(RTMIDI_FOUND)
-+      message("Using system-installed RtMidi found by pkg-config.")
-+      target_link_libraries(OPN2BankEditor PUBLIC ${RTMIDI_LDFLAGS})
-+      target_include_directories(OPN2BankEditor PUBLIC ${RTMIDI_INCLUDE_DIRS})
-+      target_compile_options(OPN2BankEditor PUBLIC ${RTMIDI_CFLAGS})
-+    endif()
-+  endif()
-+
-+  if(NOT RTMIDI_FOUND)
-+    find_library(RTMIDI_LIBRARY "rtmidi")
-+    find_path(RTMIDI_INCLUDE_DIRS "RtMidi.h")
-+    message("RtMidi library: ${RTMIDI_LIBRARY}")
-+    message("RtMidi header directory: ${RTMIDI_INCLUDE_DIRS}")
-+    if(NOT RTMIDI_LIBRARY-NOTFOUND AND NOT RTMIDI_INCLUDE_DIRS STREQUAL RTMIDI_INCLUDE_DIRS-NOTFOUND)
-+      message("Using system-installed RtMidi.")
-+      set(RTMIDI_FOUND TRUE)
-+      target_link_libraries(OPN2BankEditor PUBLIC ${RTMIDI_LIBRARY})
-+      target_include_directories(OPN2BankEditor PUBLIC ${RTMIDI_INCLUDE_DIRS})
-+    endif()
-+  endif()
-+
-+  if(NOT RTMIDI_FOUND)
-+    message("Using bundled RtMidi.")
-+    add_library(RtMidi STATIC "src/midi/external/rtmidi/RtMidi.cpp")
-+    target_include_directories(RtMidi PUBLIC "src/midi/external/rtmidi")
-+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+      target_compile_definitions(RtMidi PUBLIC "__LINUX_ALSA__")
-+      target_link_libraries(RtMidi PUBLIC "asound")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-+      target_compile_definitions(RtMidi PUBLIC "__WINDOWS_MM__")
-+      target_link_libraries(RtMidi PUBLIC "winmm")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+      target_compile_definitions(RtMidi PUBLIC "__MACOSX_CORE__")
-+      find_library(COREMIDI_LIBRARY "CoreMIDI")
-+      target_link_libraries(RtMidi PUBLIC "${COREMIDI_LIBRARY}")
-+    endif()
-+    target_link_libraries(OPN2BankEditor PRIVATE RtMidi)
-   endif()
-+
-   target_sources(OPN2BankEditor PRIVATE "src/midi/midi_rtmidi.cpp")
-   target_compile_definitions(OPN2BankEditor PRIVATE "ENABLE_MIDI")
-  target_link_libraries(OPN2BankEditor PRIVATE RtMidi)
- endif()
- 
- if(USE_RTAUDIO)
-  add_library(RtAudio STATIC "src/audio/external/rtaudio/RtAudio.cpp")
-  target_include_directories(RtAudio PUBLIC "src/audio/external/rtaudio")
-  if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    target_compile_definitions(RtAudio PUBLIC "__LINUX_ALSA__")
-    target_link_libraries(RtAudio PUBLIC "asound")
-    if(JACK_FOUND)
-      target_compile_definitions(RtAudio PUBLIC "__UNIX_JACK__")
-      target_include_directories(RtAudio PUBLIC ${JACK_INCLUDE_DIRS})
-      link_directories(${JACK_LIBRARY_DIRS})
-      target_link_libraries(RtAudio PUBLIC ${JACK_LIBRARIES})
-+  if(PKG_CONFIG_FOUND)
-+    pkg_check_modules(RTAUDIO rtaudio)
-+    if(RTAUDIO_FOUND)
-+      message("Using system-installed RtAudio found by pkg-config.")
-+      target_link_libraries(OPN2BankEditor PUBLIC ${RTAUDIO_LDFLAGS})
-+      target_include_directories(OPN2BankEditor PUBLIC ${RTAUDIO_INCLUDE_DIRS})
-+      target_compile_options(OPN2BankEditor PUBLIC ${RTAUDIO_CFLAGS})
-     endif()
-    if(PULSEAUDIO_FOUND)
-      target_compile_definitions(RtAudio PUBLIC "__LINUX_PULSE__")
-      target_include_directories(RtAudio PUBLIC ${PULSEAUDIO_INCLUDE_DIRS})
-      link_directories(${PULSEAUDIO_LIBRARY_DIRS})
-      target_link_libraries(RtAudio PUBLIC ${PULSEAUDIO_LIBRARIES})
-+  endif()
-+
-+  if(NOT RTAUDIO_FOUND)
-+    find_library(RTAUDIO_LIBRARY "rtaudio")
-+    find_path(RTAUDIO_INCLUDE_DIRS "RtAudio.h")
-+    message("RtAudio library: ${RTAUDIO_LIBRARY}")
-+    message("RtAudio header directory: ${RTAUDIO_INCLUDE_DIRS}")
-+    if(NOT RTAUDIO_LIBRARY-NOTFOUND AND NOT RTAUDIO_INCLUDE_DIRS STREQUAL RTAUDIO_INCLUDE_DIRS-NOTFOUND)
-+      message("Using system-installed RtAudio.")
-+      set(RTAUDIO_FOUND TRUE)
-+      target_link_libraries(OPN2BankEditor PUBLIC ${RTAUDIO_LIBRARY})
-+      target_include_directories(OPN2BankEditor PUBLIC ${RTAUDIO_INCLUDE_DIRS})
-     endif()
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_DS__")
-    target_link_libraries(RtAudio PUBLIC "dsound" "ole32")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_WASAPI__")
-    target_link_libraries(RtAudio PUBLIC "ksguid")
-    target_compile_definitions(RtAudio PUBLIC "__WINDOWS_ASIO__")
-    target_include_directories(RtAudio PRIVATE
-      "src/audio/external/rtaudio/include")
-    target_sources(RtAudio PRIVATE
-      "src/audio/external/rtaudio/include/asio.cpp"
-      "src/audio/external/rtaudio/include/asiodrivers.cpp"
-      "src/audio/external/rtaudio/include/asiolist.cpp"
-      "src/audio/external/rtaudio/include/iasiothiscallresolver.cpp")
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    target_compile_definitions(RtAudio PUBLIC "__MACOSX_CORE__")
-    find_library(COREAUDIO_LIBRARY "CoreAudio")
-    target_link_libraries(RtAudio PUBLIC "${COREAUDIO_LIBRARY}")
-    find_library(COREFOUNDATION_LIBRARY "CoreFoundation")
-    target_link_libraries(RtAudio PUBLIC "${COREFOUNDATION_LIBRARY}")
-   endif()
-+
-+  if(NOT RTAUDIO_FOUND)
-+    message("Using bundled RtAudio.")
-+    add_library(RtAudio STATIC "src/audio/external/rtaudio/RtAudio.cpp")
-+    target_include_directories(RtAudio PUBLIC "src/audio/external/rtaudio")
-+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-+      target_compile_definitions(RtAudio PUBLIC "__LINUX_ALSA__")
-+      target_link_libraries(RtAudio PUBLIC "asound")
-+      if(JACK_FOUND)
-+        target_compile_definitions(RtAudio PUBLIC "__UNIX_JACK__")
-+        target_include_directories(RtAudio PUBLIC ${JACK_INCLUDE_DIRS})
-+        link_directories(${JACK_LIBRARY_DIRS})
-+        target_link_libraries(RtAudio PUBLIC ${JACK_LIBRARIES})
-+      endif()
-+      if(PULSEAUDIO_FOUND)
-+        target_compile_definitions(RtAudio PUBLIC "__LINUX_PULSE__")
-+        target_include_directories(RtAudio PUBLIC ${PULSEAUDIO_INCLUDE_DIRS})
-+        link_directories(${PULSEAUDIO_LIBRARY_DIRS})
-+        target_link_libraries(RtAudio PUBLIC ${PULSEAUDIO_LIBRARIES})
-+      endif()
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_DS__")
-+      target_link_libraries(RtAudio PUBLIC "dsound" "ole32")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_WASAPI__")
-+      target_link_libraries(RtAudio PUBLIC "ksguid")
-+      target_compile_definitions(RtAudio PUBLIC "__WINDOWS_ASIO__")
-+      target_include_directories(RtAudio PRIVATE
-+        "src/audio/external/rtaudio/include")
-+      target_sources(RtAudio PRIVATE
-+        "src/audio/external/rtaudio/include/asio.cpp"
-+        "src/audio/external/rtaudio/include/asiodrivers.cpp"
-+        "src/audio/external/rtaudio/include/asiolist.cpp"
-+        "src/audio/external/rtaudio/include/iasiothiscallresolver.cpp")
-+    elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+      target_compile_definitions(RtAudio PUBLIC "__MACOSX_CORE__")
-+      find_library(COREAUDIO_LIBRARY "CoreAudio")
-+      target_link_libraries(RtAudio PUBLIC "${COREAUDIO_LIBRARY}")
-+      find_library(COREFOUNDATION_LIBRARY "CoreFoundation")
-+      target_link_libraries(RtAudio PUBLIC "${COREFOUNDATION_LIBRARY}")
-+    endif()
-+    target_link_libraries(OPN2BankEditor PRIVATE RtAudio)
-+  endif()
-+
-   target_sources(OPN2BankEditor PRIVATE "src/audio/ao_rtaudio.cpp")
-   target_compile_definitions(OPN2BankEditor PRIVATE "ENABLE_AUDIO_TESTING")
-  target_link_libraries(OPN2BankEditor PRIVATE RtAudio)
- endif()
- 
- add_executable(measurer_tool
-- 
-2.29.3
-
@@ -2,9 +2,10 @@
  stdenv,
  lib,
  fetchFromGitHub,
-  dos2unix,
+  unstableGitUpdater,
  cmake,
  pkg-config,
+  # No Qt6 yet: https://github.com/Wohlstand/OPN2BankEditor/issues/126
  libsForQt5,
  rtaudio,
  rtmidi,
@@ -12,25 +13,23 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "opn2bankeditor";
-  version = "1.3";
+  version = "1.3-unstable-2026-01-01";

  src = fetchFromGitHub {
    owner = "Wohlstand";
    repo = "opn2bankeditor";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-YigxCgGIjOrwDxNgcIwiW8d3qHlDyA7o0vUUb5SpKlo=";
+    rev = "0371db0867ac23f49e8d160f9fd3163cf1fe41a2";
+    fetchSubmodules = true;
+    hash = "sha256-+BgvzZoGAh9KlKjAyn7BsWnfGDB5njW8tJoFwtY0fCo=";
  };

-  prePatch = ''
-    dos2unix CMakeLists.txt
+  # https://github.com/Wohlstand/OPN2BankEditor/issues/125
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.2...3.10)'
  '';

-  patches = [
-    ./0001-opn2bankeditor-Look-for-system-installed-Rt-libs.patch
-  ];
-
  nativeBuildInputs = [
-    dos2unix
    cmake
    pkg-config
    libsForQt5.qttools
@@ -39,25 +38,31 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    libsForQt5.qtbase
-    libsForQt5.qwt6_1
+    libsForQt5.qwt
    rtaudio
    rtmidi
  ];

-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
-  '';
+  cmakeFlags = [
+    (lib.strings.cmakeBool "USE_RTAUDIO" true)
+    (lib.strings.cmakeBool "USE_RTMIDI" true)
+    (lib.strings.cmakeBool "USE_VENDORED_RTAUDIO" false)
+    (lib.strings.cmakeBool "USE_VENDORED_RTMIDI" false)
+  ];

  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
    mkdir $out/{bin,Applications}
    mv "OPN2 Bank Editor.app" $out/Applications/

-    install_name_tool -change {,${libsForQt5.qwt6_1}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor"
+    install_name_tool -change {,${libsForQt5.qwt}/lib/}libqwt.6.dylib "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor"

    ln -s "$out/Applications/OPN2 Bank Editor.app/Contents/MacOS/OPN2 Bank Editor" $out/bin/opn2_bank_editor
  '';

+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
+
  meta = {
    mainProgram = "opn2_bank_editor";
    description = "Small cross-platform editor of the OPN2 FM banks of different formats";
@@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "passes";
-  version = "0.11";
+  version = "0.12";

  src = fetchFromGitHub {
    owner = "pablo-s";
    repo = "passes";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-PD6+G04RyNqbBvOjwwu9Gtzng5hgV6SvWGv4iNrvd18=";
+    hash = "sha256-S+TEZQu7Ye+hBqzSJP/YEik35b+4LQrnk2A/hhTjpww=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "postfix-tlspol";
-  version = "1.8.27";
+  version = "1.9.0";

  src = fetchFromGitHub {
    owner = "Zuplu";
    repo = "postfix-tlspol";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JK6QBJ7TxGAmIffrGIc/gE/w7HWdGMWUTt/TpU572tA=";
+    hash = "sha256-tYe5uPykTkw9XQHPdxa1nqdWgOtKKMdnis0m0SdlEPo=";
  };

  vendorHash = null;
@@ -7,7 +7,7 @@
  rainfrog,
 }:
 let
-  version = "0.3.17";
+  version = "0.3.18";
 in
 rustPlatform.buildRustPackage {
  inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
    owner = "achristmascarl";
    repo = "rainfrog";
    tag = "v${version}";
-    hash = "sha256-26pB4A1RR2d++Bh9u6IkNrJ552y6KALTxv1NwRzQ+UE=";
+    hash = "sha256-MraqApmj0FFGBbzG+XXjoDHPgJPG8yAMdXyoCZTMpFk=";
  };

-  cargoHash = "sha256-AeRh4xozRZs7IK7ez63DuglE+WUm3F3Gl4ohq1W/ZSg=";
+  cargoHash = "sha256-pPVJgemV7Esg1vYGxCPv8gv0I5DQwA1VtWhcgm5VLFE=";

  passthru = {
    tests.version = testers.testVersion {
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
    description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed";
    mainProgram = "rdocker";
    homepage = "https://github.com/dvddarias/rdocker";
-    maintainers = [ lib.maintainers.pneumaticat ];
+    maintainers = [ ];
    license = lib.licenses.mit;
    platforms = lib.platforms.unix;
  };
@@ -6,13 +6,13 @@

 buildGoModule (finalAttrs: {
  pname = "scalr-cli";
-  version = "0.17.8";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "Scalr";
    repo = "scalr-cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-hJvIVSv40Wlua1nOWJb5pu4OSfsATiwMoqNrZsWCBNA=";
+    hash = "sha256-j32W/z67jouaJh88IvRXfdBlxHr9SiKB+Xa9Bqiw4+0=";
  };

  vendorHash = "sha256-TUf+0Z0yBDOpzMuETn+FCAPXWvQltjRhwQ3Xz0X6YOI=";
@@ -6,6 +6,7 @@
  openssl,
  versionCheckHook,
  nix-update-script,
+  withTls ? true,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,10 +24,8 @@ rustPlatform.buildRustPackage (finalAttrs: {

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ openssl ];
-
-  # Currently no tests are implemented, so we avoid building the package twice
-  doCheck = false;
+  buildInputs = lib.optional withTls openssl;
+  buildFeatures = lib.optional withTls "tls";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "thunderkittens";
+  version = "0-unstable-2026-04-07";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "HazyResearch";
+    repo = "ThunderKittens";
+    rev = "0a3ce9a949fb520ba10cda09cb5ffad7f6a1cc0a";
+    hash = "sha256-Wk3oafjEkTddn/880dHAg8S7EUDuEbXYnW0dmPTC54g=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/include
+    cp -r include/* $out/include/
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Tile primitives for speedy CUDA deep learning kernels";
+    homepage = "https://github.com/HazyResearch/ThunderKittens";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
@@ -11,6 +11,8 @@
  libuuid,
  abrmdSupport ? true,
  tpm2-abrmd ? null,
+  buildPackages,
+  enableManpages ? buildPackages.pandoc.compiler.bootstrapAvailable,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -23,9 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
  };

  nativeBuildInputs = [
-    pandoc
    pkg-config
    makeWrapper
+  ]
+  ++ lib.optionals enableManpages [
+    pandoc
  ];
  buildInputs = [
    curl
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "traefik-certs-dumper";
-  version = "2.11.0";
+  version = "2.11.2";

  src = fetchFromGitHub {
    owner = "ldez";
    repo = "traefik-certs-dumper";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-rjD0zt5kJ7A4TLn3jQBLGvzvHthszP9AvmcILVo5lzk=";
+    sha256 = "sha256-4s4IN/aDGP/9mFEf3Sl8/R9GtQlYSSXjxPrSA2CYuWE=";
  };

-  vendorHash = "sha256-hGmcE8vEJI4nZOVFbDGWpnfTyupFydwGj09gMb2Mctc=";
+  vendorHash = "sha256-VKtYOc1PbR0UZ9mJZ5houzVEPN+j+OnTw42eFr1aQgg=";
  excludedPackages = "integrationtest";

  meta = {
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "uutils-login";
-  version = "0-unstable-2026-04-07";
+  version = "0-unstable-2026-04-16";

  src = fetchFromGitHub {
    owner = "uutils";
    repo = "login";
-    rev = "20df30470f98dc50af80c23f53cd6cacc64e85c3";
-    hash = "sha256-YQsnKpJRG3rEllKb4KtPi+lUeGoywh/UGsMfvRBdu4M=";
+    rev = "0f5fc5f66a890b65381dfaa3f112e2879476ad38";
+    hash = "sha256-Vkivr/lBj+kNiJji/wFKvsfvmD+vv9CxkPio1ZWolOE=";
  };

-  cargoHash = "sha256-dKpgyGcZEEx94iQH7NnO/X1+KLE/Bcdl1FFT7ijS1WE=";
+  cargoHash = "sha256-zgKNU24HJFT/DISWflKNN9R88cioLxBNdL8eexCRAOE=";

  cargoBuildFlags = [ "--workspace" ];

@@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "velocity";
-  version = "3.5.0-unstable-2026-04-01";
+  version = "3.5.0-unstable-2026-04-13";

  src = fetchFromGitHub {
    owner = "PaperMC";
    repo = "Velocity";
-    rev = "ab99bde9d658fb2a270fedd0c58fc905cf1be387";
-    hash = "sha256-KkBehlhqcO7rClhKMMNE7aM4NiYNIfiqg5wZNhJTKqk=";
+    rev = "a6d97e28adb1b0cd6464bab78ed4e2c14835868f";
+    hash = "sha256-CfYZgiYqH+M8t3CmPx3B3CIkudxPKHbtuysewqhE/B0=";
  };

  nativeBuildInputs = [
@@ -5,13 +5,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "vex-tui";
-  version = "2.0.2";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "CodeOne45";
    repo = "vex-tui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wmze6OkX8Oxm+HtHBWo1+oSVDUR4PWWTTW/Ldu5z8pc=";
+    hash = "sha256-Zvk9rcUyRwLzjy151ucEDv3upeuIOmklmh7FqTkSCg0=";
  };

  vendorHash = "sha256-jE53+VEjj5E5G2Yycwb8NDA8vDtoUtarrQgZ9ULyVh0=";
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vulkanscenegraph";
-  version = "1.1.13";
+  version = "1.1.14";

  src = fetchFromGitHub {
    owner = "vsg-dev";
    repo = "VulkanSceneGraph";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6Jxk94GPUaPxcv4dHTQKnE7n8b/2neG2Mrv94vc9ckU=";
+    hash = "sha256-879jvD8gP31ENYeTGexV+V4UQtdo2xJDPUaDRKkropg=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "vultr-cli";
-  version = "3.9.2";
+  version = "3.10.0";

  src = fetchFromGitHub {
    owner = "vultr";
    repo = "vultr-cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-czyLpc9pWFjqQkS08y6/MEfnUV+blFzPVpMdnn/15ns=";
+    hash = "sha256-Cwgku9sjznwpNQ2vHSwOnX0ymt42V55vAb3PiRMaFjM=";
  };

-  vendorHash = "sha256-75hBUfHUYAUhqh22EHRKjwv773h34loyFLw1JKy39W0=";
+  vendorHash = "sha256-jno5BPZn7RXpnn23lTRLj4IDgiaMPBDdP9h8WG1VohI=";

  nativeBuildInputs = [ installShellFiles ];

@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "wakatime-cli";
-  version = "2.3.0";
+  version = "2.3.1";

  src = fetchFromGitHub {
    owner = "wakatime";
    repo = "wakatime-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-t0HKRN7qguE+zhyI3fbBtuhpDAPZrbMS9wa8crQkLhc=";
+    hash = "sha256-ZOCOhLeDzdlePETOaBlaGmcxXxEtlKhmWlkXQRhlVBE=";
  };

  vendorHash = "sha256-HngszNLX2b2EVvh8ovouIEvjBOJL1jA5AhA6Y11ke9Y=";
@@ -14,6 +14,11 @@
    "version": "4.19.0",
    "hash": "sha256-Nb4ftf+RREzgiVOpc+xSxd4b+PiLGmFQM3okA/wGO54="
  },
+  {
+    "pname": "goaaats.Steamworks",
+    "version": "2.3.4",
+    "hash": "sha256-Wk9arQvVPPeMSgt8lL9rVRVkO1NrBNYzME4ZuOWcHc4="
+  },
  {
    "pname": "Hexa.NET.ImGui",
    "version": "2.2.9",
@@ -49,36 +54,6 @@
    "version": "1.0.5",
    "hash": "sha256-pJWjjU3AFsnMMX6cUoLUy4wovyfPx4S44Y6coMAGgcU="
  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "9.0.14",
-    "hash": "sha256-CYFpZjwH68KHWqec/xe6pN4IZkRqzcugkqLQlhXgA7M="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "9.0.14",
-    "hash": "sha256-/x9+MS5bMBCsMt3JKR53dnC8BoxbVJuQ67+MQ9uWrhk="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "10.0.5",
-    "hash": "sha256-wLAKLpfzo2Fe5/iGj4SMXYq1/uXVFakFjdepQWttmks="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
-    "version": "9.0.14",
-    "hash": "sha256-lmIs30hcwH5xQaystGKFkWa5Kt2U/6DH9mWjUAbFQss="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.win-x64",
-    "version": "10.0.5",
-    "hash": "sha256-iAwrxanErf0nX08bStBmzIBZlDvvJhCZo1xmrxi8c7g="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.win-x64",
-    "version": "9.0.14",
-    "hash": "sha256-/GL0ddcs1XMwW00PL1IPY5Mh7uxGsP/L/Jgxx4gyDg8="
-  },
  {
    "pname": "Microsoft.CodeAnalysis.Analyzers",
    "version": "3.3.3",
@@ -94,16 +69,16 @@
    "version": "4.14.0",
    "hash": "sha256-f7svtnkq4xLTjGVj6kNZ1ZGFCV/RESsM+GJZmEpezh4="
  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.0.1",
-    "hash": "sha256-i6XtEcymf17CcDkiEFZ6zSuLJdlEt3aZ2oLf81x00sA="
-  },
  {
    "pname": "Microsoft.CodeAnalysis.Common",
    "version": "4.0.1",
    "hash": "sha256-SU1WPMlg2245w9BFhS3GHtEEbus+tVAYaemHCW3Ysis="
  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.0.1",
+    "hash": "sha256-i6XtEcymf17CcDkiEFZ6zSuLJdlEt3aZ2oLf81x00sA="
+  },
  {
    "pname": "Microsoft.CodeAnalysis.NetAnalyzers",
    "version": "10.0.101",
@@ -114,81 +89,11 @@
    "version": "9.0.0",
    "hash": "sha256-UBTANXmzAS6KuCKDIGhi0MGphAI83FizpRCPebqJ9GE="
  },
-  {
-    "pname": "Microsoft.NET.ILLink.Tasks",
-    "version": "9.0.14",
-    "hash": "sha256-C5iDwdaHEn5xBH4VWKtqshPoscFTVDXdjgbvvbNNl/0="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "9.0.14",
-    "hash": "sha256-tX+wRSRsoL1uf2A5J03vgOXXDp0s0zIARVZKeIQ6J3U="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "10.0.5",
-    "hash": "sha256-BjeaDi5OYZlNl5Oaq9BEsvRd50xCV9kxfmwU8fymSzw="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.osx-x64",
-    "version": "9.0.14",
-    "hash": "sha256-49/RJMBbw3GeQGsbbfrxs0bPsMS/2jGkZ6gBK/nel4U="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.win-x64",
-    "version": "10.0.5",
-    "hash": "sha256-Rstfo3XefLjeoW5qfVcHsCviFxWvZS+F8McWRUW7WdQ="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.win-x64",
-    "version": "9.0.14",
-    "hash": "sha256-iUdlLBWto05nOUiqcvzxLQpb0Ayn0xNu10glTPGvse0="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "9.0.14",
-    "hash": "sha256-lU54ZU8G8vwTbetEMGLgyjMLSNI/VDwyieAX+aRexhU="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "9.0.14",
-    "hash": "sha256-Wdl28fplmnFuKO4RfMLWxtaEGexI83Uw1cfR2uz8piA="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "10.0.5",
-    "hash": "sha256-TaLme2Xd+hTpdmvekQ2YAZML+OLEnvBiBZKibFibwtQ="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
-    "version": "9.0.14",
-    "hash": "sha256-7Sh8eMaIFcilcZXERZKvjw14HGcdyUS61oiEryOzaWc="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.win-x64",
-    "version": "10.0.5",
-    "hash": "sha256-XtyAw8OB4ffgSoJftFKPNj/kYR/9+1f2x5y6oTaG1is="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.win-x64",
-    "version": "9.0.14",
-    "hash": "sha256-wzcS5NxSLHkKVc39QBI7zF4jeR9qV5T1LOT78fXhn2Q="
-  },
  {
    "pname": "Microsoft.NETCore.Platforms",
    "version": "1.1.0",
    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
-  },
-  {
-    "pname": "Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
-  },
  {
    "pname": "Microsoft.Win32.Registry",
    "version": "6.0.0-preview.5.21301.5",
@@ -284,156 +189,26 @@
    "version": "2.3.2",
    "hash": "sha256-HFW3T9erIDZnjO7qldQx5eRbsib52MSYdOIiCZZSGB0="
  },
-  {
-    "pname": "System.AppContext",
-    "version": "4.3.0",
-    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.3.0",
-    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
-  },
  {
    "pname": "System.Buffers",
    "version": "4.5.1",
    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
  },
-  {
-    "pname": "System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
-  },
-  {
-    "pname": "System.Collections.Concurrent",
-    "version": "4.3.0",
-    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
-  },
  {
    "pname": "System.Collections.Immutable",
    "version": "5.0.0",
    "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
  },
-  {
-    "pname": "System.Collections.NonGeneric",
-    "version": "4.3.0",
-    "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
-  },
-  {
-    "pname": "System.Collections.Specialized",
-    "version": "4.3.0",
-    "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="
-  },
-  {
-    "pname": "System.ComponentModel",
-    "version": "4.3.0",
-    "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="
-  },
-  {
-    "pname": "System.ComponentModel.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="
-  },
-  {
-    "pname": "System.ComponentModel.TypeConverter",
-    "version": "4.3.0",
-    "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="
-  },
  {
    "pname": "System.Configuration.ConfigurationManager",
    "version": "6.0.0",
    "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
  },
-  {
-    "pname": "System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
-  },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "4.3.0",
-    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
-  },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
-  },
-  {
-    "pname": "System.Diagnostics.TraceSource",
-    "version": "4.3.0",
-    "hash": "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="
-  },
-  {
-    "pname": "System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
-  },
  {
    "pname": "System.Drawing.Common",
    "version": "6.0.0",
    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
-  },
-  {
-    "pname": "System.Globalization.Calendars",
-    "version": "4.3.0",
-    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
-  },
-  {
-    "pname": "System.Globalization.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
-  },
-  {
-    "pname": "System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
-  },
-  {
-    "pname": "System.IO.Compression.ZipFile",
-    "version": "4.3.0",
-    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
-  },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
-  },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.3.0",
-    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.3.0",
-    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
-  },
  {
    "pname": "System.Memory",
    "version": "4.5.4",
@@ -444,96 +219,21 @@
    "version": "4.6.0",
    "hash": "sha256-OhAEKzUM6eEaH99DcGaMz2pFLG/q/N4KVWqqiBYUOFo="
  },
-  {
-    "pname": "System.Net.Http",
-    "version": "4.3.0",
-    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
-  },
-  {
-    "pname": "System.Net.NameResolution",
-    "version": "4.3.0",
-    "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="
-  },
-  {
-    "pname": "System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
-  },
-  {
-    "pname": "System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
-  },
  {
    "pname": "System.Numerics.Vectors",
    "version": "4.4.0",
    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.3.0",
-    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
-  },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.3.0",
-    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.3.0",
-    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.3.0",
-    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
-  },
  {
    "pname": "System.Reflection.Emit.Lightweight",
    "version": "4.7.0",
    "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
-  },
  {
    "pname": "System.Reflection.Metadata",
    "version": "5.0.0",
    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.3.0",
-    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
-  },
  {
    "pname": "System.Runtime.CompilerServices.Unsafe",
    "version": "4.5.2",
@@ -549,419 +249,44 @@
    "version": "5.0.0",
    "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
  },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
-  },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
-  },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.3.0",
-    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
-  },
-  {
-    "pname": "System.Runtime.Numerics",
-    "version": "4.3.0",
-    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
-  },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "6.0.0",
-    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
-  },
  {
    "pname": "System.Security.AccessControl",
    "version": "6.0.0-preview.5.21301.5",
    "hash": "sha256-/rXZ6FJNEN3EuqOsCgCuypBOpA0hQyYIQXbsGccfLow="
  },
-  {
-    "pname": "System.Security.Cryptography.Algorithms",
-    "version": "4.3.0",
-    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
-  },
-  {
-    "pname": "System.Security.Cryptography.Cng",
-    "version": "4.3.0",
-    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
-  },
-  {
-    "pname": "System.Security.Cryptography.Csp",
-    "version": "4.3.0",
-    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
-  },
-  {
-    "pname": "System.Security.Cryptography.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
-  },
-  {
-    "pname": "System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
-  },
-  {
-    "pname": "System.Security.Cryptography.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
-  },
  {
    "pname": "System.Security.Cryptography.ProtectedData",
    "version": "6.0.0",
    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
  },
-  {
-    "pname": "System.Security.Cryptography.X509Certificates",
-    "version": "4.3.0",
-    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
-  },
  {
    "pname": "System.Security.Permissions",
    "version": "6.0.0",
    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.3.0",
-    "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="
-  },
  {
    "pname": "System.Security.Principal.Windows",
    "version": "6.0.0-preview.5.21301.5",
    "hash": "sha256-p0ROK7zJPz4EmNdjgAz2eX8dOMVHhpvQLTU7JveMceA="
  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
-  },
  {
    "pname": "System.Text.Encoding.CodePages",
    "version": "4.5.1",
    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
  },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
-  },
  {
    "pname": "System.Text.Json",
    "version": "9.0.2",
    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.3.0",
-    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.3.0",
-    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
-  },
-  {
-    "pname": "System.Threading.Overlapped",
-    "version": "4.3.0",
-    "hash": "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk="
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
-  },
  {
    "pname": "System.Threading.Tasks.Extensions",
    "version": "4.5.4",
    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
  },
-  {
-    "pname": "System.Threading.ThreadPool",
-    "version": "4.3.0",
-    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
-  },
-  {
-    "pname": "System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
-  },
  {
    "pname": "System.Windows.Extensions",
    "version": "6.0.0",
    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
-  },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.3.0",
-    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
-  },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.3.0",
-    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
-  },
-  {
-    "pname": "System.Xml.XmlDocument",
-    "version": "4.3.0",
-    "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="
-  },
-  {
-    "pname": "goaaats.Steamworks",
-    "version": "2.3.4",
-    "hash": "sha256-Wk9arQvVPPeMSgt8lL9rVRVkO1NrBNYzME4ZuOWcHc4="
-  },
-  {
-    "pname": "runtime.any.System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tools",
-    "version": "4.3.0",
-    "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="
-  },
-  {
-    "pname": "runtime.any.System.Diagnostics.Tracing",
-    "version": "4.3.0",
-    "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="
-  },
-  {
-    "pname": "runtime.any.System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
-  },
-  {
-    "pname": "runtime.any.System.Globalization.Calendars",
-    "version": "4.3.0",
-    "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="
-  },
-  {
-    "pname": "runtime.any.System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
-  },
-  {
-    "pname": "runtime.any.System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
-  },
-  {
-    "pname": "runtime.any.System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="
-  },
-  {
-    "pname": "runtime.any.System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
-  },
-  {
-    "pname": "runtime.any.System.Threading.Timer",
-    "version": "4.3.0",
-    "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
-  },
-  {
-    "pname": "runtime.native.System.IO.Compression",
-    "version": "4.3.0",
-    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
-  },
-  {
-    "pname": "runtime.native.System.Net.Http",
-    "version": "4.3.0",
-    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
-    "version": "4.3.0",
-    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
-  },
-  {
-    "pname": "runtime.unix.Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="
-  },
-  {
-    "pname": "runtime.unix.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
-  },
-  {
-    "pname": "runtime.unix.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
-  },
-  {
-    "pname": "runtime.unix.System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="
-  },
-  {
-    "pname": "runtime.unix.System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
-  },
-  {
-    "pname": "runtime.unix.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
-  },
-  {
-    "pname": "runtime.win.Microsoft.Win32.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-ZnzR82+YDpNYf1GICTbzPjB20AjSy8dlRhfocK1FMEw="
-  },
-  {
-    "pname": "runtime.win.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-TCb+x4hHljj7sPIQLDsM10x5OyGZVnueYb+wlZ1UXnQ="
-  },
-  {
-    "pname": "runtime.win.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-DpU+PGIUCtaK6gQEl/OWSO/JKg/TA9yeD01Zzxaxy5k="
-  },
-  {
-    "pname": "runtime.win.System.IO.FileSystem",
-    "version": "4.3.0",
-    "hash": "sha256-6JnGF9kj6jYd9xneKQdTvb3zNTSHdeWW/pr7vui0AbA="
-  },
-  {
-    "pname": "runtime.win.System.Net.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-jqUpP60h/kkampLU9Bt8T5gSDaVXwxPsOOTEVVKAPbY="
-  },
-  {
-    "pname": "runtime.win.System.Net.Sockets",
-    "version": "4.3.0",
-    "hash": "sha256-k2lTk08ryI2NSEI3IFlO0y2cltiT8TIhNnqHgeL8I1M="
-  },
-  {
-    "pname": "runtime.win.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-+TMflNyjP+Lf5bge0xVN5AKxMAk4/caWY6zZrqtyAJw="
  }
-]
+]
@@ -50,8 +50,15 @@ buildDotnetModule rec {
  nugetDeps = ./deps.json; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps`

  # please do not unpin these even if they match the defaults, xivlauncher is sensitive to .NET versions
-  dotnet-sdk = dotnetCorePackages.sdk_10_0;
-  dotnet-runtime = dotnetCorePackages.runtime_10_0;
+  dotnet-sdk =
+    with dotnetCorePackages;
+    sdk_10_0
+    // {
+      inherit (sdk_9_0)
+        packages
+        targetPackages
+        ;
+    };

  dotnetFlags = [
    "-p:BuildHash=${rev}"
@@ -97,7 +97,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
-  version = "0.231.2";
+  version = "0.232.2";

  outputs = [
    "out"
@@ -110,10 +110,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-o64xjJKvGzn4H1nMVVbqx+XFxDwHyFwnO+OoNJB04OI=";
+    hash = "sha256-S7N9R5VUcJP+yq0S6s4zeQQhSFSdDovtoL9FL1BEg2U=";
  };

  postPatch = ''
+    # Disable upstream's rustflags overrides to avoid linker issues
+    rm .cargo/config.toml
+
    # Dynamically link WebRTC instead of static
    substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \
      --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
@@ -136,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    rm -r $out/git/*/candle-book/
  '';

-  cargoHash = "sha256-++2q4zeLBDSW4ooTu7dU77YsuHggeX/sWkvuCb3PF50=";
+  cargoHash = "sha256-WpEPQw3GOemxjyfDH7VH3FURpkYVfVyXQiALJsccwQ4=";

  __structuredAttrs = true;

@@ -223,6 +226,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
    writableTmpDirAsHomeHook
  ];

+  # These two tests trigger GUI prompts that hang in the headless Nix build sandbox.
+  checkFlags = [
+    "--skip"
+    "zed::open_listener::tests::test_e2e_prompt_user_picks_existing_window"
+    "--skip"
+    "zed::open_listener::tests::test_e2e_prompt_user_picks_new_window"
+  ];
+
  useNextest = true;

  remoteServerExecutableName = "zed-remote-server-${channel}-${finalAttrs.version}+${channel}";
@@ -319,6 +330,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    maintainers = with lib.maintainers; [
      GaetanLepage
      niklaskorz
+      schembriaiden
    ];
    mainProgram = "zeditor";
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
@@ -25,6 +25,7 @@ let
      #### Development tools / libraries
      cmake-extras = callPackage ./development/cmake-extras { };
      deviceinfo = callPackage ./development/deviceinfo { };
+      geonames = callPackage ./development/geonames { };
      gsettings-qt = callPackage ./development/gsettings-qt { };
      lomiri-api = callPackage ./development/lomiri-api { };
      lomiri-app-launch = callPackage ./development/lomiri-app-launch { };
@@ -48,6 +49,7 @@ let
        withDocumentation = !useQt6;
      };
      lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
+      lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
      lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };
    }
    // lib.optionalAttrs useQt6 {
@@ -78,7 +80,6 @@ let
      lomiri-session = callPackage ./data/lomiri-session { };

      #### Development tools / libraries
-      geonames = callPackage ./development/geonames { };
      gmenuharness = callPackage ./development/gmenuharness { };
      libusermetrics = callPackage ./development/libusermetrics { };
      qtmir = callPackage ./development/qtmir { };
@@ -97,7 +98,6 @@ let
      lomiri-indicator-datetime = ayatana-indicator-datetime.override { enableLomiriFeatures = true; };
      lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
      lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
-      lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
      mediascanner2 = callPackage ./services/mediascanner2 { };
    };
 in
@@ -32,6 +32,9 @@
  xvfb-run,
 }:

+let
+  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+in
 stdenv.mkDerivation (finalAttrs: {
  pname = "lomiri-thumbnailer";
  version = "3.1.0";
@@ -141,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
  dontWrapQtApps = true;

  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT6" withQt6)
    (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
    (lib.cmakeBool "GSETTINGS_COMPILE" true)
    # error: use of old-style cast to 'std::remove_reference<_GstElement*>::type' {aka 'struct _GstElement*'}
@@ -176,6 +180,12 @@ stdenv.mkDerivation (finalAttrs: {

  passthru = {
    tests = {
+      pkg-config = testers.hasPkgConfigModules {
+        package = finalAttrs.finalPackage;
+        versionCheck = true;
+      };
+    }
+    // lib.optionalAttrs (!withQt6) {
      # gallery app delegates to thumbnailer, tests various formats
      inherit (nixosTests.lomiri-gallery-app)
        format-mp4
@@ -187,11 +197,6 @@ stdenv.mkDerivation (finalAttrs: {

      # music app relies on thumbnailer to extract embedded cover art
      music-app = nixosTests.lomiri-music-app;
-
-      pkg-config = testers.hasPkgConfigModules {
-        package = finalAttrs.finalPackage;
-        versionCheck = true;
-      };
    };
    updateScript = gitUpdater { };
  };
@@ -208,7 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
    teams = [ lib.teams.lomiri ];
    platforms = lib.platforms.linux;
    pkgConfigModules = [
-      "liblomiri-thumbnailer-qt"
+      "liblomiri-thumbnailer-qt${lib.optionalString withQt6 "6"}"
    ];
  };
 })
@@ -30,14 +30,14 @@

 buildPythonPackage rec {
  pname = "boost-histogram";
-  version = "1.6.1";
+  version = "1.7.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "scikit-hep";
    repo = "boost-histogram";
    tag = "v${version}";
-    hash = "sha256-c2zREASzWfXhNTyygGxj3354l58pT/9zygmRou2bUNE=";
+    hash = "sha256-nDNSLpmQ3YOo/nEkHfvsE0l9yATzQnrlunX1qWupbLQ=";
    fetchSubmodules = true;
  };

@@ -28,22 +28,27 @@
  writableTmpDirAsHomeHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "docling-ibm-models";
-  version = "3.11.0";
+  version = "3.13.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "docling-project";
    repo = "docling-ibm-models";
-    tag = "v${version}";
-    hash = "sha256-foRoxuTqwNqn2q/3pAXNoiUYrAKwzXVnAabNRietZ40=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-T8sVXG9s7jlhoRNexPRmCaiHPtQUAhDa9Z0Ri9i0zcc=";
  };

  build-system = [
    poetry-core
  ];

+  pythonRelaxDeps = [
+    "jsonlines"
+    "numpy"
+    "transformers"
+  ];
  dependencies = [
    accelerate
    docling-core
@@ -61,15 +66,7 @@ buildPythonPackage rec {
    transformers
  ];

-  pythonRelaxDeps = [
-    "jsonlines"
-    "numpy"
-    "transformers"
-  ];
-
-  pythonImportsCheck = [
-    "docling_ibm_models"
-  ];
+  pythonImportsCheck = [ "docling_ibm_models" ];

  nativeCheckInputs = [
    datasets
@@ -77,8 +74,13 @@ buildPythonPackage rec {
    writableTmpDirAsHomeHook
  ];

+  disabledTestPaths = [
+    # Require network access
+    "tests/test_tableformer_v2.py"
+  ];
+
  disabledTests = [
-    # Requires network access
+    # Require network access
    "test_code_formula_predictor" # huggingface_hub.errors.LocalEntryNotFoundError
    "test_figure_classifier" # huggingface_hub.errors.LocalEntryNotFoundError
    "test_layoutpredictor"
@@ -87,10 +89,10 @@ buildPythonPackage rec {
  ];

  meta = {
-    changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/DS4SD/docling-ibm-models/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    description = "Docling IBM models";
    homepage = "https://github.com/DS4SD/docling-ibm-models";
    license = lib.licenses.mit;
    maintainers = [ ];
  };
-}
+})
@@ -19,14 +19,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "fsspec-xrootd";
-  version = "0.5.2";
+  version = "0.5.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "CoffeaTeam";
    repo = "fsspec-xrootd";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-UKZO5lgOOfzyOsrDZ2En67Xhm+BKvHELGuvkwSHbolY=";
+    hash = "sha256-phtvWBKaBu6piVB226y9R29njI39z6vRLBbwlHZbpKk=";
  };

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

 buildPythonPackage rec {
  pname = "geniushub-client";
-  version = "0.7.3";
+  version = "0.7.4";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "manzanotti";
    repo = "geniushub-client";
    tag = "v${version}";
-    hash = "sha256-9/LOybFJdVxImr/i/RIbrYSPZ7vA5ffdSBxzg51UM8s=";
+    hash = "sha256-0qHmTq/nOPruivU5R8r0abmMAhxy0w5zILKFPxtL2Mc=";
  };

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

 buildPythonPackage rec {
  pname = "google-cloud-translate";
-  version = "3.25.0";
+  version = "3.26.0";
  pyproject = true;

  src = fetchPypi {
    pname = "google_cloud_translate";
    inherit version;
-    hash = "sha256-o0AeIOPRjuq2jhW4D69PmFxsohk0r/6kA4uWHNGTEN4=";
+    hash = "sha256-dMTDAupwXaodfdoJUoj9c2u2FvlDSA2zQxTNDNUsyd0=";
  };

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

 buildPythonPackage (finalAttrs: {
  pname = "huggingface-hub";
-  version = "1.9.0";
+  version = "1.10.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "huggingface_hub";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7spvenDWuSDVTlcbOQd8oJ3bwzsyuQDIyMiVSyFIhuQ=";
+    hash = "sha256-Q9N0QnxV8oJcxUsJzv4wX8Z6FkNdEfUH5BEVoZolsRY=";
  };

  build-system = [ setuptools ];
@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  pycryptodome,
+  requests,
+  urllib3,
+  websocket-client,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "ibind";
+  version = "0.1.22";
+  pyproject = true;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "Voyz";
+    repo = "ibind";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hFjxkAEbhbcwseI7XwrEBtq5kzGj6XRBw3mqcxar9r0=";
+  };
+
+  # Otherwise, fails with:
+  # __main__.py: error: unrecognized arguments: unpacked/ibind-0.0.2
+  postUnpack = ''
+    rm -r "$sourceRoot/dist"
+  '';
+
+  # ModuleNotFoundError: No module named 'test_utils'
+  # TODO: The fix is already merged upstream: remove when updating to the next release
+  postPatch = ''
+    substituteInPlace "pytest.ini" \
+      --replace-fail '[tool:pytest]' '[pytest]'
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "requests"
+    "websocket-client"
+  ];
+  dependencies = [
+    pycryptodome
+    requests
+    urllib3
+    websocket-client
+  ];
+
+  pythonImportsCheck = [ "ibind" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # AssertionError: 0.2564859390258789 != 0.1 within 0.02 delta (0.1564859390258789 difference)
+    "test_wait_until_timeout"
+  ];
+
+  meta = {
+    description = "REST and WebSocket client library for Interactive Brokers Client Portal Web API";
+    homepage = "https://github.com/Voyz/ibind";
+    changelog = "https://github.com/Voyz/ibind/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
@@ -36,14 +36,14 @@
 }:
 buildPythonPackage rec {
  pname = "manim-slides";
-  version = "5.5.4";
+  version = "5.6.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "jeertmans";
    repo = "manim-slides";
    tag = "v${version}";
-    hash = "sha256-Izr7nCDn3BQ3j27KlWzM1Z1DTVaAS+YfR0yxt00VkeE=";
+    hash = "sha256-aAkKUa0oA2hGcd3PAda4pXPb9SoBVDfuHPplXk+6Vuo=";
  };

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

 buildPythonPackage rec {
  pname = "mitmproxy";
-  version = "12.2.1";
+  version = "12.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mitmproxy";
    repo = "mitmproxy";
    tag = "v${version}";
-    hash = "sha256-z3JJOql4JacXSeo6dRbKOaL+kLlSnpKQkeXzZdzLQJo=";
+    hash = "sha256-WhWXybzBuI7hB54TuqxOmOoHUUIqf0uiC8+KDbvbqgA=";
  };

  pythonRelaxDeps = [
@@ -93,8 +93,5 @@ buildPythonPackage (finalAttrs: {
    changelog = "https://github.com/Blaizzy/mlx-vlm/releases/tag/${finalAttrs.src.tag}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ GaetanLepage ];
-    platforms = [
-      "aarch64-darwin"
-    ];
  };
 })
@@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "openfga-sdk";
-  version = "0.10.0";
+  version = "0.10.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "openfga";
    repo = "python-sdk";
    tag = "v${version}";
-    hash = "sha256-yopZJMGv2cVJZsTXqU7vaQN31QOwCW/kg0gghqt6rus=";
+    hash = "sha256-BU1PDmO0eW4c5MOrVeaZY2YDd+tllQ+iQUDz0fwGRaU=";
  };

  build-system = [ hatchling ];
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "pyreadstat";
-  version = "1.3.3";
+  version = "1.3.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Roche";
    repo = "pyreadstat";
    tag = "v${version}";
-    hash = "sha256-CXZ9edMmup4+/2lImt6Zy19RIqGig1sUIK35snvIFEk=";
+    hash = "sha256-DC8iNv+4JpqdLq8op5gSHJEnodW+mc8utE7HCezcqpM=";
  };

  build-system = [
@@ -31,14 +31,14 @@ in

 buildPythonPackage rec {
  pname = "python-arango";
-  version = "8.3.1";
+  version = "8.3.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "arangodb";
    repo = "python-arango";
    tag = version;
-    hash = "sha256-8H1SKaQWuQfiMGTEaohdr/N8zXVCo1QkDEGP331Kt5k=";
+    hash = "sha256-wN1KsOK5WidQDyyUII5OWsqMyIkh0XstPXKccNO0clI=";
  };

  nativeBuildInputs = [
@@ -23,13 +23,13 @@
  requests,
 }:
 let
-  version = "3.8.0";
+  version = "3.8.1";

  src = fetchFromGitHub {
    owner = "RapidAI";
    repo = "RapidOCR";
    tag = "v${version}";
-    hash = "sha256-KOnZbbNgv6Ca9tAFSZ0AZbugG28U0tZKeIw3/ML3eAc=";
+    hash = "sha256-keAR7H/qn0Q+Vo0usp69dWZO5QWB60EgU7d9vspQ+2w=";
  };

  models =
@@ -34,14 +34,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "sentence-transformers";
-  version = "5.3.0";
+  version = "5.4.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "sentence-transformers";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xf5ujZH7OH81ofavytI/Zd0PCkRf6rIoXzWI9kUjoDE=";
+    hash = "sha256-VZu50DVuU0P7o3+iKVWougui7nWSrnP/eza0Rqtt7ZU=";
  };

  build-system = [ setuptools ];
@@ -58,9 +58,11 @@ buildPythonPackage (finalAttrs: {
  ];

  optional-dependencies = {
-    image = [
-      pillow
-    ];
+    image = transformers.optional-dependencies.vision;
+    inherit (transformers.optional-dependencies)
+      audio
+      video
+      ;
    train = [
      accelerate
      datasets
@@ -115,12 +117,14 @@ buildPythonPackage (finalAttrs: {
    "test_router_with_trainer"
    "test_router_with_trainer_without_router_mapping"
    "test_save_and_load"
+    "test_simple"
    "test_simple_encode"
    "test_tokenize"
    "test_train_stsb"
    "test_trainer"
    "test_trainer_invalid_column_names"
    "test_trainer_multi_dataset_errors"
+    "test_unsupported_modality"
    "test_valid_initialization_no_warnings"
    "test_valid_initialization_with_weights"
    "test_weights_length_mismatch_raises_error"
@@ -152,31 +156,26 @@ buildPythonPackage (finalAttrs: {

  disabledTestPaths = [
    # Tests require network access
-    "tests/cross_encoder/test_cross_encoder.py"
+    "tests/base/modules/"
+    "tests/base/test_model.py"
+    "tests/base/test_model_card.py"
+    "tests/cross_encoder/evaluation/test_reranking.py"
+    "tests/cross_encoder/test_model.py"
    "tests/cross_encoder/test_model_card.py"
    "tests/cross_encoder/test_train_stsb.py"
-    "tests/evaluation/test_information_retrieval_evaluator.py"
-    "tests/sparse_encoder/models/test_csr.py"
-    "tests/sparse_encoder/models/test_sparse_static_embedding.py"
+    "tests/sentence_transformer/test_compute_embeddings.py"
+    "tests/sentence_transformer/test_model.py"
+    "tests/sentence_transformer/test_model_card.py"
+    "tests/sentence_transformer/test_model_card_data.py"
+    "tests/sparse_encoder/modules/test_csr.py"
+    "tests/sparse_encoder/modules/test_sparse_static_embedding.py"
+    "tests/sparse_encoder/test_model.py"
    "tests/sparse_encoder/test_model_card.py"
    "tests/sparse_encoder/test_opensearch_models.py"
    "tests/sparse_encoder/test_pretrained.py"
-    "tests/sparse_encoder/test_sparse_encoder.py"
-    "tests/test_compute_embeddings.py"
-    "tests/test_model_card.py"
-    "tests/test_model_card_data.py"
-    "tests/test_multi_process.py"
-    "tests/test_pretrained_stsb.py"
-    "tests/test_sentence_transformer.py"
-    "tests/test_train_stsb.py"
    "tests/util/test_hard_negatives.py"
  ];

-  # Sentence-transformer needs a writable hf_home cache
-  postInstall = ''
-    export HF_HOME=$(mktemp -d)
-  '';
-
  meta = {
    description = "Multilingual Sentence & Image Embeddings with BERT";
    homepage = "https://github.com/huggingface/sentence-transformers";
@@ -94,14 +94,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "transformers";
-  version = "5.5.0";
+  version = "5.5.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "transformers";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-2fOCORAsQDKxp6EPe1OHysPWb/q168z6sCYg89tRXdU=";
+    hash = "sha256-ZqynYPj8VxH6BmvxHuw3lq16e2FFi3p8pw5of+vkz40=";
  };

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

 buildPythonPackage (finalAttrs: {
  pname = "tyro";
-  version = "1.0.12";
+  version = "1.0.13";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "brentyi";
    repo = "tyro";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-e4LIJzZ7lIkvhqbOz/EGHgPo9ri1HNiMp0j+I1S0/J4=";
+    hash = "sha256-Ux0bAF96KGhsy9b7NvybJpMKQP2G6BsQwnew0c44tXM=";
  };

  build-system = [ hatchling ];
@@ -39,14 +39,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "unsloth-zoo";
-  version = "2026.4.2";
+  version = "2026.4.7";
  pyproject = true;

  # no tags on GitHub
  src = fetchPypi {
    pname = "unsloth_zoo";
    inherit (finalAttrs) version;
-    hash = "sha256-l0OTaZjPrNnrxVYIfZcf6pYr1tJS9EGj+iguU6S+D28=";
+    hash = "sha256-jJ58d2+5lEALEaASELZtQkY2YxNWaLrfLvOCUGnwrh4=";
  };

  postPatch = ''
@@ -59,12 +59,10 @@ buildPythonPackage (finalAttrs: {
        "setuptools-scm"
  '';

-  # Upstream constrains datasets/torch more tightly than the versions
-  # currently shipped in nixpkgs, but the package still builds and works with
-  # the newer dependency set here.
  pythonRelaxDeps = [
    "datasets"
    "torch"
+    "transformers"
  ];

  patches = [
@@ -54,14 +54,14 @@ in

 buildPythonPackage (finalAttrs: {
  pname = "unsloth";
-  version = "2026.4.1";
+  version = "2026.4.5";
  pyproject = true;

  # Tags on the GitHub repo don't match
  src = fetchPypi {
    pname = "unsloth";
    inherit (finalAttrs) version;
-    hash = "sha256-RGpVxrcFzKbHxV7o0/OYaADo/Pqxx/c+FaxcV05gHGU=";
+    hash = "sha256-35+IMV/WHVi0iGnOxtfSZNKo0+0ZlNVlbNtA5tXw9sE=";
  };

  postPatch = ''
@@ -178,7 +178,6 @@ buildPythonPackage (finalAttrs: {
  meta = {
    description = "Finetune Llama 3.3, DeepSeek-R1 & Reasoning LLMs 2x faster with 70% less memory";
    homepage = "https://github.com/unslothai/unsloth";
-    changelog = "https://github.com/unslothai/unsloth/releases/tag/${finalAttrs.version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ hoh ];
  };
@@ -2496,9 +2496,9 @@
  };

  sshclientconfig = rec {
-    version = "2026.4.9";
+    version = "2026.4.16";
    url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-6DyyfBbq72J6ciCCLRn2oN30/+VY55ztshoOinZpbHE=";
+    hash = "sha256-bWZsxfLr8e2Kv96EGOwTyycLBH8DhXsLrzUIABN5um8=";
    meta = {
      license = lib.licenses.cc0;
      maintainers = with lib.maintainers; [
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
  owner = "Lash-L";
  domain = "roborock_custom_map";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "Lash-L";
    repo = "RoborockCustomMap";
    tag = version;
-    hash = "sha256-jXkKjjof1/JeT0KDKIC4sX+P7JwWOzajbFOhlq772L8=";
+    hash = "sha256-tAMkGDDCrTwOq6BqA4fu9PsVqa3AjFAl/VNI94BMGfI=";
  };

  meta = {
@@ -6,16 +6,16 @@

 buildNpmPackage rec {
  pname = "sankey-chart";
-  version = "3.11.0";
+  version = "4.0.2";

  src = fetchFromGitHub {
    owner = "MindFreeze";
    repo = "ha-sankey-chart";
    rev = "v${version}";
-    hash = "sha256-P6D/Inm9vFRF9Ozel8W1iKbd+H3ZR6Eoyk5Gm7tKv2s=";
+    hash = "sha256-JZ2FtJkkF80ic7Dd9MTwOQKJ2hCfxN3IOQFcaJcXapE=";
  };

-  npmDepsHash = "sha256-dHix97fuLEM2FySzJ0DZStx+ZExWwCKPakOGJbTI1rw=";
+  npmDepsHash = "sha256-AN/u8VHDY8FXzqS8bSK//DJnqSj1ML//5q7b5hhNVjw=";

  installPhase = ''
    runHook preInstall
@@ -2,8 +2,8 @@

 grafanaPlugin {
  pname = "grafana-metricsdrilldown-app";
-  version = "2.0.1";
-  zipHash = "sha256-fZVp+Bd5o10doJlzDFSfPgjI33XG+lUnGcOFwERYxBY=";
+  version = "2.0.2";
+  zipHash = "sha256-Cg4YFk2LCH6ALy5pUs7hVg3wUyfBBFNfj0Hp/aPBTIY=";
  meta = {
    description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
    license = lib.licenses.agpl3Only;
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
    homepage = "https://github.com/mike-fabian/ibus-table-chinese";
    license = lib.licenses.gpl3;
    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ pneumaticat ];
+    maintainers = [ ];
  };
 }
@@ -22,13 +22,13 @@ let
      name = lib.toLower (builtins.replaceStrings [ "." ] [ "_" ] name);
      value = stdenvNoCC.mkDerivation {
        pname = "skk-jisyo-" + lib.toLower name;
-        version = "0-unstable-2024-08-28";
+        version = "0-unstable-2026-04-11";

        src = fetchFromGitHub {
          owner = "skk-dev";
          repo = "dict";
-          rev = "4eb91a3bbfef70bde940668ec60f3beae291e971";
-          sha256 = "sha256-sWz85Q6Bu2WoKsckSp5SlcuPUQN2mcq+BHMqNXQ/aho=";
+          rev = "0a164e6b990c5eb5b59eb7d8789f08865dc2f644";
+          sha256 = "sha256-xKMtHB54kVSwwwr+v248ewa7dwuavYVmc6KHrZwSdnM=";
        };

        nativeBuildInputs = lib.optionals useUtf8 [ nkf ];
@@ -7350,6 +7350,8 @@ self: super: with self; {

  ibeacon-ble = callPackage ../development/python-modules/ibeacon-ble { };

+  ibind = callPackage ../development/python-modules/ibind { };
+
  ibis = callPackage ../development/python-modules/ibis { };

  ibis-framework = callPackage ../development/python-modules/ibis-framework { };