Merge staging-next into staging

2026-01-06 18:07:38 +00:00
parent 9ab74f3ce3 bfbaac3f80
commit 02cebb4644
114 changed files with 4835 additions and 624 deletions
@@ -440,6 +440,11 @@ rec {
    isPE = {
      kernel.execFormat = execFormats.pe;
    };
+
+    isEabi = {
+      abi.eabi = true;
+    };
+
  };

  # given two patterns, return a pattern which is their logical AND.
@@ -662,15 +662,19 @@ rec {
    # On ARM, this corresponds to ARMEABI.
    eabi = {
      float = "soft";
+      eabi = true;
    };
    eabihf = {
      float = "hard";
+      eabi = true;
    };

    # Other architectures should use ELF in embedded situations.
    elf = { };

-    androideabi = { };
+    androideabi = {
+      eabi = true;
+    };
    android = {
      assertions = [
        {
@@ -684,9 +688,11 @@ rec {

    gnueabi = {
      float = "soft";
+      eabi = true;
    };
    gnueabihf = {
      float = "hard";
+      eabi = true;
    };
    gnu = {
      assertions = [
@@ -730,17 +736,21 @@ rec {

    musleabi = {
      float = "soft";
+      eabi = true;
    };
    musleabihf = {
      float = "hard";
+      eabi = true;
    };
    musl = { };

    uclibceabi = {
      float = "soft";
+      eabi = true;
    };
    uclibceabihf = {
      float = "hard";
+      eabi = true;
    };
    uclibc = { };

@@ -1120,6 +1120,13 @@
    githubId = 82811;
    name = "Aldo Borrero";
  };
+  aleclearmind = {
+    email = "ale.nix@clearmind.me";
+    matrix = "@bake.monorail:matrix.org";
+    github = "aleclearmind";
+    githubId = 2545644;
+    name = "Alessandro Di Federico";
+  };
  alejandrosame = {
    email = "alejandrosanchzmedina@gmail.com";
    matrix = "@alejandrosame:matrix.org";
@@ -69,6 +69,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh

 - `services.desktopManager.gnome` no longer installs the Geary e-mail client since it is not part of the GNOME [core applications](https://apps.gnome.org/) list. Geary's position in the default favorite apps section has been replaced by GNOME Text Editor. To keep it installed, add `programs.geary.enable = true;` to your configuration.

+- Support for `reiserfs` in nixpkgs has been removed, following the removal in Linux 6.13.
+
 - The `networking.wireless` module has been security hardened: the `wpa_supplicant` daemon now runs under an unprivileged user with restricted access to the system.

  As part of these changes, `/etc/wpa_supplicant.conf` has been deprecated: the NixOS-generated configuration file is now linked to `/etc/wpa_supplicant/nixos.conf` and `/etc/wpa_supplicant/imperative.conf` has been added for imperatively configuring `wpa_supplicant` or when using [allowAuxiliaryImperativeNetworks](#opt-networking.wireless.allowAuxiliaryImperativeNetworks).
@@ -59,6 +59,13 @@ in
      ];
    };

+    finalPackage = lib.mkOption {
+      type = lib.types.package;
+      visible = false;
+      readOnly = true;
+      description = "Resulting customized Firefox package.";
+    };
+
    wrapperConfig = lib.mkOption {
      type = lib.types.attrs;
      default = { };
@@ -276,14 +283,7 @@ in

  config = lib.mkIf cfg.enable {
    environment.systemPackages = [
-      (cfg.package.override (old: {
-        extraPrefsFiles =
-          (old.extraPrefsFiles or [ ])
-          ++ cfg.autoConfigFiles
-          ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ];
-        nativeMessagingHosts = (old.nativeMessagingHosts or [ ]) ++ cfg.nativeMessagingHosts.packages;
-        cfg = (old.cfg or { }) // cfg.wrapperConfig;
-      }))
+      cfg.finalPackage
    ];

    environment.etc =
@@ -295,23 +295,34 @@ in
      };

    # Preferences are converted into a policy
-    programs.firefox.policies = {
-      DisableAppUpdate = true;
-      Preferences = (
-        builtins.mapAttrs (_: value: {
-          Value = value;
-          Status = cfg.preferencesStatus;
-        }) cfg.preferences
-      );
-      ExtensionSettings = builtins.listToAttrs (
-        builtins.map (
-          lang:
-          lib.attrsets.nameValuePair "langpack-${lang}@firefox.mozilla.org" {
-            installation_mode = "normal_installed";
-            install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi";
-          }
-        ) cfg.languagePacks
-      );
+    programs.firefox = {
+      policies = {
+        DisableAppUpdate = true;
+        Preferences = (
+          builtins.mapAttrs (_: value: {
+            Value = value;
+            Status = cfg.preferencesStatus;
+          }) cfg.preferences
+        );
+        ExtensionSettings = builtins.listToAttrs (
+          builtins.map (
+            lang:
+            lib.attrsets.nameValuePair "langpack-${lang}@firefox.mozilla.org" {
+              installation_mode = "normal_installed";
+              install_url = "https://releases.mozilla.org/pub/firefox/releases/${cfg.package.version}/linux-x86_64/xpi/${lang}.xpi";
+            }
+          ) cfg.languagePacks
+        );
+      };
+
+      finalPackage = cfg.package.override (old: {
+        extraPrefsFiles =
+          (old.extraPrefsFiles or [ ])
+          ++ cfg.autoConfigFiles
+          ++ [ (pkgs.writeText "firefox-autoconfig.js" cfg.autoConfig) ];
+        nativeMessagingHosts = (old.nativeMessagingHosts or [ ]) ++ cfg.nativeMessagingHosts.packages;
+        cfg = (old.cfg or { }) // cfg.wrapperConfig;
+      });
    };
  };

@@ -161,7 +161,7 @@ in
    environment.systemPackages = [
      cfg.finalPackage
    ];
-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
    # On most NixOS configurations /share is already included, so it includes
    # this directory as well. But  This makes sure that /share/nvim/site paths
    # from other packages will be used by neovim.
@@ -26,7 +26,7 @@ in
    ];
    environment = {
      systemPackages = [ cfg.package ];
-      variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "vim");
+      sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "vim");
      pathsToLink = [ "/share/vim-plugins" ];
    };
  };
@@ -49,7 +49,7 @@ in
      cfg.finalPackage
    ];

-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (
      lib.mkOverride 900 cfg.finalPackage.meta.mainProgram
    );

@@ -194,6 +194,7 @@ in
        description = "Generate Diffie-Hellman Parameters for ${name}";
        after = [ "dhparams-init.service" ];
        before = [ "${name}.service" ];
+        requiredBy = [ "${name}.service" ];
        wantedBy = [ "multi-user.target" ];
        unitConfig.ConditionPathExists = "!${path}";
        serviceConfig.Type = "oneshot";
@@ -90,7 +90,7 @@ in
      editorScript
    ];

-    environment.variables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "emacseditor");
+    environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor (lib.mkOverride 900 "emacseditor");
  };

  meta.doc = ./emacs.md;
@@ -137,7 +137,8 @@ in
          '';

          extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
-            ls ${pkgs.vdo}/bin/ | grep -vE '(adaptlvm|vdorecover)' | while read BIN; do
+            exclude='adaptlvm|vdorecover|vdocalculatesize'
+            ls ${pkgs.vdo}/bin/ | grep -vE "($exclude)" | while read BIN; do
              $out/bin/$(basename $BIN) --help > /dev/null
            done
          '';
@@ -0,0 +1,5 @@
+{
+  lib,
+  vimPlugins,
+}:
+lib.recurseIntoAttrs vimPlugins.nvim-treesitter-legacy.grammarPlugins
@@ -0,0 +1,13 @@
+{ vimUtils, fetchFromGitHub }:
+vimUtils.buildVimPlugin {
+  pname = "nvim-treesitter-legacy";
+  version = "0.10.0-unstable-2025-05-24";
+  src = fetchFromGitHub {
+    owner = "nvim-treesitter";
+    repo = "nvim-treesitter";
+    rev = "42fc28ba918343ebfd5565147a42a26580579482";
+    hash = "sha256-CVs9FTdg3oKtRjz2YqwkMr0W5qYLGfVyxyhE3qnGYbI=";
+  };
+  meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
+  meta.hydraPlatforms = [ ];
+}
@@ -0,0 +1,91 @@
+{
+  lib,
+  callPackage,
+  tree-sitter,
+  neovim,
+  neovimUtils,
+  runCommand,
+  vimPlugins,
+  tree-sitter-grammars,
+  writableTmpDirAsHomeHook,
+}:
+
+self: super:
+
+let
+  inherit (neovimUtils) grammarToPlugin;
+
+  overrides = prev: {
+  };
+
+  generatedGrammars =
+    let
+      generated = callPackage ./generated.nix {
+        inherit (tree-sitter) buildGrammar;
+      };
+    in
+    lib.overrideExisting generated (overrides generated);
+
+  generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars;
+
+  # add aliases so grammars from `tree-sitter` are overwritten in `withPlugins`
+  # for example, for ocaml_interface, the following aliases will be added
+  #   ocaml-interface
+  #   tree-sitter-ocaml-interface
+  #   tree-sitter-ocaml_interface
+  builtGrammars =
+    generatedGrammars
+    // lib.concatMapAttrs (
+      k: v:
+      let
+        replaced = lib.replaceStrings [ "_" ] [ "-" ] k;
+      in
+      {
+        "tree-sitter-${k}" = v;
+      }
+      // lib.optionalAttrs (k != replaced) {
+        ${replaced} = v;
+        "tree-sitter-${replaced}" = v;
+      }
+    ) generatedDerivations;
+
+  allGrammars = lib.attrValues generatedDerivations;
+
+  # Usage:
+  # pkgs.vimPlugins.nvim-treesitter-legacy.withPlugins (p: [ p.c p.java ... ])
+  # or for all grammars:
+  # pkgs.vimPlugins.nvim-treesitter-legacy.withAllGrammars
+  withPlugins =
+    f:
+    self.nvim-treesitter-legacy.overrideAttrs {
+      passthru.dependencies = map grammarToPlugin (f (tree-sitter.builtGrammars // builtGrammars));
+    };
+
+  withAllGrammars = withPlugins (_: allGrammars);
+in
+
+{
+  postPatch = ''
+    rm -r parser
+  '';
+
+  passthru = (super.nvim-treesitter-legacy.passthru or { }) // {
+    inherit
+      builtGrammars
+      allGrammars
+      grammarToPlugin
+      withPlugins
+      withAllGrammars
+      ;
+
+    grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations;
+    parsers = lib.recurseIntoAttrs vimPlugins.nvim-treesitter.grammarPlugins;
+  };
+
+  meta =
+
+    (super.nvim-treesitter-legacy.meta or { }) // {
+      license = lib.licenses.asl20;
+      maintainers = [ ];
+    };
+}
@@ -1927,7 +1927,7 @@ assertNoAdditions {
    };

  markid = super.markid.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  mason-lspconfig-nvim = super.mason-lspconfig-nvim.overrideAttrs {
@@ -2421,7 +2421,7 @@ assertNoAdditions {
      nvim-cmp
      nvim-lspconfig
      telescope-nvim
-      nvim-treesitter
+      nvim-treesitter-legacy
      nvchad-ui
    ];
    nvimSkipModules = [
@@ -2464,7 +2464,7 @@ assertNoAdditions {

  nvim-biscuits = super.nvim-biscuits.overrideAttrs {
    dependencies = with self; [
-      nvim-treesitter
+      nvim-treesitter-legacy
      plenary-nvim
    ];
  };
@@ -2526,7 +2526,7 @@ assertNoAdditions {
  };

  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
@@ -2699,16 +2699,16 @@ assertNoAdditions {
    # Optional toggleterm integration
    checkInputs = [ self.toggleterm-nvim ];
    dependencies = with self; [
-      nvim-treesitter
-      nvim-treesitter-parsers.c_sharp
-      nvim-treesitter-parsers.go
-      nvim-treesitter-parsers.haskell
-      nvim-treesitter-parsers.javascript
-      nvim-treesitter-parsers.python
-      nvim-treesitter-parsers.ruby
-      nvim-treesitter-parsers.rust
-      nvim-treesitter-parsers.typescript
-      nvim-treesitter-parsers.zig
+      nvim-treesitter-legacy
+      nvim-treesitter-legacy-parsers.c_sharp
+      nvim-treesitter-legacy-parsers.go
+      nvim-treesitter-legacy-parsers.haskell
+      nvim-treesitter-legacy-parsers.javascript
+      nvim-treesitter-legacy-parsers.python
+      nvim-treesitter-legacy-parsers.ruby
+      nvim-treesitter-legacy-parsers.rust
+      nvim-treesitter-legacy-parsers.typescript
+      nvim-treesitter-legacy-parsers.zig
    ];
    nvimSkipModules = [
      # Broken runners
@@ -2738,37 +2738,42 @@ assertNoAdditions {
    callPackage ./nvim-treesitter/overrides.nix { } self super
  );

+  # TODO: raise warning at 26.04; drop at 26.11
+  nvim-treesitter-legacy = super.nvim-treesitter-legacy.overrideAttrs (
+    callPackage ./nvim-treesitter-legacy/overrides.nix { } self super
+  );
+
  nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs {
    # Meant for CI installing parsers
    nvimSkipModules = [ "install_parsers" ];
  };

  nvim-treesitter-endwise = super.nvim-treesitter-endwise.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-pairs = super.nvim-treesitter-pairs.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-pyfold = super.nvim-treesitter-pyfold.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-refactor = super.nvim-treesitter-refactor.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-textobjects = super.nvim-treesitter-textobjects.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-treesitter-textsubjects = super.nvim-treesitter-textsubjects.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-legacy ];
  };

  nvim-ufo = super.nvim-ufo.overrideAttrs {
@@ -216,6 +216,14 @@ let
            ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3
          '';
        in
+
+        assert
+          (
+            builtins.elem vimPlugins.nvim-treesitter (opt ++ allPlugins)
+            && builtins.elem vimPlugins.nvim-treesitter-legacy (opt ++ allPlugins)
+          )
+          -> throw "You cannot include two different versions of nvim-treesitter, perhaps you included a legacy plugin together with a new one?";
+
        [
          packdirStart
          packdirOpt
@@ -60,7 +60,8 @@ stdenv.mkDerivation {
  # Workaround build failure on -fno-common toolchains:
  #   ld: initc.o:(.bss+0x28): multiple definition of `HacksDisable'; cfg.o:(.bss+0x59e3): first defined here
  # Use pre-c++17 standard (c++17 forbids throw annotations)
-  env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14";
+  # Use pre-c23: chips/dsp3emu.c:31:23: error: 'bool' cannot be defined via 'typedef'
+  env.NIX_CFLAGS_COMPILE = "-fcommon -std=c++14 -std=gnu17";

  preConfigure = ''
    cd src
@@ -70,6 +71,8 @@ stdenv.mkDerivation {

  configureFlags = [ "--enable-release" ];

+  enableParallelBuilding = true;
+
  postInstall = ''
    function installIcon () {
        mkdir -p $out/share/icons/hicolor/$1/apps/
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "docker-compose";
-  version = "5.0.0";
+  version = "5.0.1";

  src = fetchFromGitHub {
    owner = "docker";
    repo = "compose";
    tag = "v${version}";
-    hash = "sha256-7g9l9SBxPY3jMS3DWZNI/fhOZN1oZo1qkUfhMfbzAaM=";
+    hash = "sha256-lX891L9EPT8FQ4h69t345IuIrbagaKPnnYQogR2DjZ8=";
  };

-  vendorHash = "sha256-EFbEd1UwrBnH6pSh+MvupYdie8SnKr8y6K9lQflBSlk=";
+  vendorHash = "sha256-zuzepwTiYJhiqrOxPxYX0b/ffwAVhUfj0RtfXzrhG8o=";

  nativeInstallCheckInputs = [ versionCheckHook ];

@@ -39,6 +39,22 @@
  "@node-rs/jieba-win32-arm64-msvc@npm:1.10.4": "68146cf2b5324c461847da9fd36aa851aeb5655f94b0178a194630c80926e914b71f5fe60a6853c9197516e2b2680303bf28c405963f8655d0099d335c5178bd",
  "@node-rs/jieba-win32-ia32-msvc@npm:1.10.4": "38deadbf93c6ffb410a880f8938034635e2ca755b956b7cf0b751f287dbfb4b5e58a492f532f23b30e77a7b3889467055c4d9be4d76df8c4416d97f96c242f93",
  "@node-rs/jieba-win32-x64-msvc@npm:1.10.4": "073b499e19d211f416a604a791c7a29c99552b328d0565d8381258a49682f87014274eebdaafcc9477238a2fd555b0e18fedccb45a49715ad3332958c6f43905",
+  "@oxfmt/darwin-arm64@npm:0.17.0": "71b9edea8adcd27da7dbf6fd9d9307aa2721c644ad8ebc75cc7ac94872223c3e1364fa323d979a20a483ac39e0a36dc0cf4ad5d47516a23b4d8321d4a1f6633e",
+  "@oxfmt/darwin-x64@npm:0.17.0": "4c853c87f8db467c463467062eb7f083d66a5d2cd7b8aa260f62d6d1567d9cc43848f8a07fc5e98fc2376c69689098e98a90b7eb382ddab63cce23d74eae7ab6",
+  "@oxfmt/linux-arm64-gnu@npm:0.17.0": "4fda05a45aac1872af2545aa66f5025ae1048277400e56aaf2fa230858d4d2dee660a095858238d14a733fe5ab2fb4630c9e4d74ac8dcccd71423b5288868629",
+  "@oxfmt/linux-arm64-musl@npm:0.17.0": "3cf4c2750cc083464cd77d2f083ee0ead99a1a95330e0129d6145189d16f7a51714e61d3ab231e3a456fe09726d097d39cdcdfee3bbfae31a01a25b188049d59",
+  "@oxfmt/linux-x64-gnu@npm:0.17.0": "4ff9bbf38f689e6cc4da94618249cce9c2793e0a5aea4e443d248379f3917de8fbda2b6efe847daeff52b9fbb6fe83777290168b53065eb07a0bf6ebd5f51bce",
+  "@oxfmt/linux-x64-musl@npm:0.17.0": "8415da3d577bbbb95e0c590dd0ce2c9dc274ec415825c6983295635ef5a3b85de9506e970512795ee3a6f5f2ea13b55f17cc929d227248a685377fe2a696c54e",
+  "@oxfmt/win32-arm64@npm:0.17.0": "9099a962667f5ae861517b8e8497ca535038b232a9018882b0ad5a033e7830ab462717a04797aa1da89f0da9b733e22f41762bf69f277ce5865a0e6a5256d5d2",
+  "@oxfmt/win32-x64@npm:0.17.0": "02f95c2034b3a805d9c1e45c4b3bb957a775830ee9a31a253ea3fd8ca81f03ea50a89ba6ed06c03ec96d1094cec2be81e7ebf936c16a7d410e41caaced398899",
+  "@oxlint/darwin-arm64@npm:1.32.0": "2de9d433150abc903561ff2dd058620233033647458554ac9353264e0aaa0e6ae31adcd82c67f93f08a793e578f99a05a98861a1a666f57b8fb2bcf2ec994217",
+  "@oxlint/darwin-x64@npm:1.32.0": "ab6cb1af8034e49b9ef7412da12d10f93b1f0bcc50d48a5d4051f1f519f27e23ed357cccc8e74068d10b5980b667f773658f2cd1877c5d64bccd6d2a02d4589a",
+  "@oxlint/linux-arm64-gnu@npm:1.32.0": "ee1b2046013e6c3f4ae6b16d87a83714ddc421a331221b884c885d46236b41a5394e8c2e6430079a5fafb874e02d70ce3953b119a9314253c48fbaaed0f73138",
+  "@oxlint/linux-arm64-musl@npm:1.32.0": "21a5e03fadf0329fd570f6b0d5030134a182b56c3c76f6d45040718f441e6b7dc9faa4df28c89c03e0f00c6e1b8294619d91fd2acd2aa058895b6435b4c565b5",
+  "@oxlint/linux-x64-gnu@npm:1.32.0": "e01e573538868746624ae2a45f70b9162a86654961f5baa31c76250414ffc9f46bfb277020e1af4b0c29707e388bcf3e5f299850b318089786bf56f098980fba",
+  "@oxlint/linux-x64-musl@npm:1.32.0": "96f033d22630060c83eb24675fa0bfbfa6be72b1fcd735c9423a2c4300878d4051119115881058b87ceba0bd555f35c2282a6775f19567d5799909520b8a1f25",
+  "@oxlint/win32-arm64@npm:1.32.0": "7d17c307a56703016e99638be262225cbecece4d4a43005cb9cccd08f0d9c385de33331a60984e855ecb5ab3de2b461ad15f095efc59251482ee9e0b6ea41a58",
+  "@oxlint/win32-x64@npm:1.32.0": "b646ba637dbe9c742157b56832f49cffc80b59b28ba48f9cbf34ac59e25c219fd1795e395c68b8941199dbb5bdf78b86b0545b0baf8232b77f4fed8e0f50e027",
  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
@@ -82,25 +98,6 @@
  "@swc/core-win32-arm64-msvc@npm:1.15.2": "1c009bc927578943b5e08f43ef69dd6997545feeaedacc7fcd415e5a6e7d669186f0591f1e3617b0218a67567216dfa134d77c133a75f44c8f11f44d52c73532",
  "@swc/core-win32-ia32-msvc@npm:1.15.2": "88e9beeafa768fb212a64b0652f66d2aa2f6728a0309ce6f8962200d65ff370638578f13b783a83d499e91ffafbfeb9160b3a5fb37521d1120b506e9ddf1e89e",
  "@swc/core-win32-x64-msvc@npm:1.15.2": "df51454cdd0a5ea999d267a3230e9c51daef93f0fefec3c3aed5d3f8c8409f89514971edb99270fece2e3342bccf3c55a28a32a87e5cd250f25c2410218ddb8f",
-  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "5c8769703d724915224711f718085f541d8558e95d8646c6cca5709f1f7dd00ce65d0e2d0bc03bb1c0c74d22d70d54cfc490176dbb7c6f5d06072365ec7ef6b6",
-  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "7ab93a01b7f4cbc99bfaf8cd35a1454f78826bb2840f0387a19491cb4835b16d81d30ca2b4b71a43643f58aaceb83a63cd89274a3f16637e35887e67a93ea21e",
-  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "f8bd59a69ca200f9590a94de5699a0cecbcba120f5b82b2295468d36f943be48d957a8ca466f3fb30466abafee4a9672831c382ff9dea4ccdaa0a92992bb41b1",
-  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "423acf3a8032b6bde50fabcdeccd4c1954bbede56f8c2fc5134621fd957f931a08ad74b3690762e3e18e2f5f31f35dc93b826a1c2626031d218dc4b16d415efc",
-  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "d6b88ea9447328f4f5e373e77524daa52d5630ecc7035ca67121082e2017a91dc9e3fd7b8230e41f1307137ee7487b0bc0c8a922dda1b77b01f735202486e36f",
-  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "d4a3248f64ab92ea680b3bd5f74c19f15c8f82eb1628e32aeaa058a7fd2efdbba4b5d4e011e453389e42e79cbf00847c79a172ef66d8c9b555feada7a2693772",
-  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "1426c4a182922d16b684cfaff9a2d1cc6ddb06eba6fbe966d8d5a88fc0ed6660f4742c7d90659dc14f9f152132fcbde4afd483b5d0c8aa22eedd1154b0f3c632",
-  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "baa3911178e6462c8d682d3ec182e95fc33f308d5b50662f07108a9a5572d365c97604932887113053fada46949580fabc9ca704822c714160ba8eee0387b286",
-  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "cb7763961f472f201e885753c3daf72231990c65fa5112a76a996f7c5754f2e6688cdc58f1861b05b5f176dae9255e34a860c40b21401318395eb4939759e46a",
-  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "148d28b05c5d50bc4d429f5da3e675b1285387b54c8e5363d7c288b53f2f38688bf9472ac5f2e4ba7fa3c3d7f19bac19738b1815a8973ba29c6bae76990b66f7",
-  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "40ba923597ae297b7be85de1769025578e16af29def72060e7603ec3311fefe537c9608520e771291e934af7e64e3a52d74ccb5ee1f7a657ba2f2a2fcfbf3df7",
-  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "193da09875cf4ce3ea9ef24a141f9235da9095808b157b4dc83ce431f97732f2d19f65d4030771187d1a8424f6843e8a50ac6ba2ab4391271f80680c1166b2d7",
-  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "c376fbbfbe0909844c188f23eec33c937fbf4a1f2fe81418726aa9bab91b44d9411ec98560ed73aaf15fa2082483fb0907a335535449623e3e4a604ee18b7ac3",
-  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "c3011171259f4f4c5c1751e565fd6f0ec203558484234cc438279a26f6fb2ec0d4bbed72ed9bfbc9967e43351fd8e3aa716269b8e670a7c9421ff64a1a9123eb",
-  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "27da30650ec1e6378bc47665a944913839ef95e9af1bc7892f6ad3fd7cd10468d5b4da8caa03f83e3c56e03253cae4034ba1ee64d3ceb19a3656f31d362eaabf",
-  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "ca69e8caeed033c074d9413112264fe1c0bdaaedb4fa9e6f5bcbf3a64ee98fa8261a6b5e54c3d7b7144cf020217c9a89f308086ec64d11d78480bd5885dc2e1a",
-  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "4aabb2e8c80590650bd2b46f205f24e9f345ead68e7b53c20adb219d0c3f030c605d5434f3895fde68ebfa521ea97ea6da974e342e19487086da6a16332860df",
-  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "5b364708ea2985d0e59f235a00e05bf3668704a81e9d32e8929980c84fd0bd67102c2041337b08e266a8bc4883ddf618ac7cb5e1f64614d8f9861cc4e3208905",
-  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "92ff0d27efe168480a14c8d705c0f68624f01251bdc5f8f41bbd6c7ed8ea23effb8481f01eb93270896822397fe2fd78a427c1756ecabc3cb13a746c918b5949",
  "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
  "glob-hasher-darwin-arm64@npm:1.4.2": "1abc74c6f6c6251b8bea6e412090eff4e4918f3489a371971840ee81534344b9f9e62a610efb98157970fc46561161bf23382c8572578da98a7e884d6fb6853e",
  "glob-hasher-darwin-x64@npm:1.4.2": "44110045f0b2e0b3abaf4f70f917a3c57b9b0c6ee56e5d02932e1772cc63a36b066fb3bc1e6a275c40978b3b2d2ad62752e899bcd966930d4df8884b1d554764",
@@ -13,13 +13,13 @@
 let
  nodejs = nodejs_22;
  yarn-berry = yarn-berry_4.override { inherit nodejs; };
-  version = "25.12.0";
+  version = "26.1.0";
  src = fetchFromGitHub {
    name = "actualbudget-actual-source";
    owner = "actualbudget";
    repo = "actual";
    tag = "v${version}";
-    hash = "sha256-hu5Y67vomAJI1IJ1gLAdapRACDW/Q+cOAB+Bo4uQ9+w=";
+    hash = "sha256-WjWmiosDgEj3vTsOIKysR5HrNzkApQppUsdSil4Umbo=";
  };
  translations = fetchFromGitHub {
    name = "actualbudget-translations-source";
@@ -27,8 +27,8 @@ let
    repo = "translations";
    # Note to updaters: this repo is not tagged, so just update this to the Git
    # tip at the time the update is performed.
-    rev = "570f8db9dd436810e014d587b4d27105bce7dfda";
-    hash = "sha256-fVyO4rMgbdI1Hm3J4ka9/72sNcwlfLS6Ef06YUvx4Gs=";
+    rev = "813c3d7cc8feb667c0ea3c25ba13156d75475cfe";
+    hash = "sha256-Qv9FFQCZv6WxYffP1W8Hdw15NDiGhkTeAUbyrOV5wxw=";
  };

 in
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
  missingHashes = ./missing-hashes.json;
  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes;
-    hash = "sha256-Hlc/UMPfZCBbBcmCzmNgDSX+uH8WDEIp/KE9H5jYr2Y=";
+    hash = "sha256-7CxsRmuA53JZJa8IznJKGVvHzE7CeM7XklIZznRqXis=";
  };

  pname = "actual-server";
@@ -144,6 +144,7 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = [
      lib.maintainers.oddlama
      lib.maintainers.patrickdag
+      lib.maintainers.yash-garg
    ];
  };
 })
@@ -33,5 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      NotAShelf
    ];
    platforms = lib.platforms.linux;
+    mainProgram = "anyrun-provider";
  };
 })
@@ -8,6 +8,8 @@
  anytype-heart,
  libsecret,
  electron,
+  go,
+  lsof,
  makeDesktopItem,
  copyDesktopItems,
  commandLineArgs ? "",
@@ -42,6 +44,7 @@ buildNpmPackage (finalAttrs: {

  nativeBuildInputs = [
    pkg-config
+    go
    copyDesktopItems
  ];
  buildInputs = [ libsecret ];
@@ -67,6 +70,7 @@ buildNpmPackage (finalAttrs: {
    done

    npm run build
+    npm run build:nmh

    runHook postBuild
  '';
@@ -97,6 +101,9 @@ buildNpmPackage (finalAttrs: {
      --add-flags $out/lib/anytype/ \
      --add-flags ${lib.escapeShellArg commandLineArgs}

+    wrapProgram $out/lib/anytype/dist/nativeMessagingHost \
+       --prefix PATH : ${lib.makeBinPath [ lsof ]}
+
    runHook postInstall
  '';

@@ -1,152 +0,0 @@
-{
-  "name": "airflow-www",
-  "version": "1.0.0",
-  "description": "Apache Airflow is a platform to programmatically author, schedule and monitor workflows.",
-  "scripts": {
-    "test": "jest",
-    "dev": "NODE_ENV=development webpack --watch --progress --devtool eval-cheap-source-map --mode development",
-    "prod": "NODE_ENV=production node --max_old_space_size=4096 ./node_modules/webpack/bin/webpack.js --mode production --progress",
-    "build": "NODE_ENV=production webpack --progress --mode production",
-    "lint": "eslint --ignore-path=.eslintignore --max-warnings=0 --ext .js,.jsx,.ts,.tsx . && tsc",
-    "lint:fix": "eslint --fix --ignore-path=.eslintignore --ext .js,.jsx,.ts,.tsx . && tsc",
-    "format": "yarn prettier --write .",
-    "generate-api-types": "npx openapi-typescript \"../api_connexion/openapi/v1.yaml\" --output static/js/types/api-generated.ts && node alias-rest-types.js static/js/types/api-generated.ts"
-  },
-  "author": "Apache",
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/apache/airflow.git"
-  },
-  "homepage": "https://airflow.apache.org/",
-  "keywords": [
-    "big",
-    "data",
-    "workflow",
-    "airflow",
-    "d3",
-    "nerds",
-    "database",
-    "flask"
-  ],
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@babel/core": "^7.18.5",
-    "@babel/eslint-parser": "^7.18.2",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/preset-react": "^7.16.0",
-    "@babel/preset-typescript": "^7.17.12",
-    "@testing-library/jest-dom": "^5.16.0",
-    "@testing-library/react": "^13.0.0",
-    "@types/color": "^3.0.3",
-    "@types/react": "^18.0.12",
-    "@types/react-dom": "^18.0.5",
-    "@types/react-syntax-highlighter": "^15.5.6",
-    "@types/react-table": "^7.7.12",
-    "@typescript-eslint/eslint-plugin": "^5.13.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "babel-jest": "^27.3.1",
-    "babel-loader": "^9.1.0",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "5.2.7",
-    "css-minimizer-webpack-plugin": "^4.0.0",
-    "eslint": "^8.6.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-html": "^6.0.2",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsx-a11y": "^6.5.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.30.0",
-    "eslint-plugin-react-hooks": "^4.5.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "file-loader": "^6.0.0",
-    "imports-loader": "^1.1.0",
-    "jest": "^27.3.1",
-    "jest-canvas-mock": "^2.5.1",
-    "mini-css-extract-plugin": "^1.6.2",
-    "moment": "^2.29.4",
-    "moment-locales-webpack-plugin": "^1.2.0",
-    "nock": "^13.2.4",
-    "openapi-typescript": "^5.4.1",
-    "prettier": "^2.8.4",
-    "style-loader": "^1.2.1",
-    "stylelint": "^15.10.1",
-    "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-standard": "^20.0.0",
-    "terser-webpack-plugin": "<5.0.0",
-    "typescript": "^4.6.3",
-    "url-loader": "4.1.0",
-    "web-worker": "^1.2.0",
-    "webpack": "^5.76.0",
-    "webpack-cli": "^4.0.0",
-    "webpack-license-plugin": "^4.2.1",
-    "webpack-manifest-plugin": "^4.0.0"
-  },
-  "dependencies": {
-    "@chakra-ui/react": "2.4.2",
-    "@emotion/cache": "^11.9.3",
-    "@emotion/react": "^11.9.3",
-    "@emotion/styled": "^11",
-    "@visx/group": "^2.10.0",
-    "@visx/shape": "^2.12.2",
-    "axios": "^0.26.0",
-    "bootstrap-3-typeahead": "^4.0.2",
-    "camelcase-keys": "^7.0.0",
-    "chakra-react-select": "^4.0.0",
-    "codemirror": "^5.59.1",
-    "color": "^4.2.3",
-    "d3": "^3.4.4",
-    "d3-selection": "^3.0.0",
-    "d3-shape": "^2.1.0",
-    "d3-tip": "^0.9.1",
-    "dagre-d3": "^0.6.4",
-    "datatables.net": "^1.11.4",
-    "datatables.net-bs": "^1.11.4",
-    "echarts": "^5.4.2",
-    "elkjs": "^0.7.1",
-    "eonasdan-bootstrap-datetimepicker": "^4.17.47",
-    "framer-motion": "^6.0.0",
-    "jquery": ">=3.5.0",
-    "jshint": "^2.13.4",
-    "lodash": "^4.17.21",
-    "moment-timezone": "^0.5.43",
-    "nvd3": "^1.8.6",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "react-icons": "^4.9.0",
-    "react-json-view": "^1.21.3",
-    "react-markdown": "^8.0.4",
-    "react-query": "^3.39.1",
-    "react-router-dom": "^6.3.0",
-    "react-syntax-highlighter": "^15.5.0",
-    "react-table": "^7.8.0",
-    "react-textarea-autosize": "^8.3.4",
-    "reactflow": "^11.7.4",
-    "redoc": "^2.0.0-rc.72",
-    "remark-gfm": "^3.0.1",
-    "swagger-ui-dist": "4.1.3",
-    "tsconfig-paths": "^3.14.2",
-    "type-fest": "^2.17.0",
-    "url-search-params-polyfill": "^8.1.0",
-    "validator": "^13.9.0"
-  },
-  "resolutions": {
-    "d3-color": "^3.1.0"
-  }
-}
@@ -79,7 +79,10 @@
  pytest-asyncio,
  pytestCheckHook,
  time-machine,
-  mkYarnPackage,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  webpack-cli,
  fetchYarnDeps,
  writeScript,

@@ -102,18 +105,22 @@ let
  # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree.
  # This replicates this shell script, fixing bugs in yarn.lock and package.json

-  airflow-frontend = mkYarnPackage rec {
+  airflow-frontend = stdenv.mkDerivation rec {
    name = "airflow-frontend";

    src = "${airflow-src}/airflow/www";
-    packageJSON = ./package.json;

    offlineCache = fetchYarnDeps {
      yarnLock = "${src}/yarn.lock";
      hash = "sha256-WQKuQgNp35fU6z7owequXOSwoUGJDJYcUgkjPDMOops=";
    };

-    distPhase = "true";
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      nodejs
+      webpack-cli
+    ];

    # The webpack license plugin tries to create /licenses when given the
    # original relative path
@@ -121,12 +128,7 @@ let
      sed -i 's!../../../../licenses/LICENSES-ui.txt!licenses/LICENSES-ui.txt!' webpack.config.js
    '';

-    configurePhase = ''
-      cp -r $node_modules node_modules
-    '';
-
-    buildPhase = ''
-      yarn --offline build
+    postBuild = ''
      find package.json yarn.lock static/css static/js -type f | sort | xargs md5sum > static/dist/sum.md5
    '';

@@ -62,6 +62,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
  env = {
    # Used upstream: https://github.com/atuinsh/desktop/blob/6ddebdf66c70042defe5587f7f6c433f889b9ef4/.envrc#L1
    NODE_OPTIONS = "--max-old-space-size=6144";
+
+    # TMP: Fix build failure with GCC 15.
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
  };

  # Otherwise tauri will look for a private key we don't have.
@@ -22,10 +22,10 @@
 }:
 mkDerivation {
  pname = "bruijn";
-  version = "0.1.0.0";
+  version = "0-unstable-2025-12-07";
  src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/c37a9d27b9f654b1e0118d32269a1548800b062b.tar.gz";
-    sha256 = "1a667693agsc559yy4k04gxv1hlsgkn3aw64yvg876fbn5dr7sk3";
+    url = "https://github.com/marvinborner/bruijn/archive/3f329f0299c944205293eceec72be25418fd9f0b.tar.gz";
+    sha256 = "0qx7x50bz0yw0iwg4ymxipzqbh7ki729rbfwxrmijnwbxijlsr01";
  };
  isLibrary = true;
  isExecutable = true;
@@ -10,8 +10,6 @@ let
  generated = haskellPackages.callPackage ./generated.nix { };

  overrides = {
-    version = lib.fileContents ./version.txt;
-
    passthru.updateScript = ./update.sh;

    description = "Purely functional programming language based on lambda calculus and de Bruijn indices";
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils cabal2nix curl jq
+#!nix-shell -i bash -p coreutils cabal2nix curl jq nixfmt gnused

 set -euo pipefail

@@ -9,8 +9,9 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
  < <(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sfL https://api.github.com/repos/marvinborner/bruijn/branches/main \
    | jq -r '.commit | .sha, .commit.committer.date')

+version="0-unstable-$(date -I --date="$committer_date")"
+
 cabal2nix --maintainer defelo "https://github.com/marvinborner/bruijn/archive/${rev}.tar.gz" \
  | nixfmt \
+  | sed -E 's/\bversion = "[^"]+";/version = "'"${version}"'";/' \
  > generated.nix
-
-echo "0-unstable-$(date -I --date="$committer_date")" > version.txt
@@ -1 +0,0 @@
-0-unstable-2025-11-01
@@ -8,13 +8,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "chhoto-url";
-  version = "6.5.3";
+  version = "6.5.4";

  src = fetchFromGitHub {
    owner = "SinTan1729";
    repo = "chhoto-url";
    tag = finalAttrs.version;
-    hash = "sha256-y2bIRVlNOyz97RNfl1VkeR+4njclWM9Yo7NM/bI2J9k=";
+    hash = "sha256-s6jYI/btY7/osdVPyAABckSFFDiCYhBZJJIkuFQklh4=";
  };

  sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
  '';

-  cargoHash = "sha256-/NgHR5Fuby05iXut4hMKDqGVvvWF+NJFFxcRXlp606E=";
+  cargoHash = "sha256-mECYGKWlEP8mNk+qP+my6hcNm68ru7o4jzhb5hM2SKQ=";

  postInstall = ''
    mkdir -p $out/share/chhoto-url
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "debian-devscripts";
-  version = "2.25.33";
+  version = "2.26.1";

  src = fetchFromGitLab {
    domain = "salsa.debian.org";
    owner = "debian";
    repo = "devscripts";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Vn8RiTmMSxqHgP9u4tFJY6xl0RR6MT12+mBQv7W4m1U=";
+    hash = "sha256-aYzFBotRiw2di8T+4LSht+/ECIdkwpHadcfV2depWoU=";
  };

  patches = [
@@ -27,13 +27,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dosbox-x";
-  version = "2025.12.01";
+  version = "2026.01.02";

  src = fetchFromGitHub {
    owner = "joncampbell123";
    repo = "dosbox-x";
    rev = "dosbox-x-v${finalAttrs.version}";
-    hash = "sha256-DD1GE3QUioqCm3A1jYiVuAt17+vlERDYM5T1YS94bQ8=";
+    hash = "sha256-/1DACDf530rzxeLVMLGkB3n6d3d8sN/ci8Q3kHAtZJo=";
  };

  # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants
@@ -22,14 +22,14 @@
 let
  self = python3.pkgs.buildPythonApplication rec {
    pname = "duplicity";
-    version = "3.0.6.3";
+    version = "3.0.7";
    format = "setuptools";

    src = fetchFromGitLab {
      owner = "duplicity";
      repo = "duplicity";
      rev = "rel.${version}";
-      hash = "sha256-WY2pQlWlqdsFGONUBdAoJM1sNr+Hu496pThhn8IKSXE=";
+      hash = "sha256-t2YFp/AuQ9xKZSPmNA/IuQYNOcnPO0l8xhXyLBKSuqA=";
    };

    patches = [
@@ -0,0 +1,27 @@
+From f17afb6b3782445d7484a1f2e07e1d47f1773d3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+Date: Thu, 1 Jan 2026 16:02:30 +0100
+Subject: [PATCH] Fix a crash on an OOB container access
+
+Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
+---
+ src/Controller/Src/Finder/Finder.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/Controller/Src/Finder/Finder.cpp b/src/Controller/Src/Finder/Finder.cpp
+index aa6b853..5e063e8 100755
+--- a/src/Controller/Src/Finder/Finder.cpp
+++ b/src/Controller/Src/Finder/Finder.cpp
+@@ -52,6 +52,9 @@ namespace epsonscan {
+   }
+   SDIDeviceInfo* Finder::GetDevicesPointer()
+   {
+   if (devices_.size() == 0) {
+    return nullptr;
+   }
+    return &devices_[0];
+   }
+   int32_t Finder::GetDevicesCount() const
+-- 
+2.51.2
+
@@ -1,37 +0,0 @@
-diff --git a/thirdparty/zlib/gzlib.c b/thirdparty/zlib/gzlib.c
-index 4105e6a..eae3a38 100644
--- a/thirdparty/zlib/gzlib.c
-+++ b/thirdparty/zlib/gzlib.c
-@@ -3,6 +3,7 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
-+#include <unistd.h>
- #include "gzguts.h"
- 
- #if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
-diff --git a/thirdparty/zlib/gzread.c b/thirdparty/zlib/gzread.c
-index 956b91e..66089b6 100644
--- a/thirdparty/zlib/gzread.c
-+++ b/thirdparty/zlib/gzread.c
-@@ -3,6 +3,7 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
-+#include <unistd.h>
- #include "gzguts.h"
- 
- /* Local functions */
-diff --git a/thirdparty/zlib/gzwrite.c b/thirdparty/zlib/gzwrite.c
-index c7b5651..e685f3e 100644
--- a/thirdparty/zlib/gzwrite.c
-+++ b/thirdparty/zlib/gzwrite.c
-@@ -3,6 +3,7 @@
-  * For conditions of distribution and use, see copyright notice in zlib.h
-  */
- 
-+#include <unistd.h>
- #include "gzguts.h"
- 
- /* Local functions */
- 
@@ -0,0 +1,44 @@
+From aac9755fe41725ccf827d4de745fb1215c32329c Mon Sep 17 00:00:00 2001
+From: Sefa Eyeoglu <contact@scrumplex.net>
+Date: Thu, 1 Jan 2026 16:05:41 +0100
+Subject: [PATCH] Fixes for GCC 15 support
+
+Fixes the following compliation failures:
+
+src/ES2Command/Linux/../Src/Utils/ESAccessor.h:177:17: error: 'const class CESAccessor::CSetterFunc<_ValueType>' has no member named 'func'; did you mean 'm_func'? [-Wtemplate-body]
+src/Controller/./Src/Filter/GrayToMono.hpp:27:37: error: 'pow' was not declared in this scope
+
+Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
+---
+ src/Controller/Src/Filter/GrayToMono.hpp | 1 +
+ src/ES2Command/Src/Utils/ESAccessor.h    | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Controller/Src/Filter/GrayToMono.hpp b/src/Controller/Src/Filter/GrayToMono.hpp
+index 0eec964..c21653f 100755
+--- a/src/Controller/Src/Filter/GrayToMono.hpp
+++ b/src/Controller/Src/Filter/GrayToMono.hpp
+@@ -24,6 +24,7 @@
+ #include "ModelInfo.hpp"
+ #include "Filter.hpp"
+ #include "../FileFormat/FFManager.hpp"
+#include <math.h>
+ #define CONVERT_TO_GAMMA22(x) (255.*pow(((x)/255.) , (1.0/2.2)))
+ namespace epsonscan
+ {
+diff --git a/src/ES2Command/Src/Utils/ESAccessor.h b/src/ES2Command/Src/Utils/ESAccessor.h
+index 700a680..b537ba7 100755
+--- a/src/ES2Command/Src/Utils/ESAccessor.h
+++ b/src/ES2Command/Src/Utils/ESAccessor.h
+@@ -174,7 +174,7 @@ protected:
+   {
+   }
+   CSetterFunc(const CSetterFunc& rhs)
+-   : m_func(rhs.func)
+   : m_func(rhs.m_func)
+   {
+   }
+   virtual ISetterFunc* Clone()
+-- 
+2.51.2
+
@@ -28,20 +28,20 @@ let
  # There can be multiple different packages identified by the same
  #version, so we also tag them with the month and year shown in
  # the Epson download page.
-  version = "6.7.70.0-01-2025";
+  version = "6.7.90.0-2026-01";

  system = stdenv.hostPlatform.system;

  src = fetchzip {
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/70/c7fc14e41ec84255008c6125b63bcac40f55e11c/epsonscan2-6.7.70.0-1.src.tar.gz";
-    hash = "sha256-WvNBy5hAxNJfwgjBR5VGaXuyTCK2YEiD3i7SMDl3U/U=";
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/17/08/06/1babf9876ebb16956420a601b92ee28b57cd7db7/epsonscan2-6.7.80.0-1.src.tar.gz";
+    hash = "sha256-SHNpnVyoFTwLu3drlL8MFKj/NCKy5U0UDqP08f7u1R4=";
  };
  bundle =
    {
      "x86_64-linux" = fetchzip {
        name = "${pname}-bundle";
-        url = "https://download3.ebz.epson.net/dsc/f/03/00/16/14/38/7b1780ace96e2c6033bbb667c7f3ed281e4e9f38/epsonscan2-bundle-6.7.70.0.x86_64.deb.tar.gz";
-        hash = "sha256-fPNNFgW/VU/YG+jjmSvPZ0WsHibsXY1TNp164GxLHKw=";
+        url = "https://download3.ebz.epson.net/dsc/f/03/00/17/08/12/9f3fec0ae80aa5c36f5170377ebcc38c93251e23/epsonscan2-bundle-6.7.80.0.x86_64.deb.tar.gz";
+        hash = "sha256-Smjp2PRcsNN9nP3W++HmKOw85zZj20zEIFEEVSO8lDo=";
      };
    }
    ."${system}" or (throw "Unsupported system: ${system}");
@@ -52,18 +52,17 @@ stdenv.mkDerivation {

  patches = [
    ./build.patch
-    ./gcc14.patch
+    ./gcc15.patch
    (fetchpatch {
-      url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0002-Fix-crash.patch";
-      hash = "sha256-rNsFnHq//CJcIZl0M6RLRkIY3YhnJZbikO8SeeC2ktg=";
+      url = "https://github.com/flathub/net.epson.epsonscan2/raw/f9eb99109e63dbed907f46e36f435e46d7c01aad/patches/0002-Fix-crash.patch";
+      hash = "sha256-Al5DkVnCBNoMtex4G3Zm7uZwTvnWGAjOk5xh/U9WyNU=";
    })
+    # At the time of writing, some flathub patches are not updated to work with 6.7.90.0-1 (2026/01/01)
+    ./xdg-open.patch # Rebase of https://github.com/flathub/net.epson.epsonscan2/blob/master/patches/0003-Use-XDG-open-to-open-the-directory.patch
+    ./fix-oob-container-access.patch # Rebase of https://github.com/flathub/net.epson.epsonscan2/blob/master/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch
    (fetchpatch {
-      url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch";
-      hash = "sha256-WmA8pmPSJ1xUdeBbE8Jzi6w9p96aIOm0erF3T4EQ6VA=";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0003-Use-XDG-open-to-open-the-directory.patch";
-      hash = "sha256-H3lle1SXkkpbBkozYEwiX0z9oTUubTpB+l91utxH03M=";
+      url = "https://github.com/flathub/net.epson.epsonscan2/raw/f9eb99109e63dbed907f46e36f435e46d7c01aad/patches/0005-Added-missing-headers.patch";
+      hash = "sha256-YJjCI8UNzLciSq9IfcHxiF4isFGM9A5Hn7Kxao/+lpQ=";
    })
  ];

@@ -0,0 +1,33 @@
+From fc9afb09c6cb4a92a5249707961e6856226d80bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+Date: Thu, 1 Jan 2026 15:58:59 +0100
+Subject: [PATCH] Use XDG open to open the directory
+
+Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
+---
+ src/Standalone/savedestfolder.cpp | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/Standalone/savedestfolder.cpp b/src/Standalone/savedestfolder.cpp
+index 7480631..51179de 100755
+--- a/src/Standalone/savedestfolder.cpp
+++ b/src/Standalone/savedestfolder.cpp
+@@ -43,7 +43,14 @@ bool SaveDestFolder::open_folder(Supervisor* sv)
+     int cmd_size = 0;
+     const bool result = ES_CMN_FUNCS::PATH::ES_IsExistFile(sv->device_data.SelectPath);
+     if (result) {
+-        if(system("which nautilus > /dev/null") == 0){
+        if(system("which xdg-open > /dev/null") == 0){
+            cmd_size = strlen("xdg-open ");
+            failer = (char *)malloc(cmd_size+1);
+            if(failer){
+               memset(failer, 0, cmd_size+1);
+               memcpy(failer, "xdg-open", cmd_size);
+            }
+        }else if(system("which nautilus > /dev/null") == 0){
+             cmd_size = strlen("nautilus ");
+             failer = (char *)malloc(cmd_size+1);
+             if(failer){
+-- 
+2.51.2
+
@@ -29,19 +29,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "firefoxpwa";
-  version = "2.17.0";
+  version = "2.18.0";

  src = fetchFromGitHub {
    owner = "filips123";
    repo = "PWAsForFirefox";
    rev = "v${version}";
-    hash = "sha256-GKK5PYWSO+rWtuZuHgDQx3V7f8bEX8JHvvFK8sQRli4=";
+    hash = "sha256-F/Sj72er6aNxoV/dR7wCafgAHOKkQ7267/E+vfXdfdw=";
  };

  sourceRoot = "${src.name}/native";
  buildFeatures = [ "immutable-runtime" ];

-  cargoHash = "sha256-aV6Wvv+GzPLsWtdsS3ki82ju1Fh4IgFnIOF4OTEV7uQ=";
+  cargoHash = "sha256-PnqfYZO454t9XCzc9dwNCe4Qcp0FrG82sQcHUNdEnoo=";

  preConfigure = ''
    sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "flake-checker";
-  version = "0.2.10";
+  version = "0.2.11";

  src = fetchFromGitHub {
    owner = "DeterminateSystems";
    repo = "flake-checker";
    rev = "v${version}";
-    hash = "sha256-/hwcRsaVdLvjKnCjFzy4T/zdvWjWAMBtfgJX/cNpmOc=";
+    hash = "sha256-0ftHzqFpFkKZKByWJ49/YySrXBU4lCxvcpbTuMY8ZXs=";
  };

-  cargoHash = "sha256-5pK0l84L4cEhw5d8n8j6JWEXEbsmWHmHJxB5ZMrnAU0=";
+  cargoHash = "sha256-5zzSLk5QT3X6rdGEPHPelXFd5nOxNtlbqDHwV7fFDKY=";

  meta = {
    description = "Health checks for your Nix flakes";
@@ -14,15 +14,15 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "foomatic-db";
-  version = "0-unstable-2024-12-05";
+  version = "0-unstable-2025-11-22";

  src = fetchFromGitHub {
    # there is also a daily snapshot at the `downloadPage`,
    # but it gets deleted quickly and would provoke 404 errors
    owner = "OpenPrinting";
    repo = "foomatic-db";
-    rev = "9a7a08318598fea569cf073489709899c9af6143";
-    hash = "sha256-7vvJPhUa4oDe101Iv897LoChNIcdTa4LviLUndHxWtw=";
+    rev = "d4774d0c39bcdf970ccb335452f48d9241ec1f71";
+    hash = "sha256-r2Lb7qUoaBI1c/RVOvTuue8UkFnUbUKfBjB93qaC1pQ=";
  };

  buildInputs = [
@@ -8,7 +8,7 @@

 let
  pname = "gallery-dl";
-  version = "1.31.0";
+  version = "1.31.2";
 in
 python3Packages.buildPythonApplication {
  inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
    owner = "mikf";
    repo = "gallery-dl";
    tag = "v${version}";
-    hash = "sha256-XxsMm6IhtZdmp//2jYXna24UKn13opf1pOla0C5la2E=";
+    hash = "sha256-cKgfIJFSlUmZa3ovInI98Yw29QurXNAy7J1dUSPAUfQ=";
  };

  build-system = [ python3Packages.setuptools ];
@@ -40,9 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = {
-    description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries";
+    description = "Powerful image editor, especially suitable for creating icons, cursors, animations and icon libraries";
    homepage = "https://greenfishsoftware.org/gfie.php";
-    license = with lib.licenses; [ gpl3 ];
+    license = with lib.licenses; [ unfree ];
    maintainers = with lib.maintainers; [ pluiedev ];
    platforms = [ "x86_64-linux" ];
    mainProgram = "gfie";
@@ -11,13 +11,13 @@

 buildNpmPackage rec {
  pname = "ghostfolio";
-  version = "2.225.0";
+  version = "2.228.0";

  src = fetchFromGitHub {
    owner = "ghostfolio";
    repo = "ghostfolio";
    tag = version;
-    hash = "sha256-nzXQfi4N7t/tm5Zub29AIYKgBYzZN8k/fPLqRK3PKwM=";
+    hash = "sha256-/SCZ/dv/yVA+0meDLO70hcjOLIdk2MA+Qjd5WbuU0nM=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
    '';
  };

-  npmDepsHash = "sha256-TADFJd6kWmEsXi9+04OAGlhR2rX+++K5OraaQatLSho=";
+  npmDepsHash = "sha256-IEE6HPWqzes+LiQlSr8OaGjVkKoetASCK2SRchFnnVE=";

  nativeBuildInputs = [
    prisma_6
@@ -17,6 +17,7 @@
  libical,
  libsoup_3,
  glib,
+  glib-networking,
  gsettings-desktop-schemas,
  libadwaita,
 }:
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
    libical
    libsoup_3
    glib
+    glib-networking
    libgweather
    geoclue2
    gsettings-desktop-schemas
@@ -32,7 +32,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-online-accounts";
-  version = "3.56.2";
+  version = "3.56.3";

  outputs = [
    "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zojfZUV/DmOg2Nr/EzIuKey1hBl6GH9Io6Ib4vzRyCQ=";
+    hash = "sha256-OFlvF+Amn3fhYjpr95VpVzx733t82GP7R4p4rmZN6jA=";
  };

  mesonFlags = [
@@ -23,11 +23,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-sudoku";
-  version = "49.2";
+  version = "49.3";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
-    hash = "sha256-ymcPrHPZ5cPngz/aNVZxC0Ig22Qz577FCnEFYNp9uEA=";
+    hash = "sha256-ybVGyN/pcWHfXVD1U4GCp0FTYmy8NoBbB4FSjvM7xZU=";
  };

  nativeBuildInputs = [
@@ -30,11 +30,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-terminal";
-  version = "3.58.0";
+  version = "3.58.1";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-B+vHrxNRa+Wzd3f1INJkCzMSBiDpm7sF3upfgoD9ac4=";
+    hash = "sha256-HfuutVpxz8NqIaoe5KDUWcP96Ls9ZbCfvKaVx/3fvro=";
  };

  nativeBuildInputs = [
@@ -47,7 +47,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "gucharmap";
-  version = "17.0.0";
+  version = "17.0.1";

  outputs = [
    "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "GNOME";
    repo = "gucharmap";
    rev = finalAttrs.version;
-    hash = "sha256-BYplW+gVTgWdXYW+h2g4xwxmFSl+WoygZfw8dug4qkw=";
+    hash = "sha256-86+D+WYIezo7ZXaKTWybinP9Q10Auy63+3VlescymC0=";
  };

  strictDeps = true;
@@ -13,13 +13,13 @@

 let
  # Use unstable because it has improvements for finding python
-  version = "0.12-unstable-2025-12-27";
+  version = "0.12-unstable-2026-01-01";

  src = fetchFromGitHub {
    owner = "FPGAwars";
    repo = "icestudio";
-    rev = "fbc1e0378be4911289e3ba32db4b303e40acf954";
-    hash = "sha256-ddMo+XdDbikWO3m+VsaYgQC8dtR7j4FjiDtDisptN78=";
+    rev = "85719eecf39bd7dd0800fdcb10891350c7c88279";
+    hash = "sha256-d63HPoCEgC4Ft+seWIi8rCuXckJVfe4mzxUCbEqMiDw=";
  };

  collection = fetchurl {
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "influxdb-cxx";
-  version = "0.8.0";
+  version = "0.8.1";

  src = fetchFromGitHub {
    owner = "offa";
    repo = "influxdb-cxx";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-bP3Mfsv+20BfYiNdGFeNKHYdqGJSryrd7MWfqXjGnZw=";
+    hash = "sha256-5y9yRc69IH94Lmokp+XzXehQYkfj/vr3qnNmjTMylsg=";
  };

  nativeBuildInputs = [ cmake ];
@@ -72,6 +72,7 @@ stdenv.mkDerivation {

  meta = {
    description = "Key remapping daemon for Linux";
+    homepage = "https://github.com/rvaiya/keyd";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ alfarel ];
    platforms = lib.platforms.linux;
@@ -8,11 +8,6 @@
    "poster"
    "text"
    "title"
-    "komikahuna"
-    "komikandy"
-    "komikazba"
-    "komikaze"
-    "komikazoom"
  ],
 }:

@@ -57,26 +52,6 @@ let
        "Referer: https://www.1001freefonts.com/komika-title.font"
      ];
    };
-    "komikahuna" = {
-      url = "https://www.1001fonts.com/download/komikahuna.zip";
-      hash = "sha256-TjGxQA3ZyIOyJUNP+MVkYiSDk9WDIDPy3d2ttWC1aoc=";
-    };
-    "komikandy" = {
-      url = "https://www.1001fonts.com/download/komikandy.zip";
-      hash = "sha256-NqpR+gM2giTHGUBYoJlO8vkzOD0ep7LzAry3nIagjLY=";
-    };
-    "komikazba" = {
-      url = "https://www.1001fonts.com/download/komikazba.zip";
-      hash = "sha256-SGJMP0OdZ/AEImN5S3QshCbWSLXO4qTjHnSQYqoy3Pc=";
-    };
-    "komikaze" = {
-      url = "https://www.1001fonts.com/download/komikaze.zip";
-      hash = "sha256-daJRwgkzL5v224KwkaGMK2FqVnfin8+8WvMTvXTkCGE=";
-    };
-    "komikazoom" = {
-      url = "https://www.1001fonts.com/download/komikazoom.zip";
-      hash = "sha256-/o2QPPPiQBkNU0XRxJyI0+5CKFEv4FKU3A5ku1zyVX4=";
-    };

  };
  knownFonts = lib.attrNames fontMap;
@@ -95,20 +70,18 @@ let
 in
 stdenvNoCC.mkDerivation {
  pname = "komika-fonts";
-  version = "0-unstable-2024-08-12";
+  version = "0-unstable-2001-06-16";
  sourceRoot = ".";

  srcs = map (variant: fetchFont fontMap.${variant}) selectedFonts;
  installPhase = ''
    runHook preInstall
-    mkdir -p $out/share/fonts/ttf
-    mv **/*.ttf $out/share/fonts/ttf
+    install -Dm444 **/*.ttf -t $out/share/fonts/ttf
    runHook postInstall
  '';

  meta = {
-    homepage = "https://moorstation.org/typoasis/designers/lab/index.htm";
-    # description from archive here: http://web.archive.org/web/20030422173903fw_/http://www.hardcovermedia.com/lab/Pages/Fontpages/komikahands.html
+    homepage = "https://pedroreina.net/apostrophiclab/";
    description = "First ever comic lettering super family";
    longDescription = ''
      50 fonts, covering everything the comic artist needs when it comes to lettering. 10 text faces, 10 display faces, 10 tiling faces, 10 hand variations, 9 poster faces, and 20 balloons in a font.
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikahuna";
+  version = "0-unstable-2000-10-14";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikahuna.zip";
+    hash = "sha256-TjGxQA3ZyIOyJUNP+MVkYiSDk9WDIDPy3d2ttWC1aoc=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0049-Komikahuna/komikahuna.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikandy";
+  version = "0-unstable-2001-05-12";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikandy.zip";
+    hash = "sha256-NqpR+gM2giTHGUBYoJlO8vkzOD0ep7LzAry3nIagjLY=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0122-Komikandy/komikandy.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikazba";
+  version = "0-unstable-2000-10-30";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikazba.zip";
+    hash = "sha256-SGJMP0OdZ/AEImN5S3QshCbWSLXO4qTjHnSQYqoy3Pc=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0052-Komikazba/komikazba.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikaze";
+  version = "0-unstable-2000-09-23";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikaze.zip";
+    hash = "sha256-daJRwgkzL5v224KwkaGMK2FqVnfin8+8WvMTvXTkCGE=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0045-Komikaze/komikaze.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -0,0 +1,29 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "komikazoom";
+  version = "0-unstable-2000-09-29";
+
+  src = fetchzip {
+    url = "https://www.1001fonts.com/download/komikazoom.zip";
+    hash = "sha256-/o2QPPPiQBkNU0XRxJyI0+5CKFEv4FKU3A5ku1zyVX4=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 *.ttf -t $out/share/fonts/ttf
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://pedroreina.net/apostrophiclab/0046-Komikazoom/komikazoom.html";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ pancaek ];
+    platforms = lib.platforms.all;
+  };
+}
@@ -1,12 +0,0 @@
-diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
-index 385858d174..bbc87d9f1e 100644
--- a/lasso/xml/tools.c
-+++ b/lasso/xml/tools.c
-@@ -47,6 +47,7 @@
- #include <libxml/xmlIO.h>
- 
- #include <openssl/evp.h>
-+#include <openssl/pem.h>
- 
- #include <xmlsec/base64.h>
- #include <xmlsec/crypto.h>
@@ -1,53 +0,0 @@
-From 1bf9184e1208e805f70ccb8ba06b4c3d63a1a04a Mon Sep 17 00:00:00 2001
-From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
-Date: Wed, 24 Jan 2024 15:15:39 +0100
-Subject: [PATCH] misc: adjust to structured error callback argument change in
- libxml2 2.12 (#86080)
-
---
- lasso/lasso.c     | 8 +++++++-
- lasso/xml/tools.c | 9 ++++++++-
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/lasso/lasso.c b/lasso/lasso.c
-index 9902512f..7ea5df44 100644
--- a/lasso/lasso.c
-+++ b/lasso/lasso.c
-@@ -138,7 +138,13 @@ DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
- #include "types.c"
- 
- static void
-lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data, xmlErrorPtr error)
-+lasso_xml_structured_error_func(G_GNUC_UNUSED void *user_data,
-+#if LIBXML_VERSION >= 21200
-+                                        const xmlError *error
-+#else
-+                                        xmlErrorPtr error
-+#endif
-+				)
- {
- 	g_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: %s", error->message);
- }
-diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
-index 385858d1..014f4040 100644
--- a/lasso/xml/tools.c
-+++ b/lasso/xml/tools.c
-@@ -1449,7 +1449,14 @@ lasso_concat_url_query(const char *url, const char *query)
- 	}
- }
- 
-static void structuredErrorFunc (void *userData, xmlErrorPtr error) {
-+static void structuredErrorFunc (void *userData,
-+#if LIBXML_VERSION >= 21200
-+                                        const xmlError *error
-+#else
-+                                        xmlErrorPtr error
-+#endif
-+				 )
-+{
- 		*(int*)userData = error->code;
- }
- 
-- 
-2.49.0
-
@@ -2,8 +2,8 @@
  lib,
  stdenv,
  autoreconfHook,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitea,
+  writeShellScript,
  glib,
  gobject-introspection,
  gtk-doc,
@@ -19,31 +19,25 @@

 stdenv.mkDerivation rec {
  pname = "lasso";
-  version = "2.8.2";
+  version = "2.9.0";

-  src = fetchurl {
-    url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz";
-    hash = "sha256-ahgxv9v49CTHUIq6R7BF1RNB7A/ekSLziwuGsJbvUz4=";
+  src = fetchFromGitea {
+    domain = "git.entrouvert.org";
+    owner = "entrouvert";
+    repo = "lasso";
+    rev = "v${version}";
+    hash = "sha256-fDMM9DJBzxz6DX4cNK3DEE28FBT8gCF9C9DQfUNNFaY=";
  };

-  patches = [
-    # Fix build with xmlsec 1.3.0
-    (fetchpatch {
-      url = "https://git.entrouvert.org/entrouvert/lasso/commit/ffaddeb015a61db3e52c391de00430107a23e2f1.patch";
-      hash = "sha256-D2npxpIuR/KrNYiKO3KXCvHEb/XVXUKIP0HQUd+w56k=";
-    })
-    # Fix GCC 14 implicit declaration of function
-    # backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/9767cdf7645a146bcc596a705ce32b855855a590
-    ./fix-gcc14-implicit-function-declaration.diff
-    # Fix GCC 14 incompatible pointer
-    # backported patch of https://git.entrouvert.org/entrouvert/lasso/commit/cbe2c45455d93ed793dc4be59e3d2d26f1bd1111
-    ./fix-gcc14-incompatible-pointer.diff
-    # Fix GCC 14 int-conversion (xmlsec)
-    (fetchpatch {
-      url = "https://git.entrouvert.org/entrouvert/lasso/commit/66c9f50f1f6b00d621a9a0ca2f924875f94d14ae.patch";
-      hash = "sha256-UkWxznKx2xAbjY29+NQ+cjIDhWLuyoWsmBTSiLUxWgU=";
-    })
-  ];
+  postPatch =
+    let
+      printVersion = writeShellScript "print-version" ''
+        echo -n ${lib.escapeShellArg version}
+      '';
+    in
+    ''
+      cp ${printVersion} tools/git-version-gen
+    '';

  nativeBuildInputs = [
    autoreconfHook
@@ -73,7 +67,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://lasso.entrouvert.org/";
    description = "Liberty Alliance Single Sign-On library";
-    changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/ChangeLog";
+    changelog = "https://git.entrouvert.org/entrouvert/lasso/raw/tag/v${version}/NEWS";
    license = lib.licenses.gpl2Plus;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ womfoo ];
@@ -24,7 +24,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libshumate";
-  version = "1.5.1";
+  version = "1.5.2";

  outputs = [
    "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-2q34twATQ4jH6TPgtiNYaqp/L76LOmJZOHUTMDuYduY=";
+    hash = "sha256-ppVlwetd2ezTkmi78UNeqlGlsCjtDGUqC2uTZ+BMk4Y=";
  };

  patches = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
  patches = [
    (fetchpatch {
      url = "https://github.com/lakinduakash/linux-wifi-hotspot/commit/a3fce4b3ee9371eeb7b300fa7e9f291d93986db3.patch";
-      hash = "sha256-tvWoYvQELYVq1Cr6NG+9kafYFHZloNMuOvaPeIbYlSI=";
+      hash = "sha256-4xQ3iRUlkNpoxHXABhMIgsoDY9nENN/9FtHD3UMyAhc=";
    })
  ];

@@ -25,17 +25,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "loupe";
-  version = "49.1";
+  version = "49.2";

  src = fetchurl {
    url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MAmLyXmhyHouyye0patyWr+QC9cQu5wrzAyULVFcUcU=";
+    hash = "sha256-WFPnXM66f6K+oBvic80vCjBhlB573+OgCLIzFxBnFCw=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
    name = "loupe-deps-${finalAttrs.version}";
-    hash = "sha256-GqPHvUBA5aRUnRSP+PpdOCC9sL8axnEdfqtHFp2KYJc=";
+    hash = "sha256-9jEz6hcdFUv5Daeh/0co1hHt49bE9kFAbFvnyiEaGJg=";
  };

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

  passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        # Ignore subcrate releases (fox, aqua-registry)
+        "--version-regex=^v([0-9]+\\.[0-9]+\\.[0-9])$"
+      ];
+    };
    tests = {
      version = (testers.testVersion { package = mise; }).overrideAttrs (old: {
        nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ];
@@ -20,13 +20,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "noto-fonts${suffix}";
-  version = "2025.12.01";
+  version = "2026.01.01";

  src = fetchFromGitHub {
    owner = "notofonts";
    repo = "notofonts.github.io";
    rev = "noto-monthly-release-${version}";
-    hash = "sha256-XYamBsakiqfpwghuQan81ZNJTvcfua9hIbVXU4HWOqY=";
+    hash = "sha256-CePEUiNyXm0UXo0wJ5CGMkJBNIhdTrEeuIu/8E7uPOc=";
  };

  outputs = [
@@ -20,6 +20,9 @@ rustPlatform.buildRustPackage (finalAttrs: {

  cargoHash = "sha256-7c1LryJvrOsSiLPYNvGIFaTONhA0c99n918/yNRKkxo=";

+  # Tests use mockito which needs to bind to localhost
+  __darwinAllowLocalNetworking = true;
+
  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgramArg = "--version";
@@ -6,7 +6,7 @@
  makeDesktopItem,
  copyDesktopItems,
  desktopToDarwinBundle,
-  wrapQtAppsHook,
+  qt5,
 }:

 python3Packages.buildPythonApplication rec {
@@ -17,13 +17,17 @@ python3Packages.buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "FreeOpcUa";
    repo = "opcua-client-gui";
-    rev = version;
+    tag = version;
    hash = "sha256-0BH1Txr3z4a7iFcsfnovmBUreXMvIX2zpZa8QivQVx8=";
  };

+  buildInputs = [
+    qt5.qtwayland
+  ];
+
  nativeBuildInputs = [
    copyDesktopItems
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];

@@ -39,9 +43,6 @@ python3Packages.buildPythonApplication rec {
    pyqtgraph
  ];

-  #This test uses a deprecated libarby, when updating the package check if the test was updated as well
-  doCheck = false;
-
  desktopItems = [
    (makeDesktopItem {
      name = "opcua-client";
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "oxlint";
-  version = "1.12.0";
+  version = "1.35.0";

  src = fetchFromGitHub {
    owner = "oxc-project";
    repo = "oxc";
    tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-HH98Q4mvCrylnRmvmfqKksF3ECT3rkoT93bSTqV4xOY=";
+    hash = "sha256-WHSdT4IMl/TUnMJycL3sYfA8aVLtag54dOYSXrDuN9g=";
  };

-  cargoHash = "sha256-lAEAOB6JkIkwckhwXU2/fRMkGOkEZnNtiyx/Xm+0JKc=";
+  cargoHash = "sha256-OTxSxDjNDN8MZV7hVg914xQDl199+yjAMukN9jTmQsU=";

  nativeBuildInputs = [ cmake ];
  buildInputs = [
@@ -37,7 +37,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=^oxlint_v([0-9.]+)$" ];
+  };

  meta = {
    description = "Collection of JavaScript tools written in Rust";
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pageedit";
-  version = "2.6.2";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "Sigil-Ebook";
    repo = "pageedit";
    tag = finalAttrs.version;
-    hash = "sha256-9+kWfyOfwbWh41cTXpP0raCY/dblQZP0PWFzGV+f4dY=";
+    hash = "sha256-oC4OMYTFXIoLCstAalyJb4ppstmSTiE+mdmqhOY6FUU=";
  };

  nativeBuildInputs = with qt6Packages; [
@@ -41,7 +41,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "papers";
-  version = "49.2";
+  version = "49.3";

  outputs = [
    "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {

  src = fetchurl {
    url = "mirror://gnome/sources/papers/${lib.versions.major finalAttrs.version}/papers-${finalAttrs.version}.tar.xz";
-    hash = "sha256-SanKL2LFWY+ObKTmfIf09ZxewN5wTTspnVFkyR0fakE=";
+    hash = "sha256-dpddnR/S+Iw2j+yMMfDlb6ndk6G46F+s6qQDxZpVqpA=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
    sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk=";
  };

+  # Since C23, coercing functions with different parameter lists to a function pointer with no
+  # parameter specified triggers a hard error: `symbol.c:92:22: error: initialization of
+  # 'int (*)(void)' from incompatible pointer type 'int (*)(double)' [-Wincompatible-pointer-types]`
+  env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+
  makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ];
  nativeBuildInputs = [
    bison
@@ -1,8 +1,8 @@
 {
  lib,
-  stdenv,
+  stdenv_32bit,
  makeWrapper,
-  fetchurl,
+  fetchFromGitHub,
  cabextract,
  gettext,
  gnupg,
@@ -33,7 +33,7 @@
 }:

 let
-  version = "4.4";
+  stdenv = stdenv_32bit;

  binpath = lib.makeBinPath [
    cabextract
@@ -80,13 +80,15 @@ let
  );

 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "playonlinux";
-  inherit version;
+  version = "4.4-unstable-2025-11-07";

-  src = fetchurl {
-    url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "0n40927c8cnjackfns68zwl7h4d7dvhf7cyqdkazzwwx4k2xxvma";
+  src = fetchFromGitHub {
+    owner = "PlayOnLinux";
+    repo = "POL-POM-4";
+    rev = "a91f598837b3d77ead6f418ec300fd4d284fdfa4";
+    hash = "sha256-rFZ1+30aOgNH4G+i08lfy7dCoYmN7VFlG48zxHpXOQQ=";
  };

  patches = [
@@ -173,4 +175,4 @@ stdenv.mkDerivation {
    ];
    mainProgram = "playonlinux";
  };
-}
+})
@@ -72,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
  patches = [
    # podman should be installed with nix; disable auto-installation
    ./extension-no-download-podman.patch
+    ./system-defaults-dir.patch
  ];

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
@@ -0,0 +1,10 @@
+diff --git a/packages/main/src/plugin/managed-by-constants.ts b/packages/main/src/plugin/managed-by-constants.ts
+index 5a20d2de29e..9fea8a17165 100644
+--- a/packages/main/src/plugin/managed-by-constants.ts
+++ b/packages/main/src/plugin/managed-by-constants.ts
+@@ -29,4 +29,4 @@ export const SYSTEM_LOCKED_FILENAME = 'locked.json';
+ // Folders for managed defaults on different platforms
+ export const SYSTEM_DEFAULTS_FOLDER_MACOS = '/Library/Application Support/io.podman_desktop.PodmanDesktop';
+ export const SYSTEM_DEFAULTS_FOLDER_WINDOWS = 'Podman Desktop';
+-export const SYSTEM_DEFAULTS_FOLDER_LINUX = '/usr/share/podman-desktop';
+export const SYSTEM_DEFAULTS_FOLDER_LINUX = '/etc/podman-desktop';
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
  pname = "postmoogle";
-  version = "0.9.27";
+  version = "0.9.28";

  src = fetchFromGitHub {
    owner = "etkecc";
    repo = "postmoogle";
    tag = "v${version}";
-    hash = "sha256-bifAuysOdkXnXRMYQv8pktY0NK5zUXovJJvinjsbPXQ=";
+    hash = "sha256-Vov/s2HTN/kJgwZ2AxbeWrVllcGxr6WI1EI24ea3Nl8=";
  };

  tags = [
@@ -5,39 +5,35 @@
  cmake,
  cmark,
  extra-cmake-modules,
-  fetchpatch2,
  gamemode,
-  ghc_filesystem,
  jdk17,
  kdePackages,
+  libarchive,
  ninja,
  nix-update-script,
+  qrencode,
  stripJavaArchivesHook,
  tomlplusplus,
  zlib,
  msaClientID ? null,
-  gamemodeSupport ? stdenv.hostPlatform.isLinux,
 }:
 let
  libnbtplusplus = fetchFromGitHub {
    owner = "PrismLauncher";
    repo = "libnbtplusplus";
-    rev = "23b955121b8217c1c348a9ed2483167a6f3ff4ad";
-    hash = "sha256-yy0q+bky80LtK1GWzz7qpM+aAGrOqLuewbid8WT1ilk=";
+    rev = "531449ba1c930c98e0bcf5d332b237a8566f9d78";
+    hash = "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=";
  };
 in
-assert lib.assertMsg (
-  gamemodeSupport -> stdenv.hostPlatform.isLinux
-) "gamemodeSupport is only available on Linux.";
 stdenv.mkDerivation (finalAttrs: {
  pname = "prismlauncher-unwrapped";
-  version = "9.4";
+  version = "10.0.0";

  src = fetchFromGitHub {
    owner = "PrismLauncher";
    repo = "PrismLauncher";
    tag = finalAttrs.version;
-    hash = "sha256-q8ln54nepwbJhC212vGODaafsbOCtdXar7F2NacKWO4=";
+    hash = "sha256-s3gMalc98lo8T+RZDZRO6AtV0Wf54wHo0/vmAss3dQE=";
  };

  postUnpack = ''
@@ -45,16 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
    ln -s ${libnbtplusplus} source/libraries/libnbtplusplus
  '';

-  patches = [
-    # https://github.com/PrismLauncher/PrismLauncher/pull/3622
-    # https://github.com/NixOS/nixpkgs/issues/400119
-    (fetchpatch2 {
-      name = "fix-qt6.9-compatibility.patch";
-      url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff";
-      hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
    ninja
@@ -65,14 +51,14 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    cmark
-    ghc_filesystem
    kdePackages.qtbase
    kdePackages.qtnetworkauth
-    kdePackages.quazip
+    libarchive
+    qrencode
    tomlplusplus
    zlib
  ]
-  ++ lib.optional gamemodeSupport gamemode;
+  ++ lib.optional stdenv.hostPlatform.isLinux gamemode;

  cmakeFlags = [
    # downstream branding
@@ -81,9 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optionals (msaClientID != null) [
    (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
  ]
-  ++ lib.optionals (lib.versionOlder kdePackages.qtbase.version "6") [
-    (lib.cmakeFeature "Launcher_QT_VERSION_MAJOR" "5")
-  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # we wrap our binary manually
    (lib.cmakeFeature "INSTALL_BUNDLE" "nodeps")
@@ -51,7 +51,7 @@ assert lib.assertMsg (
 ) "textToSpeechSupport only has an effect on Linux.";

 let
-  prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
+  prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID; };
 in

 symlinkJoin {
@@ -67,9 +67,7 @@ symlinkJoin {
    kdePackages.qtimageformats
    kdePackages.qtsvg
  ]
-  ++ lib.optional (
-    lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.hostPlatform.isLinux
-  ) kdePackages.qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux kdePackages.qtwayland;

  postBuild = ''
    wrapQtAppsHook
@@ -16,13 +16,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "renovate";
-  version = "42.57.1";
+  version = "42.71.0";

  src = fetchFromGitHub {
    owner = "renovatebot";
    repo = "renovate";
    tag = finalAttrs.version;
-    hash = "sha256-IMUnOk4D0CDKgrkM9geyaj80Pir6pORlWUPW2UIoKOM=";
+    hash = "sha256-35kAAvtK1wrd4ydsuinhFHxLDOwY3OzuXQxcxY9uKXE=";
  };

  postPatch = ''
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_10;
    fetcherVersion = 2;
-    hash = "sha256-WTShVxWhdAPbITBaSw6BrqSwSJ9pc2imB+ovjhTT6qY=";
+    hash = "sha256-ryAmVtU3bZEmgIAowQQJyK963zKiS31gC3lR0f+q2tc=";
  };

  env.COREPACK_ENABLE_STRICT = 0;
@@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shader-slang";
-  version = "2025.24.2";
+  version = "2025.24.3";

  src = fetchFromGitHub {
    owner = "shader-slang";
    repo = "slang";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-GBiGeVboAO4XqnO7ZIWCUjsb3M/+MEtIxausOs3unyQ=";
+    hash = "sha256-bLD7EOebKx3lbmJUBBUQEOWArNRjmdsKUwXV7taQHQA=";
    fetchSubmodules = true;
  };

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

 buildGoModule (finalAttrs: {
  pname = "spire";
-  version = "1.13.3";
+  version = "1.14.0";

  outputs = [
    "out"
@@ -20,12 +20,12 @@ buildGoModule (finalAttrs: {
    owner = "spiffe";
    repo = "spire";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-Qph36DNnhZbO+bn1WnvBkWOWeCSusC0vrvZV1G32kFw=";
+    sha256 = "sha256-I5fNjOuij8A60pEPoq+iSfC5oGrTu4DizCd6OnLtJ2I=";
  };

  # Needed for github.co/google/go-tpm-tools/simulator  which contains non-go files that `go mod vendor` strips
  proxyVendor = true;
-  vendorHash = "sha256-hkUA9L4lTSv7s/HtD1XOf07Hhk7ob2n/GCS+LnOSasI=";
+  vendorHash = "sha256-trWUhYibzfUCyUSL6LfC+ERrrxspdcEYuBauq539GRM=";

  buildInputs = [ openssl ];

@@ -10,14 +10,18 @@
  prefetch-npm-deps,
  rsync,
  stdenv,
+  nodejs_22,
 }:
 let
  electron = electron_37;
+  nodejs = nodejs_22;
 in
 buildNpmPackage rec {
  pname = "super-productivity";
  version = "16.7.3";

+  inherit nodejs;
+
  src = fetchFromGitHub {
    owner = "johannesjo";
    repo = "super-productivity";
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (

 stdenv.mkDerivation (finalAttrs: {
  pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke50";
+  version = "0.11.1-etke51";

  src = fetchFromGitHub {
    owner = "etkecc";
    repo = "synapse-admin";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-460Ma0R1WG9BGB2NgHD7yIz+alcywtuhyHZXH4DPxDA=";
+    hash = "sha256-bKfWQ/lz8ms6xNUsZaNUNNhq/mNy4P7bk8dnd7dXiJ8=";
  };

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-qpzrOfBInKHFH/uUViLCSIkjc41XUaHOyTs5oejt5NY=";
+    hash = "sha256-TmZ/DoNXEa+o6uVZoXybt0JFoo3hpiiLHoUwbrNdpag=";
  };

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

 stdenv.mkDerivation {
  pname = "systemdgenie";
-  version = "0.99.0-unstable-2025-10-11";
+  version = "0.99.0-unstable-2026-01-02";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    repo = "SystemdGenie";
    owner = "system";
-    rev = "dcfd937a711fb124da6c717c51334dbbb430e48e";
-    hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE=";
+    rev = "c007f1dad545626c4b405538a281e41278b34762";
+    hash = "sha256-/D5F10U4cb5oEIMuS2OFtw93FG4W+FVmHYlzDsPQz6w=";
  };

  strictDeps = true;
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "tail-tray";
-  version = "0.2.27";
+  version = "0.2.28";

  src = fetchFromGitHub {
    owner = "SneWs";
    repo = "tail-tray";
    tag = "v${version}";
-    hash = "sha256-/T7t8I1cfhNmTW277X8lz68qsp2KIDJPxAgUibh6O+w=";
+    hash = "sha256-UhJyrlY9S3CRK3TgFf7nUGF6drj4Zx/yirZ0z4jpqtE=";
  };

  nativeBuildInputs = with kdePackages; [
@@ -24,7 +24,7 @@

 buildGoModule (finalAttrs: {
  pname = "tailscale";
-  version = "1.92.3";
+  version = "1.92.4";

  outputs = [
    "out"
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
    owner = "tailscale";
    repo = "tailscale";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6dE3kgYABAVtrAjGWnWZ3X4Aq7yJagxNEk6BSyIC3Yk=";
+    hash = "sha256-IMRFye4P3D3TKlZfBPnwh7NmrfU5EDBVmyaD9aIuQLg=";
  };

  vendorHash = "sha256-jJSSXMyUqcJoZuqfSlBsKDQezyqS+jDkRglMMjG1K8g=";
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchpatch,
  cmake,
  libuuid,
  gnutls,
@@ -22,6 +23,15 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/GothenburgBitFactory/libshared/commit/bde76fb717c8e56e5859472ba1e890abc5b94e63.patch";
+      sha256 = "sha256-6esIya9VATtDbL3jOpXZtvMoIJ8ztznqUju4d4lE49w=";
+      stripLen = 1;
+      extraPrefix = "src/libshared/";
+    })
+  ];
+
  postPatch = ''
    substituteInPlace src/commands/CmdNews.cpp \
      --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"
@@ -38,7 +38,7 @@ in

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

  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 = "89e7366783e13d63085878ba407da83107ccd401";
-    hash = "sha256-7w/PDv58o2U23gOLqFV9TFfCejud4xcjdflX3gkRDUE=";
+    rev = "0da5c72f8365fb4857096e716d53175ddbdf5a15";
+    hash = "sha256-0bVBz0Wi7kfbU8w4jA/7qyYE1K1oV2UZTnSfdHGFiIo=";
  };

  buildInputs = [
@@ -20,14 +20,14 @@

 stdenv.mkDerivation rec {
  pname = "tev";
-  version = "2.6.3";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "Tom94";
    repo = "tev";
    tag = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-2jUUipT6xE/8qxWaMsUmrEf2qmDcE93vp2nME01B34A=";
+    hash = "sha256-R7nzzYP7yA7bYQ6WLRrxNoEe7p7ElvQIJCNBu8zICfM=";
  };

  postPatch = lib.optionalString stdenv.hostPlatform.isLinux (
@@ -8,7 +8,7 @@

 stdenv.mkDerivation {
  pname = "tftp-hpa";
-  version = "5.2-untagged-2024-06-10";
+  version = "5.2-unstable-2024-06-10";
  src = fetchgit {
    url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git";
    hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY=";
@@ -26,16 +26,15 @@ let
            echo "parseconfig: removing $NAME"
            sed -i /^$NAME=/d .config

-            #if test "$OPTION" != n; then
-                echo "parseconfig: setting $NAME=$OPTION"
-                echo "$NAME=$OPTION" >> .config
-            #fi
+            echo "parseconfig: setting $NAME=$OPTION"
+            echo "$NAME=$OPTION" >> .config
        done
        set +x
    }
  '';

  # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds.
+  # 'ftw' needed to build acl, a coreutils dependency
  nixConfig = ''
    RUNTIME_PREFIX "/"
    DEVEL_PREFIX "/"
@@ -52,13 +51,20 @@ let
  + lib.optionalString (stdenv.hostPlatform.gcc.float or "" == "soft") ''
    UCLIBC_HAS_FPU n
  ''
-  + lib.optionalString (stdenv.hostPlatform.isAarch32 && isCross) ''
+  + lib.optionalString stdenv.hostPlatform.isEabi ''
    CONFIG_ARM_EABI y
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLittleEndian ''
    ARCH_WANTS_BIG_ENDIAN n
    ARCH_BIG_ENDIAN n
    ARCH_WANTS_LITTLE_ENDIAN y
    ARCH_LITTLE_ENDIAN y
-    UCLIBC_HAS_FPU n
+  ''
+  + lib.optionalString stdenv.hostPlatform.isBigEndian ''
+    ARCH_WANTS_BIG_ENDIAN y
+    ARCH_BIG_ENDIAN y
+    ARCH_WANTS_LITTLE_ENDIAN n
+    ARCH_LITTLE_ENDIAN n
  '';
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -70,9 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-X386r92yygj7KVvkVWHAGIQHED10Rs/SZLm4Iv7T7S0=";
  };

-  # 'ftw' needed to build acl, a coreutils dependency
  configurePhase = ''
-    make defconfig
+    make defconfig ARCH=${stdenv.hostPlatform.linuxArch}
    ${configParser}
    cat << EOF | parseconfig
    ${nixConfig}
@@ -92,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
  makeFlags = [
    "ARCH=${stdenv.hostPlatform.linuxArch}"
    "TARGET_ARCH=${stdenv.hostPlatform.linuxArch}"
-    "VERBOSE=1"
+    "V=1"
  ]
  ++ lib.optionals isCross [
    "CROSS=${stdenv.cc.targetPrefix}"
@@ -144,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
      experimental and need more testing.
    '';
    license = lib.licenses.lgpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ aleclearmind ];
    platforms = lib.platforms.linux;
    badPlatforms = lib.platforms.aarch64;
  };
@@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "uutils-diffutils";
-  version = "0.4.2";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "uutils";
    repo = "diffutils";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-IAgrCkhUC2Tkh+OM1lorpmD0GpsHUauLgU0KcmsvKb4=";
+    hash = "sha256-YZAa4A5fvW8BcaZn4xSVbSnzyoAaKKqBzpFOjnSRnc4=";
  };

-  cargoHash = "sha256-SiZIp0rJXl0ZqKaxLPtV1nypxSqKXW+NoFLxCVpW4OY=";
+  cargoHash = "sha256-jX3uuUopNaVi+XNskBUPzITlJrsVkXWR8LP7PTuwMm8=";

  checkFlags = [
    # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" }
@@ -25,12 +25,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=ed_diff::tests::test_permutations_empty_lines"
  ];

-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  postInstall = ''
+    ln -s $out/bin/diffutils $out/bin/cmp
+    ln -s $out/bin/diffutils $out/bin/diff
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/diffutils 2>/dev/null | head -1 | grep -F 'diffutils ${finalAttrs.version}'
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = nix-update-script { };

  meta = {
-    changelog = "https://github.com/uutils/diffutils/releases/tag/${finalAttrs.version}";
+    changelog = "https://github.com/uutils/diffutils/releases/tag/v${finalAttrs.version}";
    description = "Drop-in replacement of diffutils in Rust";
    homepage = "https://github.com/uutils/diffutils";
    license = lib.licenses.mit;
@@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "uv";
-  version = "0.9.21";
+  version = "0.9.22";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    tag = finalAttrs.version;
-    hash = "sha256-/Fis5719wA76HzyfVCOboXUhCVXBtGvNZm2lIhESv5o=";
+    hash = "sha256-6LdOzNnmPPpfoi3/QtsZgiAb39ClZVRpNqzZ0w/gQrE=";
  };

-  cargoHash = "sha256-N0D0PSehHKioI4SWqLfCV/eoLjM6MbNySOWYabzKd4I=";
+  cargoHash = "sha256-2u9OAFoSD4XvEAG4bzQSGFKnMI3XljLL8dgJdk4hlf0=";

  buildInputs = [
    rust-jemalloc-sys
@@ -7,6 +7,7 @@
  nix-update-script,
  stdenv,
  testers,
+  validatePkgConfig,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    cmake
+    validatePkgConfig
  ];
  buildInputs = [
    libuv
@@ -36,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {

    tests.pkg-config = testers.hasPkgConfigModules {
      package = finalAttrs.finalPackage;
-      moduleNames = [ "uvwasi" ];
    };
  };

@@ -47,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ aduh95 ];
    platforms = lib.platforms.all;
+    pkgConfigModules = [ "uvwasi" ];
  };
 })
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "witr";
-  version = "0.1.1";
+  version = "0.1.8";

  src = fetchFromGitHub {
    owner = "pranshuparmar";
    repo = "witr";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-U93fdcJ6Xdo2Z9WMVCFR2wxo1dhXVFd5MWGTF8B9a3M=";
+    hash = "sha256-GRgbqZ3G/cpCzsm4/T7IB/XoT1K7Gqique908W31lhg=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -37,8 +37,12 @@ buildGoModule (finalAttrs: {

  nativeBuildInputs = [ installShellFiles ];

+  subPackages = [
+    "cmd/witr"
+  ];
+
  postInstall = ''
-    installManPage docs/witr.1
+    installManPage docs/cli/witr.1
  '';

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

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "xapp-symbolic-icons";
-  version = "1.0.7";
+  version = "1.0.8";

  src = fetchFromGitHub {
    owner = "xapp-project";
    repo = "xapp-symbolic-icons";
    tag = finalAttrs.version;
-    hash = "sha256-zBU7LyINEKZB3F6AiQe5k5ZGJBdLJAaPXJhGudZ37eY=";
+    hash = "sha256-4Q+FHD3kYJGI4kZThb/ZVheaz8dMze9ZTgz8AFKy3HY=";
  };

  nativeBuildInputs = [
@@ -106,7 +106,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "zed-editor";
-  version = "0.217.3";
+  version = "0.217.4";

  outputs = [
    "out"
@@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    owner = "zed-industries";
    repo = "zed";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-flUkt39vttnF1HjzxLQ4pizFqxHxlIkaV+mb/GtxphU=";
+    hash = "sha256-yeDJNnKiFQ05OuUkPd/SVpjJh4MeTdv3R8EZDDcSFpQ=";
  };

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

-  cargoHash = "sha256-ZUHz93ImWj3S5kRaWsiLz4Xc0sdaWzy+4CxCW5cvEf0=";
+  cargoHash = "sha256-UfnKnN91uA3MmYCpgCbjz5U9chxsYwE4t4Fu/wD0o/c=";

  nativeBuildInputs = [
    cmake
@@ -19,6 +19,7 @@ in
      case = case: out: { inherit case out; };
    in
    lib.switch coq.coq-version [
+      (case "9.1" "1.0+9.1")
      (case "9.0" "1.0+9.0")
      (case "8.20" "1.0+8.20")
      (case "8.19" "1.0+8.19")
@@ -36,6 +37,7 @@ in
      (case "8.7" "0.6.2")
    ] null;

+  release."1.0+9.1".hash = "sha256-6bQsXcY8ouxP7pfJrT3leD9kuhNjpskJKpTv6oHZaTE=";
  release."1.0+9.0".sha256 = "sha256-gXy70fj2bAkE0did4gI0wTyWp9AIvOo4xTTihaFIpZ0=";
  release."1.0+8.20".sha256 = "sha256-szfH/OksCH3SCbcFjwEvLwHE5avmHp1vYiJM6KAXFqs=";
  release."1.0+8.19".sha256 = "sha256-L1vjEydYiwDFTXES3sgfdaO/D50AbTJKBXUKUCgbpto=";
--- a/Show More
+++ b/Show More