Merge master into staging-next

2026-04-20 00:31:09 +00:00
parent e502d8ffaa 9fcf76718e
commit 033bc223bd
371 changed files with 4450 additions and 4023 deletions
@@ -2636,6 +2636,13 @@ in
          (lib.concatMap lib.attrValues)
          (lib.concatMap lib.attrValues)
          (lib.filter (rule: rule.enable))
+          (lib.filter (
+            rule:
+            !builtins.elem rule.control [
+              "include"
+              "substack"
+            ]
+          ))
          (lib.catAttrs "modulePath")
          (map (
            modulePath:
@@ -39,8 +39,8 @@ in

      configFile = lib.mkOption {
        type = lib.types.path;
-        default = "${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";
-        defaultText = lib.literalExpression "\${pkgs.sillytavern}/lib/node_modules/sillytavern/config.yaml";
+        default = "${cfg.package}/lib/node_modules/sillytavern/config.yaml";
+        defaultText = lib.literalExpression "\${cfg.package}/lib/node_modules/sillytavern/config.yaml";
        description = ''
          Path to the SillyTavern configuration file.
        '';
@@ -109,7 +109,7 @@ in
          in
          lib.concatStringsSep " " (
            [
-              "${lib.getExe pkgs.sillytavern}"
+              "${lib.getExe cfg.package}"
            ]
            ++ f cfg.port "port"
            ++ f cfg.listen "listen"
@@ -122,7 +122,7 @@ in
        Restart = "always";
        StateDirectory = "SillyTavern";
        BindPaths = [
-          "%S/SillyTavern/extensions:${pkgs.sillytavern}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"
+          "%S/SillyTavern/extensions:${cfg.package}/lib/node_modules/sillytavern/public/scripts/extensions/third-party"
        ];

        # Security hardening
@@ -663,7 +663,7 @@ let
        let
          commonConfig = {
            # builds stuff in the VM, needs more juice
-            virtualisation.diskSize = 8 * 1024;
+            virtualisation.diskSize = 12 * 1024;
            virtualisation.cores = 8;
            virtualisation.memorySize = 2048;

@@ -700,7 +700,7 @@ let
              # Use a small /dev/vdb as the root disk for the
              # installer. This ensures the target disk (/dev/vda) is
              # the same during and after installation.
-              virtualisation.emptyDiskImages = [ 512 ];
+              virtualisation.emptyDiskImages = [ 1024 ];
              virtualisation.rootDevice = "/dev/vdb";

              nix.package = selectNixPackage pkgs;
@@ -40,6 +40,7 @@ let
          submodules = value.src.fetchSubmodules or false;
          sha256 = value.src.outputHash;
          rev = value.src.rev;
+          tag = value.src.tag or null;
        }}
      else
        null;
@@ -1385,6 +1385,8 @@ assertNoAdditions {
    nvimSkipModules = [
      # lua module '.init' not found
      "fzy.fzy-lua-native"
+      # Requires removed Neovim internal module vim.treesitter._highlight
+      "guihua.ts_obsolete.highlight"
    ];
  };

@@ -1832,6 +1834,16 @@ assertNoAdditions {
    };
  });

+  live-share-nvim = super.live-share-nvim.overrideAttrs (old: {
+    nvimSkipModules = (old.nvimSkipModules or [ ]) ++ [
+      # These modules unconditionally load OpenSSL via LuaJIT FFI and abort in
+      # the headless require check on Darwin.
+      "live-share.host"
+      "live-share.guest"
+      "live-share.collab.crypto"
+    ];
+  });
+
  lsp-format-modifications-nvim = super.lsp-format-modifications-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
  };
@@ -3138,14 +3150,29 @@ assertNoAdditions {
    ];
  };

-  python-mode = super.python-mode.overrideAttrs {
-    postPatch = ''
+  python-mode = super.python-mode.overrideAttrs (old: {
+    postPatch = (old.postPatch or "") + ''
      # NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
      # https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360
      rm -f pymode/libs/pytoolconfig
      ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig
+
+      # The current source tarball only ships a subset of the historical
+      # submodules, so drop the now-dangling vendored linter symlinks.
+      rm -f \
+        pymode/libs/appdirs.py \
+        pymode/libs/astroid \
+        pymode/libs/mccabe.py \
+        pymode/libs/pycodestyle.py \
+        pymode/libs/pydocstyle \
+        pymode/libs/pyflakes \
+        pymode/libs/pylama \
+        pymode/libs/pylint \
+        pymode/libs/snowballstemmer \
+        pymode/libs/toml \
+        pymode/autopep8.py
    '';
-  };
+  });

  pywal-nvim = super.pywal-nvim.overrideAttrs {
    # Optional feline integration
@@ -23,6 +23,7 @@ let
          submodules = value.src.fetchSubmodules or false;
          sha256 = value.src.outputHash;
          inherit (value.src) rev;
+          tag = value.src.tag or null;
        }
      else
        null;
@@ -50,9 +50,9 @@ class VimEditor(nixpkgs_plugin_update.Editor):
        self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
    ):
        log.info("Generating nix code")
-        log.debug("Loading nvim-treesitter revision from nix...")
-        nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr(
-            "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
+        log.debug("Loading nvim-treesitter source reference from nix...")
+        nvim_treesitter_ref = nixpkgs_plugin_update.run_nix_expr(
+            "(let src = (import <localpkgs> { }).vimPlugins.nvim-treesitter.src; in if src.tag != null then src.tag else src.rev)",
            self.nixpkgs,
            timeout=10,
        )
@@ -93,10 +93,7 @@ class VimEditor(nixpkgs_plugin_update.Editor):
            for pdesc, plugin in plugins:
                content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
                f.write(content)
-                if (
-                    plugin.name == "nvim-treesitter"
-                    and plugin.commit != nvim_treesitter_rev
-                ):
+                if plugin.name == "nvim-treesitter" and (plugin.tag or plugin.commit) != nvim_treesitter_ref:
                    self.nvim_treesitter_updated = True
            f.write("}\n")
        print(f"updated {outfile}")
@@ -45,13 +45,13 @@
    "vendorHash": "sha256-qjtyg+b3CfF24us0Fqw1KqKEbuoqL4eLe4QCuIAp4SE="
  },
  "aliyun_alicloud": {
-    "hash": "sha256-xdWoc0unJDM7WL3t1AoDBzwPgByij9g9hEoNSOxJtxs=",
+    "hash": "sha256-pOoFxaAB1x2G89AsnCK7D2q6hTgfMiwE+zfdKZh3bgE=",
    "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
    "owner": "aliyun",
    "repo": "terraform-provider-alicloud",
-    "rev": "v1.275.0",
+    "rev": "v1.276.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Kk0YeStlev8AurZasORMe/42Rd3ZPFoFMat/rMpZFbE="
+    "vendorHash": "sha256-Y/r9gdvPhN27nve+IZyqypZkvCXHE7Ox31JLDQd9l4k="
  },
  "aminueza_minio": {
    "hash": "sha256-rAdHPVw/G5uO/67yLOohHvO3/KxjyQkIpagKPd0vMOQ=",
@@ -1229,13 +1229,13 @@
    "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
  },
  "spacelift-io_spacelift": {
-    "hash": "sha256-j9D4rUjnBQqobAu5yXo5fCJSwkVSovmrroowBTuLIVQ=",
+    "hash": "sha256-oS3Ikmi5wUlVbQos16x1BXoqhgOMIGyJcpl7sIXmDtk=",
    "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
    "owner": "spacelift-io",
    "repo": "terraform-provider-spacelift",
-    "rev": "v1.47.1",
+    "rev": "v1.48.0",
    "spdx": "MIT",
-    "vendorHash": "sha256-Ub0lqMdCu44UX3LkcjErsxfWdL9C6CxhVKPOn1AAdEc="
+    "vendorHash": "sha256-/4v25xY/fmfSAEALRbXu/a+x3nC1Ly/IJPOEKmYjgmw="
  },
  "splunk-terraform_signalfx": {
    "hash": "sha256-m+qD71tTqQycD+9xju5T83IaYCgJhkfh+byn6yrdfO4=",
@@ -1409,11 +1409,11 @@
    "vendorHash": "sha256-OVdhM8Zqnm1J8KducnkNkroBoSLER3fHfZBjyp7kBu8="
  },
  "ucloud_ucloud": {
-    "hash": "sha256-lDLYp0ApFCV6XYCxCunkpFwEXpACoChQWLx2bHTjeQs=",
+    "hash": "sha256-rS9OdlxP9sGUK94hrYbPrNJn5Netov/bToQM6W73+ac=",
    "homepage": "https://registry.terraform.io/providers/ucloud/ucloud",
    "owner": "ucloud",
    "repo": "terraform-provider-ucloud",
-    "rev": "v1.39.3",
+    "rev": "v1.39.4",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -15,12 +15,12 @@
  pkgs,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "openpaperwork-core";
  inherit (callPackage ./src.nix { }) version src;
  pyproject = true;

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

  # Python 2.x is not supported.
  disabled = !isPy3k && !isPyPy;
@@ -61,4 +61,4 @@ buildPythonPackage rec {
    ];
    platforms = lib.platforms.linux;
  };
-}
+})
@@ -15,12 +15,12 @@
  pkgs,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "openpaperwork-gtk";
  inherit (callPackage ./src.nix { }) version src;
  pyproject = true;

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

  # Python 2.x is not supported.
  disabled = !isPy3k && !isPyPy;
@@ -61,4 +61,4 @@ buildPythonPackage rec {
    ];
    platforms = lib.platforms.linux;
  };
-}
+})
@@ -26,12 +26,12 @@
  setuptools-scm,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "paperwork-backend";
  inherit (callPackage ./src.nix { }) version src;
  pyproject = true;

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

  patches = [
    # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700
@@ -93,4 +93,4 @@ buildPythonPackage rec {
      symphorien
    ];
  };
-}
+})
@@ -19,12 +19,12 @@
  pkgs,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "paperwork-shell";
  inherit (callPackage ./src.nix { }) version src;
  pyproject = true;

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

  # Python 2.x is not supported.
  disabled = !isPy3k && !isPyPy;
@@ -71,4 +71,4 @@ buildPythonPackage rec {
      symphorien
    ];
  };
-}
+})
@@ -9,7 +9,7 @@
  makeWrapper,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "hyprshade";
  version = "4.0.1";
  pyproject = true;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "loqusion";
    repo = "hyprshade";
-    tag = version;
+    tag = finalAttrs.version;
    hash = "sha256-zK8i2TePJ4cEtGXe/dssHWg+ioCTo1NyqzInQhMaB8w=";
  };

@@ -45,4 +45,4 @@ buildPythonPackage rec {
    maintainers = with lib.maintainers; [ willswats ];
    platforms = lib.platforms.linux;
  };
-}
+})
@@ -5,13 +5,13 @@
  i3ipc,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "i3-balance-workspace";
  version = "1.8.6";
  format = "setuptools";

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

@@ -27,4 +27,4 @@ buildPythonPackage rec {
    maintainers = with lib.maintainers; [ euxane ];
    mainProgram = "i3_balance_workspace";
  };
-}
+})
@@ -15,11 +15,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "algol68g";
-  version = "3.5.14";
+  version = "3.11.3";

  src = fetchurl {
-    url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz";
-    hash = "sha256-uIy8rIhUjohiQJ/K5EprsIISXMAx1w27I3cGo/9H9Wk=";
+    # Uses archive.org because the original site removes older versions.
+    url = "https://web.archive.org/web/20260419212716/https://jmvdveer.home.xs4all.nl/algol68g-3.11.3.tar.gz";
+    hash = "sha256-P8hKm5lFG3P8+OigX2mFPzL1bN30bblAvijajJzTcxA=";
  };

  outputs = [
@@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    '';
    license = lib.licenses.gpl3Plus;
    mainProgram = "a68g";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
    platforms = lib.platforms.unix;
  };
 })
@@ -14,9 +14,9 @@

  # buildInputs
  fmt,
+  mimalloc,

  # propagatedBuildInputs
-  suitesparse,
  crocoddyl,
  pinocchio,

@@ -27,13 +27,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "aligator";
-  version = "0.16.0";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "Simple-Robotics";
    repo = "aligator";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-OyCJa2iTkCxVLooSKdVgBd0y7rHObo4vFcc56t48TSY=";
+    hash = "sha256-qdXZo7IvgcUFEJARwxpSaHJVRlZ6HdgRADPOiY3oCpk=";
  };

  outputs = [
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    fmt
+    mimalloc
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
    llvmPackages.openmp
@@ -60,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
  propagatedBuildInputs = [
    crocoddyl
    pinocchio
-    suitesparse
  ];

  checkInputs = [
@@ -8,12 +8,12 @@

 stdenv.mkDerivation {
  pname = "althttpd";
-  version = "0-unstable-2026-01-27";
+  version = "0-unstable-2026-03-20";

  src = fetchfossil {
    url = "https://sqlite.org/althttpd/";
-    rev = "7758535a137da507";
-    hash = "sha256-9yszcoYpbM9/KDn7zpWgDINZF6azkQVxwlOw7BvRo+4=";
+    rev = "a8fac0faaab1f43f";
+    hash = "sha256-Z4kZgCvqY7Kroc6A98s5UH4N8CEUzF+xmdXDRw2Lxtw=";
  };

  buildInputs = [ openssl ];
@@ -10,6 +10,12 @@
  openssh,
  sshfs-fuse,
  encfs,
+  gocryptfs,
+  which,
+  ps,
+  gnugrep,
+  man,
+  asciidoctor,
 }:

 let
@@ -28,24 +34,30 @@ let
    rsync
    sshfs-fuse
    encfs
+    gocryptfs
  ];
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "backintime-common";
-  version = "1.5.6";
+  version = "1.6.1";

  src = fetchFromGitHub {
    owner = "bit-team";
    repo = "backintime";
-    rev = "v${version}";
-    sha256 = "sha256-y9uo/6R9OXK9hqUD0pCLJXF2B80lr2gXf6v8+Ca6u5M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE=";
  };

  nativeBuildInputs = [
    makeWrapper
    gettext
  ];
-  buildInputs = [ python' ];
+
+  buildInputs = [
+    python'
+    man
+    asciidoctor
+  ];

  installFlags = [ "DEST=$(out)" ];

@@ -53,12 +65,23 @@ stdenv.mkDerivation rec {

  preConfigure = ''
    patchShebangs --build updateversion.sh
+    patchShebangs --build doc/manpages/build_manpages.sh
    cd common
    substituteInPlace configure \
-      --replace-fail "/.." "" \
+      --replace-fail "/../etc" "/etc" \
      --replace-fail "share/backintime" "${python'.sitePackages}/backintime"
+
    substituteInPlace "backintime" "backintime-askpass" \
      --replace-fail "share" "${python'.sitePackages}"
+
+    substituteInPlace "schedule.py" \
+      --replace-fail "'crontab'" "'${cron}/bin/crontab'" \
+      --replace-fail "'which'" "'${lib.getExe which}'" \
+      --replace-fail "'ps'" "'${lib.getExe ps}'" \
+      --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \
+
+    substituteInPlace "bitlicense.py" \
+      --replace-fail "/usr/share/doc" "$out/share/doc" \
  '';

  dontAddPrefix = true;
@@ -81,4 +104,4 @@ stdenv.mkDerivation rec {
      done by taking snapshots of a specified set of directories.
    '';
  };
-}
+})
@@ -4,21 +4,45 @@
  backintime-common,
  python3,
  polkit,
+  meld ? null,
+  meldSupport ? true,
+  kdePackages ? null,
+  kompareSupport ? false,
  which,
  su,
  coreutils,
  util-linux,
  qt6,
+  man,
+  asciidoctor,
+  keyringBackends ?
+    ps: with ps; [
+      secretstorage
+      keyrings-alt
+      keyring-pass
+    ],
 }:

 let
  python' = python3.withPackages (
-    ps: with ps; [
+    ps:
+    with ps;
+    [
      pyqt6
      backintime-common
+      dbus-python
+      keyring
      packaging
    ]
+    ++ (keyringBackends ps)
  );
+  diffProgram =
+    if meldSupport then
+      "${lib.getBin meld}/bin"
+    else if kompareSupport then
+      "${lib.getBin kdePackages.kompare}/bin"
+    else
+      "";
 in
 stdenv.mkDerivation {
  inherit (backintime-common)
@@ -36,6 +60,8 @@ stdenv.mkDerivation {
    backintime-common
    qt6.qtbase
    qt6.qtwayland
+    man
+    asciidoctor
  ];

  nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [
@@ -46,14 +72,16 @@ stdenv.mkDerivation {

  preConfigure = ''
    patchShebangs --build updateversion.sh
+    patchShebangs --build doc/manpages/build_manpages.sh
    cd qt
    substituteInPlace qttools_path.py \
-      --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"'
+      --replace-fail "Path(__file__).parent.parent" '"${backintime-common}/${python'.sitePackages}/backintime"'
  '';

  preFixup = ''
    wrapQtApp "$out/bin/backintime-qt" \
-      --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH"
+      --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" \
+      --prefix PATH : "${diffProgram}:$PATH"

    substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \
      --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt"
@@ -12,7 +12,7 @@
  udevCheckHook,
 }:

-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage (finalAttrs: {
  pname = "boxflat";
  version = "1.35.5";
  pyproject = true;
@@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "Lawstorant";
    repo = "boxflat";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-R03mQIsa6T1ApV8SMWvilBfiCGcAWvyZ5hDDgAuGd6s=";
  };

@@ -66,7 +66,7 @@ python3Packages.buildPythonPackage rec {
    setup(
      name='boxflat',
      packages=['boxflat', 'boxflat.panels', 'boxflat.widgets'],
-      version='${version}',
+      version='${finalAttrs.version}',
      install_requires=install_requires,
      entry_points={
        'console_scripts': ['boxflat=boxflat.entrypoint:main']
@@ -117,11 +117,11 @@ python3Packages.buildPythonPackage rec {

  meta = {
    homepage = "https://github.com/Lawstorant/boxflat";
-    changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${version}";
+    changelog = "https://github.com/Lawstorant/boxflat/releases/tag/v${finalAttrs.version}";
    description = "Control your Moza gear settings";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ racci ];
    platforms = lib.platforms.linux;
    mainProgram = "boxflat";
  };
-}
+})
@@ -1,28 +1,52 @@
 {
  lib,
-  stdenvNoCC,
-  fetchurl,
-  undmg,
+  stdenv,
+  fetchFromGitHub,
+  apple-sdk,
+  darwin,
+  xcbuildHook,
 }:

-stdenvNoCC.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
  pname = "caffeine";
  version = "1.1.4";

-  src = fetchurl {
-    url = "https://github.com/IntelliScape/caffeine/releases/download/${finalAttrs.version}/Caffeine.dmg";
-    hash = "sha256-GtNMMpmgyGaHPE/rQyw+ERhjda229DxfSBrp1G0G1yM=";
+  src = fetchFromGitHub {
+    owner = "IntelliScape";
+    repo = "caffeine";
+    tag = finalAttrs.version;
+    hash = "sha256-AmBPY5ZVWBq2ZesNvvJ/Do5XgPjb5R1ESNJm7tx0M6k=";
  };

-  sourceRoot = ".";
+  # xcbuild routes image.png resources through CopyPNGFile, which requires the
+  # Apple-only copypng tool that is unavailable in the nixpkgs toolchain.
+  # Treat these PNGs as generic files so xcbuild copies them directly.
+  postPatch = ''
+    substituteInPlace Caffeine.xcodeproj/project.pbxproj \
+      --replace-fail \
+        "lastKnownFileType = image.png;" \
+        "lastKnownFileType = file;"
+  '';

-  nativeBuildInputs = [ undmg ];
+  nativeBuildInputs = [
+    xcbuildHook
+    darwin.autoSignDarwinBinariesHook
+  ];
+
+  buildInputs = [
+    apple-sdk
+  ];
+
+  xcbuildFlags = [
+    "-target Caffeine"
+    "-configuration Release"
+  ];

  installPhase = ''
    runHook preInstall

    mkdir -p $out/Applications
-    cp -r *.app $out/Applications
+    cp -r Products/Release/Caffeine.app $out/Applications

    runHook postInstall
  '';
@@ -36,6 +60,5 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      "x86_64-darwin"
      "aarch64-darwin"
    ];
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
 })
@@ -22,16 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
    ninja
  ];

-  # canfigger has asan and ubsan enabled by default, disable it here
-  mesonFlags = [
-    "-Dcanfigger:b_sanitize=none"
-  ];
-
  meta = {
    description = "Lightweight library designed to parse configuration files";
    homepage = "https://github.com/andy5995/canfigger";
    changelog = "https://github.com/andy5995/canfigger/blob/${finalAttrs.src.rev}/ChangeLog.txt";
-    license = lib.licenses.gpl3Only;
+    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ iynaix ];
    mainProgram = "canfigger";
    platforms = lib.platforms.all;
@@ -11,12 +11,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "cannelloni";
-  version = "2.0.0";
+  version = "2.0.1";
  src = fetchFromGitHub {
    owner = "mguentner";
    repo = "cannelloni";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-b3pBC2XFK+pyONvnkPw/0YUXAG2cRD1OaN7k2ONzFV8=";
+    hash = "sha256-lHZmsgtIL7edODXV8lWfVwMhnS40n9wD8iVyAzJycbA=";
  };

  nativeBuildInputs = [
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
  pname = "cosmic-ext-applet-caffeine";
-  version = "0-unstable-2026-01-11";
+  version = "0-unstable-2026-04-18";

  src = fetchFromGitHub {
    owner = "tropicbliss";
    repo = "cosmic-ext-applet-caffeine";
-    rev = "f101f568c5e6bd5c1acbd1f32a09026898cd5a4c";
-    hash = "sha256-tnuNOuTUdwGnS3mIHs5K4ByA6C9uymDTqYDwevJVNFw=";
+    rev = "96f7be5de71a460b9c26ec024bb8089208ad991f";
+    hash = "sha256-wdsm6snDY61+sJfzKkLDGVbAm5mC0lWDCTlDdImTwO8=";
  };

  cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ=";
@@ -6,6 +6,9 @@
  git,
  testers,
  d2,
+  libgbm,
+  makeWrapper,
+  playwright-driver,
 }:

 buildGoModule (finalAttrs: {
@@ -29,13 +32,25 @@ buildGoModule (finalAttrs: {
    "-X oss.terrastruct.com/d2/lib/version.Version=v${finalAttrs.version}"
  ];

-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libgbm
+    playwright-driver.browsers
+  ];
+
+  nativeCheckInputs = [ git ];

  postInstall = ''
    installManPage ci/release/template/man/d2.1
-  '';

-  nativeCheckInputs = [ git ];
+      # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright
+      wrapProgram $out/bin/d2 \
+        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}
+  '';

  preCheck = ''
    # See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests.
@@ -8,7 +8,6 @@
  cdrkit,
  dvdauthor,
  gtk3,
-  gettext,
  wrapGAppsHook3,
  gdk-pixbuf,
  gobject-introspection,
@@ -22,23 +21,25 @@ let
    pygobject3
    urllib3
    setuptools
+    setuptools-gettext
+    importlib-metadata
    ;
 in
 buildPythonApplication (finalAttrs: {
  pname = "devede";
-  version = "4.21.0";
-  format = "setuptools";
+  version = "4.21.3.1";
+  format = "pyproject";
  namePrefix = "";

  src = fetchFromGitLab {
    owner = "rastersoft";
    repo = "devedeng";
    rev = finalAttrs.version;
-    hash = "sha256-sLJkIKw0ciX6spugbdO0eZ1dIkoHfuu5e/f2XwA70a0=";
+    hash = "sha256-81H063PpBF/+JDsRgBLwfAevb11yNkDtH4KdtOAL/Fg=";
  };

  nativeBuildInputs = [
-    gettext
+    setuptools-gettext
    wrapGAppsHook3
    gobject-introspection
  ];
@@ -59,6 +60,7 @@ buildPythonApplication (finalAttrs: {
    cdrkit
    urllib3
    setuptools
+    importlib-metadata
  ];

  postPatch = ''
@@ -68,7 +70,7 @@ buildPythonApplication (finalAttrs: {
      --replace "/usr/local/share" "$out/share"
  '';

-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;

  meta = {
    description = "DVD Creator for Linux";
@@ -0,0 +1,7 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p curl nix-update xmlstarlet
+
+set -euo pipefail
+
+latest_tag=$(curl -s "https://gitlab.com/rastersoft/devedeng/-/tags?format=atom" | xmlstarlet sel -t -v "(//*[local-name()='entry']/*[local-name()='title'])[1]")
+nix-update devede --version $latest_tag
@@ -10,7 +10,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "directx-shader-compiler";
-  version = "1.8.2505.1";
+  version = "1.9.2602";

  # Put headers in dev, there are lot of them which aren't necessary for
  # using the compiler binary.
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "microsoft";
    repo = "DirectXShaderCompiler";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-d8qJ9crS5CStbsGOe/OSHtUEV4vr3sLCQp+6KsEq/A4=";
+    hash = "sha256-S3ar1LTV/9fYU2B5y8x0ESB20lMnAx8XQw9n3G4z0nk=";
    fetchSubmodules = true;
  };

@@ -34,7 +34,12 @@ stdenv.mkDerivation (finalAttrs: {
    python3
  ];

-  cmakeFlags = [ "-C../cmake/caches/PredefinedParams.cmake" ];
+  cmakeFlags = [
+    "-C../cmake/caches/PredefinedParams.cmake"
+    # Tries to download prebuilt dxcs
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+    (lib.cmakeBool "HLSL_INCLUDE_TESTS" false)
+  ];

  # The default install target installs heaps of LLVM stuff.
  #
@@ -6,12 +6,12 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "distgen";
-  version = "2.2";
+  version = "2.3";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-w+/aiLv5NCQFD0ItlC+Wy9BuvA/ndDQcLf6Iyb9trF4=";
+    hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ=";
  };

  build-system = with python3.pkgs; [
@@ -1,28 +0,0 @@
---
- src/dmitry.c | 1 +
- src/file.c   | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/dmitry.c b/src/dmitry.c
-index d47f231..567482d 100644
--- a/src/dmitry.c
-+++ b/src/dmitry.c
-@@ -9,6 +9,7 @@
- #include <ctype.h>
- #include <string.h>
- #include <signal.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-diff --git a/src/file.c b/src/file.c
-index f4ad48b..3714786 100644
--- a/src/file.c
-+++ b/src/file.c
-@@ -1,4 +1,6 @@
- #include "includes/file.h"
-+#include <string.h>
-+#include <stdlib.h>
- int file_prep()
- {
- 	outputfile[strlen(outputfile)] = '\0';
@@ -7,21 +7,17 @@

 stdenv.mkDerivation {
  pname = "dmitry";
-  version = "1.3a-unstable-2020-06-22";
+  version = "1.3a-unstable-2026-03-26";

  src = fetchFromGitHub {
    owner = "jaygreig86";
    repo = "dmitry";
-    rev = "f3ae08d4242e3e178271c827b86ff0d655972280";
-    hash = "sha256-cYFeBM8xFMaLXYk6Rg+5JvfbbIJI9F3mefzCX3+XbB0=";
+    rev = "f2b8961dabbd55486a5649a9803446b860ad28e7";
+    hash = "sha256-ZEfRaJ4ds1yWxN9VTFoBiUI5ZzK//aD7o9ry6vmA1YM=";
  };

-  patches = [ ./implicit-function-declaration.patch ];
-
  nativeBuildInputs = [ autoreconfHook ];

-  env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ];
-
  meta = {
    description = "Deepmagic Information Gathering Tool";
    mainProgram = "dmitry";
@@ -14,9 +14,9 @@

 let
  # for update.sh easy to handle
-  ngclientVersion = "0.0.192";
-  ngclientRev = "5237ca55b42e58896da2919ad8a76c034517e98a";
-  ngclientHash = "sha256-06LMFg0kRmG4c5s60/+NU8gugkfgWAyTGoLo0+UHRUI=";
+  ngclientVersion = "0.0.207";
+  ngclientRev = "42d711a541ca1ee2ff43f95cce89e8eeb224afc8";
+  ngclientHash = "sha256-VS6kb/2YGn/TBDXt62UifD7BHCWE2xiUkLcGBXzV+ww=";

  # from Duplicati/Server/webroot/ngclient/package.json
  ngclient = buildNpmPackage {
@@ -30,7 +30,7 @@ let
      hash = ngclientHash;
    };

-    npmDepsHash = "sha256-i9lW+JDB2TZGfhW1fzrZA36qgkYeMmHbJkeEYxga2ko=";
+    npmDepsHash = "sha256-wkzSUEqoB013yNbC1sX4qRz8DuGWRB20/M+ue/thbOQ=";

    nativeBuildInputs = [ bun ];

@@ -58,22 +58,22 @@ let
 in
 buildDotnetModule rec {
  pname = "duplicati";
-  version = "2.2.0.3";
+  version = "2.3.0.0";
  channel = "stable";
-  buildDate = "2026-01-06";
+  buildDate = "2026-04-14";

  src = fetchFromGitHub {
    owner = "duplicati";
    repo = "duplicati";
    tag = "v${version}_${channel}_${buildDate}";
-    hash = "sha256-p2hl1S/XsKsbAfWBAgvNMl6z5zGm/FBH3EYSqDvkKy8=";
+    hash = "sha256-X9SaH83p2RJWeJK8MfNwPgI2c3AfBHhbxOaFz4c26qU=";
    stripRoot = true;
  };

  nugetDeps = ./deps.json;

-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_10_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;

  enableParallelBuilding = false;

@@ -111,6 +111,8 @@ buildDotnetModule rec {
  ];

  postPatch = ''
+    sed -i '/Duplicati.ShellExtension.csproj/d' Duplicati.slnx
+
    rm -rf Duplicati/Server/webroot/ngclient
    ln -s ${ngclient}/browser Duplicati/Server/webroot/ngclient
  '';
@@ -11,7 +11,7 @@

 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "esphome-dashboard";
  version = "20260210.0";
  pyproject = true;
@@ -19,12 +19,12 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "esphome";
    repo = "dashboard";
-    tag = version;
+    tag = finalAttrs.version;
    hash = "sha256-Edd2ZOSBAZSrGVjbncyPhhjFjE0CxBHz16ZHXyzx9LI=";
  };

  npmDeps = fetchNpmDeps {
-    inherit src;
+    inherit (finalAttrs) src;
    hash = "sha256-L6tKhijTFAvQwhBBl5Wk6xzI2dtDI6IYfCkiKX75Pvc=";
  };

@@ -57,4 +57,4 @@ buildPythonPackage rec {
    license = with lib.licenses; [ asl20 ];
    maintainers = with lib.maintainers; [ hexa ];
  };
-}
+})
@@ -22,13 +22,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants
  stdenvNoCC.mkDerivation
  {
    inherit pname;
-    version = "0-unstable-2026-04-08";
+    version = "0-unstable-2026-04-17";

    src = fetchFromGitLab {
      owner = "aiyahm";
      repo = "FairyWren-Icons";
-      rev = "428ee2eef9f607021406376f55bfc6cf4054caf1";
-      hash = "sha256-XEuchaxh9h7hNpS2wjmytutcgroohdgsh7f1x5hrDKg=";
+      rev = "c55f846436b13fcc0c5ee745eead9bf8e3bcb0bf";
+      hash = "sha256-ESh/3PNprmD0ecSoH9JVw1r0VsWoQDw4ujpmSaoyhoM=";
    };

    propagatedBuildInputs = [
@@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "firecracker";
-  version = "1.14.2";
+  version = "1.15.1";

  src = fetchFromGitHub {
    owner = "firecracker-microvm";
    repo = "firecracker";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-29ZI8RmHH3fz/nUb7EeD51qGUKEKj0UKURxbpmiwwzs=";
+    hash = "sha256-H3dj11Q0MgLST1TWJ5rmfPePxjXrXOYI2Xf/3uUdICU=";
  };

-  cargoHash = "sha256-GtHIZJMLdMZNCXzVw6w3KjhzlxCJhC9eaKRDeVWwklY=";
+  cargoHash = "sha256-N2WYnFTlz4NUAU/tjy18SPvxdDVDIIaqgu44e6unOHs=";

  # For aws-lc-sys@0.22.0: use external bindgen.
  env.AWS_LC_SYS_EXTERNAL_BINDGEN = "true";
@@ -16,13 +16,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "firefly-iii-data-importer";
-  version = "2.2.2";
+  version = "2.2.3";

  src = fetchFromGitHub {
    owner = "firefly-iii";
    repo = "data-importer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-lHofvjw4wK14tferHt59uSIYPVa5KwNQUB+GgmyUoJc=";
+    hash = "sha256-2/zfxBggXK9mJDpuofQyMZ+WWV0OHyUWTUU+4CRNOUQ=";
  };

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

-  vendorHash = "sha256-eiQpGtqjix2HmMU5sarysxm7dGgQx40/kZKPemrHBHU=";
+  vendorHash = "sha256-0p0xPBX4nKFYlpIvGVZU7ay+btjpxBO2s73wzysSzUU=";

  npmDeps = fetchNpmDeps {
    inherit (finalAttrs) src;
    name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-BQglXnIlocZDTtAmSuga5dbB/m8AI5z1F/+VQ1kLzQc=";
+    hash = "sha256-baPsbZwGu1tx6bMH2tWcZVlkZuIpSflwj9JyX9vQW/U=";
  };

  composerRepository = php.mkComposerRepository {
@@ -8,17 +8,17 @@

 buildGoModule (finalAttrs: {
  pname = "gitea-actions-runner";
-  version = "0.3.1";
+  version = "0.4.0";

  src = fetchFromGitea {
    domain = "gitea.com";
    owner = "gitea";
    repo = "act_runner";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-D3/vJUQuNAgUWNyfL9QWmByZ9A/F4+pfA6GR0SDcMpQ=";
+    hash = "sha256-trKp5tIhvvb6VJ04iIpFD4Q/VK/V1urkbXEpGMwaEsE=";
  };

-  vendorHash = "sha256-XRXoChH2ApQS65xnzeGP4NIUL0RKovLWvVIAnBncT7Y=";
+  vendorHash = "sha256-dUUe4BbBmRP9MImq/PYTGssv3M2Zn84oCxH5BKf9btg=";

  ldflags = [
    "-s"
@@ -7,16 +7,16 @@

 buildGoModule (finalAttrs: {
  pname = "hcloud";
-  version = "1.61.0";
+  version = "1.62.2";

  src = fetchFromGitHub {
    owner = "hetznercloud";
    repo = "cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Gggr/wdPzi1nqCcWzxNYr85oBRGT0rBxV24QXYDHkdc=";
+    hash = "sha256-OGz/f68DDYJ7s3HFjDdQPtD86929gxRehSPs9cCkPBk=";
  };

-  vendorHash = "sha256-X/qn9mfbSBaMbi4uI7jdL98mQSq0JVfXR3nX156ySBc=";
+  vendorHash = "sha256-8JvqGCVFE2dSlpMzwYXKMvg3nw/wt8GxL7sM0bS6ZgM=";

  ldflags = [
    "-s"
@@ -1,40 +1,55 @@
 {
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  stdenv,
-  buildPackages,
-  pkg-config,
  apple-sdk,
-  installShellFiles,
-  installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
-  installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
-  notmuch,
-  gpgme,
-  buildNoDefaultFeatures ? false,
  buildFeatures ? [ ],
-  withNoDefaultFeatures ? buildNoDefaultFeatures,
-  withFeatures ? buildFeatures,
-}@args:
+  buildNoDefaultFeatures ? false,
+  buildPackages,
+  dbus,
+  fetchFromGitHub,
+  gpgme,
+  installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
+  installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
+  installShellFiles,
+  lib,
+  notmuch,
+  pkg-config,
+  rustPlatform,
+  stdenv,
+}:

 let
-  version = "1.1.0";
-  hash = "sha256-gdrhzyhxRHZkALB3SG/aWOdA5iMYkel3Cjk5VBy3E4M=";
-  cargoHash = "sha256-ulqMjpW3UI509vs3jVHXAEQUhxU/f/hN8XiIo8UBRq8=";
+  version = "1.2.0";
+  hash = "sha256-BBzfDeNu7s010ARCYuydCyR7QWrbeI3/B4CxA6d4olw=";
+  cargoHash = "sha256-IkvRiU9NuD6n7aCF8J235u2LjjmLftnF1n874IWVcN0=";

-  noDefaultFeatures =
-    lib.warnIf (args ? buildNoDefaultFeatures)
-      "buildNoDefaultFeatures is deprecated in favour of withNoDefaultFeatures and will be removed in the next release"
-      withNoDefaultFeatures;
+  inherit (stdenv.hostPlatform)
+    isLinux
+    isWindows
+    isAarch64
+    ;
+
+  emulator = stdenv.hostPlatform.emulator buildPackages;
+  exe = stdenv.hostPlatform.extensions.executable;
+
+  hasPgpGpgFeature = builtins.elem "pgp-gpg" buildFeatures;
+  hasKeyringFeature = builtins.elem "keyring" buildFeatures;
+  hasNotmuchFeature = builtins.elem "notmuch" buildFeatures;
+
+  dbus' = dbus.overrideAttrs (old: {
+    env = (old.env or { }) // {
+      NIX_CFLAGS_COMPILE =
+        (old.env.NIX_CFLAGS_COMPILE or "")
+        # required for D-Bus on Linux AArch64
+        + lib.optionalString (isLinux && isAarch64) " -mno-outline-atomics";
+    };
+  });

-  features =
-    lib.warnIf (args ? buildFeatures)
-      "buildFeatures is deprecated in favour of withFeatures and will be removed in the next release"
-      withFeatures;
 in
-
 rustPlatform.buildRustPackage {
-  inherit version cargoHash;
+  inherit
+    version
+    cargoHash
+    buildNoDefaultFeatures
+    ;

  pname = "himalaya";

@@ -45,36 +60,44 @@ rustPlatform.buildRustPackage {
    rev = "v${version}";
  };

-  buildNoDefaultFeatures = noDefaultFeatures;
-  buildFeatures = features;
+  env = {
+    # OpenSSL should not be provided by vendors, not even on Windows
+    OPENSSL_NO_VENDOR = "1";
+  };

-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
+  nativeBuildInputs =
+    [ ]
+    ++ lib.optional (hasPgpGpgFeature || hasKeyringFeature || hasNotmuchFeature) pkg-config
+    ++ lib.optional (installManPages || installShellCompletions) installShellFiles;

  buildInputs =
    [ ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk
-    ++ lib.optional (builtins.elem "notmuch" withFeatures) notmuch
-    ++ lib.optional (builtins.elem "pgp-gpg" withFeatures) gpgme;
+    ++ lib.optional hasPgpGpgFeature gpgme
+    ++ lib.optional (hasKeyringFeature && !isWindows) dbus'
+    ++ lib.optional hasNotmuchFeature notmuch;
+
+  buildFeatures =
+    buildFeatures
+    # D-Bus is provided by vendors on Windows
+    ++ lib.optional (hasKeyringFeature && isWindows) "vendored";

  # most of the tests are lib side
  doCheck = false;

  postInstall =
-    let
-      emulator = stdenv.hostPlatform.emulator buildPackages;
-    in
+    lib.optionalString (lib.hasInfix "wine" emulator) ''
+      export WINEPREFIX="''${WINEPREFIX:-$(mktemp -d)}"
+      mkdir -p $WINEPREFIX
    ''
+    + ''
      mkdir -p $out/share/{applications,completions,man}
      cp assets/himalaya.desktop "$out"/share/applications/
-      ${emulator} "$out"/bin/himalaya man "$out"/share/man
-      ${emulator} "$out"/bin/himalaya completion bash > "$out"/share/completions/himalaya.bash
-      ${emulator} "$out"/bin/himalaya completion elvish > "$out"/share/completions/himalaya.elvish
-      ${emulator} "$out"/bin/himalaya completion fish > "$out"/share/completions/himalaya.fish
-      ${emulator} "$out"/bin/himalaya completion powershell > "$out"/share/completions/himalaya.powershell
-      ${emulator} "$out"/bin/himalaya completion zsh > "$out"/share/completions/himalaya.zsh
+      ${emulator} "$out"/bin/himalaya${exe} man "$out"/share/man
+      ${emulator} "$out"/bin/himalaya${exe} completion bash > "$out"/share/completions/himalaya.bash
+      ${emulator} "$out"/bin/himalaya${exe} completion elvish > "$out"/share/completions/himalaya.elvish
+      ${emulator} "$out"/bin/himalaya${exe} completion fish > "$out"/share/completions/himalaya.fish
+      ${emulator} "$out"/bin/himalaya${exe} completion powershell > "$out"/share/completions/himalaya.powershell
+      ${emulator} "$out"/bin/himalaya${exe} completion zsh > "$out"/share/completions/himalaya.zsh
    ''
    + lib.optionalString installManPages ''
      installManPage "$out"/share/man/*
@@ -3,16 +3,15 @@
  buildGo126Module,
  fetchFromGitHub,
 }:
-
 buildGo126Module (finalAttrs: {
  pname = "hyprmon";
-  version = "0.0.14";
+  version = "0.0.15";

  src = fetchFromGitHub {
    owner = "erans";
    repo = "hyprmon";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ObOvC2cIoLTBaGmpTAkm2y4vzqg61z+JZotEnmef1eE=";
+    hash = "sha256-dcjEnxSQwXUPJ44gj7pVPQtZUkBXbqLvQgmhYvANz8o=";
  };

  vendorHash = "sha256-n4RZxpsrlSUD3B/GLVoM2CPckvDkbyaMyg6h4QNbuH0=";
@@ -50,11 +50,15 @@ let
      # ariadne 0.29+ is missing 'convert_kwargs_to_snake_case'
      ariadne = prev.ariadne.overridePythonAttrs (oldAttrs: rec {
        version = "0.28.0";
-        src = fetchPypi {
-          inherit (oldAttrs) pname;
-          inherit version;
-          hash = "sha256-gW66L7djPo4nHjd/UN18IPYFo956wzSqM+p1AZF/qnw=";
-        };
+        src =
+          fetchPypi {
+            inherit (oldAttrs) pname;
+            inherit version;
+            hash = "sha256-gW66L7djPo4nHjd/UN18IPYFo956wzSqM+p1AZF/qnw=";
+          }
+          // {
+            tag = version;
+          };
        patches = [ ];
        doCheck = false;
      });
@@ -2,19 +2,20 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
+  git,
  versionCheckHook,
  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jarl";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "etiennebacher";
    repo = "jarl";
    tag = finalAttrs.version;
-    hash = "sha256-96ekjR0lcNhcmkEILYZd/QpeJl1pXJ2OBP4WyJ3AX90=";
+    hash = "sha256-MFP1xMNnJ9mfHuUu6hqE9B7nRgI2HfXBpblo3sFnAwo=";
  };

  postPatch = ''
@@ -24,7 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
                   '(?:/nix)?/(?:build)/(?:nix[\-0-9]+/)?'
  '';

-  cargoHash = "sha256-FfoYed147pR8fa2176vvFJmAiXMTGE/UVtT57rKuj9s=";
+  cargoHash = "sha256-Rhv9Wku/bRl28nrXYof+6VAgl2K4ysILRQa1v19r0pU=";
+
+  # integrations test require git at build time (jarl >= 0.5.0)
+  nativeBuildInputs = [ git ];

  # Don't run integration_tests for jarl-lsp, because it doesn't see
  # the CARGO_BIN_EXE_jarl env var even if exported in preCheck
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jsongrep";
-  version = "0.8.1";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "micahkepe";
    repo = "jsongrep";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-A4cBHIRXmjpRSJtUNNPGOfSOFQG4om5QFa9xw4MeYj8=";
+    hash = "sha256-rDt4jtrC+KuPKdEoReVWW8R9/sKBnalnRuB4bj1tzas=";
  };

-  cargoHash = "sha256-RQLMQ2jEtqh7km4FWhBaWuw9QY4B4O50DbPdBO+hcW4=";
+  cargoHash = "sha256-VJ8ZB3oVppMRsSvpVOF1SIvOtI0rcS8elJEweoum/lY=";

  nativeBuildInputs = [ installShellFiles ];

@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitHub,
+  fetchpatch,
  qt6,
  ffmpeg_4,
  pkg-config,
@@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-eW5sO1gjuwIighnlylJQd9QC+07s1MZX/oPyaHIi/Qs=";
  };

+  patches = [
+    # fix build with Qt 6.10, remove after next release
+    # https://github.com/gyunaev/karlyriceditor/pull/38
+    (fetchpatch {
+      url = "https://github.com/gyunaev/karlyriceditor/commit/1d5e095cc691d4239c919d78209bdd05e57ed2aa.patch";
+      hash = "sha256-G93OfcQzgv8PhRQa8aUNsjaIt0GcGQxZGe4Eo0xP7TM=";
+    })
+  ];
+
  nativeBuildInputs = [
    qt6.wrapQtAppsHook
    qt6.qmake
@@ -10,7 +10,7 @@
  setuptools,
  euclid3,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "solidpython";
  version = "1.1.3";
  pyproject = true;
@@ -54,8 +54,8 @@ buildPythonPackage rec {
  meta = {
    description = "Python interface to the OpenSCAD declarative geometry language";
    homepage = "https://github.com/SolidCode/SolidPython";
-    changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${version}";
+    changelog = "https://github.com/SolidCode/SolidPython/releases/tag/v${finalAttrs.version}";
    maintainers = with lib.maintainers; [ jfly ];
    license = lib.licenses.lgpl21Plus;
  };
-}
+})
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "kine";
-  version = "0.14.14";
+  version = "0.14.16";

  src = fetchFromGitHub {
    owner = "k3s-io";
    repo = "kine";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-G1GVR0bgcx51HqwsCUqd9H30mWZgLkYYy2PNdmO/oQw=";
+    hash = "sha256-WLH0aGs8Y8DKbhsjvtnp2sjEDP1F19V/tEtdfT+3FtM=";
  };

-  vendorHash = "sha256-N5FEspfnc6GexPIzN5PbX8/XYD0LXledE+mi9Ni0gTU=";
+  vendorHash = "sha256-RFqK2k1Gm89Oc3c+LAEE2FyOVIfEYIrEbUXQVHUWbrU=";

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

-python3.pkgs.buildPythonPackage rec {
+python3.pkgs.buildPythonPackage (finalAttrs: {
  pname = "krr";
  version = "1.7.1";
  pyproject = true;
@@ -14,16 +14,16 @@ python3.pkgs.buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "robusta-dev";
    repo = "krr";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-Bc1Ql3z/UmOXE2RJYC5/sE4a3MFdE06I3HwKY+SdSlk=";
  };

  postPatch = ''
    substituteInPlace robusta_krr/__init__.py \
-      --replace-warn '1.7.0-dev' '${version}'
+      --replace-warn '1.7.0-dev' '${finalAttrs.version}'

    substituteInPlace pyproject.toml \
-      --replace-warn '1.7.0-dev' '${version}' \
+      --replace-warn '1.7.0-dev' '${finalAttrs.version}' \
      --replace-fail 'aiostream = "^0.4.5"' 'aiostream = "*"' \
      --replace-fail 'kubernetes = "^26.1.0"' 'kubernetes = "*"' \
      --replace-fail 'pydantic = "1.10.7"' 'pydantic = "*"' \
@@ -65,9 +65,9 @@ python3.pkgs.buildPythonPackage rec {
      reduces costs and improves performance.
    '';
    homepage = "https://github.com/robusta-dev/krr";
-    changelog = "https://github.com/robusta-dev/krr/releases/tag/v${src.rev}";
+    changelog = "https://github.com/robusta-dev/krr/releases/tag/v${finalAttrs.src.rev}";
    license = lib.licenses.mit;
    maintainers = [ ];
    mainProgram = "krr";
  };
-}
+})
@@ -12,14 +12,14 @@
  pytestCheckHook,
  versionCheckHook,
 }:
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "kubernetes-validate";
  version = "1.35.0";
  pyproject = true;

  src = fetchPypi {
    pname = "kubernetes_validate";
-    inherit version;
+    inherit (finalAttrs) version;
    hash = "sha256-UKnkbaLARxwoK7MTjH14XSkjH28be8LmimEatBsigyY=";
  };

@@ -45,9 +45,9 @@ buildPythonPackage rec {
  meta = {
    description = "Module to validate Kubernetes resource definitions against the declared Kubernetes schemas";
    homepage = "https://github.com/willthames/kubernetes-validate";
-    changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${version}";
+    changelog = "https://github.com/willthames/kubernetes-validate/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ lykos153 ];
    mainProgram = "kubernetes-validate";
  };
-}
+})
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "lazydocker";
-  version = "0.25.0";
+  version = "0.25.2";

  src = fetchFromGitHub {
    owner = "jesseduffield";
    repo = "lazydocker";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ZZl0gt0gNjEI3JC96Xc29SZAyKh15jCuGHyEanIwNwY=";
+    sha256 = "sha256-MHSZ0O8LPx1SOhrUK0sh73jDvDvu31Qsw+yjsTMQN/Y=";
  };

  vendorHash = null;
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  fetchDebianPatch,
  boost,
  cmake,
  libsForQt5,
@@ -10,18 +11,28 @@
  zlib,
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "leela-zero";
  version = "0.17-unstable-2023-02-07";

  src = fetchFromGitHub {
-    owner = "gcp";
+    owner = "leela-zero";
    repo = "leela-zero";
    rev = "3ee6d20d0b36ae26120331c610926359cc5837de";
    hash = "sha256-JF25y471miw/0b7XXBURzK+4WBwZI5ZUP+36/cZUORo=";
    fetchSubmodules = true;
  };

+  patches = [
+    (fetchDebianPatch {
+      pname = finalAttrs.pname;
+      version = "0.17";
+      debianRevision = "1.3";
+      patch = "boost1.90.patch";
+      hash = "sha256-/vnRuRWlZl+pzJvjP6a/A9TaFNuCSkTZkd4h9zvZJis=";
+    })
+  ];
+
  buildInputs = [
    boost
    opencl-headers
@@ -47,4 +58,4 @@ stdenv.mkDerivation {
    ];
    platforms = lib.platforms.linux;
  };
-}
+})
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  lib,
+  fetchzip,
+  cmake,
+  pkg-config,
+  libusb1,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libdlcr";
+  version = "0.3.0";
+
+  src = fetchzip {
+    url = "https://dragnlabs.com/host-tools/dlcr_host_v${finalAttrs.version}.zip";
+    hash = "sha256-DOoc02woE10tU+8CDaYC0Xezvma06+UbhVuGFEiG67c=";
+    stripRoot = false;
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [ libusb1 ];
+
+  postPatch = ''
+    # Workaround based on
+    # https://github.com/NixOS/nixpkgs/issues/144170
+
+    substituteInPlace libdlcr.pc.in --replace-fail "\''${prefix}/" ""
+  '';
+
+  meta = {
+    description = "Dragon Labs CR-8 Host Driver and Utilities";
+    homepage = "https://dragnlabs.com/";
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ noderyos ];
+  };
+})
@@ -7,12 +7,12 @@
 let
  pname = "lmstudio";

-  version_aarch64-linux = "0.4.10-1";
-  hash_aarch64-linux = "sha256-fo9jUmEtqu8bkfL1/v84IAp3RG0ua5g4hgieszhWOuM=";
-  version_aarch64-darwin = "0.4.10-1";
-  hash_aarch64-darwin = "sha256-LgaxbTXmiKyI/T8D+K+SLVzUgiQzOq/6JKEDwktrrDU=";
-  version_x86_64-linux = "0.4.10-1";
-  hash_x86_64-linux = "sha256-FC7rPA1CxTaYakpSSpjxYiPETW8+N5QmsmUib3RHD0o=";
+  version_aarch64-linux = "0.4.12-1";
+  hash_aarch64-linux = "sha256-Gt3QiP4P3BpbRf7gvdKLUaf9/oz/eef5M0bVzCqHPSw=";
+  version_aarch64-darwin = "0.4.12-1";
+  hash_aarch64-darwin = "sha256-S4Xj1mzjxGBKAECmayVnL4p1a2HuvQlz+BKHO4oPM3U=";
+  version_x86_64-linux = "0.4.12-1";
+  hash_x86_64-linux = "sha256-U7TJkMUqmL4Wk77zcIN2/4IFz7artvVg0saREjoGy8I=";

  meta = {
    description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
@@ -3,32 +3,41 @@
  fetchFromGitHub,
  lib,
  pkg-config,
-  SDL2,
+  sdl3,
  libserialport,
+  cmake,
+  copyDesktopItems,
+  nix-update-script,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "m8c";
-  version = "1.7.10";
+  version = "2.2.3";

  src = fetchFromGitHub {
    owner = "laamaa";
    repo = "m8c";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-8QkvvTtFxQmDIqpyhZi/ORcB7YwENu+YafYtCZw0faE=";
+    hash = "sha256-cr5tat7JOFJ7y7AEinphgV/5T138gV6jidb87GooZ8U=";
  };

  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

  installFlags = [ "PREFIX=$(out)" ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    copyDesktopItems
+  ];

  buildInputs = [
-    SDL2
+    sdl3
    libserialport
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Cross-platform M8 tracker headless client";
    homepage = "https://github.com/laamaa/m8c";
@@ -6,7 +6,7 @@
  maven,
 }:
 let
-  version = "8.22";
+  version = "8.23";
 in
 maven.buildMavenPackage {
  pname = "megabasterd";
@@ -16,7 +16,7 @@ maven.buildMavenPackage {
    owner = "tonikelope";
    repo = "megabasterd";
    tag = "v${version}";
-    hash = "sha256-dkxIbQCnOnZ3tbqijqlRhEtEJ4q1ksot5n0gJ7HvsgI=";
+    hash = "sha256-FcEG+DvHa+ZcMV2CfKmLzMaXgEXzTW3qmULV4PwHaQ8=";
  };

  mvnHash = "sha256-b7+17CXmBB65fMG472FPjOvr+9nAsUurdBC/7esalCE=";
@@ -0,0 +1,125 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0daf084d..4ff0a86d 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -88,6 +88,12 @@ endif()
+ include(megacmd_options) #Load first MEGAcmd's options (that we have prevalescence over SDK (e.g libuv)
+ include(sdklib_options) #load default sdk's
+ 
+if (WIN32 OR APPLE)
+    option(ENABLE_UPDATER "Enable updater" ON)
+else()
+    option(ENABLE_UPDATER "Enable updater" OFF)
+endif()
+
+ if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h)
+     file(RENAME ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h ${CMAKE_CURRENT_LIST_DIR}/sdk/include/mega/config.h_non_cmake_bk)
+ endif()
+@@ -222,6 +228,10 @@ target_compile_definitions(LMegacmdServer
+     $<$<BOOL:${USE_PCRE}>:USE_PCRE>
+ )
+ 
+if (ENABLE_UPDATER)
+    target_compile_definitions(LMegacmdServer PUBLIC ENABLE_UPDATER)
+endif()
+
+ if (NOT WIN32)
+     if (ENABLE_ASAN)
+         add_compile_options("-fsanitize=address" "-fno-omit-frame-pointer" "-fno-common")
+@@ -419,7 +429,7 @@ load_megacmdserver_libraries()
+ 
+ 
+ list(APPEND all_targets mega-exec mega-cmd mega-cmd-server)
+-if (APPLE)
+if (APPLE AND ENABLE_UPDATER)
+     list(APPEND all_targets mega-cmd-updater)
+ endif()
+ 
+diff --git a/src/megacmd.cpp b/src/megacmd.cpp
+index 9110ae31..aeb3b1e1 100644
+--- a/src/megacmd.cpp
+++ b/src/megacmd.cpp
+@@ -830,7 +830,7 @@ void insertValidParamsPerCommand(set<string> *validParams, string thecommand, se
+     {
+         validParams->insert("only-shell");
+     }
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+     else if ("update" == thecommand)
+     {
+         validOptValues->insert("auto");
+@@ -4211,7 +4211,7 @@ static bool process_line(const std::string_view line)
+                 break;
+             }
+ 
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+             else if (isBareCommand(l, "update")) //if extra args are received, it'll be processed by executer
+             {
+                 string confirmationQuery("This might require restarting MEGAcmd. Are you sure to continue");
+@@ -4684,7 +4684,7 @@ void megacmd()
+ 
+                 std::string s;
+ 
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+                 ostringstream os;
+                 auto updatMsgOpt = lookForAvailableNewerVersions(api);
+                 //TODO: have this executed in worker thread instead (see MegaCmdExecuter::mayExecutePendingStuffInWorkerThread)
+diff --git a/src/megacmdcommonutils.h b/src/megacmdcommonutils.h
+index 039d7b81..977dbb67 100644
+--- a/src/megacmdcommonutils.h
+++ b/src/megacmdcommonutils.h
+@@ -120,7 +120,7 @@ static std::vector<std::string> loginInValidCommands { "log", "debug", "speedlim
+ #elif defined(_WIN32)
+                              , "unicode"
+ #endif
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+                              , "update"
+ #endif
+                            };
+@@ -144,7 +144,7 @@ static std::vector<std::string> allValidCommands { "login", "signup", "confirm",
+ #else
+                              , "permissions"
+ #endif
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+                              , "update"
+ #endif
+ #ifdef WITH_FUSE
+diff --git a/src/megacmdexecuter.cpp b/src/megacmdexecuter.cpp
+index 19f4903b..7712d546 100644
+--- a/src/megacmdexecuter.cpp
+++ b/src/megacmdexecuter.cpp
+@@ -2696,7 +2696,7 @@ int MegaCmdExecuter::actUponLogin(SynchronousRequestListener *srl, int timeout)
+         fetchNodes(api, clientID);
+     }
+ 
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+ 
+     MegaCmdListener *megaCmdListener = new MegaCmdListener(NULL);
+     srl->getApi()->getLastAvailableVersion("BdARkQSQ",megaCmdListener);
+@@ -5829,7 +5829,7 @@ void MegaCmdExecuter::executecommand(vector<string> words, map<string, int> *clf
+             }
+         }
+     }
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+     else if (words[0] == "update")
+     {
+         string sauto = getOption(cloptions, "auto", "");
+diff --git a/src/megacmdshell/megacmdshell.cpp b/src/megacmdshell/megacmdshell.cpp
+index 7723982e..2d077c7c 100644
+--- a/src/megacmdshell/megacmdshell.cpp
+++ b/src/megacmdshell/megacmdshell.cpp
+@@ -1289,7 +1289,7 @@ void process_line(const char * line)
+                         doExit = true;
+                     }
+                 }
+-#if defined(_WIN32) || defined(__APPLE__)
+#ifdef ENABLE_UPDATER
+                 else if (words[0] == "update")
+                 {
+                     comms->markServerIsUpdating();
@@ -1,49 +1,30 @@
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,6 +25,11 @@ AM_CPPFLAGS = \
- 
- AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/sdk/include
- 
-+if DARWIN
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx -I$(top_srcdir)/sdk/include/mega/osx
-+endif
-+
- if WIN32
- AM_CPPFLAGS+=-I$(top_srcdir)/sdk/include/mega/win32
- else
+diff --git a/src/megacmdshell/megacmdshellcommunications.cpp b/src/megacmdshell/megacmdshellcommunications.cpp
+index bdd683b2..266e17ee 100644
 --- a/src/megacmdshell/megacmdshellcommunications.cpp
 +++ b/src/megacmdshell/megacmdshellcommunications.cpp
-@@ -306,10 +306,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
-         #endif
-                     const char executable2[] = "./mega-cmd-server";
-     #else
-        #ifdef __MACH__
-                    const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd";
-                    const char executable2[] = "./mega-cmd";
-        #else
-                     const char executable[] = "mega-cmd-server";
-             #ifdef __linux__
-                     char executable2[PATH_MAX];
-@@ -317,7 +313,6 @@ SOCKET MegaCmdShellCommunications::createSocket(int number, bool initializeserve
-             #else
-                     const char executable2[] = "./mega-cmd-server";
-             #endif
-        #endif
+@@ -153,12 +153,9 @@ SOCKET MegaCmdShellCommunicationsPosix::createSocket(int number, bool initialize
+ #ifndef NDEBUG
+                 const char executable[] = "./mega-cmd-server";
+ #else
+-    #ifdef __MACH__
+-                const char executable[] = "/Applications/MEGAcmd.app/Contents/MacOS/mega-cmd";
+-                const char executable2[] = "./mega-cmd";
+-    #else
+                 const char executable[] = "mega-cmd-server";
+                 char executable2[PATH_MAX];
+    #ifdef __linux__
+                 sprintf(executable2, "%s/mega-cmd-server", getCurrentExecPath().c_str());
     #endif
+ #endif
+@@ -217,11 +214,7 @@ SOCKET MegaCmdShellCommunicationsPosix::createSocket(int number, bool initialize
+             {
 
-                     std::vector<char*> argsVector{
--- a/sdk/Makefile.am
-+++ b/sdk/Makefile.am
-@@ -27,6 +27,11 @@ AM_CPPFLAGS = \
- 
- include m4/aminclude.am
- 
-+if DARWIN
-+AM_LIBTOOLFLAGS="--tag=CXX"
-+AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/osx
-+endif
-+
- if WIN32
- AM_CPPFLAGS+=-I$(top_srcdir)/include/mega/win32
- else
+                 cerr << "Unable to connect to " << (number?("response socket N "+std::to_string(number)):"service") << ": error=" << ERRNO << endl;
+-#ifdef __linux__
+                 cerr << "Please ensure mega-cmd-server is running" << endl;
+-#else
+-                cerr << "Please ensure MEGAcmdServer is running" << endl;
+-#endif
+                 return INVALID_SOCKET;
+             }
+             else
@@ -1,29 +0,0 @@
--- a/sdk/src/gfx/freeimage.cpp
-+++ b/sdk/src/gfx/freeimage.cpp
-@@ -216,11 +216,13 @@ bool GfxProviderFreeImage::readbitmapFreeimage(const LocalPath& imagePath, int s
- 
- #ifdef HAVE_FFMPEG
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 60
- #ifdef AV_CODEC_CAP_TRUNCATED
- #define CAP_TRUNCATED AV_CODEC_CAP_TRUNCATED
- #else
- #define CAP_TRUNCATED CODEC_CAP_TRUNCATED
- #endif
-+#endif
- 
- const char *GfxProviderFreeImage::supportedformatsFfmpeg()
- {
-@@ -323,10 +325,12 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(const LocalPath& imagePath, int size
- 
-     // Force seeking to key frames
-     formatContext->seek2any = false;
-+#if LIBAVCODEC_VERSION_MAJOR < 60
-     if (decoder->capabilities & CAP_TRUNCATED)
-     {
-         codecContext->flags |= CAP_TRUNCATED;
-     }
-+#endif
- 
-     AVPixelFormat sourcePixelFormat = static_cast<AVPixelFormat>(codecParm->format);
-     AVPixelFormat targetPixelFormat = AV_PIX_FMT_BGR24; //raw data expected by freeimage is in this format
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -135,7 +135,6 @@ if(UNIX AND NOT APPLE)
+     # Note: using cmake --install --prefix /some/prefix will not set rpath relative to that prefix
+     # The above can be used for building packages: in which install dir is a path construction folder that will not be there in packages
+     set(CMAKE_INSTALL_LIBDIR "opt/megacmd/lib")
+-    set(CMAKE_INSTALL_BINDIR "usr/bin") #override default "bin"
+ 
+     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+         message(STATUS "Overriding default CMAKE_INSTALL_PREFIX to /")
+@@ -430,9 +429,9 @@ endif()
+ if (APPLE)
+     install(TARGETS ${all_targets}
+         BUNDLE
+-        DESTINATION "./"
+        DESTINATION "Applications/"
+     )
+ elseif(NOT WIN32)
+     set(PERMISSIONS755
+          OWNER_READ
+          OWNER_WRITE
@@ -0,0 +1,40 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb161de8..5fa97e79 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -39,7 +39,7 @@ execute_process(
+ )
+ endif()
+ 
+-if((NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT})
+if(VCPKG_ROOT AND (NOT WIN32 OR BASH_VERSION_RESULT EQUAL 0) AND NOT EXISTS ${VCPKG_ROOT})
+     message(STATUS "vcpkg will be cloned into ${VCPKG_ROOT}")
+     execute_process(
+         #TODO: have the same for windows ... or at least check if bash is available
+@@ -468,17 +468,19 @@ elseif(NOT WIN32)
+         DESTINATION "etc/sysctl.d"
+         )
+ 
+-    #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs.
+-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-        SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/")
+-    else()
+-        SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/")
+-    endif()
+-    install(DIRECTORY "${vcpkg_lib_folder}"
+    if(VCPKG_ROOT)
+        #Install vcpkg dynamic libraries in locations defined by GNUInstallDirs.
+        if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+            SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/")
+        else()
+            SET(vcpkg_lib_folder "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/")
+        endif()
+        install(DIRECTORY "${vcpkg_lib_folder}"
+             DESTINATION ${CMAKE_INSTALL_LIBDIR}
+             FILES_MATCHING
+             PATTERN "lib*.so*"
+             PATTERN "*dylib*" #macOS
+             PATTERN "manual-link" EXCLUDE
+             PATTERN "pkgconfig" EXCLUDE)
+    endif()
+ endif() #not WIN32
@@ -1,106 +1,170 @@
 {
  lib,
  stdenv,
-  autoreconfHook,
-  c-ares,
+  cmake,
  cryptopp,
  curl,
  fetchFromGitHub,
+  file,
  ffmpeg,
-  gcc-unwrapped,
+  fuse,
  icu,
  libmediainfo,
-  libraw,
  libsodium,
  libuv,
  libzen,
-  pcre-cpp,
+  makeWrapper,
+  nix-update-script,
+  pdfium-binaries,
  pkg-config,
  readline,
  sqlite,
+  versionCheckHook,
+  writeShellScriptBin,
 }:

-let
+stdenv.mkDerivation (finalAttrs: {
  pname = "megacmd";
-  version = "1.7.0";
-  srcOptions =
-    if stdenv.hostPlatform.isLinux then
-      {
-        tag = "${version}_Linux";
-        hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
-      }
-    else
-      {
-        tag = "${version}_macOS";
-        hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM=";
-      };
-in
-stdenv.mkDerivation {
-  inherit pname version;
+  version = "2.5.2";

-  src = fetchFromGitHub (
-    srcOptions
-    // {
-      owner = "meganz";
-      repo = "MEGAcmd";
-      fetchSubmodules = true;
-    }
-  );
+  src = fetchFromGitHub {
+    owner = "meganz";
+    repo = "MEGAcmd";
+    # The upstream makes a tag for each platform getting a release,
+    # but the tags all point to the same commit,
+    # so we just stick to the Linux tag to make the update script easy.
+    tag = "${finalAttrs.version}_Linux";
+    fetchSubmodules = true;
+    postCheckout = "git -C $out/sdk rev-parse --short HEAD > $out/sdk/.gitrev";
+    hash = "sha256-RE4n4igAXhYNshnjjyeb2McmBKt5HY0oZ+U5SMMtQ2I=";
+  };

-  enableParallelBuilding = true;
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [ gcc-unwrapped ] # fix: ld: cannot find lib64/libstdc++fs.a
-    ++ [
-      c-ares
-      cryptopp
-      curl
-      ffmpeg
-      icu
-      libmediainfo
-      libraw
-      libsodium
-      libuv
-      libzen
-      pcre-cpp
-      readline
-      sqlite
-    ];
-
-  configureFlags = [
-    "--disable-examples"
-    "--with-cares"
-    "--with-cryptopp"
-    "--with-curl"
-    "--with-ffmpeg"
-    "--with-icu"
-    "--with-libmediainfo"
-    "--with-libuv"
-    "--with-libzen"
-    "--with-pcre"
-    "--with-readline"
-    "--with-sodium"
-    "--with-termcap"
-    "--without-freeimage"
-  ];
-
-  # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
-  postConfigure = ''
-    echo '#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0' >> sdk/include/mega/config.h
-  '';
+  __structuredAttrs = true;

  patches = [
-    ./fix-ffmpeg.patch # https://github.com/meganz/sdk/issues/2635#issuecomment-1495405085
-    ./fix-darwin.patch # fix: libtool tag not found; MacFileSystemAccess not declared; server cannot init
+    # use pkg-config instead of vcpkg
+    # https://github.com/meganz/MEGAcmd/pull/1067
+    ./no-vcpkg.patch
+
+    # use cmake option to enable the updater instead of depending on os
+    # https://github.com/meganz/MEGAcmd/pull/1117
+    ./disable-updater.patch
+
+    # fix install paths (/usr/bin -> /bin on linux, and / -> /Applications on darwin)
+    ./install-path.patch
+
+    # do not look for the mega-cmd-server executable in /Applications on darwin
+    # but use the same strategy as on linux
+    ./fix-darwin.patch
  ];

+  postPatch = ''
+    # interesting typo (https://github.com/meganz/MEGAcmd/pull/1118, https://github.com/meganz/sdk/pull/2770)
+    substituteInPlace build/cmake/modules/megacmd_configuration.cmake sdk/cmake/modules/configuration.cmake \
+      --replace-fail "check_function_exists(aio_write, HAVE_AIO_RT)" "check_function_exists(aio_write HAVE_AIO_RT)"
+
+    # cryptopp on nixpkgs has libcryptopp.pc, not libcrypto++.pc
+    # pdfium-binaries{,-v8} in nixpkgs does not provide a pc file but only a cmake file
+    # libicui18n is needed (https://github.com/meganz/sdk/pull/2769)
+    substituteInPlace sdk/cmake/modules/sdklib_libraries.cmake \
+      --replace-fail "pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcrypto++)" "pkg_check_modules(cryptopp REQUIRED IMPORTED_TARGET libcryptopp)" \
+      --replace-fail "pkg_check_modules(pdfium REQUIRED IMPORTED_TARGET pdfium)" "find_package(PDFium)" \
+      --replace-fail "target_link_libraries(SDKlib PRIVATE PkgConfig::pdfium)" "target_link_libraries(SDKlib PRIVATE pdfium)" \
+      --replace-fail "find_package(ICU COMPONENTS uc data REQUIRED)" "find_package(ICU COMPONENTS i18n uc data REQUIRED)" \
+      --replace-fail "target_link_libraries(SDKlib PRIVATE ICU::uc ICU::data)" "target_link_libraries(SDKlib PRIVATE ICU::i18n ICU::uc ICU::data)"
+  '';
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    file
+    makeWrapper
+
+    # https://github.com/meganz/MEGAcmd/blob/2.5.0_Linux/CMakeLists.txt#L4-L10
+    (writeShellScriptBin "git" ''
+      dir="$(pwd)"
+      while [[ ! -f "$dir/.gitrev" ]]; do
+        if [[ "$dir" == "/" ]]; then
+          echo "fatal: not a git repository (or any of the parent directories): .git" >&2
+          exit 128
+        fi
+        dir="$(dirname "$dir")"
+      done
+      cat "$dir/.gitrev"
+    '')
+  ];
+
+  buildInputs = [
+    cryptopp
+    curl
+    ffmpeg
+    fuse
+    icu
+    libmediainfo
+    libsodium
+    libuv
+    libzen
+    pdfium-binaries
+    readline
+    sqlite
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "VCPKG_ROOT" "") # fallback to pkg-config instead of vcpkg
+    (lib.cmakeBool "ENABLE_UPDATER" false)
+    (lib.cmakeBool "USE_FREEIMAGE" false) # freeimage was removed from nixpkgs
+    (lib.cmakeBool "USE_PCRE" false) # causes link errors and is not needed anyway (use std::regex instead)
+  ];
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/bin
+    for bundle in $out/Applications/*.app; do
+      ln -s "$bundle/Contents/MacOS"/* -t $out/bin
+    done
+
+    # this command has different names (linux: mega-cmd-server; macos: MEGAcmd; windows: MEGAcmdServer)
+    # NOTE: official documentation (https://help.mega.io/desktop-app/mega-cmd/cmd) is outdated about this
+    ln -s $out/bin/MEGAcmd $out/bin/mega-cmd-server
+
+    # these commands are installed on linux but not on macos
+    install -Dm755 ../src/client/mega-* -t $out/bin
+  '';
+
+  preFixup = ''
+    # use mega-exec from the same package instead of the one from PATH to avoid version mismatch
+    for f in $out/bin/*; do
+      if [[ "$(file -b --mime-type "$f")" == text/* ]]; then # shell script
+        substituteInPlace "$f" --replace-fail mega-exec "exec $out/bin/mega-exec"
+      elif [[ -f "$f" ]]; then # binary executable and not symlink
+        wrapProgram "$f" --prefix PATH : $out/bin${
+          # there are some rpath problems on darwin that causes the binaries unable to find shared libraries
+          # there is probably a better way to fix this, but I cannot find it out
+          # everything in buildInputs is needed
+          lib.optionalString stdenv.hostPlatform.isDarwin
+            " --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs}"
+        }
+      fi
+    done
+  '';
+
+  # mega-exec wants to connect to megacmd server
+  __darwinAllowLocalNetworking = finalAttrs.doInstallCheck;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/mega-version";
+  versionCheckProgramArg = "-l";
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version-regex=(\\d+\\.\\d+\\.\\d+)_Linux" ];
+  };
+
  meta = {
    description = "MEGA Command Line Interactive and Scriptable Application";
    homepage = "https://mega.io/cmd";
+    changelog = "https://github.com/meganz/MEGAcmd/blob/${finalAttrs.src.tag}/build/megacmd/megacmd.changes";
    license = with lib.licenses; [
      bsd2
      gpl3Only
@@ -110,5 +174,6 @@ stdenv.mkDerivation {
      lunik1
      ulysseszhan
    ];
+    mainProgram = "mega-cmd";
  };
-}
+})
@@ -20,37 +20,23 @@

 buildGoModule (finalAttrs: {
  pname = "navidrome";
-  version = "0.61.1";
+  version = "0.61.2";

  src = fetchFromGitHub {
    owner = "navidrome";
    repo = "navidrome";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-BRMJCBQl38AqsCI2UYQ9X36U57pg9uuiHsx8sHpVBKE=";
+    hash = "sha256-epSgGiDdfNRUaQtWoOd4ADKtF7Ptt3p9UOqsWBzZg7I=";
  };

-  patches = [
-    # https://github.com/navidrome/navidrome/pull/5276 (waiting on release)
-    (fetchpatch {
-      name = "regenerate-package-lock-json";
-      url = "https://github.com/navidrome/navidrome/compare/v0.61.1...33a05ef662760fd9feb0a3ae43c7fe149eda610b.patch";
-      hash = "sha256-IQ0wJ7vsSaLjBZS/fKIApNM8UV8oj6L2taCQIPhHvwg=";
-    })
-  ];
-
-  vendorHash = "sha256-iVXJPP41rIpC6Tu1P/jWcePYCQ2Z9lEoTOrDLN26kTU=";
+  vendorHash = "sha256-RmmZudmWBxiw+c9g8KFEX+ALFD0xP/SBsYc6b6RWWO8=";

  npmRoot = "ui";

  npmDeps = fetchNpmDeps {
-    inherit (finalAttrs) src patches;
-    # Remove after https://github.com/navidrome/navidrome/pull/5276 is released
-    # patches are applied after we run npmDeps without inheriting patches here
-    # so we have to get out of the sourceRoot to apply it then get back in to it
-    prePatch = "cd ..";
-    postPatch = "cd ui";
+    inherit (finalAttrs) src;
    sourceRoot = "${finalAttrs.src.name}/ui";
-    hash = "sha256-iXey2XmDwsTR1/bIrBLzm6uvVGzPgQFcDLUtNy8robI=";
+    hash = "sha256-7hy2vLCEicKzjORpJZ0mrRS8PT3GsJ8DWdvj/7SrB70=";
  };

  nativeBuildInputs = [
@@ -64,26 +64,29 @@ stdenv.mkDerivation (
        }))
      else
        luapkgs.lpeg;
-    requiredLuaPkgs =
+    runtimeLuaPkgs = ps: [
+      (nvim-lpeg-dylib ps)
+      ps.luabitop
+      ps.mpack
+    ];
+    checkLuaPkgs =
      ps:
-      (
-        with ps;
-        [
-          (nvim-lpeg-dylib ps)
-          luabitop
-          mpack
-        ]
-        ++ lib.optionals finalAttrs.finalPackage.doCheck [
-          luv
-          coxpcall
-          busted
-          luafilesystem
-          penlight
-          inspect
-        ]
-      );
-    neovimLuaEnv = lua.withPackages requiredLuaPkgs;
-    neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages requiredLuaPkgs;
+      runtimeLuaPkgs ps
+      ++ (with ps; [
+        luv
+        coxpcall
+        busted
+        luafilesystem
+        penlight
+        inspect
+      ]);
+    # neovimLuaEnv ends up in buildInputs and its lib path is baked into the
+    # nvim binary, so it must only contain runtime modules; otherwise
+    # busted -> luarocks -> cmake leak into the runtime closure.
+    neovimLuaEnv = lua.withPackages runtimeLuaPkgs;
+    neovimLuaEnvOnBuild = lua.luaOnBuild.withPackages (
+      if finalAttrs.finalPackage.doCheck then checkLuaPkgs else runtimeLuaPkgs
+    );
    codegenLua =
      if lua.luaOnBuild.pkgs.isLuaJIT then
        let
@@ -207,7 +210,15 @@ stdenv.mkDerivation (
        -e "s|\$<TARGET_FILE:nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g"
    '';
    # check that the above patching actually works
-    disallowedRequisites = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
+    disallowedRequisites = [
+      stdenv.cc
+    ]
+    ++ lib.optional (lua != codegenLua) codegenLua
+    # Ensure test-only lua modules (busted, ...) don't leak into the
+    # runtime closure via LUA_PRG. When doCheck is off (and we're not
+    # cross-compiling) the two envs are the same derivation, hence the
+    # guard.
+    ++ lib.optional (neovimLuaEnvOnBuild != neovimLuaEnv) neovimLuaEnvOnBuild;

    cmakeFlags = [
      # Don't use downloaded dependencies. At the end of the configurePhase one
@@ -18,13 +18,13 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "noriskclient-launcher-unwrapped";
-  version = "0.6.17";
+  version = "0.6.19";

  src = fetchFromGitHub {
    owner = "NoRiskClient";
    repo = "noriskclient-launcher";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-SihBoCh8QRU0UkgMyjm9fmiq+9GuUAhpvHC6UOjSkxA=";
+    hash = "sha256-SHLYCpflIjslCuCPROyuVsIdNIkHWl2BVflgxAz3RYg=";
  };

  yarnOfflineCache = fetchYarnDeps {
@@ -45,11 +45,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
  '';

-  cargoHash = "sha256-mldZg4Y12o6Laf2RJSeLzKCcqBpFesUbHhmxRjT9MDI=";
+  cargoHash = "sha256-j41whr62i0FlTe/fWoPsMS9kX5aPgCjM9TckeZpnwgw=";

  cargoRoot = "src-tauri";
  buildAndTestSubdir = finalAttrs.cargoRoot;

+  checkFlags = [
+    # test fails to find correct function
+    "--skip=utils::string_utils::safe_truncate"
+  ];
+
  nativeBuildInputs = [
    cargo-tauri.hook
    desktop-file-utils
@@ -28,7 +28,7 @@ let
    };
  } ./pybind11-setup-hook.sh;
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pybind11";
  version = "2.13.6";
  pyproject = true;
@@ -36,7 +36,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "pybind";
    repo = "pybind11";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
  };

@@ -111,7 +111,7 @@ buildPythonPackage rec {

  meta = {
    homepage = "https://github.com/pybind/pybind11";
-    changelog = "https://github.com/pybind/pybind11/blob/${src.rev}/docs/changelog.rst";
+    changelog = "https://github.com/pybind/pybind11/blob/${finalAttrs.src.rev}/docs/changelog.rst";
    description = "Seamless operability between C++11 and Python";
    mainProgram = "pybind11-config";
    longDescription = ''
@@ -125,4 +125,4 @@ buildPythonPackage rec {
      dotlambda
    ];
  };
-}
+})
@@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "orchard";
-  version = "0.52.0";
+  version = "0.54.0";

  src = fetchFromGitHub {
    owner = "cirruslabs";
    repo = "orchard";
    rev = version;
-    hash = "sha256-0TkgPmQq7PGelIvpAuDkwjhNOQlGpvVDNn6uT8UkFKw=";
+    hash = "sha256-Kf8RGYxgnXX9iEbZ9B0aRKUDQ5PgfyBfVk/C62zSrMU=";
    # 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;
@@ -25,7 +25,7 @@ buildGoModule rec {
    '';
  };

-  vendorHash = "sha256-3NW62OgZ19uUajNqoKxOBxYLCP+V78Mw7La8+GGeAPY=";
+  vendorHash = "sha256-yFqYNfBHvUiBQ6OZlNq4aUBg48g8VnuIBYEAKKrb6Y4=";

  nativeBuildInputs = [ installShellFiles ];

@@ -18,6 +18,7 @@
  imagemagick,
  copyDesktopItems,
  nix-update-script,
+  wrapGAppsHook3,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -40,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    cmake
    qt6Packages.wrapQtAppsHook
+    wrapGAppsHook3
    imagemagick
    copyDesktopItems
  ];
@@ -62,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
    qt6Packages.qtwayland
  ];

+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
  # manually create a desktop file
  desktopItems = [
    (makeDesktopItem {
@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "pat";
-  version = "0.19.1";
+  version = "0.19.2";

  src = fetchFromGitHub {
    owner = "la5nta";
    repo = "pat";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-hpbSjxePAXuqQAlNTAfknh+noZgdILtNG57OWVJO02M=";
+    hash = "sha256-a/tWKo65szgu8zTsy6xVh7DXojxA9X8jUIVHi900iWE=";
  };

-  vendorHash = "sha256-8XPnY99arnDDeGlzPv4sw6pwxXkSsxSzNFtz+IeKeq4=";
+  vendorHash = "sha256-mneQyYZ7B0euRciFQru6S7F0IKXTxIceiF5JL18W2C8=";

  ldflags = [
    "-s"
@@ -3,6 +3,7 @@
  fetchFromGitHub,
  rustPlatform,
  nix-update-script,
+  python3Packages,
  versionCheckHook,
 }:

@@ -28,7 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;

-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    python-bindings = python3Packages.pdf-oxide;
+    updateScript = nix-update-script { };
+  };

  meta = {
    description = "Fastest PDF library for text extraction, image extraction, and markdown conversion";
@@ -8,7 +8,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pdfium-binaries";
-  version = "7734";
+  version = "7749";

  src =
    let
@@ -27,17 +27,17 @@ stdenv.mkDerivation (finalAttrs: {
      hash =
        if withV8 then
          selectSystem {
-            x86_64-linux = "sha256-ovbxiOwsmBUddbuTreVvhJeHMYd4dKu+rACDELsRC90=";
-            aarch64-linux = "sha256-wMddHbzxCs21dzZhLjpLEviplFOzHukrRRbCPMOTrDs=";
-            x86_64-darwin = "sha256-+UsFsft9WKd0LrDKbdxuKlHxNsfhzOIWvm8Br0MlNgc=";
-            aarch64-darwin = "sha256-MDE27+uIhqkSe76xtx/sHt++OQtXXAueq10KrwYVJ8Q=";
+            x86_64-linux = "sha256-I3JTNnqXpDHwl+sOS/AlPj4znG2OFIqRxtJNhXD+w6I=";
+            aarch64-linux = "sha256-PBkwxcjsqeEElNC+V74h4P1e508IB/zXjGoQuwK6Krk=";
+            x86_64-darwin = "sha256-aumdSND6Lefr6GgmWBSX4pQhZj8jJIABi6VJSqKNin8=";
+            aarch64-darwin = "sha256-DpoPHGaFkjfOa3tXItYLeJpTLfRXOrjlN/+eyPEcgOQ=";
          }
        else
          selectSystem {
-            x86_64-linux = "sha256-us1UjIhdsRTSGJOkasLdMyIRKdHXKr21hY2+NOIKVH4=";
-            aarch64-linux = "sha256-wHZVPH/c+jsxcClWznox/wnlKlTyUeKqdQxujdD67XU=";
-            x86_64-darwin = "sha256-+Umu2SsuO9lJGngkBVyuAvg4wu9d/OCsSabQ7F4U55U=";
-            aarch64-darwin = "sha256-pHEK9QC2DMZoRnTGc6NfVjCxaZYmCsh3RqHdSCdZ0Cs=";
+            x86_64-linux = "sha256-0VaBPO4angdRqerquTjqizZWvGxrRP8k7DZXLw8Yqaw=";
+            aarch64-linux = "sha256-h7JJxmCg9GIaVMajNZb+AeClIeX8w9XWM2RYqGhPoUY=";
+            x86_64-darwin = "sha256-1Or4cuxvx13Z70kIj7Q1DM1hg/bW5SPAGEDEtnBU6YI=";
+            aarch64-darwin = "sha256-rJqrpCo+5bzqyUsRubGOsBZ8orV1dSuXfjADFJmxBOw=";
          };
      stripRoot = false;
    };
@@ -7,12 +7,12 @@

 let
  pname = "plexamp";
-  version = "4.13.0";
+  version = "4.13.1";

  src = fetchurl {
    url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
    name = "${pname}-${version}.AppImage";
-    hash = "sha512-3Blgl3t21hH6lgDe5u3vy3I/3k9b4VM1CvoZg2oashkGXSDwV8q7MATN9YjsBgWysNXwdm7nQ/yrFQ7DiRfdYg==";
+    hash = "sha512-HgF0+ojb0wOWO1DuiifiYMb0kSiRLvvMcteC89zZ4IYOflzOw+vNKoU+eyRo1Yl6irIL/Pg32eK4xRn5wyB46g==";
  };

  appimageContents = appimageTools.extractType2 {
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
  meta = {
    description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
    homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/82";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/83";
    license = lib.licenses.unfree;
    maintainers = with lib.maintainers; [
      killercup
@@ -35,11 +35,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "PortfolioPerformance";
-  version = "0.83.0";
+  version = "0.83.1";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-C67cbOX4AQyl6rcWo+LVDEVuD+k59pJy9mbytrKt1Ls=";
+    hash = "sha256-MQ3GA5MV8eWDnu7SWZm9hXbRxWTMO04uNKOQV2x6Yvc=";
  };

  nativeBuildInputs = [
@@ -10,7 +10,7 @@
  umap-learn,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pretalx-llm";
  version = "0.5.1";
  pyproject = true;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "why2025-datenzone";
    repo = "pretalx-llm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
    hash = "sha256-KnL4X24RESAgO0Oh1k9c+K4zaho6CEFHMQvDeRdLBzs=";
  };

@@ -43,8 +43,8 @@ buildPythonPackage rec {
  meta = {
    description = "LLM support for Pretalx";
    homepage = "https://github.com/why2025-datenzone/pretalx-llm";
-    changelog = "https://github.com/why2025-datenzone/pretalx-llm/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/why2025-datenzone/pretalx-llm/blob/${finalAttrs.src.rev}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ hexa ];
  };
-}
+})
@@ -6,7 +6,7 @@
  zammad-py,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pretalx-zammad";
  version = "2025.0.1";
  pyproject = true;
@@ -14,7 +14,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "badbadc0ffee";
    repo = "pretalx-zammad";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-YIKZO04vaKPGhUrTFiE4F+KjuBrYm0KsxUua5+Hm7gg=";
  };

@@ -38,4 +38,4 @@ buildPythonPackage rec {
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ hexa ];
  };
-}
+})
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pretix-plugin-build,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pretix-dbevent";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pretix";
+    repo = "pretix-dbevent";
+    rev = "v${version}";
+    hash = "sha256-1WUTunDeRh0+hPOF/uLcPmRlUlHAOhOqeoYQNYv0ZLI=";
+  };
+
+  build-system = [
+    pretix-plugin-build
+    setuptools
+  ];
+
+  doCheck = false; # no tests
+
+  pythonImportsCheck = [
+    "pretix_dbevent"
+  ];
+
+  meta = {
+    description = "Advertise the DB Event Offers for discounted and sustainable train travel to your attendees";
+    homepage = "https://github.com/pretix/pretix-dbevent";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      e1mo
+      hexa
+    ];
+  };
+}
@@ -1,38 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pretix-plugin-build,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "pretix-dbvat";
-  version = "1.1.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "pretix";
-    repo = "pretix-dbvat";
-    rev = "v${version}";
-    hash = "sha256-yAKqB0G2WyGqGogAxv8fI34gO6Wl/50sY/5rvWYH4Ho=";
-  };
-
-  build-system = [
-    pretix-plugin-build
-    setuptools
-  ];
-
-  doCheck = false; # no tests
-
-  pythonImportsCheck = [
-    "pretix_dbvat"
-  ];
-
-  meta = {
-    description = "Plugin for using Deutsche Bahn (DB) Event Discount (Veranstaltungsrabatt)";
-    homepage = "https://github.com/pretix/pretix-dbvat";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ e1mo ];
-  };
-}
@@ -1,6 +1,6 @@
 {
-  version = "3.10.0";
-  hash = "sha256-tTxHLngOsJ0STwfnBfuXN7CUaVgtpRGzEiFtXTWVDD4=";
-  npmDepsHash = "sha256-+nu7qfxlVa8OWARFgQnXj5riTQ0P1sjxbIgYUvJpcHw=";
-  vendorHash = "sha256-AsVy9RPemaKDuX8is2IXjlzRBsJFJiRfFj18SQl8Oc8=";
+  version = "3.11.2";
+  hash = "sha256-pSps9LKOOgWUA27lkgFOYliI8Skejx895EKwD88ysn8=";
+  npmDepsHash = "sha256-ZYbyWtqv7SL/SVAOuQmgb7atkrBQDumYB6Wpa39MThw=";
+  vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168=";
 }
@@ -22,23 +22,25 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "qbz";
-  version = "1.2.4";
+  version = "1.2.7";

  src = fetchFromGitHub {
    owner = "vicrodh";
    repo = "qbz";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-3MPWLovWRmSrSfaR5ciZR2+4S7QzPYYVdVKP+mczhis=";
+    hash = "sha256-/7gYjCfMJ1TmjogGQWkRDgDaUZ8o03hVNxZ21w4xniU=";
  };

-  cargoHash = "sha256-jc/OZi93S0Hu3ywuwNgekyezJ1qCvxWpE60mTu0Y8jU=";
+  cargoHash = "sha256-Xk1v5QosIgzowLpo5L0qaSNFKqoL+kfQeA6KCIImK8M=";
  cargoRoot = "src-tauri";
  buildAndTestSubdir = finalAttrs.cargoRoot;

+  tauriBuildFlags = [ "--no-sign" ];
+
  npmDeps = fetchNpmDeps {
    name = "qbz-${finalAttrs.version}-npm-deps";
    inherit (finalAttrs) src;
-    hash = "sha256-JN3lQyEX1n5G1OcWuRNZl/KSfL7JEfsc4opeh4F/iAY=";
+    hash = "sha256-xBad4Ms5dlE0jHZ5iKLS2dEujgIZahfNfcknJH9qoXM=";
  };

  env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib";
@@ -14,12 +14,13 @@
  gnugrep,
  nix-update,
  common-updater-scripts,
+  libiconv,
 }:

 let
-  version = "0.30.0";
+  version = "0.31.0";
  apalacheVersion = "0.51.1";
-  evaluatorVersion = "0.4.0";
+  evaluatorVersion = "0.5.0";

  metaCommon = {
    description = "Formal specification language with TLA+ semantics";
@@ -33,7 +34,7 @@ let
    owner = "informalsystems";
    repo = "quint";
    tag = "v${version}";
-    hash = "sha256-4gZUGw5T4iVbg7IWkXXIpSib/dPVXhK6Srt1kNewPGA=";
+    hash = "sha256-d1iCkpUh5z+Gr2AbjpyfwiR4XZ6vYk96UHCeippC6iw=";
  };

  # Build the Quint CLI from source
@@ -43,7 +44,7 @@ let

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

-    npmDepsHash = "sha256-qmekskqCePyI/k1AaBRVfc6q6SQNCA4K61E6GxfsAUI=";
+    npmDepsHash = "sha256-UZbATCXqyAulEX+oxLEsT5VPm7y4NiCgnAwyugbzc9g=";

    npmBuildScript = "compile";

@@ -75,7 +76,11 @@ let
    # Skip tests during build, as many rust tests rely on the Quint CLI
    doCheck = false;

-    cargoHash = "sha256-beWqUDaWWCbGL+V1LNtf35wZrIqWCCbFLYo5HCZF7FI=";
+    buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+    ];
+
+    cargoHash = "sha256-aGVs/J+lAPHOsi01xShfZHBeUjd6eONpraNuMkaVfO8=";

    meta = metaCommon // {
      description = "Evaluator for the Quint formal specification language";
@@ -132,7 +137,7 @@ stdenv.mkDerivation (finalAttrs: {
      })
      (writeShellScript "update" ''
        src=$(nix build --print-out-paths --no-link .#quint.src)
-        QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/quintRustWrapper.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/")
+        QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/rust/binaryManager.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/")
        ${lib.getExe nix-update} quint.quint-evaluator --version $QUINT_EVALUATOR_VERSION
        DEFAULT_APALACHE_VERSION_TAG=$(${lib.getExe gnugrep} "DEFAULT_APALACHE_VERSION_TAG" $src/quint/src/apalache.ts | sed -E "s/.*= '([^']+)'.*/\1/")
        ${lib.getExe' common-updater-scripts "update-source-version"} quint $DEFAULT_APALACHE_VERSION_TAG --version-key=apalacheVersion --source-key=apalacheDist --ignore-same-version --ignore-same-hash
@@ -14,17 +14,17 @@

 buildNpmPackage (finalAttrs: {
  pname = "qwen-code";
-  version = "0.14.3";
+  version = "0.14.5";

  src = fetchFromGitHub {
    owner = "QwenLM";
    repo = "qwen-code";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RtZlwZev8zv3yMn+cCQpGvyPq/gyA39N4Iq0qFBTERY=";
+    hash = "sha256-2d+PaHaUdCEYjYkAG33DxX3rMbVpL/CcngczFeOvy8M=";
  };

  npmDepsFetcherVersion = 3;
-  npmDepsHash = "sha256-mrc46cZJ2hI1VL/PMYsCCkgEGYMHrkhLZs0EfsXRRIw=";
+  npmDepsHash = "sha256-7o3ap0+eyCxga18V4qoG+a6b2EM45MkMLjXdY8J/eGg=";

  # npm 11 incompatible with fetchNpmDeps
  # https://github.com/NixOS/nixpkgs/issues/474535
@@ -9,7 +9,7 @@
  stress,
 }:

-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonPackage (finalAttrs: {
  pname = "s-tui";
  version = "1.3.0";
  format = "setuptools";
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "amanusk";
    repo = "s-tui";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-B5KQz+/RG+IROJah0jq+2e94DtnILwY2aH9qulWzHns=";
  };

@@ -40,4 +40,4 @@ python3Packages.buildPythonPackage rec {
    broken = stdenv.hostPlatform.isDarwin; # https://github.com/amanusk/s-tui/issues/49
    mainProgram = "s-tui";
  };
-}
+})
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "sail";
-  version = "0.5.3";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "lakehq";
    repo = "sail";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-PPtA/I2M99wiO7XRsR5UfPejjDXk/6sag5lhqwCctqo=";
+    hash = "sha256-ISTZwWDQ5DjNa5TC77Xea3zuhp2sSnp/NwD3ytYbjLc=";
  };

-  cargoHash = "sha256-/NnaXzXvTT7ZRGGLjDpKFjcX65rz++MrWZYYO3JvBUU=";
+  cargoHash = "sha256-njc4c/xN9uWvNgOvswx1fwwynFrM9eHw4LUOFVYJ4ls=";

  cargoBuildFlags = [
    "-p"
@@ -1,27 +0,0 @@
-diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
-index 7fce281d..b709255f 100644
--- a/core/libcorrect/CMakeLists.txt
-+++ b/core/libcorrect/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.13)
- project(Correct C)
- include(CheckLibraryExists)
- include(CheckIncludeFiles)
-diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
-index 1dc1c913..e9924677 100644
--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
-+++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.2.0)
-+cmake_minimum_required (VERSION 3.13)
- project (DiscordRPC)
- 
- include(GNUInstallDirs)
-@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
- 
- # add subdirs
- 
-add_subdirectory(src)
-\ No newline at end of file
-+add_subdirectory(src)
@@ -19,6 +19,8 @@
  audio_source ? true,
  bladerf_source ? stdenv.hostPlatform.isLinux,
  libbladeRF,
+  dragonlabs_source ? true,
+  libdlcr,
  file_source ? true,
  hackrf_source ? true,
  hackrf,
@@ -81,21 +83,18 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "sdrpp";

-  upstreamVersion = "1.2.1";
-  version = "${finalAttrs.upstreamVersion}-unstable-2025-10-09";
+  upstreamVersion = "1.3.0";
+  version = "${finalAttrs.upstreamVersion}-unstable-2026-03-24";

  src = fetchFromGitHub {
    owner = "AlexandreRouma";
    repo = "SDRPlusPlus";
-    rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93";
-    hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU=";
+    rev = "a6df4d58e5f6b3045883a70aeb8fb41fd5dbf1d9";
+    hash = "sha256-VzeLGQTnRur5vB+M5TovpLhI2QYKvpZjZjthuGyjcm0=";
  };

  patches = [
    ./0001-Allow-management-of-resources-and-modules-paths.patch
-    # CMake 4 dropped support of versions lower than 3.5,
-    # versions lower than 3.10 are deprecated.
-    ./cmake4.patch
  ];

  postPatch = ''
@@ -122,6 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optional airspy_source airspy
  ++ lib.optional airspyhf_source airspyhf
  ++ lib.optional bladerf_source libbladeRF
+  ++ lib.optional dragonlabs_source libdlcr
  ++ lib.optional hackrf_source hackrf
  ++ lib.optional limesdr_source limesuite
  ++ lib.optionals rtl_sdr_source [
@@ -148,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.cmakeBool "OPT_BUILD_AIRSPY_SOURCE" airspy_source)
    (lib.cmakeBool "OPT_BUILD_AUDIO_SOURCE" audio_source)
    (lib.cmakeBool "OPT_BUILD_BLADERF_SOURCE" bladerf_source)
+    (lib.cmakeBool "OPT_BUILD_DRAGONLABS_SOURCE" dragonlabs_source)
    (lib.cmakeBool "OPT_BUILD_FILE_SOURCE" file_source)
    (lib.cmakeBool "OPT_BUILD_HACKRF_SOURCE" hackrf_source)
    (lib.cmakeBool "OPT_BUILD_HERMES_SOURCE" hermes_source)
@@ -1,22 +0,0 @@
-From a4ca664abfac0b7efa7dbc48c6438bc1a5333962 Mon Sep 17 00:00:00 2001
-From: Fazzi <faaris.ansari@proton.me>
-Date: Sat, 24 May 2025 20:55:50 +0100
-Subject: [PATCH] desktopFile: hide entry from app launchers
-
---
- linux-release/com.steamgriddb.SGDBoop.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux-release/com.steamgriddb.SGDBoop.desktop b/linux-release/com.steamgriddb.SGDBoop.desktop
-index 9c84cdb..9899682 100644
--- a/linux-release/com.steamgriddb.SGDBoop.desktop
-+++ b/linux-release/com.steamgriddb.SGDBoop.desktop
-@@ -4,7 +4,7 @@ Comment=Apply Steam assets from SteamGridDB
- Exec=SGDBoop %U
- Terminal=false
- Type=Application
-NoDisplay=false
-+NoDisplay=true
- Icon=com.steamgriddb.SGDBoop
- MimeType=x-scheme-handler/sgdb
- Categories=Utility
@@ -5,26 +5,19 @@
  curl,
  pkg-config,
  wrapGAppsHook3,
+  nix-update-script,
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "sgdboop";
-  version = "1.3.1";
+  version = "1.3.2";

  src = fetchFromGitHub {
    owner = "SteamGridDB";
    repo = "SGDBoop";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-FpVQQo2N/qV+cFhYZ1FVm+xlPHSVMH4L+irnQEMlUQs=";
+    hash = "sha256-/pXZMq80fb7Z+619ACnu/ZYWpouh59PIiruWY7l2cnQ=";
  };

-  patches = [
-    # Hide the app from app launchers, as it is not meant to be run directly
-    # Remove when https://github.com/SteamGridDB/SGDBoop/pull/112 is merged
-    ./hide_desktop_entry.patch
-    # remove unused arg to fix build
-    ./remove-unused-arg.patch
-  ];
-
  makeFlags = [
    # The flatpak install just copies things to /app - otherwise wants to do things with XDG
    "FLATPAK_ID=fake"
@@ -48,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: {
    curl
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Applying custom artwork to Steam, using SteamGridDB";
    homepage = "https://github.com/SteamGridDB/SGDBoop/";
@@ -1,31 +0,0 @@
-From 74bea8b264fa5d7ded02db66e2500ba9d72b58cf Mon Sep 17 00:00:00 2001
-From: Fazzi <faaris.ansari@proton.me>
-Date: Wed, 31 Dec 2025 20:57:45 +0000
-Subject: [PATCH] remove unused arg
-
---
- sgdboop.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sgdboop.c b/sgdboop.c
-index f0d95c0..7e860f3 100644
--- a/sgdboop.c
-+++ b/sgdboop.c
-@@ -1,4 +1,4 @@
-#include <stdlib.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
- #include <curl/curl.h>
-@@ -1276,7 +1276,7 @@ int main(int argc, char** argv)
- 					struct nonSteamApp* apps = getNonSteamApps();
- 					struct nonSteamApp* appsMods = NULL;
- 					if (includeMods) {
-						appsMods = getMods(includeMods);
-+						appsMods = getMods();
- 					}
- 
- 					// Exit with an error if nothing found
-- 
-2.51.2
-
@@ -7,14 +7,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "sipvicious";
-  version = "0.3.5";
+  version = "0.3.7";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "EnableSecurity";
    repo = "sipvicious";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-jH5/rNGFbiPdSX52UuJCAq5M7Kco7tCAhtcCyZl5wEc=";
+    hash = "sha256-OQq1PP0qoETu+0qs2vhkgVU5FVZA5wnWMKU+lKJrvv4=";
  };

  build-system = [
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "slint-lsp";
-  version = "1.15.1";
+  version = "1.16.0";

  src = fetchCrate {
    inherit (finalAttrs) pname version;
-    hash = "sha256-WaxvwKtRwUjO0SqODDYXrtU5C10htuXBuTnolYUwl0w=";
+    hash = "sha256-2VO0gVqPPJjPlLxEtYL27YcC2YaStNbI3osU8k3ZYT4=";
  };

-  cargoHash = "sha256-Wat4jcvqHz+hL49UAs5wOGZvRiIdIlOvUndginz2okc=";
+  cargoHash = "sha256-H58mVzgWh2KW+v1h8tyFQYYZVM2iE0MBlPr6CzDc5aU=";

  rpathLibs = [
    fontconfig
@@ -16,17 +16,17 @@

 maven.buildMavenPackage rec {
  pname = "sonarlint-ls";
-  version = "4.8.0.77946";
+  version = "4.15.0.78211";

  src = fetchFromGitHub {
    owner = "SonarSource";
    repo = "sonarlint-language-server";
    rev = version;
-    hash = "sha256-kwgkRCVcEFGv18zVK9y0JhIx6Cb6XBrnwGbzf2uDdZE=";
+    hash = "sha256-0EFztL1hF1JaYc+6OUvmcPF9x5yA10Sy62f/Drmj4MU=";
  };

  mvnJdk = jdk17;
-  mvnHash = "sha256-KyA2/ABdT35DqzEhE5P+aSGJfu60o6T4+ofQNiQTPFg=";
+  mvnHash = "sha256-YG2eQnSCwg24DEp2CJ6awozTVcz8XBUmSSEb65UD7Rw=";

  # Disables failing tests which either need network access or are flaky.
  mvnParameters = lib.escapeShellArgs [
@@ -40,6 +40,10 @@ maven.buildMavenPackage rec {
    !OpenNotebooksCacheTests"
  ];

+  preBuild = ''
+    echo -n "${version}" > src/main/resources/slls-version.txt
+  '';
+
  installPhase = ''
    runHook preInstall

@@ -124,13 +124,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "spaghettikart";
-  version = "0.9.9.1-unstable-2025-12-23";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "HarbourMasters";
    repo = "SpaghettiKart";
-    rev = "b0582b5c32914a815fe6a2ffc41f3eb9c24a3a2b";
-    hash = "sha256-TTsW49jo8yNxuL5GFStiQRWOBw/X8Pt2hMKmDZPpEVI=";
+    tag = finalAttrs.version;
+    hash = "sha256-XEsOtt2Xg/HyYw07YGXTIBOCtIDbh3hmaBEQpbFVFYc=";
    fetchSubmodules = true;
    deepClone = true;
    postFetch = ''
@@ -279,7 +279,6 @@ stdenv.mkDerivation (finalAttrs: {
      icon = "spaghettikart";
      exec = "Spaghettify";
      comment = finalAttrs.meta.description;
-      genericName = "spaghettikart";
      desktopName = "spaghettikart";
      categories = [ "Game" ];
    })
@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication (finalAttrs: {
  pname = "strictdoc";
-  version = "0.18.1";
+  version = "0.19.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "strictdoc-project";
    repo = "strictdoc";
    tag = finalAttrs.version;
-    hash = "sha256-pfKEPdEYCW8pMOD5DH9oNVK1ypQKfFMUOXryte+JdCs=";
+    hash = "sha256-UkXVn1GVWBBhjFaRvkVk+E9mug3i2k7SQk+7JVA8KSo=";
  };

  build-system = [
@@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
    jinja2
    lark
    lxml
+    markdown-it-py
    openpyxl
    orjson
    pandas
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "2.6.6";
+  version = "2.6.9";

  src = fetchFromGitHub {
    owner = "TandoorRecipes";
    repo = "recipes";
    tag = version;
-    hash = "sha256-aRc9fh9O2ZI+9ngKraD3AnkOMPuPVt8evheJ0YvZETE=";
+    hash = "sha256-g151bUOpAp+7+K92kF+eK5SR2aCHPHdFc3UXqOO4aSw=";
  };

  yarnHash = "sha256-Un5pHocZZrXajY3AGfqV1kjT9twE8B93rwoJMi4CILg=";
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitHub,
  fetchzip,
+  nix-update-script,
  ninja,
  cmake,
  SDL2,
@@ -23,13 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "taradino" + lib.optionalString buildShareware "-shareware";
-  version = "20251031";
+  version = "20251222";

  src = fetchFromGitHub {
    owner = "fabiangreffrath";
    repo = "taradino";
    tag = finalAttrs.version;
-    hash = "sha256-Z3yAT4CxZIQ63F6G7ZUAdz2VK+8dcv6WHyQJ8Pmz4Zk=";
+    hash = "sha256-nB6FNET9OCgK7xqku5gaXfuaIIhYPj8Lo03gINCZSFI=";
  };

  strictDeps = true;
@@ -58,6 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
    unzip -d "$out/${datadir}" ${sharewareData}/ROTTSW13.SHR
  '';

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "SDL2 port of Rise of the Triad";
    mainProgram = "taradino" + lib.optionalString buildShareware "-shareware";
@@ -9,17 +9,17 @@

 buildGoModule (finalAttrs: {
  pname = "tea";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchFromGitea {
    domain = "gitea.com";
    owner = "gitea";
    repo = "tea";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-fycLPF7JBkc9Cjw9mU4cikP9dJzXLa4WAkbZ/+aG6Yw=";
+    sha256 = "sha256-FLaOhU9oDZhpRJnWrXgIV3Cup6L9i5JHP5xWiu9aZkI=";
  };

-  vendorHash = "sha256-tPlpNfBTcfBJGI0PFD2B1J1nH3wQwJ8uqGcje7wzKTo=";
+  vendorHash = "sha256-7FLDDJB5ms9miAaxQJ26MCBfRxQZN/RlXyMJweTk7SE=";

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

 buildTeleport {
-  version = "17.7.19";
-  hash = "sha256-2bQEW3HllZvMofumLSgvZvWqrlRV6fK9uB3QTJD6x3w=";
-  vendorHash = "sha256-GUnX3TnHjZyqNsIDIy5Du6jRURWnYBsNb2zWEGl1tzQ=";
+  version = "17.7.20";
+  hash = "sha256-zxP7vhDyxypotG58wzwlCx8JMoRSYC0adMe+zKfrOek=";
+  vendorHash = "sha256-uwSCPu3z9LCvN/vKJg/Q9rgk6wnjh4P4tq4a5suPNrg=";
  cargoHash = "sha256-opLo7UmZzxrVxYZOwn4v4G5lhHFp5GrdOZe7uIb97q0=";
-  pnpmHash = "sha256-mcv9Paybeu9RnNfzj1v0043UX2WhfgMpmWjVxQX7Fzc=";
+  pnpmHash = "sha256-quHu43JccCpguSeHkGnpqL81oDN4p5WtAt/sOgMCCec=";

  wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
  inherit buildGoModule withRdpClient extPatches;
@@ -7,10 +7,10 @@
 }:

 buildTeleport {
-  version = "18.7.0";
-  hash = "sha256-1AzIZ2jbYncpUStIrKgP6jhkJ42HDoXfhEv5hJdyDnA=";
-  vendorHash = "sha256-p600z/Fm3y5KG8fDItIc/Xq4O0/DWHjcmrh5qJmCy1I=";
-  pnpmHash = "sha256-/sLG0yfMIguj+yzr3bDj1AoPvDEva6ETjyKcqm4Fvks=";
+  version = "18.7.2";
+  hash = "sha256-1ANYBYNhTzSA3zhgUgKks73piHdw+4iXGFmGUWHTYpE=";
+  vendorHash = "sha256-0HxDrsWWRjuaVGtbX7xwCMsj2dYRJr3wmpf8qInlyBE=";
+  pnpmHash = "sha256-XJ2SLCMoFFeoBQ3YKIlq4APNOhSS8ipTNQufQ1nkYqs=";
  cargoHash = "sha256-SfVoh4HnHSOz1haPPV7a/RyA6LFjLRe78Mn2fVdVyEA=";

  wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
@@ -2,7 +2,6 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  git,
  stdenvNoCC,
  bun,
  nixosTests,
@@ -11,17 +10,16 @@

 buildGoModule (finalAttrs: {
  pname = "tinyauth";
-  version = "5.0.6";
+  version = "5.0.7";

  src = fetchFromGitHub {
    owner = "steveiliop56";
    repo = "tinyauth";
    tag = "v${finalAttrs.version}";
-    fetchSubmodules = true;
-    hash = "sha256-V75kjO34b1DBBI5aJMfn9finHSbVbWqQ34CH68gzrig=";
+    hash = "sha256-VeII5jSNUJpGZgqons1o1fp6KXxDOBhSMciSqtQfaC4=";
  };

-  vendorHash = "sha256-iyduJgKt9OAkOY6J8J1GztCkYEssr/TcB43L6/Qdzmc=";
+  vendorHash = "sha256-XP+kVfcDKWAvBdrvGjiTdWh7jNe6qiDsgVjPrFFPoDU=";

  subPackages = [ "cmd/tinyauth" ];

@@ -37,10 +35,6 @@ buildGoModule (finalAttrs: {
    cp -r ${finalAttrs.frontend}/dist internal/assets/dist
  '';

-  postPatch = ''
-    ${lib.getExe git} apply --directory paerser/ patches/nested_maps.diff
-  '';
-
  frontend = stdenvNoCC.mkDerivation {
    pname = "tinyauth-frontend";
    inherit (finalAttrs) version src;
@@ -83,7 +77,7 @@ buildGoModule (finalAttrs: {
    '';

    outputHashMode = "recursive";
-    outputHash = "sha256-pd5v5lD8Lyhf21OQvzjDTh63EcAe7E1OAoQuFGhAOX8=";
+    outputHash = "sha256-FRACDa1akm+JnYIRwNXRcomzDIMCIAlJDbjMyS77sNA=";
  };

  passthru = {
--- a/Show More
+++ b/Show More