Merge remote-tracking branch 'origin/master' into staging-next

2025-02-05 09:44:25 +03:00 · 2025-02-05 09:44:25 +03:00 · af55d5afc2
commit af55d5afc2
parent f56aaaac0c 6293940374
114 changed files with 2303 additions and 610 deletions
--- a/README.md
+++ b/README.md
@ -59,7 +59,7 @@ system, [Hydra](https://hydra.nixos.org/).
 Artifacts successfully built with Hydra are published to cache at
 https://cache.nixos.org/. When successful build and test criteria are
 met, the Nixpkgs expressions are distributed via [Nix
-channels](https://nixos.org/manual/nix/stable/package-management/channels.html).
+channels](https://nix.dev/manual/nix/stable/command-ref/nix-channel.html).

 # Contributing

--- a/doc/languages-frameworks/astal.section.md
+++ b/doc/languages-frameworks/astal.section.md
@ -0,0 +1,39 @@
+# Astal {#astal}
+
+Astal is a collection of building blocks for creating custom desktop shells.
+
+## Bundling {#astal-bundling}
+
+Bundling Astal application is done using `ags` tool, you can use it like this:
+
+```nix
+ags.bundle {
+  pname = "hyprpanel";
+  version = "1.0.0";
+
+  src = fetchFromGitHub { ... };
+
+  # change your entry file (default is `app.ts`)
+  entry = "app.ts";
+
+  dependencies = [
+    # list here astal modules, that your package depends on
+    # `astal3`, `astal4` and `astal.io` are automatically included
+    astal.apps
+    astal.battery
+    astal.bluetooth
+
+    # you can also list here other runtime dependencies
+    hypridle
+    hyprpicker
+    hyprsunset
+  ];
+
+  # GTK 4 support is opt-in
+  enableGtk4 = true;
+
+  meta = { ... };
+}
+```
+
+You can also pass all other arguments that are supported by `stdenv.mkDerivation`.
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@ -53,6 +53,7 @@ Each supported language or software ecosystem has its own package set named `<la
 ```{=include=} sections
 agda.section.md
 android.section.md
+astal.section.md
 beam.section.md
 bower.section.md
 chicken.section.md
--- a/doc/redirects.json
+++ b/doc/redirects.json
@ -2352,6 +2352,12 @@
  "using-predefined-android-package-compositions": [
    "index.html#using-predefined-android-package-compositions"
  ],
+  "astal": [
+    "index.html#astal"
+  ],
+  "astal-bundling": [
+    "index.html#astal-bundling"
+  ],
  "spawning-emulator-instances": [
    "index.html#spawning-emulator-instances"
  ],
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@ -330,7 +330,7 @@ let mapOffset(h, t, i) = i + (if i <= 0 then h else t - 1)
 dep(h0, t0, A, B)
 propagated-dep(h1, t1, B, C)
 h0 + h1 in {-1, 0, 1}
-h0 + t1 in {-1, 0, -1}
+h0 + t1 in {-1, 0, 1}
 ----------------------------- Take immediate dependencies' propagated dependencies
 propagated-dep(mapOffset(h0, t0, h1),
               mapOffset(h0, t0, t1),
@ -343,7 +343,7 @@ propagated-dep(h, t, A, B)
 dep(h, t, A, B)
 ```

-Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the target offset: `t = h + 1`. That means that:
+Some explanation of this monstrosity is in order. In the common case, the target offset of a dependency is the successor to the host offset: `t = h + 1`. That means that:

 ```
 let f(h, t, i) = i + (if i <= 0 then h else t - 1)
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4625,6 +4625,11 @@
    githubId = 87764;
    name = "Ben Ford";
  };
+  commiterate = {
+    github = "commiterate";
+    githubId = 111539270;
+    name = "commiterate";
+  };
  CompEng0001 = {
    email = "sb1501@canterbury.ac.uk";
    github = "CompEng0001";
@ -6876,6 +6881,12 @@
    github = "emilytrau";
    githubId = 13267947;
  };
+  Emin017 = {
+    email = "cchuqiming@gmail.com";
+    github = "Emin017";
+    githubId = 99674037;
+    name = "Qiming Chu";
+  };
  emmabastas = {
    email = "emma.bastas@protonmail.com";
    matrix = "@emmabastas:matrix.org";
@ -13073,6 +13084,12 @@
    githubId = 80920;
    name = "Levi Gross";
  };
+  Levizor = {
+    email = "levizorri@protonmail.com";
+    github = "Levizor";
+    githubId = 132144514;
+    name = "Lev Sauliak";
+  };
  lewo = {
    email = "lewo@abesis.fr";
    matrix = "@lewo:matrix.org";
@ -16559,6 +16576,12 @@
    githubId = 1224006;
    name = "Roberto Abdelkader Martínez Pérez";
  };
+  nilscc = {
+    email = "mail@nils.cc";
+    github = "nilscc";
+    githubId = 92021;
+    name = "Nils";
+  };
  nils-degroot = {
    email = "nils@peeko.nl";
    github = "nils-degroot";
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@ -289,6 +289,13 @@
  [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
  for more information.

+- `ags` was updated to v2, which is just a CLI for Astal now. Components are available as a different package set `astal.*`.
+  If you want to use v1, it is available as `ags_1` package.
+
+  See the release notes of
+  [v2.0.0](https://github.com/Aylur/ags/releases/tag/v2.0.0)
+  for more information.
+
 - `nodePackages.expo-cli` has been removed, as it was deprecated by upstream. The suggested replacement is the `npx expo` command.

 - DokuWiki with the Caddy webserver (`services.dokuwiki.webserver = "caddy"`) now sets up sites with Caddy's automatic HTTPS instead of HTTP-only.
--- a/nixos/modules/services/misc/taskchampion-sync-server.nix
+++ b/nixos/modules/services/misc/taskchampion-sync-server.nix
@ -45,6 +45,11 @@ in
        default = 14;
      };
    };
+    allowClientIds = lib.mkOption {
+      description = "Client IDs to allow (can be repeated; if not specified, all clients are allowed)";
+      type = types.listOf types.str;
+      default = [ ];
+    };
  };

  config = lib.mkIf cfg.enable {
@ -77,7 +82,8 @@ in
            --port ${builtins.toString cfg.port} \
            --data-dir ${cfg.dataDir} \
            --snapshot-versions ${builtins.toString cfg.snapshot.versions} \
-            --snapshot-days ${builtins.toString cfg.snapshot.days}
+            --snapshot-days ${builtins.toString cfg.snapshot.days} \
+            ${lib.concatMapStringsSep " " (id: "--allow-client-id ${id}") cfg.allowClientIds}
        '';
      };
    };
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@ -193,11 +193,11 @@ in
      }
      {
        assertion = !(cfg.passwordSalt != null && cfg.passwordSaltFile != null);
-        message = "Both `services.wakapi.passwordSalt` `services.wakapi.passwordSaltFile` should not be set at the same time.";
+        message = "Both `services.wakapi.passwordSalt` and `services.wakapi.passwordSaltFile` should not be set at the same time.";
      }
      {
        assertion = !(cfg.smtpPassword != null && cfg.smtpPasswordFile != null);
-        message = "Both `services.wakapi.smtpPassword` `services.wakapi.smtpPasswordFile` should not be set at the same time.";
+        message = "Both `services.wakapi.smtpPassword` and `services.wakapi.smtpPasswordFile` should not be set at the same time.";
      }
      {
        assertion = cfg.database.createLocally -> cfg.settings.db.dialect != null;
@ -206,10 +206,10 @@ in
    ];

    warnings = [
-      (lib.optionalString (cfg.database.createLocally -> cfg.settings.db.dialect != "postgres") ''
+      (lib.optionalString (cfg.database.createLocally && cfg.settings.db.dialect != "postgres") ''
        You have enabled automatic database configuration, but the database dialect is not set to "posgres".

-        The Wakapi module only supports for PostgreSQL. Please set `services.wakapi.database.createLocally`
+        The Wakapi module only supports PostgreSQL. Please set `services.wakapi.database.createLocally`
        to `false`, or switch to "postgres" as your database dialect.
      '')
    ];
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@ -1,45 +1,44 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, boost
-, cmake
-, chromaprint
-, gettext
-, gst_all_1
-, liblastfm
-, qtbase
-, qtx11extras
-, qttools
-, taglib
-, fftw
-, glew
-, qjson
-, sqlite
-, libgpod
-, libplist
-, usbmuxd
-, libmtp
-, libpulseaudio
-, gvfs
-, libcdio
-, pcre
-, projectm
-, protobuf
-, qca-qt5
-, pkg-config
-, sparsehash
-, config
-, makeWrapper
-, gst_plugins
-
-, util-linux
-, libunwind
-, libselinux
-, elfutils
-, libsepol
-, orc
-
-, alsa-lib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  boost,
+  cmake,
+  chromaprint,
+  gettext,
+  gst_all_1,
+  liblastfm,
+  qtbase,
+  qtx11extras,
+  qttools,
+  taglib,
+  fftw,
+  glew,
+  qjson,
+  sqlite,
+  libgpod,
+  libplist,
+  usbmuxd,
+  libmtp,
+  libpulseaudio,
+  gvfs,
+  libcdio,
+  pcre,
+  projectm,
+  protobuf,
+  qca-qt5,
+  pkg-config,
+  sparsehash,
+  config,
+  wrapQtAppsHook,
+  gst_plugins,
+  util-linux,
+  libunwind,
+  libselinux,
+  elfutils,
+  libsepol,
+  orc,
+  alsa-lib,
 }:

 let
@ -48,22 +47,21 @@ let
  withCD = config.clementine.cd or true;
  withCloud = config.clementine.cloud or true;
 in
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
  pname = "clementine";
-  version = "1.4.rc2-unstable-2024-05-12";
+  version = "1.4.1";

  src = fetchFromGitHub {
    owner = "clementine-player";
    repo = "Clementine";
-    rev = "7607ddcb96e79d373c4b60d9de21f3315719c7d8";
-    sha256 = "sha256-yOG/Je6N8YEsu5AOtxOFgDl3iqb97assYMZYMSwQqqk=";
+    tag = finalAttrs.version;
+    hash = "sha256-ges7PHsv/J0R5dqmKvS5BpYxOgy9YB8hZMXOIe16M6A=";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
-    makeWrapper
-
+    wrapQtAppsHook
    util-linux
    libunwind
    libselinux
@ -72,37 +70,41 @@ mkDerivation {
    orc
  ];

-  buildInputs = [
-    boost
-    chromaprint
-    fftw
-    gettext
-    glew
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gstreamer
-    gvfs
-    liblastfm
-    libpulseaudio
-    pcre
-    projectm
-    protobuf
-    qca-qt5
-    qjson
-    qtbase
-    qtx11extras
-    qttools
-    sqlite
-    taglib
-
-    alsa-lib
-  ]
-  # gst_plugins needed for setup-hooks
-  ++ gst_plugins
-  ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
-  ++ lib.optionals (withMTP) [ libmtp ]
-  ++ lib.optionals (withCD) [ libcdio ]
-  ++ lib.optionals (withCloud) [ sparsehash ];
+  buildInputs =
+    [
+      boost
+      chromaprint
+      fftw
+      gettext
+      glew
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gstreamer
+      gvfs
+      liblastfm
+      libpulseaudio
+      pcre
+      projectm
+      protobuf
+      qca-qt5
+      qjson
+      qtbase
+      qtx11extras
+      qttools
+      sqlite
+      taglib
+      alsa-lib
+    ]
+    # gst_plugins needed for setup-hooks
+    ++ gst_plugins
+    ++ lib.optionals (withIpod) [
+      libgpod
+      libplist
+      usbmuxd
+    ]
+    ++ lib.optionals (withMTP) [ libmtp ]
+    ++ lib.optionals (withCD) [ libcdio ]
+    ++ lib.optionals (withCloud) [ sparsehash ];

  postPatch = ''
    sed -i src/CMakeLists.txt \
@ -123,16 +125,18 @@ mkDerivation {
    "-DSPOTIFY_BLOB=OFF"
  ];

+  dontWrapQtApps = true;
+
  postInstall = ''
-    wrapProgram $out/bin/clementine \
+    wrapQtApp $out/bin/clementine \
      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://www.clementine-player.org";
    description = "Multiplatform music player";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ttuegel ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
  };
-}
+})
--- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
@ -85,14 +85,11 @@ rec {
    pkg: predicate:
    pkg.overrideAttrs (
      finalAttrs: previousAttrs: {
-        preInstall =
+        nativeBuildInputs =
          if predicate finalAttrs previousAttrs then
-            ''
-              HOME=$(mktemp -d)
-            ''
-            + previousAttrs.preInstall or ""
+            previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
          else
-            previousAttrs.preInstall or null;
+            previousAttrs.nativeBuildInputs or null;
      }
    );
 }
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@ -12,6 +12,7 @@
  gopls,
  tempel,
  unstableGitUpdater,
+  writableTmpDirAsHomeHook,
 }:

 let
@ -65,6 +66,10 @@ melpaBuild {
    python
  ];

+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
  files = ''
    ("*.el"
     "lsp_bridge.py"
@ -80,7 +85,7 @@ melpaBuild {

    mkfifo test.log
    cat < test.log &
-    HOME=$(mktemp -d) python -m test.test
+    python -m test.test

    runHook postCheck
  '';
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@ -316,9 +316,7 @@ let
        });

        # tries to write a log file to $HOME
-        insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
-          HOME = "/tmp";
-        });
+        insert-shebang = mkHome super.insert-shebang;

        ivy-rtags = ignoreCompilationError (fix-rtags super.ivy-rtags); # elisp error

@ -665,9 +663,7 @@ let
        helm-rtags = ignoreCompilationError (fix-rtags super.helm-rtags); # elisp error

        # tries to write to $HOME
-        php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: {
-          HOME = "/tmp";
-        });
+        php-auto-yasnippets = mkHome super.php-auto-yasnippets;

        racer = super.racer.overrideAttrs (attrs: {
          postPatch = attrs.postPatch or "" + ''
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@ -526,6 +526,17 @@
      },
      "name": "toml"
    },
+    "8327": {
+      "compatible": [
+        "idea-community",
+        "idea-ultimate"
+      ],
+      "builds": {
+        "243.22562.218": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip"
+      },
+      "name": "minecraft-development"
+    },
    "8554": {
      "compatible": [
        "clion",
@ -1824,6 +1835,7 @@
    "https://plugins.jetbrains.com/files/7499/667439/gittoolbox-600.0.14_243-signed.zip": "sha256-rpJ0tPIf3mw5KLSv+wx16mXVKA1PxKTktgCYzKU3cU4=",
    "https://plugins.jetbrains.com/files/8195/630064/toml-243.21565.122.zip": "sha256-vKigewUGi06by9/6a9HbjN51zPAIafdk6w4MFG4kwG8=",
    "https://plugins.jetbrains.com/files/8195/672659/toml-243.23654.183.zip": "sha256-OFoWuz5z0BcZJqWkS+vkcD/Q0e5IUnQRY84/GEQQIb8=",
+    "https://plugins.jetbrains.com/files/8327/615097/Minecraft_Development-2024.3-1.8.2.zip": "sha256-4c1nxjbEsNs9twmQnJllk1OIVmm0nnUYZ0R7f/6bJt4=",
    "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip": "sha256-3MCG1SNEy2Mf9r+nTLcRwJ+rIJRvtO0kYKFNjIan86E=",
    "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=",
    "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip": "sha256-YRf5sj+quf/dQv6eFU6f190vWW+RHtyGS+S2a6DhUoM=",
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -1530,6 +1530,18 @@ final: prev:
    meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/";
  };

+  bufresize-nvim = buildVimPlugin {
+    pname = "bufresize.nvim";
+    version = "2022-03-21";
+    src = fetchFromGitHub {
+      owner = "kwkarlwang";
+      repo = "bufresize.nvim";
+      rev = "3b19527ab936d6910484dcc20fb59bdb12322d8b";
+      sha256 = "1s0zmpwg7z76l3ca1p426mkh33cw94m18q7rfsvnz4h4xwlsafpa";
+    };
+    meta.homepage = "https://github.com/kwkarlwang/bufresize.nvim/";
+  };
+
  bullets-vim = buildVimPlugin {
    pname = "bullets.vim";
    version = "2024-08-04";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -313,6 +313,10 @@ in
    nvimSkipModule = [ "bufferline.commands" ];
  };

+  bufresize-nvim = super.bufresize-nvim.overrideAttrs {
+    meta.license = lib.licenses.mit;
+  };
+
  catppuccin-nvim = super.catppuccin-nvim.overrideAttrs {
    nvimSkipModule = [
      "catppuccin.groups.integrations.noice"
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -125,6 +125,7 @@ https://github.com/jlanzarotta/bufexplorer/,,
 https://github.com/AndrewRadev/bufferize.vim/,HEAD,
 https://github.com/akinsho/bufferline.nvim/,,
 https://github.com/kwkarlwang/bufjump.nvim/,HEAD,
+https://github.com/kwkarlwang/bufresize.nvim/,HEAD,
 https://github.com/bullets-vim/bullets.vim/,,
 https://github.com/itchyny/calendar.vim/,,
 https://github.com/bkad/camelcasemotion/,,
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -1316,6 +1316,18 @@ let
        };
      };

+      dendron.adjust-heading-level = callPackage ./dendron.adjust-heading-level { };
+
+      dendron.dendron = callPackage ./dendron.dendron { };
+
+      dendron.dendron-markdown-preview-enhanced =
+        callPackage ./dendron.dendron-markdown-preview-enhanced
+          { };
+
+      dendron.dendron-paste-image = callPackage ./dendron.dendron-paste-image { };
+
+      dendron.dendron-snippet-maker = callPackage ./dendron.dendron-snippet-maker { };
+
      denoland.vscode-deno = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "vscode-deno";
--- a/pkgs/applications/editors/vscode/extensions/dendron.adjust-heading-level/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/dendron.adjust-heading-level/default.nix
@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "adjust-heading-level";
+    publisher = "dendron";
+    version = "0.1.0";
+    hash = "sha256-u50RJ7ETVFUC43mp94VJsR931b9REBaTyRhZE7muoLw=";
+  };
+  meta = {
+    description = "A VSCode extension to adjust the heading level of the selected text";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.adjust-heading-level";
+    homepage = "https://github.com/kevinslin/adjust-heading-level";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}
--- a/pkgs/applications/editors/vscode/extensions/dendron.dendron-markdown-preview-enhanced/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/dendron.dendron-markdown-preview-enhanced/default.nix
@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "dendron-markdown-preview-enhanced";
+    publisher = "dendron";
+    version = "0.10.57";
+    hash = "sha256-uJmdsC+nKCkAJVH+szNepPcyfHD4ZQ83on195jjqZig=";
+  };
+  meta = {
+    description = "A SUPER POWERFUL markdown extension for Visual Studio Code to bring you a wonderful markdown writing experience";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.dendron-markdown-preview-enhanced";
+    homepage = "https://github.com/dendronhq/markdown-preview-enhanced";
+    license = lib.licenses.ncsa;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}
--- a/pkgs/applications/editors/vscode/extensions/dendron.dendron-paste-image/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/dendron.dendron-paste-image/default.nix
@ -0,0 +1,17 @@
+{ lib, vscode-utils, ... }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "dendron-paste-image";
+    publisher = "dendron";
+    version = "1.1.1";
+    hash = "sha256-SlW8MEWBgf8cJsdSzeegqPiAlEvlnrxuvrJJdhHwq2E=";
+  };
+  meta = {
+    description = "Paste images directly from your clipboard to markdown/asciidoc(or other file)!";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.dendron-paste-image";
+    homepage = "https://github.com/dendronhq/dendron-paste-image";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}
--- a/pkgs/applications/editors/vscode/extensions/dendron.dendron-snippet-maker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/dendron.dendron-snippet-maker/default.nix
@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "dendron-snippet-maker";
+    publisher = "dendron";
+    version = "0.1.6";
+    hash = "sha256-KOIbAt6EjqRGaqOlCV+HO9phR4tk2KV/+FMCefCKN+8=";
+  };
+  meta = {
+    description = "Easily create markdown snippets. Used in Dendron but can also be used standalone.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.dendron-snippet-maker";
+    homepage = "https://github.com/dendronhq/easy-snippet-maker";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}
--- a/pkgs/applications/editors/vscode/extensions/dendron.dendron/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/dendron.dendron/default.nix
@ -0,0 +1,18 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "dendron";
+    publisher = "dendron";
+    version = "0.124.0";
+    hash = "sha256-/hxgmmiMUfBtPt5BcuNvtXs3LzDmPwDuUOyDf2udHws=";
+  };
+  meta = {
+    changelog = "https://github.com/dendronhq/dendron/blob/master/CHANGELOG.md";
+    description = "The personal knowledge management (PKM) tool that grows as you do!";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=dendron.dendron";
+    homepage = "https://www.dendron.so/";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.ivyfanchiang ];
+  };
+}
--- a/pkgs/applications/misc/snagboot/default.nix
+++ b/pkgs/applications/misc/snagboot/default.nix
@ -2,25 +2,26 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  python3,
+  python3Packages,
  snagboot,
  testers,
  gitUpdater,
 }:

-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "snagboot";
-  version = "1.3";
-  format = "pyproject";
+  version = "2.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "bootlin";
    repo = "snagboot";
-    rev = "v${version}";
-    hash = "sha256-ergTa6uR1SyR27H2HAWp/rtgalCnQge07Pi24PrsW+8=";
+    tag = "v${version}";
+    hash = "sha256-1WyCzfvcvDpYybxV2Jt/Ty4i2ywapJmEAZtlvxe3dpQ=";
  };

-  nativeBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
  ];

  pythonRemoveDeps = [
@ -28,18 +29,21 @@ python3.pkgs.buildPythonApplication rec {
    "swig"
  ];

-  propagatedBuildInputs = with python3.pkgs; [
-    setuptools
+  dependencies = with python3Packages; [
+    pyyaml
    pyusb
    pyserial
-    crccheck
-    six
-    xmodem
-    pyyaml
-    libfdt
    tftpy
+    crccheck
+    # pylibfdt
+    # swig
+    packaging
  ];

+  optional-dependencies = with python3Packages; {
+    gui = [ kivy ];
+  };
+
  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
    rules="src/snagrecover/50-snagboot.rules"
    if [ ! -f "$rules" ]; then
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "ladybird";
-  version = "0-unstable-2025-01-28";
+  version = "0-unstable-2025-02-04";

  src = fetchFromGitHub {
    owner = "LadybirdWebBrowser";
    repo = "ladybird";
-    rev = "eca68aad8846f20f64167cf53dc1f432abe1590e";
-    hash = "sha256-8vENHJ6BdMAEhlt54IU9+i4iVPnGp0R42v6zykGrrg4=";
+    rev = "b8537f760d4390120574be1a6a53ea08fbe1b943";
+    hash = "sha256-61Zw1FQFgtaYaRWfwGVwwV5AUrSCSUydXoCYCSe2STE=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "helm-diff";
-  version = "3.9.14";
+  version = "3.10.0";

  src = fetchFromGitHub {
    owner = "databus23";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-9YXsbxcth6v+4OW2nJjRK47dR4b8fn5izvjLfGeS5qI=";
+    hash = "sha256-vRngZigXOyxdx9bG2uWpeQ0ASTW+4tKuQWZ1Vm47Y+k=";
  };

-  vendorHash = "sha256-pn5ipX2kXuR2tHO2LE5m34xJLpB7R6jLYW+KALSPgxo=";
+  vendorHash = "sha256-kotV3GC2ilq258cLVGOzBTHb0koWfn92Acl0L8rRi5I=";

  ldflags = [
    "-s"
--- a/pkgs/applications/science/math/mathematica/generic.nix
+++ b/pkgs/applications/science/math/mathematica/generic.nix
@ -32,7 +32,7 @@
  libuuid,
  libxkbcommon,
  libxml2,
-  llvmPackages_12,
+  llvmPackages_13,
  matio,
  mpfr,
  ncurses,
@ -102,7 +102,7 @@ stdenv.mkDerivation {
      libuuid
      libxkbcommon
      libxml2
-      llvmPackages_12.libllvm.lib
+      llvmPackages_13.libllvm.lib
      matio
      mpfr
      ncurses
--- a/pkgs/applications/video/kodi/addons/libretro-gw/default.nix
+++ b/pkgs/applications/video/kodi/addons/libretro-gw/default.nix
@ -0,0 +1,38 @@
+{
+  lib,
+  rel,
+  buildKodiBinaryAddon,
+  fetchFromGitHub,
+  libretro,
+  gw,
+}:
+
+buildKodiBinaryAddon rec {
+  pname = "libretro-gw";
+  namespace = "game.libretro.gw";
+  version = "1.6.3.34";
+
+  src = fetchFromGitHub {
+    owner = "kodi-game";
+    repo = "game.libretro.gw";
+    rev = "${version}-${rel}";
+    hash = "sha256-HYXR3cEjbdKgKy42nq36Ii3UyxRVuQVROQjyaxSp5Ro=";
+  };
+
+  extraCMakeFlags = [
+    "-DGW_LIB=${gw}/lib/retroarch/cores/gw_libretro.so"
+  ];
+
+  extraBuildInputs = [ gw ];
+  propagatedBuildInputs = [
+    libretro
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/kodi-game/game.libretro.gw";
+    description = "Game and Watch for Kodi";
+    platforms = platforms.all;
+    license = licenses.gpl2Only;
+    maintainers = teams.kodi.members;
+  };
+}
--- a/pkgs/applications/video/mpv/scripts/skipsilence.nix
+++ b/pkgs/applications/video/mpv/scripts/skipsilence.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  buildLua,
+}:
+
+buildLua {
+  pname = "mpv-skipsilence";
+  version = "0-unstable-2024-05-06";
+
+  src = fetchFromGitHub {
+    owner = "ferreum";
+    repo = "mpv-skipsilence";
+    rev = "5ae7c3b6f927e728c22fc13007265682d1ecf98c";
+    hash = "sha256-fg8vfeb68nr0bTBIvr0FnRnoB48/kV957pn22tWcz1g=";
+  };
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Increase playback speed during silence";
+    homepage = "https://github.com/ferreum/mpv-skipsilence";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ mksafavi ];
+  };
+}
--- a/pkgs/by-name/ab/abuild/package.nix
+++ b/pkgs/by-name/ab/abuild/package.nix
@ -53,7 +53,8 @@ stdenv.mkDerivation (finalAttrs: {

  patchPhase = ''
    substituteInPlace ./Makefile \
-      --replace 'chmod 4555' '#chmod 4555'
+      --replace 'chmod 4555' '#chmod 4555' \
+      --replace 'pkg-config' "$PKG_CONFIG"
  '';

  makeFlags = [
--- a/pkgs/by-name/ad/add-determinism/Cargo.lock
+++ b/pkgs/by-name/ad/add-determinism/Cargo.lock
@ -0,0 +1,942 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "add-determinism"
+version = "0.5.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "glob",
+ "indoc",
+ "itertools",
+ "log",
+ "nix",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "regex",
+ "serde",
+ "serde_cbor",
+ "tempfile",
+ "thiserror",
+ "time",
+ "walkdir",
+ "zip",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.0.98"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "errno"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+
+[[package]]
+name = "flate2"
+version = "1.0.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+dependencies = [
+ "crc32fast",
+ "libz-sys",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+
+[[package]]
+name = "half"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libm"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+
+[[package]]
+name = "libz-sys"
+version = "1.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "serde",
+ "smallvec",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_cbor"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+dependencies = [
+ "half",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "byteorder",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "time",
+]
--- a/pkgs/by-name/ad/add-determinism/package.nix
+++ b/pkgs/by-name/ad/add-determinism/package.nix
@ -0,0 +1,61 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  zlib,
+  stdenv,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "add-determinism";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "keszybz";
+    repo = pname;
+    tag = "v${version}";
+    hash = "sha256-YfY0l57SjBfO5nLlCfEBzwyVPdzZKK5YKVvVATsObi0=";
+  };
+
+  # this project has no Cargo.lock now
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+  };
+
+  patches = [
+    # fix MetadataExt imports for macOS builds, will be removed when the PR is merged:
+    # https://github.com/keszybz/add-determinism/pull/48
+    (fetchpatch {
+      url = "https://github.com/Emin017/add-determinism/commit/0c6c4d1c78c845ab6b6b0666aee0e2dc85492205.patch";
+      sha256 = "sha256-y5blOfQuZ5GMug4cDkDDKc5jaGgQEYtLTuuLl041sZs=";
+    })
+  ];
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  doCheck = !stdenv.hostPlatform.isDarwin; # it seems to be running forever on darwin
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    zlib
+  ];
+
+  meta = {
+    description = "Build postprocessor to reset metadata fields for build reproducibility";
+    homepage = "https://github.com/keszybz/add-determinism";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      Emin017
+      sharzy
+    ];
+    platforms = lib.platforms.all;
+    mainProgram = "add-determinism";
+  };
+}
--- a/pkgs/by-name/ag/ags/bundle.nix
+++ b/pkgs/by-name/ag/ags/bundle.nix
@ -0,0 +1,86 @@
+{
+  lib,
+  ags,
+  astal,
+  dart-sass,
+  fzf,
+  gjs,
+  gnused,
+  gobject-introspection,
+  gtk3,
+  gtk4-layer-shell,
+  stdenvNoCC,
+  wrapGAppsHook3,
+  wrapGAppsHook4,
+}:
+{
+  entry ? "app.ts",
+  dependencies ? [ ],
+  enableGtk4 ? false,
+  ...
+}@attrs:
+stdenvNoCC.mkDerivation (
+  finalAttrs:
+  attrs
+  // {
+    nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [
+      (ags.override { extraPackages = dependencies; })
+      gnused
+      gobject-introspection
+      (if enableGtk4 then wrapGAppsHook4 else wrapGAppsHook3)
+    ];
+
+    buildInputs =
+      (attrs.buildInputs or [ ])
+      ++ dependencies
+      ++ [
+        gjs
+        astal.astal4
+        astal.astal3
+        astal.io
+      ];
+
+    preFixup =
+      ''
+        gappsWrapperArgs+=(
+          --prefix PATH : ${
+            lib.makeBinPath (
+              dependencies
+              ++ [
+                dart-sass
+                fzf
+                gtk3
+              ]
+            )
+          }
+        )
+      ''
+      + lib.optionalString enableGtk4 ''
+        gappsWrapperArgs+=(
+          --set LD_PRELOAD "${gtk4-layer-shell}/lib/libgtk4-layer-shell.so"
+        )
+      ''
+      + (attrs.preFixup or "");
+
+    installPhase =
+      let
+        outBin = "$out/bin/${finalAttrs.pname}";
+      in
+      # bash
+      ''
+        runHook preInstall
+
+        mkdir -p "$out/bin" "$out/share"
+        cp -r ./* "$out/share"
+        ags bundle "${entry}" "${outBin}" -d "SRC='$out/share'"
+
+        chmod +x "${outBin}"
+
+        if ! head -n 1 "${outBin}" | grep -q "^#!"; then
+          sed -i '1i #!${gjs}/bin/gjs -m' "${outBin}"
+        fi
+
+        runHook postInstall
+      '';
+  }
+)
--- a/pkgs/by-name/ag/ags/package.nix
+++ b/pkgs/by-name/ag/ags/package.nix
@ -1,78 +1,122 @@
 {
  lib,
-  buildNpmPackage,
+  astal,
+  blueprint-compiler,
+  buildGoModule,
+  callPackage,
+  dart-sass,
+  symlinkJoin,
  fetchFromGitHub,
-  meson,
-  ninja,
-  pkg-config,
-  gobject-introspection,
+  fetchpatch2,
  gjs,
-  glib-networking,
-  gnome-bluetooth,
-  gtk-layer-shell,
-  libpulseaudio,
-  libsoup_3,
-  networkmanager,
-  upower,
-  typescript,
-  wrapGAppsHook3,
-  linux-pam,
+  glib,
+  gobject-introspection,
+  gtk4-layer-shell,
+  installShellFiles,
  nix-update-script,
-}:
+  nodejs,
+  stdenv,
+  wrapGAppsHook3,

-buildNpmPackage rec {
+  extraPackages ? [ ],
+}:
+buildGoModule rec {
  pname = "ags";
-  version = "1.8.2";
+  version = "2.2.1";

  src = fetchFromGitHub {
    owner = "Aylur";
    repo = "ags";
-    rev = "v${version}";
-    hash = "sha256-ebnkUaee/pnfmw1KmOZj+MP1g5wA+8BT/TPKmn4Dkwc=";
-    fetchSubmodules = true;
+    tag = "v${version}";
+    hash = "sha256-snHhAgcH8hACWZFaAqHr5uXH412UrAuA603OK02MxN8=";
  };

-  npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20=";
+  patches = [
+    # refactor for better nix support
+    (fetchpatch2 {
+      url = "https://github.com/Aylur/ags/commit/17df94c576d0023185770f901186db427f2ec0a2.diff?full_index=1";
+      hash = "sha256-tcoifkYmXjV+ZbeAFRHuk8cVmxWMrS64syvQMGGKAVA=";
+    })
+  ];

-  mesonFlags = [ (lib.mesonBool "build_types" true) ];
+  vendorHash = "sha256-Pw6UNT5YkDVz4HcH7b5LfOg+K3ohrBGPGB9wYGAQ9F4=";
+  proxyVendor = true;
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.astalGjs=${astal.gjs}/share/astal/gjs"
+    "-X main.gtk4LayerShell=${gtk4-layer-shell}/lib/libgtk4-layer-shell.so"
+  ];

  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gjs
-    gobject-introspection
-    typescript
    wrapGAppsHook3
+    gobject-introspection
+    installShellFiles
  ];

-  # Most of the build inputs here are basically needed for their typelibs.
-  buildInputs = [
-    gjs
-    glib-networking
-    gnome-bluetooth
-    gtk-layer-shell
-    libpulseaudio
-    libsoup_3
-    linux-pam
-    networkmanager
-    upower
+  buildInputs = extraPackages ++ [
+    glib
+    astal.io
+    astal.astal3
+    astal.astal4
+    gobject-introspection # needed for type generation
  ];

-  postPatch = ''
-    chmod u+x ./post_install.sh && patchShebangs ./post_install.sh
-  '';
+  preFixup =
+    let
+      # git files are usually in `dev` output.
+      # `propagatedBuildInputs` are also available in the gjs runtime
+      # so we also want to generate types for these.
+      depsOf = pkg: [ (pkg.dev or pkg) ] ++ (map depsOf (pkg.propagatedBuildInputs or [ ]));
+      girDirs = symlinkJoin {
+        name = "gir-dirs";
+        paths = lib.flatten (map depsOf buildInputs);
+      };
+    in
+    ''
+      gappsWrapperArgs+=(
+        --prefix EXTRA_GIR_DIRS : "${girDirs}/share/gir-1.0"
+        --prefix PATH : "${
+          lib.makeBinPath (
+            [
+              gjs
+              nodejs
+              dart-sass
+              blueprint-compiler
+              astal.io
+            ]
+            ++ extraPackages
+          )
+        }"
+      )
+    '';

-  passthru.updateScript = nix-update-script { };
+  postInstall =
+    lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
+      # bash
+      ''
+        installShellCompletion \
+          --cmd ags \
+          --bash <($out/bin/ags completion bash) \
+          --fish <($out/bin/ags completion fish) \
+          --zsh <($out/bin/ags completion zsh)
+      '';
+
+  passthru = {
+    bundle = callPackage ./bundle.nix { };
+    updateScript = nix-update-script { };
+  };

  meta = {
+    description = "Scaffolding CLI for Astal widget system";
    homepage = "https://github.com/Aylur/ags";
-    description = "EWW-inspired widget system as a GJS library";
    changelog = "https://github.com/Aylur/ags/releases/tag/v${version}";
    license = lib.licenses.gpl3Plus;
    maintainers = with lib.maintainers; [
      foo-dogsquared
      johnrtitor
+      perchun
    ];
    mainProgram = "ags";
    platforms = lib.platforms.linux;
--- a/pkgs/by-name/ag/ags_1/package.nix
+++ b/pkgs/by-name/ag/ags_1/package.nix
@ -0,0 +1,80 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  gjs,
+  glib-networking,
+  gnome-bluetooth,
+  gtk-layer-shell,
+  libpulseaudio,
+  libsoup_3,
+  networkmanager,
+  upower,
+  typescript,
+  wrapGAppsHook3,
+  linux-pam,
+  nix-update-script,
+}:
+
+buildNpmPackage rec {
+  pname = "ags";
+  version = "1.8.2";
+
+  src = fetchFromGitHub {
+    owner = "Aylur";
+    repo = "ags";
+    rev = "v${version}";
+    hash = "sha256-ebnkUaee/pnfmw1KmOZj+MP1g5wA+8BT/TPKmn4Dkwc=";
+    fetchSubmodules = true;
+  };
+
+  npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20=";
+
+  mesonFlags = [ (lib.mesonBool "build_types" true) ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gjs
+    gobject-introspection
+    typescript
+    wrapGAppsHook3
+  ];
+
+  # Most of the build inputs here are basically needed for their typelibs.
+  buildInputs = [
+    gjs
+    glib-networking
+    gnome-bluetooth
+    gtk-layer-shell
+    libpulseaudio
+    libsoup_3
+    linux-pam
+    networkmanager
+    upower
+  ];
+
+  postPatch = ''
+    chmod u+x ./post_install.sh && patchShebangs ./post_install.sh
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/Aylur/ags";
+    description = "EWW-inspired widget system as a GJS library";
+    changelog = "https://github.com/Aylur/ags/releases/tag/v${version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      foo-dogsquared
+      johnrtitor
+    ];
+    mainProgram = "ags";
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "application-title-bar";
-  version = "0.7.7";
+  version = "0.8.3";

  src = fetchFromGitHub {
    owner = "antroids";
    repo = "application-title-bar";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-K4wbEWmeXDxVkVSHCPU8u49A211ZXR1As1k47/ibj/c=";
+    hash = "sha256-orAgSPFKIgBXw2NAlVglJGQ4Db2zF7BqLJfZJDOqZgE=";
  };

  propagatedUserEnvPkgs = with kdePackages; [ kconfig ];
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@ -16,9 +16,9 @@
 {
  application-insights = mkAzExtension rec {
    pname = "application-insights";
-    version = "1.2.1";
+    version = "1.2.2";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl";
-    hash = "sha256-4fqCTrWH4r7H9MtNHEzhAzqz0/rGWvQt1iGPZzsBnO4=";
+    hash = "sha256-ijmPj8jG+s+855jly3m5wEz5myS8pxU/Scf7lRP2VvI=";
    description = "Support for managing Application Insights components and querying metrics, events, and logs from such components";
    propagatedBuildInputs = with python3Packages; [ isodate ];
    meta.maintainers = with lib.maintainers; [ andreasvoss ];
@ -83,9 +83,9 @@

  containerapp = mkAzExtension rec {
    pname = "containerapp";
-    version = "1.0.0b1";
+    version = "1.1.0b2";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
-    hash = "sha256-2AuDsOIncJJcJLyhUMhBgjdrewr/m28oSY12nchhi0U=";
+    hash = "sha256-+2iP6+jsuO3NKJzKUUdLuBCpscn0w/Gx+pqBagyv4rE=";
    description = "Microsoft Azure Command-Line Tools Containerapp Extension";
    propagatedBuildInputs = with python3Packages; [
      docker
@ -96,9 +96,9 @@

  rdbms-connect = mkAzExtension rec {
    pname = "rdbms-connect";
-    version = "1.0.6";
+    version = "1.0.7";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl";
-    hash = "sha256-Scvo2bfqB6iXSimtkCR+hk7XmL7V8o0OOleks39ZOec=";
+    hash = "sha256-66mX1K1azQvbuApyKBwvVuiKCbLaqezCDdrv0lhvVD0=";
    description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers";
    propagatedBuildInputs =
      (with python3Packages; [
@ -113,15 +113,18 @@

  ssh = mkAzExtension rec {
    pname = "ssh";
-    version = "2.0.5";
+    version = "2.0.6";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl";
-    hash = "sha256-gMmLENe/HOQAW3aUrt0FxHNVRWd1umElMIvmX7D+/JM=";
+    hash = "sha256-PSIGtOa91WxpzFCauZ5d5tx/ZtCRsBhbejtVfY3Bgss=";
    description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates";
    propagatedBuildInputs = with python3Packages; [
      oras
      oschmod
    ];
-    meta.maintainers = with lib.maintainers; [ gordon-bp ];
+    meta = {
+      maintainers = with lib.maintainers; [ gordon-bp ];
+      changelog = "https://github.com/Azure/azure-cli-extensions/blob/ssh-${version}/src/ssh/HISTORY.md";
+    };
  };

  storage-preview = mkAzExtension rec {
@ -136,9 +139,9 @@

  vm-repair = mkAzExtension rec {
    pname = "vm-repair";
-    version = "2.0.0";
+    version = "2.0.2";
    url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
-    hash = "sha256-mBa0SgKyGdxrTtrSVDp78Z0yXUMywL/9o0osKeUbhdU=";
+    hash = "sha256-ts7ByTWI1Chtx9kFQ3sfw4TWP8X5b1hYscudnYJDdOs=";
    description = "Support for repairing Azure Virtual Machines";
    propagatedBuildInputs = with python3Packages; [ opencensus ];
    meta.maintainers = with lib.maintainers; [ ];
--- a/pkgs/by-name/cl/clock-rs/package.nix
+++ b/pkgs/by-name/cl/clock-rs/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "clock-rs";
-  version = "0.1.213";
+  version = "0.1.214";

  src = fetchFromGitHub {
    owner = "Oughie";
    repo = "clock-rs";
    tag = "v${version}";
-    sha256 = "06spnadlgy7902bqhhi6019ay5y55qfrarsfidp938icali9q5pi";
+    sha256 = "sha256-D0Wywl20TFIy8aQ9UkcI6T+5huyRuCCPc+jTeXsZd8g=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-3XIPrKt6oYugIo5erBE/od55AvBGEZe46l8DMXhhzF4=";
+  cargoHash = "sha256-W4m4JffqNwebGWYNsMF6U0bDroqXJAixmcmqcqYjyzw=";

  meta = {
    description = "Modern, digital clock that effortlessly runs in your terminal";
@ -24,9 +24,9 @@ rustPlatform.buildRustPackage rec {
      clock-rs is a terminal-based clock written in Rust, designed to be a new alternative to tty-clock.
      It supports all major platforms and offers several improvements, which include:

-      The use of a single configuration file to manage its settings, with the ability to overwrite them through the command line,
-      Many additional features such as a timer and a stopwatch,
-      And greater flexibility as well as better user experience!
+      - The use of a single configuration file to manage its settings, with the ability to overwrite them through the command line,
+      - Many additional features such as a timer and a stopwatch,
+      - And greater flexibility as well as better user experience!
    '';
    homepage = "https://github.com/Oughie/clock-rs";
    license = lib.licenses.asl20;
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "codeql";
-  version = "2.20.2";
+  version = "2.20.3";

  dontConfigure = true;
  dontBuild = true;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  src = fetchzip {
    url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-t2CT2bseVlVVt5h5j9r9usdr7za2ki+qYSsm5wG7kk8=";
+    hash = "sha256-J5zPIfQz1RRCLfer1gL/5ZbLT/Wb+SUTUWF2pMyvdxk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
  env.VERGEN_GIT_SHA = src.rev;

  postPatch = ''
-    substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
+    substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
  '';

  nativeBuildInputs = [
@ -79,20 +79,9 @@ rustPlatform.buildRustPackage rec {
    "-Wl,--pop-state"
  ];

-  # LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
  postInstall = ''
    wrapProgram "$out/bin/cosmic-edit" \
-      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
-      --prefix LD_LIBRARY_PATH : ${
-        lib.makeLibraryPath [
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXi
-          vulkan-loader
-          libxkbcommon
-          wayland
-        ]
-      }
+      --suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
  '';

  meta = with lib; {
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@ -9,6 +9,7 @@
  makeShellWrapper,
  maven,
  wrapGAppsHook3,
+  nix-update-script,
 }:

 let
@ -16,23 +17,18 @@ let
 in
 maven.buildMavenPackage rec {
  pname = "cryptomator";
-  version = "1.14.2";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "cryptomator";
    repo = "cryptomator";
-    rev = version;
-    hash = "sha256-TSE83QYFry8O6MKAoggJBjqonYiGax5GG/a7sm7aHf8=";
+    tag = version;
+    hash = "sha256-fGn8jsPHwGHSiXgIfkMtSYut6pVg8p9+N/uDUlj2Wwc=";
  };

-  patches = [
-    # https://github.com/cryptomator/cryptomator/pull/3621
-    ./string-template-removal-and-jdk23.patch
-  ];
-
  mvnJdk = jdk;
  mvnParameters = "-Dmaven.test.skip=true -Plinux";
-  mvnHash = "sha256-LFD150cGW6OdwkK28GYI9j44GtVE0pwFMaQ8dQqArLo=";
+  mvnHash = "sha256-w0mIeSFRSGl3EorrGcxqnXF6C0SowjWUMYT/NN1erwM=";

  preBuild = ''
    VERSION=${version}
@ -114,9 +110,12 @@ maven.buildMavenPackage rec {
    libayatana-appindicator
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Free client-side encryption for your cloud files";
    homepage = "https://cryptomator.org";
+    changelog = "https://github.com/cryptomator/cryptomator/releases/tag/${version}";
    license = lib.licenses.gpl3Plus;
    mainProgram = "cryptomator";
    maintainers = with lib.maintainers; [
--- a/pkgs/by-name/cr/cryptomator/string-template-removal-and-jdk23.patch
+++ b/pkgs/by-name/cr/cryptomator/string-template-removal-and-jdk23.patch
@ -1,135 +0,0 @@
-diff --git a/src/main/java/org/cryptomator/common/mount/Mounter.java b/src/main/java/org/cryptomator/common/mount/Mounter.java
-index 6ca067305b..89f8fb7822 100644
--- a/src/main/java/org/cryptomator/common/mount/Mounter.java
-+++ b/src/main/java/org/cryptomator/common/mount/Mounter.java
-@@ -160,7 +160,7 @@ public MountHandle mount(VaultSettings vaultSettings, Path cryptoFsRoot) throws
- 		var mountService = mountProviders.stream().filter(s -> s.getClass().getName().equals(vaultSettings.mountService.getValue())).findFirst().orElse(defaultMountService.getValue());
- 
- 		if (isConflictingMountService(mountService)) {
-			var msg = STR."\{mountService.getClass()} unavailable due to conflict with either of \{CONFLICTING_MOUNT_SERVICES.get(mountService.getClass().getName())}";
-+			var msg = mountService.getClass() + " unavailable due to conflict with either of " + CONFLICTING_MOUNT_SERVICES.get(mountService.getClass().getName());
- 			throw new ConflictingMountServiceException(msg);
- 		}
- 
-diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
-index eefad55a2f..0e7a6cc3ab 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
-+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
-@@ -20,7 +20,7 @@ public class HubConfig {
- 	public String devicesResourceUrl;
- 
- 	/**
-	 * A collection of String template processors to construct URIs related to this Hub instance.
-+	 * A collection of functions to construct URIs related to this Hub instance.
- 	 */
- 	@JsonIgnore
- 	public final URIProcessors URIs = new URIProcessors();
-@@ -52,8 +52,7 @@ public class URIProcessors {
- 		/**
- 		 * Resolves paths relative to the <code>/api/</code> endpoint of this Hub instance.
- 		 */
-		public final StringTemplate.Processor<URI, RuntimeException> API = template -> {
-			var path = template.interpolate();
-+		public URI getApi(String path) {
- 			var relPath = path.startsWith("/") ? path.substring(1) : path;
- 			return getApiBaseUrl().resolve(relPath);
- 		};
-diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
-index 3bfb4ec8ea..3353d78dd6 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
-+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
-@@ -88,7 +88,7 @@ public void receiveKey() {
- 	 * STEP 0 (Request): GET /api/config
- 	 */
- 	private void requestApiConfig() {
-		var configUri = hubConfig.URIs.API."config";
-+		var configUri = hubConfig.URIs.getApi("config");
- 		var request = HttpRequest.newBuilder(configUri) //
- 				.GET() //
- 				.timeout(REQ_TIMEOUT) //
-@@ -122,7 +122,7 @@ private void receivedApiConfig(HttpResponse<String> response) {
- 	 * STEP 1 (Request): GET user key for this device
- 	 */
- 	private void requestDeviceData() {
-		var deviceUri = hubConfig.URIs.API."devices/\{deviceId}";
-+		var deviceUri = hubConfig.URIs.getApi("devices/" + deviceId);
- 		var request = HttpRequest.newBuilder(deviceUri) //
- 				.header("Authorization", "Bearer " + bearerToken) //
- 				.GET() //
-@@ -162,7 +162,7 @@ private void needsDeviceRegistration() {
- 	 * STEP 2 (Request): GET vault key for this user
- 	 */
- 	private void requestVaultMasterkey(String encryptedUserKey) {
-		var vaultKeyUri = hubConfig.URIs.API."vaults/\{vaultId}/access-token";
-+		var vaultKeyUri = hubConfig.URIs.getApi("vaults/" + vaultId + "/access-token");
- 		var request = HttpRequest.newBuilder(vaultKeyUri) //
- 				.header("Authorization", "Bearer " + bearerToken) //
- 				.GET() //
-@@ -205,7 +205,7 @@ private void receivedBothEncryptedKeys(String encryptedVaultKey, String encrypte
- 	 */
- 	@Deprecated
- 	private void requestLegacyAccessToken() {
-		var legacyAccessTokenUri = hubConfig.URIs.API."vaults/\{vaultId}/keys/\{deviceId}";
-+		var legacyAccessTokenUri = hubConfig.URIs.getApi("vaults/" + vaultId + "/keys/" + deviceId);
- 		var request = HttpRequest.newBuilder(legacyAccessTokenUri) //
- 				.header("Authorization", "Bearer " + bearerToken) //
- 				.GET() //
-diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
-index b00d49874e..d711ff86ef 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
-+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
-@@ -115,7 +115,7 @@ public void register() {
- 		workInProgress.set(true);
- 
- 
-		var userReq = HttpRequest.newBuilder(hubConfig.URIs.API."users/me") //
-+		var userReq = HttpRequest.newBuilder(hubConfig.URIs.getApi("users/me")) //
- 				.GET() //
- 				.timeout(REQ_TIMEOUT) //
- 				.header("Authorization", "Bearer " + bearerToken) //
-@@ -143,7 +143,7 @@ public void register() {
- 					var now = Instant.now().toString();
- 					var dto = new CreateDeviceDto(deviceId, deviceNameField.getText(), BaseEncoding.base64().encode(deviceKeyPair.getPublic().getEncoded()), "DESKTOP", jwe.serialize(), now);
- 					var json = toJson(dto);
-					var deviceUri = hubConfig.URIs.API."devices/\{deviceId}";
-+					var deviceUri = hubConfig.URIs.getApi("devices/" + deviceId);
- 					var putDeviceReq = HttpRequest.newBuilder(deviceUri) //
- 							.PUT(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) //
- 							.timeout(REQ_TIMEOUT) //
-@@ -164,7 +164,7 @@ public void register() {
- 	private void migrateLegacyDevices(ECPublicKey userPublicKey) {
- 		try {
- 			// GET legacy access tokens
-			var getUri = hubConfig.URIs.API."devices/\{deviceId}/legacy-access-tokens";
-+			var getUri = hubConfig.URIs.getApi("devices/" + deviceId + "/legacy-access-tokens");
- 			var getReq = HttpRequest.newBuilder(getUri).GET().timeout(REQ_TIMEOUT).header("Authorization", "Bearer " + bearerToken).build();
- 			var getRes = httpClient.send(getReq, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
- 			if (getRes.statusCode() != 200) {
-@@ -185,12 +185,12 @@ private void migrateLegacyDevices(ECPublicKey userPublicKey) {
- 					LOG.warn("Failed to decrypt legacy access token for vault {}. Skipping migration.", entry.getKey());
- 				}
- 			}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-			var postUri = hubConfig.URIs.API."users/me/access-tokens";
-+			var postUri = hubConfig.URIs.getApi("users/me/access-tokens");
- 			var postBody = JSON.writer().writeValueAsString(newAccessTokens);
- 			var postReq = HttpRequest.newBuilder(postUri).POST(HttpRequest.BodyPublishers.ofString(postBody)).timeout(REQ_TIMEOUT).header("Authorization", "Bearer " + bearerToken).build();
- 			var postRes = httpClient.send(postReq, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8));
- 			if (postRes.statusCode() != 200) {
-				throw new IOException(STR."Unexpected response from POST \{postUri}: \{postRes.statusCode()}");
-+				throw new IOException("Unexpected response from POST " + postUri + ": " + postRes.statusCode());
- 			}
- 		} catch (IOException e) {
- 			// log and ignore: this is merely a best-effort attempt of migrating legacy devices. Failure is uncritical as this is merely a convenience feature.
-diff --git a/pom.xml b/pom.xml
-index 3290b3121d..0812419af1 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -26,7 +26,7 @@
- 
- 	<properties>
- 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>22</project.jdk.version>
-+		<project.jdk.version>23</project.jdk.version>
- 
- 		<!-- Group IDs of jars that need to stay on the class path for now -->
- 		<!-- remove them, as soon they got modularized or support is dropped (i.e., WebDAV) -->
--- a/pkgs/by-name/ed/edgedb/package.nix
+++ b/pkgs/by-name/ed/edgedb/package.nix
@ -16,19 +16,19 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "edgedb";
-  version = "6.1.0";
+  version = "6.1.1";

  src = fetchFromGitHub {
    owner = "edgedb";
    repo = "edgedb-cli";
    tag = "v${version}";
-    hash = "sha256-iB0ZWciEx/Xiq+pMg3nMJNHumoy5Z8dB6ev7UneHnVg=";
+    hash = "sha256-cNjt66CTJq3q1leuQ7z1WreJVG0gdUmMW+pH+FozFz0=";
    fetchSubmodules = true;
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
-    hash = "sha256-oiDCUJamnl2ykvfs7V20dvr29ZAtSl+kZW4fzmlc1Ao=";
+    hash = "sha256-fAr/cTF8LqLAxbKW1Vq4H8fFX1kUa/rZDSVz3/wl44E=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ej/ejson/package.nix
+++ b/pkgs/by-name/ej/ejson/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "ejson";
-  version = "1.5.3";
+  version = "1.5.4";

  src = fetchFromGitHub {
    owner = "Shopify";
    repo = "ejson";
    rev = "v${version}";
-    sha256 = "sha256-WazcVmZq9uQPXbslWFW0r0SFF4xNKECgxcBoD+RS17k=";
+    sha256 = "sha256-s/VeBajNZI0XNs1PwWMpHAF0Wrh1/ZQUvUZBnUCoPBM=";
  };

-  vendorHash = "sha256-N2vcj3STkaZO2eRr8VztZTWOBUTI+wOri0HYDJ1KiN8=";
+  vendorHash = "sha256-JeZkiiqNmDsuQSA6hCboasApRlTmw/+fgTAp5WbgdDg=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ex/exfatprogs/package.nix
+++ b/pkgs/by-name/ex/exfatprogs/package.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "exfatprogs";
-  version = "1.2.6";
+  version = "1.2.7";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "sha256-VUvVPABgQ7EUQu90DbWU7a+YThrWhusTk/YreKSqU/M=";
+    sha256 = "sha256-ZMtDQ+RCTV0gUAXhsgUfRQlqcseWhbWa1szWfmgpDFk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fe/fertilizer/package.nix
+++ b/pkgs/by-name/fe/fertilizer/package.nix
@ -0,0 +1,43 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "fertilizer";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "moleculekayak";
+    repo = "fertilizer";
+    tag = "v${version}";
+    hash = "sha256-sDoAjEiKxHf+HtFLZr6RwuXN+rl0ZQnFUoQ09QiE6Xc=";
+  };
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
+    bencoder
+    colorama
+    flask
+    requests
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [ "fertilizer" ];
+
+  meta = {
+    description = "Cross-seeding tool for music";
+    homepage = "https://github.com/moleculekayak/fertilizer";
+    changelog = "https://github.com/moleculekayak/fertilizer/releases";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ambroisie ];
+    mainProgram = "fertilizer";
+  };
+}
--- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix
+++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix
@ -0,0 +1,59 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitLab,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "fleeting-plugin-aws";
+  version = "1.0.0";
+
+  src = fetchFromGitLab {
+    owner = "gitlab-org/fleeting/plugins";
+    repo = "aws";
+    tag = "v${version}";
+    hash = "sha256-8vEduf+xh9R3+GoouXJS2h/ELlzKXDmLBLekaXGn7SE=";
+  };
+
+  vendorHash = "sha256-bfEzPPP280peOK4Jyu1fyfFCaFnRLoPmsjJ+G1BoVW4=";
+
+  subPackages = [ "cmd/fleeting-plugin-aws" ];
+
+  # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22.
+  #
+  # Needed for "fleeting-plugin-aws version" to not show "dev".
+  ldflags =
+    let
+      # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L14.
+      #
+      # Couldn't find a way to substitute "go list ." into "ldflags".
+      ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/plugins/aws";
+    in
+    [
+      "-X ${ldflagsPackageVariablePrefix}.NAME=fleeting-plugin-aws"
+      "-X ${ldflagsPackageVariablePrefix}.VERSION=v${version}"
+      "-X ${ldflagsPackageVariablePrefix}.REVISION=${src.rev}"
+    ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgram = "${builtins.placeholder "out"}/bin/fleeting-plugin-aws";
+
+  versionCheckProgramArg = "version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "GitLab fleeting plugin for AWS";
+    homepage = "https://gitlab.com/gitlab-org/fleeting/plugins/aws";
+    license = lib.licenses.mit;
+    mainProgram = "fleeting-plugin-aws";
+    maintainers = with lib.maintainers; [ commiterate ];
+  };
+}
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "gh-dash";
-  version = "4.9.1";
+  version = "4.11.0";

  src = fetchFromGitHub {
    owner = "dlvhdr";
    repo = "gh-dash";
    rev = "v${version}";
-    hash = "sha256-n0+I1URuIOKqBj+BSE6bD3wOxpaKWM9t1X3PkPhawKY=";
+    hash = "sha256-i7PsOd2avaKY0FvsjBpTQk6rijf9EE6kVRicfe4k8NE=";
  };

  vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
--- a/pkgs/by-name/gv/gvproxy/package.nix
+++ b/pkgs/by-name/gv/gvproxy/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "gvproxy";
-  version = "0.8.2";
+  version = "0.8.3";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "gvisor-tap-vsock";
    rev = "v${version}";
-    hash = "sha256-D+iOnkQcd0MsnC2xSuWvBIQt0v8EosgyLDTvOJF/TI8=";
+    hash = "sha256-oJxuOl9Q94QdH0egc4BTwOESljTJ+tii0mSkaEsmq2s=";
  };

  vendorHash = null;
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@ -35,11 +35,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "haproxy";
-  version = "3.1.2";
+  version = "3.1.3";

  src = fetchurl {
    url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rzXci/MZOHC3InamOSCXS+8UBfxBA41UW4a2QapZ9AA=";
+    hash = "sha256-bdIfmkHw7HKJZQ4pkYC2T53SJeNRE/0b3cajouedUXI=";
  };

  buildInputs =
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@ -6,17 +6,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "harper";
-  version = "0.18.1";
+  version = "0.19.1";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${version}";
-    hash = "sha256-UzsRiEYDKvOQR1jlD5KVZlJjhqzF1Digii85HI3vuOc=";
+    hash = "sha256-3W/pFtI8G9GOEXt1nCpoy+vp6+59Ya3oqlx2EttGEIk=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-TrABsTBO0Tn7V6Ev2GDsHguB792S7FSK3bBoi0JbhcI=";
+  cargoHash = "sha256-xPppf2YRgvGqmFBFLZl8XF5apGUX6kICE0jp2nx++io=";

  meta = {
    description = "Grammar Checker for Developers";
--- a/pkgs/by-name/ht/httptap/package.nix
+++ b/pkgs/by-name/ht/httptap/package.nix
@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  fetchpatch,
+}:
+
+buildGoModule rec {
+  pname = "httptap";
+  version = "0.0.8";
+
+  src = fetchFromGitHub {
+    owner = "monasticacademy";
+    repo = "httptap";
+    tag = "v${version}";
+    hash = "sha256-1BtV5ao5dAKSINdUdJD/wxTMFXXiP8Vy1A7gQfVIsUQ=";
+  };
+
+  patches = [
+    # this patch updates go.mod to include missing dependencies
+    # https://github.com/monasticacademy/httptap/pull/13
+    (fetchpatch {
+      name = "update-go-mod";
+      url = "https://github.com/monasticacademy/httptap/commit/3b520725c784d6435be6a51c58ae847bae729962.patch";
+      hash = "sha256-0dPq0Ldu1m8YZKctFtoUcbQdmx6sqjA8EVhTeMwNWx8=";
+    })
+  ];
+
+  vendorHash = "sha256-+TtHw2KdeNHCgnMnkxJJ9shqsrlbeTzYwbPH0dJmCjM=";
+
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "."
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "View HTTP/HTTPS requests made by any Linux program";
+    homepage = "https://github.com/monasticacademy/httptap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jpetrucciani ];
+    mainProgram = "httptap";
+  };
+}
--- a/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
+++ b/pkgs/by-name/hy/hyprland-workspaces-tui/package.nix
@ -0,0 +1,43 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  hyprland-workspaces,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "hyprland-workspaces-tui";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "Levizor";
+    repo = "hyprland-workspaces-tui";
+    tag = version;
+    hash = "sha256-3QmqoyWmtC4ps8dtIWEoLjzdzKAXOujyz+GgOlo172Q=";
+  };
+
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-VjYLqRXJhR8MZD+qcwqgw36Xh0RafJeAnuHzO+pab4s=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ hyprland-workspaces ];
+
+  postFixup = ''
+    wrapProgram $out/bin/hyprland-workspaces-tui \
+      --suffix PATH : ${lib.makeBinPath [ hyprland-workspaces ]}
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal-based user interface (TUI) wrapper for the hyprland-workspaces CLI utility";
+    homepage = "https://github.com/Levizor/hyprland-workspaces-tui";
+    license = lib.licenses.mit;
+    mainProgram = "hyprland-workspaces-tui";
+    maintainers = with lib.maintainers; [ Levizor ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/iv/ivyterm/package.nix
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@ -12,17 +12,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "ivyterm";
-  version = "1.0.4";
+  version = "1.0.5";

  src = fetchFromGitHub {
    owner = "Tomiyou";
    repo = "ivyterm";
    tag = "v${version}";
-    hash = "sha256-zp0crxn8dF/6Bxru08qmfjs12VOqKaxDxU3xlD6Gosk=";
+    hash = "sha256-Xr4oXg+kZPDImY7BlKUHwgi5AtCArH1vf3+s117luTQ=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-Vm6EP/t6y6Ijb6RnHebdf1qMIAwoMjh0RJ77xyYV1ZM=";
+  cargoHash = "sha256-aBo+IAM+tAzUazw9XE80EACWyQtDIQjm33Q20p49L5s=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@ -5,17 +5,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "jql";
-  version = "8.0.2";
+  version = "8.0.3";

  src = fetchFromGitHub {
    owner = "yamafaktory";
    repo = pname;
    rev = "jql-v${version}";
-    hash = "sha256-acvLzxjj+HxVE/BWiWezeghDiP4VNNAzeFEs+u+b5iA=";
+    hash = "sha256-Xnu7rw8C+NiF6vkEixt/RchlUjkswzN3E+Py0M7Xtyo=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-O0WefEbtjBQp1JUV4lxPHN5aT+qo8mNxHsegSjVCgJU=";
+  cargoHash = "sha256-4pWyQVrREDjk901ihpeDPjcApPt29Vc2zlJveA+36Jw=";

  meta = with lib; {
    description = "JSON Query Language CLI tool built with Rust";
--- a/pkgs/by-name/ku/kube-state-metrics/package.nix
+++ b/pkgs/by-name/ku/kube-state-metrics/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "kube-state-metrics";
-  version = "2.14.0";
+  version = "2.15.0";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = "kube-state-metrics";
    rev = "v${version}";
-    hash = "sha256-qLn+2znmfIdBkoVkCJ0tFAPVRYc+qAJWKbDP2FqMocg=";
+    hash = "sha256-s46K5V7lwqeQ4qjaCPAoMoKLikezT+Ik5bJAkkJ5Q40=";
  };

-  vendorHash = "sha256-KyEGmtSQO0EERLb0I7NBmxv1Jz+bYMrCZVwjJ1Jt+Ik=";
+  vendorHash = "sha256-3g3iPgc60u+zh1YZoWv4aPOJM2TmVzrlBmRoaxrEORo=";

  excludedPackages = [
    "./tests/e2e"
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@ -31,6 +31,22 @@ let
  pname = "legends-of-equestria";
  version = "2024.06.02";
  description = "Free-to-play MMORPG";
+
+  srcOptions = {
+    x86_64-linux = {
+      url = "https://mega.nz/file/Z3oAGYDa#01EfQICR4k5BK56hWFckYKsfgdV36KoU91TvSBwKgxY";
+      outputHash = "vpVIaRPrZih+ydWszsBF/JgO0AXh2rF/yOpBuI+V0m4=";
+    };
+    x86_64-darwin = {
+      url = "https://mega.nz/file/p6JQUDYC#lBRUK7lmxMHh4OvEyKjfl0W1mOL2VVzAH9rXL5ViiN0";
+      outputHash = "bvFg4wjltiilCP1oKfgUWThcEq8tzCIP3W/eAd3SxFo=";
+    };
+    aarch64-darwin = {
+      url = "https://mega.nz/file/cvxSzZ4b#eJHLvVHz_zxBiRxGMCBcsl1gV6M6ebQf2tQbNpEqCvk";
+      outputHash = "1aZGuOgXTLFxwF2FcYEwKA/LRT26uiXupBoqmzq9pFM=";
+    };
+  };
+
  runtimeDeps =
    [
      dbus.lib
@ -67,17 +83,19 @@ stdenv.mkDerivation {
  inherit pname version;
  src =
    runCommand "mega-loe"
-      {
-        inherit pname version;
-        nativeBuildInputs = [
-          megacmd
-          unzip
-        ];
-        url = "https://mega.nz/file/Z3oAGYDa#01EfQICR4k5BK56hWFckYKsfgdV36KoU91TvSBwKgxY";
-        outputHashAlgo = "sha256";
-        outputHash = "vpVIaRPrZih+ydWszsBF/JgO0AXh2rF/yOpBuI+V0m4=";
-        outputHashMode = "recursive";
-      }
+      (
+        srcOptions.${stdenv.hostPlatform.system}
+        // {
+          pname = "${pname}-source";
+          inherit version;
+          nativeBuildInputs = [
+            megacmd
+            unzip
+          ];
+          outputHashAlgo = "sha256";
+          outputHashMode = "recursive";
+        }
+      )
      ''
        export HOME=$(mktemp -d)
        dest=$HOME/mega-loe
@ -91,28 +109,42 @@ stdenv.mkDerivation {
  buildInputs = [
    libgcc
  ];
-  nativeBuildInputs = [
-    makeWrapper
-    copyDesktopItems
-    autoPatchelfHook
-  ];
+  nativeBuildInputs =
+    [
+      makeWrapper
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      copyDesktopItems
+      autoPatchelfHook
+    ];

-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    if stdenv.hostPlatform.isLinux then
+      ''
+        runHook preInstall

-    loeHome=$out/lib/${pname}
-    mkdir -p $loeHome
-    cp -r Linux/* $loeHome
+        loeHome=$out/lib/${pname}
+        mkdir -p $loeHome
+        cp -r Linux/* $loeHome

-    makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \
-      --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"
+        makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \
+          --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}"

-    icon=$out/share/icons/hicolor/128x128/apps/legends-of-equestria.png
-    mkdir -p $(dirname $icon)
-    ln -s $loeHome/LoE_Data/Resources/UnityPlayer.png $icon
+        icon=$out/share/icons/hicolor/128x128/apps/legends-of-equestria.png
+        mkdir -p $(dirname $icon)
+        ln -s $loeHome/LoE_Data/Resources/UnityPlayer.png $icon

-    runHook postInstall
-  '';
+        runHook postInstall
+      ''
+    else
+      ''
+        runHook preInstall
+
+        mkdir -p $out/Applications
+        cp -r *.app $out/Applications
+
+        runHook postInstall
+      '';

  passthru.updateScript = ./update.sh;

@ -131,7 +163,7 @@ stdenv.mkDerivation {
  meta = {
    inherit description;
    license = lib.licenses.unfree;
-    platforms = [ "x86_64-linux" ];
+    platforms = lib.attrNames srcOptions;
    maintainers = with lib.maintainers; [ ulysseszhan ];
    mainProgram = "LoE";
    homepage = "https://www.legendsofequestria.com";
--- a/pkgs/by-name/le/legends-of-equestria/update.sh
+++ b/pkgs/by-name/le/legends-of-equestria/update.sh
@ -1,17 +1,55 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts
+#!nix-shell -i bash -p curl megacmd unzip common-updater-scripts

 set -eu -o pipefail

-DOWNLOADS_PAGE_URL=https://www.legendsofequestria.com/downloads
-REGEX='href="(https.+)".+Linux.+v(([0-9]+\.)+[0-9]+)'
+ATTR=legends-of-equestria
+DOWNLOADS_PAGE=https://www.legendsofequestria.com/downloads
+OLD_VERSION=$(nix-instantiate --eval -A $ATTR.version | tr -d '"')
+TMP=$(mktemp -d)

-if [[ $(curl -s $DOWNLOADS_PAGE_URL | grep -Fi Linux) =~ $REGEX ]]; then
-    url="${BASH_REMATCH[1]}"
-    version="${BASH_REMATCH[2]}"
-else
-    echo "cannot find the latest version"
-    exit 1
-fi
+findHash() {
+    system=$1
+    url="$2"

-update-source-version legends-of-equestria "$version" "" "$url"
+    mkdir -p $TMP/$system/{download,out}
+    oldpwd="$(pwd)"
+    cd $TMP/$system
+
+    echo "downloading to $(pwd)/download..." >&2
+    HOME=$TMP mega-get "$url" download >&2
+    echo "unzipping to $(pwd)/out..." >&2
+    unzip -q -d out download/*.zip
+
+    nix-hash --to-sri --type sha256 $(nix-hash --type sha256 out)
+
+    cd "$oldpwd"
+}
+
+applyUpdate() {
+    system=$1
+    echo "checking for updates for $system..." >&2
+    systemText="$2"
+    regex='<a href="(https.+)">'"$systemText"'</a>.+v(([0-9]+\.)+[0-9]+)'
+
+    if [[ "$(curl -s $DOWNLOADS_PAGE | grep -Fi "$systemText")" =~ $regex ]]; then
+        url="${BASH_REMATCH[1]}"
+        version="${BASH_REMATCH[2]}"
+        echo "$version $url" >&2
+    else
+        echo "cannot find the latest version for $system" >&2
+        exit 1
+    fi
+    if [[ $OLD_VERSION == $version ]]; then
+        echo "already up-to-date at version $version" >&2
+        exit 1
+    fi
+
+    hash="$(findHash $system "$url" | sed -E 's/sha256-(.+)/\1/')"
+    echo "output hash: $hash" >&2
+    update-source-version $ATTR $version "$hash" "$url" --system=$system --ignore-same-version --ignore-same-hash
+}
+
+applyUpdate x86_64-linux Linux
+applyUpdate x86_64-darwin macOS
+applyUpdate aarch64-darwin "macOS arm64"
--- a/pkgs/by-name/li/libjcat/package.nix
+++ b/pkgs/by-name/li/libjcat/package.nix
@ -20,7 +20,7 @@

 stdenv.mkDerivation rec {
  pname = "libjcat";
-  version = "0.2.2";
+  version = "0.2.3";

  outputs = [
    "bin"
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
    owner = "hughsie";
    repo = "libjcat";
    rev = version;
-    sha256 = "sha256-Vn5Qjyo2FHCmQC2pmb1qgU81VaFKsXnSIwlSYk/8Rig=";
+    sha256 = "sha256-3Ttk5nwVLB/Ll4Xz25JODOKHsGrOxKeSF2f+6QhDI2Q=";
  };

  patches = [
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@ -82,13 +82,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "llama-cpp";
-  version = "4546";
+  version = "4621";

  src = fetchFromGitHub {
    owner = "ggerganov";
    repo = "llama.cpp";
    tag = "b${finalAttrs.version}";
-    hash = "sha256-NUt6Q372jsCzcSAEqe2VZB2ZUpGSZyrvr0wyqrBYoOY=";
+    hash = "sha256-6/M1KbGEXYwalHP9PyW7kIJKdEBDViVIO3s6VHp4PbM=";
    leaveDotGit = true;
    postFetch = ''
      git -C "$out" rev-parse --short HEAD > $out/COMMIT
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "louvre";
-  version = "2.13.0-1";
+  version = "2.14.0-1";

  src = fetchFromGitHub {
    owner = "CuarzoSoftware";
    repo = "Louvre";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ZUGan5lcE44Lt6xEvVO9Nd1ONBEvvwj8QuLDnAaenpU=";
+    hash = "sha256-2qFtgKOqTBPTKiZ5/RuQEUK8GPwm9Nv8bc7+y+3+0Ow=";
  };

  sourceRoot = "${finalAttrs.src.name}/src";
--- a/pkgs/by-name/ma/maddy/package.nix
+++ b/pkgs/by-name/ma/maddy/package.nix
@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "maddy";
-  version = "0.7.1";
+  version = "0.8.1";

  src = fetchFromGitHub {
    owner = "foxcpp";
    repo = "maddy";
    rev = "v${version}";
-    sha256 = "sha256-jVlIjeBvxc82GQn8vW2RqcAErxZqftGj32d+IbBxQxY=";
+    sha256 = "sha256-cR5qRUYQnFfm+ZOwwwNNRo1odq/ntI2QlGmhJBTjaF4=";
  };

-  vendorHash = "sha256-bSBk68w6T/Wy5klj5oC/ZW5TqDESG3mW9cIQ3auNmCk=";
+  vendorHash = "sha256-YbXhxcRDTkNDdlCAKtQS2G8fwRIrRGpouIYx+5RG2lY=";

  tags = [ "libpam" ];

--- a/pkgs/by-name/md/mdformat/package.nix
+++ b/pkgs/by-name/md/mdformat/package.nix
@ -26,7 +26,7 @@ let
        };
      }
      ''
-        buildPythonPath $plugins
+        buildPythonPath "$plugins"
        makeWrapper ${lib.getExe python.pkgs.mdformat} $out/bin/mdformat \
          --suffix PYTHONPATH : "$program_PYTHONPATH"
      '';
--- a/pkgs/by-name/na/nanoflann/package.nix
+++ b/pkgs/by-name/na/nanoflann/package.nix
@ -7,14 +7,14 @@
 }:

 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.3";
+  version = "1.7.0";
  pname = "nanoflann";

  src = fetchFromGitHub {
    owner = "jlblancoc";
    repo = "nanoflann";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-vtf/dkgvpeLvwtM5KMd23pOn1rye5tAJapYTAiDu9Ow=";
+    hash = "sha256-tYLKpoqI9uqM9JZo2j6n1NqRJzn9gh/6G1BaelQOJYs=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/na/nanovna-qt/package.nix
+++ b/pkgs/by-name/na/nanovna-qt/package.nix
@ -12,6 +12,8 @@
 stdenv.mkDerivation rec {
  pname = "nanovna-qt";
  # 20200507 dropped support for NanoVNA V2.2
+  # We could add later versions as separate packages if someone needs, but not updating it
+  # nixpkgs-update: no auto update
  version = "20200403";

  src = fetchFromGitHub {
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@ -20,15 +20,20 @@

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

  src = fetchFromGitHub {
    owner = "notofonts";
    repo = "notofonts.github.io";
    rev = "noto-monthly-release-${version}";
-    hash = "sha256-25517Bkx/kcMETJvGJvcHSJ3e/N7U8LWqp62dADm9G4=";
+    hash = "sha256-IXQmHBG7yvngifLTVLwkL+10lfqofgERtNmgZSvgrt8=";
  };

+  outputs = [
+    "out"
+    "megamerge" # Experimental fonts created by mergeing regular notofonts
+  ];
+
  _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants;

  installPhase =
@ -39,6 +44,8 @@ stdenvNoCC.mkDerivation rec {
      #
      # We have a mix of otf and ttf fonts
      local out_font=$out/share/fonts/noto
+
+      install -m444 -Dt $megamerge/share/fonts/truetype/ megamerge/*.ttf
    ''
    + (
      if _variants == [ ] then
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@ -6,15 +6,15 @@

 buildGoModule rec {
  pname = "opcr-policy";
-  version = "0.2.22";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "opcr-io";
    repo = "policy";
    rev = "v${version}";
-    sha256 = "sha256-I7KjJpm7dw8rWl1Da53bK/iJvdWY1dHKKfdz6e64wVk=";
+    sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
  };
-  vendorHash = "sha256-cmhg//MlRsScn0yCInp6g/HG4SawMO9qhfaD14ODzyE=";
+  vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@ -21,13 +21,13 @@

 buildDotnetModule (finalAttrs: {
  pname = "OpenTabletDriver";
-  version = "0.6.5.0";
+  version = "0.6.5.1";

  src = fetchFromGitHub {
    owner = "OpenTabletDriver";
    repo = "OpenTabletDriver";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw=";
+    hash = "sha256-PpgqmeQRGZew0+HD4xtbimc25XPEfgW69VfJf+TlYC4=";
  };

  dotnet-sdk = dotnetCorePackages.sdk_8_0;
@ -64,6 +64,8 @@ buildDotnetModule (finalAttrs: {

  buildInputs = finalAttrs.runtimeDeps;

+  OTD_CONFIGURATIONS = "${finalAttrs.src}/OpenTabletDriver.Configurations/Configurations";
+
  doCheck = true;
  testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj";

@ -76,12 +78,11 @@ buildDotnetModule (finalAttrs: {
    "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_UpdatedBinaries_To_BinDirectory"
    "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_Only_ToBeUpdated_Binaries"
    "OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles"
-    # Intended only to be run in continuous integration, unnecessary for functionality
-    "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting"
    # Depends on processor load
    "OpenTabletDriver.Tests.TimerTests.TimerAccuracy"
-    # Can't find Configurations directory
+    # Can't find Configurations directory, remove after https://github.com/OpenTabletDriver/OpenTabletDriver/pull/3796
    "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Verify_Configs_With_Schema"
+    "OpenTabletDriver.Tests.ConfigurationTest.Configurations_Are_Linted"
  ];

  preBuild = ''
@ -99,7 +100,6 @@ buildDotnetModule (finalAttrs: {
    install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps

    # Generate udev rules from source
-    export OTD_CONFIGURATIONS="$src/OpenTabletDriver.Configurations/Configurations"
    mkdir -p $out/lib/udev/rules.d
    ./generate-rules.sh > $out/lib/udev/rules.d/70-opentabletdriver.rules
  '';
--- a/pkgs/by-name/ow/owmods-cli/package.nix
+++ b/pkgs/by-name/ow/owmods-cli/package.nix
@ -17,17 +17,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "owmods-cli";
-  version = "0.15.0";
+  version = "0.15.1";

  src = fetchFromGitHub {
    owner = "ow-mods";
    repo = "ow-mod-man";
    rev = "cli_v${version}";
-    hash = "sha256-rTANG+yHE8YfWYUyELoKgj4El+1ZW6vI9NkgADD40pw=";
+    hash = "sha256-NIg8heytWUshpoUbaH+RFIvwPBQGXL6yaGKvUuGnxg8=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-Y57EGKl/wJnZ/eTlKL984GlxMWTq/ZUT5Rns/MEGOCE=";
+  cargoHash = "sha256-kLuiNfrxc3Z8UeDQ2Mb6N78TST6c2f4N7mt4X0zv1Zk=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/po/poetry/package.nix
+++ b/pkgs/by-name/po/poetry/package.nix
@ -17,27 +17,13 @@ let
      # We keep the override around even when the versions match, as
      # it's likely to become relevant again after the next Poetry update.
      poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
-        version = "2.0.0";
+        version = "2.0.1";
        src = fetchFromGitHub {
          owner = "python-poetry";
          repo = "poetry-core";
          tag = version;
-          hash = "sha256-3dmvFn2rxtR0SK8oiEHIVJhpJpX4Mm/6kZnIYNSDv90=";
+          hash = "sha256-X3HFvnjbQ8An856QwSsWm5bmzs9KuscPE9LaVebNfgk=";
        };
-        patches = [ ];
-        nativeCheckInputs =
-          old.nativeCheckInputs
-          ++ (with self; [
-            trove-classifiers
-          ]);
-        disabledTests = old.disabledTests ++ [
-          # relies on git
-          "test_package_with_include"
-          # Nix changes timestamp
-          "test_dist_info_date_time_default_value"
-          "test_sdist_members_mtime_default"
-          "test_sdist_mtime_zero"
-        ];
      });
    }
    // (plugins self);
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@ -36,7 +36,7 @@

 buildPythonPackage rec {
  pname = "poetry";
-  version = "2.0.0";
+  version = "2.0.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -45,7 +45,7 @@ buildPythonPackage rec {
    owner = "python-poetry";
    repo = "poetry";
    tag = version;
-    hash = "sha256-r4TK4CKDfCeCW+Y1vUoS4ppXmn5xEvI1ZBVUHqFJLKo=";
+    hash = "sha256-RpAoADxZmH9hQSEjufLBoKJsxIc74RnRxZB3RVNk/iE=";
  };

  patches = [
--- a/pkgs/by-name/po/polkit/package.nix
+++ b/pkgs/by-name/po/polkit/package.nix
@ -141,7 +141,7 @@ stdenv.mkDerivation rec {
      # location using DESTDIR and then move it to proper one in postInstall.
      DESTDIR = "dest";
    }
-    // lib.optionalAttrs stdenv.cc.isGNU {
+    // lib.optionalAttrs (stdenv.cc.isGNU || stdenv.cc.isClang) {
      NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
    };

--- a/pkgs/by-name/ra/rain-bittorrent/package.nix
+++ b/pkgs/by-name/ra/rain-bittorrent/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "rain";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "cenkalti";
    repo = "rain";
    tag = "v${version}";
-    hash = "sha256-6Y+q7up6JyzBM4qov3k4l/ZUP7XsGVXvG0C6VKA/42g=";
+    hash = "sha256-qR9iwE4EpTCsDhbU8mxalGDK31lneN1HPiXOBfhiZas=";
  };

-  vendorHash = "sha256-SX686l6fsr3Gm+gyzNUZUSGXwAnxaTvUo/J57N10fmU=";
+  vendorHash = "sha256-j8IVymRwhLZ2EDJtmNGgFfQ0KOmLvClDCeMjvq5KagM=";

  meta = {
    description = "BitTorrent client and library in Go";
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "rasm";
-  version = "2.3.2";
+  version = "2.3.3";

  src = fetchFromGitHub {
    owner = "EdouardBERGE";
    repo = "rasm";
    rev = "v${version}";
-    hash = "sha256-vuOI29VMTBWIyP7jRIwYbXKWf9ijg8HqLhMEj1R9iQQ=";
+    hash = "sha256-AV01XbjbF2pyIJ7lO/4mzWSREC2+aX4w5YJ8AI3GrqI=";
  };

  # by default the EXEC variable contains `rasm.exe`
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@ -9,17 +9,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "reindeer";
-  version = "2025.01.20.00";
+  version = "2025.02.03.00";

  src = fetchFromGitHub {
    owner = "facebookincubator";
    repo = "reindeer";
    tag = "v${version}";
-    hash = "sha256-dmx9FPgyVz5s32peKTg4xA72JD7X2R9ks8HSna3msmA=";
+    hash = "sha256-dEtwCGtS8JE24aBGIHvTgUimNccDmjCCEjX5zA1I4bU=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-fof3xJzcnF4oUdfYC0SNmSrdb9fbGh2m8hHkOsSoHhI=";
+  cargoHash = "sha256-mhqT0vZRrmYN6UR9omEjQa/1JJ2pI3yu5HveMlbvvR0=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
+++ b/pkgs/by-name/rs/rs-git-fsmonitor/package.nix
@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  makeWrapper,
+  watchman,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rs-git-fsmonitor";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "jgavris";
+    repo = "rs-git-fsmonitor";
+    tag = "v${version}";
+    hash = "sha256-+5nR+/09HmFk3mq2B8NTeBT50aBG85yXEdeO6BhStVw=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-WkqJSbtaJxaagJMsdFiVozi1SkrfxXyM9bdZeimwJag=";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/rs-git-fsmonitor --prefix PATH ":" "${lib.makeBinPath [ watchman ]}"
+  '';
+
+  meta = {
+    description = "Fast git core.fsmonitor hook written in Rust";
+    homepage = "https://github.com/jgavris/rs-git-fsmonitor";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nilscc ];
+    mainProgram = "rs-git-fsmonitor";
+  };
+}
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@ -9,13 +9,13 @@

 buildGoModule rec {
  pname = "slackdump";
-  version = "3.0.3";
+  version = "3.0.5";

  src = fetchFromGitHub {
    owner = "rusq";
    repo = "slackdump";
    tag = "v${version}";
-    hash = "sha256-fHWKKzUsvL3ine4ub4qnrp8fmc+PNwG32phCz68FC6s=";
+    hash = "sha256-iNXCqiDTD5z1dNIsQiTNAmVqx2HpTNDCdhY5X2FoC8k=";
  };

  nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
--- a/pkgs/by-name/sm/smtprelay/package.nix
+++ b/pkgs/by-name/sm/smtprelay/package.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "smtprelay";
-  version = "1.11.1";
+  version = "1.11.2";

  src = fetchFromGitHub {
    owner = "decke";
    repo = "smtprelay";
    tag = "v${version}";
-    hash = "sha256-2fZA2vYJ6c5oaNImvS0KKZo1+Eu7LFO6jCRnChReMcE=";
+    hash = "sha256-SwLRodyg6DC9gssmwbdKk426V71bKt3yhj9nqn0X3nU=";
  };

-  vendorHash = "sha256-BX1Ll0EEo59p+Pe5oM6+6zT6fvnv1RsfX8YEh9RKkWU=";
+  vendorHash = "sha256-poTToZlC/yNM4tD9PCVUGTMFEtbA7N8xgK/fmJfUMnE=";

  subPackages = [
    "."
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@ -8,16 +8,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "snipe-it";
-  version = "7.1.15";
+  version = "7.1.16";

  src = fetchFromGitHub {
    owner = "snipe";
    repo = "snipe-it";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-+MMu42HsaIqNKcIJAyBI40AqQIpOPK0ZMtAAd/EflT4=";
+    hash = "sha256-TGa/zI1hpF17EdyohGo4Lu+yAiF2gp6ZQACk7Tqq880=";
  };

-  vendorHash = "sha256-9qnEsI5R28aqMNE7KbvOp9Kev+JNXvIsDIbPyAa41Go=";
+  vendorHash = "sha256-jINYWbQ2jdYbG9YdP2elqm9Zk5X8/ksUZqLHkH/l6Gw=";

  postInstall = ''
    snipe_it_out="$out/share/php/snipe-it"
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "spicetify-cli";
-  version = "2.38.7";
+  version = "2.38.9";

  src = fetchFromGitHub {
    owner = "spicetify";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-2fsHFl5t/Xo7W5IHGc5FWY92JvXjkln6keEn4BZerw4=";
+    hash = "sha256-aNDZZzSqVBom499mx6OZlZbeS6UvWJCKs3003TpWITo=";
  };

  vendorHash = "sha256-a6lAVBUoSTqHnAKKvW+egmtupsuy0uB/XGtBaljju1I=";
--- a/pkgs/by-name/st/structorizer/package.nix
+++ b/pkgs/by-name/st/structorizer/package.nix
@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "structorizer";
-  version = "3.32-24";
+  version = "3.32-25";

  desktopItems = [
    (makeDesktopItem {
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
    owner = "fesch";
    repo = "Structorizer.Desktop";
    rev = version;
-    hash = "sha256-bzo8lUdjCPf22AF++Q9YnvuQp89M2T1cLixuEDHWX6U=";
+    hash = "sha256-JZHS3QtPNVajrNkEoAT606Yn2OZ8KuFeMZCxNyZxAy8=";
  };

  patches = [
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "supabase-cli";
-  version = "2.9.4";
+  version = "2.10.2";

  src = fetchFromGitHub {
    owner = "supabase";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-qUx6KMJVknMzLzmOTXM6sqTqIK9EyT46nehzcSleGiU=";
+    hash = "sha256-OuX2fD+b5B5d3ir638ZuNQpt/HuEUhc1chrPyq03qSE=";
  };

-  vendorHash = "sha256-k/w+4ledwTXxUQttjqtnTGVpNVOcEXuDe4gF4wViyB4=";
+  vendorHash = "sha256-8CMmwMBqrfeiXp2XgpXruOkBhdUUf7W4okvn2Z3+MYA=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ta/taterclient-ddnet/package.nix
+++ b/pkgs/by-name/ta/taterclient-ddnet/package.nix
@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "taterclient-ddnet";
-  version = "10.0.3";
+  version = "10.1.1";

  src = fetchFromGitHub {
    owner = "sjrc6";
    repo = "taterclient-ddnet";
    tag = "V${finalAttrs.version}";
-    hash = "sha256-RhOZuPsjyXq5UcM+5dawDi1BfjMMQ3K9O3PHkCg5sDI=";
+    hash = "sha256-B5J8LctMYkb6X1tEI5H4oMEDDWLLpLW5v4NRWplhncY=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@ -11,20 +11,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "topiary";
-  version = "0.5.1";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "tweag";
    repo = "topiary";
    tag = "v${version}";
-    hash = "sha256-Vsyl4tZ9AWTydpXw9IyvrD2tYiG8ySAD39lPwxRflSc=";
+    hash = "sha256-nRVxjdEtYvgF8Vpw0w64hUd1scZh7f+NjFtbTg8L5Qc=";
  };

  nativeBuildInputs = [ installShellFiles ];
  nativeInstallCheckInputs = [ versionCheckHook ];

  useFetchCargoVendor = true;
-  cargoHash = "sha256-bk5993v0wn/emzJKvxaPBYjqCmP0BpOuFMga7ZOyqXg=";
+  cargoHash = "sha256-EqalIF1wx3F/5CiD21IaYsPdks6Mv1VfwL8OTRWsWaU=";

  # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
  depsExtraArgs.postBuild = ''
@ -46,12 +46,14 @@ rustPlatform.buildRustPackage rec {
    "--skip=test_fmt_dir"
    "--skip=test_fmt_files"
    "--skip=test_fmt_files_query_fallback"
+    "--skip=test_fmt_invalid"
    "--skip=test_fmt_stdin"
    "--skip=test_fmt_stdin_query"
    "--skip=test_fmt_stdin_query_fallback"
    "--skip=test_vis"
    "--skip=formatted_query_tester"
    "--skip=input_output_tester"
+    "--skip=coverage_tester"
  ];

  env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";
--- a/pkgs/by-name/um/umu-launcher/package.nix
+++ b/pkgs/by-name/um/umu-launcher/package.nix
@ -4,6 +4,7 @@
  umu-launcher-unwrapped,
  extraPkgs ? pkgs: [ ],
  extraLibraries ? pkgs: [ ],
+  withMultiArch ? true, # Many Wine games need 32-bit libraries.
 }:
 buildFHSEnv {
  pname = "umu-launcher";
@ -17,6 +18,7 @@ buildFHSEnv {
    ]
    ++ extraPkgs pkgs;
  multiPkgs = extraLibraries;
+  multiArch = withMultiArch;

  executableName = umu-launcher-unwrapped.meta.mainProgram;
  runScript = lib.getExe umu-launcher-unwrapped;
--- a/pkgs/by-name/ut/ut/package.nix
+++ b/pkgs/by-name/ut/ut/package.nix
@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ut";
-  version = "2.1.1";
+  version = "2.3.0";

  cmakeFlags = [
    "-DBOOST_UT_ALLOW_CPM_USE=OFF"
@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "boost-ext";
    repo = "ut";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-4AMUOkfbzw7+3fFZ2AT6gCN7kmhpZAdA1XD1aN8ki74=";
+    hash = "sha256-3H3kyf58gy+VdNfj4gmIe+D1+douMwZQU7+iphO+utU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "versitygw";
-  version = "1.0.9";
+  version = "1.0.10";

  src = fetchFromGitHub {
    owner = "versity";
    repo = "versitygw";
    tag = "v${version}";
-    hash = "sha256-giPk0037zMqrqG6L1b9M7Us9d9YpGNjlJXWaNCIx3vc=";
+    hash = "sha256-IG+Jg9+SVaj4Nlv7mfwjpAf1tsXMMEaVgq7w7fpIMcc=";
  };

-  vendorHash = "sha256-vW1LQDr2u/owt919HyRkd6frCQquCq5rrYFAp0n3x2o=";
+  vendorHash = "sha256-ZRu5519FRgdDFcKm+Ada0/KFNvPrZ+5hODPp7lUeyuI=";

  doCheck = false; # Require access to online S3 services

--- a/pkgs/by-name/wa/walker/package.nix
+++ b/pkgs/by-name/wa/walker/package.nix
@ -13,16 +13,16 @@

 buildGoModule rec {
  pname = "walker";
-  version = "0.12.10";
+  version = "0.12.13";

  src = fetchFromGitHub {
    owner = "abenz1267";
    repo = "walker";
    rev = "v${version}";
-    hash = "sha256-nrt/uHHAtnQbOwzXCfNrdk/ywRUWWLLpy9PO2VkGwkQ=";
+    hash = "sha256-B5ZFcPLgp5a3CJGlWDmuT+rfwIA/X75HUYISP44aykc=";
  };

-  vendorHash = "sha256-urAtl2aSuNw7UVnuacSACUE8PCwAsrRQbuMb7xItjao=";
+  vendorHash = "sha256-6PPNVnsH1eU4fLcZpxiBoHCzN/TUUxfTfmxDsBDPDKQ=";
  subPackages = [ "cmd/walker.go" ];

  passthru.updateScript = nix-update-script { };
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "warp-plus";
-  version = "1.2.4";
+  version = "1.2.5";

  src = fetchFromGitHub {
    owner = "bepass-org";
    repo = "warp-plus";
    rev = "v${version}";
-    hash = "sha256-fFyYch14JqXSmnplPJ8c3epOxromZmEJAdcuSgkKbcM=";
+    hash = "sha256-gDn4zicSD+Hz3GsL6pzGpUaiHcw+8KHDaOJGCML6LOA=";
  };

-  vendorHash = "sha256-/rBZqrX9xZT8yOZwynkOOQyPl0govNmvsEqWVxsuvB4=";
+  vendorHash = "sha256-MWzF9+yK+aUr8D4d64+qCD6XIqtmWH5hCLmQoksgFf8=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@ -1,25 +1,25 @@
 {
-  "version": "0.141.0",
+  "version": "0.142.0",
  "binaries": {
    "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.141.0/darwin/arm64/yc",
-      "hash": "sha256-4Y69a7aMp5zyt9cqRbKd/VF0I6NGtfggyDUqU/Ytlmc="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.142.0/darwin/arm64/yc",
+      "hash": "sha256-5IJYcb0uIqnZK1yH2vFCLSyjInJKFWaTZmnVub1cywg="
    },
    "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.141.0/linux/arm64/yc",
-      "hash": "sha256-MfcdI7sni71jcqZnMzIIKnGCczBuyX4TqFkKi8eUKnk="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.142.0/linux/arm64/yc",
+      "hash": "sha256-THxJ4HrHw8zk2q/VkYFY3djO8qs/sXF8XvHTpDZDlBw="
    },
    "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.141.0/linux/386/yc",
-      "hash": "sha256-2ZAv878dhwJuXUk39ZJ23ca2QLnT5oulpuuqGdjR7Xw="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.142.0/linux/386/yc",
+      "hash": "sha256-Q7YyNDkX+TZ/d/byJ0JFJZ3t6FWtAk+yFrVSc35/Fk0="
    },
    "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.141.0/darwin/amd64/yc",
-      "hash": "sha256-s2auZhoWFY+0M1Q3rbe+JZX/otgafLQVXd12I62oTp4="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.142.0/darwin/amd64/yc",
+      "hash": "sha256-7IiVmLegCYZW31QHc3I1a1URQaVYuyXu1sCDWym8vRs="
    },
    "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.141.0/linux/amd64/yc",
-      "hash": "sha256-7BCU9WsT/9Qbd6/ZRejYXA1eoKU2VounZprZC7JWWhM="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.142.0/linux/amd64/yc",
+      "hash": "sha256-awwxmUQRe3BLAxYqSzGoPseqOxcpARYtnfj10mDagiQ="
    }
  }
 }
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@ -6,16 +6,16 @@

 buildNpmPackage rec {
  pname = "zwave-js-server";
-  version = "1.40.2";
+  version = "1.40.3";

  src = fetchFromGitHub {
    owner = "zwave-js";
    repo = pname;
    rev = version;
-    hash = "sha256-+S6sMJKmvi5P7eDEWtimArY1W/5IABl/cZkTqhDORgc=";
+    hash = "sha256-fk9UBtdbU9ZVoqCXXeeGpaiGhU9/pcR87NP1S86axSM=";
  };

-  npmDepsHash = "sha256-HfxYR62r0D0LTmj4Lb+dCvD4tdpE8b7nmk5wki7vEM8=";
+  npmDepsHash = "sha256-iSrgrgepUZzlBvwMe6lmFUW4i6DVx1Bq4I4UBph/oNA=";

  # For some reason the zwave-js dependency is in devDependencies
  npmFlags = [ "--include=dev" ];
--- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
+++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix
@ -16,9 +16,9 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "libxfce4windowing";
-  version = "4.20.0";
+  version = "4.20.2";

-  sha256 = "sha256-t/GbsGipc0Ts2tZJaDJBuDF+9XMp8+Trq78NPAuHEpU=";
+  sha256 = "sha256-Xw1hs854K5dZCAYoBMoqJzdSxPRFUYqEpWxg4DLSK5Q=";

  nativeBuildInputs = [
    gobject-introspection
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@ -11,7 +11,6 @@
 , libxfce4ui
 , libxfce4util
 , libxfce4windowing
-, perl
 , tzdata
 , vala
 , wayland
@ -21,13 +20,12 @@
 mkXfceDerivation {
  category = "xfce";
  pname = "xfce4-panel";
-  version = "4.20.0";
+  version = "4.20.3";

-  sha256 = "sha256-oB7mlU7RZtRuCQAKgv5I7ZRRu703Za7Ki9+AkHSELRE=";
+  sha256 = "sha256-tLWjU0M7tuE+qqDwaE1CtnOjDiPWno8Mf7hhxYxbvjo=";

  nativeBuildInputs = [
    gobject-introspection
-    perl
    vala
  ];

--- a/pkgs/development/compilers/go/1.22.nix
+++ b/pkgs/development/compilers/go/1.22.nix
@ -49,11 +49,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "go";
-  version = "1.22.11";
+  version = "1.22.12";

  src = fetchurl {
    url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-pgwj3sldEKJXYmXOWA9Xhp1awkccT0rKgFrdyeoPyf4=";
+    hash = "sha256-ASp+HzfzYsCRjB36MzRFisLaFijEuc9NnKAtuYbhfXE=";
  };

  strictDeps = true;
--- a/pkgs/development/libraries/astal/modules/io.nix
+++ b/pkgs/development/libraries/astal/modules/io.nix
@ -2,7 +2,13 @@
 (buildAstalModule {
  name = "io";
  sourceRoot = "lib/astal/io";
-  meta.description = "Astal core library";
+  meta = {
+    description = "Astal core library";
+    longDescription = ''
+      Astal is a collection of building blocks for creating custom desktop shells
+    '';
+    mainProgram = "astal";
+  };
 }).overrideAttrs
  {
    # add an update script only in one place,
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@ -12,13 +12,13 @@

 mkDerivation rec {
  pname = "qxmpp";
-  version = "1.9.3";
+  version = "1.9.4";

  src = fetchFromGitHub {
    owner = "qxmpp-project";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-gKA2hSkgeBe9vnhHQ3MxcQC+401gGoxSM7ETmRhvcbs=";
+    sha256 = "sha256-Wra+PvORsvSJD4Y4z4rd3Urn5eG3tEBK+YsIlIaWFe4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/depyf/default.nix
+++ b/pkgs/development/python-modules/depyf/default.nix
@ -5,6 +5,7 @@
  astor,
  dill,
  filelock,
+  pytestCheckHook,
 }:

 buildPythonPackage rec {
@ -28,7 +29,9 @@ buildPythonPackage rec {
    filelock
  ];

-  pythonImportCheck = [ "depyf" ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "depyf" ];

  meta = with lib; {
    description = "Decompile python functions, from bytecode to source code";
--- a/pkgs/development/python-modules/linear-operator/default.nix
+++ b/pkgs/development/python-modules/linear-operator/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "linear-operator";
-  version = "0.5.3";
+  version = "0.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cornellius-gp";
    repo = "linear_operator";
    tag = "v${version}";
-    hash = "sha256-fKDVaHyaneV6MafJd/RT2InZO5cuYoC36YgzQhfIH8g=";
+    hash = "sha256-qBC7wrpcZ8ViFqIOSd2F8heeBRQxrac/l33srHhNaIM=";
  };

  build-system = [
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@ -59,6 +59,7 @@
  pytestCheckHook,
  pytorch-lightning,
  sentence-transformers,
+  shap,
  starlette,
  statsmodels,
  tensorflow,
@ -70,20 +71,16 @@

 buildPythonPackage rec {
  pname = "mlflow";
-  version = "2.19.0";
+  version = "2.20.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mlflow";
    repo = "mlflow";
    tag = "v${version}";
-    hash = "sha256-QUyoT6tl/kv/RAntKYZ83p/lvssX1dJb45VpklAVQT4=";
+    hash = "sha256-672lKzYkWpUuUB2hiVtOqMhQltzRMGhoff2ZimLWJC8=";
  };

-  # Remove currently broken dependency `shap`, a model explainability package.
-  # This seems quite unprincipled especially with tests not being enabled,
-  # but not mlflow has a 'skinny' install option which does not require `shap`.
-  pythonRemoveDeps = [ "shap" ];
  pythonRelaxDeps = [
    "gunicorn"
    "importlib-metadata"
@ -117,10 +114,12 @@ buildPythonPackage rec {
    pandas
    protobuf
    pyarrow
+    pydantic
    pyyaml
    requests
    scikit-learn
    scipy
+    shap
    sqlalchemy
    sqlparse
  ];
--- a/pkgs/development/python-modules/pydeps/default.nix
+++ b/pkgs/development/python-modules/pydeps/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pydeps";
-  version = "3.0.0";
+  version = "3.0.1";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "thebjorn";
    repo = "pydeps";
    tag = "v${version}";
-    hash = "sha256-0GYqCeEMlLjYVVzoHoe16BAtx4qBZalwsji2v1aUKz0=";
+    hash = "sha256-N/WTamT981eQqxhz51Ry2OOPIecnAnYmMHlASmPpFWA=";
  };

  build-system = [ setuptools ];
--- a/Show More
+++ b/Show More