Merge staging-next into staging

2026-01-26 00:20:52 +00:00
parent c3cad4b3f9 6f836daa90
commit 7673a2fb77
106 changed files with 961 additions and 882 deletions
@@ -97,7 +97,7 @@ jobs:
          github.event_name == 'pull_request_target' &&
          !contains(fromJSON(inputs.headBranch).type, 'development')
        with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
          configuration-path: .github/labeler.yml # default
          sync-labels: true

@@ -107,7 +107,7 @@ jobs:
          github.event_name == 'pull_request_target' &&
          !contains(fromJSON(inputs.headBranch).type, 'development')
        with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
          configuration-path: .github/labeler-no-sync.yml
          sync-labels: false

@@ -120,7 +120,7 @@ jobs:
          github.event_name == 'pull_request_target' &&
          contains(fromJSON(inputs.headBranch).type, 'development')
        with:
-          repo-token: ${{ steps.app-token.outputs.token }}
+          repo-token: ${{ steps.app-token.outputs.token || github.token }}
          configuration-path: .github/labeler-development-branches.yml
          sync-labels: true

@@ -65,5 +65,5 @@ jobs:
        with:
          issue-number: 105153
          body: |
-            Periodic merge from `${{ inputs.from }}` into `[${{ inputs.into }}](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }})` has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
+            Periodic merge from `${{ inputs.from }}` into [`${{ inputs.into }}`](https://github.com/NixOS/nixpkgs/tree/${{ inputs.into }}) has [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}).
          token: ${{ steps.app-token.outputs.token }}
@@ -9,6 +9,9 @@ module.exports = async ({ github, context, core, dry }) => {

  const artifactClient = new DefaultArtifactClient()

+  // Detect if running in a fork (not NixOS/nixpkgs)
+  const isFork = context.repo.owner !== 'NixOS'
+
  async function downloadMaintainerMap(branch) {
    let run

@@ -68,9 +71,18 @@ module.exports = async ({ github, context, core, dry }) => {

    // We get here when none of the 10 commits we looked at contained a maintainer map.
    // For the master branch, we don't have any fallback options, so we error out.
-    // For other branches, we select a suitable fallback below.
-    if (branch === 'master') throw new Error('No maintainer map found.')
+    // In forks without merge-group history, return empty map to allow testing.
+    if (branch === 'master') {
+      if (isFork) {
+        core.warning(
+          'No maintainer map found. Using empty map (expected in forks without merge-group history).',
+        )
+        return {}
+      }
+      throw new Error('No maintainer map found.')
+    }

+    // For other branches, we select a suitable fallback below.
    const { stable, version } = classify(branch)

    const release = `release-${version}`
@@ -109,6 +121,11 @@ module.exports = async ({ github, context, core, dry }) => {
      return []
    }

+    // Forks don't have NixOS teams, return empty list
+    if (isFork) {
+      return []
+    }
+
    if (!members[team_slug]) {
      members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
        org: context.repo.owner,
@@ -304,9 +321,37 @@ module.exports = async ({ github, context, core, dry }) => {
        expectedHash: artifact.digest,
      })

-      const evalLabels = JSON.parse(
+      const changedPaths = JSON.parse(
        await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
-      ).labels
+      )
+      const evalLabels = changedPaths.labels
+
+      // Fetch all PR commits to check their messages for package patterns
+      const prCommits = await github.paginate(github.rest.pulls.listCommits, {
+        ...context.repo,
+        pull_number,
+        per_page: 100,
+      })
+      const commitMessages = prCommits.map((c) => c.commit.message)
+
+      // Label new package PRs: "packagename: init at X.Y.Z"
+      // Exclude NixOS module commits like "nixos/timekpr: init at 0.5.8"
+      const newPackagePattern = /(?<!nixos\/\S+): init at\b/
+      const hasNewPackages = changedPaths.attrdiff?.added?.length > 0
+      const commitsIndicateNewPackage = commitMessages.some((msg) =>
+        newPackagePattern.test(msg),
+      )
+      evalLabels['8.has: package (new)'] =
+        hasNewPackages && commitsIndicateNewPackage
+
+      // Label package update PRs: "packagename: X.Y.Z -> A.B.C"
+      // Matches versions like: 1.2.3, 0-unstable-2024-01-15, 1.3rc1, alpha, unstable
+      // Exclude NixOS module commits like "nixos/ncps: types.str -> types.path"
+      const updatePackagePattern = /(?<!nixos\/\S+): [\w.-]+ (->|→) [\w.-]+/
+      const commitsIndicateUpdate = commitMessages.some((msg) =>
+        updatePackagePattern.test(msg),
+      )
+      evalLabels['8.has: package (update)'] = commitsIndicateUpdate

      // TODO: Get "changed packages" information from list of changed by-name files
      // in addition to just the Eval results, to make this work for these packages
@@ -3931,12 +3931,6 @@
    githubId = 15181236;
    keys = [ { fingerprint = "AE1E 3B80 7727 C974 B972  AB3C C324 01C3 BF52 1179"; } ];
  };
-  bridgesense = {
-    name = "Saad Nadeem";
-    email = "saad29nadeem@gmail.com";
-    github = "BridgeSenseDev";
-    githubId = 88615188;
-  };
  britter = {
    name = "Benedikt Ritter";
    email = "beneritter@gmail.com";
@@ -16996,6 +16990,13 @@
    githubId = 68288772;
    name = "Markus Heinrich";
  };
+  MH0386 = {
+    name = "Mohamed Hisham Abdelzaher";
+    email = "mohamed.hisham.abdelzaher@gmail.com";
+    github = "MH0386";
+    githubId = 77013511;
+    matrix = "@mh0386:matrix.org";
+  };
  mh182 = {
    email = "mh182@chello.at";
    github = "mh182";
@@ -23262,6 +23263,12 @@
    github = "s1341";
    githubId = 5682183;
  };
+  saadndm = {
+    name = "Saad Nadeem";
+    email = "saad29nadeem@gmail.com";
+    github = "saadndm";
+    githubId = 88615188;
+  };
  sagikazarmark = {
    name = "Mark Sagi-Kazar";
    email = "mark.sagikazar@gmail.com";
@@ -118,6 +118,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.

 - `services.pingvin-share` has been removed as the `pingvin-share.backend` package was broken and the project was archived upstream.

+- `geph` package's built-in GUI `geph5-client-gui` has been [removed](https://github.com/geph-official/geph5/commit/f2221fb8386312daf2cef05483ebb353ff48bdb4) by the upstream. All users who wish to continue using the GUI should install the `gephgui-wry`, which is consistent with the official release version.
+
 ## Other Notable Changes {#sec-release-26.05-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -10,18 +10,18 @@
  vimUtils,
 }:
 let
-  version = "e3f788f-unstable-2025-12-13";
+  version = "6b01f95-unstable-2026-01-24";
  src = fetchFromGitHub {
    owner = "dmtrKovalenko";
    repo = "fff.nvim";
-    rev = "e3f788f87b014f61e39cd916edc766d10e563d73";
-    hash = "sha256-NSTo5zs9DvGDVUp6PJNHCQsSNPgdkJCTYvlA/IP12h4=";
+    rev = "6b01f95ca6305511ef28175c42b250925376f181";
+    hash = "sha256-vI1oOVzpTpYZ0ea6w0e2wyKa0TsyLFFauOZkhYbXLYM=";
  };
  fff-nvim-lib = rustPlatform.buildRustPackage {
    pname = "fff-nvim-lib";
    inherit version src;

-    cargoHash = "sha256-kNTJC+0KBQKt0nMY2HAUWnr55x8nTd5oRGeDuam8X30=";
+    cargoHash = "sha256-jch2snZVoDqPkbeuF++yc/3ikoWal29bTKZjkyDgVjU=";

    nativeBuildInputs = [
      pkg-config
@@ -49,10 +49,15 @@ vimUtils.buildVimPlugin {
  postPatch = ''
    substituteInPlace lua/fff/download.lua \
      --replace-fail \
-        "return plugin_dir .. '/../target'" \
+        "return plugin_dir .. '/../target/release'" \
        "return '${fff-nvim-lib}/lib'"
  '';

+  nvimSkipModule = [
+    # Skip single file dev config for testing fff.nvim locally
+    "empty_config"
+  ];
+
  passthru = {
    updateScript = nix-update-script {
      extraArgs = [ "--version=branch" ];
@@ -69,6 +74,7 @@ vimUtils.buildVimPlugin {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [
      GaetanLepage
+      saadndm
    ];
  };
 }
@@ -7,11 +7,10 @@
  makeDesktopItem,
  unzip,
  libsecret,
-  libXScrnSaver,
-  libxshmfence,
  buildPackages,
  at-spi2-atk,
  autoPatchelfHook,
+  buildFHSEnv,
  alsa-lib,
  libgbm,
  nss,
@@ -19,22 +18,21 @@
  xorg,
  systemdLibs,
  fontconfig,
+  imagemagick,
  libdbusmenu,
  glib,
-  buildFHSEnv,
  wayland,
  libglvnd,
-  libkrb5,
  openssl,
  webkitgtk_4_1,
-
-  # Populate passthru.tests
-  tests,
+  ripgrep,

  # needed to fix "Save as Root"
  asar,
  bash,
+}:

+{
  # Attributes inherit from specific versions
  version,
  vscodeVersion ? version,
@@ -54,10 +52,17 @@
  vscodeServer ? null,
  sourceExecutableName ? executableName,
  useVSCodeRipgrep ? false,
-  ripgrep,
  hasVsceSign ? false,
  patchVSCodePath ? true,
-  imagemagick,
+
+  # Populate passthru.tests
+  tests,
+
+  extraNativeBuildInputs ? [ ],
+
+  # Customize FHS environment
+  # Function that takes default buildFHSEnv arguments and returns modified arguments
+  customizeFHSEnv ? args: args,
 }:

 stdenv.mkDerivation (
@@ -77,82 +82,86 @@ stdenv.mkDerivation (
      {
        additionalPkgs ? pkgs: [ ],
      }:
-      buildFHSEnv {
-        # also determines the name of the wrapped command
-        pname = executableName;
-        inherit version;
+      let
+        defaultArgs = {
+          # also determines the name of the wrapped command
+          pname = executableName;
+          inherit version;

-        # additional libraries which are commonly needed for extensions
-        targetPkgs =
-          pkgs:
-          (with pkgs; [
-            # ld-linux-x86-64-linux.so.2 and others
-            glibc
+          # additional libraries which are commonly needed for extensions
+          targetPkgs =
+            pkgs:
+            (with pkgs; [
+              # ld-linux-x86-64-linux.so.2 and others
+              glibc

-            # dotnet
-            curl
-            icu
-            libunwind
-            libuuid
-            lttng-ust
-            openssl
-            zlib
+              # dotnet
+              curl
+              icu
+              libunwind
+              libuuid
+              lttng-ust
+              openssl
+              zlib

-            # mono
-            krb5
+              # mono
+              krb5

-            # Needed for headless browser-in-vscode based plugins such as
-            # anything based on Puppeteer https://pptr.dev .
-            # e.g. Roo Code
-            glib
-            nspr
-            nss
-            dbus
-            at-spi2-atk
-            cups
-            expat
-            libxkbcommon
-            xorg.libX11
-            xorg.libXcomposite
-            xorg.libXdamage
-            xorg.libxcb
-            xorg.libXext
-            xorg.libXfixes
-            xorg.libXrandr
-            cairo
-            pango
-            alsa-lib
-            libgbm
-            udev
-            libudev0-shim
-          ])
-          ++ additionalPkgs pkgs;
+              # Needed for headless browser-in-vscode based plugins such as
+              # anything based on Puppeteer https://pptr.dev .
+              # e.g. Roo Code
+              glib
+              nspr
+              nss
+              dbus
+              at-spi2-atk
+              cups
+              expat
+              libxkbcommon
+              xorg.libX11
+              xorg.libXcomposite
+              xorg.libXdamage
+              xorg.libxcb
+              xorg.libXext
+              xorg.libXfixes
+              xorg.libXrandr
+              cairo
+              pango
+              alsa-lib
+              libgbm
+              udev
+              libudev0-shim
+            ])
+            ++ additionalPkgs pkgs;

-        extraBwrapArgs = [
-          "--bind-try /etc/nixos/ /etc/nixos/"
-          "--ro-bind-try /etc/xdg/ /etc/xdg/"
-        ];
+          extraBwrapArgs = [
+            "--bind-try /etc/nixos/ /etc/nixos/"
+            "--ro-bind-try /etc/xdg/ /etc/xdg/"
+          ];

-        # symlink shared assets, including icons and desktop entries
-        extraInstallCommands = ''
-          ln -s "${finalAttrs.finalPackage}/share" "$out/"
-        '';
+          # symlink shared assets, including icons and desktop entries
+          extraInstallCommands = ''
+            ln -s "${finalAttrs.finalPackage}/share" "$out/"
+          '';

-        runScript = "${finalAttrs.finalPackage}/bin/${executableName}";
+          runScript = "${finalAttrs.finalPackage}/bin/${executableName}";

-        # vscode likes to kill the parent so that the
-        # gui application isn't attached to the terminal session
-        dieWithParent = false;
+          # vscode likes to kill the parent so that the
+          # gui application isn't attached to the terminal session
+          dieWithParent = false;

-        passthru = {
-          inherit executableName;
-          inherit (finalAttrs.finalPackage) pname version; # for home-manager module
+          passthru = {
+            inherit executableName;
+            inherit (finalAttrs.finalPackage) pname version; # for home-manager module
+          };
+
+          meta = meta // {
+            description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
+          };
        };
-
-        meta = meta // {
-          description = "Wrapped variant of ${pname} which launches in a FHS compatible environment, should allow for easy usage of extensions without nix-specific modifications";
-        };
-      };
+        customizedArgs = customizeFHSEnv defaultArgs;
+      in
+      buildFHSEnv customizedArgs;
  in
  {

@@ -225,13 +234,10 @@ stdenv.mkDerivation (

    buildInputs = [
      libsecret
-      libXScrnSaver
-      libxshmfence
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
      alsa-lib
      at-spi2-atk
-      libkrb5
      libgbm
      nss
      nspr
@@ -252,6 +258,7 @@ stdenv.mkDerivation (
      unzip
      imagemagick
    ]
+    ++ extraNativeBuildInputs
    ++ lib.optionals stdenv.hostPlatform.isLinux [
      autoPatchelfHook
      asar
@@ -2,7 +2,7 @@
  lib,
  stdenv,
  stdenvNoCC,
-  callPackage,
+  buildVscode,
  fetchurl,
  nixosTests,
  srcOnly,
@@ -51,7 +51,7 @@ let
  # This is used for VS Code - Remote SSH test
  rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086";
 in
-callPackage ./generic.nix {
+buildVscode {
  pname = "vscode" + lib.optionalString isInsiders "-insiders";

  executableName = "code" + lib.optionalString isInsiders "-insiders";
@@ -1,7 +1,7 @@
 {
  lib,
  stdenv,
-  callPackage,
+  buildVscode,
  fetchurl,
  nixosTests,
  commandLineArgs ? "",
@@ -38,7 +38,7 @@ let

  sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) ".";
 in
-callPackage ./generic.nix rec {
+buildVscode rec {
  inherit sourceRoot commandLineArgs useVSCodeRipgrep;

  # Please backport all compatible updates to the stable release.
@@ -1031,13 +1031,13 @@
    "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
  },
  "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-68JyLHSHyse7znn7egPLMz4DeyHaWAGfa0TLCHQJd4k=",
+    "hash": "sha256-Pco5/kiFOyqwjktDFgHgCtq/kVKshzZyp9cjT+mJYJs=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.56",
+    "rev": "v1.36.57",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ESu1guITtquRqdGI3KdMhOf24gjtii45i5TkVrqJ18U="
+    "vendorHash": "sha256-v7t3W7v38xw7M8r9rdx+9cTUT6FFY4x5ujkVYD7qThw="
  },
  "opsgenie_opsgenie": {
    "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
@@ -8,13 +8,13 @@
 buildKodiAddon rec {
  pname = "sponsorblock";
  namespace = "script.service.sponsorblock";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "siku2";
    repo = namespace;
    rev = "v${version}";
-    hash = "sha256-IBgh2kdPgCy+HHrR7UZxTgjF1LR77ABGlUp3PgaobNM=";
+    hash = "sha256-9+0gIY12C+bZNsCRzla1IFmtVZiiGnS4TL3srkOBWsQ=";
  };

  propagatedBuildInputs = [
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1768760544-gf06f5a"
+        "@sourcegraph/amp": "^0.0.1769346334-gc7e300"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1768760544-gf06f5a",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1768760544-gf06f5a.tgz",
-      "integrity": "sha512-ECw/n1n3aKERHW8qo5KaFgKgLDj4zJElFsyHnAS10BRv3ON0T6BPbboMvqvtYq1NEeX00QGpBDO2u0Q1+k3oGQ==",
+      "version": "0.0.1769346334-gc7e300",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1769346334-gc7e300.tgz",
+      "integrity": "sha512-inYgc+ARJbXEXrDMQsG2kwQI9/tRHD/TPubNGv6XnQSd0MxCq9hr4KxiSryFnw5qIASWYn85RdSy6LM9dRFa7Q==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1768760544-gf06f5a";
+  version = "0.0.1769346334-gc7e300";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-URgYg3SZXeHrw+xXiXC1BDe0/ZUFRu9mDmqtTIA9ObU=";
+    hash = "sha256-Y0ySMlYP/mvD+ydkGhqt03zYkFj6BmZpe2zLnAV5rDk=";
  };

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

-  npmDepsHash = "sha256-7r522RT+38rjv1YqjhR9XIhWYoxVHmRUKeYfToCbsHA=";
+  npmDepsHash = "sha256-2e0kJJqmIB3kAaSzATSaNojLvsCIq5MwTGK0y0OxfO4=";

  propagatedBuildInputs = [
    ripgrep
@@ -1,11 +1,9 @@
 {
  lib,
  stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
  fetchurl,
  jq,
-  buildFHSEnv,
  writeShellScript,
  coreutils,
  commandLineArgs ? "",
@@ -19,7 +17,7 @@ let
    information.sources."${hostPlatform.system}"
      or (throw "antigravity: unsupported system ${hostPlatform.system}");
 in
-(callPackage vscode-generic {
+(buildVscode {
  inherit commandLineArgs useVSCodeRipgrep;
  inherit (information) version vscodeVersion;
  pname = "antigravity";
@@ -34,32 +32,30 @@ in

  sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity";

-  # When running inside an FHS environment, try linking Google Chrome or Chromium
-  # to the hardcoded Playwright search path: /opt/google/chrome/chrome
-  buildFHSEnv =
-    args:
-    buildFHSEnv (
-      args
-      // {
-        extraBuildCommands = (args.extraBuildCommands or "") + ''
-          mkdir -p "$out/opt/google/chrome"
-        '';
-        extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
-        runScript = writeShellScript "antigravity-wrapper" ''
-          for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
-            if target=$(command -v "$candidate"); then
-              ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
-              break
-            fi
-          done
-          exec ${args.runScript} "$@"
-        '';
-      }
-    );
-
  tests = { };
  updateScript = ./update.js;

+  # When running inside an FHS environment, try linking Google Chrome or Chromium
+  # to the hardcoded Playwright search path: /opt/google/chrome/chrome
+  customizeFHSEnv =
+    args:
+    args
+    // {
+      extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
+      extraBuildCommands = (args.extraBuildCommands or "") + ''
+        mkdir -p "$out/opt/google/chrome"
+      '';
+      runScript = writeShellScript "antigravity-wrapper" ''
+        for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
+          if target=$(command -v "$candidate"); then
+            ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
+            break
+          fi
+        done
+        exec ${args.runScript} "$@"
+      '';
+    };
+
  meta = {
    mainProgram = "antigravity";
    description = "Agentic development platform, evolving the IDE into the agent-first era";
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "cagent";
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "docker";
+    repo = "cagent";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-J7IRlSsjXRDvbUKwnV2rrWnEmvqciJw3mN8NerQBtl4=";
+  };
+
+  vendorHash = "sha256-q7mP9JWJEdDbUO/3MHsJwiySNvN2SbhnhEbJArnCW3M=";
+
+  # Disable tests: Networked model providers and writable cache directories are required.
+  doCheck = false;
+
+  # Skip install checks on macOS: The build sandbox is missing the `/etc/protocols` file, which is required for validation.
+  doInstallCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "github.com/docker/cagent/pkg/version.Version=${finalAttrs.version}"
+    "-X"
+    "github.com/docker/cagent/pkg/version.Commit=${finalAttrs.src.tag}"
+  ];
+
+  meta = {
+    description = "Agent Builder and Runtime by Docker Engineering";
+    longDescription = ''
+      A powerful, easy-to-use, customizable multi-agent runtime that
+      orchestrates AI agents with specialized capabilities and tools,
+      and the interactions between agents.
+    '';
+    homepage = "https://github.com/docker/cagent";
+    changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}";
+    downloadPage = "https://github.com/docker/cagent/releases";
+    license = lib.licenses.asl20;
+    mainProgram = "cagent";
+    maintainers = with lib.maintainers; [ MH0386 ];
+  };
+})
@@ -1,8 +1,7 @@
 {
  lib,
  stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
  fetchurl,
  appimageTools,
  undmg,
@@ -24,7 +23,7 @@ let

  source = sources.${hostPlatform.system};
 in
-(callPackage vscode-generic rec {
+buildVscode rec {
  inherit useVSCodeRipgrep;
  inherit (sourcesJson) version vscodeVersion;
  commandLineArgs = finalCommandLineArgs;
@@ -46,6 +45,9 @@ in
    else
      source;

+  # for unpacking the DMG
+  extraNativeBuildInputs = lib.optionals hostPlatform.isDarwin [ undmg ];
+
  sourceRoot =
    if hostPlatform.isLinux then "${pname}-${version}-extracted/usr/share/cursor" else "Cursor.app";

@@ -66,7 +68,7 @@ in
    homepage = "https://cursor.com";
    changelog = "https://cursor.com/changelog";
    license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
    maintainers = with lib.maintainers; [
      aspauldingcode
      prince213
@@ -79,12 +81,4 @@ in
    ++ lib.platforms.darwin;
    mainProgram = "cursor";
  };
-}).overrideAttrs
-  (oldAttrs: {
-    nativeBuildInputs =
-      (oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
-
-    passthru = (oldAttrs.passthru or { }) // {
-      inherit sources;
-    };
-  })
+}
@@ -22,14 +22,14 @@

 stdenv.mkDerivation {
  pname = "curv";
-  version = "0.5-unstable-2026-01-17";
+  version = "0.5-unstable-2026-01-23";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "doug-moen";
    repo = "curv";
-    rev = "1c2eb68e47e3c61a98e39cd3c50f90691c5a268d";
-    hash = "sha256-PuRBnJswrg+PjtU6ize+PjoBpQSSEzO2CeCx9mQF+3w=";
+    rev = "17d03b534c69976ed60936beb8b7cc38e8c12c13";
+    hash = "sha256-qQLcRCha01b6ClUSPO2jMBDJsN28EhqzakTLu1medAQ=";
    fetchSubmodules = true;
  };

@@ -97,7 +97,8 @@ stdenv.mkDerivation {
    homepage = "https://codeberg.org/doug-moen/curv";
    license = lib.licenses.asl20;
    platforms = lib.platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
+    # aarch64 fails installCheckPhase: https://hydra.nixos.org/build/319705783
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
    maintainers = with lib.maintainers; [ pbsds ];
    mainProgram = "curv";
  };
@@ -2,7 +2,7 @@
  lib,
  autoreconfHook,
  fetchFromGitHub,
-  fltk,
+  fltk_1_3,
  libjpeg,
  libpng,
  libwebp,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    autoreconfHook
    pkg-config
-    fltk
+    fltk_1_3
    which
  ];

@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    libpng
    libwebp
    ssl
-    fltk
+    fltk_1_3
  ];

  outputs = [
@@ -19,7 +19,7 @@
  nativefiledialog-extended,
  nlohmann_json,
  opencolorio,
-  openexr,
+  openexr_2,
  openssl,
  opentimelineio,
  plutovg,
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
    nativefiledialog-extended
    nlohmann_json
    opencolorio
-    openexr
+    openexr_2
    openssl
    opentimelineio
    plutovg
@@ -14,7 +14,7 @@
  wayland,
  wayland-protocols,
  wayland-scanner,
-  wlroots,
+  wlroots_0_18,
  writeText,
  xcbutilwm,
  xwayland,
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
    pixman
    wayland
    wayland-protocols
-    wlroots
+    wlroots_0_18
  ]
  ++ lib.optionals enableXWayland [
    libX11
@@ -1,11 +1,11 @@
 {
  lib,
  fetchFromGitHub,
-  ocamlPackages,
+  ocaml-ng,
 }:

 let
-  inherit (ocamlPackages) buildDunePackage js_of_ocaml menhir;
+  inherit (ocaml-ng.ocamlPackages_5_2) buildDunePackage js_of_ocaml menhir;
 in

 buildDunePackage rec {
@@ -174,7 +174,7 @@ stdenv.mkDerivation (
      changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
      license = lib.licenses.agpl3Plus;
      teams = [ lib.teams.matrix ];
-      platforms = electron.meta.platforms ++ lib.platforms.darwin;
+      inherit (electron.meta) platforms;
      mainProgram = "element-desktop";
    };
  }
@@ -6,7 +6,7 @@
  gperf,
  kmod,
  pkg-config,
-  util-linux,
+  util-linuxMinimal,
  testers,
 }:

@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    kmod
-    util-linux
+    util-linuxMinimal
  ];

  configureFlags = [
@@ -2,7 +2,7 @@
  lib,
  nixosTests,
  fetchFromGitHub,
-  beamPackages,
+  beam27Packages,
  gitMinimal,
  pnpm_9,
  fetchPnpmDeps,
@@ -13,7 +13,7 @@

  mixReleaseName ? "domain", # "domain" "web" or "api"
 }:
-beamPackages.mixRelease rec {
+beam27Packages.mixRelease rec {
  pname = "firezone-server-${mixReleaseName}";
  version = "0-unstable-2025-08-31";

@@ -69,7 +69,7 @@ beamPackages.mixRelease rec {

  inherit mixReleaseName;

-  mixFodDeps = beamPackages.fetchMixDeps {
+  mixFodDeps = beam27Packages.fetchMixDeps {
    pname = "mix-deps-${pname}-${version}";
    inherit src version;
    hash = "sha256-h3l7HK9dxNmkHWfJyCOCXmCvFOK+mZtmszhRv0zxqoo=";
@@ -6,7 +6,8 @@
 }:

 buildEnv {
-  name = "flare-1.14";
+  pname = "flare";
+  version = "1.14";

  paths = [
    (callPackage ./engine.nix { })
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "flashmq";
-  version = "1.24.0";
+  version = "1.25.0";

  src = fetchFromGitHub {
    owner = "halfgaar";
    repo = "FlashMQ";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-aDIUTJVDo00qyAsNuXDptHehngwHm9AkPGgwiRRND/E=";
+    hash = "sha256-+74nTluVpEfbK1pfWnJR5uv51HPkNbwzXUkHb5NeWn8=";
  };

  nativeBuildInputs = [
@@ -3,6 +3,7 @@
  fetchurl,
  lib,
  stdenv,
+  argp-standalone,
  libgcrypt,
  readline,
  libgpg-error,
@@ -17,12 +18,22 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-W872u562gOSbSjYjV5kwrOeJn1OSWyBF/p+RrWkEER0=";
  };

+  postPatch = lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace man/Makefile.in \
+      --replace-fail \
+        '$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man $@.pre $@' \
+        '$(CPP_FOR_BUILD) -nostdinc -w -C -P -I. -I$(top_srcdir)/man -o $@ $@.pre'
+  '';
+
  depsBuildBuild = [ buildPackages.stdenv.cc ];

  buildInputs = [
    libgcrypt
    readline
    libgpg-error
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    argp-standalone
  ];

  configureFlags = [
@@ -63,6 +74,6 @@ stdenv.mkDerivation rec {
    license = lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.unix;
  };
 }
@@ -2,7 +2,7 @@
  fetchurl,
  lib,
  stdenv,
-  guile,
+  guile_2_2,
  guile-lib,
  libffi,
  pkg-config,
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  # Note: Glib support is optional, but it's quite useful (e.g., it's used by
  # Guile-GNOME).
  buildInputs = [
-    guile
+    guile_2_2
    glib
    guile-lib
  ];
@@ -29,7 +29,7 @@
  glslang,
  hwdata,
  stb,
-  wlroots,
+  wlroots_0_17,
  libdecor,
  lcms,
  lib,
@@ -37,7 +37,7 @@
  makeBinaryWrapper,
  nix-update-script,
  enableExecutable ? true,
-  enableWsi ? true,
+  enableWsi ? false,
 }:
 let
  frogShaders = fetchFromGitHub {
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
    vulkan-headers
  ]
  ++ lib.optionals enableExecutable (
-    wlroots.buildInputs
+    wlroots_0_17.buildInputs
    ++ [
      # gamescope uses a custom wlroots branch
      xorg.libXcomposite
@@ -3,17 +3,11 @@
  rustPlatform,
  fetchFromGitHub,
  pkg-config,
-  libxkbcommon,
  openssl,
  rust-jemalloc-sys-unprefixed,
  sqlite,
-  vulkan-loader,
-  wayland,
  iproute2,
  iptables,
-  libglvnd,
-  copyDesktopItems,
-  makeDesktopItem,
  nix-update-script,
 }:
 let
@@ -24,29 +18,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "geph5";
-  version = "0.2.86";
+  version = "0.2.93";

  src = fetchFromGitHub {
    owner = "geph-official";
    repo = "geph5";
    rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-68b6czefoqLskdqhc9kDIoS8eDCKu56lqvX8Jz47C3k=";
+    hash = "sha256-ZYcGW6Ssauf5BUs75KBV+4Zub2ZCVN29cWTxeNi87cI=";
  };

-  cargoHash = "sha256-CoYnP83Ci5Jp3Hunm2+xdXBu0mlhADf4jyfLSIXZ0jI=";
+  cargoHash = "sha256-0Ml8tgWghxhDJzUMMD+YGwy3fyFjKcNjbV8MDJW8rZk=";

  postPatch = ''
    substituteInPlace binaries/geph5-client/src/vpn/*.sh \
      --replace-fail 'PATH=' 'PATH=${binPath}:'
-
-    # This setting is dumped from https://github.com/geph-official/gephgui-wry/blob/a85a632448e548f69f9d1eea3d06a4bdc8be3d57/src/daemon.rs#L230
-    cat ${./settings_default.yaml} | base32 -w 0  | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567' '0123456789ABCDEFGHJKMNPQRSTVWXYZ' | sed 's/=//g' > binaries/geph5-client-gui/src/settings_default.yaml.base32
  '';

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

  buildInputs = [
    openssl
@@ -69,39 +57,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=traffcount::tests::test_traffic_count_basic"
    # Requires network
    "--skip=dns::tests::resolve_google"
+    "--skip=tests::test_clib"
    # Never finish
    "--skip=tests::test_blind_sign"
    "--skip=tests::test_generate_secret_key"
    "--skip=tests::ping_pong"
  ];

-  desktopItems = [
-    (makeDesktopItem {
-      name = "Geph5";
-      desktopName = "Geph5";
-      icon = "geph5";
-      exec = "geph5-client-gui";
-      categories = [ "Network" ];
-      comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
-    })
-  ];
-
-  postInstall = ''
-    install -m 444 -D binaries/geph5-client-gui/icon.png $out/share/icons/hicolor/512x512/apps/geph5.png
-  '';
-
-  postFixup = ''
-    # Add required but not explicitly requested libraries
-    patchelf --add-rpath '${
-      lib.makeLibraryPath [
-        wayland
-        libxkbcommon
-        vulkan-loader
-        libglvnd
-      ]
-    }' "$out/bin/geph5-client-gui"
-  '';
-
  passthru.updateScript = nix-update-script {
    extraArgs = [
      "--version-regex"
@@ -1,23 +0,0 @@
-exit_constraint: auto
-
-broker:
-  race:
-    - fronted:
-        front: https://www.cdn77.com/
-        host: 1826209743.rsc.cdn77.org
-    - fronted:
-        front: https://www.vuejs.org/
-        host: svitania-naidallszei-2.netlify.app
-        override_dns:
-          - 75.2.60.5:443
-    - fronted:
-        front: https://www.vuejs.org/
-        host: svitania-naidallszei-3.netlify.app
-        override_dns:
-          - 75.2.60.5:443
-    - aws_lambda:
-        function_name: geph-lambda-bouncer
-        region: us-east-1
-        obfs_key: 855MJGAMB58MCPJBB97NADJ36D64WM2T:C4TN2M1H68VNMRVCCH57GDV2C5VN6V3RB8QMWP235D0P4RT2ACV7GVTRCHX3EC37
-
-spoof_dns: true
@@ -0,0 +1,144 @@
+{
+  lib,
+  rustPlatform,
+  webkitgtk_4_1,
+  pkg-config,
+  buildNpmPackage,
+  makeDesktopItem,
+  fetchFromGitHub,
+  nix-update-script,
+  perl,
+  stdenv,
+  glib,
+  copyDesktopItems,
+  wrapGAppsHook4,
+  nodejs_22,
+}:
+let
+  pac-cmd = stdenv.mkDerivation {
+    pname = "pac-cmd";
+    version = "0-unstable-2020-01-07";
+
+    src = fetchFromGitHub {
+      owner = "getlantern";
+      repo = "pac-cmd";
+      rev = "495bad48b8601385daa8205ec4db504166dff18b";
+      hash = "sha256-T4g0FR20sOxJ20H4LTmhrA2EsRe8JYXj6MB2ImkbPsY=";
+    };
+
+    postPatch = ''
+      rm binaries/*/pac
+      substituteInPlace Makefile --replace-fail 'uname -p' 'uname -m'
+    '';
+
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ glib ];
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm755 -t $out/bin binaries/*/pac
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Change proxy auto-config settings of operation system";
+      homepage = "https://github.com/getlantern/pac-cmd";
+      license = lib.licenses.asl20;
+      mainProgram = "pac";
+      platforms = lib.platforms.all;
+    };
+  };
+in
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gephgui-wry";
+  version = "5.4.1";
+
+  src = fetchFromGitHub {
+    owner = "geph-official";
+    repo = "gephgui-pkg";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nlWFiEFraI4sUBTs/ZxiHpaeYHert78oPiyFc6LKV30=";
+    fetchSubmodules = true;
+  };
+
+  gephgui = buildNpmPackage {
+    pname = "gephgui";
+    inherit (finalAttrs) version src;
+
+    sourceRoot = "${finalAttrs.src.name}/gephgui-wry/gephgui";
+    npmDepsHash = "sha256-dGzmdvzKp/JHCgDf3NJb0oolgW4Y/spagzpeVpMF28w=";
+
+    # npm dependency install fails with nodejs_24: https://github.com/NixOS/nixpkgs/issues/474535
+    nodejs = nodejs_22;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -aR dist/* $out/
+
+      runHook postInstall
+    '';
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/gephgui-wry";
+  cargoHash = "sha256-7EJvcnltKlq94jahnMpvzdFJ8P12HjUGC6AOXirpcg4=";
+
+  nativeBuildInputs = [
+    pkg-config
+    perl
+    copyDesktopItems
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [ webkitgtk_4_1 ];
+
+  preBuild = ''
+    cp -r ${finalAttrs.gephgui}/ gephgui/dist/
+  '';
+
+  postInstall = ''
+    install -m 444 -D gephgui/public/gephlogo.png $out/share/icons/hicolor/512x512/apps/geph.png
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --suffix PATH : ${lib.makeBinPath [ pac-cmd ]}
+    )
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Geph";
+      desktopName = "Geph";
+      icon = "geph";
+      exec = "gephgui-wry";
+      categories = [ "Network" ];
+      comment = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+      startupWMClass = "geph";
+    })
+  ];
+
+  passthru = {
+    inherit pac-cmd;
+    inherit (finalAttrs) gephgui;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage=gephgui"
+      ];
+    };
+  };
+
+  meta = {
+    description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering";
+    homepage = "https://github.com/geph-official/gephgui-wry";
+    mainProgram = "gephgui-wry";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [
+      penalty1083
+      MCSeekeri
+    ];
+  };
+})
@@ -326,7 +326,6 @@ let
    homepage = "https://www.google.com/chrome/browser/";
    license = lib.licenses.unfree;
    maintainers = with lib.maintainers; [
-      johnrtitor
      mdaniels5757
    ];
    platforms = lib.platforms.darwin ++ [ "x86_64-linux" ];
@@ -3,7 +3,7 @@
  stdenv,
  fetchFromGitHub,
  autoreconfHook,
-  guile,
+  guile_2_2,
  pkg-config,
  texinfo,
 }:
@@ -24,13 +24,13 @@ stdenv.mkDerivation {
    pkg-config
  ];
  buildInputs = [
-    guile
+    guile_2_2
    texinfo
  ];

  configureFlags = [
-    "--with-guile-site-dir=$(out)/${guile.siteDir}"
-    "--with-guile-site-ccache-dir=$(out)/${guile.siteCcacheDir}"
+    "--with-guile-site-dir=$(out)/${guile_2_2.siteDir}"
+    "--with-guile-site-ccache-dir=$(out)/${guile_2_2.siteCcacheDir}"
  ];

  makeFlags = [
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
    description = "XCB bindings for Guile";
    license = lib.licenses.gpl3Plus;
    maintainers = [ ];
-    platforms = guile.meta.platforms;
+    platforms = guile_2_2.meta.platforms;
  };
 }
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [
      nydragon
-      bridgesense
+      saadndm
    ];
    mainProgram = "impala";
  };
@@ -13,13 +13,18 @@ stdenvNoCC.mkDerivation rec {
    hash = "sha256-xoGMEcGMwDDVX/g/ZLK62P7vSF53QvhPlKYdgRpiWL0=";
  };

+  outputs = [
+    "out"
+    "doc"
+  ];
+
  installPhase = ''
    runHook preInstall

    install -D -m644 ipw2200-bss.fw     $out/lib/firmware/ipw2200-bss.fw
    install -D -m644 ipw2200-ibss.fw    $out/lib/firmware/ipw2200-ibss.fw
    install -D -m644 ipw2200-sniffer.fw $out/lib/firmware/ipw2200-sniffer.fw
-    install -D -m644 LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
+    install -D -m644 LICENSE.ipw2200-fw ''${!outputDoc}/share/doc/intel2200BGFirmware/LICENSE

    runHook postInstall
  '';
@@ -248,6 +248,6 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      fugi
    ];
-    platforms = electron.meta.platforms ++ lib.platforms.darwin;
+    inherit (electron.meta) platforms;
  };
 })
@@ -1,8 +1,7 @@
 {
  lib,
  stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
  fetchurl,
  extraCommandLineArgs ? "",
  useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,
@@ -11,7 +10,7 @@
 let
  sources = (lib.importJSON ./sources.json).${stdenv.hostPlatform.system};
 in
-(callPackage vscode-generic {
+(buildVscode {
  inherit useVSCodeRipgrep;
  commandLineArgs = extraCommandLineArgs;

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

 stdenvNoCC.mkDerivation {
  pname = "kitty-themes";
-  version = "0-unstable-2026-01-10";
+  version = "0-unstable-2026-01-25";

  src = fetchFromGitHub {
    owner = "kovidgoyal";
    repo = "kitty-themes";
-    rev = "0da136b4d31ab1c0dc49306bbf2ba8b819dafed8";
-    hash = "sha256-jefF6MzFbKDz6Grsdh5fyi/hrZI72mNkp5iUvelIhDs=";
+    rev = "58a07a8ca50f72f95f6858153a21717416cf3389";
+    hash = "sha256-UIFIe68eb+Xihx+rdeQdp4Nku49m0Ft6G7R0KjRfY8g=";
  };

  dontConfigure = true;
@@ -1,27 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libbaseencode";
-  version = "1.0.15";
-
-  src = fetchFromGitHub {
-    owner = "paolostivanin";
-    repo = "libbaseencode";
-    rev = "v${version}";
-    sha256 = "sha256-WiE+ZMX4oZieER1pu43aSWytkxfkQdX+S3JI98XPpL4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)";
-    homepage = "https://github.com/paolostivanin/libbaseencode";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ alexbakker ];
-  };
-}
@@ -8,7 +8,7 @@
  cryptopp,
  immer,
  lager,
-  libcpr,
+  libcpr_1_10_5,
  libhttpserver,
  libmicrohttpd,
  nlohmann_json,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    cryptopp
    immer
    lager
-    libcpr
+    libcpr_1_10_5
    libhttpserver
    libmicrohttpd
    olm
@@ -0,0 +1,46 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  libpulseaudio,
+  openssl,
+  qt6,
+  cmake,
+  pkg-config,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  pname = "librepods";
+  version = "0.1.0-unstable-2025-12-07";
+
+  src = fetchFromGitHub {
+    owner = "kavishdevar";
+    repo = "librepods";
+    rev = "0e1f784737122913c21b429810d059aadfb4479e";
+    hash = "sha256-nXEMIyQWEDMjyKGPAleqqSttznNmrdSHKT4Kr2tLHBY=";
+  };
+
+  sourceRoot = "source/linux";
+
+  buildInputs = [
+    libpulseaudio
+    openssl
+    qt6.qtbase
+    qt6.qtconnectivity
+    qt6.qtquick3d
+    qt6.qttools
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  meta = {
+    homepage = "https://github.com/kavishdevar/librepods";
+    description = "AirPods liberated from Apple's ecosystem";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.thefossguy ];
+  };
+}
@@ -74,13 +74,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "llama-cpp";
-  version = "7815";
+  version = "7823";

  src = fetchFromGitHub {
    owner = "ggml-org";
    repo = "llama.cpp";
    tag = "b${finalAttrs.version}";
-    hash = "sha256-KeLi/DsbSbTNK7EwDOugsJaYEAU3JLOYno59hgJgXhc=";
+    hash = "sha256-3NLIX2bAxaxkpPRMzxWfcEhJDke2q4TWAyWjXIa/Wpk=";
    leaveDotGit = true;
    postFetch = ''
      git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
  pname = "nom";
-  version = "3.1.0";
+  version = "3.1.1";

  src = fetchFromGitHub {
    owner = "guyfedwards";
    repo = "nom";
    tag = "v${version}";
-    hash = "sha256-u+DS79ByO1XL0hGnK8PbeMIO6aU+wkhYaLWspXvEgwQ=";
+    hash = "sha256-4TZLMSqp6ZoDcRAnpABztBQ85sVkPWVsJtd9zOWtCTQ=";
  };

  vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
@@ -3,7 +3,7 @@
  stdenv,
  fetchFromGitea,
  giflib,
-  imlib2,
+  imlib2Full,
  libXft,
  libexif,
  libwebp,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    giflib
-    imlib2
+    imlib2Full
    libXft
    libexif
    libwebp
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
    (replaceVars ./hardcode-paths.patch {
      avahi = "${avahi}/lib";
      freeipmi = "${freeipmi}/lib";
-      libgpiod = "${libgpiod_1}/lib";
+      libgpiod = if stdenv.hostPlatform.isLinux then "${libgpiod_1}/lib" else "/homeless-shelter";
      libusb = "${libusb1}/lib";
      neon = "${neon}/lib";
      libmodbus = "${modbus}/lib";
@@ -76,18 +76,20 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
-    neon
-    libusb1
-    openssl
-    udev
    avahi
    freeipmi
-    libgpiod_1
-    libtool
-    i2c-tools
-    net-snmp
    gd
+    libtool
+    libusb1
    modbus
+    neon
+    net-snmp
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    i2c-tools
+    libgpiod_1
+    udev
  ];

  nativeBuildInputs = [
@@ -129,7 +131,7 @@ stdenv.mkDerivation rec {
    "sbin"
  ];

-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
    substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \
      --replace /bin/sed "${gnused}/bin/sed" \
      --replace /bin/sleep "${coreutils}/bin/sleep" \
@@ -155,7 +157,7 @@ stdenv.mkDerivation rec {
      It uses a layered approach to connect all of the parts.
    '';
    homepage = "https://networkupstools.org/";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
    maintainers = [ lib.maintainers.pierron ];
    license = with lib.licenses; [
      gpl1Plus
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromSourcehut,
+  meson,
+  ninja,
+  pkg-config,
+  pam,
+  keyutils,
+}:
+
+stdenv.mkDerivation {
+  pname = "pam_fde_boot_pw";
+  version = "0-unstable-2025-02-14";
+
+  src = fetchFromSourcehut {
+    owner = "~kennylevinsen";
+    repo = "pam_fde_boot_pw";
+    rev = "49bf498fd8d13f73e4a24221818a8a5d2af20088";
+    hash = "sha256-dS9ufryg3xfxgUzJKDgrvMZP2qaYH+WJQFw1ogl1isc=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    pam
+    keyutils
+  ];
+
+  mesonFlags = [
+    (lib.mesonOption "pam-mod-dir" "${placeholder "out"}/lib/security")
+  ];
+
+  meta = {
+    description = "PAM module for leveraging disk encryption password in the PAM session";
+    longDescription = ''
+      pam_fde_boot_pw transfers a password from the kernel keyring (for example,
+      the passphrase used to unlock an encrypted disk) into the PAM session.
+      This enables user-space keyrings, such as gnome-keyring, to be
+      automatically unlocked.
+    '';
+    homepage = "https://git.sr.ht/~kennylevinsen/pam_fde_boot_pw";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ivanbrennan ];
+  };
+}
@@ -2,9 +2,9 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  awk,
+  gawk,
  cmake,
-  grep,
+  gnugrep,
  libXext,
  libXft,
  libXinerama,
@@ -14,7 +14,7 @@
  libpng,
  pkg-config,
  runtimeShell,
-  sed,
+  gnused,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -51,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
  strictDeps = true;

  cmakeFlags = [
-    "-DAWK=${lib.getBin awk}/bin/awk"
-    "-DGREP=${lib.getBin grep}/bin/grep"
-    "-DSED=${lib.getBin sed}/bin/sed"
+    "-DAWK=${lib.getBin gawk}/bin/awk"
+    "-DGREP=${lib.getBin gnugrep}/bin/grep"
+    "-DSED=${lib.getBin gnused}/bin/sed"
    "-DSH=${runtimeShell}"
  ];

@@ -1,7 +1,7 @@
 {
  "auto_orientation": "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=",
  "canvas_danmaku": "sha256-C3No/hLtf/TpPJHXXfPqHjUKI1vck++UWqvkAX9EzYM=",
-  "chat_bottom_container": "sha256-um9KwZUDxWBhFsGHfv00TjPzxDHmp43TLRF0GwuV1xs=",
+  "chat_bottom_container": "sha256-+R1MiDMO4onCMXiJ7MJtJVAwyEJcikTyONwp+HibqA0=",
  "extended_nested_scroll_view": "sha256-Vjv5zp5c0Xob1H8/U0+lUueLqOKo7qwusOCchdt3Z7M=",
  "file_picker": "sha256-yOZwX6GrA+91WtpXuVf7eM5gdI6mxmdxkSe+dgnHvj4=",
  "floating": "sha256-0Xd9dsXJCQ/r/8Nb16oM+M8Jdw+r4QzGmU++HpqF/v0=",
@@ -13,7 +13,7 @@
 let
  srcInfo = lib.importJSON ./src-info.json;
  description = "Third-party Bilibili client developed in Flutter";
-  version = "1.1.5.3";
+  version = "1.1.5.5";
 in
 flutter338.buildFlutterApplication {
  pname = "piliplus";
@@ -4,21 +4,21 @@
      "dependency": "transitive",
      "description": {
        "name": "_fe_analyzer_shared",
-        "sha256": "5b7468c326d2f8a4f630056404ca0d291ade42918f4a3c6233618e724f39da8e",
+        "sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "92.0.0"
+      "version": "93.0.0"
    },
    "analyzer": {
      "dependency": "transitive",
      "description": {
        "name": "analyzer",
-        "sha256": "70e4b1ef8003c64793a9e268a551a82869a8a96f39deb73dea28084b0e8bf75e",
+        "sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.0.0"
+      "version": "10.0.1"
    },
    "ansicolor": {
      "dependency": "transitive",
@@ -205,11 +205,11 @@
      "dependency": "transitive",
      "description": {
        "name": "build",
-        "sha256": "c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413",
+        "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.3"
+      "version": "4.0.4"
    },
    "build_config": {
      "dependency": "transitive",
@@ -235,11 +235,11 @@
      "dependency": "direct dev",
      "description": {
        "name": "build_runner",
-        "sha256": "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057",
+        "sha256": "b4d854962a32fd9f8efc0b76f98214790b833af8b2e9b2df6bfc927c0415a072",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.10.4"
+      "version": "2.10.5"
    },
    "built_collection": {
      "dependency": "transitive",
@@ -255,11 +255,11 @@
      "dependency": "transitive",
      "description": {
        "name": "built_value",
-        "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139",
+        "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "8.12.1"
+      "version": "8.12.3"
    },
    "cached_network_image": {
      "dependency": "direct main",
@@ -327,7 +327,7 @@
      "description": {
        "path": "packages/chat_bottom_container",
        "ref": "main",
-        "resolved-ref": "acccababf698ef1712031c383ea4b7ff54ae630c",
+        "resolved-ref": "dba2bf10db4a6f89564d9be63ce17b18f0f7e3e5",
        "url": "https://github.com/bggRGjQaUbCoE/flutter_chat_packages.git"
      },
      "source": "git",
@@ -363,6 +363,16 @@
      "source": "hosted",
      "version": "1.1.2"
    },
+    "code_assets": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_assets",
+        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
    "code_builder": {
      "dependency": "transitive",
      "description": {
@@ -467,11 +477,11 @@
      "dependency": "transitive",
      "description": {
        "name": "dart_style",
-        "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b",
+        "sha256": "8a0aa2b9bae196552b71575efc94580e447546c26c7120577bb6f81fbd33b52e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
    },
    "dbus": {
      "dependency": "transitive",
@@ -628,11 +638,11 @@
      "dependency": "transitive",
      "description": {
        "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
    },
    "file": {
      "dependency": "transitive",
@@ -1052,6 +1062,16 @@
      "source": "hosted",
      "version": "1.1.0"
    },
+    "hooks": {
+      "dependency": "transitive",
+      "description": {
+        "name": "hooks",
+        "sha256": "5d309c86e7ce34cd8e37aa71cb30cb652d3829b900ab145e4d9da564b31d59f7",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
    "html": {
      "dependency": "direct main",
      "description": {
@@ -1156,11 +1176,11 @@
      "dependency": "transitive",
      "description": {
        "name": "image_picker_android",
-        "sha256": "5e9bf126c37c117cf8094215373c6d561117a3cfb50ebc5add1a61dc6e224677",
+        "sha256": "297e42bd236c4ac4b091d4277292159b3280545e030cae2be3d503f9ecf7e6a1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.8.13+10"
+      "version": "0.8.13+12"
    },
    "image_picker_for_web": {
      "dependency": "transitive",
@@ -1509,6 +1529,16 @@
      "source": "hosted",
      "version": "2.0.0"
    },
+    "native_toolchain_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "native_toolchain_c",
+        "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.17.4"
+    },
    "nm": {
      "dependency": "transitive",
      "description": {
@@ -1519,6 +1549,16 @@
      "source": "hosted",
      "version": "0.5.0"
    },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "7fd0c4d8ac8980011753b9bdaed2bf15111365924cdeeeaeb596214ea2b03537",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "9.2.4"
+    },
    "octo_image": {
      "dependency": "transitive",
      "description": {
@@ -1603,11 +1643,11 @@
      "dependency": "transitive",
      "description": {
        "name": "path_provider_foundation",
-        "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4",
+        "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.1"
+      "version": "2.6.0"
    },
    "path_provider_linux": {
      "dependency": "transitive",
@@ -1803,11 +1843,11 @@
      "dependency": "transitive",
      "description": {
        "name": "safe_local_storage",
-        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
+        "sha256": "608354d4cdfdabb29428bdb330c4e54dbc31aab238b09ba59fe73660580553cc",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "2.0.2"
    },
    "saver_gallery": {
      "dependency": "direct main",
@@ -1903,11 +1943,11 @@
      "dependency": "transitive",
      "description": {
        "name": "sentry",
-        "sha256": "9b2fe138df1a104f6e41d8ebf2b1e4fe39d4370d2200eb4eea29913d38b8b33b",
+        "sha256": "fa14b2177d2cd4489ec78817ec4e52affe1be9f595718de970a5e4ed2bccc530",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "9.9.1"
+      "version": "9.10.0"
    },
    "share_plus": {
      "dependency": "direct main",
@@ -2290,11 +2330,11 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_web",
-        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
    },
    "url_launcher_windows": {
      "dependency": "transitive",
@@ -2340,11 +2380,11 @@
      "dependency": "transitive",
      "description": {
        "name": "vector_graphics_compiler",
-        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
+        "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.19"
+      "version": "1.1.20"
    },
    "vector_math": {
      "dependency": "direct main",
@@ -2400,11 +2440,11 @@
      "dependency": "transitive",
      "description": {
        "name": "watcher",
-        "sha256": "f52385d4f73589977c80797e60fe51014f7f2b957b5e9a62c3f6ada439889249",
+        "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.2.1"
    },
    "waterfall_flow": {
      "dependency": "direct main",
@@ -2520,7 +2560,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.10.0 <4.0.0",
-    "flutter": "3.38.4"
+    "dart": ">=3.10.3 <4.0.0",
+    "flutter": "3.38.6"
  }
 }
@@ -1,6 +1,6 @@
 {
-  "rev": "de85e82bfa49b5220f1ede5aff315dc92ec61ad4",
-  "revCount": 4526,
-  "commitDate": 1767759159,
-  "hash": "sha256-SSGLkBB0PH42GvXeVKdbURmo94TsGcR4ZtMFSD3OmEc="
+  "rev": "038f03a4e7b08db8f55fe6c2a629397ac32d7749",
+  "revCount": 4573,
+  "commitDate": 1769325693,
+  "hash": "sha256-fLCQ8TguCIe6qjN5XjvQIiCHg91Ry1uoqgO5DmjNqY4="
 }
@@ -13,19 +13,19 @@
  lld,
 }:
 let
-  version = "0.34.0";
+  version = "0.34.1";
  pname = "rauthy";

  src = fetchFromGitHub {
    owner = "sebadob";
    repo = "rauthy";
    tag = "v${version}";
-    hash = "sha256-ZYugnemiZpa8gmXCRgZc/9att/vUribC1+vpS7vhgl8=";
+    hash = "sha256-6Ddf8ukwEecxBp9hMbWS4odxrRGB/uIXWdTbIU3MAUM=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src pname version;
-    hash = "sha256-ixl4mlQJw8Gr7Rrnm8B2Iz8xI7IAne8OR9Dri0k3kqY=";
+    hash = "sha256-fXe4bQRLscUk7fdAQGwzwBVJIRs8+puWfTeAjby1MmE=";
  };

  # Wasm modules are needed to build the frontend and are part of the main Rust repo.
@@ -12,7 +12,7 @@
  libpng,
  makeWrapper,
  pkg-config,
-  python3,
+  python312,
  SDL2,
  stdenv,
  versionCheckHook,
@@ -21,7 +21,7 @@
 }:

 let
-  python = python3;
+  python = python312;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "renpy";
@@ -4,7 +4,8 @@
  fetchFromGitHub,
  qt5,
  openssl,
-  protobuf,
+  # https://github.com/blueprint-freespeech/ricochet-refresh/issues/178
+  protobuf_21,
  pkg-config,
  cmake,
 }:
@@ -35,12 +36,12 @@ stdenv.mkDerivation (finalAttrs: {
    ])
    ++ [
      openssl
-      protobuf
+      protobuf_21
    ];

  nativeBuildInputs = [
    pkg-config
-    protobuf
+    protobuf_21
    cmake
    qt5.wrapQtAppsHook
  ];
@@ -73,15 +73,15 @@
  },
  {
    "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.11.0",
-    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.11.0/microsoft.codeanalysis.analyzers.3.11.0.nupkg"
+    "version": "5.3.0-2.25625.1",
+    "hash": "sha256-3SvBNBYQtwJ6My2i66QkaznakuumyCksU7++97I0krU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.3.0-2.25625.1/microsoft.codeanalysis.analyzers.5.3.0-2.25625.1.nupkg"
  },
  {
    "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-5UN//A8oc2w+UoxAwWmXWRXykQD+2mpa1hbJrAfh2Lg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-OxqQo5NUVs1UuWTc/DiAHUY693VJDQCPv5CXuh9x1ow=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/5.4.0-2.26060.102/microsoft.codeanalysis.bannedapianalyzers.5.4.0-2.26060.102.nupkg"
  },
  {
    "pname": "Microsoft.CodeAnalysis.Common",
@@ -109,9 +109,9 @@
  },
  {
    "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-nXx0MSYXVzdr0jcNo9aZLocZU1ywN+n/vdD2kYBh5TI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.24081.1/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-E5JTn3ZWGipvAkCA6khC0gKtEv+LJm5k64KwlcnwbNg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/5.4.0-2.26060.102/microsoft.codeanalysis.publicapianalyzers.5.4.0-2.26060.102.nupkg"
  },
  {
    "pname": "Microsoft.CSharp",
@@ -127,21 +127,21 @@
  },
  {
    "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "11.0.0-beta.25603.2",
-    "hash": "sha256-xXwq/ffFnDXjMnrzKUAT3Du31tKso7aNW4VBvABHX4M=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25603.2/microsoft.dotnet.arcade.sdk.11.0.0-beta.25603.2.nupkg"
+    "version": "11.0.0-beta.26055.1",
+    "hash": "sha256-7CNAmWFoehsYuE04wgK2MjUrHNXgYIzWGSTVOjpfKPM=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.26055.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.26055.1.nupkg"
  },
  {
    "pname": "Microsoft.DotNet.FileBasedPrograms",
-    "version": "10.0.200-preview.0.25556.104",
-    "hash": "sha256-IZMj0EGno5ZlJiicdK+Kxg97IvDaWheVxuMlCPmN1wI=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/8ea23ec3-b9b2-4976-90d7-7c4a6f529fdc/nuget/v3/flat2/microsoft.dotnet.filebasedprograms/10.0.200-preview.0.25556.104/microsoft.dotnet.filebasedprograms.10.0.200-preview.0.25556.104.nupkg"
+    "version": "11.0.100-alpha.1.26060.102",
+    "hash": "sha256-2wcbDTV7kJqbRlHaGRtWQw5tBhYP0JBXGPjZcyluU0E=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a57d0dd1-b586-4233-8880-21626fab1f1a/nuget/v3/flat2/microsoft.dotnet.filebasedprograms/11.0.100-alpha.1.26060.102/microsoft.dotnet.filebasedprograms.11.0.100-alpha.1.26060.102.nupkg"
  },
  {
    "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "11.0.0-beta.25603.2",
-    "hash": "sha256-qLUHUextwX33sSm4oK0N4qpbGEZpz6qOw5kabpJ9Xkk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25603.2/microsoft.dotnet.xlifftasks.11.0.0-beta.25603.2.nupkg"
+    "version": "11.0.0-beta.26055.1",
+    "hash": "sha256-LHQOeR3DyMj30ofpJa7n2gvs6z5qrSrZ4CewTA9bjsk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.26055.1/microsoft.dotnet.xlifftasks.11.0.0-beta.26055.1.nupkg"
  },
  {
    "pname": "Microsoft.Extensions.Configuration",
@@ -253,9 +253,9 @@
  },
  {
    "pname": "Microsoft.ServiceHub.Analyzers",
-    "version": "4.9.11-beta",
-    "hash": "sha256-v4vgNHVeTwxnETMNVxtBzQrnacVF0GyKs/PQSDcAJ1c=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.11-beta/microsoft.servicehub.analyzers.4.9.11-beta.nupkg"
+    "version": "4.9.14-beta",
+    "hash": "sha256-VV99hhKmo87BlxUO2nAPeLmsJ/LE35/L2fne/ZkjfcI=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.9.14-beta/microsoft.servicehub.analyzers.4.9.14-beta.nupkg"
  },
  {
    "pname": "Microsoft.ServiceHub.Client",
@@ -265,9 +265,9 @@
  },
  {
    "pname": "Microsoft.ServiceHub.Framework",
-    "version": "4.9.11-beta",
-    "hash": "sha256-sAdzwH8lt1Z44YMGYTTwMSS8uceK8FXWR5h1p3Iu1OQ=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.11-beta/microsoft.servicehub.framework.4.9.11-beta.nupkg"
+    "version": "4.9.14-beta",
+    "hash": "sha256-yA/03/aQEepEBSQHilfn3uYQVkEXtOLsH6llghEAuKM=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.servicehub.framework/4.9.14-beta/microsoft.servicehub.framework.4.9.14-beta.nupkg"
  },
  {
    "pname": "Microsoft.TestPlatform.ObjectModel",
@@ -313,9 +313,9 @@
  },
  {
    "pname": "Microsoft.VisualStudio.Threading",
-    "version": "17.15.20-alpha",
-    "hash": "sha256-/0oB9YozrbcEoew5Tvh0OEE/b3iFHWmO1nzsmS2iDRA=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.20-alpha/microsoft.visualstudio.threading.17.15.20-alpha.nupkg"
+    "version": "17.15.22-alpha",
+    "hash": "sha256-LO8aishMaE97UkwqBv21lbmKZNHoKqKrRlbBvkcIGQ4=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.15.22-alpha/microsoft.visualstudio.threading.17.15.22-alpha.nupkg"
  },
  {
    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
@@ -337,9 +337,9 @@
  },
  {
    "pname": "Microsoft.VisualStudio.Threading.Only",
-    "version": "17.15.20-alpha",
-    "hash": "sha256-cBFSercx77Jqw4Z8Af5lu57a2xUmudETNywGN43JR8U=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.20-alpha/microsoft.visualstudio.threading.only.17.15.20-alpha.nupkg"
+    "version": "17.15.22-alpha",
+    "hash": "sha256-+st04bceIFbmImRdFGNZ7DDYKl8Vd+TjTE/xiJQwZcs=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.only/17.15.22-alpha/microsoft.visualstudio.threading.only.17.15.22-alpha.nupkg"
  },
  {
    "pname": "Microsoft.VisualStudio.Utilities.Internal",
@@ -445,9 +445,9 @@
  },
  {
    "pname": "Roslyn.Diagnostics.Analyzers",
-    "version": "3.11.0-beta1.24081.1",
-    "hash": "sha256-wIOhKwvYetwytnuNX0uNC5oyBDU7xAhLqzTvyuGDVMM=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a54510f9-4b2c-4e69-b96a-6096683aaa1f/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.24081.1/roslyn.diagnostics.analyzers.3.11.0-beta1.24081.1.nupkg"
+    "version": "5.4.0-2.26060.102",
+    "hash": "sha256-XUTC2E3EdZ4Y+fwL1NoPK1GELYHDLgqlQbwLDWghZ/w=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/roslyn.diagnostics.analyzers/5.4.0-2.26060.102/roslyn.diagnostics.analyzers.5.4.0-2.26060.102.nupkg"
  },
  {
    "pname": "SQLitePCLRaw.bundle_green",
@@ -481,9 +481,9 @@
  },
  {
    "pname": "StreamJsonRpc",
-    "version": "2.23.39-alpha",
-    "hash": "sha256-3gQz0m7BhU6dTj6cDgaY/TFIn0Tl0+CAJl6SXRr4Oxg=",
-    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.39-alpha/streamjsonrpc.2.23.39-alpha.nupkg"
+    "version": "2.23.41-alpha",
+    "hash": "sha256-zTq/O6hLbOvcpzPwWxKE7a2NdetdFwPOAYw1afvCAbM=",
+    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.23.41-alpha/streamjsonrpc.2.23.41-alpha.nupkg"
  },
  {
    "pname": "System.Buffers",
@@ -511,9 +511,9 @@
  },
  {
    "pname": "System.CommandLine",
-    "version": "3.0.0-alpha.1.25570.101",
-    "hash": "sha256-j7PBGIeUwbV/jodHa0CNu4i/+D8mQqFMY2E7k3ALJAY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-alpha.1.25570.101/system.commandline.3.0.0-alpha.1.25570.101.nupkg"
+    "version": "3.0.0-alpha.1.26060.102",
+    "hash": "sha256-jvTFAZTJWGooqjR1qS86UAOTw1RCaVzNBlBUov404ss=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/3.0.0-alpha.1.26060.102/system.commandline.3.0.0-alpha.1.26060.102.nupkg"
  },
  {
    "pname": "System.ComponentModel.Composition",
@@ -38,18 +38,18 @@ in
 buildDotnetModule (finalAttrs: rec {
  inherit pname dotnet-sdk dotnet-runtime;

-  vsVersion = "2.111.2-prerelease";
+  vsVersion = "2.113.22-prerelease";
  src = fetchFromGitHub {
    owner = "dotnet";
    repo = "roslyn";
    rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-oP+mKOvsbc+/NnqJvounE75BlE6UJTIAnmYTBNQlMFA=";
+    hash = "sha256-rGkQfyKoRlEa7L7H9iFQkKTCD4dU3OP97XDtRFRAHnc=";
  };

  # versioned independently from vscode-csharp
  # "roslyn" in here:
  # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.3.0-2.25604.5";
+  version = "5.4.0-2.26062.9";
  projectFile = "src/LanguageServer/${project}/${project}.csproj";
  useDotnetFromEnv = true;
  nugetDeps = ./deps.json;
@@ -1,6 +1,6 @@
 {
  lib,
-  stdenv,
+  gcc14Stdenv,
  fetchFromGitHub,

  nixosTests,
@@ -54,7 +54,8 @@
  nix-update-script,
 }:

-stdenv.mkDerivation (finalAttrs: {
+# relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700
+gcc14Stdenv.mkDerivation (finalAttrs: {
  pname = "shadps4";
  version = "0.13.0";

@@ -117,14 +117,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "shipwright";
-  version = "9.1.1";
+  version = "9.1.2";
  src = fetchFromGitHub {
    owner = "harbourmasters";
    repo = "shipwright";
    tag = finalAttrs.version;
-    hash = "sha256-TEP2YNKUuAnvLg+aDOkMmYfPQIjUXWYOhprfqsr8EgQ=";
+    hash = "sha256-kFi5yo+CGH67NU7haDAbzWCURzsUYMlRzx66XGvh0a0=";
    fetchSubmodules = true;
-    fetchTags = true;
    deepClone = true;
    postFetch = ''
      cd $out
@@ -13,7 +13,7 @@
  luarocks,

  # buildInputs
-  lua,
+  luajit,
  harfbuzz,
  icu,
  fontconfig,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
    # build time we would fail to build since we only provide it at test time.
    "PDFINFO=false"
  ]
-  ++ lib.optionals (!lua.pkgs.isLuaJIT) [
+  ++ lib.optionals (!luajit.pkgs.isLuaJIT) [
    "--without-luajit"
  ];

@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
    # Use this passthru variable to add packages to your lua environment. Use
    # something like this in your development environment:
    #
-    # myLuaEnv = lua.withPackages (
+    # myLuaEnv = luajit.withPackages (
    #  ps: lib.attrVals (sile.passthru.luaPackages ++ [
    #    "lua-cjson"
    #    "lua-resty-http"
@@ -142,13 +142,13 @@ stdenv.mkDerivation (finalAttrs: {
      "ldoc"
      # NOTE: Add lua packages here, to change the luaEnv also read by `flake.nix`
    ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.2") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.2") [
      "bit32"
    ]
-    ++ lib.optionals (lib.versionOlder lua.luaversion "5.3") [
+    ++ lib.optionals (lib.versionOlder luajit.luaversion "5.3") [
      "compat53"
    ];
-    luaEnv = lua.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);
+    luaEnv = luajit.withPackages (ps: lib.attrVals finalAttrs.finalPackage.passthru.luaPackages ps);

    # Copied from Makefile.am
    tests.test = lib.optionalAttrs (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) (
@@ -20,7 +20,7 @@
  libinput,
  gdk-pixbuf,
  librsvg,
-  wlroots,
+  wlroots_0_19,
  wayland-protocols,
  libdrm,
  nixosTests,
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
    librsvg
    wayland-protocols
    libdrm
-    (wlroots.override { inherit (finalAttrs) enableXWayland; })
+    (wlroots_0_19.override { inherit (finalAttrs) enableXWayland; })
  ]
  ++ lib.optionals finalAttrs.enableXWayland [
    xorg.xcbutilwm
@@ -8,7 +8,7 @@
  lib,
  libpng,
  libX11,
-  lua,
+  lua5_2,
  luajit,
  meson,
  ninja,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    jsoncpp
    libpng
    libX11
-    lua
+    lua5_2
    luajit
    SDL2
    zlib
@@ -15,7 +15,7 @@
  lsof,
  makeBinaryWrapper,
  nix-update-script,
-  pinentry,
+  pinentry-curses,
  stdenvNoCC,
  util-linuxMinimal,
  versionCheckHook,
@@ -36,7 +36,7 @@ let
    gnupg
    libargon2
    lsof
-    pinentry
+    pinentry-curses
    util-linuxMinimal
  ];

@@ -55,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  nativeBuildInputs = [ makeBinaryWrapper ];

  buildInputs = [
-    pinentry
+    pinentry-curses
    zsh
  ];

@@ -3,7 +3,7 @@
  stdenv,
  fetchurl,
  autoconf,
-  automake,
+  automake116x,
  makeWrapper,
  pkg-config,
  unzip,
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    autoconf
-    automake
+    automake116x
    makeWrapper
    pkg-config
    unzip
@@ -17,7 +17,7 @@
  wayland,
  wayland-protocols,
  wayland-scanner,
-  wlroots,
+  wlroots_0_17,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    udev
    wayland
    wayland-protocols
-    wlroots
+    wlroots_0_17
  ];

  strictDeps = true;
@@ -2,13 +2,10 @@
  lib,
  buildNpmPackage,
  fetchFromGitHub,
-  nodejs_20,
+  nodejs,
  runtimeShell,
 }:

-let
-  nodejs = nodejs_20;
-in
 buildNpmPackage rec {
  pname = "whitebophir";
  version = "1.19.1";
@@ -1,8 +1,7 @@
 {
  lib,
  stdenv,
-  callPackage,
-  vscode-generic,
+  buildVscode,
  fetchurl,
  nixosTests,
  commandLineArgs ? "",
@@ -13,7 +12,7 @@ let
    (lib.importJSON ./info.json)."${stdenv.hostPlatform.system}"
      or (throw "windsurf: unsupported system ${stdenv.hostPlatform.system}");
 in
-callPackage vscode-generic {
+buildVscode {
  inherit commandLineArgs useVSCodeRipgrep;

  inherit (info) version vscodeVersion;
@@ -16,7 +16,7 @@
  unstableGitUpdater,
  wayland,
  wayland-protocols,
-  wlroots,
+  wlroots_0_19,
  xwayland,
 }:

@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
    udev
    wayland
    wayland-protocols
-    wlroots
+    wlroots_0_19
    xwayland
  ];

@@ -2,7 +2,7 @@
  lib,
  stdenv,
  fetchurl,
-  fox,
+  fox_1_6,
  fontconfig,
  freetype,
  pkg-config,
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
    intltool
  ];
  buildInputs = [
-    fox
+    fox_1_6
    gettext
    xcbutil
    gcc
@@ -4,7 +4,7 @@
  perl,
  fetchurl,
  python3,
-  fmt,
+  fmt_9,
  libidn,
  pkg-config,
  spidermonkey_115,
@@ -34,7 +34,7 @@
  cxxtest,
  freetype,
  withEditor ? true,
-  wxGTK,
+  wxGTK32,
 }:

 # You can find more instructions on how to build 0ad here:
@@ -80,19 +80,19 @@ stdenv.mkDerivation rec {
    gloox
    nvidia-texture-tools
    libsodium
-    fmt
+    fmt_9
    freetype
    premake5
    cxxtest
  ]
-  ++ lib.optional withEditor wxGTK;
+  ++ lib.optional withEditor wxGTK32;

  env.NIX_CFLAGS_COMPILE = toString [
    "-I${xorgproto}/include"
    "-I${libX11.dev}/include"
    "-I${libXcursor.dev}/include"
    "-I${SDL2}/include/SDL2"
-    "-I${fmt.dev}/include"
+    "-I${fmt_9.dev}/include"
    "-I${nvidia-texture-tools.dev}/include"
  ];

@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ];

  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeWrapper "$out/Application/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio"
+    makeWrapper "$out/Applications/ZMK Studio.app/Contents/MacOS/zmk-studio" "$out/bin/zmk-studio"
  '';

  meta = {
@@ -1,48 +1,52 @@
 {
  lib,
  stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
  pkg-config,
  gettext,
  perl,
  itstool,
  isocodes,
  enchant,
+  gtk-doc,
  libxml2,
+  mate-common,
  python3,
  gtksourceview4,
  libpeas,
  mate-desktop,
  wrapGAppsHook3,
+  yelp-tools,
  gitUpdater,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "pluma";
-  version = "1.28.0";
+  version = "1.28.1";

-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/pluma-${finalAttrs.version}.tar.xz";
-    sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "pluma";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-+3zY3A7JRc7utYMNiQBnsy0lZr1PuDSOtdP+iigNRDQ=";
  };

-  patches = [
-    # Switch to girepository-2.0
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/pluma/raw/55b770fa4d899bd92aa5ce94f3be7e2e3523a096/f/libpeas1_pygobject352.patch";
-      hash = "sha256-uNGz6LEnJU4HxU1yzcm2mmrGM6QyuRSwc3w7XDYCNaQ=";
-    })
-  ];
-
  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
    gettext
    isocodes
    itstool
+    gtk-doc
+    mate-common # mate-common.m4 macros
    perl
    pkg-config
    python3.pkgs.wrapPython
    wrapGAppsHook3
+    yelp-tools
  ];

  buildInputs = [
@@ -58,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {

  pythonPath = with python3.pkgs; [
    pycairo
-    six
  ];

  postFixup = ''
@@ -67,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  passthru.updateScript = gitUpdater {
-    url = "https://git.mate-desktop.org/pluma";
    odd-unstable = true;
    rev-prefix = "v";
  };
@@ -14,12 +14,12 @@

 let
  pname = "ex_doc";
-  version = "0.39.3";
+  version = "0.40.0";
  src = fetchFromGitHub {
    owner = "elixir-lang";
    repo = "${pname}";
    rev = "v${version}";
-    hash = "sha256-LLy4gemj3oiMbZKc9ZUWY3g2fyY1Rvxjtzx/sbAp8JE=";
+    hash = "sha256-jz/9zIylMe7opCLt9wQ4GhR7bvAenWU8MOEACIvLKzk=";
  };
 in
 mixRelease {
@@ -37,7 +37,7 @@ mixRelease {
  mixFodDeps = fetchMixDeps {
    pname = "mix-deps-${pname}";
    inherit src version elixir;
-    hash = "sha256-TknrENa0Nb1Eobd4oTBl6TilPVEsw9+XjPdF3Ntq+DI=";
+    hash = "sha256-pMIm0lVMqkuiprp0XeVB+x4VTh+hQR3t8dk5OBmnIqA=";
  };

  passthru = {
@@ -1,186 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  jetbrains,
-  openjdk17,
-  openjdk17-bootstrap,
-  git,
-  autoconf,
-  unzip,
-  rsync,
-  debugBuild ? false,
-  withJcef ? true,
-
-  libXdamage,
-  libXxf86vm,
-  libXrandr,
-  libXi,
-  libXcursor,
-  libXrender,
-  libX11,
-  libXext,
-  libxcb,
-  nss,
-  nspr,
-  libdrm,
-  libgbm,
-  wayland,
-  udev,
-  fontconfig,
-}:
-
-assert debugBuild -> withJcef;
-
-let
-  arch =
-    {
-      "aarch64-linux" = "aarch64";
-      "x86_64-linux" = "x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  cpu = stdenv.hostPlatform.parsed.cpu.name;
-in
-openjdk17.overrideAttrs (oldAttrs: rec {
-  pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
-  javaVersion = "17.0.15";
-  build = "1381";
-  # To get the new tag:
-  # git clone https://github.com/jetbrains/jetbrainsruntime
-  # cd jetbrainsruntime
-  # git tag --points-at [revision]
-  # Look for the line that starts with jbr-
-  openjdkTag = "jbr-17.0.15+6";
-  version = "${javaVersion}-b${build}";
-
-  src = fetchFromGitHub {
-    owner = "JetBrains";
-    repo = "JetBrainsRuntime";
-    rev = "jb${version}";
-    hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo=";
-  };
-
-  env = (oldAttrs.env or { }) // {
-    BOOT_JDK = openjdk17-bootstrap.home;
-    # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-    SOURCE_DATE_EPOCH = 1745907200;
-  };
-
-  patches = [ ];
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    ${lib.optionalString withJcef "cp -r ${jetbrains.jcef} jcef_linux_${arch}"}
-
-    sed \
-        -e "s/OPENJDK_TAG=.*/OPENJDK_TAG=${openjdkTag}/" \
-        -e "s/SOURCE_DATE_EPOCH=.*//" \
-        -e "s/export SOURCE_DATE_EPOCH//" \
-        -i jb/project/tools/common/scripts/common.sh
-    substituteInPlace jb/project/tools/linux/scripts/mkimages_${arch}.sh --replace-fail "STATIC_CONF_ARGS" "STATIC_CONF_ARGS ''${configureFlags[*]}"
-    sed \
-        -e "s/create_image_bundle \"jb/#/" \
-        -e "s/echo Creating /exit 0 #/" \
-        -i jb/project/tools/linux/scripts/mkimages_${arch}.sh
-
-    patchShebangs .
-    ./jb/project/tools/linux/scripts/mkimages_${arch}.sh -w ${build} ${
-      if debugBuild then "fd" else (if withJcef then "jcef" else "nomod")
-    }
-
-    runHook postBuild
-  '';
-
-  installPhase =
-    let
-      buildType = if debugBuild then "fastdebug" else "release";
-      debugSuffix = if debugBuild then "-fastdebug" else "";
-      jcefSuffix = if debugBuild || !withJcef then "" else "_jcef";
-      jbrsdkDir = "jbrsdk${jcefSuffix}-${javaVersion}-linux-${arch}${debugSuffix}-b${build}";
-    in
-    ''
-      runHook preInstall
-
-      mv build/linux-${cpu}-server-${buildType}/images/jdk/man build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir}
-      rm -rf build/linux-${cpu}-server-${buildType}/images/jdk
-      mv build/linux-${cpu}-server-${buildType}/images/${jbrsdkDir} build/linux-${cpu}-server-${buildType}/images/jdk
-    ''
-    + oldAttrs.installPhase
-    + "runHook postInstall";
-
-  postInstall = lib.optionalString withJcef ''
-    chmod +x $out/lib/openjdk/lib/chrome-sandbox
-  '';
-
-  dontStrip = debugBuild;
-
-  postFixup = ''
-    # Build the set of output library directories to rpath against
-    LIBDIRS="${
-      lib.makeLibraryPath [
-        libXdamage
-        libXxf86vm
-        libXrandr
-        libXi
-        libXcursor
-        libXrender
-        libX11
-        libXext
-        libxcb
-        nss
-        nspr
-        libdrm
-        libgbm
-        wayland
-        udev
-        fontconfig
-      ]
-    }"
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort -u | tr '\n' ':'):$LIBDIRS"
-    done
-    # Add the local library paths to remove dependencies on the bootstrap
-    for output in ${lib.concatStringsSep " " oldAttrs.outputs}; do
-      if [ "$output" = debug ]; then continue; fi
-      OUTPUTDIR=$(eval echo \$$output)
-      BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-      echo "$BINLIBS" | while read i; do
-        patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-      done
-    done
-  '';
-
-  nativeBuildInputs = [
-    git
-    autoconf
-    unzip
-    rsync
-  ]
-  ++ oldAttrs.nativeBuildInputs;
-
-  meta = {
-    description = "OpenJDK fork which better supports Jetbrains's products";
-    longDescription = ''
-      JetBrains Runtime is a runtime environment for running IntelliJ Platform
-      based products on Windows, Mac OS X, and Linux. JetBrains Runtime is
-      based on OpenJDK project with some modifications. These modifications
-      include: Subpixel Anti-Aliasing, enhanced font rendering on Linux, HiDPI
-      support, ligatures, some fixes for native crashes not presented in
-      official build, and other small enhancements.
-      JetBrains Runtime is not a certified build of OpenJDK. Please, use at
-      your own risk.
-    '';
-    homepage = "https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime";
-    inherit (openjdk17.meta) license platforms mainProgram;
-
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-
-  passthru = oldAttrs.passthru // {
-    home = "${jetbrains.jdk}/lib/openjdk";
-  };
-})
@@ -141,7 +141,7 @@ let
        luarocksConfig =
          let
            externalDepsGenerated = lib.filter (drv: !drv ? luaModule) (
-              self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
+              self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs
            );

            generatedConfig = luaLib.generateLuarocksConfig {
@@ -156,7 +156,7 @@ let
              # closure, as it doesn't have a rock tree :)
              # luaLib.hasLuaModule
              requiredLuaRocks = lib.filter luaLib.hasLuaModule (
-                lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs)
+                lua.pkgs.requiredLuaModules (self.finalPackage.nativeBuildInputs ++ self.propagatedBuildInputs)
              );
            };

@@ -9,16 +9,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "castor";
-  version = "0.27.0";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "jolicode";
    repo = "castor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-ot4akuKhNtEXukiDSy69q75phx6EvkJsL0XHAN+el+M=";
+    hash = "sha256-HgFFy/qEN7fPCFqDJe1SLMpDWB04YPI6OPYaURqjyKQ=";
  };

-  vendorHash = "sha256-fLx4uLS9708IFKnBus3R7nt6V/BCsZZflYEhwzUkXzc=";
+  vendorHash = "sha256-RBN99M5YFee8FZURn4lVuscrCmajMNn+10KgwqgPk8k=";

  nativeBuildInputs = [ installShellFiles ];

@@ -13,13 +13,13 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
  pname = "composer";
-  version = "2.9.3";
+  version = "2.9.4";

  src = fetchFromGitHub {
    owner = "composer";
    repo = "composer";
    tag = finalAttrs.version;
-    hash = "sha256-H5/YY0CKFlLdvEMzj3fr5QsEro0Y2/8gZInLQDbGR30=";
+    hash = "sha256-OzruOfYKiNgHx7bj6dVY+QtfSUzLEIqBhwATaWV1YAQ=";
  };

  nativeBuildInputs = [
@@ -33,7 +33,7 @@ php.buildComposerProject2 (finalAttrs: {
    inherit (finalAttrs.passthru) pharHash;
  };

-  vendorHash = "sha256-4RFIegm7NFTpEbW11BtKB2BV+5VrSAhNrk125PcrBTw=";
+  vendorHash = "sha256-EHvZfRL3xM2oG8m/8nHTOSjDIlp1FuMH+eYtbaqMz+Y=";

  postInstall = ''
    wrapProgram $out/bin/composer \
@@ -7,16 +7,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "grumphp";
-  version = "2.17.0";
+  version = "2.18.0";

  src = fetchFromGitHub {
    owner = "phpro";
    repo = "grumphp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8=";
+    hash = "sha256-JNpgIba+Y3qURegZFNeBKwigynSVzSfaAxM2RwcILMc=";
  };

-  vendorHash = "sha256-lgXDxfBTCtGlrDzi+leeE8J8VIsaKpwyB1CUTUvdpMg=";
+  vendorHash = "sha256-Abi+NIXqD8HVTI1OVimeYmzybKXGGNA+l2MHUkx7CpQ=";

  doInstallCheck = true;
  nativeInstallCheckInputs = [ versionCheckHook ];
@@ -6,7 +6,7 @@
 }:
 let
  pname = "maxminddb";
-  version = "1.12.1";
+  version = "1.13.1";
 in
 buildPecl {
  inherit pname version;
@@ -15,7 +15,7 @@ buildPecl {
    owner = "maxmind";
    repo = "MaxMind-DB-Reader-php";
    rev = "v${version}";
-    sha256 = "sha256-VsQOztF4TN3XgJjf3mZa1/Y5+6ounbkLRAzawLSX+BI=";
+    sha256 = "sha256-rOS6XAap94AtFSZnQO8kEXDRUfr1Y5IhWKRxP6fxSio=";
  };

  prePatch = ''
@@ -9,13 +9,13 @@

 buildPecl rec {
  pname = "phalcon";
-  version = "5.9.3";
+  version = "5.10.0";

  src = fetchFromGitHub {
    owner = "phalcon";
    repo = "cphalcon";
    rev = "v${version}";
-    hash = "sha256-1+8+kIaKvgQCE+qvZOkYOW/RdDv4ln0njC5VzL9jvnQ=";
+    hash = "sha256-2dk/AjOWG2oJ3BoBODO9H4S32Jc/Z+W3qxvMkfR5oKE=";
  };

  internalDeps = [
@@ -8,16 +8,16 @@
 (php.withExtensions ({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject2
  (finalAttrs: {
    pname = "phing";
-    version = "3.1.0";
+    version = "3.1.1";

    # Upstream no longer provides the composer.lock in their release artifact
    src = fetchgit {
      url = "https://github.com/phingofficial/phing";
      tag = finalAttrs.version;
-      hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU=";
+      hash = "sha256-2v16ojUDIECLfwWy8/Rbp1A6LlAXnjr4/dJLh6oog8w=";
    };

-    vendorHash = "sha256-yfGfMAQGlXnCoww4rtynknL7qDjcQFEM8p8FbsIqJZU=";
+    vendorHash = "sha256-dBk4/Mz2jh7Bq9VfdfvnWqSufbeAeVdC85zAnXVFQNA=";

    nativeInstallCheckInputs = [
      versionCheckHook
@@ -9,7 +9,7 @@
 }:

 let
-  version = "6.0.2";
+  version = "6.1.6";
 in
 buildPecl {
  inherit version;
@@ -19,7 +19,7 @@ buildPecl {
    owner = "swoole";
    repo = "swoole-src";
    rev = "v${version}";
-    hash = "sha256-mCJj0vLpJinxK/EfPq+CeVWnoxouqClOKYbrgj7GNDc=";
+    hash = "sha256-gbN9CsuSRnttK0GmssLmhpqygkArDqtgkXZbzJhpFlM=";
  };

  buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ valgrind ];
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "ducc0";
-  version = "0.39.1";
+  version = "0.40.0";
  pyproject = true;

  src = fetchFromGitLab {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "mtr";
    repo = "ducc";
    tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-8nM7Jnxx1NoQQwL0VyPGLzdq1UW5apjxKa1ksq2Qh6U=";
+    hash = "sha256-0QzCY9E79hRrLQwxrB6t04NUM6sDQmWIyl/y0H0R3ak=";
  };

  postPatch = ''
@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  pkgs,
  buildPythonPackage,
  fetchFromGitHub,
@@ -198,6 +199,15 @@ buildPythonPackage (finalAttrs: {
    "test_resnet18_export_to_executorch"
    "test_resnet50_export_to_executorch"
    "test_vit_export_to_executorch"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    # RuntimeError: Error in dlopen:
+    # /tmp/AP8CBk/vision_encoder/data/aotinductor/model/chm6ca425mbz7jdmmwcbnyrm6x6tedrfmaoyr4vee625vxhjibbt.wrapper.so:
+    # cannot enable executable stack as shared object requires: Invalid argument
+    "TestImageTransform"
+    "test_flamingo_vision_encoder"
+    "test_llama3_2_text_decoder_aoti"
+    "test_tile_positional_embedding_aoti"
  ];

  meta = {
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyezvizapi";
-  version = "1.0.4.4";
+  version = "1.0.4.5";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "RenierM26";
    repo = "pyEzvizApi";
    tag = version;
-    hash = "sha256-ReGGyB7qxiBK5zNQJP2oCzTF3IeQDu1ljM5IF7vZcXk=";
+    hash = "sha256-mzEZQmdhS/vJTFMgDSLaLqKos0ui2pFkcSToy5B8yrw=";
  };

  build-system = [ setuptools ];
@@ -60,8 +60,8 @@ buildPythonPackage rec {
      );
    })

-    # Can be removed after the SDL 3.4.0 bump.
-    ./skip-rle-tests.patch
+    # https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119
+    ./skip-failing-tests.patch
  ];

  postPatch = ''
@@ -0,0 +1,43 @@
+diff --git a/test/draw_test.py b/test/draw_test.py
+index ed99f0ce9..0484ef53d 100644
+--- a/test/draw_test.py
+++ b/test/draw_test.py
+@@ -7496,6 +7496,10 @@ class DrawModuleTest(unittest.TestCase):
+             with self.assertRaises(TypeError):
+                 draw.polygon(surf, col, points, 0)
+ 
+    @unittest.skipIf(
+        True,
+        "https://github.com/pygame-community/pygame-ce/pull/3680#issuecomment-3796052119",
+    )
+     def test_aafunctions_depth_segfault(self):
+         """Ensure future commits don't break the segfault fixed by pull request
+         https://github.com/pygame-community/pygame-ce/pull/3008
+diff --git a/test/surface_test.py b/test/surface_test.py
+index c2c91f4f5..35b9e1aaf 100644
+--- a/test/surface_test.py
+++ b/test/surface_test.py
+@@ -286,6 +286,7 @@ class SurfaceTypeTest(unittest.TestCase):
+         for pt in test_utils.rect_outer_bounds(fill_rect):
+             self.assertNotEqual(s1.get_at(pt), color)
+ 
+    @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/575")
+     def test_fill_rle(self):
+         """Test RLEACCEL flag with fill()"""
+         color = (250, 25, 25, 255)
+diff --git a/test/window_test.py b/test/window_test.py
+index b8dd1f005..5b7939908 100644
+--- a/test/window_test.py
+++ b/test/window_test.py
+@@ -113,10 +113,7 @@ class WindowTypeTest(unittest.TestCase):
+         self.win.always_on_top = False
+         self.assertFalse(self.win.always_on_top)
+ 
+-    @unittest.skipIf(
+-        SDL < (2, 0, 18),
+-        "requires SDL 2.0.18+",
+-    )
+    @unittest.skipIf(True, "https://github.com/pygame-community/pygame-ce/pull/3680")
+     def test_mouse_rect(self):
+         self.win.mouse_rect = None
+         self.assertIsNone(self.win.mouse_rect)
@@ -1,12 +0,0 @@
-diff --git a/test/surface_test.py b/test/surface_test.py
-index c2c91f4f5..58d916de8 100644
--- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -435,6 +436,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
-     def test_set_alpha__set_colorkey_rle(self):
-         pygame.display.init()
-         try:
@@ -32,6 +32,9 @@ buildPythonPackage rec {
  version = "2.6.1";
  pyproject = true;

+  # https://github.com/NixOS/nixpkgs/pull/475917
+  disabled = pythonAtLeast "3.14";
+
  src = fetchFromGitHub {
    owner = "pygame";
    repo = "pygame";
@@ -64,8 +67,7 @@ buildPythonPackage rec {
    # mixer queue test returns busy queue when it shouldn't
    ./skip-mixer-test.patch

-    # Can be removed with the next SDL3 bump.
-    ./skip-rle-tests.patch
+    ./skip-failing-tests.patch

    # https://github.com/pygame/pygame/pull/4497
    ./0001-Use-SDL_HasSurfaceRLE-when-available.patch
@@ -0,0 +1,24 @@
+diff --git a/test/pixelarray_test.py b/test/pixelarray_test.py
+index 7b1cf420..67b93d3d 100644
+--- a/test/pixelarray_test.py
+++ b/test/pixelarray_test.py
+@@ -990,6 +990,7 @@ class PixelArrayTypeTest(unittest.TestCase, TestMixin):
+         self.assertEqual(w2, w)
+         self.assertEqual(h2, h_slice)
+ 
+    @unittest.skipIf(True, "")
+     def test_make_surface__subclassed_surface(self):
+         """Ensure make_surface can handle subclassed surfaces."""
+         expected_size = (3, 5)
+diff --git a/test/surface_test.py b/test/surface_test.py
+index b1147d27..8e1209ff 100644
+--- a/test/surface_test.py
+++ b/test/surface_test.py
+@@ -239,6 +239,7 @@ class SurfaceTypeTest(unittest.TestCase):
+         for pt in test_utils.rect_outer_bounds(fill_rect):
+             self.assertNotEqual(s1.get_at(pt), color)
+ 
+    @unittest.skipIf(True, "https://github.com/libsdl-org/sdl2-compat/issues/575")
+     def test_fill_rle(self):
+         """Test RLEACCEL flag with fill()"""
+         color = (250, 25, 25, 255)
@@ -1,20 +0,0 @@
-diff --git a/test/surface_test.py b/test/surface_test.py
-index b1147d27..c7ba2928 100644
--- a/test/surface_test.py
-+++ b/test/surface_test.py
-@@ -346,6 +346,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/pull/14429")
-     def test_solarwolf_rle_usage_2(self):
-         """Test for RLE status after setting alpha"""
- 
-@@ -377,6 +378,7 @@ class SurfaceTypeTest(unittest.TestCase):
-         finally:
-             pygame.display.quit()
- 
-+    @unittest.skipIf(True, "https://github.com/libsdl-org/SDL/issues/14424")
-     def test_set_alpha__set_colorkey_rle(self):
-         pygame.display.init()
-         try:
@@ -20,7 +20,7 @@
 }:

 let
-  # https://github.com/meta-pytorch/tokenizers/blob/v1.0.1/CMakeLists.txt#L174-L175
+  # https://github.com/meta-pytorch/tokenizers/blob/v<VERSION>/CMakeLists.txt#L174-L175
  pybind11-src = fetchFromGitHub {
    owner = "pybind";
    repo = "pybind11";
@@ -28,17 +28,17 @@ let
    hash = "sha256-SNLdtrOjaC3lGHN9MAqTf51U9EzNKQLyTMNPe0GcdrU=";
  };
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "pytorch-tokenizers";
-  version = "1.0.1";
+  version = "1.1.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "meta-pytorch";
    repo = "tokenizers";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-1BGazimbauNBN/VfLiuhk21VEhbP07GEpPc+GAfKTQY=";
+    hash = "sha256-la1PH8KT6iWYjvwBNYcQu5KwRS1/6H7SX5Vu6bpD+vg=";
  };

  patches = [
@@ -93,4 +93,4 @@ buildPythonPackage rec {
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
-}
+})
@@ -111,6 +111,14 @@ buildPythonPackage (finalAttrs: {
    "test_forward_with_curr_pos"
    "test_forward_with_packed_pos"
  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    # RuntimeError: Error in dlopen:
+    # /tmp/yae2xK/mha/data/aotinductor/model/ckk2zlroqn6hgq5vvpy7bcjikztqmwqkek3njxe2gvvwp244hjny.wrapper.so:
+    # cannot enable executable stack as shared object requires: Invalid argument
+    "test_attention_aoti"
+    "test_tile_positional_embedding_aoti"
+    "test_tiled_token_positional_embedding_aoti"
+  ]
  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
    # Fatal Python error: Segmentation fault
    "test_forward_gqa"
@@ -11,7 +11,7 @@
  gbenchmark,
  buildTests ? false,
  buildBenchmarks ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 # CUB can also be used as a backend instead of rocPRIM.
@@ -15,7 +15,7 @@
  buildTests ? false,
  buildBenchmarks ? false,
  buildSamples ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 # Can also use cuFFT
@@ -9,7 +9,7 @@
  rocrand,
  gtest,
  buildTests ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -13,7 +13,7 @@
  buildTests ? false,
  buildBenchmarks ? false,
  buildSamples ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 # This can also use cuSPARSE as a backend instead of rocSPARSE
@@ -25,7 +25,7 @@
  useOpenCL ? false,
  useCPU ? false,
  buildDocs ? false, # Needs internet
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +17,7 @@
  buildTests ? false,
  buildBenchmarks ? false,
  buildSamples ? false,
-  gpuTargets ? [ ], # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ]
+  gpuTargets ? clr.localGpuTargets or [ ], # gpuTargets = [ "gfx803" "gfx900:xnack-" "gfx906:xnack-" ... ]
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -10,7 +10,7 @@
  gbenchmark,
  buildTests ? false,
  buildBenchmarks ? false,
-  gpuTargets ? [ ],
+  gpuTargets ? clr.localGpuTargets or [ ],
 }:

 stdenv.mkDerivation (finalAttrs: {
--- a/Show More
+++ b/Show More