Merge 00f6d5456c into haskell-updates

2026-03-13 00:28:26 +00:00
parent 51beefa3bc 00f6d5456c
commit 56381786fa
308 changed files with 4947 additions and 1503 deletions
@@ -77,6 +77,7 @@ jobs:
              'ci/github-script/bot.js',
              'ci/github-script/check-target-branch.js',
              'ci/github-script/commits.js',
+              'ci/github-script/get-pr-commit-details.js',
              'ci/github-script/lint-commits.js',
              'ci/github-script/merge.js',
              'ci/github-script/prepare.js',
@@ -0,0 +1,101 @@
+// @ts-check
+const { promisify } = require('node:util')
+const execFile = promisify(require('node:child_process').execFile)
+
+/**
+ * @param {{
+ *  args: string[]
+ *  core: import('@actions/core'),
+ *  quiet?: boolean,
+ *  repoPath?: string,
+ * }} RunGitProps
+ */
+async function runGit({ args, repoPath, core, quiet }) {
+  if (repoPath) {
+    args = ['-C', repoPath, ...args]
+  }
+
+  if (!quiet) {
+    core.info(`About to run \`git ${args.map((s) => `'${s}'`).join(' ')}\``)
+  }
+
+  return await execFile('git', args)
+}
+
+/**
+ * Gets the SHA, subject and changed files for each commit in the given PR.
+ *
+ * Don't use GitHub API at all: the "list commits on PR" endpoint has a limit
+ * of 250 commits and doesn't return the changed files.
+ *
+ * @param {{
+ *  core: import('@actions/core'),
+ *  pr: Awaited<ReturnType<InstanceType<import('@actions/github/lib/utils').GitHub>["rest"]["pulls"]["get"]>>["data"]
+ *  repoPath?: string,
+ * }} GetCommitMessagesForPRProps
+ *
+ * @returns {Promise<{
+ *  subject: string,
+ *  sha: string,
+ *  changedPaths: string[],
+ *  changedPathSegments: Set<string>,
+ * }[]>}
+ */
+async function getCommitDetailsForPR({ core, pr, repoPath }) {
+  await runGit({
+    args: ['fetch', `--depth=1`, 'origin', pr.base.sha],
+    repoPath,
+    core,
+  })
+  await runGit({
+    args: ['fetch', `--depth=${pr.commits + 1}`, 'origin', pr.head.sha],
+    repoPath,
+    core,
+  })
+
+  const shas = (
+    await runGit({
+      args: [
+        'rev-list',
+        `--max-count=${pr.commits}`,
+        `${pr.base.sha}..${pr.head.sha}`,
+      ],
+      repoPath,
+      core,
+    })
+  ).stdout
+    .split('\n')
+    .map((s) => s.trim())
+    .filter(Boolean)
+
+  return Promise.all(
+    shas.map(async (sha) => {
+      // Subject first, then a blank line, then filenames.
+      const result = (
+        await runGit({
+          args: ['log', '--format=%s', '--name-only', '-1', sha],
+          repoPath,
+          core,
+          quiet: true,
+        })
+      ).stdout.split('\n')
+
+      const subject = result[0]
+
+      const changedPaths = result.slice(2, -1)
+
+      const changedPathSegments = new Set(
+        changedPaths.flatMap((path) => path.split('/')),
+      )
+
+      return {
+        sha,
+        subject,
+        changedPaths,
+        changedPathSegments,
+      }
+    }),
+  )
+}
+
+module.exports = { getCommitDetailsForPR }
@@ -1,27 +1,6 @@
 // @ts-check
 const { classify } = require('../supportedBranches.js')
-const { promisify } = require('node:util')
-const execFile = promisify(require('node:child_process').execFile)
-
-/**
- * @param {{
- *  args: string[]
- *  core: import('@actions/core'),
- *  quiet?: boolean,
- *  repoPath?: string,
- * }} RunGitProps
- */
-async function runGit({ args, repoPath, core, quiet }) {
-  if (repoPath) {
-    args = ['-C', repoPath, ...args]
-  }
-
-  if (!quiet) {
-    core.info(`About to run \`git ${args.map((s) => `'${s}'`).join(' ')}\``)
-  }
-
-  return await execFile('git', args)
-}
+const { getCommitDetailsForPR } = require('./get-pr-commit-details.js')

 /**
 * @param {{
@@ -67,84 +46,70 @@ async function checkCommitMessages({ github, context, core, repoPath }) {
    return
  }

-  /**
-   * GitHub's API will return a maximum of 250 commits.
-   * We will use it if we can, but fall back to using git locally.
-   * This type is used to abstract over the differences between the two.
-   * @type {{
-   *  message: string,
-   *  sha: string,
-   * }[]}
-   */
-  let commits
-
-  if (pr.commits < 250) {
-    commits = (
-      await github.paginate(github.rest.pulls.listCommits, {
-        ...context.repo,
-        pull_number,
-      })
-    ).map((commit) => ({ message: commit.commit.message, sha: commit.sha }))
-  } else {
-    await runGit({
-      args: ['fetch', `--depth=1`, 'origin', pr.base.sha],
-      repoPath,
-      core,
-    })
-    await runGit({
-      args: ['fetch', `--depth=${pr.commits + 1}`, 'origin', pr.head.sha],
-      repoPath,
-      core,
-    })
-
-    const shas = (
-      await runGit({
-        args: [
-          'rev-list',
-          `--max-count=${pr.commits}`,
-          `${pr.base.sha}..${pr.head.sha}`,
-        ],
-        repoPath,
-        core,
-      })
-    ).stdout
-      .split('\n')
-      .map((s) => s.trim())
-      .filter(Boolean)
-
-    commits = await Promise.all(
-      shas.map(async (sha) => ({
-        sha,
-        message: (
-          await runGit({
-            args: ['log', '--format=%s', '-1', sha],
-            repoPath,
-            core,
-            quiet: true,
-          })
-        ).stdout,
-      })),
-    )
-  }
+  const commits = await getCommitDetailsForPR({ core, pr, repoPath })

  const failures = new Set()

+  const conventionalCommitTypes = [
+    'build',
+    'chore',
+    'ci',
+    'doc',
+    'docs',
+    'feat',
+    'feature',
+    'fix',
+    'perf',
+    'refactor',
+    'style',
+    'test',
+  ]
+
+  /**
+   * @param {string[]} types e.g. ["fix", "feat"]
+   * @param {string?} sha commit hash
+   */
+  function makeConventionalCommitRegex(types, sha = null) {
+    core.info(
+      `${
+        sha
+          ? `Conventional commit types for ${sha?.slice(0, 16)}`
+          : 'Default conventional commit types'
+      }: ${JSON.stringify(types)}`,
+    )
+
+    return new RegExp(`^(${types.join('|')})!?(\\(.*\\))?!?:`)
+  }
+
+  // Optimize for the common case that we don't have path segments with the
+  // same name as a conventional commit type.
+  const fullConventionalCommitRegex = makeConventionalCommitRegex(
+    conventionalCommitTypes,
+  )
+
  for (const commit of commits) {
-    const message = commit.message
-    const firstLine = message.split('\n')[0]
+    const logMsgStart = `Commit ${commit.sha}'s message's subject ("${commit.subject}")`

-    const logMsgStart = `Commit ${commit.sha}'s message's subject ("${firstLine}")`
+    // If we have a commit `perf: ...`, and we touch a file containing the path
+    // segment "perf", we don't want to flag this.
+    const filteredTypes = conventionalCommitTypes.filter(
+      (type) => !commit.changedPathSegments.has(type),
+    )
+    const conventionalCommitRegex =
+      filteredTypes.length === conventionalCommitTypes.length
+        ? fullConventionalCommitRegex
+        : makeConventionalCommitRegex(filteredTypes, commit.sha)

-    if (!firstLine.includes(': ')) {
+    if (!commit.subject.includes(': ')) {
      core.error(
        `${logMsgStart} was detected as not meeting our guidelines because ` +
-          'it does not contain a colon followed by a whitespace.' +
+          'it does not contain a colon followed by a whitespace. ' +
          'There are likely other issues as well.',
      )
      failures.add(commit.sha)
    }

-    if (firstLine.endsWith('.')) {
+    if (commit.subject.endsWith('.')) {
      core.error(
        `${logMsgStart} was detected as not meeting our guidelines because ` +
          'it ends in a period. There may be other issues as well.',
@@ -153,15 +118,25 @@ async function checkCommitMessages({ github, context, core, repoPath }) {
    }

    const fixups = ['amend!', 'fixup!', 'squash!']
-    if (fixups.some((s) => firstLine.startsWith(s))) {
+    if (fixups.some((s) => commit.subject.startsWith(s))) {
      core.error(
        `${logMsgStart} was detected as not meeting our guidelines because ` +
-          `it begins with "${fixups.find((s) => firstLine.startsWith(s))}". ` +
+          `it begins with "${fixups.find((s) => commit.subject.startsWith(s))}". ` +
          'Did you forget to run `git rebase -i --autosquash`?',
      )
      failures.add(commit.sha)
    }

+    if (conventionalCommitRegex.test(commit.subject)) {
+      core.error(
+        `${logMsgStart} was detected as not meeting our guidelines because ` +
+          'it seems to use conventional commit (conventionalcommits.org) ' +
+          'formatting. Nixpkgs has its own, different, commit message ' +
+          'formatting standards.',
+      )
+      failures.add(commit.sha)
+    }
+
    if (!failures.has(commit.sha)) {
      core.info(`${logMsgStart} passed our automated checks!`)
    }
@@ -4470,7 +4470,7 @@
    name = "Claas Augner";
  };
  caverav = {
-    email = "camilo@fvv.cl";
+    email = "nixpkgs@caverav.cl";
    github = "caverav";
    githubId = 66751764;
    name = "Camilo Vera Vidales";
@@ -8757,6 +8757,12 @@
    githubId = 40620903;
    name = "figsoda";
  };
+  fin-w = {
+    email = "fin-w@tutanota.com";
+    github = "fin-w";
+    githubId = 41450706;
+    name = "fin-w";
+  };
  fionera = {
    email = "nix@fionera.de";
    github = "fionera";
@@ -25201,12 +25207,6 @@
    githubId = 12636891;
    name = "Akhil Indurti";
  };
-  smironov = {
-    email = "grrwlf@gmail.com";
-    github = "sergei-mironov";
-    githubId = 4477729;
-    name = "Sergey Mironov";
-  };
  smissingham = {
    email = "sean@missingham.com";
    github = "smissingham";
@@ -26700,6 +26700,11 @@
    githubId = 378734;
    name = "TG ⊗ Θ";
  };
+  tgi74 = {
+    github = "tgi74";
+    githubId = 1854712;
+    name = "tgi74";
+  };
  th0rgal = {
    email = "thomas.marchand@tuta.io";
    github = "Th0rgal";
@@ -485,14 +485,7 @@ with lib.maintainers;
  };

  lxc = {
-    members = [
-      aanderse
-      adamcstephens
-      megheaiulian
-      mkg20001
-    ];
-    scope = "All things linuxcontainers. Incus, LXC, and related packages.";
-    shortName = "lxc";
+    github = "lxc";
  };

  lxqt = {
@@ -48,6 +48,10 @@ in
      };
    };

+    xdg = {
+      serverAutostart = lib.mkEnableOption "starting the foot server via xdg-autostart";
+    };
+
    theme = lib.mkOption {
      type = with lib.types; nullOr str;
      default = null;
@@ -74,10 +78,14 @@ in
    environment = {
      systemPackages = [ cfg.package ];
      etc."xdg/foot/foot.ini".source = settingsFormat.generate "foot.ini" cfg.settings;
+
+      etc."xdg/autostart/foot-server.desktop".source =
+        lib.mkIf cfg.xdg.serverAutostart "${cfg.package}/share/applications/foot-server.desktop";
    };
+
    programs = {
      foot.settings.main.include = lib.optionals (cfg.theme != null) [
-        "${pkgs.foot.themes}/share/foot/themes/${cfg.theme}"
+        "${cfg.package.themes}/share/foot/themes/${cfg.theme}"
      ];
      # https://codeberg.org/dnkl/foot/wiki#user-content-shell-integration
      bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ". ${./bashrc} # enable shell integration for foot terminal";
@@ -212,10 +212,7 @@ in
      ++ lib.optional config.services.pipewire.pulse.enable plasma-pa
      ++ lib.optional config.powerManagement.enable powerdevil
      ++ lib.optional config.services.printing.enable print-manager
-      ++ lib.optionals config.hardware.sane.enable [
-        skanlite
-        skanpage
-      ]
+      ++ lib.optional config.hardware.sane.enable skanpage
      ++ lib.optional config.services.colord.enable colord-kde
      ++ lib.optional config.services.hardware.bolt.enable plasma-thunderbolt
      ++ lib.optional config.services.samba.enable kdenetwork-filesharing
@@ -1,21 +1,25 @@
 {
-  pkgs,
-  lib,
  config,
+  lib,
+  pkgs,
  ...
 }:
+
 let
+
  cfg = config.services.devpi-server;
-
+  package = cfg.package.override { inherit (cfg) extraPackages; };
  secretsFileName = "devpi-secret-file";
-
  stateDirName = "devpi";
-
  runtimeDir = "/run/${stateDirName}";
  serverDir = "/var/lib/${stateDirName}";
+
 in
+
 {
+
  options.services.devpi-server = {
+
    enable = lib.mkEnableOption "Devpi Server";

    package = lib.mkPackageOption pkgs "devpi-server" { };
@@ -57,6 +61,20 @@ in
      description = "The port on which Devpi Server will listen.";
    };

+    extraPackages = lib.mkOption {
+      default = (ps: [ ]);
+      defaultText = lib.literalExpression "ps: [ ]";
+      example = lib.literalExpression ''
+        ps: with ps; [ devpi-web devpi-ldap ]
+      '';
+      type =
+        with lib.types;
+        coercedTo (listOf lib.types.package) (v: (_: v)) (functionTo (listOf lib.types.package));
+      description = ''
+        Plugins and extra Python packages to be available to devpi-server.
+      '';
+    };
+
    openFirewall = lib.mkEnableOption "opening the default ports in the firewall for Devpi Server";
  };

@@ -80,7 +98,7 @@ in
          # already initialized the package index, exit gracefully
          exit 0
        fi
-        ${cfg.package}/bin/devpi-init --serverdir ${serverDir} ''
+        ${package}/bin/devpi-init --serverdir ${serverDir} ''
      + lib.optionalString cfg.replica "--role=replica --master-url=${cfg.primaryUrl}";

      serviceConfig = {
@@ -109,7 +127,7 @@ in
                [ "--role=master" ]
            );
          in
-          "${cfg.package}/bin/devpi-server ${lib.concatStringsSep " " args}";
+          "${package}/bin/devpi-server ${lib.concatStringsSep " " args}";
        DynamicUser = true;
        StateDirectory = stateDirName;
        RuntimeDirectory = stateDirName;
@@ -125,5 +143,8 @@ in
    };
  };

-  meta.maintainers = [ lib.maintainers.cafkafk ];
+  meta.maintainers = with lib.maintainers; [
+    cafkafk
+    confus
+  ];
 }
@@ -149,19 +149,4 @@ rec {
      paramsToRenderedStrings prefixedAttrs (mapAttrs (_n: _v: p) prefixedAttrs);
  };

-  mkPostfixedAttrsOfParams = params: description: {
-    _type = "param";
-    option = mkOption {
-      type = types.attrsOf (types.submodule { options = paramsToOptions params; });
-      default = { };
-      description = description;
-    };
-    render =
-      postfix: attrs:
-      let
-        postfixedAttrs = mapAttrs' (name: nameValuePair "${name}-${postfix}") attrs;
-      in
-      paramsToRenderedStrings postfixedAttrs (mapAttrs (_n: _v: params) postfixedAttrs);
-  };
-
 }
@@ -433,7 +433,7 @@ in
                located, the first certificate is used.
              '';

-              cert = mkPostfixedAttrsOfParams certParams ''
+              cert = mkPrefixedAttrsOfParams certParams ''
                Section for a certificate candidate to use for
                authentication. Certificates in certs are transmitted as binary blobs,
                these sections offer more flexibility.
@@ -568,7 +568,7 @@ in
                or an absolute path.
              '';

-              cert = mkPostfixedAttrsOfParams certParams ''
+              cert = mkPrefixedAttrsOfParams certParams ''
                Section for a certificate candidate to use for
                authentication. Certificates in certs are transmitted as binary blobs,
                these sections offer more flexibility.
@@ -590,7 +590,7 @@ in
                swanctl `x509ca` directory or an absolute path.
              '';

-              cacert = mkPostfixedAttrsOfParams certParams ''
+              cacert = mkPrefixedAttrsOfParams certParams ''
                Section for a CA certificate to accept for authentication. Certificates
                in cacerts are transmitted as binary blobs, these sections offer more
                flexibility.
@@ -40,7 +40,7 @@ let
      ++ old.optional-dependencies.otp
      ++ old.optional-dependencies.sms;
    makeWrapperArgs = (old.makeWrapperArgs or [ ]) ++ [
-      "--set CONFIG /etc/canaille/config.toml"
+      "--set CANAILLE_CONFIG /etc/canaille/config.toml"
      "--set SECRETS_DIR \"${secretsDir}\""
    ];
  });
@@ -303,7 +303,7 @@ in
      ];
      environment = {
        PYTHONPATH = "${pythonEnv}/${python.sitePackages}/";
-        CONFIG = "/etc/canaille/config.toml";
+        CANAILLE_CONFIG = "/etc/canaille/config.toml";
        SECRETS_DIR = secretsDir;
      };
      serviceConfig = commonServiceConfig // {
@@ -53,7 +53,7 @@ let
      else
        mkKeyValueDefault { } sep k v;
  };
-  configContent = gendeepINI cfg.serverConfig;
+  configFile = pkgs.writeText "qBittorrent.conf" (gendeepINI cfg.serverConfig);
 in
 {
  options.services.qbittorrent = {
@@ -154,10 +154,10 @@ in
            mode = "755";
            inherit (cfg) user group;
          };
-          "${cfg.profileDir}/qBittorrent/config/qBittorrent.conf"."f+" = mkIf (cfg.serverConfig != { }) {
+          "${cfg.profileDir}/qBittorrent/config/qBittorrent.conf"."C+" = mkIf (cfg.serverConfig != { }) {
            mode = "600";
            inherit (cfg) user group;
-            argument = configContent;
+            argument = toString configFile;
          };
        };
      };
@@ -170,7 +170,7 @@ in
          "nss-lookup.target"
        ];
        wantedBy = [ "multi-user.target" ];
-        restartTriggers = optionals (cfg.serverConfig != { }) [ configContent ];
+        restartTriggers = optionals (cfg.serverConfig != { }) [ configFile ];

        serviceConfig = {
          Type = "simple";
@@ -74,5 +74,39 @@ in
    # We no longer need those when using envfs
    system.activationScripts.usrbinenv = lib.mkForce "";
    system.activationScripts.binsh = lib.mkForce "";
+
+    # Disabling the activation scripts above prevents the creation of 2
+    # directories, which would normally be created just before switch-root at
+    # stage1. This causes problems when systemd is used in the initrd.
+    #
+    # This only affects fresh installations or systems using impermanence/tmpfs
+    # root, where these directories don't persist from a previous activation.
+    boot.initrd.systemd.tmpfiles.settings = lib.mkIf config.boot.initrd.systemd.enable {
+      "50-envfs" = {
+        # During switch-root, systemd's base_filesystem_create_fd() creates an
+        # empty /usr. Later at stage2, systemd initialize_runtime() checks
+        # dir_is_empty("/usr/"), which returns 1 for an empty but existing
+        # directory causing a fatal boot failure: "Refusing to run in
+        # unsupported environment where /usr/ is not populated."
+        "/sysroot/usr/bin" = {
+          d = {
+            group = "root";
+            mode = "0755";
+            user = "root";
+          };
+        };
+        # During switch-root, base_filesystem_create_fd() creates a symlink
+        # /bin -> /usr/bin if /bin does not exist. systemd-fstab-generator then
+        # canonicalizes the /bin fstab entry through this symlink, producing a
+        # duplicate usr-bin.mount. Create /bin to avoid this behaviour.
+        "/sysroot/bin" = {
+          d = {
+            group = "root";
+            mode = "0755";
+            user = "root";
+          };
+        };
+      };
+    };
  };
 }
@@ -518,7 +518,14 @@ in
  enlightenment = runTest ./enlightenment.nix;
  ente = runTest ./ente;
  env = runTest ./env.nix;
-  envfs = runTest ./envfs.nix;
+  envfs = runTest {
+    imports = [ ./envfs.nix ];
+    _module.args.systemdStage1 = false;
+  };
+  envfs-systemd-stage-1 = runTest {
+    imports = [ ./envfs.nix ];
+    _module.args.systemdStage1 = true;
+  };
  envoy = runTest {
    imports = [ ./envoy.nix ];
    _module.args.envoyPackage = pkgs.envoy;
@@ -1,4 +1,9 @@
-{ lib, pkgs, ... }:
+{
+  pkgs,
+  systemdStage1 ? false,
+  ...
+}:
+
 let
  pythonShebang = pkgs.writeScript "python-shebang" ''
    #!/usr/bin/python
@@ -12,7 +17,11 @@ let
 in
 {
  name = "envfs";
-  nodes.machine.services.envfs.enable = true;
+
+  nodes.machine = {
+    services.envfs.enable = true;
+    boot.initrd.systemd.enable = systemdStage1;
+  };

  testScript = ''
    start_all()
@@ -17,24 +17,38 @@
        environment.IMMICH_LOG_LEVEL = "verbose";
      };

-      services.postgresql.extensions = lib.mkForce (ps: [
-        ps.pgvector
-        # pin vectorchord to an older version simulate version bump
-        (ps.vectorchord.overrideAttrs (prevAttrs': rec {
-          version = "0.5.2";
-          src = pkgs.fetchFromGitHub {
-            owner = "tensorchord";
-            repo = "vectorchord";
-            tag = version;
-            hash = "sha256-KGwiY5t1ivFiYex3D20y3sdiu3CT9LCDd2fPnRE56jM=";
-          };
+      services.postgresql.extensions = lib.mkForce (
+        ps:
+        let
+          # Pin vectorchord to an older version simulate version bump.
+          # This version must have a different "schema" version than the latest version in nixpkgs.
+          # See version number at https://github.com/tensorchord/VectorChord/blob/1.1.0/crates/vchordrq/src/tuples.rs#L23
+          vectorchord =
+            (ps.vectorchord.override {
+              cargo-pgrx_0_17_0 = pkgs.cargo-pgrx_0_16_0;
+            }).overrideAttrs
+              (
+                finalAttrs: _: {
+                  version = "1.0.0";
+                  src = pkgs.fetchFromGitHub {
+                    owner = "tensorchord";
+                    repo = "vectorchord";
+                    tag = finalAttrs.version;
+                    hash = "sha256-+BOuiinbKPZZaDl9aYsIoZPgvLZ4FA6Rb4/W+lAz4so=";
+                  };

-          cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
-            inherit src;
-            hash = "sha256-Vn3c/xuUpQzERJ74I0qbvufTZtW3goefPa5B/nOUO48=";
-          };
-        }))
-      ]);
+                  cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+                    inherit (finalAttrs) src;
+                    hash = "sha256-kwe2x7OTjpdPonZsvnR1C/89D5W/R5JswYF79YcSFEA=";
+                  };
+                }
+              );
+        in
+        [
+          ps.pgvector
+          vectorchord
+        ]
+      );

      specialisation."immich-vectorchord-upgraded".configuration = {
        # needs to be lower than mkForce, otherwise it does not get rid of the previous version
@@ -13,7 +13,7 @@ let
        optional = false;
      };
    in
-    map (x: defaultPlugin // (if (x ? plugin) then x else { plugin = x; })) plugins;
+    map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) plugins;

  pluginWithConfigType =
    with lib;
@@ -78,17 +78,26 @@ in

    userPluginViml = lib.mkOption {
      readOnly = true;
-      type = lib.types.listOf (lib.types.lines);
+      type = lib.types.listOf lib.types.lines;
      description = ''
        The viml config set by the user.
      '';
    };

+    pluginPython3Packages = lib.mkOption {
+      readOnly = true;
+      type = lib.types.listOf (lib.types.functionTo (lib.types.listOf lib.types.package));
+      example = lib.literalExpression "[ (ps: [ ps.python-language-server ]) ]";
+      description = ''
+        Packages required by the plugins to work with the python3 provider.
+      '';
+    };
+
  };

  config =
    let
-      pluginsNormalized = normalizePlugins config.plugins;
+      pluginsNormalized = config.plugins;
    in
    {
      pluginAdvisedLua =
@@ -111,5 +120,7 @@ in
      userPluginViml = lib.foldl (
        acc: p: if p.config != null then acc ++ [ p.config ] else acc
      ) [ ] pluginsNormalized;
+
+      pluginPython3Packages = map (plugin: plugin.python3Dependencies or (_: [ ])) pluginsNormalized;
    };
 }
@@ -99,24 +99,19 @@ let
        inherit plugins;
      };

-      pluginsNormalized = normalizePlugins plugins;
+      pluginsNormalized = checked_cfg.plugins;

      vimPackage = normalizedPluginsToVimPackage pluginsNormalized;

-      getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ]));
-
-      requiredPlugins = vimUtils.requiredPluginsForPackage vimPackage;
-      pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins;
    in
    {
-      # plugins' python dependencies
-      inherit pluginPython3Packages;

      # viml config set by the user along with the plugin
      inherit (checked_cfg)
        userPluginViml
        runtimeDeps
        pluginAdvisedLua
+        pluginPython3Packages
        ;

      # A Vim "package", see ':h packages'
@@ -4588,6 +4588,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  devexcuses-nvim = buildVimPlugin {
+    pname = "devexcuses.nvim";
+    version = "0-unstable-2026-03-11";
+    src = fetchFromGitHub {
+      owner = "mahyarmirrashed";
+      repo = "devexcuses.nvim";
+      rev = "0bd585fd00f2c2290d541a8846a6649c1b71854a";
+      hash = "sha256-Mz5FeZzFPaPGvzWAKLUhvJtnB1hW1kW0vTGArMTc2nc=";
+    };
+    meta.homepage = "https://github.com/mahyarmirrashed/devexcuses.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  dhall-vim = buildVimPlugin {
    pname = "dhall-vim";
    version = "0-unstable-2024-05-18";
@@ -10,13 +10,13 @@
 }:
 vimUtils.buildVimPlugin rec {
  pname = "codediff.nvim";
-  version = "2.41.1";
+  version = "2.43.9";

  src = fetchFromGitHub {
    owner = "esmuellert";
    repo = "codediff.nvim";
    tag = "v${version}";
-    hash = "sha256-JOlBmzdKVfU7HLVXyCbxwrARLFAiW/p7xFMlafpIKCY=";
+    hash = "sha256-9u0jrAjsxSt0HbQ/9DhgQfpjkgsxC50u26KwOrwesJ4=";
  };

  dependencies = [ vimPlugins.nui-nvim ];
@@ -351,6 +351,7 @@ https://github.com/deoplete-plugins/deoplete-zsh/,,
 https://github.com/Shougo/deoplete.nvim/,,
 https://github.com/maskudo/devdocs.nvim/,HEAD,
 https://github.com/rhysd/devdocs.vim/,,
+https://github.com/mahyarmirrashed/devexcuses.nvim/,HEAD,
 https://github.com/vmchale/dhall-vim/,,
 https://github.com/dgagn/diagflow.nvim/,HEAD,
 https://github.com/onsails/diaglist.nvim/,,
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "vscode-wakatime";
    publisher = "WakaTime";
-    version = "25.5.1";
-    hash = "sha256-4wdY8cmKWfp/ua39lcD8ibxoy8W0zyX97vMyDEZu2o4=";
+    version = "27.0.0";
+    hash = "sha256-SCgVX/s4fjMXPA4wrjIqzdi+RHMuhq+kf5gN2oWpQQY=";
  };

  meta = {
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
  mktplcRef = {
    name = "amazon-q-vscode";
    publisher = "AmazonWebServices";
-    version = "1.111.0";
-    hash = "sha256-f4GVY3vL7ienn/pWzcbXcDHNHCrPPmFWeVpVDVVNF5c=";
+    version = "1.112.0";
+    hash = "sha256-iuyET7vCZCyldfNuognB6fLDurJzg7XsRme6BjDCQzU=";
  };

  meta = {
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
-    version = "2.1.70";
-    hash = "sha256-m9xKwS2g2jwekmoIZl3asrZq+xAZUtw/ThWXLdleWrM=";
+    version = "2.1.74";
+    hash = "sha256-WmDHxRVHzS8WmaUg4WG/f7Jy4TQ8oVm5PJXm1V7wOn8=";
  };

  postInstall = ''
@@ -1007,8 +1007,8 @@ let
        mktplcRef = {
          name = "coder-remote";
          publisher = "coder";
-          version = "1.12.2";
-          hash = "sha256-0ZX0EQnPIqREsIy5dSML94PXD0Z+UZCIKwdqXVYTc1Q=";
+          version = "1.13.2";
+          hash = "sha256-Dw8eJPpbeMz2taELHI0eYwO67SngCFel8wL/ZCGXQoM=";
        };
        meta = {
          description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";
@@ -1729,8 +1729,8 @@ let
        mktplcRef = {
          name = "foam-vscode";
          publisher = "foam";
-          version = "0.29.2";
-          hash = "sha256-6Bga51DCHaVn+UV5RPCE7uFsAei/F0xN4Mk4dm52FWs=";
+          version = "0.31.0";
+          hash = "sha256-Z3M20CjSEFSG5KVfsbLa7gokNnGAG1IrdD0xe7Ch3t8=";
        };
        meta = {
          changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "google";
    name = "colab";
-    version = "0.3.0";
-    hash = "sha256-O95bJuMQtQDj30nhw9yE1Spf/ViuakpcO2q9nf2iVtg=";
+    version = "0.4.1";
+    hash = "sha256-ebSMfnDumkXKsMqg3/ifi0GVXfXtrs2mLCCG8hZlkR0=";
  };

  meta = {
@@ -13,7 +13,7 @@ let
  buildVscodeLanguagePack =
    {
      language,
-      version ? "1.108.2026012809",
+      version ? "1.108.2026021109",
      hash,
    }:
    buildVscodeMarketplaceExtension {
@@ -41,71 +41,71 @@ in
  # French
  vscode-language-pack-fr = buildVscodeLanguagePack {
    language = "fr";
-    hash = "sha256-1+aWgvoXR/FqhnIn3OrLOC11jLXVWlO2yecpzr2Waww=";
+    hash = "sha256-wlNUPeU7gblFeQ0G6CE+lzC3xQW8Xy2DM0mpmy1K5dM=";
  };
  # Italian
  vscode-language-pack-it = buildVscodeLanguagePack {
    language = "it";
-    hash = "sha256-t6jN3qok7B4/G/IjEXD6THO6c+8X+1gxny6W7qdh5mI=";
+    hash = "sha256-Nx+4ByeCnH3BxL41M6XcwlW5qgbUh9ex3Bu6xvy24UI=";
  };
  # German
  vscode-language-pack-de = buildVscodeLanguagePack {
    language = "de";
-    hash = "sha256-rZM/T1gbYrtcHNLW0itNdhKcRR938PwK5VBN0xLDIWg=";
+    hash = "sha256-9747wTc4cdsEOZmy7JPNGL65vNG+bLEjN4CDMVbOphw=";
  };
  # Spanish
  vscode-language-pack-es = buildVscodeLanguagePack {
    language = "es";
-    hash = "sha256-PG3oOCjWRgh1ox6GAPRdZdf8QNP1JsJZznJnM+2Ihl0=";
+    hash = "sha256-LKoDwonmsB9X50/DLTfh0rED/EvdWPbkP+i/n2pjfL4=";
  };
  # Russian
  vscode-language-pack-ru = buildVscodeLanguagePack {
    language = "ru";
-    hash = "sha256-RPpNet015xGnOszcKfehP9VxnfDAnQJ2A62rVtNBDew=";
+    hash = "sha256-CZhmpvW+EQW3E0PdRB7zz1XXQW+9vnzT99n7cagx7DE=";
  };
  # Chinese (Simplified)
  vscode-language-pack-zh-hans = buildVscodeLanguagePack {
    language = "zh-hans";
-    hash = "sha256-pm1dCoK4YM8XBM/O6p42R4PYy5f95sLcECHJMAKFt9Q=";
+    hash = "sha256-QYgM9PRpHKB4SxAC5C92gkUsNXO9ua5GHqn7Cd9I8tM=";
  };
  # Chinese (Traditional)
  vscode-language-pack-zh-hant = buildVscodeLanguagePack {
    language = "zh-hant";
-    hash = "sha256-cSM+2W5aCUA77kxgV7vyk7KAoSlkeT+y56ziIPjP9II=";
+    hash = "sha256-X476P0tOH4VBgbW74/XnnsBdkAcq2co7rxzXD8O5Xtc=";
  };
  # Japanese
  vscode-language-pack-ja = buildVscodeLanguagePack {
    language = "ja";
-    hash = "sha256-UfMMLKHi48Qhgm8PXFAfGFQFX6e8vQsl/RYqha42TOc=";
+    hash = "sha256-BoTVsv5KhZd+hZFdpe3RhU+VvpZu5Z2u3X1KPsEBd3U=";
  };
  # Korean
  vscode-language-pack-ko = buildVscodeLanguagePack {
    language = "ko";
-    hash = "sha256-gneZF4CIEDy88juFZBiB9/o/rzTnu2du4aiZ+NH+XlE=";
+    hash = "sha256-/RaaiP32Ky9bbifWNDB3rCHu7G8rZS6jvEyJhnR+0A8=";
  };
  # Czech
  vscode-language-pack-cs = buildVscodeLanguagePack {
    language = "cs";
-    hash = "sha256-ojh2KBEpTTJsAgM2RilGO58kkcWgaFf5nkiiZ4gYNtg=";
+    hash = "sha256-hHnrMUVmjXezk5k/q1jrd3Zp6NyetoeYnFQgAyEuX+8=";
  };
  # Portuguese (Brazil)
  vscode-language-pack-pt-br = buildVscodeLanguagePack {
    language = "pt-BR";
-    hash = "sha256-n55nI9gCxNpr6Pq70qJnmgp2rs0Gcblirg4SaeXAXtE=";
+    hash = "sha256-JTkPbkwrH4Vxg6V9zTSame8WyjSli/LDVLCv4DY7zGM=";
  };
  # Turkish
  vscode-language-pack-tr = buildVscodeLanguagePack {
    language = "tr";
-    hash = "sha256-S6orhrfCaA4aeLhW3+rdaJb4X8h7IUjfBC9A+QgiQgk=";
+    hash = "sha256-rvM5SgcJujWztSREZulD4y5wZBm9e9CDseKozqtmNfM=";
  };
  # Polish
  vscode-language-pack-pl = buildVscodeLanguagePack {
    language = "pl";
-    hash = "sha256-YoNl44f2jEYXIhDKz+xU5fzt/JD6l86dtbqXFKOzHrk=";
+    hash = "sha256-M4XKkz1hgsjxsjqf7pQGYAB0rtJN9eKxM2WhDYGLssk=";
  };
  # Pseudo Language
  vscode-language-pack-qps-ploc = buildVscodeLanguagePack {
    language = "qps-ploc";
-    hash = "sha256-onc+lk6itrWP5J17eVLIMcpG1gDM/rpTzKci8m2uBcY=";
+    hash = "sha256-/zVq/03CcM7cgZ4/K7k4pYqkbc6bNuBnhMl38DRFulw=";
  };
 }
@@ -15,19 +15,19 @@
 let
  supported = {
    x86_64-linux = {
-      hash = "sha256-MJ5FI1YbvknhuBgSQIpd/s4fyIvaOZHTQBeGxBo1uhs=";
+      hash = "sha256-14CuWI0le00n55TYhEtz0XI/xG+fXnjrboSHgJ2Tx/s=";
      arch = "linux-x64";
    };
    x86_64-darwin = {
-      hash = "sha256-Jk41L8QulT+olJxUl1E/UOOtD/qIIiwSlkP5R9qOJhU=";
+      hash = "sha256-EKomndqpCJXajwesbolWx9kr/sEpAhZpPtn0S/d1nbM=";
      arch = "darwin-x64";
    };
    aarch64-linux = {
-      hash = "sha256-xeD73t9WleBz/p+DyIs9vRUlKcbzUwL1RxILNKOi+14=";
+      hash = "sha256-f8jehKgNMuIyP+yQ7oCLhKvdcmujc6d7UbwXL+khZCg=";
      arch = "linux-arm64";
    };
    aarch64-darwin = {
-      hash = "sha256-gRViqhIyqmUId56lf8o6z9KK4rNK5Ufg9i2gecsTrVc=";
+      hash = "sha256-87tvTop81XTOHuY64dXA+WmfEGdEACNKipqHDe3lNp8=";
      arch = "darwin-arm64";
    };
  };
@@ -41,7 +41,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = base // {
    name = "python";
    publisher = "ms-python";
-    version = "2025.16.0";
+    version = "2026.2.0";
  };

  buildInputs = [ icu ];
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "vscode-pylance";
    publisher = "MS-python";
-    version = "2025.9.1";
-    hash = "sha256-8iZP5nd5SAEhwy6CxBY5kVhJFX5OdZp8u1sjDyuMS08=";
+    version = "2026.1.1";
+    hash = "sha256-82zIUJBgjbBW0R6ExBLXGYYtYxm1vC7bz/3BvP3IIXA=";
  };

  buildInputs = [ pyright ];
@@ -21,13 +21,13 @@ let
  # Use the plugin version as in vscode marketplace, updated by update script.
  inherit (vsix) version;

-  releaseTag = "2025-08-25";
+  releaseTag = "2026-02-16";

  src = fetchFromGitHub {
    owner = "rust-lang";
    repo = "rust-analyzer";
    tag = releaseTag;
-    hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk=";
+    hash = "sha256-1TZROjtryMzOJHgHhAUQUoAMnnWal231G7gM1pfNlK4=";
  };

  vsix = buildNpmPackage {
@@ -35,7 +35,7 @@ let
    name = "${pname}-${version}.vsix";
    version = lib.trim (lib.readFile ./version.txt);
    src = "${src}/editors/code";
-    npmDepsHash = "sha256-fV4Z3jj+v56A7wbIEYhVAPVuAMqMds5xSe3OetWAsbw=";
+    npmDepsHash = "sha256-rg4ARGB9NzI8rxEOONWq+mwSG9hd3yyFRhOUomMLN6w=";
    buildInputs = [
      pkgsBuildBuild.libsecret
    ];
@@ -1 +1 @@
-0.3.2593
+0.3.2803
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    publisher = "sourcegraph";
    name = "amp";
-    version = "0.0.1772583932";
-    hash = "sha256-QP3/wNxNVqOoPeC0BIPVrfbDp3bqjqLtREgi0oC/Atw=";
+    version = "0.0.1772799397";
+    hash = "sha256-O3OnTWazDpdxSQuQo6VS0O8OsfK4WoPMs2w1LCV9Nyc=";
  };

  meta = {
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
      sources = {
        "x86_64-linux" = {
          arch = "linux-x64";
-          hash = "sha256-NXlV80CV6EyALfJHT3x3pfjGiJfYxPT2JXTADMfB7yA=";
+          hash = "sha256-qyhYpEkkXjG48JXSxOodgvh18R/nOOcP2m3m0OpdqvY=";
        };
        "x86_64-darwin" = {
          arch = "darwin-x64";
-          hash = "sha256-NWak0NXK5SxGm7JLpqR7zapEzxG+CDFdTcZDyCY6ifk=";
+          hash = "sha256-elhKqa9aLcx+3CTYt1S1BiE+Y5ldLc5ilfnfPoEEd3w=";
        };
        "aarch64-linux" = {
          arch = "linux-arm64";
-          hash = "sha256-9lJfrqVFTROMqLaO9SUx9msACjHu0lTSKLRPPA8r8AM=";
+          hash = "sha256-r2DmSo1TLyZSFKVsbvYhF1CkNODgjotNFXhA+q69MAw=";
        };
        "aarch64-darwin" = {
          arch = "darwin-arm64";
-          hash = "sha256-iz3+iEXCYzItNTrAlzZAuM80U+TNlz/n1nljRvOfX3k=";
+          hash = "sha256-4qGX4TwT9gtJbZt7JLbnQwGLA13yoqZQsydtfr4Kivw=";
        };
      };
    in
    {
      name = "visualjj";
      publisher = "visualjj";
-      version = "0.20.2";
+      version = "0.24.1";
    }
    // sources.${stdenvNoCC.hostPlatform.system}
      or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
  core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2026-02-27";
+  version = "0-unstable-2026-03-06";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "beetle-psx-libretro";
-    rev = "fe0b72c4b93e42a46cd062febd7de292d828248e";
-    hash = "sha256-2uR5zULgWuT0sUY1KZ//RPZaIOg2LlAqX+Z5QhnvLg0=";
+    rev = "3ea167a60bc37bd0c257592bb9a7f559a50465c4";
+    hash = "sha256-gSNsTV1w7i6bTLngU/Zbo7bwLmb+Bu26JwUre6Rj4qc=";
  };

  extraBuildInputs = lib.optionals withHw [
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "fbneo";
-  version = "0-unstable-2026-03-03";
+  version = "0-unstable-2026-03-08";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "fbneo";
-    rev = "7706b59fecf5a8ef81190d8d7e0abe3b08ce6d22";
-    hash = "sha256-D2PB2vaq1HpHAE0/c5I9YxwFPS8QQ4hSRuKu5xzJR/k=";
+    rev = "14ff80a2e0611d039321a3ac0dd76bf6b4e3210f";
+    hash = "sha256-L6KYyEb95L9rDnaMVh49afaWxsshTy3eujsTQWbPfl0=";
  };

  makefile = "Makefile";
@@ -67,7 +67,6 @@ symlinkJoin {
    license = lib.licenses.zlib;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [
-      smironov
      TethysSvensson
    ];
    mainProgram = "zathura";
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
-    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz";
+    sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
-    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz";
+    sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04";
  };
 }
@@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "3f45abe980b2a6ba9ba8037d9b5a96ab199ce5ddf53c496e99087422d20f0383"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "a73742d5f26b000c61eb1ada896950ca2168a0957c52d6fc8e13676244120ac1"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "924ecfe275f8e9e6c03ab52d78901cf7aa32bf5abd1c4294ac8c41d7860865b6"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "789c04f62ccb1b5adace8b5876e49dba0be739657e1324d1d9542a70c61971b0"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "fc310a93b1477a9e0e5ad21bc2e1a28dbadd7578923dff594bccc8cf90eb265b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "56e2336781b1ef115d91276aa07cdceacaa38f9aa6209aa3fff9c8f74530d8a4"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "dcef1d1edf592dce46a6a039576c3169d0caf4eec165c6cbcf1dfbe019b1535d"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "fcbb9b0b725b313ecfe077303e012ab6b88be446bbba1bf61f601a7ad90cffdb"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "a5d645989991207bae3cee1597c8c581908291af912766132d99fae3b103918b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "e9b3da2b855eb188eb170940f5e5bad79e04aafc7dff10317b30a4b2884f792c"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "53e747b44505ddcc239c3d175dfa9f23b925c5018e3f878b0be87af876c4c41b"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.32.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c5799a879b68adc996e9a09158d8ea7f04b46bff5241e9641c404809e687d29e"
  }
 }
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.32.12+k3s1";
-  k3sCommit = "0dc662e80238b7b70d24ad9025a6b64292d14955";
-  k3sRepoSha256 = "1pmdbzxp968hxya590qhf4sz3gx6yzpwhcg24hkfsxbm9bclrr0g";
-  k3sVendorHash = "sha256-T5GGzudpTTMb2SBC6+spCo7Q/IOr6LfiWb/oWOcCOv8=";
+  k3sVersion = "1.32.13+k3s1";
+  k3sCommit = "bf43a24f544763b0f3ef2d2da0beeea1cf357a35";
+  k3sRepoSha256 = "1c7022il1gsxcyn575pl15l75nwidmm1d08kvb9ckvrv6abc98m6";
+  k3sVendorHash = "sha256-42+SVIwUiZPCQ+gbk8ytGBzUrAWV1J9l9rEwCiEE+kE=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.15.0";
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
-    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz";
+    sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
-    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz";
+    sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04";
  };
 }
@@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "e4c4437580f6a2379963ed78d3a58212932fd4c917fc33c0664ce2a8b89fe389"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "93f356bfebfd647b099aed93e9754deade10c38ef081afa858f8483503d480b1"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1760ed5f74a27f4ac5ccac4f8cdf88f2cb5c3bc85ec23674bd499ae3efd93617"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "e368015a3d3b4d38b23ea2ef31b37c2bcb6e9488628954c33c7976a5f0f09290"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "6f1ff82e1845d00692f89ad12cf0b0921ae451bae18e8479334a6200312dd746"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "4cb0a69d3c7319ee27e2c1a3a93523bbdb9c05fde4698b78187d5fb30b9df791"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "9ae9184211aa4b729cb3c2c659e6442c55bedc7a13720f923898b284b48b87b0"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "b789ea7b1965d630d4d5346af7247da6645fa3b6ef32c9f27a6d44e64af9b5c0"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "a1a00a92559e9a966e882e871163dae7278fea5f20194a37d00cd81fae5dff84"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "1cd8c3902f215c861d9a66602df0b28c1a70e292468f6a149b8c6299da1d7cbe"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "790c4de411881c0af1d704d566d3832afc2fd91c4820423af1a3796c85b47734"
  }
 }
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.33.8+k3s1";
-  k3sCommit = "3552cfc26032474faad53ee617fde32ac0c1a222";
-  k3sRepoSha256 = "00dmd3rfghwi8mq33ksiga1nwpk1swqfdwalgspliy5vhfvwgma8";
-  k3sVendorHash = "sha256-89C0jv8IUweToIAGyZkaK9o9owm9e8qD4BhJuJw0XVs=";
+  k3sVersion = "1.33.9+k3s1";
+  k3sCommit = "f93a18d13d956f6c7f1cc6101e6048766df09ebb";
+  k3sRepoSha256 = "006g6spjfqnz5w57hls4iy1b84r9y6i6h0ybfprhsphdk5fblvkn";
+  k3sVendorHash = "sha256-PKEPdSdljMOFxwh/xbfSHziRPxMgfvNGK3fQqiNC0UI=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.15.0";
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
-    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz";
+    sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
-    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz";
+    sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04";
  };
 }
@@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "ab5da5904db9b41df478fd59e526b5802902650e83a85674c6b19c51ad38b4a4"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "c4b6795a54bb193ea4b156c76a742dd4f93e03bbd03b739d8356d7298aa8a9be"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "924ecfe275f8e9e6c03ab52d78901cf7aa32bf5abd1c4294ac8c41d7860865b6"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "dbc5a1a69162b37544ea7f4d04208355f57c696b98bb7ae47a3080c84d90debf"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "2018507533f3aa8c33be81358940d33ec98836f6fbcc463d1c2cfb7f20efb36c"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "d5e882421ab3d31786d03dfceaa4cdda80fdf5c15e456bfdaf69b46627dce0ef"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "2a93722994fb58faa36fa6293a7e454fa1c621eaa0a82e08e996f767e61c0c88"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "d795d06766a1d5475123deef4bf4c869fe5c8dadba844241e983aa25818d1631"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "61a8587016aabce6f1d701c679e1d3050adaa7029c3c6dc309940b5764fb9c38"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "dda519d71787bc7eed33a2a1db9015158ca58d86f23a39704b4193f3e1e1a36b"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "c5799a879b68adc996e9a09158d8ea7f04b46bff5241e9641c404809e687d29e"
  }
 }
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.34.4+k3s1";
-  k3sCommit = "c6017918a65c824ce8d321db15267c8a317cd39d";
-  k3sRepoSha256 = "0b19c1jpkndr6859m745xms1j3hn6bjffdgmv3yl05y6finaqgzq";
-  k3sVendorHash = "sha256-ZTRcv28rgKslrDRr5y8SnQJpo2ErbURa22l1nv+4QHw=";
+  k3sVersion = "1.34.5+k3s1";
+  k3sCommit = "c2661bc1e7029f4e68a02f4a9d15c7de3428d0cf";
+  k3sRepoSha256 = "07wqbj8l48nwvx59p6wrahk7acw5bgmvkv7ij24f1514xj5y6if2";
+  k3sVendorHash = "sha256-q3/KylcuuhUMC3ggpR8DsLjdWgtPnhCqa1HjM2sgHuo=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.15.0";
@@ -1,10 +1,10 @@
 {
  traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-38.0.201+up38.0.2.tgz";
-    sha256 = "1fxkdmk859nwn0x9iq0abdwb16njsang7257ppaj9s1if06fsncd";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.201+up39.0.2.tgz";
+    sha256 = "0r43kny2kkrlxjniivnivzbqqbiri08cg9qjrl6mx9rjzsxfxqwg";
  };
  traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-38.0.201+up38.0.2.tgz";
-    sha256 = "16kzjy8dgswn4jfx62dn2ihmgpkzcfvjv6ync9zdi397fz32mqjv";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.201+up39.0.2.tgz";
+    sha256 = "1ci2wns11ibgwf7x4j90vcbrsf63rrz1slsm63iayvkdq3r3ri04";
  };
 }
@@ -1,26 +1,26 @@
 {
  "airgap-images-amd64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
-    "sha256": "469e9ecafbd69565d8f55cb451ca968edbe7aa872bfd783acd3058bb3b1cbe01"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "5714a481d7e197cc4e41070bfd8a310dc93103fc9f23bfc32fce61d24940d9a7"
  },
  "airgap-images-amd64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "e60dfb27f3c5ffb9a32db8fdfdd8447d01618f29d1d132a3f0891dd8bbc00674"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "a3caf6692c1495f58bbaa1411a0e2377e9f7ebd262bd33101c3cd1edade68360"
  },
  "airgap-images-arm-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",
-    "sha256": "49a39c18db7883ef02914cea098e228610330d689313273ab0c5486fbc78a5b2"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "bd48d1aeee4e7643e796439ec95caef0e270e07744307a9b1d134e55837b868b"
  },
  "airgap-images-arm-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "2a93722994fb58faa36fa6293a7e454fa1c621eaa0a82e08e996f767e61c0c88"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "393d1de18e0ba363164d77b005d9cca045b9cd726645b9915550a429fc7920e8"
  },
  "airgap-images-arm64-tar-gz": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
-    "sha256": "e653d4fe9e8bd24600f27a247086ef3c3b2bcc068da457a3cc16c70dfd60c7b1"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "fe69ee52cf6a9b51667877e2eebda08a789b19d4fb0a0a38fde21aa5051eb24d"
  },
  "airgap-images-arm64-tar-zst": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "df4695448bd8a783cb0e6c91e40aa1abed36b921a121dd1b7f87ff3973faec27"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "5ddc08b28514575c819638ee2a870b587ca4105a4465763cca276b663ce84298"
  }
 }
@@ -1,8 +1,8 @@
 {
-  k3sVersion = "1.35.1+k3s1";
-  k3sCommit = "50fa2d70c239b3984dab99a2fb1ddaa35c3f2051";
-  k3sRepoSha256 = "0ha0vw1k6sawmd1zi81ni4c662761hp3iaj5ssi8klg93cp8hg0p";
-  k3sVendorHash = "sha256-5XPbp0wizwAGlA8Km4uwLKy9dIqWzzQuuXWgKnICmCw=";
+  k3sVersion = "1.35.2+k3s1";
+  k3sCommit = "13563febb4bd4aef9c7cda43a22c8155ac937dd4";
+  k3sRepoSha256 = "0kwk4c99bn0glhyf81cmx0ly0x97hlajhh2h658cpjr97hij2fpa";
+  k3sVendorHash = "sha256-iGtGGviYfLDmagFlWfMBZ1Gm57aNhusLFR2p70SpFMQ=";
  chartVersions = import ./chart-versions.nix;
  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
  k3sRootVersion = "0.15.0";
@@ -571,11 +571,11 @@
    "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
  },
  "hashicorp_google": {
-    "hash": "sha256-mSUEhO6zZ4PO/WzvHVCaoxFjhL/kF1OfuCeH67DA4+w=",
+    "hash": "sha256-ulwx4+m/7mTTr0+1kSO1g4qkKhd/Yx5of4K7moDik88=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/google",
    "owner": "hashicorp",
    "repo": "terraform-provider-google",
-    "rev": "v7.22.0",
+    "rev": "v7.23.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-v/XHGUEpAIpGHErv7GPqfosVLL3xaqBwZHbJKS8fkn4="
  },
@@ -1049,11 +1049,11 @@
    "vendorHash": null
  },
  "oracle_oci": {
-    "hash": "sha256-3gDOKRaZzsqFj8DOK8rug43nvU3kE6KAGcYy/ky4o0o=",
+    "hash": "sha256-Luh2NB1+dKTbYnvU3o+rkta8wmqHuJRLv+lroM6/LcQ=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v8.3.0",
+    "rev": "v8.5.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
    mainProgram = "lp_solve";
    homepage = "https://lpsolve.sourceforge.net";
    license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ smironov ];
+    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
 }
@@ -45,7 +45,6 @@ symlinkJoin {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -74,7 +74,6 @@ mkOpenModelicaDerivation (
      license = lib.licenses.gpl3Only;
      maintainers = with lib.maintainers; [
        balodja
-        smironov
      ];
      platforms = lib.platforms.linux;
    };
@@ -52,7 +52,6 @@ mkOpenModelicaDerivation {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -38,7 +38,6 @@ including Modelica Standard Library";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -28,7 +28,6 @@ suite";
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -36,7 +36,6 @@ mkOpenModelicaDerivation {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -51,7 +51,6 @@ mkOpenModelicaDerivation {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -41,7 +41,6 @@ mkOpenModelicaDerivation {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      balodja
-      smironov
    ];
    platforms = lib.platforms.linux;
  };
@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
  pname = "jellyfin";
  namespace = "plugin.video.jellyfin";
-  version = "1.1.1";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "jellyfin";
    repo = "jellyfin-kodi";
    rev = "v${version}";
-    sha256 = "sha256-Pi8q64VykEfyIm9VlNOkWFeEhEhl7D6KLnNLpVsY+iU=";
+    sha256 = "sha256-xWLwtGeKu2W9u96jvLRRluSsnFjfad1/XSIcad00c3Y=";
  };

  nativeBuildInputs = [ python ];
@@ -307,8 +307,8 @@ let
      ${virtiofsd}/bin/virtiofsd --xattr --socket-path virtio-xchg.sock --sandbox none --seccomp none --shared-dir xchg &

      # Wait until virtiofsd has created these sockets to avoid race condition.
-      until [[ -e virtio-store.sock ]]; do ${coreutils}/bin/sleep 1; done
-      until [[ -e virtio-xchg.sock ]]; do ${coreutils}/bin/sleep 1; done
+      until [[ -e virtio-store.sock ]]; do ${coreutils}/bin/sleep 0.1; done
+      until [[ -e virtio-xchg.sock ]]; do ${coreutils}/bin/sleep 0.1; done

      ${qemuCommand}
      EOF
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1772531288-g7d96a6"
+        "@sourcegraph/amp": "^0.0.1773230699-gca2c06"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1772531288-g7d96a6",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1772531288-g7d96a6.tgz",
-      "integrity": "sha512-h3MxHL/L0c8SD7NIdwpE7M1FWxd9OG7u8FjiLITVdtQg39cJmBoU+auOqJO5DfpsVxxUqhuatm0F6ldXzNbb9A==",
+      "version": "0.0.1773230699-gca2c06",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1773230699-gca2c06.tgz",
+      "integrity": "sha512-YCPHBCJj4IClLwZ6vbK6r/MyQjv9BUwt0RBoilZQE5IjFR+qfgCPJteuYD3uwnPY57AhodCGWSCknfUPi2/LPg==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1772531288-g7d96a6";
+  version = "0.0.1773230699-gca2c06";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-BZ4o4AWGiV/1oxFqvGc9wy92Gi8dedeuMRSOHLQHPnA=";
+    hash = "sha256-pNiihZiMcKYcCjtbFUr3yv+kO3SfPQzVH9vFkzOljPs=";
  };

  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-2etugV/fdw/AjznYjEfCSXTv1tkomcNK9UJT7/1T8KY=";
+  npmDepsHash = "sha256-jGv5+gELAWD00jh4EAeyOgzVShpE9X/TXBuR6nNkJJ8=";

  propagatedBuildInputs = [
    ripgrep
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
  pname = "ansel";
-  version = "0-unstable-2026-03-03";
+  version = "0-unstable-2026-03-11";

  src = fetchFromGitHub {
    owner = "aurelienpierreeng";
    repo = "ansel";
-    rev = "58d4f3ee9f7c7b17474e85d9bc5f08f3e108b4b0";
-    hash = "sha256-zWmhHI8l+Tnm8hRRWT4X4FE/piOfXE/GBCP4WT63WfE=";
+    rev = "d718fd06e944415af093a3a89c7ccffb3928e5aa";
+    hash = "sha256-EAM/kz+RDuc+G7/CjIJDRScCq85YAqVnYNUs6HLyavY=";
    fetchSubmodules = true;
  };

@@ -25,8 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
      --replace-fail "cmake_minimum_required( VERSION 2.8 )" "cmake_minimum_required(VERSION 3.10)"
  '';

-  # fixes: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only.
-  NIX_CFLAGS_COMPILE = lib.optional stdenv.cc.isClang "-Wno-error=deprecated-declarations";
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    # fixes: error: 'sprintf' is deprecated: This function is provided for compatibility reasons only.
+    NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  };

  meta = {
    homepage = "https://github.com/vietjtnguyen/argagg";
@@ -77,6 +77,7 @@ let
    #        ],
    #     )
    [
+      bash # see https://github.com/NixOS/nixpkgs/pull/489519
      coreutils
      diffutils
      file
@@ -87,6 +88,7 @@ let
      gnused
      gnutar
      gzip
+      python3 # see https://github.com/NixOS/nixpkgs/pull/489519
      unzip
      which
      zip
@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  goocanvas_1,
+  pkg-config,
+  gtk2,
+  libxml2,
+  curl,
+  libmicrohttpd,
+  libzip,
+  libusb1,
+  qrencode,
+  json-glib,
+  php,
+  libwebsockets,
+  openssl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bellepoule";
+  version = "5.5";
+
+  src =
+    (fetchgit {
+      url = "https://git.launchpad.net/bellepoule";
+      rev = finalAttrs.version;
+      hash = "sha256-SNL6yaaKk/GU8+EvHki4ysMuCHEQxFjPd3iwVIdJtCs=";
+    }).overrideAttrs
+      (oldAttrs: {
+        env = oldAttrs.env or { } // {
+          GIT_CONFIG_COUNT = 1;
+          GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+          GIT_CONFIG_VALUE_0 = "git@github.com:";
+        };
+      });
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    gtk2
+    libxml2
+    curl
+    libmicrohttpd
+    goocanvas_1
+    qrencode
+    openssl
+    json-glib
+    libzip
+    libusb1
+    libwebsockets
+  ];
+
+  makeFlags = [
+    "HOME=$(pwd)"
+    "DISTRIB=nixos"
+    "V=1"
+    "DESTDIR=$(out)"
+  ];
+
+  # Use system php
+  # Disable git soft depend
+  # Disable dch changelog generation
+  # FixUp `install` phase output
+  postPatch = ''
+    substituteInPlace ./sources/common/network/web_server.cpp --replace-fail "php7.4" "${php}/bin/php"
+    substituteInPlace ./build/BellePoule/debian/bellepoule.desktop.template --replace-fail "/usr" "$out"
+    substituteInPlace ./build/BellePoule/Makefile \
+      --replace-fail "git" "#git" \
+      --replace-fail "dch" "echo Ignoring: dch" \
+      --replace-fail "/usr" ""
+  '';
+
+  # Prepare release directory for buildPhase
+  preBuild = ''
+    cd build/BellePoule
+    make HOME=$(pwd) DISTRIB=nixos V=1 package
+    cd ./Perso/PPA/${finalAttrs.pname}/${finalAttrs.pname}_${finalAttrs.version}
+  '';
+
+  meta = {
+    description = "Fencing tournaments management software";
+    homepage = "http://betton.escrime.free.fr";
+    changelog = "https://git.launchpad.net/bellepoule/log/?h=${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tgi74 ];
+    platforms = lib.platforms.linux;
+    mainProgram = "bellepoule-supervisor";
+  };
+})
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "bitrise";
-  version = "2.39.1";
+  version = "2.39.2";

  src = fetchFromGitHub {
    owner = "bitrise-io";
    repo = "bitrise";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-/jD4FZTeT+RgNEJZqNZaSIsL1lSECdE6/fNyg1DJDYE=";
+    hash = "sha256-yduH5UkBwcp41pCeFyoOYtaTwvINrbMaQQlvmeRAXCY=";
  };

  # many tests rely on writable $HOME/.bitrise and require network access
@@ -10,16 +10,16 @@

 buildGoModule (finalAttrs: {
  pname = "buf";
-  version = "1.64.0";
+  version = "1.66.1";

  src = fetchFromGitHub {
    owner = "bufbuild";
    repo = "buf";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-vz7HtNe198Wjy4bjpx327VW11Qme5VWZMyeb56nWy0A=";
+    hash = "sha256-bBQSQ/ZLLSEYVmfpgh5OKapSHdBOFjrjAaMT/0js1Ts=";
  };

-  vendorHash = "sha256-jBwIDPDRdXO89uyrw2Ul2uE50zCLxS9qBzoYOQXupUQ=";
+  vendorHash = "sha256-JFuH/NXWhw/Myzk2ct5xzKGuMM4ma0og2YT7ZIq3kKg=";

  patches = [
    # Skip a test that requires networking to be available to work.
@@ -45,8 +45,8 @@ buildGoModule (finalAttrs: {
  preCheck = ''
    # Some tests take longer depending on builder load.
    substituteInPlace private/bufpkg/bufcheck/lint_test.go \
-      --replace-fail 'context.WithTimeout(context.Background(), 60*time.Second)' \
-                     'context.WithTimeout(context.Background(), 600*time.Second)'
+      --replace-fail 'context.WithTimeout(t.Context(), 60*time.Second)' \
+                     'context.WithTimeout(t.Context(), 600*time.Second)'
    # For WebAssembly runtime tests
    GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \
      ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix
@@ -88,6 +88,7 @@ buildGoModule (finalAttrs: {
    description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [
+      hythera
      jk
      lrewega
    ];
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "buildkit";
-  version = "0.27.1";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "moby";
    repo = "buildkit";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-vMSg5bYFkdWrdjexx/3kwyyingS5gqMcw5/JQ4RxDeU=";
+    hash = "sha256-DJ/nA8EPEx7OQBScP1LupOlMXgpsWXSJaBXdTgtyTg0=";
  };

  vendorHash = null;
@@ -12,14 +12,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bvibratr";
-  version = "1.0.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "sjaehn";
    repo = "BVibratr";
    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    sha256 = "sha256-bm4RKyLPR5WL52wXJ8w4YUZ1t9WoqYAw5ApMASVmiAQ=";
+    sha256 = "sha256-V3cy+JlpBjCYr4eyrr9fTuaA7bmi8A2SP5KA4o1qQDU=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -22,17 +22,7 @@ availableFileSystemTypes:

 showNotEncryptedBootMessage: false

-bios:
-    mountPoint: "/boot"
-    minimumSize: 512MiB
-    recommendedSize: 1GiB
-    label: "BOOT"
-
 partitionLayout:
-    - name: "boot"
-      filesystem: "ext4"
-      mountPoint: "/boot"
-      size: 1GiB
    - name: "root"
      filesystem: "unknown"
      noEncrypt: false
@@ -2,9 +2,9 @@
  lib,
  python3,
  fetchFromGitLab,
-  fetchpatch,
  openldap,
  nixosTests,
+  postgresql,
 }:

 let
@@ -12,55 +12,52 @@ let
 in
 python.pkgs.buildPythonApplication rec {
  pname = "canaille";
-  version = "0.0.74";
+  version = "0.2.1";
  pyproject = true;

  src = fetchFromGitLab {
    owner = "yaal";
    repo = "canaille";
    tag = version;
-    hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4=";
+    hash = "sha256-6Ksvl03HgpVQRhHtKWQwTrPBkaXcVWoejGaMFBAykHM=";
  };

-  patches = [
-    # https://gitlab.com/yaal/canaille/-/merge_requests/275
-    (fetchpatch {
-      url = "https://gitlab.com/yaal/canaille/-/commit/1c7fc8b1034a4423f7f46ad8adeced854910b702.patch";
-      hash = "sha256-fu7D010NG7yUChOve7HY3e7mm2c/UGpfcTAiTU8BnGg=";
-    })
-  ];
-
  build-system = with python.pkgs; [
    hatchling
    babel
    setuptools
  ];

-  dependencies =
-    with python.pkgs;
-    [
-      blinker
-      flask
-      flask-caching
-      flask-wtf
-      pydantic-settings
-      httpx
-      wtforms
-    ]
-    ++ sentry-sdk.optional-dependencies.flask;
+  dependencies = with python.pkgs; [
+    blinker
+    click
+    dramatiq
+    dramatiq-eager-broker
+    flask
+    flask-caching
+    flask-dramatiq
+    flask-session
+    flask-wtf
+    httpx
+    pydantic-settings
+    wtforms
+  ];

  nativeCheckInputs =
    with python.pkgs;
    [
      pytestCheckHook
+      postgresql
      coverage
      flask-webtest
      pyquery
      pytest-cov-stub
      pytest-httpserver
      pytest-lazy-fixtures
+      pytest-postgresql
      pytest-smtpd
      pytest-xdist
+      python-avatars
      scim2-tester
      slapd
      toml
@@ -68,13 +65,7 @@ python.pkgs.buildPythonApplication rec {
      time-machine
      pytest-scim2-server
    ]
-    ++ optional-dependencies.front
-    ++ optional-dependencies.oidc
-    ++ optional-dependencies.scim
-    ++ optional-dependencies.ldap
-    ++ optional-dependencies.postgresql
-    ++ optional-dependencies.otp
-    ++ optional-dependencies.sms;
+    ++ (lib.concatLists (builtins.attrValues optional-dependencies));

  postInstall = ''
    mkdir -p $out/etc/schema
@@ -87,17 +78,21 @@ python.pkgs.buildPythonApplication rec {
    export SBIN="${openldap}/bin"
    export SLAPD="${openldap}/libexec/slapd"
    export SCHEMA="${openldap}/etc/schema"
-
-    # Just use their example config for testing
-    export CONFIG=tests/app/fixtures/default-config.toml
  '';

+  disabledTests = [
+    # Tries to use DNS resolution
+    "test_send_new_email_error"
+    "test_send_test_email_ssl"
+  ];
+
  optional-dependencies = with python.pkgs; {
    front = [
      email-validator
      flask-babel
      flask-talisman
      flask-themer
+      isodate
      pycountry
      pytz
      tomlkit
@@ -108,10 +103,10 @@ python.pkgs.buildPythonApplication rec {
      joserfc
    ];
    scim = [
-      httpx
-      scim2-models
      authlib
+      httpx
      scim2-client
+      scim2-models
    ];
    ldap = [ python-ldap ];
    sentry = [ sentry-sdk ];
@@ -128,8 +123,18 @@ python.pkgs.buildPythonApplication rec {
      pillow
      qrcode
    ];
+    fido = [ webauthn ];
    sms = [ smpplib ];
-    server = [ hypercorn ];
+    captcha = [ captcha ];
+    server = [
+      asgiref
+      hypercorn
+      isodate
+      pydanclick
+      tomlkit
+    ];
+    redis = [ dramatiq ] ++ dramatiq.optional-dependencies.redis;
+    rabbitmq = [ dramatiq ] ++ dramatiq.optional-dependencies.rabbitmq;
  };

  passthru = {
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-codspeed";
-  version = "4.3.0";
+  version = "4.4.0";

  src = fetchFromGitHub {
    owner = "CodSpeedHQ";
    repo = "codspeed-rust";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-aOuKz7LEQU9hqJUw0M759A4zk8+9UhiMAnO7OwBc+T0=";
+    hash = "sha256-hvGpJXkdvVgN1I0xYomdlu0V0zjYK+qZB/FZ6FLbq1s=";
  };

-  cargoHash = "sha256-K1xm8Kw7TMspFmqvW4qRf4QXddarw3eUDTIuwbg1pGA=";
+  cargoHash = "sha256-oT10BxbLyHUBz9DHDyBNuqWNYK9zHUo8nlH+cr+LaR0=";

  nativeBuildInputs = [
    curl
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-sort";
-  version = "2.1.0";
+  version = "2.1.1";

  src = fetchFromGitHub {
    owner = "devinr528";
    repo = "cargo-sort";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jmiCwXRyuK10qb1/7bwhOT/Cq335S9BzKiRc/02wc1E=";
+    sha256 = "sha256-Ad4arLpD8tgNDUGHKBbIKt41oQfjMgzzyWnnw8Cjw0k=";
  };

-  cargoHash = "sha256-EzKXrN5TdWFP8zQjop2pIhavJ5a7t+YdK5s5WjwjLNM=";
+  cargoHash = "sha256-BnBo0oEZL5Ilqw/AJzDITkg388LjN+8/AwxRDHQt/9s=";

  meta = {
    description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";
@@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ccid";
-  version = "1.7.0";
+  version = "1.7.1";

  src = fetchFromGitHub {
    owner = "LudovicRousseau";
    repo = "CCID";
    tag = finalAttrs.version;
-    hash = "sha256-6eaznSIQZl1bpIe1F9EtwotF9BjOruJ9g/c2QrTgfUg=";
+    hash = "sha256-5GkpsrjGFfiGDNIhU9zsx0p7/MSVra1fse9yFhjGSFU=";
  };

  postPatch = ''
@@ -8,13 +8,13 @@

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

  src = fetchFromGitHub {
    owner = "SinTan1729";
    repo = "chhoto-url";
    tag = finalAttrs.version;
-    hash = "sha256-JrGiRYE9YLuUdOhIqtNOsk+yiTLeiaTVQ7A5g3jqk/8=";
+    hash = "sha256-mpFyvzvAL/8vSM3gmS0+vaXEB0TxBdBXQtfcYdFrcEk=";
  };

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

-  cargoHash = "sha256-QXSOeiXJadTQaCRRfbn3C3KDyKIV4eOa2IdHHPK5Dzo=";
+  cargoHash = "sha256-bn+u5KPZ8tk7iMSygFdIYQsczUahblsfZNgYrxA+CyI=";

  postInstall = ''
    mkdir -p $out/share/chhoto-url
@@ -11,14 +11,14 @@

 python3Packages.buildPythonApplication {
  pname = "chirp";
-  version = "0.4.0-unstable-2026-03-03";
+  version = "0.4.0-unstable-2026-03-11";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "kk7ds";
    repo = "chirp";
-    rev = "60f3edae35afe0b9542c8ef2eef047d6d42211ac";
-    hash = "sha256-b2dAb8RjV2X+j13tcCvmq0Nn0Xp5l6GNGPLRC/KMVao=";
+    rev = "74e1075fd884d30837e78fc3212984a508c124a3";
+    hash = "sha256-Z2z2p0It13JFAFQAa4BDICeF4P9JfMneO4fLKioa1yg=";
  };

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

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "cine";
-  version = "1.0.9";
+  version = "1.1.0";
  pyproject = false;

  src = fetchFromGitHub {
    owner = "diegopvlk";
    repo = "Cine";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-aw+M1wCGSbRRmKKcgyM4luEr0WtPLw/v7SqBE1B5H9U=";
+    hash = "sha256-vkK/6EmbER/xp8Uk5aCqHNIUVroZeXN/pcBjB2Hyifs=";
    fetchSubmodules = true;
  };

@@ -1,15 +1,15 @@
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1249,7 +1249,7 @@
-  "sha2",
+@@ -1265,7 +1265,7 @@
+  "sha2 0.10.9",
  "shadowquic",
  "shadowsocks",
 - "smoltcp 0.12.0 (git+https://github.com/smoltcp-rs/smoltcp.git?rev=ac32e64)",
 + "smoltcp",
  "sock2proc",
-  "socket2 0.6.1",
-  "tempfile",
-@@ -4234,7 +4234,7 @@
+  "socket2 0.6.2",
+  "ssh-key",
+@@ -4636,7 +4636,7 @@
  "etherparse 0.16.0",
  "futures",
  "rand 0.8.5",
@@ -18,7 +18,7 @@
  "spin 0.9.8",
  "tokio",
  "tokio-util",
-@@ -6632,20 +6632,6 @@
+@@ -7293,20 +7293,6 @@
 ]
 
 [[package]]
@@ -38,13 +38,13 @@
 -[[package]]
 name = "sock2proc"
 version = "0.1.0"
- source = "git+https://github.com/Watfaq/sock2proc.git?rev=1097e6b#1097e6ba692025f80567446e0035af1222f5231f"
-@@ -8964,7 +8950,7 @@
+ source = "git+https://github.com/Watfaq/sock2proc.git?rev=9f9e630#9f9e6304d62285115b2e4fa632527ae563bf0fcc"
+@@ -9797,7 +9783,7 @@
  "netstack-lwip",
  "netstack-smoltcp",
  "rand 0.9.2",
 - "smoltcp 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "smoltcp",
-  "socket2 0.6.1",
+  "socket2 0.6.2",
  "tokio",
  "tracing",
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "clash-rs";
-  version = "0.9.4";
+  version = "0.9.5";

  src = fetchFromGitHub {
    owner = "Watfaq";
    repo = "clash-rs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-WtNnBw0/eAz/uO/dlD2yRZHW38CXIT8zhh4lZ3HaIFs=";
+    hash = "sha256-ymxT6AGBDTfiMbpU4Ou/SwAnUZF3vKvtt/BgWRtQTJc=";
  };

-  cargoHash = "sha256-8SLBsYtO6qVihc/C9R3ZptHCKgl2iXiQrOWqgDBXdTc=";
+  cargoHash = "sha256-G1RLUFnQVX6tbLIF6ql6RDGZUwGPGFBHgx15KT3/tNQ=";

  cargoPatches = [ ./Cargo.patch ];

@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  env = {
    # requires features: sync_unsafe_cell, unbounded_shifts, let_chains, ip
    RUSTC_BOOTSTRAP = 1;
-    RUSTFLAGS = "--cfg tokio_unstable";
+    RUSTFLAGS = "--cfg tokio_unstable -A stable_features";
    NIX_CFLAGS_COMPILE = "-Wno-error";
  };

@@ -1,46 +1,46 @@
 {
-  "version": "2.1.70",
-  "buildDate": "2026-03-06T00:12:53Z",
+  "version": "2.1.74",
+  "buildDate": "2026-03-11T23:35:46Z",
  "platforms": {
    "darwin-arm64": {
      "binary": "claude",
-      "checksum": "6181e50bc9a4185f36e543744d256b740e0dfa3c3fdcf1d04b78387b2b466781",
-      "size": 197364336
+      "checksum": "48a07e2887cd4879219d319e48ac5cc6e2098238c7c0abe01c57a35430941cb7",
+      "size": 190412928
    },
    "darwin-x64": {
      "binary": "claude",
-      "checksum": "338755dce5a5c99419f37be8dd424410c35fc476f7d8ccacd9ed7ef33b8473ae",
-      "size": 203440464
+      "checksum": "31fa7ebd424719406cb123f95781c5e795f7a9899611ff1a9213092458d346eb",
+      "size": 196493184
    },
    "linux-arm64": {
      "binary": "claude",
-      "checksum": "264c669ce4740bb4896b07ac0110190bcf618eddd4fb0068b3fe2ce989734682",
-      "size": 237790658
+      "checksum": "bfa883897a26433c5132a641b32d1fce00e1eff04a61bf52cd9ab85aeac2ea95",
+      "size": 232315636
    },
    "linux-x64": {
      "binary": "claude",
-      "checksum": "1e5c1011ec899ef0ca9f0811c13c3ed44437422aed85af600d5fe50746faaf1d",
-      "size": 240875945
+      "checksum": "e5613610deee76cd32bc9b8e9e364da074fcd880705f837a4c9ee1ec38f9b73b",
+      "size": 235079569
    },
    "linux-arm64-musl": {
      "binary": "claude",
-      "checksum": "3e77f661dc5f32b37fd29598b02063ff713c7b787f9abea55585e84f548daba0",
-      "size": 228326130
+      "checksum": "72f4bc8e016357111229e9a026b4ff322dd5fa5b2782f59368bd788f78e9af75",
+      "size": 222834724
    },
    "linux-x64-musl": {
      "binary": "claude",
-      "checksum": "7f6b5dea1e6cb12129f948ea61471230b850a32c1d81105520669b06013a7834",
-      "size": 231473433
+      "checksum": "08fbc3f3f6d95a5817bff74ef02145196e2d0e5947bd6cc52fd3ea8a8b47a51c",
+      "size": 225677057
    },
    "win32-x64": {
      "binary": "claude.exe",
-      "checksum": "ca5b3b16da96bec672f6d90d211945f4d2bb04609c35eba8f5de9c3e33d15bbe",
-      "size": 246684832
+      "checksum": "f84f832c0661157b38262595f3228353079d8d44c3f24cefe2d67b6d56fd9042",
+      "size": 238872736
    },
    "win32-arm64": {
      "binary": "claude.exe",
-      "checksum": "2436d88ec2b21289c0422d377e41eed920528d78af2b9cca983168fcdf1fee1b",
-      "size": 238326944
+      "checksum": "ee6523a7a53256c0000853f032e185cbe3f9e611c2e9fa0c4285c6c6a9869da4",
+      "size": 233458848
    }
  }
 }
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    wrapProgram $out/bin/claude \
      --set DISABLE_AUTOUPDATER 1 \
      --set-default FORCE_AUTOUPDATE_PLUGINS 1 \
+      --set DISABLE_INSTALLATION_CHECKS 1 \
      --set USE_BUILTIN_RIPGREP 0 \
      --prefix PATH : ${
        lib.makeBinPath (
@@ -1,12 +1,12 @@
 {
  "name": "@anthropic-ai/claude-code",
-  "version": "2.1.70",
+  "version": "2.1.74",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@anthropic-ai/claude-code",
-      "version": "2.1.70",
+      "version": "2.1.74",
      "license": "SEE LICENSE IN README.md",
      "bin": {
        "claude": "cli.js"
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
  pname = "claude-code";
-  version = "2.1.70";
+  version = "2.1.74";

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-mxZVgsaRGVd/3VNWJqVMfRyrDid0MOuzrGIcInQHIEk=";
+    hash = "sha256-74xAW5sc3l5SH7UUFsUVpK6A6gTPn4fGg+c51MsXXhE=";
  };

-  npmDepsHash = "sha256-k+UORB4anWeBQIr+XbkKjsw792e/viz2Ous8rXKuYJI=";
+  npmDepsHash = "sha256-FQEQQK8UIvPw8WMYGW+X7TPAWi+SVJEhUV0MqO2gQz0=";

  strictDeps = true;

@@ -11,7 +11,7 @@
 buildNpmPackage rec {
  pname = "clever-tools";

-  version = "4.6.1";
+  version = "4.7.0";

  nodejs = nodejs_22;

@@ -19,10 +19,10 @@ buildNpmPackage rec {
    owner = "CleverCloud";
    repo = "clever-tools";
    rev = version;
-    hash = "sha256-n/iDQdvAaINeIfCbvnL6OGuJ35xS6HsTtFxZ4nKiPWA=";
+    hash = "sha256-W7SE6ZdoFArKmnKiHNDRTuIMvchG/QTFahacUKkzYTI=";
  };

-  npmDepsHash = "sha256-muuDE5bd35IlAhq2mOCsp+5U2zf4RuaMxhvkmw8WCHc=";
+  npmDepsHash = "sha256-pZ8MYQ+QAPDk/1XI3lCgc+wstcwDHo+k59jWcc9/hgs=";

  nativeBuildInputs = [
    installShellFiles
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "cloudflare-dynamic-dns";
-  version = "4.4.2";
+  version = "4.4.3";

  src = fetchFromGitHub {
    owner = "zebradil";
    repo = "cloudflare-dynamic-dns";
    tag = finalAttrs.version;
-    hash = "sha256-Ko69QXKQczt/H9Stl9Q0lUlhjfJ1SxoF1MGA2tO3UMg=";
+    hash = "sha256-7KGNLz/VwvICUNJuoeWMEFV+gpbqPATF5xILzcHIk+g=";
  };

  vendorHash = "sha256-rqp+K5pnslgfwpVxK/Ul3g1MGRKsWl8lpeMsS5Qqk10=";
@@ -53,13 +53,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "cockpit";
-  version = "356";
+  version = "357";

  src = fetchFromGitHub {
    owner = "cockpit-project";
    repo = "cockpit";
    tag = finalAttrs.version;
-    hash = "sha256-Mmxp/rh+4YQovAUdnNkKnjZXz1kcdnhG2TuBhNSXY+Y=";
+    hash = "sha256-4KckFQmFin0dkq9ouHRXSrkmlmsTRtAcW8Ln/Vjhylc=";
    fetchSubmodules = true;
  };

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

 buildGoModule (finalAttrs: {
  pname = "codecrafters-cli";
-  version = "52";
+  version = "53";

  src = fetchFromGitHub {
    owner = "codecrafters-io";
    repo = "cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-RgKqZ9C3aK2N3gjeX1qvLtojO8Y+jik+HrOO9UlpSvo=";
+    hash = "sha256-LuMLYupL6OgWujJzH/gu3VRI24LjmqOwPOP2ROGcjlk=";
    # A shortened git commit hash is part of the version output, and is
    # needed at build time. Use the `.git` directory to retrieve the
    # commit SHA, and remove the directory afterwards since it is not needed
@@ -20,13 +20,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codex";
-  version = "0.111.0";
+  version = "0.114.0";

  src = fetchFromGitHub {
    owner = "openai";
    repo = "codex";
    tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-hdR70BhiMg9G/ibLCeHnRSY3PcGZDv0vnqBCbzSRD6I=";
+    hash = "sha256-7t+mVwP4+YrG1ciI+OLqsK7TUM9SrDbPsJNrt26iy9c=";
  };

  sourceRoot = "${finalAttrs.src.name}/codex-rs";
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    '';
  };

-  cargoHash = "sha256-Ym2fB9IWQzYdgOX3hiBd9XUI00xF4cIoKO2jpal4eUA=";
+  cargoHash = "sha256-Ig3VMNN1oeC9DyjjVPTiXw4JXCuO01eRYJClcIXu8vQ=";

  nativeBuildInputs = [
    clang
@@ -12,18 +12,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "commitlint";
-  version = "20.4.3";
+  version = "20.4.4";

  src = fetchFromGitHub {
    owner = "conventional-changelog";
    repo = "commitlint";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CciE9m22C1RvB2k0870walO3LwkXFZKVnTYQngq9pII=";
+    hash = "sha256-Nt3uq5FkdpLyjSaQin4avcF4hqUxkd18f+k4I1uxy64=";
  };

  yarnOfflineCache = fetchYarnDeps {
    inherit (finalAttrs) src;
-    hash = "sha256-zKODU4opWFY1dJ7/vx8q4DQ2NSclShULWv3XrTjpktk=";
+    hash = "sha256-vD+63mWGZAaLut+xMSD7nnAvGSSl7XhSJykUWYDKWQ4=";
  };

  nativeBuildInputs = [
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cosmic-reader";
-  version = "0-unstable-2026-02-17";
+  version = "0-unstable-2026-03-09";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-reader";
-    rev = "cbf4fa1e28ad807b60ad3555d250f0611a6a59fc";
-    hash = "sha256-19Bp1EeMq1C1JP3xMfiFVDF8rqYJX4I2CzayJpqGxFM=";
+    rev = "a7a2b6dab1603c28ba42a66f1ea63fd85062d22f";
+    hash = "sha256-4IUgrMVDHJwdqKmu//t52Ngwr3QWeVgptDcllkyof0k=";
  };

  cargoHash = "sha256-p0dg5RNXkzbi+/RB5k+jr34RNOp+Irahj0BiFUddfnk=";
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "deck";
-  version = "1.55.2";
+  version = "1.56.0";

  src = fetchFromGitHub {
    owner = "Kong";
    repo = "deck";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-d8klm5pac6hINuiQhOMItSZx+lIVPwZEe+bpiMCiefk=";
+    hash = "sha256-F57BuEU91wRLVaA4YYHyqCKdBL60ZiHEAyuuioLN66c=";
  };

  nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
  ];

  proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-eGL42rfNnrc9vSUEZd7xilXO+8O7RffajeLkFF9S+xI=";
+  vendorHash = "sha256-joVAsg714Nuizv1fYYMes7vGsWbIvmUPKRDuU/Hwyso=";

  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd deck \
@@ -1,4 +1,27 @@
-{ python3Packages }:
+{
+  lib,
+  python3,
+  runCommand,
+  # configurable options
+  extraPackages ? (ps: [ ]),
+}:

-with python3Packages;
-toPythonApplication devpi-server
+let
+  pythonEnv = python3.withPackages (ps: [ ps.devpi-server ] ++ extraPackages ps);
+  server = python3.pkgs.devpi-server;
+in
+runCommand "devpi-${server.version}"
+  {
+    inherit (server)
+      pname
+      version
+      meta
+      passthru
+      ;
+  }
+  ''
+    mkdir -p $out/bin
+    for bin in ${lib.getBin server}/bin/*; do
+      ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/
+    done
+  ''
@@ -9,7 +9,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "dinit";
-  version = "0.20.0";
+  version = "0.21.0";

  src = fetchFromGitHub {
    owner = "davmac314";
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
    postFetch = ''
      [ -f "$out/BUILD" ] && rm "$out/BUILD"
    '';
-    hash = "sha256-71BUjguKt9Ow5n2olnIaTtOJJ/Bap50SJ3HD+91Rj6s=";
+    hash = "sha256-PkriMQrvmBCZsReATcHBkHu9AJQDSvjctPAifseuJGI=";
  };

  postPatch = ''
@@ -8,18 +8,18 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "drupal";
-  version = "11.3.3";
+  version = "11.3.5";

  src = fetchFromGitLab {
    domain = "git.drupalcode.org";
    owner = "project";
    repo = "drupal";
    tag = finalAttrs.version;
-    hash = "sha256-QD/vk19OLrI8whxZ9dJROL/v90U4QuCfeONs0OX4qS4=";
+    hash = "sha256-h01wI6EcVwynXVYUJDokG0rS0I7SxDfu1/sNFan96Og=";
  };

  composerNoPlugins = false;
-  vendorHash = "sha256-YsNg5l72htLoJgBhQ+RYxWYK5nB5Nq7Js6tf8L+BE7E=";
+  vendorHash = "sha256-R/9F7JGMlTnque6Ip5NTN8alKdIUr1+Zyds2ks2sEko=";

  passthru = {
    tests = {
@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "dump_syms";
-  version = "2.3.6";
+  version = "2.3.7";

  src = fetchFromGitHub {
    owner = "mozilla";
    repo = "dump_syms";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ABfjLV6WMIiaSiyfR/uxL6+VyO/pO6oZjbJSAxRGXuE=";
+    hash = "sha256-fCplZFp+yONBd2HDDlX/6XcmnQFbsnVmiS5b8fqGOAE=";
  };

-  cargoHash = "sha256-t9xK7epfBp1XgewlAuAnInlKQDQ+3gVNmJoLNcey8YU=";
+  cargoHash = "sha256-guJgkcldcKvi3XWolAqyB5bFzlSMNQQMzri6axGJpLo=";

  nativeBuildInputs = [
    pkg-config
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {

  passthru = {
    tests = {
-      envfs = nixosTests.envfs;
+      inherit (nixosTests) envfs envfs-systemd-stage-1;
    };

    updateScript = nix-update-script { };
@@ -38,9 +38,9 @@ let
    # However, the version string is more useful for end-users.
    # These are contained in a attrset of their own to make it obvious that
    # people should update both.
-    version = "1.36.2";
-    rev = "dc2d3098ae5641555f15c71d5bb5ce0060a8015c";
-    hash = "sha256-ll7gn3y2dUW3kMtbUTjfi7ZTviE87S30ptiRlCPec9Q=";
+    version = "1.36.5";
+    rev = "41749943780b54b70b510b1b1a4805ae529e174a";
+    hash = "sha256-dT6ehfmW/huuyitqIlYAlEzUE6WrVA39sDKxatkZGaY=";
  };

  # these need to be updated for any changes to fetchAttrs
@@ -49,8 +49,8 @@ let
      depsHash
    else
      {
-        x86_64-linux = "sha256-CUWT2EIHG9vWo4aUbA18SpYn2HTa9haWNo7lGLN8ihw=";
-        aarch64-linux = "sha256-bdFQlvBi7UG2oV8h74geNZbDQCXh+4oIQxD8JNtpWf4=";
+        x86_64-linux = "sha256-ty429bQBZRNKMWsjUUv07ICrq5d4FjR1zjtO+nbbqiA=";
+        aarch64-linux = "sha256-59sY+bpGsKMDthcj+jw00WhN+vsP5MOTXy0m8HJxebM=";
      }
      .${stdenv.system} or (throw "unsupported system ${stdenv.system}");

@@ -20,20 +20,20 @@ stdenv.mkDerivation (finalAttrs: {
  # the Equicord repository. Dates as tags (and automatic releases) were the compromise
  # we came to with upstream. Please do not change the version schema (e.g., to semver)
  # unless upstream changes the tag schema from dates.
-  version = "2026-03-03";
+  version = "2026-03-11";

  src = fetchFromGitHub {
    owner = "Equicord";
    repo = "Equicord";
    tag = finalAttrs.version;
-    hash = "sha256-JGzzT0HXkopUVocgtz3cSQBD69W+PPFZqWrfJth12uo=";
+    hash = "sha256-bx0zXbkXBzxB56yvR9Svuwm0Ci8NBdT+7kS5idOD4E4=";
  };

  pnpmDeps = fetchPnpmDeps {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_10;
    fetcherVersion = 3;
-    hash = "sha256-4mpqjkCCCjzNpLns6Q3TDBqf29wg0jooRnz8nnJRlN4=";
+    hash = "sha256-jG9A/nIU8pU8c5JT/fLJn3M6EJf2vB+pm5LdrvAr22M=";
  };

  nativeBuildInputs = [
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .3.2593
 .3.2803