Merge master into staging-next

2026-04-06 06:39:25 +00:00
parent e1d7113a8a e6c8eff62f
commit bb442c4cf7
95 changed files with 652 additions and 430 deletions
@@ -144,6 +144,7 @@
                        nixpkgs.hostPlatform = "x86_64-linux";
                        boot.loader.grub.enable = false;
                        fileSystems."/".device = "nodev";
+                        fileSystems."/".fsType = "none";
                        # See https://search.nixos.org/options?show=system.stateVersion&query=stateversion
                        system.stateVersion = lib.trivial.release; # DON'T do this in real configs!
                      }
@@ -29514,13 +29514,6 @@
    github = "xdHampus";
    githubId = 16954508;
  };
-  xe = {
-    email = "me@christine.website";
-    matrix = "@withoutwithin:matrix.org";
-    github = "Xe";
-    githubId = 529003;
-    name = "Christine Dodrill";
-  };
  xeals = {
    email = "dev@xeal.me";
    github = "xeals";
@@ -145,6 +145,8 @@

 - The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.

+- The `fileSystems.<name>.fsType` option no longer has a default value and must be specified by the user. The value `"auto"` still works as before, though its use is generally discouraged.
+
 - `services.uptime` has been removed because the package it relies on does not exist anymore in nixpkgs.

 - `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a
@@ -796,6 +796,7 @@ in
          "/dev/disk/by-label/${config.isoImage.volumeID}"
        else
          "/dev/root";
+      fsType = "iso9660";
      neededForBoot = true;
      noCheck = true;
    };
@@ -160,17 +160,14 @@ in
      serviceConfig = {
        Type = "notify";
        ExecStart = "${cmd} start";
-        ExecStop = "${cmd} stop";
+        ExecStop = [
+          "${cmd} stop"
+          "${lib.getExe' pkgs.util-linux "waitpid"} -t 30 -e $MAINPID"
+        ];
        Restart = "always";
-        TimeoutSec = "5min";
        User = "unifi";
        UMask = "0077";
        WorkingDirectory = "${stateDir}";
-        # the stop command exits while the main process is still running, and unifi
-        # wants to manage its own child processes. this means we have to set KillSignal
-        # to something the main process ignores, otherwise every stop will have unifi.service
-        # fail with SIGTERM status.
-        KillSignal = "SIGCONT";

        # Hardening
        AmbientCapabilities = "";
@@ -13,7 +13,10 @@ let
        text = "${expect.dev}";
      };
      documentation.enable = false;
-      fileSystems."/".device = "ignore-root-device";
+      fileSystems."/" = {
+        device = "ignore-root-device";
+        fsType = "none";
+      };
      boot.loader.grub.enable = false;

      # Don't do this in an actual config
@@ -26,7 +29,10 @@ let
      system.forbiddenDependenciesRegexes = [ "-dev$" ];
      system.extraDependencies = [ expect.dev ];
      documentation.enable = false;
-      fileSystems."/".device = "ignore-root-device";
+      fileSystems."/" = {
+        device = "ignore-root-device";
+        fsType = "none";
+      };
      boot.loader.grub.enable = false;

      # Don't do this in an actual config
@@ -93,7 +93,10 @@ let

      # irrelevant stuff
      system.stateVersion = "25.05";
-      fileSystems."/".device = "/test/dummy";
+      fileSystems."/" = {
+        device = "/test/dummy";
+        fsType = "auto";
+      };
      boot.loader.grub.enable = false;
    }
  );
@@ -122,7 +122,6 @@ let
        };

        fsType = mkOption {
-          default = "auto";
          example = "ext3";
          type = nonEmptyStr;
          description = ''
@@ -1453,6 +1453,7 @@ in
            else
              {
                device = "/nix/.ro-store";
+                fsType = "none";
                options = [ "bind" ];
              }
          );
@@ -172,6 +172,7 @@ let
              { ... }:
              {
                fileSystems."/".device = mkDefault "/dev/sda1";
+                fileSystems."/".fsType = mkDefault "auto";
                boot.loader.grub.device = mkDefault "/dev/sda";
              }
            );
@@ -476,7 +477,10 @@ rec {
          modules = singleton (
            { ... }:
            {
-              fileSystems."/".device = mkDefault "/dev/sda1";
+              fileSystems."/" = {
+                device = mkDefault "/dev/sda1";
+                fsType = "ext4";
+              };
              boot.loader.grub.device = mkDefault "/dev/sda";
              system.stateVersion = mkDefault lib.trivial.release;
            }
@@ -32,6 +32,7 @@
        # bind-mount the store
        "/nix/store" = {
          device = "/usr/nix/store";
+          fsType = "none";
          options = [ "bind" ];
        };
      };
@@ -4,6 +4,7 @@

  nodes.machine = {
    virtualisation.fileSystems."/var" = {
+      fsType = "none";
      options = [
        "bind"
        "nosuid"
@@ -2,7 +2,10 @@
 {
  name = "engelsystem";
  meta = with pkgs.lib.maintainers; {
-    maintainers = [ talyz ];
+    maintainers = [
+      talyz
+      tmarkus
+    ];
  };

  nodes.engelsystem =
@@ -30,6 +30,7 @@ let

      fileSystems = {
        "/".device = rootFsDevice;
+        "/".fsType = "ext4";
      };

      # Needed for installing bootloader
@@ -19,7 +19,10 @@ let
        ../modules/testing/test-instrumentation.nix
        ../modules/profiles/qemu-guest.nix
        {
-          fileSystems."/".device = "/dev/disk/by-label/nixos";
+          fileSystems."/" = {
+            device = "/dev/disk/by-label/nixos";
+            fsType = "ext4";
+          };
          boot.loader.grub.device = "/dev/vda";
          boot.loader.timeout = 0;
          nixpkgs.pkgs = pkgs;
@@ -18,6 +18,7 @@ with pkgs.lib;
        virtualisation.fileSystems."/test-bind-dir/bind" = {
          device = "/";
          neededForBoot = true;
+          fsType = "none";
          options = [ "bind" ];
        };

@@ -25,6 +26,7 @@ with pkgs.lib;
          depends = [ "/nix/store" ];
          device = builtins.toFile "empty" "";
          neededForBoot = true;
+          fsType = "none";
          options = [ "bind" ];
        };
      };
@@ -23,6 +23,7 @@ let

      fileSystems = {
        "/".device = rootFsDevice;
+        "/".fsType = "ext4";
      };

      system.switch.enable = true;
@@ -32,7 +32,10 @@
        };
        virtualisation.rootDevice = "/dev/mapper/cryptroot";
        # test mounting device unlocked in initrd after switching root
-        virtualisation.fileSystems."/cryptroot2".device = "/dev/mapper/cryptroot2";
+        virtualisation.fileSystems."/cryptroot2" = {
+          device = "/dev/mapper/cryptroot2";
+          fsType = "auto";
+        };
      };
    };

@@ -75,7 +75,10 @@ in
        virtualisation.rootDevice = "/dev/mapper/cryptroot";
        virtualisation.fileSystems."/".autoFormat = true;
        # test mounting device unlocked in initrd after switching root
-        virtualisation.fileSystems."/cryptroot2".device = "/dev/mapper/cryptroot2";
+        virtualisation.fileSystems."/cryptroot2" = {
+          device = "/dev/mapper/cryptroot2";
+          fsType = "auto";
+        };
      };
    };

@@ -21,8 +21,19 @@

    machine.wait_for_unit("unifi.service")
    machine.wait_for_open_port(8880)
+    machine.succeed("systemctl show unifi.service | grep -q 'ActiveState=active'")
+    machine.succeed("pgrep mongod")

    status = json.loads(machine.succeed("curl --silent --show-error --fail-with-body http://localhost:8880/status"))
    assert status["meta"]["rc"] == "ok"
+
+    machine.succeed("systemctl stop unifi.service")
+    machine.succeed("systemctl show unifi.service | grep -q 'ActiveState=inactive'")
+    machine.fail("pgrep mongod")
+
+    machine.succeed("systemctl start unifi.service")
+    machine.wait_for_unit("unifi.service")
+    machine.succeed("systemctl show unifi.service | grep -q 'ActiveState=active'")
+    machine.succeed("pgrep mongod")
  '';
 }
@@ -10,7 +10,10 @@ let
    modules = [
      {
        system.stateVersion = "25.05";
-        fileSystems."/".device = "/dev/null";
+        fileSystems."/" = {
+          device = "/dev/null";
+          fsType = "none";
+        };
        boot.loader.grub.device = "nodev";
        nixpkgs.hostPlatform = pkgs.stdenv.hostPlatform.system;
        virtualisation.vmVariant.networking.hostName = "vm";
@@ -73,13 +73,13 @@
    "vendorHash": "sha256-CO09y7rdbY27VFX85pV2ocnO0rvhGJg3hXfLWaF+HTI="
  },
  "auth0_auth0": {
-    "hash": "sha256-JQC8532P5+PXCzqzxl9YUjhuEbd07WzJv7tfhJWyk3c=",
+    "hash": "sha256-1gtBZPyzYk3UqLrRKHeyLt/2KPPP6QlJYo042XNDWkY=",
    "homepage": "https://registry.terraform.io/providers/auth0/auth0",
    "owner": "auth0",
    "repo": "terraform-provider-auth0",
-    "rev": "v1.41.0",
+    "rev": "v1.42.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-JPgRr5DcAOkzUy24aUAjqhW6VhpITKxDA+55dNKrGu4="
+    "vendorHash": "sha256-g1xtMHyQ1zD5dzfB2+MtVUo42RG95TX9uni3Hf8FiRQ="
  },
  "aviatrixsystems_aviatrix": {
    "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=",
@@ -463,22 +463,22 @@
    "vendorHash": "sha256-/8h2bmesnFz3tav3+iDelZSjp1Z9lreexwcw0WdYekA="
  },
  "goharbor_harbor": {
-    "hash": "sha256-YrFGx/xHd2Z0G6ZidHnOCY9RtcsjReUWXfiLhdDGmWM=",
+    "hash": "sha256-+HhtRod8VNOE6KceWIviWDCPvPuLK9/WaKrgT27GUpw=",
    "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
    "owner": "goharbor",
    "repo": "terraform-provider-harbor",
-    "rev": "v3.11.3",
+    "rev": "v3.11.5",
    "spdx": "MIT",
-    "vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
+    "vendorHash": "sha256-yOM4JcQxAvYAFPyAFfjJn4FK8pEXF3I55ddMTkijn9c="
  },
  "grafana_grafana": {
-    "hash": "sha256-nt6C5pKvg1fCYUa9ptYGonV4fEu8mOySP2W4lUQbFe4=",
+    "hash": "sha256-eYVNiyD3hFxE9dqlyfsOZBaX6xVec0uPAuquOdxg78A=",
    "homepage": "https://registry.terraform.io/providers/grafana/grafana",
    "owner": "grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v4.28.2",
+    "rev": "v4.29.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-CkIb5zi4w7uZ+UvclOZcbCpu3R2bg5p9SdBk0x4qovY="
+    "vendorHash": "sha256-9fBGjh/kstnMHi9aWQoq0tqJfDWoKHESlQwBoRA+8oA="
  },
  "gridscale_gridscale": {
    "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
@@ -508,13 +508,13 @@
    "vendorHash": "sha256-picwxtQOtsBX8SkA64+ekFNDC7zIpg0CG66kelO2THk="
  },
  "hashicorp_awscc": {
-    "hash": "sha256-68SdqhF4RA/rjVm89yAZb8MRdDPrcqrQ6lc3tJTIeng=",
+    "hash": "sha256-tcDnXPoiwGcy4tW3r/YMM+eivGur90TeAZO5gWhT7DA=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
    "owner": "hashicorp",
    "repo": "terraform-provider-awscc",
-    "rev": "v1.77.0",
+    "rev": "v1.78.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-tlxuUXJAAP/9hmyEJI9foMD+CeOosFrXfp/06fZVvSA="
+    "vendorHash": "sha256-z2KPnztWBOlKTIwloRGdT1GMjBewQ1FlJgZkoGFK7XY="
  },
  "hashicorp_azuread": {
    "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
@@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "obs-move-transition";
-  version = "3.1.5";
+  version = "3.2.1";

  src = fetchFromGitHub {
    owner = "exeldro";
    repo = "obs-move-transition";
    rev = version;
-    sha256 = "sha256-MelIMAy+9LiSlYwDdS8mbgttyZ6rvGFS5TKMas8LzCM=";
+    sha256 = "sha256-YA66qSCchZbA5TowOqn1FNvAtPzxREIChVJleoaImxk=";
  };

  nativeBuildInputs = [ cmake ];
@@ -1,21 +1,21 @@
 {
-  "version": "1.3.14-stable",
+  "version": "1.3.17-stable",
  "sources": {
    "aarch64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.14-stable/acli_1.3.14-stable_darwin_arm64.tar.gz",
-      "sha256": "1400b04908d4b099783dba261ba79ab6e09da67cf78d2ca35fb2456e99211634"
+      "url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_arm64.tar.gz",
+      "sha256": "db630d0ce82777d47c5cb647a622cd30f38fedefa6b8e1e6f62c1ca3c0974d1f"
    },
    "aarch64-linux": {
-      "url": "https://acli.atlassian.com/linux/1.3.14-stable/acli_1.3.14-stable_linux_arm64.tar.gz",
-      "sha256": "b8742f5c3d4f5e1d5f531c1e50bcc775f272b2909e481c43ddd615808c77f156"
+      "url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_arm64.tar.gz",
+      "sha256": "59dc9405f6de0a70f8f82e328fdd6db3fc564d28aef38d14c08431a8b130ba36"
    },
    "x86_64-darwin": {
-      "url": "https://acli.atlassian.com/darwin/1.3.14-stable/acli_1.3.14-stable_darwin_amd64.tar.gz",
-      "sha256": "0c66ff14f0db7a27a1d7e70ff03b8cbfde9bc019450539c0f6707de2dc908dd9"
+      "url": "https://acli.atlassian.com/darwin/1.3.17-stable/acli_1.3.17-stable_darwin_amd64.tar.gz",
+      "sha256": "043e3b80f08cf4fc09dd52f0432500f5de28902d8c85d848128c5931f766af45"
    },
    "x86_64-linux": {
-      "url": "https://acli.atlassian.com/linux/1.3.14-stable/acli_1.3.14-stable_linux_amd64.tar.gz",
-      "sha256": "2c76293e9ba9ce6a233756b13e9c3eea1fc3fce992fc0ccefe8c32f6dbf36f29"
+      "url": "https://acli.atlassian.com/linux/1.3.17-stable/acli_1.3.17-stable_linux_amd64.tar.gz",
+      "sha256": "6177dd5950b0a27f14e8b2daf41e93cf30a306c2e2ee61b13a22f572cbf2f4ff"
    }
  }
 }
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
  pname = "airwindows";
-  version = "0-unstable-2026-03-14";
+  version = "0-unstable-2026-04-01";

  src = fetchFromGitHub {
    owner = "airwindows";
    repo = "airwindows";
-    rev = "36106b00885d81efa9ac9a8c387e3431abac0471";
-    hash = "sha256-xf+gRy8t3uXpGwsVhPyO8J4YQ806KDZ1muR6A/7AhGM=";
+    rev = "974a26ea5a96a3cd57c3f8f8d95745bb765a5a72";
+    hash = "sha256-Gin8I86TpLVG9SzfErVZobryW3rZQEidwLrUb7sd+rs=";
  };

  # we patch helpers because honestly im spooked out by where those variables
@@ -11,11 +11,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "betterdisplay";
-  version = "4.0.4";
+  version = "4.2.3";

  src = fetchurl {
    url = "https://github.com/waydabber/BetterDisplay/releases/download/v${finalAttrs.version}/BetterDisplay-v${finalAttrs.version}.dmg";
-    hash = "sha256-njk1epuekOiBN8Exkxs9J2OHVP4xu4on42F+TPlW75M=";
+    hash = "sha256-keJkdMDO213DUl2LAVqtx1joAmcUpU336Tj8AldCoKo=";
  };

  dontPatch = true;
@@ -4,7 +4,7 @@ version = 4

 [[package]]
 name = "CamillaDSP"
-version = "4.0.0"
+version = "4.0.1"
 dependencies = [
 "alsa",
 "alsa-sys",
@@ -417,7 +417,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "rustc-hash 2.1.1",
+ "rustc-hash 2.1.2",
 "shlex",
 "syn",
 ]
@@ -485,9 +485,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"

 [[package]]
 name = "cc"
-version = "1.2.58"
+version = "1.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e928d4b69e3077709075a938a05ffbedfa53a84c8f766efbf8220bb1ff60e1"
+checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -971,9 +971,9 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "a043dc74da1e37d6afe657061213aa6f425f855399a11d3463c6ecccc4dfda1f"

 [[package]]
 name = "find-msvc-tools"
@@ -1300,9 +1300,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
 dependencies = [
 "equivalent",
 "hashbrown 0.16.1",
@@ -1422,10 +1422,12 @@ dependencies = [

 [[package]]
 name = "js-sys"
-version = "0.3.91"
+version = "0.3.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+checksum = "2e04e2ef80ce82e13552136fabeef8a5ed1f985a96805761cbb9a2c34e7664d9"
 dependencies = [
+ "cfg-if",
+ "futures-util",
 "once_cell",
 "wasm-bindgen",
 ]
@@ -1472,9 +1474,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"

 [[package]]
 name = "libc"
-version = "0.2.183"
+version = "0.2.184"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af"

 [[package]]
 name = "libloading"
@@ -2137,7 +2139,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.8+spec-1.1.0",
+ "toml_edit 0.25.10+spec-1.1.0",
 ]

 [[package]]
@@ -2331,9 +2333,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"

 [[package]]
 name = "rustfft"
@@ -2447,9 +2449,9 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"

 [[package]]
 name = "serde"
@@ -2524,7 +2526,7 @@ dependencies = [
 "chrono",
 "hex",
 "indexmap 1.9.3",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "schemars 0.9.0",
 "schemars 1.2.1",
 "serde_core",
@@ -2753,9 +2755,9 @@ dependencies = [

 [[package]]
 name = "toml_datetime"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97251a7c317e03ad83774a8752a7e81fb6067740609f75ea2b585b569a59198f"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
 "serde_core",
 ]
@@ -2766,7 +2768,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "serde",
 "serde_spanned",
 "toml_datetime 0.6.11",
@@ -2775,23 +2777,23 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.25.8+spec-1.1.0"
+version = "0.25.10+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
+checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b"
 dependencies = [
- "indexmap 2.13.0",
- "toml_datetime 1.1.0+spec-1.1.0",
+ "indexmap 2.13.1",
+ "toml_datetime 1.1.1+spec-1.1.0",
 "toml_parser",
- "winnow 1.0.0",
+ "winnow 1.0.1",
 ]

 [[package]]
 name = "toml_parser"
-version = "1.1.0+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2334f11ee363607eb04df9b8fc8a13ca1715a72ba8662a26ac285c98aabb4011"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.0",
+ "winnow 1.0.1",
 ]

 [[package]]
@@ -2989,9 +2991,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.114"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+checksum = "0551fc1bb415591e3372d0bc4780db7e587d84e2a7e79da121051c5c4b89d0b0"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -3002,23 +3004,19 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.64"
+version = "0.4.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8"
+checksum = "03623de6905b7206edd0a75f69f747f134b7f0a2323392d664448bf2d3c5d87e"
 dependencies = [
- "cfg-if",
- "futures-util",
 "js-sys",
- "once_cell",
 "wasm-bindgen",
- "web-sys",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.114"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+checksum = "7fbdf9a35adf44786aecd5ff89b4563a90325f9da0923236f6104e603c7e86be"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -3026,9 +3024,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.114"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+checksum = "dca9693ef2bab6d4e6707234500350d8dad079eb508dca05530c85dc3a529ff2"
 dependencies = [
 "bumpalo",
 "proc-macro2",
@@ -3039,9 +3037,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.114"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+checksum = "39129a682a6d2d841b6c429d0c51e5cb0ed1a03829d8b3d1e69a011e62cb3d3b"
 dependencies = [
 "unicode-ident",
 ]
@@ -3063,7 +3061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
 "anyhow",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "wasm-encoder",
 "wasmparser",
 ]
@@ -3076,15 +3074,15 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
 "bitflags 2.11.0",
 "hashbrown 0.15.5",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "semver",
 ]

 [[package]]
 name = "web-sys"
-version = "0.3.91"
+version = "0.3.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9"
+checksum = "cd70027e39b12f0849461e08ffc50b9cd7688d942c1c8e3c7b22273236b4dd0a"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -3428,9 +3426,9 @@ dependencies = [

 [[package]]
 name = "winnow"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5"
 dependencies = [
 "memchr",
 ]
@@ -3469,7 +3467,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
 "anyhow",
 "heck",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "prettyplease",
 "syn",
 "wasm-metadata",
@@ -3500,7 +3498,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
 "anyhow",
 "bitflags 2.11.0",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "log",
 "serde",
 "serde_derive",
@@ -3519,7 +3517,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
 "anyhow",
 "id-arena",
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "log",
 "semver",
 "serde",
@@ -3535,7 +3533,7 @@ version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08c7c1b1a6a7c8a6b2741a6c21a4f8918e51899b111cfa08d1288202656e3975"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap 2.13.1",
 "itoa",
 "libyaml-rs",
 "ryu",
@@ -3614,18 +3612,18 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.8.47"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.8.47"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "camilladsp";
-  version = "4.0.0";
+  version = "4.0.1";

  src = fetchFromGitHub {
    owner = "HEnquist";
    repo = "camilladsp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JBqjFpk+KVc2ajTqkC2ompbs7oQEsba+n2zNOwxL2Uo=";
+    hash = "sha256-PedaOmrvvE9Kxux0XwwDJfKq0fncsV/sUzZhnAp++DM=";
  };

  cargoLock = {
@@ -41,6 +41,9 @@ makeSetupHook {
        --prefix WEBKIT_GST_ALLOWED_URI_PROTOCOLS : "asset"
        # Not picked up automatically by the wrappers from the propagatedBuildInputs.
        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${cargo-tauri.gst-plugin}/lib/gstreamer-1.0/"
+        # fix NVIDIA issues with Tauri
+        # https://github.com/tauri-apps/tauri/issues/9394#issuecomment-3795449374
+        --set-default __NV_DISABLE_EXPLICIT_SYNC 1
      )
    '';

@@ -7,20 +7,26 @@

 buildGoModule (finalAttrs: {
  pname = "certspotter";
-  version = "0.21.0";
+  version = "0.24.0";

  src = fetchFromGitHub {
    owner = "SSLMate";
    repo = "certspotter";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-cJIjJyWvy/prx97jUvVToJsEdMa0MpqATD9rO8G2biY=";
+    hash = "sha256-OmukbtHOvyfjRb7WdAc3A3I5FlWmQD515dNeJ5JiJ0k=";
  };

-  vendorHash = "sha256-CLq/QFnZ5OLv7wT+VYr5SkSgmwt1g6cBYcAlB4Z/3wE=";
+  vendorHash = "sha256-F7qNpvjWqywPPLTKw90bfy6V83/LMQcV+Gml2n1Wd2A=";

  ldflags = [
    "-s"
    "-w"
+    "-X main.Version=${finalAttrs.version}"
+    "-X main.Source=software.sslmate.com/src/certspotter"
+  ];
+
+  checkFlags = [
+    "-skip=TestParseFromURL" # requires network access
  ];

  nativeBuildInputs = [ lowdown-unsandboxed ];
@@ -32,24 +32,16 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "chiaki-ng";
-  version = "1.9.9";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "streetpea";
    repo = "chiaki-ng";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ=";
+    hash = "sha256-se60wu1rwk/w5QG+pFvdtKD+zsJQdOmBole2WY2KCxw=";
    fetchSubmodules = true;
  };

-  patches = [
-    # fix for building with Qt >= 6.10 -- remove when updating past 1.9.9
-    (fetchpatch {
-      url = "https://github.com/streetpea/chiaki-ng/commit/fe5bfd87998c7ca67ade76436e31ab9924000c8b.patch";
-      hash = "sha256-7Eo5tcmhgbQszBrgtTGrnH34GewJXXAYSKqvqGN/viI=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
    pkg-config
@@ -64,12 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
        $out/share/applications/Cinny.desktop
    '';

-  preFixup = ''
-    gappsWrapperArgs+=(
-      --set-default WEBKIT_DISABLE_DMABUF_RENDERER "1"
-    )
-  '';
-
  nativeBuildInputs = [
    cargo-tauri.hook
  ]
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "cloudflare-ddns";
-  version = "1.15.1";
+  version = "1.16.2";

  src = fetchFromGitHub {
    owner = "favonia";
    repo = "cloudflare-ddns";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/806eUsuWhiCnvO1DasPW2xVFYYxnmki3KIDre7gjrg=";
+    hash = "sha256-oQNOYGn3BTVN2EI83cIVYKwtT/Fm8Nf2CXnP1oREVQ0=";
  };

-  vendorHash = "sha256-XIfPL1BNA8mcQH+w4AhThh80gh/1vUjKDtFN97O5zqw=";
+  vendorHash = "sha256-JSd5daOIWblugMq7zmeNEdBiX6cMgNyib4SkCus6yJQ=";

  subPackages = [
    "cmd/ddns"
@@ -8,12 +8,12 @@

 buildGraalvmNativeImage (finalAttrs: {
  pname = "cq";
-  version = "2024.06.24-12.10";
+  version = "2026.01.09-17.19";

  # we need both src (the prebuild jar)
  src = fetchurl {
    url = "https://github.com/markus-wa/cq/releases/download/${finalAttrs.version}/cq.jar";
-    hash = "sha256-iULV+j/AuGVYPYhbOTQTKd3n+VZhWQYBRE6cRiaa1/M=";
+    hash = "sha256-CUErNKworfgKIrOQ7V5vcnudTdZzdVdyA/gsOZUOQBI=";
  };

  # and build-src (for the native-image build process)
@@ -21,7 +21,7 @@ buildGraalvmNativeImage (finalAttrs: {
    owner = "markus-wa";
    repo = "cq";
    tag = finalAttrs.version;
-    hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
+    hash = "sha256-jDhN6eYBOouqBeJ/t5DGA1WELkH1udcuvAGaQKQufiw=";
  };

  # copied verbatim from the upstream build script https://github.com/markus-wa/cq/blob/main/package/build-native.sh#L5
@@ -9,26 +9,26 @@ let
  inherit (stdenv) hostPlatform;
  sources = {
    x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.18-f6873f7/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-O0dcGKyTryFBiSCIoUtsBoWKBCdgj3Rc178nbaxFu64=";
+      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-4NS2EdsRHS2+dkdDhicb/z4duyzG3fUn+dXVgBss4qA=";
    };
    aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.18-f6873f7/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-JpSeyfrpX9vcAu3ymn4hBlomuRGnowVFXQ58NaCoSz8=";
+      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-dRBud1TlTcCoZ2naQ94D/FzUpEuS5lxvpowYbHtXgSU=";
    };
    x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.18-f6873f7/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-ubEakI8t3/BJ9eVcYueGEg7RWhvTjWbJMGNweyF9V0E=";
+      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-9z4nTSikG/WTksC0KvgK1m1gZqUjtNQ3sXOAJzikWEg=";
    };
    aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2026.03.18-f6873f7/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-KHybHgQrIOBHbiJZSEbFVG0Fp1+TRPvK75JXPcSTMKk=";
+      url = "https://downloads.cursor.com/lab/2026.03.30-a5d3e17/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-+l5f/W38rJlbOzrmsBdad+PX6MuzHaQxvhIwdgEDKrQ=";
    };
  };
 in
 stdenv.mkDerivation {
  pname = "cursor-cli";
-  version = "0-unstable-2026-03-18";
+  version = "0-unstable-2026-03-30";

  src = sources.${hostPlatform.system};

@@ -15,20 +15,25 @@

 buildGoModule rec {
  pname = "dnote";
-  version = "0.15.1";
+  version = "0.16.0";

  src = fetchFromGitHub {
    owner = "dnote";
    repo = "dnote";
    tag = "cli-v${version}";
-    hash = "sha256-2vVopuFf9bx8U3+U4wznC/9nlLtan+fU5v9HUCEI1R4=";
+    hash = "sha256-so86Pit8/JeO/qwoOCZp8gY/E/HwhiDi6nzye2AM33A=";
  };

+  postPatch = ''
+    # This is not used and compile error
+    rm -rf pkg/e2e
+  '';
+
  npmDeps = fetchNpmDeps {
    inherit version src;
    pname = "${pname}-webui";
    sourceRoot = "${src.name}/pkg/server/assets";
-    hash = "sha256-gUr8ptPsE7uw/F52CZi1P2L7eLgGiELEz6tI+fwAN0I=";
+    hash = "sha256-yq55iO3Svqbjah9HdWfSicJISNEipxUkNDD1KJ7ZUhY=";
  };

  overrideModAttrs = oldAttrs: {
@@ -94,17 +99,14 @@ buildGoModule rec {

  postInstall = ''
    mv $out/bin/cli $out/bin/dnote-cli
-    mv $out/bin/migrate $out/bin/dnote-migrate
    mv $out/bin/server $out/bin/dnote-server
-    mv $out/bin/templates $out/bin/dnote-templates
+    mv $out/bin/schema $out/bin/dnote-schema
    mv $out/bin/watcher $out/bin/dnote-watcher
  '';

-  checkFlags = [
-    "-p 1"
-  ];
+  checkFlags = [ "-p 1" ];

-  vendorHash = "sha256-4mP5z3ZVlHYhItRjkbXvcOxVm6PuZ6viL2GHqzCH9tA=";
+  vendorHash = "sha256-PExF+1SWcCROmthzo1e8Y7zqhW780GufYe35l0FRhxY=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -7,11 +7,11 @@
 }:
 appimageTools.wrapType2 rec {
  pname = "dopamine";
-  version = "3.0.2";
+  version = "3.0.3";

  src = fetchurl {
    url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
-    hash = "sha256-Cb3Kwqf4PQW+bQonsPdACzp7gpVTm0DpR8wOcQ1qZFE=";
+    hash = "sha256-jSES9FJKrA2z6+f376Vc9NtHbRBG215Fc2335Vp/h1A=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -0,0 +1,5 @@
+{
+  drone,
+}:
+
+drone.override { enableUnfree = false; }
@@ -5,15 +5,15 @@
  enableUnfree ? true,
 }:

-buildGoModule rec {
+buildGoModule (finalAttrs: {
  pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
  version = "2.28.1";

  src = fetchFromGitHub {
    owner = "harness";
    repo = "drone";
-    rev = "v${version}";
-    sha256 = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg=";
  };

  vendorHash = "sha256-6a4Xdp8lcPq+GPewQmEPzr9hXjSrqHR7kqw7pqHzjXE=";
@@ -35,4 +35,4 @@ buildGoModule rec {
    ];
    license = with lib.licenses; if enableUnfree then unfreeRedistributable else asl20;
  };
-}
+})
@@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dsvpn";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "jedisct1";
    repo = "dsvpn";
-    rev = finalAttrs.version;
-    sha256 = "1gbj3slwmq990qxsbsaxasi98alnnzv3adp6f8w8sxd4gi6qxhdh";
+    tag = finalAttrs.version;
+    hash = "sha256-hO1UVyAGZXqSaEJsCo/SQZkvvbfU6FCuOJWhLJ2CGhg=";
  };

  installPhase = ''
@@ -11,25 +11,25 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "engelsystem";
-  version = "3.6.0";
+  version = "3.7.0";

  src = fetchFromGitHub {
    owner = "engelsystem";
    repo = "engelsystem";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Pi+nowImUvENx2c4gsku1KkFb3pLM84oT8WevI6ImQg=";
+    hash = "sha256-hnTkeSqxkvO2Prop0VaBAV/4opr46wjEaJ5ptd5zQ34=";
  };

  inherit php;

  composerNoDev = true;
  composerStrictValidation = false;
-  vendorHash = "sha256-JRd5FJviNf5NUI9PwRcMqdDXYBlMoBB6o5yx7dvostE=";
+  vendorHash = "sha256-oGpgtkX0UVSdVceQ8pD3PuGBITifQzaMIb4QRdc7WeY=";

  yarnOfflineCache = fetchYarnDeps {
    pname = "${finalAttrs.pname}-yarn-deps";
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-nyCLM9OF2qwlW+VK38kiRMo6jMlupNFG+91N3Fb/WLY=";
+    hash = "sha256-IMg1AoqCiQEvMHeqXgonIY2J0nmBHLW2Drz/Vb0rD48=";
  };

  strictDeps = true;
@@ -66,7 +66,7 @@ php.buildComposerProject2 (finalAttrs: {
    homepage = "https://engelsystem.de";
    license = lib.licenses.gpl2Only;
    mainProgram = "migrate";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tmarkus ];
    platforms = lib.platforms.all;
  };
 })
@@ -3,13 +3,13 @@ GEM
  specs:
    CFPropertyList (3.0.8)
    abbrev (0.1.2)
-    addressable (2.8.8)
+    addressable (2.8.9)
      public_suffix (>= 2.0.2, < 8.0)
    artifactory (3.0.17)
    atomos (0.1.3)
    aws-eventstream (1.4.0)
-    aws-partitions (1.1194.0)
-    aws-sdk-core (3.239.2)
+    aws-partitions (1.1233.0)
+    aws-sdk-core (3.244.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@@ -17,18 +17,19 @@ GEM
      bigdecimal
      jmespath (~> 1, >= 1.6.1)
      logger
-    aws-sdk-kms (1.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.206.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-s3 (1.218.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.12.1)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    base64 (0.2.0)
-    bigdecimal (3.3.1)
+    benchmark (0.5.0)
+    bigdecimal (4.1.0)
    claide (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
@@ -42,7 +43,7 @@ GEM
    dotenv (2.8.1)
    emoji_regex (3.2.3)
    excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.10.5)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -61,25 +62,26 @@ GEM
    faraday-em_synchrony (1.0.1)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.2.0)
      multipart-post (~> 2.0)
    faraday-net_http (1.0.2)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-retry (1.0.4)
    faraday_middleware (1.2.1)
      faraday (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.229.1)
+    fastimage (2.4.1)
+    fastlane (2.232.2)
      CFPropertyList (>= 2.3, < 4.0.0)
      abbrev (~> 0.1.2)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
      babosa (>= 1.0.3, < 2.0.0)
      base64 (~> 0.2.0)
-      bundler (>= 1.12.0, < 3.0.0)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.0.0)
      colored (~> 1.2)
      commander (~> 4.6)
      csv (~> 3.3)
@@ -94,18 +96,20 @@ GEM
      gh_inspector (>= 1.1.2, < 2.0.0)
      google-apis-androidpublisher_v3 (~> 0.3)
      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
      http-cookie (~> 1.0.5)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
      mini_magick (>= 4.9.4, < 5.0.0)
      multipart-post (>= 2.0.0, < 3.0.0)
      mutex_m (~> 0.3.0)
      naturally (~> 2.2)
      nkf (~> 0.2.0)
      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
      plist (>= 3.1.0, < 4.0.0)
      rubyzip (>= 2.0.0, < 3.0.0)
      security (= 0.1.5)
@@ -121,38 +125,40 @@ GEM
    fastlane-sirp (1.0.0)
      sysrandom (~> 1.0)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-androidpublisher_v3 (0.98.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
      mini_mime (~> 1.0)
+      mutex_m
      representable (~> 3.0)
      retriable (>= 2.0, < 4.a)
-      rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.26.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.61.0)
+      google-apis-core (>= 0.15.0, < 2.a)
    google-cloud-core (1.8.0)
      google-cloud-env (>= 1.0, < 3.a)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.5.0)
-    google-cloud-storage (1.47.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.6.0)
+    google-cloud-storage (1.59.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
      mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
      jwt (>= 1.4, < 3.0)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
@@ -163,13 +169,13 @@ GEM
    httpclient (2.9.0)
      mutex_m
    jmespath (1.6.2)
-    json (2.18.0)
+    json (2.19.3)
    jwt (2.10.2)
      base64
    logger (1.7.0)
    mini_magick (4.13.2)
    mini_mime (1.1.5)
-    multi_json (1.18.0)
+    multi_json (1.19.1)
    multipart-post (2.4.1)
    mutex_m (0.3.0)
    nanaimo (0.4.0)
@@ -177,14 +183,15 @@ GEM
    nkf (0.2.0)
    optparse (0.8.1)
    os (1.1.4)
+    ostruct (0.6.3)
    plist (3.7.2)
-    public_suffix (7.0.0)
+    public_suffix (7.0.5)
    rake (13.3.1)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
-    retriable (3.1.2)
+    retriable (3.4.1)
    rexml (3.4.4)
    rouge (3.28.0)
    ruby2_keywords (0.0.5)
@@ -15,10 +15,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0mxhjgihzsx45l9wh2n0ywl9w0c6k70igm5r0d63dxkcagwvh4vw";
+      sha256 = "11ali533wx91fh93xlk88gjqq8w0p7kxw09nlh41hwc9wv5ly5fc";
      type = "gem";
    };
-    version = "2.8.8";
+    version = "2.8.9";
  };
  artifactory = {
    groups = [ "default" ];
@@ -55,10 +55,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "04887dhff1nw3pwrfxmqwl0mwd1dzmxfdvjgn6f6n9pl6mbwdinw";
+      sha256 = "1hhkcawvn8fr5ys7xy4bhk4glcqyyibwkd3y75cidc9d123393cj";
      type = "gem";
    };
-    version = "1.1194.0";
+    version = "1.1233.0";
  };
  aws-sdk-core = {
    dependencies = [
@@ -74,10 +74,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0fgjki9wja72m5ip1dq5zx8msn1sdw9qid4z7wd0dnqbxr2ii056";
+      sha256 = "1shqk9frm15g1ygiy33krwj34jrphfjc6w63bglxwnqcic3qqi9y";
      type = "gem";
    };
-    version = "3.239.2";
+    version = "3.244.0";
  };
  aws-sdk-kms = {
    dependencies = [
@@ -88,10 +88,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gbgf7xgg2hrrc51g3mpf0isba801w0r0z45mjnh45agdmcm3iy9";
+      sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl";
      type = "gem";
    };
-    version = "1.118.0";
+    version = "1.123.0";
  };
  aws-sdk-s3 = {
    dependencies = [
@@ -103,10 +103,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1v9as5bvkxk5nqfbchram8v7rsimnpp0v8wxcp20bwdw3dlf9yc5";
+      sha256 = "134qr73ri1j52y42xib0fpyscd5miwc37zx1ikxavwh747rsawjn";
      type = "gem";
    };
-    version = "1.206.0";
+    version = "1.218.0";
  };
  aws-sigv4 = {
    dependencies = [ "aws-eventstream" ];
@@ -139,15 +139,25 @@
    };
    version = "0.2.0";
  };
+  benchmark = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
  bigdecimal = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
+      sha256 = "1bkcvp4aavdxh1pmgg65sypyjx5l0w5ffylfsk65di1xm9kpgh3d";
      type = "gem";
    };
-    version = "3.3.1";
+    version = "4.1.0";
  };
  CFPropertyList = {
    groups = [ "default" ];
@@ -289,10 +299,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "069gmdh5j90v06rbwlqvlhzhq45lxhx74mahz25xd276rm0wb153";
+      sha256 = "1vgnx245yp2fg0fr3bixp4lcqhqn7rr35xdm42l2yra5n39g2i5i";
      type = "gem";
    };
-    version = "1.10.4";
+    version = "1.10.5";
  };
  faraday-cookie_jar = {
    dependencies = [
@@ -354,10 +364,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
+      sha256 = "0mzp9rlqiryyi99bm9ii80hfsbbafh9wl8r3c5pif51pd54sk2bx";
      type = "gem";
    };
-    version = "1.1.1";
+    version = "1.2.0";
  };
  faraday-net_http = {
    groups = [ "default" ];
@@ -404,10 +414,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+      sha256 = "1ahnsyy5f0f9qqna8883z4m10b2x19nfbzy2d5ngkavzfwrr4rfw";
      type = "gem";
    };
-    version = "1.0.3";
+    version = "1.0.4";
  };
  faraday_middleware = {
    dependencies = [ "faraday" ];
@@ -425,10 +435,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz";
+      sha256 = "085d82jw6swv4k6jxya85q7rg3vjzy2nw7hcnwx99n3gdgafnjy6";
      type = "gem";
    };
-    version = "2.4.0";
+    version = "2.4.1";
  };
  fastlane = {
    dependencies = [
@@ -439,6 +449,7 @@
      "aws-sdk-s3"
      "babosa"
      "base64"
+      "benchmark"
      "colored"
      "commander"
      "csv"
@@ -459,12 +470,14 @@
      "http-cookie"
      "json"
      "jwt"
+      "logger"
      "mini_magick"
      "multipart-post"
      "mutex_m"
      "naturally"
      "nkf"
      "optparse"
+      "ostruct"
      "plist"
      "rubyzip"
      "security"
@@ -482,10 +495,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "08q875hq41yvw44n55lsjz41pfawys85c4ws9swg5jwx7hf8rv3z";
+      sha256 = "04misa8c6msjjsc1fz11a9drznjfpq9fz1nyk53dbhqg1zv8k1lp";
      type = "gem";
    };
-    version = "2.229.1";
+    version = "2.232.2";
  };
  fastlane-sirp = {
    dependencies = [ "sysrandom" ];
@@ -514,10 +527,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49";
+      sha256 = "1jy5r35j4jxq2kv6dqnv7aijyskfr7h6dyjddk0k24cw859bjkq9";
      type = "gem";
    };
-    version = "0.54.0";
+    version = "0.98.0";
  };
  google-apis-core = {
    dependencies = [
@@ -525,18 +538,18 @@
      "googleauth"
      "httpclient"
      "mini_mime"
+      "mutex_m"
      "representable"
      "retriable"
-      "rexml"
    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3";
+      sha256 = "1vjls3xdzphphay0z3wmv2lw4zxbiv3vbmcy2d4b9spfdy0mgc4n";
      type = "gem";
    };
-    version = "0.11.3";
+    version = "0.18.0";
  };
  google-apis-iamcredentials_v1 = {
    dependencies = [ "google-apis-core" ];
@@ -544,10 +557,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs";
+      sha256 = "18s8kshls6amld400434xgmgssn2y9fpqnz9ahjxzkfnl480mxrz";
      type = "gem";
    };
-    version = "0.17.0";
+    version = "0.26.0";
  };
  google-apis-playcustomapp_v1 = {
    dependencies = [ "google-apis-core" ];
@@ -555,10 +568,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1mlgwiid5lgg41y7qk8ca9lzhwx5njs25hz5fbf1mdal0kwm37lm";
+      sha256 = "0y2sm5zwm45a3n188nk8w5771ghakd28d04rnjx65y7k0nvr1g6m";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.17.0";
  };
  google-apis-storage_v1 = {
    dependencies = [ "google-apis-core" ];
@@ -566,10 +579,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03";
+      sha256 = "1s42r7hmf2wl8l0wdc7z07qvmgbdilwjb58q7i9h2slfnncyac5k";
      type = "gem";
    };
-    version = "0.31.0";
+    version = "0.61.0";
  };
  google-cloud-core = {
    dependencies = [
@@ -591,25 +604,26 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
+      sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg";
      type = "gem";
    };
-    version = "1.6.0";
+    version = "2.1.1";
  };
  google-cloud-errors = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0jvv9w8s4dqc4ncfa6c6qpdypz2wj8dmgpjd44jq2qhhij5y4sxm";
+      sha256 = "18fh8xvflhhksibcn1v4gnrn6d3xs284ng1fsfwh9b86sxnlga0x";
      type = "gem";
    };
-    version = "1.5.0";
+    version = "1.6.0";
  };
  google-cloud-storage = {
    dependencies = [
      "addressable"
      "digest-crc"
+      "google-apis-core"
      "google-apis-iamcredentials_v1"
      "google-apis-storage_v1"
      "google-cloud-core"
@@ -620,14 +634,15 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm";
+      sha256 = "1fc6n7227l3b0b14c0gbfqjibn3zw1mivfvrnb66apbp3mkabjdq";
      type = "gem";
    };
-    version = "1.47.0";
+    version = "1.59.0";
  };
  googleauth = {
    dependencies = [
      "faraday"
+      "google-cloud-env"
      "jwt"
      "multi_json"
      "os"
@@ -637,10 +652,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1";
+      sha256 = "07kk8h5f9q62qf1mk7rycgv6m09rd0k8baffdpb3vsksxnpaqsvy";
      type = "gem";
    };
-    version = "1.8.1";
+    version = "1.11.2";
  };
  highline = {
    groups = [ "default" ];
@@ -689,10 +704,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "01fmiz052cvnxgdnhb3qwcy88xbv7l3liz0fkvs5qgqqwjp0c1di";
+      sha256 = "0il6qxkxqql7n7sgrws5bi5a36v51dswqcxb6j6gm8aj62shp6r8";
      type = "gem";
    };
-    version = "2.18.0";
+    version = "2.19.3";
  };
  jwt = {
    dependencies = [ "base64" ];
@@ -740,10 +755,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0vsrfm36zlg7jbrd1fjbr8kmdvr8bfayrw0hdlza75987vvhrxr3";
+      sha256 = "1drisvysgvnjlz49a0qcbs294id6mvj3i8iik5rvym68ybwfzvvs";
      type = "gem";
    };
-    version = "1.18.0";
+    version = "1.19.1";
  };
  multipart-post = {
    groups = [ "default" ];
@@ -815,6 +830,16 @@
    };
    version = "1.1.4";
  };
+  ostruct = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
  plist = {
    groups = [ "default" ];
    platforms = [ ];
@@ -830,10 +855,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "15dhl6k4gbax0xz8frfs4nsb6lg5zgax9vkr1pqzjmhfxddhn2gp";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
      type = "gem";
    };
-    version = "7.0.0";
+    version = "7.0.5";
  };
  rake = {
    groups = [ "default" ];
@@ -865,10 +890,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+      sha256 = "1g634lvyriq8pk87fn0dnz2ib9mma98ks7y0b30j28a9gm5i2gzv";
      type = "gem";
    };
-    version = "3.1.2";
+    version = "3.4.1";
  };
  rexml = {
    groups = [ "default" ];
@@ -62,13 +62,6 @@ rustPlatform.buildRustPackage (finalAttrs: {

  doCheck = false; # This version's tests do not pass

-  # A fix for a problem with Tauri (tauri-apps/tauri#9304)
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
-    )
-  '';
-
  passthru.updateScript = nix-update-script {
    extraArgs = [
      "--subpackage"
@@ -135,8 +135,6 @@ rustPlatform.buildRustPackage rec {

  preFixup = ''
    gappsWrapperArgs+=(
-      # Otherwise blank screen, see https://github.com/tauri-apps/tauri/issues/9304
-      --set WEBKIT_DISABLE_DMABUF_RENDERER 1
      --prefix PATH ":" ${
        lib.makeBinPath [
          zenity
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "flow";
-  version = "0.299.0";
+  version = "0.305.1";

  src = fetchFromGitHub {
    owner = "facebook";
    repo = "flow";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ohGqzTI0TW92lsM9fqJv8iRk3SZkKT03Ek+15Lj2RYU=";
+    hash = "sha256-yXC/liSwqEzPdNPUR86sEBzAPGVeN2q8wBxjMvkQrJU=";
  };

  patches = [
@@ -82,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://github.com/facebook/flow/blob/${finalAttrs.src.tag}/Changelog.md";
    license = lib.licenses.mit;
    platforms = ocamlPackages.ocaml.meta.platforms;
-    maintainers = with lib.maintainers; [ puffnfresh ];
+    maintainers = with lib.maintainers; [
+      puffnfresh
+      miniharinn
+    ];
  };
 })
@@ -65,11 +65,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    install -Dm644 "Flying Carpet/src-tauri/icons/128x128@2x.png" "$out/share/icons/hicolor/256x256@2/apps/FlyingCarpet.png"
  '';

-  preFixup = ''
-    # https://github.com/tauri-apps/tauri/issues/9304
-    gappsWrapperArgs+=(--set WEBKIT_DISABLE_DMABUF_RENDERER 1)
-  '';
-
  passthru.updateScript = nix-update-script { };

  meta = {
@@ -11,14 +11,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fna3d";
-  version = "26.03";
+  version = "26.04";

  src = fetchFromGitHub {
    owner = "FNA-XNA";
    repo = "FNA3D";
    tag = finalAttrs.version;
    fetchSubmodules = true;
-    hash = "sha256-P28rm36xG3/IydUKFk6Q7m0D9jpcMtAlfdLpXOrISs4=";
+    hash = "sha256-DZZuJ0bppyoXgewAOrtDnOHi4rKKc9PNxKif1BIN2Zk=";
  };

  cmakeFlags = [
@@ -3,6 +3,7 @@
  stdenv,
  fetchurl,
  pkg-config,
+  flex,
  glib,
  python3,
  gtk2,
@@ -13,17 +14,18 @@

 stdenv.mkDerivation rec {
  pname = "gnubg";
-  version = "1.07.001";
+  version = "1.08.003";

  src = fetchurl {
    url = "mirror://gnu/gnubg/gnubg-release-${version}-sources.tar.gz";
-    hash = "sha256-cjmXKUGcrZ8RLDBmoS0AANpFCkVq3XsJTYkVUGnWgh4=";
+    hash = "sha256-b32WmxPP/3hvupD/jMXl1WS5f08Kppr+Tzg48YxEWXk=";
  };

  nativeBuildInputs = [
    copyDesktopItems
    pkg-config
    python3
+    flex
    glib
  ];

@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hath-rust";
-  version = "1.15.0";
+  version = "1.16.1";

  src = fetchFromGitHub {
    owner = "james58899";
    repo = "hath-rust";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-jFpoEN2tH7uSJzs2XvvIcl4ZWY1DfupKhINoO37MVAw=";
+    hash = "sha256-pRaheUWEbd2ClDxt5GDE0LF2xa+GU2/UnzZF/nH7DKc=";
  };

-  cargoHash = "sha256-WSh4LxXRCKnE7vo9xM3bJK1s7rxONEnslWbE5YXVBXQ=";
+  cargoHash = "sha256-vndJckLMbu0bO5WLUtzX88xrb/SKRm3TwEfrV3S0bCU=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
@@ -10,13 +10,13 @@

 gcc15Stdenv.mkDerivation (finalAttrs: {
  pname = "hyprutils";
-  version = "0.11.1";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = "hyprutils";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-S76omfIVQ1TpGiXFbqih6o6XcH3sA5+5QI+SXB4HvlY=";
+    hash = "sha256-c4YVwO33Mmw+FIV8E0u3atJZagHvGTJ9Jai6RtiB8rE=";
  };

  nativeBuildInputs = [
@@ -30,7 +30,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
    hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw=";
  };

-  cargoHash = "sha256-jSUqpryUgOL0qo0gbbH4s24krrPsLOSNc6FQUEUeeUQ=";
+  cargoHash = "sha256-6TwMZNYvW1bBE+9PJUXQxP5Uz7VYsjyLabmaxcX9Mbk=";
+
+  cargoPatches = [
+    # update metrics dependency to fix Rust 1.94 compatibility
+    ./update-metrics.patch
+  ];

  nativeBuildInputs = [
    installShellFiles
@@ -0,0 +1,14 @@
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -2409,9 +2409,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "metrics"
+-version = "0.24.0"
+version = "0.24.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10"
+checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8"
+ dependencies = [
+  "ahash 0.8.11",
+  "portable-atomic",
@@ -8,20 +8,19 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "install-nothing";
-  version = "0.3.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "buyukakyuz";
    repo = "install-nothing";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Raz6TJ7MqOi4bQE6nN7JJVCVlGZ9v7OZRfaeL+UMx2A=";
+    hash = "sha256-ULTB17wNa8IaQbeK0EeQOsSwtMn2PdLOmfrd0fiVeCM=";
  };

-  cargoHash = "sha256-jNjAzMrRUT3MdD7OMfCB0+dKRGPQsT9kBIweTOhJCOc=";
+  cargoHash = "sha256-iERbRcbFG2RbsTxyvwwgl92trbNo6DjJu9UK75Co15c=";

-  doInstallCheck = true;
+  doInstallCheck = false; # https://github.com/buyukakyuz/install-nothing/issues/20
  nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";

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

@@ -39,13 +39,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "koboldcpp";
-  version = "1.105.4";
+  version = "1.110";

  src = fetchFromGitHub {
    owner = "LostRuins";
    repo = "koboldcpp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-m3rpvp7Lqs9RUEYwtxHjfNv0ByCWEVrtGvQFtzreMI4=";
+    hash = "sha256-wizg/XkNjWUeF0heK1sQQhfKRlIYBKwJmQ8fIaZ2zdE=";
  };

  enableParallelBuilding = true;
@@ -53,7 +53,8 @@ effectiveStdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    makeWrapper
    python3Packages.wrapPython
-  ];
+  ]
+  ++ lib.optionals vulkanSupport [ shaderc ];

  postPatch = ''
    nixLog "patching $PWD/Makefile to remove explicit linking against CUDA driver"
@@ -81,7 +82,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
  ]
  ++ lib.optionals vulkanSupport [
    vulkan-loader
-    shaderc
  ];

  pythonPath = finalAttrs.pythonInputs;
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "komari-agent";
-  version = "1.1.80";
+  version = "1.1.93";

  src = fetchFromGitHub {
    owner = "komari-monitor";
    repo = "komari-agent";
    tag = finalAttrs.version;
-    hash = "sha256-KyUnmrHzTJ4NdVr25hCeHbeMkwr/UAbm30BbO32fqTk=";
+    hash = "sha256-6rS+DvPrraW4EgYiyTzhzFTSKQQ4OssiBUSOMaOlBvo=";
  };

  vendorHash = "sha256-5RL/dDR/Or9GRCPVQmUYKTV82q7xuN2Mqc4/86WmbqY=";
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "mobsql";
-  version = "0.9.0";
+  version = "0.10.0";

  src = fetchFromSourcehut {
    owner = "~mil";
    repo = "mobsql";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-7zrM2vmaikyClNgHHO8OXmATNpJtH85/CDv/86vwzZU=";
+    hash = "sha256-Q0TMSomLDDivfDD4bDeirEpzRUuoJkC0Ph3XIhJ/dYw=";
  };
  vendorHash = "sha256-YqduGY9c4zRQscjqze3ZOAB8EYj+0/6V7NceRwLe3DY=";

@@ -13,6 +13,13 @@ stdenv.mkDerivation (finalAttrs: {
    sha256 = "0261c5e90b98b6138cd23dadecbc7bc6e2830235145ed2740290e1f35672d843";
  };

+  postPatch = ''
+    substituteInPlace mtx.h                     \
+      --replace-fail                            \
+        "typedef enum { false, true } boolean;" \
+        "typedef bool boolean;"
+  '';
+
  doCheck = false;

  meta = {
@@ -34,13 +34,12 @@ let
      rev = "ef3b57438564f2877148a23055f3f0ffce66df11";
      hash = "sha256-Cg96tsi6h1DX4VSsq1B8DTn0GxnBfoZK2nuxeT/+ca0=";
    };
-    patches = [ ];
  };

 in
 stdenv.mkDerivation {
  pname = "MultiVNC";
-  version = "2.8.1";
+  version = "0.6.0-2024-10-20";

  src = fetchFromGitHub {
    owner = "bk138";
@@ -7,15 +7,15 @@

 buildGoModule (finalAttrs: {
  pname = "nexttrace";
-  version = "1.5.0";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "nxtrace";
    repo = "NTrace-core";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Ui3Vm9Q6VJXW9hGDFCuOCUmoSO8SE5ufRYq0niY6ojo=";
+    sha256 = "sha256-EKsOPE5EGkUtgNIf60ojvMJfZwtSwDzVDDEeKPBLWhY=";
  };
-  vendorHash = "sha256-8KxY3KYcaaZZjk+IIKdu8tzGhgGUlJ5nyMMSKhe41kg=";
+  vendorHash = "sha256-fUM2mWbol1lM6moygeCFiGHyYZfaVzz6edZM6zoGrSg=";

  buildInputs = [ libpcap ];

@@ -25,7 +25,6 @@ buildGoModule (finalAttrs: {
    "-s"
    "-w"
    "-X github.com/nxtrace/NTrace-core/config.Version=v${finalAttrs.version}"
-    "-checklinkname=0" # refers to https://github.com/nxtrace/NTrace-core/issues/247
  ];

  postInstall = ''
@@ -34,7 +33,7 @@ buildGoModule (finalAttrs: {

  meta = {
    description = "Open source visual route tracking CLI tool";
-    homepage = "https://mtr.moe";
+    homepage = "https://www.nxtrace.org/";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ sharzy ];
    mainProgram = "nexttrace";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
  # To obtain the version you will need to run the following command:
  #
  # dpkg-deb -I ${odafileconverter.src} | grep Version
-  version = "26.7.0.0";
+  version = "27.1.0.0";

  src = fetchurl {
    # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time)
-    url = "https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_26.7.deb";
-    hash = "sha256-MqST9Se66OJ+L0IKzuZkkFjCl3nb07gTO17j+lOWrHI=";
+    url = "https://www.opendesign.com/guestfiles/get?filename=ODAFileConverter_QT6_lnxX64_8.3dll_27.1.deb";
+    hash = "sha256-xxNjzVR1gXevR6NlFU8YDcUKHitSoTGZT9pUHBOjZ2Y=";
  };

  buildInputs = [
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
      echo "patching $file"
      patchelf --set-rpath '${rpath}' $file
    done
+
+    substituteInPlace $out/share/applications/ODAFileConverter_*.desktop \
+      --replace-fail '/usr/bin/ODAFileConverter' 'ODAFileConverter'
  '';

  meta = {
@@ -16,16 +16,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "onefetch";
-  version = "2.26.1";
+  version = "2.27.1";

  src = fetchFromGitHub {
    owner = "o2sh";
    repo = "onefetch";
-    rev = finalAttrs.version;
-    hash = "sha256-JT7iQRKOK/2Zh/IDMv1FM1szITeBaaMy+WuXHjpPkfY=";
+    tag = finalAttrs.version;
+    hash = "sha256-aeVLlYDrX7FfZmx30k6hCcihdMUyZm7j72l540+PZJo=";
  };

-  cargoHash = "sha256-VBbiOA/+SPcIvmhNQ71gUBOIWEWV1A86rljBfdAfhZM=";
+  cargoHash = "sha256-WR8T/spHZqvwzQxwkQI81yMLBA6s6ral97rTmIW+vpg=";

  cargoPatches = [
    # enable pkg-config feature of zstd
@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 839cdbc..9622d04 100644
+index 7f0f5c9..4eb062f 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2819,6 +2819,7 @@ dependencies = [
+@@ -2595,6 +2595,7 @@ dependencies = [
  "tokei",
  "typetag",
  "winres",
@@ -11,14 +11,14 @@ index 839cdbc..9622d04 100644
 
 [[package]]
 diff --git a/Cargo.toml b/Cargo.toml
-index 79cbb8c..410a969 100644
+index 99340b3..75957a3 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -68,6 +68,7 @@ time = { version = "0.3.37", features = ["formatting"] }
+@@ -58,6 +58,7 @@ time = { version = "0.3.47", features = ["formatting"] }
 time-humanize = { version = "0.1.3", features = ["time"] }
- tokei = "13.0.0-alpha.7"
- typetag = "0.2"
+ tokei = "14.0.0"
+ typetag = "0.2.21"
 +zstd = { version = "*", features = ["pkg-config"] }
 
 [dev-dependencies]
- criterion = "0.5.1"
+ criterion = "0.8.2"
@@ -3,6 +3,7 @@
  lib,
  jre_headless,
  fetchFromGitHub,
+  fetchpatch,
  maven,
  makeWrapper,
  nix-update-script,
@@ -10,7 +11,7 @@

 let
  jre = jre_headless;
-  version = "7.18.0";
+  version = "7.21.0";
  mainProgram = "openapi-generator-cli";
  this = maven.buildMavenPackage {
    inherit version;
@@ -21,10 +22,18 @@ let
      owner = "OpenAPITools";
      repo = "openapi-generator";
      tag = "v${version}";
-      hash = "sha256-D7F4fbgXqUMH0ZOsnGtB3gVWmans0MPdD7ix6ImXsfA=";
+      hash = "sha256-3e2JrZ+k88t3CyrkBzwkijs0yZGGwB9Se2CeSB02x6c=";
    };

-    mvnHash = "sha256-17siKb+TIYAuY1p7+1mcc3QY+Rfnsoy+CJiWT5LFM0w=";
+    patches = [
+      # Achieve reproducible mvnHash by pinning develocity plugin.
+      (fetchpatch {
+        url = "https://github.com/OpenAPITools/openapi-generator/pull/23326.patch";
+        hash = "sha256-s68VoIXSFGvGCaFtCUYkeoq+CgC+2gIdDIIsmn8uqyk=";
+      })
+    ];
+
+    mvnHash = "sha256-iWVWVEiwvCwc0ayVjH9joiDchyyNUOhEZjJTMH9CCEE=";
    mvnParameters = "-Duser.home=$TMPDIR";
    doCheck = false;

@@ -17,16 +17,16 @@ buildNpmPackage (finalAttrs: {
  inherit nodejs;

  pname = "openscreen";
-  version = "1.2.0";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "siddharthvaddem";
    repo = "openscreen";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-9vtX6rEwRADbi8bSXOi995UvO6wI3z8ai580nhsXJEM=";
+    hash = "sha256-0L+SGbhKNvSH5IpjHjS5G1uhnoWV5oIaSs2mRSAl/mM=";
  };

-  npmDepsHash = "sha256-wYKw8fNuRVJOzR+KMa3DVN3bcT3R5GhKe/xWEH+nt0U=";
+  npmDepsHash = "sha256-pKfOxRzVfMNVHxA9oM9naWz024api8jxiTJwy0+6W9A=";

  npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent running `node-gyp build`

@@ -4,24 +4,28 @@
  fetchFromGitHub,
  pkg-config,
  libsecret,
+  libfido2,
 }:

 buildGoModule (finalAttrs: {
  pname = "protonmail-bridge";
-  version = "3.21.2";
+  version = "3.23.1";

  src = fetchFromGitHub {
    owner = "ProtonMail";
    repo = "proton-bridge";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-IQgP+eWUCyViEBi0WFIOW2rXZLtoyVlrQrtAaqaLOv0=";
+    hash = "sha256-QSK+MiHE8JFtUM4r+4xswOcNrcUd0flxuSf5uG2kZnI=";
  };

-  vendorHash = "sha256-aW7N6uacoP99kpvw9E5WrHaQ0fZ4P5WGsNvR/FAZ+cA=";
+  vendorHash = "sha256-Ww42BbdMHVUUc074vWNYTEMr1myqDPLgkMsaTarziag=";

  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [ libsecret ];
+  buildInputs = [
+    libsecret
+    libfido2
+  ];

  preBuild = ''
    patchShebangs ./utils/
@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "radicale";
-  version = "3.6.1";
+  version = "3.7.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Kozea";
    repo = "Radicale";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-NPebEqLSDsR+FSA3vM0k8JJ8ciIDaRs34z4DBvr5GOE=";
+    hash = "sha256-9mcYyiBljH9iwO/YgavCnR7VbqSYFy4IP3YtYjFbCS8=";
  };

  build-system = with python3.pkgs; [
@@ -18,10 +18,6 @@
  moreutils,
  jq,
  gst_all_1,
-
-  # NOTE: this is enabled by default for better compatibility, but it may slow
-  # down performance.
-  withNvidiaFix ? true,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "readest";
@@ -95,15 +91,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
    pnpm setup-vendors
  '';

-  preFixup = lib.optionalString withNvidiaFix ''
-    # fix Nvidia issues with Tauri
-    # https://github.com/tauri-apps/tauri/issues/9394
-    # https://github.com/tauri-apps/tauri/issues/9304
-    gappsWrapperArgs+=(
-      --set-default WEBKIT_DISABLE_DMABUF_RENDERER 1
-    )
-  '';
-
  passthru.updateScript = nix-update-script { };

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

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "rime-wanxiang";
-  version = "15.4.0";
+  version = "15.6.1";

  src = fetchFromGitHub {
    owner = "amzxyz";
    repo = "rime_wanxiang";
    tag = "v" + finalAttrs.version;
-    hash = "sha256-MbPTW+Bams2Zze8PjSHsNnUzpyvZ/l7xS8wnCTQn8MA=";
+    hash = "sha256-h33dhVBI14JARrGIpPPy7AAXHZs4F6s5AtUm9ZafR3Y=";
  };

  installPhase = ''
@@ -15,14 +15,14 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "rofi-rbw";
-  version = "1.5.1";
+  version = "1.6.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "fdw";
    repo = "rofi-rbw";
    tag = finalAttrs.version;
-    hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE=";
+    hash = "sha256-gV1rZg6GLk8xXJPmQ9TdrfvUv930R68PRiChmiT7MTs=";
  };

  build-system = [
@@ -39,6 +39,31 @@
    "version": "1.11.72",
    "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k="
  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Ref",
+    "version": "8.0.23",
+    "hash": "sha256-MhWoomc6BwUta7PxbnGC3Fno+GQx3aUEtg/LBDAEi38="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-tG2pcAzeiDBouBrMVaYrCD2M2jCXJ4wk2sNOF2KQILk="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
+    "version": "8.0.23",
+    "hash": "sha256-PGtAymoWt5+PBLjt+krej6KruhWy+D+dUE4PgVZSx88="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-fZQKWvYkS/fXUK8BIWD4dSOo1jltO0fDSy0TT+U3H9c="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
+    "version": "8.0.23",
+    "hash": "sha256-HsEhlsBgaDkIDgVz3oPkFe3dRcYFqrHEnikKaTqqWpo="
+  },
  {
    "pname": "Microsoft.Bcl.AsyncInterfaces",
    "version": "9.0.1",
@@ -49,6 +74,56 @@
    "version": "4.7.0",
    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
  },
+  {
+    "pname": "Microsoft.NET.ILLink.Tasks",
+    "version": "8.0.23",
+    "hash": "sha256-CZRiTLcHzhuitBOdeGnLZbVrzh6qwwhTbd7ET4yxVJU="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-C7fkJ6CSrORo8ST27oN1bvApyFD/3P5G40LEJHan8dQ="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-x64",
+    "version": "8.0.23",
+    "hash": "sha256-QSyUAyYwlDbFdWXKMD+Gm+2gkwjEZu+JyxpTIuIHl5w="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-7ztl28l8zPNREGKvR9IcrVDm13/Fi2xSqD8fjxE6yLM="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-x64",
+    "version": "8.0.23",
+    "hash": "sha256-/eDywkBIggw2lt65yf1HFs8wSc1IgrTpEg/aKIz1y7g="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Ref",
+    "version": "8.0.23",
+    "hash": "sha256-Vevn8gsO4gCnGo0ns6B7i0MedAnEq3nBgnqx/E7aI44="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-DyEbaM692s4YBvufr3ebhFH9j2miUAisTIXT5E3fCYg="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
+    "version": "8.0.23",
+    "hash": "sha256-s5iFeWfR2RebcBVPJcxxs2ceDdyol6ut2+g2kRCGIJs="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
+    "version": "8.0.23",
+    "hash": "sha256-IN/OdsXuwiuJG7gu/Gh7nVoL8rgUyMlK+LOkrHoyo+s="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
+    "version": "8.0.23",
+    "hash": "sha256-86dZZBxKLtaQH17UBBIu1nO8CNfxT64ZBL+HRf1kd4A="
+  },
  {
    "pname": "Newtonsoft.Json",
    "version": "13.0.3",
@@ -22,7 +22,7 @@ buildDotnetModule (finalAttrs: {
    substituteInPlace \
        slsk-batchdl/slsk-batchdl.csproj \
        slsk-batchdl.Tests/slsk-batchdl.Tests.csproj \
-        --replace-fail "<TargetFramework>net6.0</TargetFramework>" "<TargetFramework>net8.0</TargetFramework>"
+        --replace-fail "<TargetFramework>net6.0</TargetFramework>" "<TargetFramework>net10.0</TargetFramework>"
  '';

  projectFile = "slsk-batchdl/slsk-batchdl.csproj";
@@ -31,7 +31,7 @@ buildDotnetModule (finalAttrs: {
  # See: https://github.com/fiso64/slsk-batchdl/issues/111
  # testProjectFile = "slsk-batchdl.Tests/slsk-batchdl.Tests.csproj";

-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
  nugetDeps = ./deps.json;
  executables = [ "sldl" ];

@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "spicetify-cli";
-  version = "2.42.14";
+  version = "2.43.1";

  src = fetchFromGitHub {
    owner = "spicetify";
    repo = "cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0ACf7GAWLquAkGrvsRaE+0YvmJqHZe+2pjHvf5eNtqI=";
+    hash = "sha256-yAoIHKPN1o0Ls6klPvDodu+uWCYRmbh437KNbNv3F0k=";
  };

  vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec=";
@@ -38,7 +38,7 @@ in

 stdenv.mkDerivation {
  pname = if tde2eOnly then "tde2e" else "tdlib";
-  version = "1.8.62";
+  version = "1.8.63";

  src = fetchFromGitHub {
    owner = "tdlib";
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
    # The tdlib authors do not set tags for minor versions, but
    # external programs depending on tdlib constrain the minor
    # version, hence we set a specific commit with a known version.
-    rev = "e597838871547131ef92332fca601f5effba4e8a";
-    hash = "sha256-WdBgLjaYVf50B3gIkydEddV+eDDG+VWZLiEibWQzRGw=";
+    rev = "f06b0bac65278b03d26414c096080e7bfecfef52";
+    hash = "sha256-SzUDAZqdEIrIj1qUUD0MvzbCYxKLJwoX2+T0chud/rQ=";
  };

  buildInputs = [
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "tfswitch";
-  version = "1.15.0";
+  version = "1.16.0";

  src = fetchFromGitHub {
    owner = "warrensbox";
    repo = "terraform-switcher";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oaroJ02hHYxCFm5oS/IUSe00QH6n7G+LE/1tUO19TAI=";
+    sha256 = "sha256-TpE0HX/2fGv17o1mwkyuWndclbydUBC6EKy6uFC5VdM=";
  };

-  vendorHash = "sha256-fF7iAN0sX0yMGIQ3MvH7jIzlHpfY8+uE1XlBi28Q5RU=";
+  vendorHash = "sha256-NxPqXpXCSHqgUJSC4/2R/ImqwNX9e+qNUU6g9n2SWBo=";

  # Disable tests since it requires network access and relies on the
  # presence of release.hashicorp.com
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "tomlc17";
-  version = "250712";
+  version = "260323";

  src = fetchFromGitHub {
    owner = "cktan";
    repo = "tomlc17";
    tag = "R${finalAttrs.version}";
-    hash = "sha256-0if07Zj7Og+DBc/gxmAEHQh7QwAo8C/4S+x9IttEUjI=";
+    hash = "sha256-pwUJkZRiVqTZqbjTcB/Uw5xY8vuvprWuiQVC/kzFsNM=";
  };

  doCheck = false; # tries to download toml-test suite
@@ -22,7 +22,9 @@ stdenv.mkDerivation (finalAttrs: {
    "prefix=${placeholder "out"}"
  ];

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^R(.*)" ];
+  };

  meta = {
    homepage = "https://github.com/cktan/tomlc17";
@@ -6,26 +6,28 @@

 buildGoModule (finalAttrs: {
  pname = "unpackerr";
-  version = "0.14.5";
+  version = "0.15.2";

  src = fetchFromGitHub {
    owner = "davidnewhall";
    repo = "unpackerr";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-uQwpdgV6ksouW9JTuiiuQjxBGOE/ypDW769kNJgWrHw=";
+    sha256 = "sha256-npq0CXsaWaFa6RazQXRKVaqTyK87VhzaF/hd/d952Po=";
  };

-  vendorHash = "sha256-wWIw0gNn5tqRq0udzPy/n2OkiIVESpSotOSn2YlBNS4=";
+  vendorHash = "sha256-v0ml1dTIhf79mhlyTrPNhIfg1Yhao27eP0pnI95OvaU=";

  ldflags = [
    "-s"
    "-w"
+    "-X golift.io/version.Branch=main"
    "-X golift.io/version.Version=${finalAttrs.version}"
+    "-X golift.io/version.Revision=v${finalAttrs.version}"
  ];

  meta = {
    description = "Extracts downloads for Radarr, Sonarr, Lidarr - Deletes extracted files after import";
-    homepage = "https://github.com/davidnewhall/unpackerr";
+    homepage = "https://unpackerr.zip/";
    maintainers = [ ];
    license = lib.licenses.mit;
    mainProgram = "unpackerr";
@@ -138,13 +138,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      popd
    '';

-  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    wrapProgram $out/bin/yaak-app \
-      --inherit-argv0 \
-      --set-default WEBKIT_DISABLE_DMABUF_RENDERER 1 \
-      --set-default WEBKIT_DISABLE_COMPOSITING_MODE 1
-  '';
-
  passthru.updateScript = nix-update-script { };

  meta = {
@@ -6,23 +6,26 @@

 pkgsi686Linux.stdenv.mkDerivation (finalAttrs: {
  pname = "zsnes2";
-  version = "2.0.12";
+  version = "2.1.0";

  src = fetchFromGitHub {
    owner = "xyproto";
    repo = "zsnes";
    tag = finalAttrs.version;
-    hash = "sha256-Xz+9YgMpnHyno7vP67aut4tIyG/gTn7SnU2FO2QMND0=";
+    hash = "sha256-HY9rjymYulITVjvEgEbdsbTNsTE7NtykgObbtHQwWsA=";
  };

  nativeBuildInputs = [
    pkgsi686Linux.nasm
    pkgsi686Linux.pkg-config
+    pkgsi686Linux.python3
    pkgsi686Linux.udevCheckHook
  ];

  buildInputs = [
-    pkgsi686Linux.SDL
+    (pkgsi686Linux.sdl3.overrideAttrs (oldAttrs: {
+      doCheck = false;
+    }))
    pkgsi686Linux.libGL
    pkgsi686Linux.libGLU
    pkgsi686Linux.libpng
@@ -1,26 +1,40 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
  lxml,
  sqlalchemy,
+  python,
 }:

-buildPythonPackage rec {
+buildPythonPackage {
  pname = "cinemagoer";
-  version = "2023.5.1";
-  format = "setuptools";
+  version = "2025.12.31";
+  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-XOHXeuZUZwFhjxHlsVVqGdGO3srRttfZaXPsNJQbGPI=";
+  src = fetchFromGitHub {
+    owner = "cinemagoer";
+    repo = "cinemagoer";
+    rev = "aca62692b6f0ca7ed9c70871bafd8b558c6ba6ec"; # No tag
+    hash = "sha256-Aelgi+Wz2rxLBkJ3YoHJMfno0QoEKESIpwwrJUzAAF0=";
  };

-  propagatedBuildInputs = [
+  pythonRelaxDeps = [
+    "lxml"
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    lxml
    sqlalchemy
  ];

+  preBuild = ''
+    ${python.interpreter} rebuildmo.py
+  '';
+
  # Tests require networking, and https://github.com/cinemagoer/cinemagoer/issues/240
  doCheck = false;

@@ -14,6 +14,7 @@
  threadpoolctl,
  pytestCheckHook,
  python,
+  sklearn-compat,
 }:

 buildPythonPackage rec {
@@ -39,6 +40,7 @@ buildPythonPackage rec {
    scikit-learn
    scipy
    threadpoolctl
+    sklearn-compat
  ];

  optional-dependencies = {
@@ -74,12 +76,6 @@ buildPythonPackage rec {
    "imblearn/utils/tests/test_min_dependencies.py"
  ];

-  disabledTests = [
-    # Broken upstream test https://github.com/scikit-learn-contrib/imbalanced-learn/issues/1131
-    "test_estimators_compatibility_sklearn"
-    "test_balanced_bagging_classifier_with_function_sampler"
-  ];
-
  meta = {
    description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance";
    homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn";
@@ -26,16 +26,16 @@
  trove-classifiers,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "mkdocs-material";
-  version = "9.7.1";
+  version = "9.7.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "squidfunk";
    repo = "mkdocs-material";
-    tag = version;
-    hash = "sha256-+DMxYTj3PYjhv3M3XQS+XgLRSMFAfFeZYiMEzl7Wo6o=";
+    tag = finalAttrs.version;
+    hash = "sha256-qQtVnWNSh7rJhVyufkebEq6n4lpBI3tZxHRT07AIZFA=";
  };

  build-system = [
@@ -84,7 +84,7 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "mkdocs" ];

  meta = {
-    changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.tag}/CHANGELOG";
+    changelog = "https://github.com/squidfunk/mkdocs-material/blob/${finalAttrs.src.tag}/CHANGELOG";
    description = "Material for mkdocs";
    downloadPage = "https://github.com/squidfunk/mkdocs-material";
    homepage = "https://squidfunk.github.io/mkdocs-material/";
@@ -94,4 +94,4 @@ buildPythonPackage rec {
      jaysa68
    ];
  };
-}
+})
@@ -32,7 +32,7 @@

 buildPythonPackage rec {
  pname = "ocrmypdf";
-  version = "17.4.0";
+  version = "17.4.1";
  pyproject = true;

  src = fetchFromGitHub {
@@ -45,7 +45,7 @@ buildPythonPackage rec {
    postFetch = ''
      rm "$out/.git_archival.txt"
    '';
-    hash = "sha256-Dn6WQg7y6IbS5MUwyjofDmlJd0MH9US0mcL/B7UE9f0=";
+    hash = "sha256-2gghArOylldrCcTrOi1XtfdIwRw7AUpf0PQ6hvKInMk=";
  };

  patches = [
@@ -4,18 +4,28 @@
  buildPythonPackage,
  postgresql,
  unittestCheckHook,
+  uv-build,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pgsanity";
  version = "0.3.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-Po/DPQpk54w1gWOL9aArN6I8dmMb7uRYxuRMI6MIDKU=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-Po/DPQpk54w1gWOL9aArN6I8dmMb7uRYxuRMI6MIDKU=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.8.19,<0.9.0" uv_build
+  '';
+
+  build-system = [
+    uv-build
+  ];
+
  nativeCheckInputs = [
    unittestCheckHook
  ];
@@ -41,4 +51,4 @@ buildPythonPackage rec {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ nalbyuites ];
  };
-}
+})
@@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "pycasbin";
-  version = "2.7.1";
+  version = "2.8.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "casbin";
    repo = "pycasbin";
    tag = "v${version}";
-    hash = "sha256-UYl+n0quHOfC0lTAdLi7EbrvwcGa8Gzh+1ofc38rPx8=";
+    hash = "sha256-jK6zmT5trj6qBcS6edXPmK8eHfqw58seraswEQQzhZ0=";
  };

  build-system = [ setuptools ];
@@ -16,7 +16,7 @@
  mock,
 }:

-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
  pname = "pyedbglib";
  version = "2.24.2.18";
  pyproject = true;
@@ -24,9 +24,7 @@ buildPythonPackage {
  src = fetchFromGitHub {
    owner = "microchip-pic-avr-tools";
    repo = "pyedbglib";
-    # the repo currently does not tag releases, so using the
-    # commit ID for now
-    rev = "9bbeceba942772ef31b9c059b761460a782313e";
+    tag = finalAttrs.version;
    hash = "sha256-iZB/+JEBy5n1zfajmJmEqRVQ2hPzJD/U85SvmyFiGhc=";
  };

@@ -54,4 +52,4 @@ buildPythonPackage {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ prophetofxenu ];
  };
-}
+})
@@ -21,7 +21,7 @@
  writableTmpDirAsHomeHook,
 }:

-buildPythonPackage {
+buildPythonPackage (finalAttrs: {
  pname = "pymcuprog";
  version = "3.19.4.61";
  pyproject = true;
@@ -29,9 +29,7 @@ buildPythonPackage {
  src = fetchFromGitHub {
    owner = "microchip-pic-avr-tools";
    repo = "pymcuprog";
-    # the repo currently does not tag releases, so using the
-    # commit ID for now
-    rev = "e2fa9a7f0b9cc413367c51b9ccf19d93cdca6c8";
+    tag = finalAttrs.version;
    hash = "sha256-RmFGQ6LbuwwM/WHr01nYGZYoWG7Qbasz/TL4r8l1NUk";
  };

@@ -66,4 +64,4 @@ buildPythonPackage {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ prophetofxenu ];
  };
-}
+})
@@ -44,14 +44,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
  pname = "pymupdf";
-  version = "1.27.1";
+  version = "1.27.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pymupdf";
    repo = "PyMuPDF";
    tag = finalAttrs.version;
-    hash = "sha256-Ebvdkvp0y7seG0sciMMnztflIBVRHh/Cowpw/lSLYLE=";
+    hash = "sha256-7Bnu5AG1b5v4hd85xzyFvjsqXl5Lqltbb2NcmkTQwaE=";
  };

  patches = [
@@ -136,6 +136,8 @@ buildPythonPackage (finalAttrs: {
    "test_4702"
    # Not a git repository, so git ls-files fails
    "test_open2"
+    # Segfaults in test_general.py::test_4907 with system MuPDF
+    "test_4907"
  ];

  disabledTestPaths = [
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pymodbus,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "python-qube-heatpump";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "MattieGit";
+    repo = "python-qube-heatpump";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-auxFAKEi8nvPQPDU7Lg2bt8X5TaFaYhvcnQLv86QpGY=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ pymodbus ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "python_qube_heatpump" ];
+
+  meta = {
+    description = "Async Modbus client for Qube Heat Pumps";
+    homepage = "https://github.com/MattieGit/python-qube-heatpump";
+    changelog = "https://github.com/MattieGit/python-qube-heatpump/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
@@ -2596,7 +2596,8 @@
      ];
    "hr_energy_qube" =
      ps: with ps; [
-      ]; # missing inputs: python-qube-heatpump
+        python-qube-heatpump
+      ];
    "html5" =
      ps: with ps; [
        py-vapid
@@ -7747,6 +7748,7 @@
    "homewizard"
    "homeworks"
    "honeywell"
+    "hr_energy_qube"
    "html5"
    "http"
    "huawei_lte"
@@ -6,16 +6,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "battery-state-card";
-  version = "4.0.1";
+  version = "4.2.0";

  src = fetchFromGitHub {
    owner = "maxwroc";
    repo = "battery-state-card";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-mwyOdNlGMHK1xrwRL85R0i5s9g5I44WjHcbNTAY/fkw=";
+    hash = "sha256-IP1l9/WJphXQlLDVSYK59WEiG5/+D30WUqVP3uybeIE=";
  };

-  npmDepsHash = "sha256-vhjH7AePShgrzLRgCEn5sO0jJzOstDzMDQaog2UCarM=";
+  npmDepsHash = "sha256-Hsldl3tATfEPw5GsrhdnLXj3Smy2cAmBA2NIeY1sNK0=";

  env = {
    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
@@ -27,7 +27,10 @@ lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
      (pkgs.nixos {
        system.nixos = dummyVersioning;
        boot.loader.grub.enable = false;
-        fileSystems."/".device = "/dev/null";
+        fileSystems."/" = {
+          device = "/dev/null";
+          fsType = "none";
+        };
        system.stateVersion = lib.trivial.release;
      }).toplevel;
  }
@@ -2246,11 +2246,6 @@ with pkgs;

  diffutils = callPackage ../tools/text/diffutils { };

-  drone = callPackage ../development/tools/continuous-integration/drone { };
-  drone-oss = callPackage ../development/tools/continuous-integration/drone {
-    enableUnfree = false;
-  };
-
  dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };

  inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })
@@ -15884,6 +15884,8 @@ self: super: with self; {

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

+  python-qube-heatpump = callPackage ../development/python-modules/python-qube-heatpump { };
+
  python-rabbitair = callPackage ../development/python-modules/python-rabbitair { };

  python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };
@@ -291,10 +291,6 @@ in
  x86_64-netbsd = mapTestOnCross systems.examples.x86_64-netbsd common;
  x86_64-openbsd = mapTestOnCross systems.examples.x86_64-openbsd common;

-  # we test `embedded` instead of `linuxCommon` because very few packages
-  # successfully cross-compile to Redox so far
-  x86_64-redox = mapTestOnCross systems.examples.x86_64-unknown-redox embedded;
-
  # Cross-built bootstrap tools for every supported platform
  bootstrapTools =
    let