Merge staging-next into staging

2025-03-27 18:05:35 +00:00
parent 2eb139f8ce 6cb078fdf0
commit 3f8948732b
71 changed files with 1027 additions and 645 deletions
@@ -170,13 +170,12 @@ To only check a specific module, add it manually to the plugin definition [overr
  };
 ```
 Some plugins will have lua modules that require a user configuration to function properly or can contain optional lua modules that we dont want to test requiring.
-We can skip specific modules using `nvimSkipModule`. Similar to `nvimRequireCheck`, it accepts a single string or a list of strings.
- `nvimSkipModule = MODULE;`
- `nvimSkipModule = [ MODULE1 MODULE2 ];`
+We can skip specific modules using `nvimSkipModules`. Similar to `nvimRequireCheck`, it accepts a list of strings.
+- `nvimSkipModules = [ MODULE1 MODULE2 ];`

 ```nix
  asyncrun-vim = super.asyncrun-vim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # vim plugin with optional toggleterm integration
      "asyncrun.toggleterm"
      "asyncrun.toggleterm2"
@@ -85,6 +85,7 @@ with lib.maintainers;

  beam = {
    members = [
+      adamcstephens
      ankhers
      Br1ght0ne
      DianaOlympos
@@ -371,7 +371,7 @@ If the you're interested in can be distinguished without a label, you may simpli
                options.destination = mkOption { … };
              };
            };
-            ignore = types.mkOption {
+            drop = types.mkOption {
              description = "Drop the packet without sending anything back.";
              type = types.submodule {};
            };
@@ -10058,6 +10058,19 @@ final: prev:
    meta.hydraPlatforms = [ ];
  };

+  nvim-dap-vscode-js = buildVimPlugin {
+    pname = "nvim-dap-vscode-js";
+    version = "2023-03-06";
+    src = fetchFromGitHub {
+      owner = "mxsdev";
+      repo = "nvim-dap-vscode-js";
+      rev = "03bd29672d7fab5e515fc8469b7d07cc5994bbf6";
+      sha256 = "1nj299by3qs0dbsv1lxb19ia9pbpspw22kdlrilwl8vqixl77ngi";
+    };
+    meta.homepage = "https://github.com/mxsdev/nvim-dap-vscode-js/";
+    meta.hydraPlatforms = [ ];
+  };
+
  nvim-docs-view = buildVimPlugin {
    pname = "nvim-docs-view";
    version = "2025-03-24";
@@ -54,9 +54,15 @@ run_require_checks() {
    local nativeCheckInputs="${nativeBuildInputs[*]}"
    local checkInputs="${buildInputs[*]}"
    set +e
+
+    if [ -v 'nvimSkipModule' ]; then
+        nvimSkipModules=("${nvimSkipModule[@]}")
+        echo "WARNING: nvimSkipModule got renamed to nvimSkipModules, please update package $name"
+    fi
+
    for name in "${nvimRequireCheck[@]}"; do
        local skip=false
-        for module in "${nvimSkipModule[@]}"; do
+        for module in "${nvimSkipModules[@]}"; do
            if [[ "$module" == "$name" ]]; then
                echo "$name is in list of modules to not check. Skipping..."
                skip=true
@@ -80,7 +80,7 @@ vimUtils.buildVimPlugin {
    inherit avante-nvim-lib;
  };

-  nvimSkipModule = [
+  nvimSkipModules = [
    # Requires setup with corresponding provider
    "avante.providers.azure"
    "avante.providers.copilot"
@@ -61,7 +61,7 @@ vimUtils.buildVimPlugin {
    ];
  };

-  nvimSkipModule = [
+  nvimSkipModules = [
    # Module for reproducing issues
    "repro"
  ];
@@ -15,7 +15,7 @@ vimUtils.buildVimPlugin {
    hash = "sha256-zWHXYs3XdnoszqOFY3hA2L5mNn1a44OAeKv3lL3EMEw=";
  };

-  nvimSkipModule = [
+  nvimSkipModules = [
    # rainbow-delimiters.types.lua
    "rainbow-delimiters.types"
    # Test that requires an unpackaged dependency
@@ -56,7 +56,7 @@ vimUtils.buildVimPlugin {
    ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
  '';

-  nvimSkipModule = [
+  nvimSkipModules = [
    # Dependent on active fuzzy search state
    "sg.cody.fuzzy"
  ];
@@ -163,7 +163,7 @@ in

  aerial-nvim = super.aerial-nvim.overrideAttrs {
    # optional dependencies
-    nvimSkipModule = [
+    nvimSkipModules = [
      "lualine.components.aerial"
      "telescope._extensions.aerial"
    ];
@@ -203,7 +203,7 @@ in
  };

  asyncrun-vim = super.asyncrun-vim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # vim plugin with optional toggleterm integration
      "asyncrun.toggleterm"
      "asyncrun.toggleterm2"
@@ -216,7 +216,7 @@ in

  auto-session = super.auto-session.overrideAttrs {
    # optional telescope dependency
-    nvimSkipModule = [
+    nvimSkipModules = [
      "auto-session.session-lens.actions"
      "auto-session.session-lens.init"
      "telescope._extensions.session-lens"
@@ -232,7 +232,7 @@ in
  };

  bamboo-nvim = super.bamboo-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires config table
      "bamboo.colors"
      "bamboo.terminal"
@@ -248,7 +248,7 @@ in

  barbar-nvim = super.barbar-nvim.overrideAttrs {
    # nvim-web-devicons dependency
-    nvimSkipModule = "bufferline.utils";
+    nvimSkipModules = [ "bufferline.utils" ];
  };

  barbecue-nvim = super.barbecue-nvim.overrideAttrs {
@@ -267,7 +267,7 @@ in
  base46 = super.base46.overrideAttrs {
    dependencies = [ self.nvchad-ui ];
    # Requires global config setup
-    nvimSkipModule = [
+    nvimSkipModules = [
      "nvchad.configs.cmp"
      "nvchad.configs.gitsigns"
      "nvchad.configs.luasnip"
@@ -303,7 +303,7 @@ in

  bufferline-nvim = super.bufferline-nvim.overrideAttrs {
    # depends on bufferline.lua being loaded first
-    nvimSkipModule = [ "bufferline.commands" ];
+    nvimSkipModules = [ "bufferline.commands" ];
  };

  bufresize-nvim = super.bufresize-nvim.overrideAttrs {
@@ -311,7 +311,7 @@ in
  };

  catppuccin-nvim = super.catppuccin-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      "catppuccin.groups.integrations.noice"
      "catppuccin.groups.integrations.feline"
      "catppuccin.lib.vim.init"
@@ -321,7 +321,7 @@ in
  ccc-nvim = super.ccc-nvim.overrideAttrs {
    # ccc auto-discover requires all pass
    # but there's a bootstrap module that hangs forever if we dont stop on first success
-    nvimSkipModule = "ccc.kit.Thread.Server._bootstrap";
+    nvimSkipModules = [ "ccc.kit.Thread.Server._bootstrap" ];
  };

  chadtree = super.chadtree.overrideAttrs {
@@ -440,7 +440,7 @@ in

  cmp-dictionary = super.cmp-dictionary.overrideAttrs {
    checkInputs = [ self.nvim-cmp ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Test files
      "cmp_dictionary.dict.external_spec"
      "cmp_dictionary.dict.trie_spec"
@@ -582,7 +582,7 @@ in
  cobalt2-nvim = super.cobalt2-nvim.overrideAttrs {
    dependencies = with self; [ colorbuddy-nvim ];
    # Few broken themes
-    nvimSkipModule = [
+    nvimSkipModules = [
      "cobalt2.plugins.init"
      "cobalt2.plugins.trouble"
      "cobalt2.plugins.gitsigns"
@@ -595,7 +595,7 @@ in

  codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional provider dependencies
      "codecompanion.providers.diff.mini_diff"
      "codecompanion.providers.actions.telescope"
@@ -697,7 +697,7 @@ in

  colorful-menu-nvim = super.colorful-menu-nvim.overrideAttrs {
    # Local bug reproduction modules
-    nvimSkipModule = [
+    nvimSkipModules = [
      "repro_blink"
      "repro_cmp"
    ];
@@ -751,7 +751,7 @@ in

  conjure = super.conjure.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Test mismatch of directory because of nix generated path
      "conjure-spec.client.fennel.nfnl_spec"
    ];
@@ -759,7 +759,7 @@ in

  context-vim = super.context-vim.overrideAttrs {
    # Vim plugin with optional lua highlight module
-    nvimSkipModule = "context.highlight";
+    nvimSkipModules = [ "context.highlight" ];
  };

  CopilotChat-nvim = super.CopilotChat-nvim.overrideAttrs {
@@ -885,7 +885,7 @@ in
  darkearth-nvim = super.darkearth-nvim.overrideAttrs {
    dependencies = [ self.lush-nvim ];
    # Lua module used to build theme
-    nvimSkipModule = "shipwright_build";
+    nvimSkipModules = [ "shipwright_build" ];
  };

  ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs {
@@ -967,7 +967,7 @@ in
  };

  devdocs-nvim = super.devdocs-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Error initializing Devdocs state
      "devdocs.state"
    ];
@@ -985,7 +985,7 @@ in
  diffview-nvim = super.diffview-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];

-    nvimSkipModule = [
+    nvimSkipModules = [
      # https://github.com/sindrets/diffview.nvim/issues/498
      "diffview.api.views.diff.diff_view"
      "diffview.scene.layouts.diff_2"
@@ -1036,7 +1036,7 @@ in

  dropbar-nvim = super.dropbar-nvim.overrideAttrs {
    # Requires global config table
-    nvimSkipModule = "dropbar.menu";
+    nvimSkipModules = [ "dropbar.menu" ];
  };

  easy-dotnet-nvim = super.easy-dotnet-nvim.overrideAttrs {
@@ -1070,7 +1070,7 @@ in
      luasnip
      nvim-fzf
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # E5108: Error executing lua vim/_init_packages.lua:0: ...in-faust-nvim-2022-06-01/lua/faust-nvim/autosnippets.lua:3: '=' expected near 'wd'
      "faust-nvim.autosnippets"
    ];
@@ -1087,7 +1087,7 @@ in
  flash-nvim = super.flash-nvim.overrideAttrs {
    # Docs require lazyvim
    # dependencies = with self; [ lazy-nvim ];
-    nvimSkipModule = "flash.docs";
+    nvimSkipModules = [ "flash.docs" ];
  };

  flit-nvim = super.flit-nvim.overrideAttrs {
@@ -1166,7 +1166,7 @@ in
      telescope-zf-native-nvim
    ];
    dependencies = [ self.telescope-fzf-native-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # TODO: package fzy-lua-native
      "fuzzy_nvim.fzy_matcher"
    ];
@@ -1248,7 +1248,7 @@ in
  };

  go-nvim = super.go-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Null-ls
      "go.null_ls"
      # _GO_NVIM_CFG
@@ -1298,7 +1298,7 @@ in
      plenary-nvim
    ];

-    nvimSkipModule = [
+    nvimSkipModules = [
      # Cannot find hardhat.extmarks
      "overseer.component.hardhat.refresh_gas_extmarks"
    ];
@@ -1310,7 +1310,7 @@ in

  harpoon2 = super.harpoon2.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Access harpoon data file
      "harpoon.scratch.toggle"
    ];
@@ -1326,14 +1326,14 @@ in

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

  helpview-nvim = super.helpview-nvim.overrideAttrs {
-    nvimSkipModule = "definitions.__vimdoc";
+    nvimSkipModules = [ "definitions.__vimdoc" ];
  };

  hex-nvim = super.hex-nvim.overrideAttrs {
@@ -1343,7 +1343,7 @@ in
  himalaya-vim = super.himalaya-vim.overrideAttrs {
    buildInputs = [ himalaya ];
    # vim plugin with optional telescope lua module
-    nvimSkipModule = [
+    nvimSkipModules = [
      "himalaya.folder.pickers.fzflua"
      "himalaya.folder.pickers.telescope"
    ];
@@ -1352,7 +1352,7 @@ in
  hover-nvim = super.hover-nvim.overrideAttrs {
    # Single provider issue with reading from config
    # /lua/hover/providers/fold_preview.lua:27: attempt to index local 'config' (a nil value)
-    nvimSkipModule = "hover.providers.fold_preview";
+    nvimSkipModules = "hover.providers.fold_preview";
  };

  hunk-nvim = super.hunk-nvim.overrideAttrs {
@@ -1379,7 +1379,7 @@ in

  indent-blankline-nvim = super.indent-blankline-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModule = "ibl.config.types";
+    nvimSkipModules = "ibl.config.types";
  };

  indent-tools-nvim = super.indent-tools-nvim.overrideAttrs {
@@ -1391,7 +1391,7 @@ in
  };

  instant-nvim = super.instant-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires global variable config
      "instant"
      # instant/log.lua:12: cannot use '...' outside a vararg function near '...'
@@ -1435,7 +1435,7 @@ in
  LazyVim = super.LazyVim.overrideAttrs {
    # Any other dependency is optional
    dependencies = [ self.lazy-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # attempt to index global 'LazyVim' (a nil value)
      "lazyvim.config.keymaps"
      "lazyvim.plugins.extras.ai.tabnine"
@@ -1463,7 +1463,7 @@ in

  lazy-nvim = super.lazy-nvim.overrideAttrs {
    patches = [ ./patches/lazy-nvim/no-helptags.patch ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires headless config option
      "lazy.manage.task.init"
      "lazy.manage.checker"
@@ -1509,7 +1509,7 @@ in
    ];

    doInstallCheck = true;
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires setup call
      "leetcode.api.auth"
      "leetcode.api.headers"
@@ -1545,7 +1545,7 @@ in

  legendary-nvim = super.legendary-nvim.overrideAttrs {
    dependencies = [ self.sqlite-lua ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      "vimdoc-gen"
      "vimdocrc"
    ];
@@ -1580,7 +1580,7 @@ in
      telescope-nvim
      plenary-nvim
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Attempt to connect to sqlitedb
      "lispdocs.db"
      "lispdocs.finder"
@@ -1630,7 +1630,7 @@ in
    dependencies = [ self.luasnip ];
    # E5108: /luasnip-latex-snippets/luasnippets/tex/utils/init.lua:3: module 'luasnip-latex-snippets.luasnippets.utils.conditions' not found:
    # Need to fix upstream
-    nvimSkipModule = [
+    nvimSkipModules = [
      "luasnip-latex-snippets.luasnippets.tex.utils.init"
    ];
  };
@@ -1711,7 +1711,7 @@ in

  mason-nvim = super.mason-nvim.overrideAttrs {
    # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
-    nvimSkipModule = "mason-vendor.zzlib.inflate-bwo";
+    nvimSkipModules = "mason-vendor.zzlib.inflate-bwo";
  };

  mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs {
@@ -1720,7 +1720,7 @@ in

  material-vim = super.material-vim.overrideAttrs {
    # vim plugin with optional lualine module
-    nvimSkipModule = "material.lualine";
+    nvimSkipModules = "material.lualine";
  };

  meson = buildVimPlugin {
@@ -1771,7 +1771,7 @@ in
      self.lualine-nvim
    ];
    dependencies = with self; [ plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Backends require configuration
      "minuet.backends.claude"
      "minuet.backends.codestral"
@@ -1791,11 +1791,11 @@ in

  modicator-nvim = super.modicator-nvim.overrideAttrs {
    # Optional lualine integration
-    nvimSkipModule = "modicator.integration.lualine.init";
+    nvimSkipModules = "modicator.integration.lualine.init";
  };

  molten-nvim = super.molten-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional image providers
      "load_image_nvim"
      "load_wezterm_nvim"
@@ -1849,7 +1849,7 @@ in

  neogit = super.neogit.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional diffview integration
      "neogit.integrations.diffview"
      "neogit.popups.diff.actions"
@@ -1858,7 +1858,7 @@ in
  };

  neorepl-nvim = super.neorepl-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires main module loaded first
      "neorepl.bufs"
      "neorepl.map"
@@ -1955,7 +1955,7 @@ in
      plenary-nvim
      nvim-treesitter-parsers.cpp
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # lua/plenary/path.lua:511: FileNotFoundError from mkdir because of stdpath parent path missing
      "neotest-gtest.executables.global_registry"
      "neotest-gtest.executables.init"
@@ -1990,7 +1990,7 @@ in
      nvim-nio
    ];
    # Unit test assert
-    nvimSkipModule = "neotest-jest-assertions";
+    nvimSkipModules = "neotest-jest-assertions";
  };

  neotest-mocha = super.neotest-mocha.overrideAttrs {
@@ -2034,7 +2034,7 @@ in
      telescope-nvim
    ];
    # Unit test assert
-    nvimSkipModule = "neotest-playwright-assertions";
+    nvimSkipModules = "neotest-playwright-assertions";
  };

  neotest-plenary = super.neotest-plenary.overrideAttrs {
@@ -2092,7 +2092,7 @@ in
      plenary-nvim
    ];
    # Unit test assert
-    nvimSkipModule = "neotest-vitest-assertions";
+    nvimSkipModules = "neotest-vitest-assertions";
  };

  neotest-zig = super.neotest-zig.overrideAttrs {
@@ -2114,7 +2114,7 @@ in
  };

  netman-nvim = super.netman-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional neo-tree integration
      "netman.ui.neo-tree.init"
      "netman.ui.neo-tree.commands"
@@ -2169,7 +2169,7 @@ in
      telescope-nvim
      nvim-treesitter
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires global config setup
      "nvchad.configs.cmp"
      "nvchad.configs.gitsigns"
@@ -2182,7 +2182,7 @@ in

  nvchad-ui = super.nvchad-ui.overrideAttrs {
    dependencies = [ self.nvzone-volt ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires global config setup
      "nvchad.tabufline.modules"
      "nvchad.term.init"
@@ -2194,7 +2194,7 @@ in
  };

  nvim-autopairs = super.nvim-autopairs.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional completion dependencies
      "nvim-autopairs.completion.cmp"
      "nvim-autopairs.completion.compe"
@@ -2217,7 +2217,7 @@ in
      neotest
      plenary-nvim
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # TODO: Add lua-xmlreader package
      "coverage.parsers.corbertura"
    ];
@@ -2227,6 +2227,10 @@ in
    dependencies = [ self.nvim-dap ];
  };

+  nvim-dap-vscode-js = super.nvim-dap-vscode-js.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
  nvim-dap-lldb = super.nvim-dap-lldb.overrideAttrs {
    dependencies = [ self.nvim-dap ];
  };
@@ -2267,7 +2271,7 @@ in
  nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
    dependencies = [ self.nvim-fzf ];
    # Requires global variable setup nvim_fzf_directory
-    nvimSkipModule = "fzf-commands.rg";
+    nvimSkipModules = "fzf-commands.rg";
  };

  nvim-genghis = super.nvim-genghis.overrideAttrs {
@@ -2282,7 +2286,7 @@ in

  nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
    # Test module
-    nvimSkipModule = [
+    nvimSkipModules = [
      "nvim-highlight-colors.buffer_utils_spec"
      "nvim-highlight-colors.color.converters_spec"
      "nvim-highlight-colors.color.patterns_spec"
@@ -2317,7 +2321,7 @@ in

  nvim-java-refactor = super.nvim-java-refactor.overrideAttrs {
    dependencies = [ self.nvim-java-core ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires the `java.utils.ui` module which seems to be provided by `nvim-java` (cyclic dependency)
      # -> Skip to avoid infinite recursion
      "java-refactor.action"
@@ -2353,7 +2357,7 @@ in

  nvim-moonwalk = super.nvim-moonwalk.overrideAttrs {
    # Asserts log file exists before it is created
-    nvimSkipModule = "moonwalk";
+    nvimSkipModules = [ "moonwalk" ];
  };

  nvim-navbuddy = super.nvim-navbuddy.overrideAttrs {
@@ -2368,7 +2372,7 @@ in
  };

  nvim-neoclip-lua = super.nvim-neoclip-lua.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional dependencies
      "neoclip.fzf"
      "neoclip.telescope"
@@ -2382,7 +2386,7 @@ in

  nvim-notify = super.nvim-notify.overrideAttrs {
    # Optional fzf integration
-    nvimSkipModule = "notify.integrations.fzf";
+    nvimSkipModules = "notify.integrations.fzf";
  };

  nvim-nu = super.nvim-nu.overrideAttrs {
@@ -2409,12 +2413,12 @@ in

  nvim-snippets = super.nvim-snippets.overrideAttrs {
    # Optional cmp integration
-    nvimSkipModule = "snippets.utils.cmp";
+    nvimSkipModules = "snippets.utils.cmp";
  };

  nvim-surround = super.nvim-surround.overrideAttrs {
    # Optional treesitter integration
-    nvimSkipModule = "nvim-surround.queries";
+    nvimSkipModules = "nvim-surround.queries";
  };

  nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
@@ -2438,7 +2442,7 @@ in
      nvim-treesitter-parsers.typescript
      nvim-treesitter-parsers.zig
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional toggleterm integration
      "nvim-test.terms.toggleterm"
      # Broken runners
@@ -2449,7 +2453,7 @@ in
  };

  nvim-tree-lua = super.nvim-tree-lua.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Meta can't be required
      "nvim-tree._meta.api"
      "nvim-tree._meta.api_decorator"
@@ -2462,7 +2466,7 @@ in

  nvim-treesitter-context = super.nvim-treesitter-context.overrideAttrs {
    # Meant for CI installing parsers
-    nvimSkipModule = "install_parsers";
+    nvimSkipModules = [ "install_parsers" ];
  };

  nvim-treesitter-endwise = super.nvim-treesitter-endwise.overrideAttrs {
@@ -2505,13 +2509,13 @@ in

  nvim-unception = super.nvim-unception.overrideAttrs {
    # Attempt rpc socket connection
-    nvimSkipModule = "client.client";
+    nvimSkipModules = "client.client";
  };

  nvzone-menu = super.nvzone-menu.overrideAttrs {
    dependencies = [ self.nvzone-volt ];
    # Optional nvimtree integration
-    nvimSkipModule = "menus.nvimtree";
+    nvimSkipModules = "menus.nvimtree";
  };

  nvzone-minty = super.nvzone-minty.overrideAttrs {
@@ -2550,11 +2554,11 @@ in

  omni-vim = super.omni-vim.overrideAttrs {
    # Optional lightline integration
-    nvimSkipModule = "omni-lightline";
+    nvimSkipModules = "omni-lightline";
  };

  onedark-nvim = super.onedark-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires global config value
      "barbecue.theme.onedark"
      "onedark.highlights"
@@ -2583,7 +2587,7 @@ in
    ];

    # FIXME: can't find plugin root dir
-    nvimSkipModule = [
+    nvimSkipModules = [
      "openscad"
      "openscad.snippets.openscad"
      "openscad.utilities"
@@ -2607,7 +2611,7 @@ in

  outline-nvim = super.outline-nvim.overrideAttrs {
    # Requires setup call
-    nvimSkipModule = "outline.providers.norg";
+    nvimSkipModules = "outline.providers.norg";
  };

  overseer-nvim = super.overseer-nvim.overrideAttrs {
@@ -2626,7 +2630,7 @@ in

      runHook postCheck
    '';
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional integrations
      "overseer.strategy.toggleterm"
      "overseer.dap"
@@ -2648,7 +2652,7 @@ in
  };

  persisted-nvim = super.persisted-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # /lua/persisted/init.lua:44: attempt to index upvalue 'config' (a nil value)
      # https://github.com/olimorris/persisted.nvim/issues/146
      "persisted"
@@ -2679,7 +2683,7 @@ in

  poimandres-nvim = super.poimandres-nvim.overrideAttrs {
    # Optional treesitter support
-    nvimSkipModule = "poimandres.highlights";
+    nvimSkipModules = "poimandres.highlights";
  };

  popup-nvim = super.popup-nvim.overrideAttrs {
@@ -2696,12 +2700,12 @@ in

  pywal-nvim = super.pywal-nvim.overrideAttrs {
    # Optional feline integration
-    nvimSkipModule = "pywal.feline";
+    nvimSkipModules = "pywal.feline";
  };

  qmk-nvim = super.qmk-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Test assertions
      "qmk.config.init_spec"
      "qmk.format.keymap_spec"
@@ -2752,7 +2756,7 @@ in
      nui-nvim
      plenary-nvim
    ];
-    nvimSkipModule = "repro";
+    nvimSkipModules = [ "repro" ];
  };

  remote-sshfs-nvim = super.remote-sshfs-nvim.overrideAttrs {
@@ -2832,21 +2836,21 @@ in
      sqlite-lua
      telescope-nvim
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # optional dependency
      "smart-open.matching.algorithms.fzf_implementation"
    ];
  };

  smart-splits-nvim = super.smart-splits-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      "vimdoc-gen"
      "vimdocrc"
    ];
  };

  snacks-nvim = super.snacks-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires setup call first
      # attempt to index global 'Snacks' (a nil value)
      "snacks.dashboard"
@@ -2878,7 +2882,7 @@ in
  };

  snap = super.snap.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      "snap.consumer.fzy.all"
      "snap.consumer.fzy.filter"
      "snap.consumer.fzy.init"
@@ -2894,7 +2898,7 @@ in

  spaceman-nvim = super.spaceman-nvim.overrideAttrs {
    # Optional telescope integration
-    nvimSkipModule = "spaceman.adapters.telescope";
+    nvimSkipModules = "spaceman.adapters.telescope";
  };

  sqlite-lua = super.sqlite-lua.overrideAttrs (
@@ -2912,7 +2916,7 @@ in
        initLua = ''vim.g.sqlite_clib_path = "${libsqlite}"'';
      };

-      nvimSkipModule = [
+      nvimSkipModules = [
        # Require "sql.utils" ?
        "sqlite.tbl.cache"
        # attempt to write to read only database
@@ -3065,7 +3069,7 @@ in
      plenary-nvim
    ];
    # Meta
-    nvimSkipModule = "frecency.types";
+    nvimSkipModules = "frecency.types";
  };

  telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs {
@@ -3208,7 +3212,7 @@ in
  };

  text-case-nvim = super.text-case-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # some leftover from development
      "textcase.plugin.range"
    ];
@@ -3216,7 +3220,7 @@ in

  tmux-complete-vim = super.tmux-complete-vim.overrideAttrs {
    # Vim plugin with optional nvim-compe lua module
-    nvimSkipModule = "compe_tmux";
+    nvimSkipModules = [ "compe_tmux" ];
  };

  todo-comments-nvim = super.todo-comments-nvim.overrideAttrs {
@@ -3225,7 +3229,7 @@ in
      trouble-nvim
    ];
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional fzf-lua integration
      # fzf-lua server must be running
      "todo-comments.fzf"
@@ -3233,7 +3237,7 @@ in
  };

  tokyonight-nvim = super.tokyonight-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Meta file
      "tokyonight.docs"
      # Optional integration
@@ -3247,7 +3251,7 @@ in

  trouble-nvim = super.trouble-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModule = "trouble.docs";
+    nvimSkipModules = "trouble.docs";
  };

  tsc-nvim = super.tsc-nvim.overrideAttrs {
@@ -3258,7 +3262,7 @@ in
    '';

    # Unit test
-    nvimSkipModule = "tsc.better-messages-test";
+    nvimSkipModules = "tsc.better-messages-test";
  };

  tssorter-nvim = super.tssorter-nvim.overrideAttrs {
@@ -3288,7 +3292,7 @@ in
      nvim-lspconfig
    ];
    # Optional null-ls integration
-    nvimSkipModule = [ "typescript.extensions.null-ls.code-actions.init" ];
+    nvimSkipModules = [ "typescript.extensions.null-ls.code-actions.init" ];
  };

  typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs {
@@ -3475,7 +3479,7 @@ in
  };

  vim-apm = super.vim-apm.overrideAttrs {
-    nvimSkipModule = "run";
+    nvimSkipModules = [ "run" ];
  };

  vim-bazel = super.vim-bazel.overrideAttrs {
@@ -3529,7 +3533,7 @@ in

  vim-flog = super.vim-flog.overrideAttrs {
    # Not intended to be required, used by vim plugin
-    nvimSkipModule = "flog.graph_bin";
+    nvimSkipModules = "flog.graph_bin";
  };

  vim-fzf-coauthorship = super.vim-fzf-coauthorship.overrideAttrs {
@@ -3606,7 +3610,7 @@ in

  vim-illuminate = super.vim-illuminate.overrideAttrs {
    # Optional treesitter integration
-    nvimSkipModule = "illuminate.providers.treesitter";
+    nvimSkipModules = "illuminate.providers.treesitter";
  };

  vim-isort = super.vim-isort.overrideAttrs {
@@ -3618,7 +3622,7 @@ in

  vim-matchup = super.vim-matchup.overrideAttrs {
    # Optional treesitter integration
-    nvimSkipModule = "treesitter-matchup.third-party.query";
+    nvimSkipModules = "treesitter-matchup.third-party.query";
  };

  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
@@ -3672,13 +3676,13 @@ in

  vim-tpipeline = super.vim-tpipeline.overrideAttrs {
    # Requires global variable
-    nvimSkipModule = "tpipeline.main";
+    nvimSkipModules = "tpipeline.main";
  };

  vim-ultest = super.vim-ultest.overrideAttrs {
    # NOTE: vim-ultest is no longer maintained.
    # If using Neovim, you can switch to using neotest (https://github.com/nvim-neotest/neotest) instead.
-    nvimSkipModule = "ultest";
+    nvimSkipModules = [ "ultest" ];
  };

  vim-unimpaired = super.vim-unimpaired.overrideAttrs {
@@ -3720,16 +3724,16 @@ in

  virt-column-nvim = super.virt-column-nvim.overrideAttrs {
    # Meta file
-    nvimSkipModule = "virt-column.config.types";
+    nvimSkipModules = "virt-column.config.types";
  };

  which-key-nvim = super.which-key-nvim.overrideAttrs {
-    nvimSkipModule = [ "which-key.docs" ];
+    nvimSkipModules = [ "which-key.docs" ];
  };

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

  windows-nvim = super.windows-nvim.overrideAttrs {
@@ -3737,7 +3741,7 @@ in
      middleclass
      animation-nvim
    ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Animation doesn't work headless
      "windows.autowidth"
      "windows.commands"
@@ -3749,7 +3753,7 @@ in
  };

  yanky-nvim = super.yanky-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Optional telescope integration
      "yanky.telescope.mapping"
      "yanky.telescope.yank_history"
@@ -3758,7 +3762,7 @@ in

  yazi-nvim = super.yazi-nvim.overrideAttrs {
    dependencies = [ self.plenary-nvim ];
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Used for reproducing issues
      "repro"
    ];
@@ -3788,7 +3792,7 @@ in
  };

  zenbones-nvim = super.zenbones-nvim.overrideAttrs {
-    nvimSkipModule = [
+    nvimSkipModules = [
      # Requires global variable set
      "randombones"
      "randombones.palette"
@@ -3835,7 +3839,7 @@ in

  zk-nvim = super.zk-nvim.overrideAttrs {
    # Optional integrations
-    nvimSkipModule = [
+    nvimSkipModules = [
      "zk.pickers.fzf_lua"
      "zk.pickers.minipick"
      "zk.pickers.snacks_picker"
@@ -1,5 +1,5 @@
 {
-  pkgs ? import ../../../../../.. { },
+  pkgs ? import ../../../../../../.. { },
 }:

 with pkgs;
@@ -3,11 +3,10 @@

 import json
 import logging
-import subprocess
-from concurrent.futures import ThreadPoolExecutor
 import os
+import subprocess
 import sys
-from os.path import join
+from concurrent.futures import ThreadPoolExecutor

 log = logging.getLogger("vim-updater")

@@ -61,7 +60,7 @@ def update_grammars(nvim_treesitter_dir: str):
    log.debug("Running command: %s", ' '.join(cmd))
    configs = json.loads(subprocess.check_output(cmd))

-    generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py
+    generated_file = """# generated by pkgs/applications/editors/vim/plugins/utils/nvim-treesitter/update.py

 { buildGrammar, """

@@ -95,4 +94,8 @@ def update_grammars(nvim_treesitter_dir: str):

 if __name__ == "__main__":
    generated = update_grammars(sys.argv[1])
-    open(join(os.path.dirname(__file__), "generated.nix"), "w").write(generated)
+    output_path = os.path.join(
+        os.path.dirname(__file__),
+        "../../nvim-treesitter/generated.nix"
+    )
+    open(output_path, "w").write(generated)
@@ -771,6 +771,7 @@ https://github.com/jonboh/nvim-dap-rr/,HEAD,
 https://github.com/rcarriga/nvim-dap-ui/,,
 https://github.com/igorlfs/nvim-dap-view/,HEAD,
 https://github.com/theHamsta/nvim-dap-virtual-text/,,
+https://github.com/mxsdev/nvim-dap-vscode-js/,HEAD,
 https://github.com/amrbashir/nvim-docs-view/,HEAD,
 https://github.com/allendang/nvim-expand-expr/,,
 https://github.com/vijaymarupudi/nvim-fzf/,,
@@ -1,7 +1,7 @@
 {
-  "version": "2.63.32",
+  "version": "2.69.25",
  "linux-x64": {
-    "hash": "sha256-laI6zoydOKAkRHZvHXQ6eFEJoFrb2I2Fe6gvti3eoJg=",
+    "hash": "sha256-RG3iuQXEePJvn9kh58tkXJeakdh6w8W1D4A6hn7NhQs=",
    "binaries": [
      ".debugger/createdump",
      ".debugger/vsdbg",
@@ -11,7 +11,7 @@
    ]
  },
  "linux-arm64": {
-    "hash": "sha256-3XWSzNhPSoAUlVVe3RNQ/Ttxm4WIuWahH0hGd4FXFhw=",
+    "hash": "sha256-sMUUS90uXEnIc8QyQ7Vk8/bhaUcqgwWIPObl8/qkkYI=",
    "binaries": [
      ".debugger/createdump",
      ".debugger/vsdbg",
@@ -21,7 +21,7 @@
    ]
  },
  "darwin-x64": {
-    "hash": "sha256-TfI6XR2jCxKCNt3mNu+ndH3KqHctWK+JF52eNd+QaLQ=",
+    "hash": "sha256-7jdVpzEx1zqvtSbr7Z6g5YnlNJyCK33g2REbx27X5Ls=",
    "binaries": [
      ".debugger/x86_64/createdump",
      ".debugger/x86_64/vsdbg",
@@ -31,7 +31,7 @@
    ]
  },
  "darwin-arm64": {
-    "hash": "sha256-SoTaPgFYuxilmXZ/QXrc8xrMa58u6HnmuhiNK9knfME=",
+    "hash": "sha256-Oz6gGQbZwcAoy8m1mLQxOQypjoo6LQc/j1OcRX94YII=",
    "binaries": [
      ".debugger/arm64/createdump",
      ".debugger/arm64/vsdbg",
@@ -78,13 +78,13 @@ let
 in
 stdenv.mkDerivation {
  pname = "ansel";
-  version = "0-unstable-2025-03-06";
+  version = "0-unstable-2025-03-18";

  src = fetchFromGitHub {
    owner = "aurelienpierreeng";
    repo = "ansel";
-    rev = "af267a56c4be7011ee2bc03cf13d72eb4de789cd";
-    hash = "sha256-V4Usp0qlEbnyH/2XXrvPmMAO8sYhBE0WIZRqpafdS9U=";
+    rev = "dd6127b7324f012abbdda55a56af4bcd061f0f83";
+    hash = "sha256-RNYs40UcfLlkqdf8vRjAzGDYvIMjxTNdamc9kt0Eg1I=";
    fetchSubmodules = true;
  };

@@ -1,11 +1,9 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f1ecfe0..9056f9d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -83,8 +83,9 @@ ExternalProject_Add(BearSource
-             -DCMAKE_MODULE_LINKER_FLAGS:STRING=${CMAKE_MODULE_LINKER_FLAGS}
-             -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+@@ -85,8 +85,9 @@
             ${CMAKE_CACHE_ARGS_EXTRA}
+         BUILD_ALWAYS
+             1
 -        TEST_BEFORE_INSTALL
 +        TEST_EXCLUDE_FROM_MAIN
             1
@@ -13,7 +11,7 @@ index f1ecfe0..9056f9d 100644
         TEST_COMMAND
             ctest # or `ctest -T memcheck`
         )
-@@ -100,7 +101,8 @@ if (ENABLE_FUNC_TESTS)
+@@ -102,7 +103,8 @@
                 -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
                 -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
                 -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
@@ -22,13 +22,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bear";
-  version = "3.1.5";
+  version = "3.1.6";

  src = fetchFromGitHub {
    owner = "rizsotto";
    repo = "bear";
    rev = finalAttrs.version;
-    hash = "sha256-pwdjytP+kmTwozRl1Gd0jUqRs3wfvcYPqiQvVwa6s9c=";
+    hash = "sha256-fWNMjqF5PCjGfFGReKIUiJ5lv8z6j7HeBn5hvbnV2V4=";
  };

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

 buildGoModule rec {
  pname = "cilium-cli";
-  version = "0.18.0";
+  version = "0.18.2";

  src = fetchFromGitHub {
    owner = "cilium";
    repo = "cilium-cli";
    tag = "v${version}";
-    hash = "sha256-jj0nHVsPrJA5y9WVXHyxsKHRxyXpdWLk6/H7GPexxO4=";
+    hash = "sha256-/R91MFE7JYutq8mOKpzLNPlt42R86dOZGJs4EOkLfKU=";
  };

  nativeBuildInputs = [ installShellFiles ];
@@ -28,11 +28,11 @@ in

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "copilot-language-server";
-  version = "1.290.0";
+  version = "1.292.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-ELOSeb3Z7AI8pjDhtUIRoaf+4UXjXKEu/OJ2CLQno6A=";
+    hash = "sha256-nWhAKf9TiAXbOkjnXPWs/FDDFFN3hp/7hWMQ4MP8cto=";
    stripRoot = false;
  };

@@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "creds";
-  version = "0.5.2";
+  version = "0.5.3";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "ihebski";
    repo = "DefaultCreds-cheat-sheet";
    tag = "creds-v${version}";
-    hash = "sha256-CtwGSF3EGcPqL49paNRCsB2qxYjKpCLqyRsC67nAyVk=";
+    hash = "sha256-nATmzEUwvJwzPZs+bO+/6ZHIrGgvjApaEwVpMyCXmik=";
  };

  pythonRelaxDeps = [ "tinydb" ];
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
    description = "Tool to search a collection of default credentials";
    mainProgram = "creds";
    homepage = "https://github.com/ihebski/DefaultCreds-cheat-sheet";
-    changelog = "https://github.com/ihebski/DefaultCreds-cheat-sheet/releases/tag/creds-${version}";
+    changelog = "https://github.com/ihebski/DefaultCreds-cheat-sheet/releases/tag/${src.tag}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
@@ -11,18 +11,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "easytier";
-  version = "2.2.2";
+  version = "2.2.4";

  src = fetchFromGitHub {
    owner = "EasyTier";
    repo = "EasyTier";
    tag = "v${version}";
-    hash = "sha256-Heb2ax2yUuGmqzIjrqjHUL3QZoofp7ATrIEN27ZA/Zs=";
+    hash = "sha256-YrWuNHpNDs1VVz6Sahi2ViPT4kcJf10UUMRWEs4Y0xc=";
  };

  useFetchCargoVendor = true;

-  cargoHash = "sha256-U2ZK9GlfTjXsA7Fjd288YDlqSZNl3vHryLG1FE/GH5c=";
+  cargoHash = "sha256-uUmF4uIhSx+byG+c4hlUuuy+O87Saw8wRJ5OGk3zaPA=";

  nativeBuildInputs = [
    protobuf
@@ -24,17 +24,17 @@ in

 rustPlatform.buildRustPackage rec {
  pname = "ff2mpv-rust";
-  version = "1.1.5";
+  version = "1.1.6";

  src = fetchFromGitHub {
    owner = "ryze312";
    repo = "ff2mpv-rust";
    rev = version;
-    hash = "sha256-hAhHfNiHzrzACrijpVkzpXqrqGYKI3HIJZtUuTrRIcQ=";
+    hash = "sha256-3ZKVa1pRorzTM6jCXak/aTq9iyDGT7fWLOcCotLYlkc=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-/OvkUyknboMaUVj1N1lTq1jx6b+MK7aFeEbaHnoP6Xg=";
+  cargoHash = "sha256-80NnJNTyMY6yPjZdkSW6qulR42+dxonMx1TBkMjnhXw=";

  postInstall = ''
    $out/bin/ff2mpv-rust manifest > manifest.json
@@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "firejail";
-  version = "0.9.72";
+  version = "0.9.74";

  src = fetchFromGitHub {
    owner = "netblue30";
    repo = "firejail";
    rev = version;
-    sha256 = "sha256-XAlb6SSyY2S1iWDaulIlghQ16OGvT/wBCog95/nxkog=";
+    sha256 = "sha256-BKEW2IWatzePGREAA479eaP6bJb1i2fRs/GZcyLinrM=";
  };

  nativeBuildInputs = [
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "gcsfuse";
-  version = "2.10.0";
+  version = "2.11.0";

  src = fetchFromGitHub {
    owner = "googlecloudplatform";
    repo = "gcsfuse";
    rev = "v${version}";
-    hash = "sha256-gKKsUihV/YiIYbdTPjOXl/SEmi7dTAncNEAnAS/42VY=";
+    hash = "sha256-TOilPoyibR6tuBeSuu+kSUE5xamurD31QJ1486rZHG0=";
  };

-  vendorHash = "sha256-/9LhIZ/KThuTI1OYfdZHfV9Ad70gw4Yii3MsE5ZVLSI=";
+  vendorHash = "sha256-Xw2XsDhQpJJq7peh015ckIvV7yG87dE+HZ2b+XwuXMY=";

  subPackages = [
    "."
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "gifski";
-  version = "1.32.0";
+  version = "1.33.0";

  src = fetchFromGitHub {
    owner = "ImageOptim";
    repo = "gifski";
    rev = version;
-    hash = "sha256-Sl8HRc5tfRcYxXsXmvZ3M+f7PU7+1jz+IKWPhWWQ/us=";
+    hash = "sha256-IjQ2PqjXhNvXknVxfphSSwQEWBuTkSxMFrbwd2trlVI=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-iWH0lXHolLpNVE/pgy1cOwiTMNRVy2JrruhQ/S4tp8M=";
+  cargoHash = "sha256-2A7SDu9f7Tf74SAD72gCQ00Ccp3r2MaPo0qjVe3nR5s=";

  nativeBuildInputs = [
    pkg-config
@@ -12,13 +12,13 @@

 rustPlatform.buildRustPackage {
  pname = "git-chain";
-  version = "0-unstable-2025-03-10";
+  version = "0-unstable-2025-03-25";

  src = fetchFromGitHub {
    owner = "dashed";
    repo = "git-chain";
-    rev = "d06b022b7bccf612fc5651c7ae119b37f69ac4ca";
-    hash = "sha256-lfiwRJSzOlWdj9BfPfb/Vnd2NtzyK7HAHhERKFYOjM8=";
+    rev = "f6a6d365e6e3cce15e74649a421044a01fb4f68f";
+    hash = "sha256-lOAURUhR2Ts1DF8yW0WnovSWeZFC8UwR6j4cxoreonY=";
  };

  useFetchCargoVendor = true;
@@ -22,5 +22,6 @@ buildGoModule rec {
    homepage = "https://github.com/segmentio/golines";
    license = licenses.mit;
    maintainers = with maintainers; [ meain ];
+    mainProgram = "golines";
  };
 }
@@ -25,17 +25,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "gossip";
-  version = "0.13.0";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "mikedilger";
    repo = "gossip";
    tag = "v${version}";
-    hash = "sha256-GhkILnt573deQU42uN4YnhzDxirEvCpsvBnp6hF06v4=";
+    hash = "sha256-nv/NMLAka62u0WzvHMEW9XBVXpg9T8bNJiUegS/oj48=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-gKyGDk64EJMSFovBLFhkOHRoWrYRERTH2O2McHe2fMM=";
+  cargoHash = "sha256-rE7SErOhl2fcmvLairq+mvdnbDIk1aPo3eYqwRx5kkA=";

  # See https://github.com/mikedilger/gossip/blob/0.9/README.md.
  RUSTFLAGS = "--cfg tokio_unstable";
@@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hwinfo";
-  version = "23.3";
+  version = "23.4";

  src = fetchFromGitHub {
    owner = "opensuse";
    repo = "hwinfo";
    rev = finalAttrs.version;
-    hash = "sha256-TOW6jD7ZTA32H4oByaVkDAjUSwo9JSID7WSBYj7ZzBs=";
+    hash = "sha256-mTkDyfdAwjJwBEp/bOYRz0zfzPSzOUEI5hp+mridZsA=";
  };

  nativeBuildInputs = [
@@ -168,16 +168,16 @@
        },
        {
            "name": "illuminate/collections",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/collections.git",
-                "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2"
+                "reference": "0094b162fa505126c1391222f27fd98734d24525"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/8dae6a0e779b07ee17066652334d36ed473ccff2",
-                "reference": "8dae6a0e779b07ee17066652334d36ed473ccff2",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/0094b162fa505126c1391222f27fd98734d24525",
+                "reference": "0094b162fa505126c1391222f27fd98734d24525",
                "shasum": ""
            },
            "require": {
@@ -220,11 +220,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-03-12T14:22:47+00:00"
+            "time": "2025-03-16T23:50:18+00:00"
        },
        {
            "name": "illuminate/conditionable",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/conditionable.git",
@@ -270,16 +270,16 @@
        },
        {
            "name": "illuminate/contracts",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/contracts.git",
-                "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56"
+                "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/6b3e6b148e814077d87a56a6f89b0e3d91e06c56",
-                "reference": "6b3e6b148e814077d87a56a6f89b0e3d91e06c56",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
+                "reference": "88962e0a73fb837e048ebdbbc67afd2f6b30e8e6",
                "shasum": ""
            },
            "require": {
@@ -314,11 +314,11 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-03-05T19:37:08+00:00"
+            "time": "2025-03-16T23:56:53+00:00"
        },
        {
            "name": "illuminate/filesystem",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/filesystem.git",
@@ -385,7 +385,7 @@
        },
        {
            "name": "illuminate/macroable",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/macroable.git",
@@ -431,16 +431,16 @@
        },
        {
            "name": "illuminate/support",
-            "version": "v12.2.0",
+            "version": "v12.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/illuminate/support.git",
-                "reference": "57e684840518d05326cc2958bca8e3790feab3eb"
+                "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/57e684840518d05326cc2958bca8e3790feab3eb",
-                "reference": "57e684840518d05326cc2958bca8e3790feab3eb",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
+                "reference": "bcba98dcdbc758261b3b872a9b9dc789aed1eb57",
                "shasum": ""
            },
            "require": {
@@ -504,7 +504,7 @@
                "issues": "https://github.com/laravel/framework/issues",
                "source": "https://github.com/laravel/framework"
            },
-            "time": "2025-03-12T14:22:47+00:00"
+            "time": "2025-03-13T14:51:35+00:00"
        },
        {
            "name": "laravel/prompts",
@@ -2233,16 +2233,16 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.8",
+            "version": "2.1.11",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f"
+                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f9adff3b87c03b12cc7e46a30a524648e497758f",
-                "reference": "f9adff3b87c03b12cc7e46a30a524648e497758f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8ca5f79a8f63c49b2359065832a654e1ec70ac30",
+                "reference": "8ca5f79a8f63c49b2359065832a654e1ec70ac30",
                "shasum": ""
            },
            "require": {
@@ -2287,7 +2287,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-03-09T09:30:48+00:00"
+            "time": "2025-03-24T13:45:00+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
  pname = "laravel";
-  version = "5.14.0";
+  version = "5.14.1";

  src = fetchFromGitHub {
    owner = "laravel";
    repo = "installer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ka8bgJA5zR5hWfqAyz/mKjZ22oL9yMpqWGdcCoy6wNQ=";
+    hash = "sha256-3DgiOybYN9G8BONK7kmyO21B5WqeY7DcHunWcT6h124=";
  };

  nativeBuildInputs = [ makeWrapper ];

  composerLock = ./composer.lock;
-  vendorHash = "sha256-KaPOPPDjiATBAOlEasb22poVMg6w0NEUnpclapuGhw0=";
+  vendorHash = "sha256-6oPbR6cpsdr2aJWjJvLWVD1NfuZF38sUMJEdBAjl/aA=";

  # Adding npm (nodejs) and php composer to path
  postInstall = ''
@@ -1,7 +1,10 @@
 {
+  stdenv,
  lib,
  buildGoModule,
+  buildPackages,
  fetchFromGitHub,
+  installShellFiles,
  nix-update-script,
 }:
 let
@@ -22,6 +25,10 @@ buildGoModule {

  vendorHash = "sha256-ofJYarmnOHONu2lZ76GvSua0ViP1gr6968xAuQ/VRNk=";

+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
  modRoot = "go/cli/mcap";

  env.GOWORK = "off";
@@ -39,6 +46,17 @@ buildGoModule {
    "-skip=TestCat|TestInfo"
  ];

+  postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    ''
+      installShellCompletion --cmd mcap \
+        --bash <(${emulator} $out/bin/mcap completion bash) \
+        --fish <(${emulator} $out/bin/mcap completion fish) \
+        --zsh <(${emulator} $out/bin/mcap completion zsh)
+    ''
+  );
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
  pname = "mpls";
-  version = "0.12.1";
+  version = "0.13.2";

  src = fetchFromGitHub {
    owner = "mhersson";
    repo = "mpls";
    tag = "v${version}";
-    hash = "sha256-Cipxs3wlnus2GE9ZLE4mkSDM0WHdJPL4FxFt5adSPY4=";
+    hash = "sha256-jcSi/ZdHP9kJRUaMkQdS6BuScp2GM4+iNGIoclYMljI=";
  };

-  vendorHash = "sha256-6iXZWLCF0LfchcGSFrCtILLeR1Yx7oxD/7JIYyrrkHM=";
+  vendorHash = "sha256-xILlYrwcnMWAPACeELwVKGUBIK9QbrUSR03xVmNXsnE=";

  ldflags = [
    "-s"
@@ -18,13 +18,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "mympd";
-  version = "20.1.0";
+  version = "20.1.1";

  src = fetchFromGitHub {
    owner = "jcorporation";
    repo = "myMPD";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ejr4CURnsOamvlhNzz+1ZPHKWsGrwfEaxiDip/OCwLw=";
+    sha256 = "sha256-A78dT/BervM4rlVlbEYojNsG7wvESvKsm9nYjI9svb4=";
  };

  nativeBuildInputs = [
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  clangStdenv,
  llvmPackages,
  fetchFromGitHub,
@@ -124,9 +125,20 @@ clangStdenv.mkDerivation rec {
    # IPO
    "-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld"
    "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON"
+
+    # The sources enable this for only apple. We turn it off globally anyway to stay
+    # consistent.
+    "-DUSE_QT6=OFF"
  ];

-  doCheck = true;
+  # tests rely on sysprof which is not available on darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/Applications
+    mv $out/bin/*.app $out/Applications
+    rmdir $out/bin
+  '';

  nativeCheckInputs = [
    mesa.llvmpipeHook
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "opkssh";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "openpubkey";
+    repo = "opkssh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RtTo/wj4v+jtJ4xZJD0YunKtxT7zZ1esgJOSEtxnLOg=";
+  };
+
+  ldflags = [ "-X main.Version=${finalAttrs.version}" ];
+
+  vendorHash = "sha256-MK7lEBKMVZv4jbYY2Vf0zYjw7YV+13tB0HkO3tCqzEI=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/openpubkey/opkssh";
+    description = "Integrating SSO with SSH - short-lived SSH keys with an OpenID provider";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.johnrichardrinehart ];
+    mainProgram = "opkssh";
+  };
+})
@@ -1,31 +0,0 @@
-diff -burN InsightToolkit-4.10.0.orig/CMake/FindFFTW.cmake InsightToolkit-4.10.0/CMake/FindFFTW.cmake
--- InsightToolkit-4.10.0.orig/CMake/FindFFTW.cmake	2016-06-16 14:21:15.226203872 +0200
-+++ InsightToolkit-4.10.0/CMake/FindFFTW.cmake	2016-06-16 14:23:48.966202670 +0200
-@@ -35,14 +35,12 @@
-   set(FFTW_LIB_SEARCHPATH
-     ${FFTW_INSTALL_BASE_PATH}/lib
-     ${FFTW_INSTALL_BASE_PATH}/lib64
-    /usr/lib/fftw
-    /usr/local/lib/fftw
-   )
- 
-   if(ITK_USE_FFTWD)
-     mark_as_advanced(FFTWD_LIB)
-    find_library(FFTWD_LIB fftw3 ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib
-    find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH}) #Double Precision Lib only if compiled with threads support
-+    find_library(FFTWD_LIB fftw3 ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib
-+    find_library(FFTWD_THREADS_LIB fftw3_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Double Precision Lib only if compiled with threads support
- 
-     if(FFTWD_LIB)
-       set(FFTWD_FOUND 1)
-@@ -55,8 +53,8 @@
- 
-   if(ITK_USE_FFTWF)
-     mark_as_advanced(FFTWF_LIB)
-    find_library(FFTWF_LIB fftw3f ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib
-    find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH}) #Single Precision Lib only if compiled with threads support
-+    find_library(FFTWF_LIB fftw3f ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib
-+    find_library(FFTWF_THREADS_LIB fftw3f_threads ${FFTW_LIB_SEARCHPATH} NO_DEFAULT_PATH) #Single Precision Lib only if compiled with threads support
- 
-     if(FFTWF_LIB)
-       set(FFTWF_FOUND 1)
@@ -1,35 +0,0 @@
-diff -burN InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/CMakeLists.txt
--- InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt	2017-08-22 11:53:55.960938649 +0200
-+++ InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/CMakeLists.txt	2017-08-22 11:56:07.289820954 +0200
-@@ -18,10 +18,14 @@
- # Retrive the variable type to CACHE.
- set(BUILD_EXAMPLES ${BUILD_EXAMPLES} CACHE BOOL "Build the examples from the ITK Software Guide." FORCE)
- 
-foreach(lib itkvcl itkv3p_netlib itktestlib itkvnl itkvnl_algo itknetlib)
-+foreach(lib itkvcl itkv3p_netlib itkvnl itkvnl_algo itknetlib)
-   itk_module_target(${lib} NO_INSTALL)
- endforeach()
- 
-+if(BUILD_TESTING)
-+  itk_module_target(itktestlib NO_INSTALL)
-+endif()
-+
- foreach(exe
-     netlib_integral_test
-     netlib_lbfgs_example
-diff -burN InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt
--- InsightToolkit-4.12.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt	2017-08-22 11:53:55.960938649 +0200
-+++ InsightToolkit-4.12.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt	2017-08-22 11:56:56.410150930 +0200
-@@ -131,8 +131,10 @@
-   set(CORE_VIDEO_FOUND OFF CACHE INTERNAL "VXL core video libraries built")
- endif ()
- 
-# common test executable
-add_subdirectory(testlib)
-+# common test executable if testing enabled
-+if(BUILD_TESTING)
-+  add_subdirectory(testlib)
-+endif()
- 
- # Tests that check and output the vxl configuration
- # NOTE: some external projects remove the tests directory (aka ITK)
@@ -1,104 +0,0 @@
--- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
-@@ -43,85 +43,7 @@
- #endif
- 
- #if defined(__GNUC__) && !defined(__ICC) // icc 8.0 defines __GNUC__
-# define VCL_GCC
-# if (__GNUC__ < 4)
-#  error "forget it."
-# elif (__GNUC__==4)
-#  define VCL_GCC_4
-#  if (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_41
-#  else
-#   define VCL_GCC_40
-#  endif
-# elif (__GNUC__==5)
-#  define VCL_GCC_5
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_53
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_52
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_51
-#  else
-#   define VCL_GCC_50
-#  endif
-# elif (__GNUC__==6)
-#  define VCL_GCC_6
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_63
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_62
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_61
-#  else
-#   define VCL_GCC_60
-#  endif
-# elif (__GNUC__==7)
-#  define VCL_GCC_7
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_73
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_72
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_71
-#  else
-#   define VCL_GCC_70
-#  endif
-# elif (__GNUC__==8)
-#  define VCL_GCC_8
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_83
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_82
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_81
-#  else
-#   define VCL_GCC_80
-#  endif
-# elif (__GNUC__==9)
-#  define VCL_GCC_9
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_93
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_92
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_91
-#  else
-#   define VCL_GCC_90
-#  endif
-# elif (__GNUC__==10)
-#  define VCL_GCC_10
-#  if (__GNUC_MINOR__ > 2 )
-#   define VCL_GCC_103
-#  elif (__GNUC_MINOR__ > 1 )
-#   define VCL_GCC_102
-#  elif (__GNUC_MINOR__ > 0 )
-#   define VCL_GCC_101
-#  else
-#   define VCL_GCC_100
-#  endif
-# else
-#  error "Dunno about this gcc"
-# endif
-+# define VCL_GCC_73
- #endif
- 
- #if defined(_WIN32) || defined(WIN32)
--- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-+++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
-@@ -64,6 +64,12 @@
-   ++minor_count;
- #endif
- 
-+#ifdef VCL_GCC_73
-+  ++compiler_count;
-+  ++major_count;
-+  ++minor_count;
-+#endif
-+
- #ifdef VCL_VC
-   ++compiler_count;
- #endif
@@ -1,147 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  expat,
-  fftw,
-  fftwFloat,
-  hdf5-cpp,
-  libjpeg,
-  libtiff,
-  libpng,
-  libuuid,
-  xz,
-  vtk,
-  zlib,
-}:
-# this ITK version is old and is only required for OTB package
-# https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_itk.cmake?ref_type=heads#L149
-stdenv.mkDerivation (finalAttrs: {
-  pname = "itk";
-  version = "4.13.3";
-
-  src = fetchFromGitHub {
-    owner = "InsightSoftwareConsortium";
-    repo = "ITK";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-lcoJ+H+nVlvleBqbmupu+yg+4iZQ4mTs9pt1mQac+xg=";
-  };
-
-  # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/tree/develop/SuperBuild/patches/ITK?ref_type=heads
-  patches = [
-    ./itk-1-fftw-all.diff
-    ./itk-2-itktestlib-all.diff
-    ./itk-3-remove-gcc-version-debian-medteam-all.diff
-  ];
-
-  # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_itk.cmake?ref_type=heads
-  cmakeFlags = [
-    "-DBUILD_TESTING=OFF"
-    "-DBUILD_EXAMPLES=OFF"
-    "-DBUILD_SHARED_LIBS=ON"
-    "-DITK_BUILD_DEFAULT_MODULES=OFF"
-    "-DITKGroup_Core=OFF"
-    "-DITK_FORBID_DOWNLOADS=ON"
-    "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, libjpeg, zlib etc
-    "-DModule_ITKCommon=ON"
-    "-DModule_ITKFiniteDifference=ON"
-    "-DModule_ITKGPUCommon=ON"
-    "-DModule_ITKGPUFiniteDifference=ON"
-    "-DModule_ITKImageAdaptors=ON"
-    "-DModule_ITKImageFunction=ON"
-    "-DModule_ITKMesh=ON"
-    "-DModule_ITKQuadEdgeMesh=ON"
-    "-DModule_ITKSpatialObjects=ON"
-    "-DModule_ITKTransform=ON"
-    "-DModule_ITKTransformFactory=ON"
-    "-DModule_ITKIOTransformBase=ON"
-    "-DModule_ITKIOTransformInsightLegacy=ON"
-    "-DModule_ITKIOTransformMatlab=ON"
-    "-DModule_ITKAnisotropicSmoothing=ON"
-    "-DModule_ITKAntiAlias=ON"
-    "-DModule_ITKBiasCorrection=ON"
-    "-DModule_ITKBinaryMathematicalMorphology=ON"
-    "-DModule_ITKColormap=ON"
-    "-DModule_ITKConvolution=ON"
-    "-DModule_ITKCurvatureFlow=ON"
-    "-DModule_ITKDeconvolution=ON"
-    "-DModule_ITKDenoising=ON"
-    "-DModule_ITKDisplacementField=ON"
-    "-DModule_ITKDistanceMap=ON"
-    "-DModule_ITKFastMarching=ON"
-    "-DModule_ITKFFT=ON"
-    "-DModule_ITKGPUAnisotropicSmoothing=ON"
-    "-DModule_ITKGPUImageFilterBase=ON"
-    "-DModule_ITKGPUSmoothing=ON"
-    "-DModule_ITKGPUThresholding=ON"
-    "-DModule_ITKImageCompare=ON"
-    "-DModule_ITKImageCompose=ON"
-    "-DModule_ITKImageFeature=ON"
-    "-DModule_ITKImageFilterBase=ON"
-    "-DModule_ITKImageFusion=ON"
-    "-DModule_ITKImageGradient=ON"
-    "-DModule_ITKImageGrid=ON"
-    "-DModule_ITKImageIntensity=ON"
-    "-DModule_ITKImageLabel=ON"
-    "-DModule_ITKImageSources=ON"
-    "-DModule_ITKImageStatistics=ON"
-    "-DModule_ITKLabelMap=ON"
-    "-DModule_ITKMathematicalMorphology=ON"
-    "-DModule_ITKPath=ON"
-    "-DModule_ITKQuadEdgeMeshFiltering=ON"
-    "-DModule_ITKSmoothing=ON"
-    "-DModule_ITKSpatialFunction=ON"
-    "-DModule_ITKThresholding=ON"
-    "-DModule_ITKEigen=ON"
-    "-DModule_ITKNarrowBand=ON"
-    "-DModule_ITKNeuralNetworks=ON"
-    "-DModule_ITKOptimizers=ON"
-    "-DModule_ITKOptimizersv4=ON"
-    "-DModule_ITKPolynomials=ON"
-    "-DModule_ITKStatistics=ON"
-    "-DModule_ITKRegistrationCommon=ON"
-    "-DModule_ITKGPURegistrationCommon=ON"
-    "-DModule_ITKGPUPDEDeformableRegistration=ON"
-    "-DModule_ITKMetricsv4=ON"
-    "-DModule_ITKPDEDeformableRegistration=ON"
-    "-DModule_ITKRegistrationMethodsv4=ON"
-    "-DModule_ITKClassifiers=ON"
-    "-DModule_ITKConnectedComponents=ON"
-    "-DModule_ITKDeformableMesh=ON"
-    "-DModule_ITKKLMRegionGrowing=ON"
-    "-DModule_ITKLabelVoting=ON"
-    "-DModule_ITKLevelSets=ON"
-    "-DModule_ITKLevelSetsv4=ON"
-    "-DModule_ITKMarkovRandomFieldsClassifiers=ON"
-    "-DModule_ITKRegionGrowing=ON"
-    "-DModule_ITKSignedDistanceFunction=ON"
-    "-DModule_ITKVoronoi=ON"
-    "-DModule_ITKWatersheds=ON"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    xz
-  ];
-  buildInputs = [ libuuid ];
-  propagatedBuildInputs = [
-    # similar to 5.2.x, we propagate these inputs for OTB
-    expat
-    fftw
-    fftwFloat
-    hdf5-cpp
-    libjpeg
-    libpng
-    libtiff
-    zlib
-  ];
-
-  meta = {
-    description = "Insight Segmentation and Registration Toolkit";
-    homepage = "https://www.itk.org";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ daspk04 ];
-    platforms = with lib.platforms; linux;
-  };
-})
@@ -36,14 +36,14 @@

 let
  pname = "pulsar";
-  version = "1.126.0";
+  version = "1.127.0";

  sourcesPath =
    {
      x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz";
-      x86_64-linux.hash = "sha256-6GY7zYLdMVIbeMaGHrRY+J74rXsnds2NN2jJBqohsEs=";
+      x86_64-linux.hash = "sha256-w6529KJ6XywWb2gHyiBv9/VFu2SV7Cyq1cTzjXLbgm0=";
      aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz";
-      aarch64-linux.hash = "sha256-0Y8i+gTMIk8y7qg7Qxp52tnn+e55psUtXE2mCE7K7Fg=";
+      aarch64-linux.hash = "sha256-IniDEKFGRcKzlDlPI6s2ozsk/YfPIBeG8x6f62g5PSI=";
    }
    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

@@ -13,16 +13,16 @@

 buildGoModule rec {
  pname = "runme";
-  version = "3.12.2";
+  version = "3.12.6";

  src = fetchFromGitHub {
    owner = "stateful";
    repo = "runme";
    rev = "v${version}";
-    hash = "sha256-5ctJ9DiklN5qRIqWi9xsE0OXmF0a8p87eopnyBkCQG0=";
+    hash = "sha256-iLN+NXJf0qXllOdKygSRSZ6rxLLJj35YaCAbICh2UJo=";
  };

-  vendorHash = "sha256-I+F6MVH7YIiraUcBg0rOkPzcPh2nCmg0ZJ0g5DdjP3k=";
+  vendorHash = "sha256-UNeyzWrTZscF3DsItpnFBK8MZ2j2tmRBFqr6cv89YrU=";

  nativeBuildInputs = [
    installShellFiles
@@ -11,13 +11,13 @@
 let
  self = buildGoModule rec {
    pname = "sblast";
-    version = "0.7.0";
+    version = "0.7.2";

    src = fetchFromGitHub {
      owner = "ugjka";
      repo = "sblast";
      rev = "v${version}";
-      hash = "sha256-+ZeZ2lohAngfljCa/z9yjCKvQwCMEiwzzPFrpAU8lWA=";
+      hash = "sha256-ICSnLfzBoaax3YKa4LiTBQ4zxgDxttxcN4YVLApFH24=";
    };

    vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s=";
@@ -50,8 +50,7 @@ let
    meta = {
      description = "Blast your Linux audio to DLNA receivers";
      homepage = "https://github.com/ugjka/sblast";
-      # license is "MIT+NoAI": <https://github.com/ugjka/sblast/blob/main/LICENSE>
-      license = lib.licenses.unfree;
+      license = lib.licenses.mit;
      mainProgram = "sblast";
      maintainers = with lib.maintainers; [ colinsane ];
      platforms = lib.platforms.linux;
@@ -5,16 +5,16 @@
 }:
 buildNpmPackage rec {
  pname = "stylelint";
-  version = "16.16.0";
+  version = "16.17.0";

  src = fetchFromGitHub {
    owner = "stylelint";
    repo = "stylelint";
    tag = version;
-    hash = "sha256-us1JdC33dxbXZr24OhpLFwGSUWwxDyhWZLYkg28GxZI=";
+    hash = "sha256-oCNgBS9yTOCrqI/35KWgim1cW62+91xwAMpWORUQVAQ=";
  };

-  npmDepsHash = "sha256-3TwOftl5nUzarZZL9mGYpWRPscqZMi2wMuB0gEOZhdI=";
+  npmDepsHash = "sha256-JZT7PXbEd7jSx0WGPLh0GtUthkMfgHR17c451k515Rc=";

  dontNpmBuild = true;

@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "subxt";
-  version = "0.40.0";
+  version = "0.41.0";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "subxt";
    rev = "v${version}";
-    hash = "sha256-U9gErJP+aex5vT3yy4kNad0/0ofdVtrN03tITVIEgzw=";
+    hash = "sha256-zg2MraqKLbyhaxTi02rE4MsMuPw4diIseYNUQEoqnVA=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-W1S6CPhfGvfQmlzLDiCxeWZoepNlClTmHOfJNo3f8oQ=";
+  cargoHash = "sha256-leJp+Ccb2mij46Cx6+pv7GoHLKG5IVlNeih0L2QQp4w=";

  # Only build the command line client
  cargoBuildFlags = [ "--bin" "subxt" ];
@@ -1,12 +1,12 @@
 {
  "name": "svelte-language-server",
-  "version": "0.17.10",
+  "version": "0.17.11",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "svelte-language-server",
-      "version": "0.17.10",
+      "version": "0.17.11",
      "license": "MIT",
      "dependencies": {
        "@jridgewell/trace-mapping": "^0.3.25",
@@ -19,11 +19,11 @@
        "prettier": "~3.3.3",
        "prettier-plugin-svelte": "^3.3.0",
        "svelte": "^4.2.19",
-        "svelte2tsx": "~0.7.25",
-        "typescript": "^5.7.2",
+        "svelte2tsx": "~0.7.35",
+        "typescript": "^5.8.2",
        "typescript-auto-import-cache": "^0.3.5",
-        "vscode-css-languageservice": "~6.3.0",
-        "vscode-html-languageservice": "~5.3.0",
+        "vscode-css-languageservice": "~6.3.2",
+        "vscode-html-languageservice": "~5.3.2",
        "vscode-languageserver": "9.0.1",
        "vscode-languageserver-protocol": "3.17.5",
        "vscode-languageserver-types": "3.17.5",
@@ -239,9 +239,9 @@
      "license": "MIT"
    },
    "node_modules/@types/lodash": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz",
-      "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==",
+      "version": "4.17.16",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",
      "dev": true,
      "license": "MIT"
    },
@@ -253,9 +253,9 @@
      "license": "MIT"
    },
    "node_modules/@types/node": {
-      "version": "18.19.70",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.70.tgz",
-      "integrity": "sha512-RE+K0+KZoEpDUbGGctnGdkrLFwi1eYKTlIHNl2Um98mUkGsm1u2Ff6Ltd0e8DktTtC98uy7rSj+hO8t/QuLoVQ==",
+      "version": "18.19.80",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.80.tgz",
+      "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -303,9 +303,9 @@
      "license": "MIT"
    },
    "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
      "license": "MIT",
      "bin": {
        "acorn": "bin/acorn"
@@ -746,9 +746,9 @@
      "license": "MIT"
    },
    "node_modules/fdir": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.2.tgz",
-      "integrity": "sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==",
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
      "license": "MIT",
      "peerDependencies": {
        "picomatch": "^3 || ^4"
@@ -1093,6 +1093,7 @@
      "version": "4.4.2",
      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
      "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==",
+      "deprecated": "This package is deprecated. Use the optional chaining (?.) operator instead.",
      "dev": true,
      "license": "MIT"
    },
@@ -1460,9 +1461,9 @@
      }
    },
    "node_modules/prettier-plugin-svelte": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.2.tgz",
-      "integrity": "sha512-kRPjH8wSj2iu+dO+XaUv4vD8qr5mdDmlak3IT/7AOgGIMRG86z/EHOLauFcClKEnOUf4A4nOA7sre5KrJD4Raw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.3.3.tgz",
+      "integrity": "sha512-yViK9zqQ+H2qZD1w/bH7W8i+bVfKrD8GIFjkFe4Thl6kCT9SlAsXVNmt3jCvQOCsnOhcvYgsoVlRV/Eu6x5nNw==",
      "license": "MIT",
      "peerDependencies": {
        "prettier": "^3.0.0",
@@ -1480,9 +1481,9 @@
      }
    },
    "node_modules/readdirp": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.1.tgz",
-      "integrity": "sha512-h80JrZu/MHUZCyHu5ciuoI0+WxsCxzxJTILn6Fs8rxSnFPh+UVHYfeIxK1nVGugMqkfC4vJcBOYbkfkwYK0+gw==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
      "license": "MIT",
      "engines": {
        "node": ">= 14.18.0"
@@ -1524,9 +1525,9 @@
      "license": "MIT"
    },
    "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
@@ -1708,9 +1709,9 @@
      }
    },
    "node_modules/svelte2tsx": {
-      "version": "0.7.34",
-      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.34.tgz",
-      "integrity": "sha512-WTMhpNhFf8/h3SMtR5dkdSy2qfveomkhYei/QW9gSPccb0/b82tjHvLop6vT303ZkGswU/da1s6XvrLgthQPCw==",
+      "version": "0.7.35",
+      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.35.tgz",
+      "integrity": "sha512-z2lnOnrfb5nrlRfFQI8Qdz03xQqMHUfPj0j8l/fQuydrH89cCeN+v9jgDwK9GyMtdTRUkE7Neu9Gh+vfXJAfuQ==",
      "license": "MIT",
      "dependencies": {
        "dedent-js": "^1.0.1",
@@ -1805,9 +1806,9 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
+      "version": "5.8.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.2.tgz",
+      "integrity": "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==",
      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
@@ -1853,9 +1854,9 @@
      }
    },
    "node_modules/vscode-html-languageservice": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.1.tgz",
-      "integrity": "sha512-ysUh4hFeW/WOWz/TO9gm08xigiSsV/FOAZ+DolgJfeLftna54YdmZ4A+lIn46RbdO3/Qv5QHTn1ZGqmrXQhZyA==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.2.tgz",
+      "integrity": "sha512-3MgFQqVG+iQVNG7QI/slaoL7lJpne0nssX082kjUF1yn/YJa8BWCLeCJjM0YpTlp8A7JT1+J22mk4qSPx3NjSQ==",
      "license": "MIT",
      "dependencies": {
        "@vscode/l10n": "^0.0.18",
@@ -4,7 +4,7 @@
  fetchurl,
 }:
 let
-  version = "0.17.10";
+  version = "0.17.11";
 in
 buildNpmPackage {
  pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {

  src = fetchurl {
    url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
-    hash = "sha256-KGsiYv57EnY5Atynuv1Qk0i/vq07FCbHuI9OOkyxOvE=";
+    hash = "sha256-rmyn0DjYa+DWQt6Qw8aIW0BnceIv5ZGi7VQXBBXRAHY=";
  };

-  npmDepsHash = "sha256-Gph0papxZnN0BKbzhwyOeNQwtYI1QkWupG6RRaUiv8U=";
+  npmDepsHash = "sha256-tc4AGUNKNUict31kDdx6LLbHZSYURZrHJK7d/wgfz54=";

  postPatch = ''
    ln -s ${./package-lock.json} package-lock.json
@@ -0,0 +1,24 @@
+{
+  python3Packages,
+  writeShellApplication,
+  withSwhPythonPackages ? [
+    python3Packages.swh-auth
+    python3Packages.swh-model
+    python3Packages.swh-scanner
+    python3Packages.swh-web-client
+  ],
+}:
+
+let
+  python3' = python3Packages.python.withPackages (ps: with ps; [ swh-core ] ++ withSwhPythonPackages);
+in
+writeShellApplication {
+  name = "swh";
+  text = ''
+    ${python3'}/bin/swh "$@"
+  '';
+  meta = {
+    inherit (python3Packages.swh-core.meta) license mainProgram platforms;
+    description = "Software Heritage command-line client";
+  };
+}
@@ -9,12 +9,12 @@
 let
  generator = pkgsBuildBuild.buildGoModule rec {
    pname = "v2ray-domain-list-community";
-    version = "20250312064659";
+    version = "20250326132209";
    src = fetchFromGitHub {
      owner = "v2fly";
      repo = "domain-list-community";
      rev = version;
-      hash = "sha256-/TvS+Q9o6RfWBW8tr5RlrkrpUKVZQkwkMfCPpo2Nf04=";
+      hash = "sha256-oxL9XgaTdMISdCQ37gAz4LtgV1bk09GirTtVbSOm8Z4=";
    };
    vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
    meta = with lib; {
@@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "terminology";
-  version = "1.13.0";
+  version = "1.14.0";

  src = fetchurl {
    url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "FqN/7Ne71j7J3j7GwK8zHO531t/ag4obFXPW8phHTaU=";
+    sha256 = "81QFcFGwXP+2meM4NqETXbHU7Yv5VPm1fcDpO8MHUU0=";
  };

  nativeBuildInputs = [
@@ -16,11 +16,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "abcl";
-  version = "1.9.2";
+  version = "1.9.3";

  src = fetchurl {
    url = "https://common-lisp.net/project/armedbear/releases/${finalAttrs.version}/abcl-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Ti9Lj4Xi2V2V5b282foXrWExoX4vzxK8Gf+5e0i8HTg=";
+    hash = "sha256-uwShIj06mGCS4BD/2tE69QQp1VwagYdL8wIvlDa/sv8=";
  };

  # note for the future:
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-wHJlCmaE8titkfcWb2WboqemekPBn3JWc4bGyWskmoY=",
+  "hash": "sha256-Vc1+8xnKmNQkCzeHoW8Y2WuxU7G5IAfRYXMp8JrjFuQ=",
  "owner": "openjdk",
  "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.13+11"
+  "rev": "refs/tags/jdk-17.0.14+7"
 }
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-48DyJXD7D28LFa+4ONeMgSddqrCLn6FLwEGWGeP4upM=",
+  "hash": "sha256-y+YFPDSkPopIi0++rTwf2fsehzBdW1eR3tEWGGV5Yqk=",
  "owner": "openjdk",
  "repo": "jdk8u",
-  "rev": "refs/tags/jdk8u432-b06"
+  "rev": "refs/tags/jdk8u442-b06"
 }
@@ -306,6 +306,7 @@ filterAndCreateOverrides {
      qt5 ? null,
      qt6 ? null,
      rdma-core,
+      stdenv,
    }:
    prevAttrs:
    let
@@ -318,6 +319,12 @@ filterAndCreateOverrides {
        else
          lib.getLib qt.qtwayland;
      inherit (qt) wrapQtAppsHook qtwebview;
+      archDir =
+        {
+          aarch64-linux = "linux-desktop-t210-a64";
+          x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
+        }
+        .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
    in
    {
      nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ wrapQtAppsHook ];
@@ -328,16 +335,22 @@ filterAndCreateOverrides {
        rdma-core
      ];
      dontWrapQtApps = true;
+      preInstall = ''
+        rm -rf host/${archDir}/Mesa/
+      '';
      postInstall = ''
        moveToOutput 'ncu' "''${!outputBin}/bin"
        moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-        moveToOutput 'host/*' "''${!outputBin}/bin"
-        moveToOutput 'target/*' "''${!outputBin}/bin"
-        wrapQtApp "''${!outputBin}/bin/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin"
+        moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+        moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+        wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
+      '';
+      preFixup = ''
+        # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+        patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
      '';
      autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps ++ [
        "libnvidia-ml.so.1"
-        "libtiff.so.5"
      ];
      brokenConditions = prevAttrs.brokenConditions // {
        "Qt 5 missing (<2022.2.0)" = !(versionOlder version "2022.2.0" -> qt5 != null);
@@ -358,6 +371,7 @@ filterAndCreateOverrides {
      qt5 ? null,
      qt6 ? null,
      rdma-core,
+      stdenv,
      ucx,
      wayland,
      xorg,
@@ -373,19 +387,31 @@ filterAndCreateOverrides {
        else
          lib.getLib qt.qtwayland;
      qtWaylandPlugins = "${qtwayland}/${qt.qtbase.qtPluginPrefix}";
+      hostDir =
+        {
+          aarch64-linux = "host-linux-armv8";
+          x86_64-linux = "host-linux-x64";
+        }
+        .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+      targetDir =
+        {
+          aarch64-linux = "target-linux-sbsa-armv8";
+          x86_64-linux = "target-linux-x64";
+        }
+        .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+      versionString = with lib.versions; "${majorMinor version}.${patch version}";
    in
    {
      # An ad hoc replacement for
      # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
      env.rmPatterns = toString [
-        "nsight-systems/*/*/lib{arrow,jpeg}*"
-        "nsight-systems/*/*/lib{ssl,ssh,crypto}*"
-        "nsight-systems/*/*/libboost*"
-        "nsight-systems/*/*/libexec"
-        "nsight-systems/*/*/libstdc*"
-        "nsight-systems/*/*/libgbm"
-        "nsight-systems/*/*/python/bin/python"
-        "nsight-systems/*/*/Mesa"
+        "nsight-systems/${versionString}/${hostDir}/lib{arrow,jpeg}*"
+        "nsight-systems/${versionString}/${hostDir}/lib{ssl,ssh,crypto}*"
+        "nsight-systems/${versionString}/${hostDir}/libboost*"
+        "nsight-systems/${versionString}/${hostDir}/libexec"
+        "nsight-systems/${versionString}/${hostDir}/libstdc*"
+        "nsight-systems/${versionString}/${hostDir}/python/bin/python"
+        "nsight-systems/${versionString}/${hostDir}/Mesa"
      ];
      postPatch =
        prevAttrs.postPatch or ""
@@ -427,21 +453,22 @@ filterAndCreateOverrides {
      postInstall =
        # 1. Move dependencies of nsys, nsys-ui binaries to bin output
        # 2. Fix paths in wrapper scripts
-        let
-          versionString = with lib.versions; "${majorMinor version}.${patch version}";
-        in
        ''
-          moveToOutput 'nsight-systems/${versionString}/host-linux-*' "''${!outputBin}"
-          moveToOutput 'nsight-systems/${versionString}/target-linux-*' "''${!outputBin}"
+          moveToOutput 'nsight-systems/${versionString}/${hostDir}' "''${!outputBin}"
+          moveToOutput 'nsight-systems/${versionString}/${targetDir}' "''${!outputBin}"
          moveToOutput 'nsight-systems/${versionString}/bin' "''${!outputBin}"
          substituteInPlace $bin/bin/nsys $bin/bin/nsys-ui \
            --replace-fail 'nsight-systems-#VERSION_RSPLIT#' nsight-systems/${versionString}
-          wrapQtApp "$bin/nsight-systems/${versionString}/host-linux-x64/nsys-ui.bin"
+          wrapQtApp "$bin/nsight-systems/${versionString}/${hostDir}/nsys-ui.bin"
        '';

+      preFixup = ''
+        # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+        patchelf --replace-needed libtiff.so.5 libtiff.so $bin/nsight-systems/${versionString}/${hostDir}/Plugins/imageformats/libqtiff.so
+      '';
+
      autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps ++ [
        "libnvidia-ml.so.1"
-        "libtiff.so.5"
      ];

      brokenConditions = prevAttrs.brokenConditions // {
@@ -579,14 +579,14 @@ buildLuarocksPackage {
 fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "fzf-lua";
-  version = "0.0.1783-1";
+  version = "0.0.1798-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/fzf-lua-0.0.1783-1.rockspec";
-    sha256 = "1br2cx5h07hcsyq15fizv8nd0indg194yv5qpsii6n8daw95q7ak";
+    url    = "mirror://luarocks/fzf-lua-0.0.1798-1.rockspec";
+    sha256 = "0y3j54nx6mzw0z04c9n2fnsdpw3c0rixs5v6iixfmp26v84aff0n";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/ibhagwan/fzf-lua/archive/15d5cd9a74da7f8739030a5c411c046c70f66a60.zip";
-    sha256 = "1i761ndiydma9fcpc8xd4br5cy0g8vx043bs6h0h7563bs6r7ss1";
+    url    = "https://github.com/ibhagwan/fzf-lua/archive/ac6a34ea39831ec71c14f72075facf377ea9a00d.zip";
+    sha256 = "0abygsdgvbmaabb93yk66zcg5650qy8zjvhjdqliavq0iipg3hqd";
  };

  disabled = luaOlder "5.1";
@@ -2590,14 +2590,14 @@ buildLuarocksPackage {
 lze = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "lze";
-  version = "0.9.1-1";
+  version = "0.10.0-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lze-0.9.1-1.rockspec";
-    sha256 = "1w4pdacfnfwi94gmrhd13xp81bx14ggxixc1h95h47hcv5cf27p9";
+    url    = "mirror://luarocks/lze-0.10.0-1.rockspec";
+    sha256 = "107micilys1nxg1dpqzabfvxbzly4mfhyc9xjkkfnsyxjvqjhd28";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/BirdeeHub/lze/archive/v0.9.1.zip";
-    sha256 = "1zs79rjkayfm45gdgfw8r2962apl2cr8vyq7h51cffrljldhkb58";
+    url    = "https://github.com/BirdeeHub/lze/archive/v0.10.0.zip";
+    sha256 = "186mhaal7cmlxdgqqgvgvqjlw30f4w7vrzx7y2l9vzmgw4ilvrj8";
  };

  disabled = luaOlder "5.1";
@@ -3022,21 +3022,20 @@ buildLuarocksPackage {
  };
 }) {};

-orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:
+orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "orgmode";
-  version = "0.5.2-1";
+  version = "0.5.3-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/orgmode-0.5.2-1.rockspec";
-    sha256 = "0ljb27lc1w3464l7fnyn051zvi9nzbxzq8qnx83i135r5jl7ls3d";
+    url    = "mirror://luarocks/orgmode-0.5.3-1.rockspec";
+    sha256 = "1fz8jwh5an22q47p18n15wv1idmgc46riik60d6l26ar2cfsj66n";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-orgmode/orgmode/archive/0.5.2.zip";
-    sha256 = "0f66nfl8agnk9765p79xr0b2qvyqx8z46rzcf0y349q8fs681kp6";
+    url    = "https://github.com/nvim-orgmode/orgmode/archive/0.5.3.zip";
+    sha256 = "1gifyysdd35shjfi5m8z8avxyp92sk34zy2j7476pjdvhp31c50b";
  };

  disabled = luaOlder "5.1";
-  propagatedBuildInputs = [ tree-sitter-orgmode ];

  meta = {
    homepage = "https://nvim-orgmode.github.io";
@@ -3331,14 +3330,14 @@ buildLuarocksPackage {
 rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "rustaceanvim";
-  version = "5.25.0-1";
+  version = "5.25.2-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/rustaceanvim-5.25.0-1.rockspec";
-    sha256 = "178vb8dqbsswa1vy0bcisxyijhdvd2bq7f7hqkl7wvxvf250k4lp";
+    url    = "mirror://luarocks/rustaceanvim-5.25.2-1.rockspec";
+    sha256 = "1glb681sb7vhjnrkhqxh1m7im2dwcjnv320h89rxqz3d2fjw9dvf";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/mrcjkb/rustaceanvim/archive/v5.25.0.zip";
-    sha256 = "0r2z5givkkxqswbk5wpqmhm04gn6gjlv7jdrgm5ddz1gn8vvkgci";
+    url    = "https://github.com/mrcjkb/rustaceanvim/archive/v5.25.2.zip";
+    sha256 = "1gl4i8pbmia78srxcsi131vxby5d8w9mn0ydzl3r0v7pawyvwr9q";
  };

  disabled = luaOlder "5.1";
@@ -3734,16 +3733,16 @@ buildLuarocksPackage {
 vusted = callPackage({ buildLuarocksPackage, busted, fetchFromGitHub, fetchurl, luasystem }:
 buildLuarocksPackage {
  pname = "vusted";
-  version = "2.5.2-1";
+  version = "2.5.3-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/vusted-2.5.2-1.rockspec";
-    sha256 = "15khykwiqipzrgj84ny4wc18iv5qs4a6vl6czmy2g8pxldipqf81";
+    url    = "mirror://luarocks/vusted-2.5.3-1.rockspec";
+    sha256 = "1n0fpr3kw0dp9qiik8k9nh3jbckl4zs7kv7mjfffs9kms85jrq3d";
  }).outPath;
  src = fetchFromGitHub {
    owner = "notomo";
    repo = "vusted";
-    rev = "v2.5.2";
-    hash = "sha256-sYRMzuCUDFe77JMG9D4LedcPa+hAKIKZiEt+stOVl7g=";
+    rev = "v2.5.3";
+    hash = "sha256-b07aSgDgSNpALs5en8ZXLEd/ThLEWX/dTME8Rg1K15I=";
  };

  propagatedBuildInputs = [ busted luasystem ];
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  aiohttp,
+  python-mimeparse,
+  gunicorn,
+  mako,
+  pytestCheckHook,
+  webtest-aiohttp,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp-utils";
+  version = "3.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sloria";
+    repo = "aiohttp-utils";
+    tag = version;
+    hash = "sha256-CGKka6nGQ9o4wn6o3YJ3hm8jGbg16NKkCdBA1mKz4bo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+    python-mimeparse
+    gunicorn
+  ];
+
+  pythonImportsCheck = [
+    "aiohttp_utils"
+  ];
+
+  nativeCheckInputs = [
+    mako
+    pytestCheckHook
+    webtest-aiohttp
+  ];
+
+  disabledTests = [
+    # AssertionError: assert None == 'application/octet-stream'
+    "test_renders_to_json_by_default"
+  ];
+
+  meta = {
+    description = "Handy utilities for building aiohttp.web applications";
+    homepage = "https://github.com/sloria/aiohttp-utils";
+    changelog = "https://github.com/sloria/aiohttp-utils/blob/${src.rev}/CHANGELOG.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  attrs,
+  setuptools,
+  setuptools-scm,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "attrs-strict";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bloomberg";
+    repo = "attrs-strict";
+    tag = version;
+    hash = "sha256-dDOD4Y57E+i8D0S4q+C6t7zjBTsS8q2UFiS22Dsp0Z8=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    attrs
+  ];
+
+  pythonImportsCheck = [ "attrs_strict" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/bloomberg/attrs-strict/releases/tag/${version}";
+    description = "Python package which contains runtime validation for attrs data classes based on the types existing in the typing module";
+    homepage = "https://github.com/bloomberg/attrs-strict";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchPypi,
+  fetchpatch,
  pythonOlder,
  h5py,
  numpy,
@@ -26,6 +27,15 @@ buildPythonPackage rec {
    hash = "sha256-An5RzK0nnRaBI6JEUl5shLrA22RgWzEbC9NJiRvgxT4=";
  };

+  patches = [
+    # fixes support for numpy 2.x, the PR is not yet merged https://github.com/telegraphic/hickle/pull/186
+    # FIXME: Remove this patch when the numpy 2.x support arrives
+    (fetchpatch {
+      url = "https://github.com/cjwatson/hickle/commit/246d8e82c805e2e49ea0abd39abc9b2d800bde59.patch";
+      hash = "sha256-IEVw2K7S1nCkzgn9q0xghm4brfXcallNjzXpt2cRq1M=";
+    })
+  ];
+
  build-system = [ setuptools ];

  dependencies = [
@@ -51,11 +51,14 @@ buildPythonPackage rec {
  # > ps: vsz: requires entitlement
  # > ps: rss: requires entitlement
  # > ps: time: requires entitlement
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    "test_forgotten_stop"
-    "test_mirakuru_cleanup"
-    "test_daemons_killing"
-  ];
+  disabledTests =
+    [
+      "test_forgotten_stop"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "test_mirakuru_cleanup"
+      "test_daemons_killing"
+    ];

  meta = with lib; {
    homepage = "https://pypi.org/project/mirakuru";
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+  setuptools,
+  setuptools-scm,
+  click,
+  python-keycloak,
+  python-jose,
+  pyyaml,
+  swh-core,
+  aiocache,
+  httpx,
+  pytestCheckHook,
+  pytest-django,
+  pytest-mock,
+  djangorestframework,
+  starlette,
+}:
+
+buildPythonPackage rec {
+  pname = "swh-auth";
+  version = "0.10.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-auth";
+    tag = "v${version}";
+    hash = "sha256-8ctd5D7zT66oVNZlvRIs8pN7Fe2BhTgC+S9p1HBDO9E=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    click
+    python-keycloak
+    python-jose
+    pyyaml
+    swh-core
+  ];
+
+  pythonImportsCheck = [ "swh.auth" ];
+
+  nativeCheckInputs = [
+    aiocache
+    djangorestframework
+    httpx
+    pytestCheckHook
+    pytest-django
+    pytest-mock
+    starlette
+  ];
+
+  meta = {
+    description = "Set of utility libraries related to user authentication in applications and services based on the use of Keycloak and OpenID Connect";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-auth";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -0,0 +1,120 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitLab,
+  backports-entry-points-selectable,
+  click,
+  deprecated,
+  python-magic,
+  pyyaml,
+  requests,
+  sentry-sdk_2,
+  tenacity,
+  setuptools,
+  setuptools-scm,
+  aiohttp-utils,
+  flask,
+  hypothesis,
+  iso8601,
+  lzip,
+  msgpack,
+  postgresql,
+  postgresqlTestHook,
+  psycopg,
+  pylzma,
+  pytestCheckHook,
+  pytest-aiohttp,
+  pytest-mock,
+  pytest-postgresql,
+  pytz,
+  requests-mock,
+  systemd,
+  types-deprecated,
+  types-psycopg2,
+  types-pytz,
+  types-pyyaml,
+  types-requests,
+  unzip,
+  pkgs, # Only for pkgs.zstd
+}:
+
+buildPythonPackage rec {
+  pname = "swh-core";
+  version = "4.0.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-core";
+    tag = "v${version}";
+    hash = "sha256-kO4B25+oQrQ9sxmKJ5NMKTCCGztRaArFtD7QA8Bytts=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    backports-entry-points-selectable
+    click
+    deprecated
+    python-magic
+    pyyaml
+    requests
+    sentry-sdk_2
+    tenacity
+  ];
+
+  pythonImportsCheck = [ "swh.core" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [
+    aiohttp-utils
+    flask
+    hypothesis
+    iso8601
+    lzip
+    msgpack
+    postgresql
+    postgresqlTestHook
+    psycopg.optional-dependencies.pool
+    pylzma
+    pytestCheckHook
+    pytest-aiohttp
+    pytest-mock
+    pytest-postgresql
+    pytz
+    requests-mock
+    systemd
+    types-deprecated
+    types-psycopg2
+    types-pytz
+    types-pyyaml
+    types-requests
+    unzip
+    pkgs.zstd
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # FileExistsError: [Errno 17] File exists:
+    "test_uncompress_upper_archive_extension"
+    # AssertionError: |500 - 632.1152460000121| not within 100
+    "test_timed_coroutine"
+    "test_timed_start_stop_calls"
+    "test_timed"
+    "test_timed_no_metric"
+  ];
+
+  meta = {
+    description = "Low-level utilities and helpers used by almost all other modules in the stack";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "swh";
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitLab,
+  setuptools,
+  setuptools-scm,
+  attrs,
+  attrs-strict,
+  dateutils,
+  deprecated,
+  hypothesis,
+  iso8601,
+  typing-extensions,
+  click,
+  dulwich,
+  aiohttp,
+  pytestCheckHook,
+  pytz,
+  types-click,
+  types-python-dateutil,
+  types-pytz,
+  types-deprecated,
+
+}:
+
+buildPythonPackage rec {
+  pname = "swh-model";
+  version = "7.1.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-model";
+    tag = "v${version}";
+    hash = "sha256-I0DaSipE5TVFqAdGkNo4e66l1x4A26EYk0F4tKMy33k=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    attrs
+    attrs-strict
+    click
+    dulwich
+    dateutils
+    deprecated
+    hypothesis
+    iso8601
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "swh.model" ];
+
+  nativeCheckInputs = [
+    aiohttp
+    click
+    pytestCheckHook
+    pytz
+    types-click
+    types-python-dateutil
+    types-pytz
+    types-deprecated
+  ];
+
+  pytestFlagsArray = lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # OSError: [Errno 92] Illegal byte sequence
+    "--deselect swh/model/tests/test_cli.py::TestIdentify::test_exclude"
+    "--deselect swh/model/tests/test_from_disk.py::DirectoryToObjects::test_exclude"
+    "--deselect swh/model/tests/test_from_disk.py::DirectoryToObjects::test_exclude_trailing"
+  ];
+
+  meta = {
+    description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -0,0 +1,84 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+  setuptools,
+  setuptools-scm,
+  requests,
+  ndjson,
+  flask,
+  importlib-metadata,
+  swh-core,
+  swh-model,
+  swh-auth,
+  swh-web-client,
+  beautifulsoup4,
+  pytestCheckHook,
+  pytest-flask,
+  pytest-mock,
+  types-beautifulsoup4,
+  types-pyyaml,
+  types-requests,
+}:
+
+buildPythonPackage rec {
+  pname = "swh-scanner";
+  version = "0.8.3";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-scanner";
+    tag = "v${version}";
+    hash = "sha256-baUUuYFapBD7iuDaDP8CSR9f4glVZcS5qBpZddVf7z8=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    requests
+    ndjson
+    flask
+    importlib-metadata
+    swh-core
+    swh-model
+    swh-auth
+    swh-web-client
+  ];
+
+  pythonImportsCheck = [ "swh.scanner" ];
+
+  nativeCheckInputs = [
+    beautifulsoup4
+    pytestCheckHook
+    pytest-flask
+    pytest-mock
+    swh-core
+    swh-model
+    types-beautifulsoup4
+    types-pyyaml
+    types-requests
+  ];
+
+  disabledTests = [
+    # AttributeError: 'called_once' is not a valid assertion. Use a spec for the mock if 'called_once' is meant to be an attribute.
+    "test_scan_api_url_option_success"
+  ];
+
+  disabledTestPaths = [
+    # pytestRemoveBytecodePhase fails with: "error (ignored): error: opening directory "/tmp/nix-build-python3.12-swh-scanner-0.8.3.drv-5/build/pytest-of-nixbld/pytest-0/test_randomdir_policy_info_cal0/big-directory/dir/dir/dir/ ......"
+    "swh/scanner/tests/test_policy.py"
+  ];
+
+  meta = {
+    description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+  setuptools,
+  setuptools-scm,
+  click,
+  dateutils,
+  requests,
+  swh-auth,
+  swh-core,
+  swh-model,
+  pytestCheckHook,
+  pytest-mock,
+  requests-mock,
+  types-python-dateutil,
+  types-pyyaml,
+  types-requests,
+}:
+
+buildPythonPackage rec {
+  pname = "swh-web-client";
+  version = "0.9.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-web-client";
+    tag = "v${version}";
+    hash = "sha256-/h3TaEwo2+B89KFpIKi9LH0tlGplsv3y18pC0TKM0jA=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    click
+    dateutils
+    requests
+    swh-auth
+    swh-core
+    swh-model
+  ];
+
+  pythonImportsCheck = [ "swh.web.client" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+    requests-mock
+    types-python-dateutil
+    types-pyyaml
+    types-requests
+  ];
+
+  meta = {
+    description = "Client for Software Heritage Web applications, via their APIs";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-web-client";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ drupol ];
+  };
+}
@@ -16,11 +16,11 @@

 stdenv.mkDerivation rec {
  pname = "bzflag";
-  version = "2.4.28";
+  version = "2.4.30";

  src = fetchurl {
    url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-XdOkqSupNOYglUEjrrtL8FrSDPP/dE/U4ejHI7xcq80=";
+    sha256 = "sha256-u3i3UOe856p8Eb01kGuwikmsx8UL8pYprzgO7NFTiU0=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -11,14 +11,14 @@
    "vue": "^2.7.15"
  },
  "devDependencies": {
+    "@babel/core": "^7.26.0",
+    "@babel/eslint-parser": "^7.25.9",
    "@material/mwc-button": "^0.27.0",
    "@vue/cli-plugin-eslint": "^5.0.8",
    "@vue/cli-service": "^5.0.8",
    "@vue/eslint-config-standard": "^8.0.1",
-    "@babel/core": "^7.0.0",
-    "@babel/eslint-parser": "^7.0.0",
-    "eslint": "^8.42.0",
-    "eslint-plugin-vue": "^9.14.1",
+    "eslint": "^8.57.1",
+    "eslint-plugin-vue": "^9.32.0",
    "lodash.isequal": "^4.5.0",
    "vue-d3-network": "^0.1.28"
  }
@@ -7,20 +7,20 @@

 mkYarnPackage rec {
  pname = "zigbee2mqtt-networkmap";
-  version = "0.9.0";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "azuwis";
    repo = "zigbee2mqtt-networkmap";
    rev = "v${version}";
-    hash = "sha256-K4DyrurC4AzzJCcB4CS9UlQbUQSWpR7PevA2JFFMRZM=";
+    hash = "sha256-S4iUTjI+pFfa8hg1/lJSI1tl2nEIh+LO2WTYhWWLh/s=";
  };

  packageJSON = ./package.json;

  offlineCache = fetchYarnDeps {
    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-h/5TWaIg8AfY6I/JBRmUF6yCCbxCMs9nRECWEaaK2to=";
+    hash = "sha256-yo+K3vUJH6WwyNj/UuvbhhmhdqzJ3XUzX+cKUueutjE=";
  };

  configurePhase = ''
@@ -6,4 +6,8 @@ set -xe
 dirname="$(dirname "$0")"

 # nix-update picks the wrong file `pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix`
-nix-update --override-filename "$dirname/default.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap
+nix-update --override-filename "$dirname/package.nix" home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap
+
+# update package.json
+source=$(nix-build -A home-assistant-custom-lovelace-modules.zigbee2mqtt-networkmap.src)
+cp "$source/package.json" "$dirname/package.json"
@@ -20,13 +20,13 @@

 stdenv.mkDerivation {
  pname = "drawterm";
-  version = "0-unstable-2025-01-13";
+  version = "0-unstable-2025-03-18";

  src = fetchFrom9Front {
    owner = "plan9front";
    repo = "drawterm";
-    rev = "daf2ab4550e555cdb6c58f2a9e647c2259a634de";
-    hash = "sha256-JUjF6JIoGrBZt9a2j1T8ATxs9VGuNR2DU0o00fu5ueY=";
+    rev = "0b43ac046ca81d78e9eca535ab1e92971d30405a";
+    hash = "sha256-L0a81zwzIKwnRK/Mu/kW1oHoJCroa+VDNGj7CI90WMQ=";
  };

  enableParallelBuilding = true;
@@ -11021,8 +11021,8 @@ with pkgs;
  jetty_12 = callPackage ../servers/http/jetty/12.x.nix { };
  jetty_11 = callPackage ../servers/http/jetty/11.x.nix { };

-  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { };
-  kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { };
+  kanidm_1_4 = callPackage ../by-name/ka/kanidm/1_4.nix { kanidm = kanidm_1_4; };
+  kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { kanidm = kanidm_1_5; };

  kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;

@@ -314,6 +314,8 @@ self: super: with self; {

  aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { };

+  aiohttp-utils = callPackage ../development/python-modules/aiohttp-utils { };
+
  aiohttp-wsgi = callPackage ../development/python-modules/aiohttp-wsgi { };

  aiohue = callPackage ../development/python-modules/aiohue { };
@@ -1053,6 +1055,8 @@ self: super: with self; {

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

+  attrs-strict = callPackage ../development/python-modules/attrs-strict { };
+
  aubio = callPackage ../development/python-modules/aubio { };

  audible = callPackage ../development/python-modules/audible { };
@@ -17349,6 +17353,16 @@ self: super: with self; {

  swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { };

+  swh-auth = callPackage ../development/python-modules/swh-auth { };
+
+  swh-core = callPackage ../development/python-modules/swh-core { };
+
+  swh-model = callPackage ../development/python-modules/swh-model { };
+
+  swh-scanner = callPackage ../development/python-modules/swh-scanner { };
+
+  swh-web-client = callPackage ../development/python-modules/swh-web-client { };
+
  swift = callPackage ../development/python-modules/swift { };

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