Merge master into staging-next

2025-07-13 21:50:33 +03:00 · 2025-06-06 12:07:00 +00:00 · 2025-06-06 12:07:00 +00:00 · cdd3b11ebb
commit cdd3b11ebb
parent 78e387e51e 68b142284d
33 changed files with 823 additions and 563 deletions
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@ -599,6 +599,8 @@ Additional file types can be supported by setting the `unpackCmd` variable (see

 The list of source files or directories to be unpacked or copied. One of these must be set. Note that if you use `srcs`, you should also set `sourceRoot` or `setSourceRoot`.

+These should ideally actually be sources and licensed under a FLOSS license.  If you have to use a binary upstream release or package non-free software, make sure you correctly mark your derivation as such in the [`sourceProvenance`](#var-meta-sourceProvenance) and [`license`](#sec-meta-license) fields of the [`meta`](#chap-meta) section.
+
 ##### `sourceRoot` {#var-stdenv-sourceRoot}

 After unpacking all of `src` and `srcs`, if neither of `sourceRoot` and `setSourceRoot` are set, `unpackPhase` of the generic builder checks that the unpacking produced a single directory and moves the current working directory into it.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -16161,7 +16161,7 @@
    email = "mightyiampresence@gmail.com";
    github = "mightyiam";
    githubId = 635591;
-    name = "Shahar Dawn Or";
+    name = "Shahar \"Dawn\" Or";
  };
  mihaimaruseac = {
    email = "mihaimaruseac@gmail.com";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -913,6 +913,7 @@ with lib.maintainers;
  ngi = {
    members = [
      eljamm
+      ethancedwards8
      fricklerhandwerk
      wegank
    ];
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@ -100,14 +100,64 @@ in
        for more.

        Settings containing secret data should be set to an
-        attribute set containing the attribute
-        <literal>_secret</literal> - a string pointing to a file
-        containing the value the option should be set to. See the
-        example in `services.glance.settings.pages` at the weather widget
+        attribute set with this format: `{ _secret = "/path/to/secret"; }`.
+        See the example in `services.glance.settings.pages` at the weather widget
        with a location secret to get a better picture of this.
+
+        Alternatively, you can use a single file with environment variables,
+        see `services.glance.environmentFile`.
      '';
    };

+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      description =
+        let
+          singleQuotes = "''";
+        in
+        ''
+          Path to an environment file as defined in {manpage}`systemd.exec(5)`.
+
+          See upstream documentation
+          <https://github.com/glanceapp/glance/blob/main/docs/configuration.md#environment-variables>.
+
+          Example content of the file:
+          ```
+          TIMEZONE=Europe/Paris
+          ```
+
+          Example `services.glance.settings.pages` configuration:
+          ```nix
+            [
+              {
+                name = "Home";
+                columns = [
+                  {
+                    size = "full";
+                    widgets = [
+                      {
+                        type = "clock";
+                        timezone = "\''${TIMEZONE}";
+                        label = "Local Time";
+                      }
+                    ];
+                  }
+                ];
+              }
+            ];
+          ```
+
+          Note that when using Glance's `''${ENV_VAR}` syntax in Nix,
+          you need to escape it as follows: use `\''${ENV_VAR}` in `"` strings
+          and `${singleQuotes}''${ENV_VAR}` in `${singleQuotes}` strings.
+
+          Alternatively, you can put each secret in it's own file,
+          see `services.glance.settings`.
+        '';
+      default = "/dev/null";
+      example = "/var/lib/secrets/glance";
+    };
+
    openFirewall = mkOption {
      type = types.bool;
      default = false;
@ -159,6 +209,7 @@ in
          '';
        ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}";
        WorkingDirectory = "/var/lib/glance";
+        EnvironmentFile = cfg.environmentFile;
        StateDirectory = "glance";
        RuntimeDirectory = "glance";
        RuntimeDirectoryMode = "0755";
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@ -12,12 +12,12 @@
  pkgs,
 }:
 let
-  version = "0.0.23-unstable-2025-06-02";
+  version = "0.0.24-unstable-2025-06-05";
  src = fetchFromGitHub {
    owner = "yetone";
    repo = "avante.nvim";
-    rev = "647a459a2b87e5c9b2987cb44150b71beffdfb10";
-    hash = "sha256-GgLOcVp2IuMBr4aBRWJTvrAuWWiMEIHmec/S97piBaM=";
+    rev = "12bdb66ea4749f9f59861e7165a4de6cfbf4eb22";
+    hash = "sha256-dUtvMkb85HR7xzMoCHeeJIwwyQPdwHNdQHUMyA7+EsU=";
  };
  avante-nvim-lib = rustPlatform.buildRustPackage {
    pname = "avante-nvim-lib";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -172,9 +172,9 @@ in

  aerial-nvim = super.aerial-nvim.overrideAttrs {
    # optional dependencies
-    nvimSkipModules = [
-      "lualine.components.aerial"
-      "telescope._extensions.aerial"
+    checkInputs = with self; [
+      lualine-nvim
+      telescope-nvim
    ];
  };

@ -212,11 +212,8 @@ in
  };

  asyncrun-vim = super.asyncrun-vim.overrideAttrs {
-    nvimSkipModules = [
-      # vim plugin with optional toggleterm integration
-      "asyncrun.toggleterm"
-      "asyncrun.toggleterm2"
-    ];
+    # Optional toggleterm integration
+    checkInputs = [ self.toggleterm-nvim ];
  };

  autosave-nvim = super.autosave-nvim.overrideAttrs {
@ -224,12 +221,8 @@ in
  };

  auto-session = super.auto-session.overrideAttrs {
-    # optional telescope dependency
-    nvimSkipModules = [
-      "auto-session.session-lens.actions"
-      "auto-session.session-lens.init"
-      "telescope._extensions.session-lens"
-    ];
+    # Optional integration
+    checkInputs = [ self.telescope-nvim ];
  };

  aw-watcher-vim = super.aw-watcher-vim.overrideAttrs {
@ -241,6 +234,11 @@ in
  };

  bamboo-nvim = super.bamboo-nvim.overrideAttrs {
+    # Optional integration
+    checkInputs = with self; [
+      barbecue-nvim
+      lualine-nvim
+    ];
    nvimSkipModules = [
      # Requires config table
      "bamboo.colors"
@ -249,14 +247,17 @@ in
      "bamboo-light"
      "bamboo-vulgaris"
      "bamboo-multiplex"
-      # Optional modules
-      "lualine.themes.bamboo"
      "barbecue.theme.bamboo"
    ];
  };

  barbar-nvim = super.barbar-nvim.overrideAttrs {
-    # nvim-web-devicons dependency
+    # Optional integrations
+    checkInputs = with self; [
+      bufferline-nvim
+      nvim-web-devicons
+    ];
+    # E5108: Error executing lua ...implugin-barbar.nvim-2025-04-28/lua/bufferline/utils.lua:10: module 'barbar.utils.hl' not found:
    nvimSkipModules = [ "bufferline.utils" ];
  };

@ -621,14 +622,18 @@ in
  };

  codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
+    checkInputs = with self; [
+      # Optional completion
+      blink-cmp
+      nvim-cmp
+      # Optional pickers
+      fzf-lua
+      mini-nvim
+      snacks-nvim
+      telescope-nvim
+    ];
    dependencies = [ self.plenary-nvim ];
    nvimSkipModules = [
-      # Optional provider dependencies
-      "codecompanion.providers.actions.mini_pick"
-      "codecompanion.providers.actions.snacks"
-      "codecompanion.providers.actions.telescope"
-      "codecompanion.providers.actions.fzf_lua"
-      "codecompanion.providers.diff.mini_diff"
      # Requires setup call
      "codecompanion.actions.static"
      "codecompanion.actions.init"
@ -1306,9 +1311,12 @@ in
  };

  go-nvim = super.go-nvim.overrideAttrs {
+    checkInputs = with self; [
+      luasnip
+      null-ls-nvim
+      nvim-treesitter
+    ];
    nvimSkipModules = [
-      # Null-ls
-      "go.null_ls"
      # _GO_NVIM_CFG
      "go.inlay"
      "go.project"
@ -1316,16 +1324,9 @@ in
      "go.tags"
      "go.gotests"
      "go.format"
-      # nvim-treesitter
-      "go.gotest"
-      "go.ginkgo"
      "go.ts.go"
-      "go.ts.utils"
      "go.ts.nodes"
-      "go.fixplurals"
-      # Luasnip
      "go.snips"
-      "snips.all"
      "snips.go"
    ];
  };
@ -1390,11 +1391,9 @@ in
  };

  haskell-tools-nvim = neovimUtils.buildNeovimPlugin {
+    # Optional integrations
+    checkInputs = [ self.telescope-nvim ];
    luaAttr = luaPackages.haskell-tools-nvim;
-    nvimSkipModules = [
-      # Optional telescope integration
-      "haskell-tools.hoogle.helpers"
-    ];
  };

  helpview-nvim = super.helpview-nvim.overrideAttrs {
@ -1407,10 +1406,10 @@ in

  himalaya-vim = super.himalaya-vim.overrideAttrs {
    buildInputs = [ himalaya ];
-    # vim plugin with optional telescope lua module
-    nvimSkipModules = [
-      "himalaya.folder.pickers.fzflua"
-      "himalaya.folder.pickers.telescope"
+    # Optional integrations
+    checkInputs = with self; [
+      fzf-lua
+      telescope-nvim
    ];
  };

@ -1827,8 +1826,8 @@ in
  };

  material-vim = super.material-vim.overrideAttrs {
-    # vim plugin with optional lualine module
-    nvimSkipModules = "material.lualine";
+    # Optional integration
+    checkInputs = [ self.lualine-nvim ];
  };

  meson = buildVimPlugin {
@ -1903,11 +1902,11 @@ in
  };

  molten-nvim = super.molten-nvim.overrideAttrs {
-    nvimSkipModules = [
-      # Optional image providers
-      "load_image_nvim"
-      "load_wezterm_nvim"
-      "load_snacks_nvim"
+    # Optional image providers
+    checkInputs = with self; [
+      image-nvim
+      snacks-nvim
+      wezterm-nvim
    ];
  };

@ -1957,9 +1956,11 @@ in
  };

  neogit = super.neogit.overrideAttrs {
+    # Optional diffview integration
+    checkInputs = [ self.diffview-nvim ];
    dependencies = [ self.plenary-nvim ];
    nvimSkipModules = [
-      # Optional diffview integration
+      # E5108: Error executing lua ...vim-2024-06-13/lua/diffview/api/views/diff/diff_view.lua:13: attempt to index global 'DiffviewGlobal' (a nil value)
      "neogit.integrations.diffview"
      "neogit.popups.diff.actions"
      "neogit.popups.diff.init"
@ -2223,11 +2224,12 @@ in
  };

  netman-nvim = super.netman-nvim.overrideAttrs {
-    nvimSkipModules = [
-      # Optional neo-tree integration
-      "netman.ui.neo-tree.init"
-      "netman.ui.neo-tree.commands"
-      "netman.ui.neo-tree.components"
+    # Optional neo-tree integration
+    checkInputs = with self; [
+      neo-tree-nvim
+      # FIXME: propagate `neo-tree` dependencies
+      nui-nvim
+      plenary-nvim
    ];
  };

@ -2313,9 +2315,12 @@ in
  };

  nvim-autopairs = super.nvim-autopairs.overrideAttrs {
+    # Optional completion dependency
+    checkInputs = with self; [
+      nvim-cmp
+    ];
    nvimSkipModules = [
-      # Optional completion dependencies
-      "nvim-autopairs.completion.cmp"
+      # compe not packaged anymore
      "nvim-autopairs.completion.compe"
    ];
  };
@ -2492,10 +2497,10 @@ in
  };

  nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
-    nvimSkipModules = [
-      # Optional dependencies
-      "neoclip.fzf"
-      "neoclip.telescope"
+    # Optional dependencies
+    checkInputs = with self; [
+      fzf-lua
+      telescope-nvim
    ];
  };

@ -2506,7 +2511,9 @@ in

  nvim-notify = super.nvim-notify.overrideAttrs {
    # Optional fzf integration
-    nvimSkipModules = "notify.integrations.fzf";
+    checkInputs = [
+      self.fzf-lua
+    ];
  };

  nvim-nu = super.nvim-nu.overrideAttrs {
@ -2532,13 +2539,17 @@ in
  };

  nvim-snippets = super.nvim-snippets.overrideAttrs {
-    # Optional cmp integration
-    nvimSkipModules = "snippets.utils.cmp";
+    checkInputs = [
+      # Optional cmp integration
+      self.nvim-cmp
+    ];
  };

  nvim-surround = super.nvim-surround.overrideAttrs {
-    # Optional treesitter integration
-    nvimSkipModules = "nvim-surround.queries";
+    checkInputs = [
+      # Optional treesitter integration
+      self.nvim-treesitter
+    ];
  };

  nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
@ -2550,6 +2561,8 @@ in
  };

  nvim-test = super.nvim-test.overrideAttrs {
+    # Optional toggleterm integration
+    checkInputs = [ self.toggleterm-nvim ];
    dependencies = with self; [
      nvim-treesitter
      nvim-treesitter-parsers.c_sharp
@ -2563,8 +2576,6 @@ in
      nvim-treesitter-parsers.zig
    ];
    nvimSkipModules = [
-      # Optional toggleterm integration
-      "nvim-test.terms.toggleterm"
      # Broken runners
      "nvim-test.runners.zig"
      "nvim-test.runners.hspec"
@ -2767,9 +2778,11 @@ in
  };

  overseer-nvim = super.overseer-nvim.overrideAttrs {
-    checkInputs = [
+    checkInputs = with self; [
      # Optional integration
-      self.neotest
+      neotest
+      toggleterm-nvim
+      nvim-dap
    ];
    checkPhase = ''
      runHook preCheck
@ -2782,11 +2795,6 @@ in

      runHook postCheck
    '';
-    nvimSkipModules = [
-      # Optional integrations
-      "overseer.strategy.toggleterm"
-      "overseer.dap"
-    ];
  };

  package-info-nvim = super.package-info-nvim.overrideAttrs {
@ -3036,6 +3044,8 @@ in
  };

  snacks-nvim = super.snacks-nvim.overrideAttrs {
+    # Optional trouble integration
+    checkInputs = [ self.trouble-nvim ];
    nvimSkipModules = [
      # Requires setup call first
      # attempt to index global 'Snacks' (a nil value)
@ -3060,8 +3070,6 @@ in
      "snacks.win"
      "snacks.words"
      "snacks.zen"
-      # Optional trouble integration
-      "trouble.sources.profiler"
      # TODO: Plugin requires libsqlite available, create a test for it
      "snacks.picker.util.db"
    ];
@ -3427,6 +3435,7 @@ in
  };

  tokyonight-nvim = super.tokyonight-nvim.overrideAttrs {
+    checkInputs = [ self.fzf-lua ];
    nvimSkipModules = [
      # Meta file
      "tokyonight.docs"
@ -3478,11 +3487,13 @@ in
    };

  typescript-nvim = super.typescript-nvim.overrideAttrs {
+    checkInputs = [
+      # Optional null-ls integration
+      self.none-ls-nvim
+    ];
    dependencies = with self; [
      nvim-lspconfig
    ];
-    # Optional null-ls integration
-    nvimSkipModules = [ "typescript.extensions.null-ls.code-actions.init" ];
  };

  typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
@ -3807,7 +3818,7 @@ in

  vim-illuminate = super.vim-illuminate.overrideAttrs {
    # Optional treesitter integration
-    nvimSkipModules = "illuminate.providers.treesitter";
+    checkInputs = [ self.nvim-treesitter ];
  };

  vim-isort = super.vim-isort.overrideAttrs {
@ -3939,14 +3950,17 @@ in
  };

  whichpy-nvim = super.whichpy-nvim.overrideAttrs {
-    checkInputs = with self; [
-      telescope-nvim
+    checkInputs = [
+      # Optional telescope integration
+      self.telescope-nvim
    ];
  };

  wiki-vim = super.wiki-vim.overrideAttrs {
-    # Optional telescope integration
-    nvimSkipModules = [ "wiki.telescope" ];
+    checkInputs = [
+      # Optional telescope integration
+      self.telescope-nvim
+    ];
  };

  windows-nvim = super.windows-nvim.overrideAttrs {
@ -3989,10 +4003,9 @@ in
  };

  yanky-nvim = super.yanky-nvim.overrideAttrs {
-    nvimSkipModules = [
+    checkInputs = with self; [
      # Optional telescope integration
-      "yanky.telescope.mapping"
-      "yanky.telescope.yank_history"
+      telescope-nvim
    ];
  };

@ -4074,12 +4087,12 @@ in
  };

  zk-nvim = super.zk-nvim.overrideAttrs {
-    # Optional integrations
-    nvimSkipModules = [
-      "zk.pickers.fzf_lua"
-      "zk.pickers.minipick"
-      "zk.pickers.snacks_picker"
-      "zk.pickers.telescope"
+    checkInputs = with self; [
+      # Optional pickers
+      fzf-lua
+      mini-nvim
+      snacks-nvim
+      telescope-nvim
    ];
  };

--- a/pkgs/by-name/at/attic-client/package.nix
+++ b/pkgs/by-name/at/attic-client/package.nix
@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage {
  pname = "attic";
-  version = "0-unstable-2025-02-02";
+  version = "0-unstable-2025-05-29";

  src = fetchFromGitHub {
    owner = "zhaofengli";
    repo = "attic";
-    rev = "ff8a897d1f4408ebbf4d45fa9049c06b3e1e3f4e";
-    hash = "sha256-hPYEJ4juK3ph7kbjbvv7PlU1D9pAkkhl+pwx8fZY53U=";
+    rev = "ce9373715fe3fac7a174a65a7e6d6baeba8cb4f9";
+    hash = "sha256-CvaKOUq8G10sghKpZhEB2UYjJoWhEkrDFggDgi7piUI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@ -7,12 +7,12 @@
 }:

 stdenvNoCC.mkDerivation rec {
-  version = "10.24.0";
+  version = "10.25.0";
  pname = "checkstyle";

  src = fetchurl {
    url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-sREZA1/H9S3rXXW6qjyVwpLY75JQCqBooMEATUssvYM=";
+    sha256 = "sha256-CnzGj5jVQIzv5BZ5h0cDLJZrB0DgdRXWIYdKbzWtOA0=";
  };

  nativeBuildInputs = [ makeBinaryWrapper ];
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@ -45,11 +45,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "copilot-language-server";
-  version = "1.322.0";
+  version = "1.330.0";

  src = fetchzip {
    url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip";
-    hash = "sha256-3AJTC4TI+sqTi1/B1XQZght7CClplWwIxjGmrt1E2ME=";
+    hash = "sha256-/Em00UVEg46gEI52fG7aQo2rqKwqrF3V1tAVx2hpyMc=";
    stripRoot = false;
  };

--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@ -17,7 +17,7 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "dbeaver-bin";
-  version = "25.0.5";
+  version = "25.1.0";

  src =
    let
@ -30,10 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        aarch64-darwin = "macos-aarch64.dmg";
      };
      hash = selectSystem {
-        x86_64-linux = "sha256-8JkvI6OZGP1Ot2TEP2n4hj3s9As7holT+thVf0BvOMQ=";
-        aarch64-linux = "sha256-cZQFEbogSxuIaS/z/tFQcvs08J0Omi21zLqb0eFQNw0=";
-        x86_64-darwin = "sha256-LueOQZIKB/r6gtlj0+xwoJXMRTFvbSY+RTwAB74KiYo=";
-        aarch64-darwin = "sha256-L6bOyvhlsT4sXL1QDhlJtb8DFfDVw21ixyRenOVdCxU=";
+        x86_64-linux = "sha256-Bpc4p6WNFdc6nwVeZI4THETzODfNUj2SouEgOhDFTkk=";
+        aarch64-linux = "sha256-mqeG/Vzn/5qsBoD7U6i/6GxXBUvP+55pC1U1wBKF1T0=";
+        x86_64-darwin = "sha256-3RoJGvOafuKRo9dn+m8J274O06F8YUWx1YAcRMQb/Qs=";
+        aarch64-darwin = "sha256-11VbGnZz2fDtG5LRQZWnQdXCT7qrIia22aO+5nA/LQE=";
      };
    in
    fetchurl {
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@ -9,14 +9,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dita-ot";
-  version = "4.3.1";
+  version = "4.3.2";

  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ openjdk17 ];

  src = fetchzip {
    url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-MwE6HnOrVtoT23wF0Tyje8T52au8kD6waY9tsrLQVck=";
+    hash = "sha256-LmXkFuejnWQh0i1L0/GcD/NBNBCMKE5+7M7bUC0DLIg=";
  };

  installPhase = ''
--- a/pkgs/by-name/do/dorion/no-cargo-patch.patch
+++ b/pkgs/by-name/do/dorion/no-cargo-patch.patch
@ -0,0 +1,31 @@
+diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
+index 13a6b54..f6bd9d6 100644
+--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
+@@ -5049,6 +5049,8 @@ dependencies = [
+ [[package]]
+ name = "tauri-plugin-shell"
+ version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
+ dependencies = [
+  "encoding_rs",
+  "log",
+diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
+index 4dcaa86..daef086 100644
+--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
+@@ -12,13 +12,6 @@ rust-version = "1.84.1"
+ strip = "debuginfo"
+ lto = false
+ 
+-# Patches
+-[package.metadata.patch]
+-crates = ["tauri-plugin-shell"]
+-
+-[patch.crates-io]
+-tauri-plugin-shell = { path="./target/patch/tauri-plugin-shell-2.2.1" }
+-
+ [build-dependencies]
+ tauri-build = { version = "2.0.0", features = [] }
+ 
--- a/pkgs/by-name/do/dorion/package.nix
+++ b/pkgs/by-name/do/dorion/package.nix
@ -1,66 +1,193 @@
 {
  lib,
-  stdenv,
+  fetchFromGitHub,
  fetchurl,
-  autoPatchelfHook,
-  dpkg,
+  rustPlatform,
+  cmake,
+  ninja,
+  wrapGAppsHook4,
  glib-networking,
  gst_all_1,
-  libappindicator,
+  libsysprof-capture,
  libayatana-appindicator,
-  webkitgtk_4_0,
-  wrapGAppsHook3,
+  nodejs,
+  openssl,
+  pkg-config,
+  yq-go,
+  pnpm_9,
+  webkitgtk_4_1,
+  cargo-tauri,
+  desktop-file-utils,
 }:

-stdenv.mkDerivation (finalAttrs: {
-  pname = "dorion";
-  version = "5.0.1";
-
-  src = fetchurl {
-    url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version}/Dorion_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-cCZikTZ+IU3mq/FkJfeggXLyWIsWG+a2qu1GbgW93WQ=";
+let
+  webkitgtk_4_1' = webkitgtk_4_1.override {
+    enableExperimental = true;
  };

-  unpackCmd = ''
-    dpkg -X $curSrc .
-  '';
+  shelter = fetchurl {
+    url = "https://raw.githubusercontent.com/uwu/shelter-builds/fab6f100bd0ab8583d67f792f66722a7d2a14bd1/shelter.js";
+    hash = "sha256-d9vaKLrl8RYNcHnE1iGN49ov6U/Y+9XpEsio+c1Sguc=";
+    meta = {
+      homepage = "https://github.com/uwu/shelter";
+      sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS
+      license = lib.licenses.cc0;
+    };
+  };
+in

-  runtimeDependencies = [
-    glib-networking
-    libappindicator
-    libayatana-appindicator
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "dorion";
+  version = "6.7.1";
+
+  src = fetchFromGitHub {
+    owner = "SpikeHD";
+    repo = "Dorion";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-d4G3royqhz+te5wPWVLNqqG/w0qOvTd7dKcWSzxUMUo=";
+  };
+
+  cargoPatches = [
+    ./no-cargo-patch.patch
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-1xpAJkS31DjrZCY5WJ4/Z1t1ALED5gz7xYLhVR1Qzww=";
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-xBonUzA4+1zbViEsKap6CaG6ZRldW1LjNYIB+FmVRFs=";
+  };
+
+  # CMake (webkit extension)
+  cmakeDir = ".";
+  cmakeBuildDir = "src-tauri/extension_webkit";
+  dontUseCmakeConfigure = true;
+  dontUseNinjaBuild = true;
+  dontUseNinjaCheck = true;
+  dontUseNinjaInstall = true;
+  # cmake's supposed to set this automatically
+  # ... but the detection is based on the presence of ninja build hook
+  cmakeFlags = [
+    "-GNinja"
  ];

  nativeBuildInputs = [
-    autoPatchelfHook
-    dpkg
-    wrapGAppsHook3
+    pnpm_9.configHook
+    cargo-tauri.hook
+    nodejs
+    pkg-config
+    wrapGAppsHook4
+    yq-go
+    desktop-file-utils
+    cmake
+    ninja
  ];

  buildInputs = [
-    glib-networking
-    gst_all_1.gst-plugins-bad
+    openssl
+    webkitgtk_4_1'
    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-bad
    gst_all_1.gst-plugins-good
-    webkitgtk_4_0
+    gst_all_1.gst-plugins-rs
+    glib-networking
+    libsysprof-capture
+    libayatana-appindicator
  ];

-  installPhase = ''
-    runHook preInstall
+  postPatch = ''
+    # remove updater
+    rm -rf updater

-    mkdir -pv $out
-    mv -v {bin,lib,share} $out
+    # patch cargo-deps
+    pushd $cargoDepsCopy/tauri-plugin-shell-*
+    patch -p1 < /build/source/src-tauri/patches/tauri-plugin-shell+*.patch
+    popd

-    runHook postInstall
+    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
+      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
+
+    # disable pre-build script and disable auto-updater
+    yq -iPo=json '
+      .bundle.resources = (.bundle.resources | map(select(. != "updater*")))
+    ' src-tauri/tauri.conf.json
+
+    # link shelter injection
+    ln -s ${shelter} src-tauri/injection/shelter.js
+
+    # link html/frontend data
+    ln -s /build/source/src /build/source/src-tauri/html
  '';

+  configurePhase = ''
+    cmakeConfigurePhase
+    pnpmConfigHook
+  '';
+
+  buildPhase = ''
+    ninjaBuildPhase
+    cd /build/source
+    tauriBuildHook
+  '';
+
+  postInstall = ''
+    # Set up the resource directories
+    mkdir -p $out/lib/Dorion
+    ln -s $out/lib/Dorion $out/lib/dorion
+    rm -rf $out/lib/Dorion/injection
+    cp -r src-tauri/injection $out/lib/Dorion
+    cp -r src $out/lib/Dorion
+
+    # Modify the desktop file
+    desktop-file-edit \
+      --set-comment "Tiny alternative Discord client" \
+      --set-key="Exec" --set-value="Dorion %U" \
+      --set-key="TryExec" --set-value="Dorion" \
+      --set-key="StartupWMClass" --set-value="Dorion" \
+      --set-key="StartupNotify" --set-value="true" \
+      --set-key="Categories" --set-value="Network;InstantMessaging;Chat;" \
+      --set-key="Keywords" --set-value="dorion;discord;vencord;chat;im;vc;ds;dc;dsc;tauri;" \
+      --set-key="Terminal" --set-value="false" \
+      --set-key="MimeType" --set-value="x-scheme-handler/discord" \
+      $out/share/applications/Dorion.desktop
+  '';
+
+  # error: failed to run custom build command for `Dorion v6.5.3 (/build/source/src-tauri)`
+  # Permission denied (os error 13)
+  doCheck = false;
+
+  env = {
+    TAURI_RESOURCE_DIR = "${placeholder "out"}/lib";
+  };
+
  meta = {
-    homepage = "https://github.com/SpikeHD/Dorion";
+    homepage = "https://spikehd.github.io/projects/dorion/";
    description = "Tiny alternative Discord client";
-    license = lib.licenses.gpl3Only;
-    mainProgram = "dorion";
-    maintainers = with lib.maintainers; [ aleksana ];
-    platforms = lib.intersectLists (lib.platforms.linux) (lib.platforms.x86_64);
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    longDescription = ''
+      Dorion is an alternative Discord client aimed towards lower-spec or
+      storage-sensitive PCs that supports themes, plugins, and more!
+    '';
+    changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      gpl3Only
+      cc0 # Shelter
+    ];
+    mainProgram = "Dorion";
+    maintainers = with lib.maintainers; [
+      nyabinary
+      aleksana
+      griffi-gh
+      getchoo
+    ];
+    platforms = lib.platforms.linux;
+    sourceProvenance = [
+      lib.sourceTypes.binaryBytecode # actually, minified JS
+      lib.sourceTypes.fromSource
+    ];
  };
 })
--- a/pkgs/by-name/ge/geteduroam/package.nix
+++ b/pkgs/by-name/ge/geteduroam/package.nix
@ -17,16 +17,16 @@

 buildGoModule (finalAttrs: {
  pname = "geteduroam";
-  version = "0.11";
+  version = "0.12";

  src = fetchFromGitHub {
    owner = "geteduroam";
    repo = "linux-app";
    tag = finalAttrs.version;
-    hash = "sha256-CbgQn6mf1125DYKBDId+BmFMcfdWNW2M4/iLoiELOAY=";
+    hash = "sha256-+3mluLby3R0xVU9fIG+1B1A4yM1IfyUvw4wclwnV5s8=";
  };

-  vendorHash = "sha256-b06wnqT88J7etNTFJ6nE9Uo0gOQOGvvs0vPNnJr6r4Q=";
+  vendorHash = "sha256-l9hge1TS+7ix9/6LKWq+lTMjNM4/Lnw8gNrWB6hWCTk=";

  subPackages = [
    "cmd/geteduroam-gui"
--- a/pkgs/by-name/go/gose/package.nix
+++ b/pkgs/by-name/go/gose/package.nix
@ -7,13 +7,13 @@
  lib,
 }:
 let
-  version = "0.10.6";
+  version = "0.11.1";

  src = fetchFromGitHub {
    repo = "gose";
    owner = "stv0g";
    tag = "v${version}";
-    hash = "sha256-H+15d0wCfL+jd+xjKSOrimLIAG1Mh8vO+5MaHaVocJg=";
+    hash = "sha256-Wz3gcx9/wrSfiHkOGnjAoUFfN0tiA1C+31GlnHqL3M0=";
  };

  frontend = buildNpmPackage {
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@ -13,10 +13,10 @@

 stdenv.mkDerivation rec {
  pname = "homebank";
-  version = "5.9.1";
+  version = "5.9.2";
  src = fetchurl {
    url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
-    hash = "sha256-s1Dtw6bjIUFObCb4VQ4rLBMNwftFlmlVa2H/1+jy44A=";
+    hash = "sha256-63WHr9yUuNx3s2pNvTSPTLwQ2M+757Mr++Yfocb6G8c=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "lightning-loop";
-  version = "0.28.8-beta";
+  version = "0.31.1-beta";

  src = fetchFromGitHub {
    owner = "lightninglabs";
    repo = "loop";
    rev = "v${version}";
-    hash = "sha256-zgKKYHDRYXPslPHay/V2DAL1jQfeX5qPWUQQtuvp1M0=";
+    hash = "sha256-OJWf96Dq06U56dIMMocGYgyZdu94VM3A6ViJZR+gbxQ=";
  };

-  vendorHash = "sha256-v7zSvCp63z+xZIuXbqHueamEBN/jZBr2Kysvq03e8L0=";
+  vendorHash = "sha256-TnnYjTbN6zuXUbZbh1sK9bmjR7FleFqNFrqwBTllypY=";

  subPackages = [
    "cmd/loop"
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@ -17,19 +17,19 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
  pname = "matrix-synapse";
-  version = "1.130.0";
+  version = "1.131.0";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "element-hq";
    repo = "synapse";
    rev = "v${version}";
-    hash = "sha256-/rPVJvIJfPMV+8hMenNF2dJzgemhaD2Z+/G4+6d7r1k=";
+    hash = "sha256-nXDVkuV5GCk0Lp4LfyiModKdO30PJ40B5mXdm5tMHQo=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
-    hash = "sha256-Gq3QvQSRfxRovzuvdboLCheNuMW58GFO9x2N2os+p38=";
+    hash = "sha256-9VJnn8aPkShqK2wYGFr+S5koIjma7VOr+LkLXwStL1E=";
  };

  postPatch = ''
--- a/pkgs/by-name/mk/mkbrr/package.nix
+++ b/pkgs/by-name/mk/mkbrr/package.nix
@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "mkbrr";
-  version = "1.12.0";
+  version = "1.12.1";

  src = fetchFromGitHub {
    owner = "autobrr";
    repo = "mkbrr";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-v5MkbsXbS37axZTrp7YTNCU5/uqVW1vnJu+F5hxk3bI=";
+    hash = "sha256-gUIX271eaG15329pLnZ8QnZD7BrdCk+cWs43uUzKxOE=";
  };

  vendorHash = "sha256-G8WM5x99UZfAZUkE5W37Ogx/OKk8JypPzGBrIuBOFNo=";
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@ -3,20 +3,25 @@
  stdenv,
  buildGoModule,
  fetchFromGitHub,
+  gotools,
 }:

 buildGoModule rec {
  pname = "mtail";
-  version = "3.0.23";
+  version = "3.2.4";

  src = fetchFromGitHub {
    owner = "jaqx0r";
    repo = "mtail";
    rev = "v${version}";
-    hash = "sha256-B/to05/qORplhNyz0s7t/WgpmOJ6UZoKnmJfqaf6Htc=";
+    hash = "sha256-3ox+EXd5/Rh3N/7GbX+JUmH4C9j/Er+REkUHZndTxw0=";
  };

-  vendorHash = "sha256-jE1tcZJ7TaMC3yegBHE3Zad9sF0EfbHxDA8ffehNL4U=";
+  vendorHash = "sha256-7EQFO7dlVhBwHdY6c3WmxJo4WdCUJbWKw5P4fL6jBsA=";
+
+  nativeBuildInputs = [
+    gotools # goyacc
+  ];

  ldflags = [
    "-X=main.Branch=main"
@ -27,11 +32,20 @@ buildGoModule rec {
  # fails on darwin with: write unixgram -> <tmpdir>/rsyncd.log: write: message too long
  doCheck = !stdenv.hostPlatform.isDarwin;

-  meta = with lib; {
+  checkFlags = [
+    # can only be executed under bazel
+    "-skip=TestExecMtail"
+  ];
+
+  preBuild = ''
+    GOOS= GOARCH= go generate ./...
+  '';
+
+  meta = {
    description = "Tool for extracting metrics from application logs";
    homepage = "https://github.com/jaqx0r/mtail";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nickcao ];
    mainProgram = "mtail";
  };
 }
--- a/pkgs/by-name/ni/nix-check-deps/package.nix
+++ b/pkgs/by-name/ni/nix-check-deps/package.nix
@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "nix-check-deps";
+  version = "0-unstable-2025-04-09";
+
+  src = fetchFromGitHub {
+    owner = "LordGrimmauld";
+    repo = "nix-check-deps";
+    rev = "263701905ec40a19c52d23d0fdceb1126e20c99e";
+    hash = "sha256-RaPk8Cd5ovskxFFvFd0+auIopCo1YHyH+6199qK+d18=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-1fazKGz3PtyTvcIW+PY/LwYc6JlErSO9ZFisTUXJdhc=";
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Scan nix packages for unused buildInputs";
+    homepage = "https://github.com/LordGrimmauld/nix-check-deps";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    mainProgram = "nix-check-deps";
+    platforms = lib.platforms.unix;
+  };
+}
--- a/pkgs/by-name/ni/nix-your-shell/package.nix
+++ b/pkgs/by-name/ni/nix-your-shell/package.nix
@ -3,6 +3,8 @@
  rustPlatform,
  fetchFromGitHub,
  nix-update-script,
+  runCommand,
+  nix-your-shell,
 }:
 rustPlatform.buildRustPackage rec {
  pname = "nix-your-shell";
@ -11,13 +13,22 @@ rustPlatform.buildRustPackage rec {
  src = fetchFromGitHub {
    owner = "MercuryTechnologies";
    repo = "nix-your-shell";
-    rev = "v${version}";
+    tag = "v${version}";
    hash = "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=";
  };

  useFetchCargoVendor = true;
  cargoHash = "sha256-zQpK13iudyWDZbpAN8zm9kKmz8qy3yt8JxT4lwq4YF0=";

+  passthru = {
+    generate-config =
+      shell:
+      runCommand "nix-your-shell-config" { } ''
+        ${lib.getExe nix-your-shell} ${lib.escapeShellArg shell} >> "$out"
+      '';
+    updateScript = nix-update-script { };
+  };
+
  meta = {
    mainProgram = "nix-your-shell";
    description = "`nix` and `nix-shell` wrapper for shells other than `bash`";
@ -26,6 +37,4 @@ rustPlatform.buildRustPackage rec {
    license = [ lib.licenses.mit ];
    maintainers = with lib.maintainers; [ _9999years ];
  };
-
-  passthru.updateScript = nix-update-script { };
 }
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@ -9,14 +9,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "pywal16";
-  version = "3.8.6";
+  version = "3.8.9";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "eylles";
    repo = "pywal16";
    tag = version;
-    hash = "sha256-aq9I9KJnzwFjfLZ2fzW80abJQ/oSX7FcmCXYi1JMY7Q=";
+    hash = "sha256-43nKFTkIqaG9UzAjvNbZAog3NLMRKdtnZHxiiiBuD/4=";
  };

  build-system = [ python3.pkgs.setuptools ];
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@ -3,7 +3,6 @@
  rustPlatform,
  fetchFromGitHub,
  nix-update-script,
-  fetchpatch,
  installShellFiles,
  python3,
  strace,
@ -19,25 +18,19 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "shh";
-  version = "2025.6.4";
+  version = "2025.6.5";

  src = fetchFromGitHub {
    owner = "desbma";
    repo = "shh";
    tag = "v${version}";
-    hash = "sha256-rhn7qy/cF1vjCFnEoVzVmKNcI/TBUEMxp5pzzC8c9bw=";
+    hash = "sha256-cKN5SK7pVw4Ey6QmCZRYIlDPJ69eg9ihQ1M2vZDmGZ0=";
  };

-  cargoHash = "sha256-hk4IG/FOwrLrV7kPDQigkpWwQzmvf1LvyrIesMYO3jk=";
+  cargoHash = "sha256-09mQDautFnL0RYfIfn6KC2T7Ah57gV7JD1JkqmApmYI=";

  patches = [
    ./fix_run_checks.patch
-    (fetchpatch {
-      # to be removed after next release
-      name = "support-kernels-without-kernel-unprivileged_userns_clone.patch";
-      url = "https://github.com/desbma/shh/commit/f103b06c756dbb43aec615b590680cc99cbb0f00.patch";
-      hash = "sha256-K68tU7EN51jUayoP+WAUuvqqB2eqyDXnAdLsWEd/eAM=";
-    })
  ];

  env = {
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@ -23,11 +23,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = if isFullPackage then "vifm-full" else "vifm";
-  version = "0.14.2";
+  version = "0.14.3";

  src = fetchurl {
    url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2";
-    hash = "sha256-zRsF0lQ832gp1gsjvCJcb94T0+98EAj4IbkgmDfx4rA=";
+    hash = "sha256-Fqm+EQjWpaCen5R/clY3XlGbpB6+lHNlmyBzn9vzRA4=";
  };

  nativeBuildInputs = [
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
    patchShebangs --build src/helpztags
  '';

+  enableParallelBuilding = true;
+
  postFixup =
    let
      path = lib.makeBinPath [
--- a/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
+++ b/pkgs/development/compilers/go/go_no_vendor_checks-1.22.patch
@ -1,23 +0,0 @@
-Starting from go1.14, go verifes that vendor/modules.txt matches the requirements
-and replacements listed in the main module go.mod file, and it is a hard failure if
-vendor/modules.txt is missing.
-
-Relax module consistency checks and switch back to pre go1.14 behaviour if
-vendor/modules.txt is missing regardless of go version requirement in go.mod.
-
-This has been ported from FreeBSD: https://reviews.freebsd.org/D24122
-See https://github.com/golang/go/issues/37948 for discussion.
-
-diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go
-index b2cb44100e..05bf3829d5 100644
--- a/src/cmd/go/internal/modload/vendor.go
-+++ b/src/cmd/go/internal/modload/vendor.go
-@@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m
- 			panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes)))
- 		}
- 		index := indexes[0]
-		if gover.Compare(index.goVersion, "1.14") < 0 {
-+		if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
- 			// Go versions before 1.14 did not include enough information in
- 			// vendor/modules.txt to check for consistency.
- 			// If we know that we're on an earlier version, relax the consistency check.
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@ -25,12 +25,14 @@ buildPythonPackage rec {

  build-system = [ setuptools-scm ];

-  dependencies = [ overrides ];
+  dependencies = [
+    overrides
+    pydantic
+  ];

  pythonImportsCheck = [ "craft_grammar" ];

  nativeCheckInputs = [
-    pydantic
    pytestCheckHook
    pyyaml
  ];
--- a/pkgs/development/python-modules/py-machineid/default.nix
+++ b/pkgs/development/python-modules/py-machineid/default.nix
@ -7,12 +7,12 @@

 buildPythonPackage rec {
  pname = "py-machineid";
-  version = "0.7.0";
+  version = "0.8.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-WnSoEOOLV7BDsUXHVsHmrBYVKct9g/4gCZ/LmGrMV3s=";
+    hash = "sha256-VRXV+XeQc9DKouiq8VoP3QrUJH/QuG2cRHQxyW0+NGc=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/tools/misc/xxdiff/default.nix
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@ -1,43 +1,44 @@
 {
  lib,
-  mkDerivation,
-  fetchFromBitbucket,
+  stdenv,
+  fetchFromGitHub,
  docutils,
  bison,
  flex,
-  qmake,
-  qtbase,
+  libsForQt5,
 }:

-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "xxdiff";
-  version = "5.0b1";
+  version = "5.1-unstable-2025-03-21";

-  src = fetchFromBitbucket {
+  src = fetchFromGitHub {
    owner = "blais";
-    repo = pname;
-    rev = "5e5f885dfc43559549a81c59e9e8c9525306356a";
-    sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w";
+    repo = "xxdiff";
+    rev = "a5593c1c675fb79d0ec2b6e353abba1fb0179aa7";
+    hash = "sha256-nRXvqhO128XsAFy4KrsrSYKpzWnciXGJV6QkuqRa07w=";
  };

  nativeBuildInputs = [
    bison
    docutils
    flex
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
  ];

-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];

  dontUseQmakeConfigure = true;

  # c++11 and above is needed for building with Qt 5.9+
  env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];

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

  postPatch = ''
-    substituteInPlace xxdiff.pro --replace ../bin ./bin
+    substituteInPlace xxdiff.pro \
+      --replace-fail "../bin" "./bin"
  '';

  preConfigure = ''
@ -47,21 +48,21 @@ mkDerivation rec {
  installPhase = ''
    runHook preInstall

-    install -Dm555 -t $out/bin                ./bin/xxdiff
-    install -Dm444 -t $out/share/doc/${pname} ${src}/README
+    install -Dm555 -t $out/bin ./bin/xxdiff
+    install -Dm444 -t $out/share/doc/xxdiff ${finalAttrs.src}/README.rst

    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Graphical file and directories comparator and merge tool";
    mainProgram = "xxdiff";
    homepage = "http://furius.ca/xxdiff/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
      pSub
      raskin
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@ -19,6 +19,7 @@
  srcOverride ? callPackage ./source.nix { inherit patches; },
  gemset ? ./. + "/gemset.nix",
  yarnHash ? srcOverride.yarnHash,
+  yarnMissingHashes ? srcOverride.yarnMissingHashes,
 }:

 stdenv.mkDerivation rec {
@ -36,9 +37,11 @@ stdenv.mkDerivation rec {
    pname = "${pname}-modules";
    inherit src version;

+    missingHashes = yarnMissingHashes;
    yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
      inherit src;
      hash = yarnHash;
+      missingHashes = yarnMissingHashes;
    };

    nativeBuildInputs = [
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@ -19,4 +19,5 @@ in
 // {
  inherit version;
  yarnHash = "sha256-IC4d/skIHEzJPuKlq4rMAqV+ydqquA6toq4WWCfuDxo=";
+  yarnMissingHashes = null;
 }
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@ -102,6 +102,7 @@ in
 // {
  inherit version;
  yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+  yarnMissingHashes = null;
 }
 EOF
 SOURCE_DIR="$(nix-build --no-out-link -E '(import <nixpkgs> {}).callPackage ./source.nix {}')"