Merge 05e9da8fdb into haskell-updates

2026-04-11 00:32:00 +00:00
parent 2aba6ba2d6 05e9da8fdb
commit d682a544fc
425 changed files with 5984 additions and 13782 deletions
@@ -72,7 +72,7 @@ jobs:

      - name: "Add 'has: port to stable' label"
        if: steps.backport.outputs.created_pull_numbers != ''
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          # Not using the app on purpose to avoid triggering another workflow run after adding this label.
          script: |
@@ -74,7 +74,7 @@ jobs:
        run: gh api /rate_limit | jq

      - name: Run bot
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ steps.app-token.outputs.token || github.token }}
          retries: 3
@@ -62,7 +62,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
        with:
          # Sandbox is disabled on MacOS by default.
          extra_nix_config: sandbox = true
@@ -52,7 +52,7 @@ jobs:

      - name: Check commits
        id: check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          TARGETS_STABLE: ${{ fromJSON(inputs.baseBranch).stable && !contains(fromJSON(inputs.headBranch).type, 'development') }}
        with:
@@ -85,7 +85,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -38,7 +38,7 @@ jobs:
          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
          permission-pull-requests: write

-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ steps.app-token.outputs.token || github.token }}
          retries: 3
@@ -43,7 +43,7 @@ jobs:
          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
          permission-pull-requests: write

-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ steps.app-token.outputs.token }}
          script: |
@@ -61,7 +61,7 @@ jobs:

      - name: Find commit that touched ci/pinned.json
        id: find-pinned-commit
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          TARGET_SHA: ${{ inputs.targetSha }}
          HEAD_SHA: ${{ inputs.headSha }}
@@ -132,7 +132,7 @@ jobs:
            core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)

      - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - name: Load supported versions
        id: versions
@@ -180,7 +180,7 @@ jobs:
          target-as-trusted-at: ${{ inputs.targetSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -270,7 +270,7 @@ jobs:
          merge-multiple: true

      - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - name: Combine all output paths and eval stats
        run: |
@@ -307,7 +307,7 @@ jobs:

      - name: Add eval summary to commit statuses
        if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
            const { readFile } = require('node:fs/promises')
@@ -337,7 +337,7 @@ jobs:
            })
      - name: Request changes if PR is against an inappropriate branch
        if: ${{ github.event_name == 'pull_request_target' }}
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
            require('./nixpkgs/trusted/ci/github-script/check-target-branch.js')({
@@ -359,7 +359,7 @@ jobs:
          path: versions

      - name: Add version comparison table to job summary
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
          SYSTEMS: ${{ inputs.systems }}
@@ -451,7 +451,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - name: Ensure flake outputs on all systems still evaluate
        run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
@@ -35,7 +35,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
      # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@96951a368ba55167b55f1c916f7d416bac6505fe # v31.10.3
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4

      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
        continue-on-error: true
@@ -139,7 +139,7 @@ jobs:
          persist-credentials: true # Needed to run git fetch for large PRs.
          path: trusted
      - name: Check commit messages
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
            const checkCommitMessages = require('./trusted/ci/github-script/lint-commits.js')
@@ -32,7 +32,7 @@ jobs:
            ci/github-script/supportedSystems.js

      - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          MERGED_SHA: ${{ inputs.mergedSha }}
          TARGET_SHA: ${{ inputs.targetSha }}
@@ -125,7 +125,7 @@ jobs:
    permissions:
      statuses: write # creating 'no PR failures' commit status
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          RESULTS: ${{ toJSON(needs.*.result) }}
        with:
@@ -37,7 +37,7 @@ jobs:
          sparse-checkout: |
            ci/github-script
      - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          retries: 10
          # The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -126,7 +126,7 @@ jobs:
    permissions:
      statuses: write
    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        env:
          RESULTS: ${{ toJSON(needs.*.result) }}
        with:
@@ -35,7 +35,7 @@ jobs:
          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
          permission-pull-requests: write

-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ steps.app-token.outputs.token || github.token }}
          retries: 3
@@ -41,7 +41,7 @@ jobs:
        run: npm install bottleneck@2.19.5

      - name: Synchronise teams
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          github-token: ${{ steps.app-token.outputs.token }}
          script: |
@@ -26,7 +26,7 @@ jobs:
          sparse-checkout: |
            ci/github-script
      - id: prepare
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          retries: 10
          # The default for this includes code 422, which happens regularly for us when comparing commits:
@@ -45,7 +45,7 @@ jobs:

      - name: Determine changed files
        id: files
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
            const files = (await github.paginate(github.rest.pulls.listFiles, {
@@ -9,9 +9,9 @@
      },
      "branch": "nixpkgs-unstable",
      "submodules": false,
-      "revision": "106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f",
-      "url": "https://github.com/NixOS/nixpkgs/archive/106eb93cbb9d4e4726bf6bc367a3114f7ed6b32f.tar.gz",
-      "hash": "0wyyhddz2mqhmq938d337223675jpd83dd5lsks2nhz0hs4r3jha"
+      "revision": "02f3fa0374fa13707d42d55d58ecc76b091f223c",
+      "url": "https://github.com/NixOS/nixpkgs/archive/02f3fa0374fa13707d42d55d58ecc76b091f223c.tar.gz",
+      "hash": "0z8d33c5g0gk9a74ppqq77npisf9xx9c8ai9isxa2hyjx4lv1pki"
    },
    "treefmt-nix": {
      "type": "Git",
@@ -22,9 +22,9 @@
      },
      "branch": "main",
      "submodules": false,
-      "revision": "75925962939880974e3ab417879daffcba36c4a3",
-      "url": "https://github.com/numtide/treefmt-nix/archive/75925962939880974e3ab417879daffcba36c4a3.tar.gz",
-      "hash": "118zlbyzmh21x6rad2vrxjkdfyicd8lx3s0if8b791n51hz1r9ns"
+      "revision": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+      "url": "https://github.com/numtide/treefmt-nix/archive/790751ff7fd3801feeaf96d7dc416a8d581265ba.tar.gz",
+      "hash": "1zah3dmbpn3ap5acg22kq1j19dg32gj73l43yamjcxhc38sv9kd5"
    }
  },
  "version": 5
@@ -143,6 +143,8 @@

 - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/.

+- `nomad` has been updated to v1.11. Refer to the [release note](https://developer.hashicorp.com/nomad/docs/release-notes/nomad/v1-11-x) for more details. Once a new Nomad version has started and upgraded it's data directory, it generally cannot be downgraded to the previous version.
+
 - The default NVIDIA drivers no longer support Maxwell (GTX 1xxx) or older GPUs. Pin the nvidia package to ` config.boot.kernelPackages.nvidiaPackages.legacy_580` for continued support.

 - `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0).
@@ -330,4 +332,4 @@ gnuradioMinimal.override {

 - The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.

- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.
+- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a new `webRoot` option for identifying custom webroots in source code, a new `configRoot` option for identifying and synchronizing config yamls onto NixOS, and a some new settings for managing variable content and filepaths.
@@ -3642,6 +3642,11 @@
    githubId = 114744388;
    name = "bloominstrong";
  };
+  blooym = {
+    name = "Lyna";
+    github = "Blooym";
+    githubId = 19539165;
+  };
  bloveless = {
    email = "brennon.loveless@gmail.com";
    github = "bloveless";
@@ -9911,6 +9916,12 @@
    name = "Adrian Groh";
    keys = [ { fingerprint = "62BD BF30 83E9 7076 9665 B60B 3AA3 153E 98B0 D771"; } ];
  };
+  god464 = {
+    github = "god464";
+    githubId = 36400459;
+    name = "god464";
+    keys = [ { fingerprint = "089E 1560 7145 FE93 2C00  2942 D7A7 2706 FC8D E569"; } ];
+  };
  goertzenator = {
    email = "daniel.goertzen@gmail.com";
    github = "goertzenator";
@@ -15174,6 +15185,12 @@
    name = "leo60228";
    keys = [ { fingerprint = "5BE4 98D5 1C24 2CCD C21A  4604 AC6F 4BA0 78E6 7833"; } ];
  };
+  leoflo = {
+    email = "noreply@leoflo.me";
+    github = "le0flo";
+    githubId = 128467278;
+    name = "Leonardo";
+  };
  leona = {
    email = "nix@leona.is";
    github = "leona-ya";
@@ -19900,6 +19917,12 @@
    github = "Noodlesalat";
    githubId = 12748782;
  };
+  nuexq = {
+    email = "nuexqq@gmail.com";
+    github = "nuexq";
+    githubId = 145666753;
+    name = "nuexq";
+  };
  nukaduka = {
    email = "ksgokte@gmail.com";
    github = "NukaDuka";
@@ -27982,6 +28005,13 @@
    githubId = 2130305;
    name = "Marek Fajkus";
  };
+  turebentzin = {
+    name = "Ture Bentzin";
+    email = "ture.bentzin@alumni.fh-aachen.de";
+    github = "turebentzin";
+    githubId = 38729194;
+    keys = [ { fingerprint = "4868 4B0F D531 473E C82A  641E F1E6 70A1 ED8E 92CE"; } ];
+  };
  turion = {
    email = "programming@manuelbaerenz.de";
    github = "turion";
@@ -29371,6 +29401,12 @@
    githubId = 9132420;
    keys = [ { fingerprint = "F943 A0BC 720C 5BEF 73CD E02D B398 93FA 5F65 CAE1"; } ];
  };
+  wolfram444 = {
+    name = "Xabibulloh To'xtayev";
+    email = "kamiltox2006@gmail.com";
+    github = "woolfram444";
+    githubId = 109225370;
+  };
  womeier = {
    name = "Wolfgang Meier";
    email = "womeier@posteo.de";
@@ -1942,6 +1942,7 @@
  ./system/boot/unl0kr.nix
  ./system/boot/uvesafb.nix
  ./system/boot/zram-as-tmp.nix
+  ./system/boot/zswap.nix
  ./system/etc/etc-activation.nix
  ./system/service/systemd/system.nix
  ./system/service/systemd/user.nix
@@ -48,7 +48,7 @@ let
    path: name:
    pkgs.runCommandLocal "${name}.fish" {
      nativeBuildInputs = [ pkgs.babelfish ];
-    } "babelfish < ${path} > $out;";
+    } "exec -a ${lib.getExe pkgs.babelfish} babelfish < ${path} > $out;";
 in
 {
  options = {
@@ -72,10 +72,6 @@ in
    systemd = {
      packages = [ pkgs.gamemode ];
      user.services.gamemoded = {
-        # The upstream service already defines this, but doesn't get applied.
-        # See https://github.com/NixOS/nixpkgs/issues/81138
-        wantedBy = [ "default.target" ];
-
        # Use pkexec from the security wrappers to allow users to
        # run libexec/cpugovctl & libexec/gpuclockctl as root with
        # the the actions defined in share/polkit-1/actions.
@@ -759,35 +759,25 @@ in
            };

            environment.NB_SETUP_KEY_FILE = "%d/setup-key";
-            /*
-              might want to do something similar to the docker entrypoint (watching log messages) instead
-              see https://github.com/netbirdio/netbird/blob/dc30dcacce4c322502975f1f491e6774efd7e1e9/client/netbird-entrypoint.sh
-            */
+
            script = ''
              set -x
-              # uses a file on a `tmpfs`, because variable updates get lost in the loop
-              status_file="/tmp/status.txt"

-              refresh_status() {
-                '${lib.getExe client.wrapper}' status &>"$status_file" || :
-              }
-
-              print_short_setup_key() {
-                cut -b1-8 <"$NB_SETUP_KEY_FILE"
+              get_status() {
+                '${lib.getExe client.wrapper}' status 2>&1 || :
              }

              main() {
-                refresh_status
-                <"$status_file" sed 's/^/STATUS:PRE-CONNECT : /g'
-
-                until refresh_status && <"$status_file" grep --quiet 'Connected\|NeedsLogin' ; do
+                # grep for `: Connected` as well, as `Connected` appears other
+                # places even when not connected, and before NeedsLogin
+                until get_status | grep --quiet ': Connected\|NeedsLogin' ; do
                  sleep 1
                done
-                <"$status_file" sed 's/^/STATUS:POST-CONNECT: /g'

-                if <"$status_file" grep --quiet 'NeedsLogin' ; then
-                  echo "Using Setup Key File with key: $(print_short_setup_key)" >&2
-                  '${lib.getExe client.wrapper}' up --setup-key-file="$NB_SETUP_KEY_FILE"
+                if get_status | grep --quiet 'NeedsLogin' ; then
+                  # setup key is in $NB_SETUP_KEY_FILE, and is
+                  # automatically picked up by the cli
+                  '${lib.getExe client.wrapper}' up
                fi
              }

@@ -14,7 +14,6 @@ in
  meta.maintainers = with lib.maintainers; [
    philandstuff
    rawkode
-    kaynetik
  ];

  options = {
@@ -23,10 +23,12 @@ let
    mkPackageOption
    nameValuePair
    optionalAttrs
+    optionalString
    types
    ;
  inherit (lib.strings)
    removePrefix
+    removeSuffix
    ;
  inherit (pkgs)
    mariadb
@@ -51,7 +53,13 @@ let
        runHook preInstall

        mkdir -p $out
-        rsync -aq * $out/ --exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites
+        EXCLUDES="--exclude=${removePrefix "/" cfg.webRoot}/sites --exclude=sites"
+
+        if [ ! -z "${cfg.configRoot}" ]; then
+          EXCLUDES="$EXCLUDES --exclude=${removePrefix "/" cfg.configRoot}"
+        fi
+
+        rsync -aq * $out/ $EXCLUDES

        runHook postInstall
      '';
@@ -81,6 +89,26 @@ let
      '';
    });

+  configSync =
+    hostName: cfg:
+    optionalString (cfg.configRoot != "") (
+      stdenv.mkDerivation (finalAttrs: {
+        pname = "drupal-config-${hostName}";
+        name = "drupal-config-${hostName}";
+        src = cfg.package;
+        buildInputs = with pkgs; [ rsync ];
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out/config
+          rsync -a ./share/php/${cfg.package.pname}${cfg.configRoot}/* $out/config/
+
+          runHook postInstall
+        '';
+      })
+    );
+
  drupalSettings =
    hostName: cfg:
    pkgs.writeTextFile {
@@ -136,7 +164,10 @@ let
    hostName: cfg:
    pkgs.writeShellApplication {
      name = "drupal-state-init-${hostName}";
-      excludeShellChecks = [ "SC2194" ];
+      excludeShellChecks = [
+        "SC2194"
+        "SC2157"
+      ];
      runtimeInputs = with pkgs; [ rsync ];
      text = ''
        echo "Updating the sites directory for ${hostName}..."
@@ -144,6 +175,12 @@ let
          --exclude "*/files" \
          --delete-before

+        if [ ! -z "${cfg.configRoot}" ]; then
+          echo "Updating config sync directory for ${hostName}..."
+          rsync -auq "${configSync hostName cfg}/config/" "${removeSuffix "/sync" cfg.configSyncDir}" \
+            --delete-before
+        fi
+
        if [ ! -d "${cfg.filesDir}" ]; then
          echo "Preparing files directory..."
          mkdir -p "${cfg.filesDir}"
@@ -221,6 +258,10 @@ let
            The location of the user-managed Drupal config sync directory.
            Drupal will both read from and write to this directory when executing
            configuration management operations.
+
+            This option differs from the `configRoot` option,
+            which this service uses to discover
+            the location of the config sync directory in the package's source code.
          '';
        };

@@ -229,12 +270,32 @@ let
          default = "";
          description = ''
            An optional path string with a leading slash
-            indicating the location of the Drupal webroot relative to the
-            project root directory, if one exists.
+            indicating the location of the Drupal webroot
+            in your package's source code.
+
+            The path relative to the project root directory.
          '';
          example = "/web";
        };

+        configRoot = mkOption {
+          type = types.str;
+          default = "";
+          description = ''
+            An optional path string with a leading slash
+            indicating the location of the config sync directory on
+            the Drupal package. Your package will probably have a config sync
+            directory if it has been significantly customized.
+
+            The path must be relative to the project root directory.
+
+            This option differs from the `configSyncDir` option, which
+            tells this service where to create a user-writeable config directory
+            on NixOS.
+          '';
+          example = "/config";
+        };
+
        extraConfig = mkOption {
          type = types.lines;
          default = "";
@@ -45,19 +45,6 @@ in
        default = "glitchtip";
      };

-      listenAddress = lib.mkOption {
-        type = lib.types.str;
-        description = "The address to listen on.";
-        default = "127.0.0.1";
-        example = "0.0.0.0";
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        description = "The port to listen on.";
-        default = 8000;
-      };
-
      stateDir = lib.mkOption {
        type = lib.types.path;
        description = "State directory of glitchtip.";
@@ -66,7 +53,7 @@ in

      settings = lib.mkOption {
        description = ''
-          Configuration of GlitchTip. See <https://glitchtip.com/documentation/install#configuration> for more information.
+          Configuration of GlitchTip. See <https://glitchtip.com/documentation/install#configuration> for more information and required settings.
        '';
        default = { };
        defaultText = lib.literalExpression ''
@@ -74,8 +61,14 @@ in
            DEBUG = 0;
            DEBUG_TOOLBAR = 0;
            DATABASE_URL = lib.mkIf config.services.glitchtip.database.createLocally "postgresql://@/glitchtip";
+            GLITCHTIP_DOMAIN = lib.mkIf config.services.glitchtip.nginx.createLocally "https://''${config.services.glitchtip.nginx.domain}";
+            GLITCHTIP_VERSION = config.services.glitchtip.package.version;
+            GRANIAN_HOST = "127.0.0.1";
+            GRANIAN_PORT = 8000;
+            GRANIAN_STATIC_PATH_MOUNT = "''${config.services.glitchtip.package}/lib/glitchtip/static";
+            GRANIAN_WORKERS = 1;
+            PYTHONUNBUFFERED = 1;
            REDIS_URL = lib.mkIf config.services.glitchtip.redis.createLocally "unix://''${config.services.redis.servers.glitchtip.unixSocket}";
-            CELERY_BROKER_URL = lib.mkIf config.services.glitchtip.redis.createLocally "redis+socket://''${config.services.redis.servers.glitchtip.unixSocket}";
          }
        '';
        example = {
@@ -94,9 +87,28 @@ in

          options = {
            GLITCHTIP_DOMAIN = lib.mkOption {
-              type = lib.types.str;
+              type = lib.types.nullOr lib.types.str;
              description = "The URL under which GlitchTip is externally reachable.";
              example = "https://glitchtip.example.com";
+              default = null;
+            };
+
+            GLITCHTIP_ENABLE_MCP = lib.mkOption {
+              type = lib.types.bool;
+              description = "Whether to enable the MCP api.";
+              default = false;
+            };
+
+            GRANIAN_WORKERS = lib.mkOption {
+              type = lib.types.ints.positive;
+              description = "Number of granian workers to start";
+              default = 1;
+            };
+
+            ENABLE_OBSERVABILITY_API = lib.mkOption {
+              type = lib.types.bool;
+              description = "Whether to enable the Prometheus metrics endpoint.";
+              default = false;
            };

            ENABLE_USER_REGISTRATION = lib.mkOption {
@@ -132,49 +144,74 @@ in
      database.createLocally = lib.mkOption {
        type = lib.types.bool;
        default = true;
-        description = ''
-          Whether to enable and configure a local PostgreSQL database server.
-        '';
+        description = "Whether to enable and configure a local PostgreSQL database server.";
+      };
+
+      nginx = {
+        createLocally = lib.mkOption {
+          type = lib.types.bool;
+          default = false;
+          description = "Whether to enable and configure a local Nginx server.";
+        };
+
+        domain = lib.mkOption {
+          type = lib.types.str;
+          example = "glitchtip.example.com";
+          description = ''
+            Domain under which GlitchTip will be reachable.
+            In contrast to `settings.GLITCHTIP_DOMAIN` this option has no protocol.
+            It will also set `settings.GLITCHTIP_DOMAIN` with the `https://` protocol.
+          '';
+        };
      };

      redis.createLocally = lib.mkOption {
        type = lib.types.bool;
        default = true;
-        description = ''
-          Whether to enable and configure a local Redis instance.
-        '';
-      };
-
-      gunicorn.extraArgs = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-        description = "Extra arguments for gunicorn.";
-      };
-
-      celery.extraArgs = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        default = [ ];
-        description = "Extra arguments for celery.";
+        description = "Whether to enable and configure a local Redis instance.";
      };
    };
  };

+  imports = [
+    (lib.mkRenamedOptionModule
+      [ "services" "glitchtip" "listenAddress" ]
+      [ "services" "glitchtip" "settings" "GRANIAN_HOST" ]
+    )
+    (lib.mkRenamedOptionModule
+      [ "services" "glitchtip" "port" ]
+      [ "services" "glitchtip" "settings" "GRANIAN_PORT" ]
+    )
+    (lib.mkRemovedOptionModule [ "services" "glitchtip" "celery" "extraArgs" ]
+      "GlitchTip 6 migrated away from celery. Please check the upstream docs how to handle your usecase now."
+    )
+    (lib.mkRemovedOptionModule [ "services" "glitchtip" "gunicorn" "extraArgs" ]
+      "GlitchTip 6 migrated away from gunicorn. Please check the upstream docs how to handle your usecase now."
+    )
+  ];
+
  config = lib.mkIf cfg.enable {
    services.glitchtip.settings = {
      DEBUG = lib.mkDefault 0;
      DEBUG_TOOLBAR = lib.mkDefault 0;
-      PYTHONPATH = "${python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/glitchtip";
-      DATABASE_URL = lib.mkIf cfg.database.createLocally "postgresql://@/glitchtip";
-      REDIS_URL = lib.mkIf cfg.redis.createLocally "unix://${config.services.redis.servers.glitchtip.unixSocket}";
-      CELERY_BROKER_URL = lib.mkIf cfg.redis.createLocally "redis+socket://${config.services.redis.servers.glitchtip.unixSocket}";
      GLITCHTIP_VERSION = pkg.version;
+      GRANIAN_HOST = lib.mkDefault "127.0.0.1";
+      GRANIAN_PORT = lib.mkDefault 8000;
+      GRANIAN_STATIC_PATH_MOUNT = "${pkg}/lib/glitchtip/static";
+      GRANIAN_WORKERS = lib.mkDefault 1;
+      PYTHONPATH = "${python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/glitchtip";
+      PYTHONUNBUFFERED = lib.mkDefault 1;
+    }
+    // lib.optionalAttrs cfg.database.createLocally { DATABASE_URL = "postgresql://@/glitchtip"; }
+    // lib.optionalAttrs cfg.nginx.createLocally { GLITCHTIP_DOMAIN = "https://${cfg.nginx.domain}"; }
+    // lib.optionalAttrs cfg.redis.createLocally {
+      REDIS_URL = "unix://${config.services.redis.servers.glitchtip.unixSocket}";
    };

    systemd.services =
      let
        commonService = {
          wantedBy = [ "multi-user.target" ];
-
          wants = [ "network-online.target" ];
          requires =
            lib.optional cfg.database.createLocally "postgresql.target"
@@ -235,35 +272,55 @@ in
      {
        glitchtip = commonService // {
          description = "GlitchTip";
+          environment =
+            environment
+            // lib.optionalAttrs (cfg.settings.ENABLE_OBSERVABILITY_API && cfg.settings.WORKERS > 1) {
+              PROMETHEUS_MULTIPROC_DIR = "/tmp/prometheus_multiproc";
+            };
+          bindsTo = [ "glitchtip-worker.service" ];
+          before = [ "glitchtip-worker.service" ];

          preStart = ''
            ${lib.getExe pkg} migrate
+            ${lib.getExe pkg} createcachetable
+            ${lib.getExe pkg} maintain_partitions
          '';

          serviceConfig = commonServiceConfig // {
            ExecStart = ''
-              ${lib.getExe python.pkgs.gunicorn} \
-                --bind=${cfg.listenAddress}:${toString cfg.port} \
-                ${lib.concatStringsSep " " cfg.gunicorn.extraArgs} \
-                glitchtip.wsgi
+              ${lib.getExe python.pkgs.granian} \
+                --interface ${if cfg.settings.GLITCHTIP_ENABLE_MCP then "asgi" else "asginl"} \
+                glitchtip.asgi:application \
+                --host ${cfg.settings.GRANIAN_HOST} \
+                --port ${toString cfg.settings.GRANIAN_PORT} \
+                --workers ${toString cfg.settings.GRANIAN_WORKERS} \
+                --no-ws
            '';
          };
        };

        glitchtip-worker = commonService // {
          description = "GlitchTip Job Runner";
-
+          environment = environment // {
+            IS_WORKER = "1";
+          };
          serviceConfig = commonServiceConfig // {
-            ExecStart = ''
-              ${lib.getExe python.pkgs.celery} \
-                -A glitchtip worker \
-                -B -s /run/glitchtip/celerybeat-schedule \
-                ${lib.concatStringsSep " " cfg.celery.extraArgs}
-            '';
+            ExecStart = "${lib.getExe pkg} runworker --scheduler";
          };
        };
      };

+    services.nginx = lib.mkIf cfg.nginx.createLocally {
+      enable = true;
+      virtualHosts.${cfg.nginx.domain} = {
+        forceSSL = lib.mkDefault true;
+        locations = {
+          "/".proxyPass = "http://${cfg.settings.GRANIAN_HOST}:${toString cfg.settings.GRANIAN_PORT}";
+          "/static/".root = "${pkg}/lib/glitchtip";
+        };
+      };
+    };
+
    services.postgresql = lib.mkIf cfg.database.createLocally {
      enable = true;
      ensureDatabases = [ "glitchtip" ];
@@ -289,15 +346,13 @@ in

    systemd.tmpfiles.settings.glitchtip."${cfg.stateDir}/uploads".d = { inherit (cfg) user group; };

-    environment.systemPackages =
-      let
-        glitchtip-manage = pkgs.writeShellScriptBin "glitchtip-manage" ''
-          set -o allexport
-          ${lib.toShellVars environment}
-          ${lib.concatMapStringsSep "\n" (f: "source ${f}") cfg.environmentFiles}
-          ${config.security.wrapperDir}/sudo -E -u ${cfg.user} ${lib.getExe pkg} "$@"
-        '';
-      in
-      [ glitchtip-manage ];
+    environment.systemPackages = [
+      (pkgs.writeShellScriptBin "glitchtip-manage" ''
+        set -o allexport
+        ${lib.toShellVars environment}
+        ${lib.concatMapStringsSep "\n" (f: "source ${f}") cfg.environmentFiles}
+        ${config.security.wrapperDir}/sudo -E -u ${cfg.user} ${lib.getExe pkg} "$@"
+      '')
+    ];
  };
 }
@@ -0,0 +1,182 @@
+# Zswap - Compressed Cache for Swap Pages
+#
+# Reference documentation:
+# - https://docs.kernel.org/admin-guide/mm/zswap.html
+# - https://www.kernel.org/doc/html/v6.1/admin-guide/mm/zswap.html
+#
+# IMPORTANT: When modifying this file, ensure that boot.kernel.sysfs configuration
+# remains consistent with kernel parameters configuration. The sysfs settings provide
+# runtime management while kernel parameters ensure early-boot availability.
+
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.boot.zswap;
+
+  # Get the current configured kernel version string
+  kernelVersion = config.boot.kernelPackages.kernel.version;
+
+  # Check if kernel supports zsmalloc as zswap backend (>= 6.3)
+  zsmallocSupported = versionAtLeast kernelVersion "6.3";
+in
+{
+  options.boot.zswap = {
+    enable = mkEnableOption "Zswap (Compressed Cache for Swap Pages)";
+
+    compressor = mkOption {
+      type = types.enum [
+        "zstd"
+        "lz4"
+        "lzo"
+        "lz4hc"
+        "deflate"
+        "842"
+      ];
+      default = "zstd";
+      description = ''
+        Compression algorithm to use for zswap.
+
+        Available options:
+        - 'zstd': Best compression ratio, excellent for Nix builds (default)
+        - 'lz4': Fastest compression, lowest latency
+        - 'lz4hc': High-compression variant of lz4, slower but better ratio
+        - 'lzo': Good balance of speed and compression (kernel default)
+        - 'deflate': Higher compression, slower processing
+        - '842': Hardware-accelerated compression on supported systems
+
+        Note: The chosen algorithm must be supported by your kernel configuration.
+      '';
+    };
+
+    zpool = mkOption {
+      type = types.enum [
+        "zsmalloc"
+        "zbud"
+      ];
+      default = if zsmallocSupported then "zsmalloc" else "zbud";
+      defaultText = literalExpression "if kernel >= 6.3 then \"zsmalloc\" else \"zbud\"";
+      description = ''
+        Kernel zpool allocator.
+        'zsmalloc' is strongly recommended for kernels >= 6.3 as it offers the best density.
+        For older kernels, 'zbud' is the fallback.
+
+        Note: 'z3fold' was removed from Linux kernel 6.8 and later.
+      '';
+    };
+
+    maxPoolPercent = mkOption {
+      type = types.ints.between 1 100;
+      default = 25;
+      description = ''
+        The maximum percentage of system memory that Zswap can occupy (1-100).
+
+        Higher values provide more compression cache but increase memory pressure.
+        Default is 25% (higher than kernel default of 20%) for better Nix build performance.
+
+        Recommended ranges:
+        - Desktop systems: 15-25%
+        - Low-memory systems: 30-50%
+        - Server systems: 10-20%
+      '';
+    };
+
+    acceptThresholdPercent = mkOption {
+      type = types.ints.between 1 100;
+      default = 90;
+      description = ''
+        Threshold percentage at which zswap starts accepting pages again after the pool becomes full (1-100).
+
+        This parameter provides hysteresis to prevent pool oscillation.
+        When the pool usage drops below this threshold, zswap starts accepting new pages.
+        Default is 90% as recommended by kernel documentation.
+      '';
+    };
+
+    shrinkerEnabled = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Enable the zswap shrinker to reclaim memory when under pressure.
+
+        When enabled, the shrinker will automatically reclaim compressed pages
+        from the zswap pool when the system is under memory pressure, helping
+        to prevent out-of-memory situations.
+
+        It is recommended to keep this enabled for most workloads, especially
+        on systems with limited memory.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # 1. Core configuration: kernel parameters for early boot
+    boot.kernelParams = [
+      "zswap.enabled=1"
+      "zswap.compressor=${cfg.compressor}"
+      "zswap.zpool=${cfg.zpool}"
+      "zswap.max_pool_percent=${toString cfg.maxPoolPercent}"
+      "zswap.accept_threshold_percent=${toString cfg.acceptThresholdPercent}"
+      "zswap.shrinker_enabled=${if cfg.shrinkerEnabled then "1" else "0"}"
+    ];
+
+    # 2. Dependency management: ensure required modules are included in initrd or kernel
+    # This ensures Zswap is ready early in the boot process (before swap is mounted)
+    boot.initrd.kernelModules = [
+      cfg.compressor
+      cfg.zpool
+    ];
+
+    # 3. Runtime configuration using boot.kernel.sysfs
+    # This ensures zswap parameters are properly set and maintained during system rebuilds
+    boot.kernel.sysfs.module.zswap.parameters = {
+      enabled = true;
+      compressor = cfg.compressor;
+      zpool = cfg.zpool;
+      max_pool_percent = cfg.maxPoolPercent;
+      accept_threshold_percent = cfg.acceptThresholdPercent;
+      shrinker_enabled = true;
+    };
+
+    assertions = [
+      {
+        assertion = !config.zramSwap.enable;
+        message = ''
+          Conflicting options enabled: 'boot.zswap.enable' and 'zramSwap.enable'.
+
+          You cannot enable Zswap and Zram simultaneously as it leads to double compression
+          and inefficient memory management.
+
+          Please disable one of them:
+            - To use Zswap (requires a physical swap device): Set 'zramSwap.enable = false'.
+            - To use Zram (swap in RAM): Set 'boot.zswap.enable = false'.
+        '';
+      }
+      {
+        assertion = config.swapDevices != [ ];
+        message = ''
+          Zswap requires at least one physical swap device to function as a backing store.
+
+          Try adding the following to your configuration (example):
+
+          swapDevices = [ {
+            device = "/var/lib/swapfile";
+            size = 16 * 1024; # 16GB
+          } ];
+        '';
+      }
+      {
+        assertion = (cfg.zpool == "zsmalloc") -> zsmallocSupported;
+        message = ''
+          Zswap allocator 'zsmalloc' is not supported on kernel version ${kernelVersion}.
+          Support for zsmalloc in Zswap was added in Linux 6.3.
+
+          Please use 'zbud' instead: boot.zswap.zpool = "zbud";
+        '';
+      }
+    ];
+  };
+
+  meta.maintainers = with lib.maintainers; [ luochen1990 ];
+}
@@ -1,7 +1,8 @@
 { lib, ... }:

 let
-  domain = "http://glitchtip.local:8000";
+  domain = "glitchtip.local";
+  url = "http://${domain}";
 in

 {
@@ -16,8 +17,10 @@ in
    {
      services.glitchtip = {
        enable = true;
-        port = 8000;
-        settings.GLITCHTIP_DOMAIN = domain;
+        nginx.createLocally = true;
+        nginx.domain = domain;
+        settings.GLITCHTIP_DOMAIN = lib.mkForce url;
+        settings.CSRF_TRUSTED_ORIGINS = "${url},http://localhost:8000";
        environmentFiles = [
          (builtins.toFile "glitchtip.env" ''
            SECRET_KEY=8Hz7YCGzo7fiicHb8Qr22ZqwoIB7lSRx
@@ -25,19 +28,23 @@ in
        ];
      };

+      services.nginx.virtualHosts.${domain}.forceSSL = false;
+
      environment.systemPackages = [ pkgs.sentry-cli ];

-      networking.hosts."127.0.0.1" = [ "glitchtip.local" ];
+      networking.hosts."127.0.0.1" = [ domain ];
    };

+  interactive.sshBackdoor.enable = true;
+  interactive.defaults.virtualisation.graphics = false;
+
  interactive.nodes.machine = {
-    services.glitchtip.listenAddress = "0.0.0.0";
-    networking.firewall.allowedTCPPorts = [ 8000 ];
+    networking.firewall.allowedTCPPorts = [ 80 ];
    virtualisation.forwardPorts = [
      {
        from = "host";
        host.port = 8000;
-        guest.port = 8000;
+        guest.port = 80;
      }
    ];
  };
@@ -53,7 +60,7 @@ in
      machine.wait_for_unit("glitchtip-worker.service")
      machine.wait_for_open_port(8000)

-      origin_url = "${domain}"
+      origin_url = "${url}"
      cookie_jar_path = "/tmp/cookies.txt"
      curl = f"curl -b {cookie_jar_path} -c {cookie_jar_path} -fS -H 'Origin: {origin_url}'"

@@ -89,7 +96,7 @@ in
      # fetch dsn
      resp = json.loads(machine.succeed(f"{curl} {origin_url}/api/0/projects/main/test/keys/"))
      assert len(resp) == 1
-      assert re.match(r"^http://[\da-f]+@glitchtip\.local:8000/\d+$", dsn := resp[0]["dsn"]["public"])
+      assert re.match(r"^http://[\da-f]+@glitchtip\.local/\d+$", dsn := resp[0]["dsn"]["public"])

      # send event
      machine.succeed(f"SENTRY_DSN={dsn} sentry-cli send-event -m 'hello world'")
@@ -15003,6 +15003,19 @@ final: prev: {
    meta.hydraPlatforms = [ ];
  };

+  spring-boot-nvim = buildVimPlugin {
+    pname = "spring-boot.nvim";
+    version = "0-unstable-2026-03-29";
+    src = fetchFromGitHub {
+      owner = "JavaHello";
+      repo = "spring-boot.nvim";
+      rev = "98c6ff1dcdda943d341bba3c00ae9d190a2e5f7d";
+      hash = "sha256-JkOWlqyVLcwW7hxOGj5jb8BpUge3bUHbSV0o5qOYW1c=";
+    };
+    meta.homepage = "https://github.com/JavaHello/spring-boot.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
  sqlite-lua = buildVimPlugin {
    pname = "sqlite.lua";
    version = "1.2.2-unstable-2025-03-14";
@@ -1153,6 +1153,7 @@ https://github.com/stsewd/sphinx.nvim/,,
 https://github.com/sjl/splice.vim/,,
 https://github.com/vimlab/split-term.vim/,,
 https://github.com/AndrewRadev/splitjoin.vim/,,
+https://github.com/JavaHello/spring-boot.nvim/,HEAD,
 https://github.com/kkharji/sqlite.lua/,,
 https://github.com/srcery-colors/srcery-vim/,,
 https://github.com/chr4/sslsecure.vim/,,
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
-    version = "2.1.92";
-    hash = "sha256-L3W9LoFA6JzsPa20Md9rOJBG/siauIJeuDcE7euZxMg=";
+    version = "2.1.96";
+    hash = "sha256-9WVCySGmohmyzTzcskzGCHk6ZFX+/HwkpmX2yudVar8=";
  };

  postInstall = ''
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "vscode-augment";
    publisher = "augment";
-    version = "0.789.1";
-    hash = "sha256-RQg4XnFJhTttphjhR+arfRibCs0Y9ITvryrsq+hvFhQ=";
+    version = "0.825.5";
+    hash = "sha256-UKkrdxHlbcdpd3RQxNpZVBINZlncPv7e5RETnj/19Ts=";
  };

  meta = {
@@ -5333,8 +5333,8 @@ let
        mktplcRef = {
          name = "php-debug";
          publisher = "xdebug";
-          version = "1.40.0";
-          hash = "sha256-B8x954/nltRZcuX9y1NYu5JrDGiYxuPINSs1bgtCnWA=";
+          version = "1.40.1";
+          hash = "sha256-WI4d6Kk+lEmFTYYfwSH7q32YaOeokdEquFtZQJcyyDA=";
        };
        meta = {
          description = "PHP Debug Adapter";
@@ -5374,6 +5374,8 @@ let
        };
      };

+      yoshi47.selection-path-copier = callPackage ./yoshi47.selection-path-copier { };
+
      yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { };

      yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { };
@@ -14,19 +14,19 @@ let
  vsix = stdenvNoCC.mkDerivation (finalAttrs: {
    name = "roo-code-${finalAttrs.version}.vsix";
    pname = "roo-code-vsix";
-    version = "3.51.1";
+    version = "3.52.0";

    src = fetchFromGitHub {
      owner = "RooCodeInc";
      repo = "Roo-Code";
      tag = "v${finalAttrs.version}";
-      hash = "sha256-HpLL466mzDvNf7twW0a3dDUvgveRm0tbCOXGymTW+tA=";
+      hash = "sha256-DvuL1WByEJER+v73pCvwNdRNfM8j+c1VQGGjAyV79p8=";
    };

    pnpmDeps = fetchPnpmDeps {
      inherit (finalAttrs) pname version src;
      fetcherVersion = 2;
-      hash = "sha256-Q97MDHl22lIF84/J3UW53dCD7oaN3Y6R32xhjRDBmpw=";
+      hash = "sha256-kQjxcqHEClQtG6x2QM1/zixN6rvcEivX8vicNydDdOw=";
    };

    nativeBuildInputs = [
@@ -0,0 +1,22 @@
+{
+  lib,
+  vscode-utils,
+  nix-update-script,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
+  mktplcRef = {
+    publisher = "yoshi47";
+    name = "selection-path-copier";
+    version = "1.5.0";
+    hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg=";
+  };
+  meta = {
+    description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=yoshi47.selection-path-copier";
+    homepage = "https://github.com/yoshi47/selection-path-copier";
+    changelog = "https://github.com/yoshi47/selection-path-copier/releases/tag/release/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aduh95 ];
+  };
+})
@@ -2,7 +2,11 @@
  stdenv,
  lib,
  coreutils,
+  gawk,
  gnugrep,
+  gnused,
+  glibc,
+  jq,
  copyDesktopItems,
  makeDesktopItem,
  unzip,
@@ -33,6 +37,7 @@
  openssl,
  webkitgtk_4_1,
  ripgrep,
+  which,

  # needed to fix "Save as Root"
  asar,
@@ -269,6 +274,7 @@ stdenv.mkDerivation (
      autoPatchelfHook
      asar
      copyDesktopItems
+      jq
      # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651
      # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset.
      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
@@ -352,9 +358,13 @@ stdenv.mkDerivation (
            # for moving files to trash
            glib

-            # for launcher script
+            # for launcher and bundled helper scripts
+            gawk
+            glibc.bin
            gnugrep
+            gnused
            coreutils
+            which
          ]
        }
        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}"
@@ -365,9 +375,15 @@ stdenv.mkDerivation (
    # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
    # linux only because of https://github.com/NixOS/nixpkgs/issues/138729
    postPatch =
-      # this is a fix for "save as root" functionality
      lib.optionalString stdenv.hostPlatform.isLinux (
+        # disable update checks
        ''
+          tmpProductJson="$(mktemp)"
+          jq 'del(.updateUrl, .backupUpdateUrl)' resources/app/product.json > "$tmpProductJson"
+          mv "$tmpProductJson" resources/app/product.json
+        ''
+        # this is a fix for "save as root" functionality
+        + ''
          packed="resources/app/node_modules.asar"
          unpacked="resources/app/node_modules"
          asar extract "$packed" "$unpacked"
@@ -35,17 +35,17 @@ let

  hash =
    {
-      x86_64-linux = "sha256-D+2JWjC0kutfkEF5QKOKwh9Z8+jWgMgMN2b8pKwYays=";
-      x86_64-darwin = "sha256-dgOKMYRKfGRipLMsQcVmlOEHbG9l4ryJZv5J8znSxwA=";
-      aarch64-linux = "sha256-NRaxhWEdYDNIK1AbimKwzw4zGd3ljwBIYJ+BaTz2/gk=";
-      aarch64-darwin = "sha256-nWkNoryvsD2SPkc5veQ12+DWPXgWPJjfWwUcC7PjbC4=";
-      armv7l-linux = "sha256-Ae5sKYiyvIF9KZzKi7BK3/SLgKjuQCLjNKi9dXIqGbo=";
+      x86_64-linux = "sha256-eDSGfF05h5HPTZNeV9l/SBV+9fIV9iVnommM5P/cGgA=";
+      x86_64-darwin = "sha256-gHNXSWjbS+xqxjNYaoE7WSeo1Vf2+au/x68RVObJtp0=";
+      aarch64-linux = "sha256-PkZiq6STbt1Rb/g9XKeE3tktcrSRyQn/ah1QQxrOITg=";
+      aarch64-darwin = "sha256-T7An1+qkBO2QncPvoyymjerwLwti2/MgwmOJJCb2Nhw=";
+      armv7l-linux = "sha256-+KfjkiqMBGg9x/Qnd4FHiW0kw0dIQ56DSGUm8SBTc8o=";
    }
    .${system} or throwSystem;

  # Please backport all compatible updates to the stable release.
  # This is important for the extension ecosystem.
-  version = "1.114.0";
+  version = "1.115.0";

  # The update server (update.code.visualstudio.com) expects the version path
  # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0").
@@ -53,7 +53,7 @@ let
  downloadVersion = lib.versions.pad 3 version;

  # This is used for VS Code - Remote SSH test
-  rev = "e7fb5e96c0730b9deb70b33781f98e2f35975036";
+  rev = "41dd792b5e652393e7787322889ed5fdc58bd75b";
 in
 buildVscode {
  pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -86,7 +86,7 @@ buildVscode {
    src = fetchurl {
      name = "vscode-server-${rev}.tar.gz";
      url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-Sx9XXo3qB+7hwi9vzAncX49usOSMVgKilgBa2UrG6pQ=";
+      hash = "sha256-2CQBU7TfYNO4m1Mf6Q0QXFt8C2txJgcN9kd7wX355J4=";
    };
    stdenv = stdenvNoCC;
  };
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "mgba";
-  version = "0-unstable-2026-03-30";
+  version = "0-unstable-2026-04-03";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "mgba";
-    rev = "6ab29fed1b5139f19ac98c523fd4a6a7f0b30e38";
-    hash = "sha256-6cCd2tuj2kXTL1w0DUPodaLU0ivNjPyKGytgxrjlwb0=";
+    rev = "6dce57eef127dc4cc292644f38196e0e7c58590c";
+    hash = "sha256-sLxQ7NG5ypSQACo1Q/9/FwQKCpZsIU0Y35dLa8uhOVs=";
  };

  meta = {
@@ -87,7 +87,7 @@ let
  ];
 in
 mkDerivation rec {
-  version = "3.40.15";
+  version = "3.44.8";
  pname = "qgis-ltr-unwrapped";
  outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man";

@@ -95,7 +95,7 @@ mkDerivation rec {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-N1ip6lMMpACDCr/Za26LGP455+iZiZe24s2MCkrYm8A=";
+    hash = "sha256-FL/JqvcLqKhHsG96o/7Mel8wH8OaL+2LDtq6jngjW50=";
  };

  passthru = {
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
  pname = "firefox-beta";
  binaryName = "firefox-beta";
-  version = "150.0b2";
+  version = "150.0b5";
  applicationName = "Firefox Beta";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "eb9ad8fe2cc763e9b45b602156b86328ea6a679824318023759813ce42c4dc961bea92cac9e3d230fe1346114d7f4fd43bcffbfc6307d6a6d18b4cc9629b0651";
+    sha512 = "6ae09ae8a73865a4d9cdfd389f0cfec667fc717e13127ae9927b6fc3bd5e7cf49a83dd5dbbed8bae9b72dddd24e6156bdc483fcb3ccb726b46070d25fd02f86f";
  };

  meta = {
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = "firefox-devedition";
-  version = "150.0b3";
+  version = "150.0b7";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1a1f9079b50bb632fe578be6452269db6195df0663165d3d3906897368d4d3752c51fb4ace9651881d5a4e9a5dd5dcb2bdf18efab193d80acac1c2f502ef11e1";
+    sha512 = "e4240a9c13bbe188763eb03d65935576c03ba4ead80411ff2ca528a06788bbe4b61be3fa221c01f70e4601428bf8c7895506df28a782078e8171d34d017299a0";
  };

  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
@@ -80,13 +80,13 @@ rec {
  # Upstream partially documents used Go versions here
  # https://github.com/hashicorp/nomad/blob/master/contributing/golang.md

-  nomad = nomad_1_10;
+  nomad = nomad_1_11;

  nomad_1_11 = generic {
    buildGoModule = buildGo125Module;
-    version = "1.11.1";
-    hash = "sha256-xP3wSxDo59hme9G4+ATfGD0LTdf11+c/cSfPoKfeBLc=";
-    vendorHash = "sha256-CXWaEwJCKzggyCrHsa+PrLnQNQKI8G14uWno2NAvOwU=";
+    version = "1.11.3";
+    hash = "sha256-J+w53HlMlrXX5yKjDYhf3rSGt1pmOyNcPlOqyUrkLWE=";
+    vendorHash = "sha256-67etQUjcPXz4VVpNXLVusQlEybxEqKfYQcNTNL4X8bA=";
    license = lib.licenses.bsl11;
    passthru.tests.nomad = nixosTests.nomad;
    preCheck = ''
@@ -1310,11 +1310,11 @@
    "vendorHash": "sha256-omxEb+ntQuHDfS2Rmt0rj0BF0Q2T8DLhobLua2uU/0o="
  },
  "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-xsYh5gDneL3nQDUIHe3fRjObFTGp3ssPq8wlqPWsq7Y=",
+    "hash": "sha256-JA8urZd08fyGkFZMCF9aVJ9UEGx+aPreGqiAuFTqA84=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.82",
+    "rev": "v1.82.84",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@@ -1499,12 +1499,12 @@
    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
  },
  "yandex-cloud_yandex": {
-    "hash": "sha256-F2nbu/MImDXHSYPjo3O6K0tsZJ4PTrmB14Ghfvnp5sc=",
+    "hash": "sha256-gCzM7pfQaez/Zw6JAJcw4bVSpqVhxxiQyjqP/FeldJQ=",
    "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
    "owner": "yandex-cloud",
    "repo": "terraform-provider-yandex",
-    "rev": "v0.195.0",
+    "rev": "v0.197.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-lSpDmhzCed9NUJkQ35tsrUbMIzx6wnEJ20UFMPbwhWE="
+    "vendorHash": "sha256-Prtwe3JPfWpx+yO37lT31VsqQ6E2aDLI7fAbYYq7gSE="
  }
 }
@@ -12,29 +12,29 @@
  mesa,
 }:

-let
-  avogadroI18N = fetchFromGitHub {
-    owner = "OpenChemistry";
-    repo = "avogadro-i18n";
-    tag = "1.103.0";
-    hash = "sha256-gdr0Ed0UWjQB0LQq+6RvlAb8ZNFQAjV9mrgFLePG+CM=";
-  };
-
-in
 stdenv.mkDerivation (finalAttrs: {
  pname = "avogadro2";
-  version = "1.103.0";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "OpenChemistry";
    repo = "avogadroapp";
    rev = finalAttrs.version;
-    hash = "sha256-nmvK3R966Xv2Xs5wXDh/8itIZLIRqbXHFe8dffFiI+s=";
+    hash = "sha256-+/NZwLRrbrfrQqxLqgiqZk6324BGoN+qRfOq7G+UIBE=";
  };

-  postUnpack = ''
-    cp -r ${avogadroI18N} avogadro-i18n
-  '';
+  postUnpack =
+    let
+      avogadroI18N = fetchFromGitHub {
+        owner = "OpenChemistry";
+        repo = "avogadro-i18n";
+        tag = finalAttrs.version;
+        hash = "sha256-5eiOFJ5tbS+HFbnLbc6sjk62BvXDMQYpPsB4xFpVWXM=";
+      };
+    in
+    ''
+      cp -r ${avogadroI18N} avogadro-i18n
+    '';

  nativeBuildInputs = [
    cmake
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "obs-color-monitor";
-  version = "0.9.3";
+  version = "0.9.6";

  src = fetchFromGitHub {
    owner = "norihiro";
    repo = "obs-color-monitor";
    tag = finalAttrs.version;
-    hash = "sha256-TwsEIOgQjj1wza7i8nne63oBM3FB6GmMjCq8/PuiWHs=";
+    hash = "sha256-2TjkPsudGwB2TNdfVnRqMiUQquAnCdBEmG9N9JLfewo=";
  };

  nativeBuildInputs = [ cmake ];
@@ -438,16 +438,16 @@ in

  docker_29 =
    let
-      version = "29.3.1";
+      version = "29.4.0";
    in
    callPackage dockerGen {
      inherit version;
      cliRev = "v${version}";
-      cliHash = "sha256-K6aUHPprl5U99610UVHpLH8poWfTNF+FvQZbcPg6/E0=";
+      cliHash = "sha256-ObuRuiC1+2E7PMMgoXC6SEi6zsdRqVvGCDvP7J/Ws28=";
      mobyRev = "docker-v${version}";
-      mobyHash = "sha256-DPWb8kg5GUv2qDyEBfvBH4LBOVCUl0//oEYzLwv2l1I=";
-      runcRev = "v1.3.4";
-      runcHash = "sha256-1IfY08sBoDpbLrwz1AKBRSTuCZyOgQzYPHTDUI6fOZ8=";
+      mobyHash = "sha256-Pot3N+AvxIYG5Vg3AQK3I0jegCW4bmC0OimsGnVCiuQ=";
+      runcRev = "v1.3.5";
+      runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0=";
      containerdRev = "v2.2.2";
      containerdHash = "sha256-1jYiyNHR1sXBwXdS33KWE+IB1tOZbiJyUxhsVeXwSrc=";
      tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
@@ -38,7 +38,13 @@ installFonts() {
  installFont 'ttf' "$out/share/fonts/truetype"
  installFont 'ttc' "$out/share/fonts/truetype"
  installFont 'otf' "$out/share/fonts/opentype"
+  installFont 'otc' "$out/share/fonts/opentype"
+  installFont 'pfa' "$out/share/fonts/type1"
+  installFont 'pfb' "$out/share/fonts/type1"
+  installFont 'pfm' "$out/share/fonts/type1"
+  installFont 'afm' "$out/share/fonts/type1"
  installFont 'bdf' "$out/share/fonts/misc"
+  installFont 'pcf' "$out/share/fonts/misc"
  installFont 'otb' "$out/share/fonts/misc"
  installFont 'psf' "$out/share/consolefonts"
  installFont 'psfu' "$out/share/consolefonts"
@@ -0,0 +1,26 @@
+From 815bf49134f9dc049080b0ec4eb2fd807c23086b Mon Sep 17 00:00:00 2001
+From: azban <me@azban.net>
+Date: Mon, 6 Apr 2026 19:49:19 -0600
+Subject: [PATCH 1/2] remove hard-coded vendor paths
+
+Hard-coded vendored sources is not compatible with fetchCargoVendor.
+
+Signed-off-by: azban <me@azban.net>
+---
+ .cargo/config.toml.in | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
+index d7d8ff4d4..e69de29bb 100644
+--- a/.cargo/config.toml.in
+++ b/.cargo/config.toml.in
+@@ -1,6 +0,0 @@
+-[source.crates-io]
+-registry = "https://github.com/rust-lang/crates.io-index"
+-@rust_vendor_sources@
+-
+-[source.vendored-sources]
+-directory = "./vendor"
+-- 
+2.51.2
+
@@ -57,11 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/389ds/389-ds-base/commit/1701419551c246e9dc21778b118220eeb2258125.patch";
      hash = "sha256-trzY/fDH3rs66DWbWI+PY46tIC9ShuVqspMHqEEKZYA=";
    })
+    ./0001-remove-hard-coded-vendor-paths.patch
+    (fetchpatch {
+      # https://github.com/389ds/389-ds-base/security/advisories/GHSA-4qwg-c5j2-q4hp
+      name = "CVE-2025-14905.patch";
+      url = "https://github.com/389ds/389-ds-base/commit/2e424110def2e3998f6045e136fb0d43f47b7f5a.patch";
+      hash = "sha256-ItxG0bnuNPWLClL677rChTDvDWXxJ2L6ygx4VY2v80w=";
+    })
  ];

+  cargoRoot = "src";
+
  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src;
-    sourceRoot = "${finalAttrs.src.name}/src";
+    inherit (finalAttrs) src cargoRoot;
    name = "389-ds-base-${finalAttrs.version}";
    hash = "sha256-pNzMQjeBpmzFg6oWCxhLDmKGUKIW6jGmZQWai5Yunjc=";
  };
@@ -74,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
    python3
    cargo
    rustc
+    rustPlatform.cargoSetupHook
  ]
  ++ lib.optional withCockpit rsync;

@@ -106,10 +115,6 @@ stdenv.mkDerivation (finalAttrs: {
    ./autogen.sh --prefix="$out"
  '';

-  preBuild = ''
-    ln -s ${finalAttrs.cargoDeps} ./vendor
-  '';
-
  configureFlags = [
    "--enable-rust-offline"
    "--enable-autobind"
@@ -69,6 +69,9 @@ stdenv.mkDerivation (finalAttrs: {
    "MSYSTEM=1"
  ];

+  strictDeps = true;
+  __structuredAttrs = true;
+
  enableParallelBuilding = true;

  postPatch = ''
@@ -103,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
      runHook preBuild

      for component in Bundles/{Alone,Alone2,Alone7z,Format7zF,SFXCon} UI/Console; do
-        make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} $makeFlags
+        make -j $NIX_BUILD_CORES -C CPP/7zip/$component -f ${makefile} "''${makeFlags[@]}"
      done

      runHook postBuild
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "act3";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "dhth";
+    repo = "act3";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GE9f4hm+R4G4NCqdPN6h5MTZqMVLkrdMnc20bOZGcu4=";
+  };
+
+  vendorHash = "sha256-+WSWlmxQTryLrpeloYdupyMibsgFYpjSuDvW+if3IHE=";
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Glance at the last 3 runs of your GitHub Actions workflows";
+    homepage = "https://github.com/dhth/act3";
+    license = lib.licenses.mit;
+    mainProgram = "act3";
+    maintainers = with lib.maintainers; [ phanirithvij ];
+    platforms = lib.platforms.unix;
+  };
+})
@@ -3,24 +3,49 @@
  rustPlatform,
  fetchFromGitHub,
  nix-update-script,
+  gitMinimal,
+  makeWrapper,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "action-validator";
-  version = "0.8.0";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "mpalmer";
    repo = "action-validator";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-irBK27De9W5BSNIQynguOY8oPgA7K03dleE/0YvY75o=";
+    hash = "sha256-E0kqEzqw902Wg7QQNzOrtHQO9riSmAvDNcWIP3XmLSY=";
    fetchSubmodules = true;
  };

-  cargoHash = "sha256-w6qC4gJ06TfoQl2WD8lgOxSxUWyG6Z8ma9mUvvYlkTU=";
+  cargoHash = "sha256-F8bJclpDpOdVET/dSIUYyP4DFcnhJDR2CV8poZtykko=";

  passthru.updateScript = nix-update-script { };

+  postPatch = ''
+    substituteInPlace Cargo.toml --replace-fail 'version = "0.0.0-git"' 'version = "${finalAttrs.version}"'
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  nativeCheckInputs = [ gitMinimal ];
+
+  # The tests require a functional git installation and leaveDotGit appears broken https://github.com/NixOS/nixpkgs/issues/8567
+  preCheck = ''
+    git init -b main
+    git add --all # action-validator tests ignore unstaged files
+  '';
+
+  postCheck = ''
+    rm -rf .git
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/action-validator" \
+      --prefix PATH : ${lib.makeBinPath [ gitMinimal ]}
+  '';
+
  meta = {
    description = "Tool to validate GitHub Action and Workflow YAML files";
    homepage = "https://github.com/mpalmer/action-validator";
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      kranzes
      vtuan10
      adamcstephens
-      kaynetik
    ];
  };
 })
@@ -80,9 +80,6 @@ buildGoModule (finalAttrs: {
    description = "Modern encryption tool with small explicit keys";
    license = lib.licenses.bsd3;
    mainProgram = "age";
-    maintainers = with lib.maintainers; [
-      tazjin
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ tazjin ];
  };
 })
@@ -33,14 +33,14 @@ let
 in
 pythonPackages.buildPythonApplication rec {
  pname = "alpaca";
-  version = "9.2.2";
+  version = "9.2.3";
  pyproject = false; # Built with meson

  src = fetchFromGitHub {
    owner = "Jeffser";
    repo = "Alpaca";
    tag = version;
-    hash = "sha256-5ZvvYsWfj51ie8LOP0fWeg3lDBHGjLwDjz4wQIvCj4A=";
+    hash = "sha256-SwZcycyY2S4GcB6mMcP6JdzMsBlN5Xr6I9kaKKqnb/8=";
  };

  postPatch = ''
@@ -3,6 +3,7 @@
  stdenv,
  fetchFromGitLab,
  rustPlatform,
+  blueprint-compiler,
  cargo,
  desktop-file-utils,
  appstream-glib,
@@ -23,20 +24,20 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "amberol";
-  version = "2025.1";
+  version = "2026.1";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = "amberol";
    tag = finalAttrs.version;
-    hash = "sha256-vF6O7+cQFoYpO4MHHHuacwjP7AUqFQCVUivCSZO7v3o=";
+    hash = "sha256-d4lhfWqg6EZeXGL1kHGS7oWrqI3c9bpDCKUdGp31OpI=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) src;
    name = "amberol-${finalAttrs.version}";
-    hash = "sha256-j/xkdLcmu02e+b8skx5U3uG2R2rIxwSJsYzyJ5tn5uU=";
+    hash = "sha256-OFZd9nKRqXJMHSIIP8tlSNtFAQzk/f/6SBeEvbdPVK0=";
  };

  postPatch = ''
@@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    appstream-glib
+    blueprint-compiler
    cargo
    desktop-file-utils
    m4
@@ -3,7 +3,6 @@
  stdenv,
  buildVscode,
  fetchurl,
-  jq,
  writeShellScript,
  coreutils,
  commandLineArgs ? "",
@@ -17,7 +16,7 @@ let
    information.sources."${hostPlatform.system}"
      or (throw "antigravity: unsupported system ${hostPlatform.system}");
 in
-(buildVscode {
+buildVscode {
  inherit commandLineArgs useVSCodeRipgrep;
  inherit (information) version vscodeVersion;
  pname = "antigravity";
@@ -75,15 +74,4 @@ in
      Zaczero
    ];
  };
-}).overrideAttrs
-  (oldAttrs: {
-    # Disable update checks
-    nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ jq ];
-    postPatch = (oldAttrs.postPatch or "") + ''
-      productJson="${
-        if stdenv.hostPlatform.isDarwin then "Contents/Resources" else "resources"
-      }/app/product.json"
-      data=$(jq 'del(.updateUrl)' "$productJson")
-      echo "$data" > "$productJson"
-    '';
-  })
+}
@@ -1,5 +1,5 @@
 {
-  "url": "https://web.archive.org/web/20251201151010/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
-  "sha256": "12l1ghjcaxqi80bpxqwvsy3krz7qkdcg3zcvvif3g3hvqz5wc31s",
-  "version": "3.45.0"
+  "url": "https://web.archive.org/web/20260401131728/https://nav.gov.hu/pfile/programFile?path=%2Fnyomtatvanyok%2Fletoltesek%2Fnyomtatvanykitolto_programok%2Fnyomtatvany_apeh%2Fkeretprogramok%2FAbevJava",
+  "sha256": "1y6p2h7y7a376k2y02sx77gxm1jndfg9ikmz1z5nikk1klp5sdmw",
+  "version": "3.48.0"
 }
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "asak";
-  version = "0.3.5";
+  version = "0.3.7";

  src = fetchFromGitHub {
    owner = "chaosprint";
    repo = "asak";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
+    hash = "sha256-/c7E8q7Kx6BewzJoB+nvktX1yzybH+HGSOMgdOk8GVA=";
  };

-  cargoHash = "sha256-XoTfymCXrvoToSY7jw+Pn8Wm6fskFzl4f55uiKnSsJ8=";
+  cargoHash = "sha256-vj88bErQ3STrY4nN8XoC2QMISW1Qt5963QqIYhwCIKM=";

  nativeBuildInputs = [
    pkg-config
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "ashell";
-  version = "0.7.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
    owner = "MalpenZibo";
    repo = "ashell";
    tag = finalAttrs.version;
-    hash = "sha256-nQrBW2pfsExHERGZzJqMG7MskzsJ3zwVyoX6wJZBils=";
+    hash = "sha256-X9TU866PAzaf52qKsCpeJvwE0suu1lJndHNQdPg51HM=";
  };

-  cargoHash = "sha256-F8oh8uQFthx5gex/ovKADO+ukqzIbmlBM5+shej/OTA=";
+  cargoHash = "sha256-nhYbehlgB8pzMoj39G0BHRca9mIT+0QjUaebCx+DDE0=";

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

 stdenv.mkDerivation (finalAttrs: {
  pname = "asn";
-  version = "0.80.5";
+  version = "0.81.0";

  src = fetchFromGitHub {
    owner = "nitefood";
    repo = "asn";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-o+qyNxEV2lPRsCNkkcZbj07hKw4eV45qhB8G34OWmgg=";
+    hash = "sha256-HPLdi5Eok06jnToWPn1bGnnAGirGV8zGFoDsKsMvrI8=";
  };

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

 buildNpmPackage rec {
  pname = "assemblyscript";
-  version = "0.28.2";
+  version = "0.28.13";

  src = fetchFromGitHub {
    owner = "AssemblyScript";
    repo = "assemblyscript";
    rev = "v${version}";
-    hash = "sha256-8nY3Rst6i+RGW+kfjn/QSbYkaZf67k/KwuyIp40fCSM=";
+    hash = "sha256-AN9W6IYmMFFiD1Au3uW+7jr2xOwVcOGd5e61cqVNnbs=";
  };

-  npmDepsHash = "sha256-wj/PMoqUBjXqz8/KOFAH5P5eFty3pztpQ8inGIy+ve4=";
+  npmDepsHash = "sha256-5s420YWTc4bZ5oZRBjinw4lAfMTPrnrIWx4IM3Ysuqo=";

  meta = {
    homepage = "https://github.com/AssemblyScript/assemblyscript";
@@ -20,7 +20,10 @@ stdenv.mkDerivation (finalAttrs: {
  };

  # https://pnpm.io/filtering#--filter-package_name-1
-  pnpmWorkspaces = [ "@astrojs/language-server..." ];
+  pnpmWorkspaces = [
+    "@astrojs/language-server..."
+    "@astrojs/ts-plugin"
+  ];
  prePnpmInstall = ''
    pnpm config set dedupe-peer-dependents false
    pnpm approve-builds @emmetio/css-parser
@@ -36,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    pnpm = pnpm_10;
    fetcherVersion = 2;
-    hash = "sha256-QJSFRJ3U7M0B7ukiU+BYY2KdrcNUpyiOcGA7G3xja3I=";
+    hash = "sha256-+5S/VuZjP6LoWUPKF1NMhw317AFAJUgaY7/Tq0ZKouw=";
  };

  nativeBuildInputs = [
@@ -50,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildPhase = ''
    runHook preBuild

-    pnpm --filter "@astrojs/language-server..." build
+    pnpm --filter "@astrojs/language-server..." --filter "@astrojs/ts-plugin" build

    runHook postBuild
  '';
@@ -63,11 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
    pnpm install --offline --prod --filter="@astrojs/language-server..."
    mkdir -p $out/{bin,lib/node_modules/astro-language-server/packages/language-tools}
    cp -r ./node_modules $out/lib/node_modules/astro-language-server
-    cp -r packages/language-tools/{language-server,yaml2ts} $out/lib/node_modules/astro-language-server/packages/language-tools/
+    cp -r packages/language-tools/{language-server,yaml2ts,ts-plugin} $out/lib/node_modules/astro-language-server/packages/language-tools/
    pushd $out/lib/node_modules/astro-language-server/node_modules
-    rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark}
+    rm -rf {./,.pnpm/node_modules/}astro-{scripts,benchmark} .pnpm/node_modules/@astrojs/ts-plugin
    popd
-
    ln -s $out/lib/node_modules/astro-language-server/packages/language-tools/language-server/bin/nodeServer.js $out/bin/astro-ls

    runHook postInstall
@@ -86,7 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://github.com/withastro/astro/tree/main/packages/language-tools";
    changelog = "https://github.com/withastro/astro/blob/%40astrojs/language-server%40${finalAttrs.version}/packages/language-tools/language-server/CHANGELOG.md";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ miniharinn ];
+    maintainers = with lib.maintainers; [
+      miniharinn
+      god464
+    ];
    mainProgram = "astro-ls";
    platforms = lib.platforms.unix;
  };
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "atlantis";
-  version = "0.39.0";
+  version = "0.41.0";

  src = fetchFromGitHub {
    owner = "runatlantis";
    repo = "atlantis";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/p8NfggweRHz8+BBrD/d166HJmDLkDzWloWearfqwVg=";
+    hash = "sha256-OnZ+rygG6TpPkZzU4UBmfnxkRrSyFWEn/rEqwpXhMio=";
  };

  ldflags = [
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
    "-X=main.date=1970-01-01T00:00:00Z"
  ];

-  vendorHash = "sha256-d137hKsd1GrVW2fXZJTUCQmOayolSjNiJNmoOtj3ZkE=";
+  vendorHash = "sha256-aAIiDFiaWRTYfmC4yqVRXtNRLrvdtLbUAV6lC3QYhdc=";

  subPackages = [ "." ];

@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
      sciencentistguy
      _0x4A6F
      rvdp
-      kaynetik
    ];
    mainProgram = "atuin";
  };
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "az-pim-cli";
-  version = "1.12.0";
+  version = "1.13.0";

  src = fetchFromGitHub {
    owner = "netr0m";
    repo = "az-pim-cli";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xc8DHsb+cwXQYlffP/n/ejP/qcvnmMrgVnEeWo4Wih8=";
+    hash = "sha256-3SC3iYW5TN5ljUr1g7aBXJsdAD03C4M+99Wtue8Sm7Y=";
  };

  patches = [
@@ -41,7 +41,6 @@ buildGoModule (finalAttrs: {
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [
      elasticdog
-      kaynetik
    ];
    teams = [ lib.teams.bazel ];
  };
@@ -20,7 +20,7 @@ buildGoModule (finalAttrs: {
  ldflags = [
    "-s"
    "-w"
-    "-X main.BazeliskVersion=${finalAttrs.version}"
+    "-X github.com/bazelbuild/bazelisk/core.BazeliskVersion=v${finalAttrs.version}"
  ];

  meta = {
@@ -32,9 +32,6 @@ buildGoModule (finalAttrs: {
    homepage = "https://github.com/bazelbuild/bazelisk";
    changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      elasticdog
-      kaynetik
-    ];
+    maintainers = with lib.maintainers; [ elasticdog ];
  };
 })
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  catch2,
-  cmake,
-  expected-lite,
-  fmt,
-  gsl-lite,
-  ninja,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "bencode";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "fbdtemme";
-    repo = "bencode";
-    rev = finalAttrs.version;
-    hash = "sha256-zpxvADZfYTUdlNLMZJSCanPL40EGl9BBCxR7oDhvOTw=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-  ];
-
-  buildInputs = [
-    catch2
-    expected-lite
-    fmt
-    gsl-lite
-  ];
-
-  postPatch = ''
-    # Disable a test that requires an internet connection.
-    substituteInPlace tests/CMakeLists.txt \
-      --replace "add_subdirectory(cmake_fetch_content)" ""
-  '';
-
-  doCheck = true;
-
-  postInstall = ''
-    rm -rf $out/lib64
-  '';
-
-  meta = {
-    description = "Header-only C++20 bencode serialization/deserialization library";
-    homepage = "https://github.com/fbdtemme/bencode";
-    changelog = "https://github.com/fbdtemme/bencode/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-    platforms = lib.platforms.unix;
-    # Broken because the default stdenv on these targets doesn't support C++20.
-    broken = with stdenv; isDarwin || (isLinux && isAarch64);
-  };
-})
@@ -7,6 +7,7 @@
  bison,
  flex,
  openssl,
+  versionCheckHook,
 }:

 stdenv.mkDerivation {
@@ -27,9 +28,13 @@ stdenv.mkDerivation {

  postPatch = ''
    # Drop blanket -Werror to avoid build failure on fresh toolchains
-    # and libraries. Without the cnage build fails on gcc-13 and on
+    # and libraries. Without the change build fails on gcc-13 and on
    # openssl-3.
    substituteInPlace src/Makefile.am --replace-fail ' -Werror ' ' '
+    # Fix incompatible function pointer type for cmp in list_t
+    # The cmp function pointer is declared as taking no arguments but is
+    # used with qsort-style callback signature (const void *, const void *)
+    substituteInPlace src/util.h --replace-fail 'int (*cmp)()' 'int (*cmp)(const void *, const void *)'
  '';

  nativeBuildInputs = [
@@ -44,6 +49,10 @@ stdenv.mkDerivation {

  enableParallelBuilding = true;

+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
+
  meta = {
    description = "IRC proxy (bouncer)";
    homepage = "http://bip.milkypond.org/";
@@ -24,7 +24,7 @@
 }:

 let
-  version = "2.1.9";
+  version = "2.1.10";

  jdk = zulu25.override { enableJavaFX = true; };

@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
  # nixpkgs-update: no auto update
  src = fetchurl {
    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb";
-    hash = "sha256-E7GV4YGbF0Nj6aWVqJNUUpwLH1G5v5bEQamHP7OUzQY=";
+    hash = "sha256-e1b2F4JKm7i7iMEqi+OTBryScWWhdvLJW3iKecQgqvg=";

    # Verify the upstream Debian package prior to extraction.
    # See https://bisq.wiki/Bisq_2#Installation
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {

  signature = fetchurl {
    url = "https://github.com/bisq-network/bisq2/releases/download/v${version}/Bisq-${version}.deb.asc";
-    hash = "sha256-bNZNRbm9uNGfLzGvshXNaRLUNX38Uz58GGy6WqJwV1E=";
+    hash = "sha256-2B8rmNwCcJ/cSv7P0FYi2DlRcWkG0o0lMFPsr5zaoIk=";
  };

  nativeBuildInputs = [
@@ -15,14 +15,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "blueprint-compiler";
-  version = "0.18.0";
+  version = "0.20.4";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "GNOME";
    repo = "blueprint-compiler";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-3vAFkP/psM/IsFtzVOIVSU77Z+RV4d3N70U7ggrDqfo=";
+    hash = "sha256-dA+FQTRmTz6rl5ToZJ8CXY1Zd7Em7VwvF3U3Qoyvu80=";
  };

  postPatch = ''
@@ -2,6 +2,7 @@
  lib,
  stdenvNoCC,
  fetchzip,
+  installFonts,
 }:

 stdenvNoCC.mkDerivation {
@@ -14,19 +15,13 @@ stdenvNoCC.mkDerivation {
    hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ=";
  };

-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 *.ttf -t $out/share/fonts/truetype
-
-    runHook postInstall
-  '';
+  nativeBuildInputs = [ installFonts ];

  meta = {
    description = "Droid Sans Mono Slashed + Hasklig-style ligatures";
    homepage = "https://github.com/marnen/borg-sans-mono";
    license = lib.licenses.asl20;
    platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ pancaek ];
  };
 }
@@ -44,6 +44,7 @@ stdenv.mkDerivation {
  patches = [
    ./work-around-API-borkage.patch
    ./libapp-include-ctype.diff
+    ./use-stdbool.patch
  ];

  buildInputs = [
@@ -0,0 +1,18 @@
+diff --git a/tmp/orig_base.h b/libapp/libapp/base.h
+index 7d8abdb..2f42b03 100644
+--- a/tmp/orig_base.h
+++ b/libapp/libapp/base.h
+@@ -1,12 +1,7 @@
+ #ifndef APP_BASE_H
+ #define APP_BASE_H
+ 
+-#ifndef __cplusplus
+-typedef enum {
+-        false = 0,
+-        true = 1
+-} bool;
+-#endif
+#include <stdbool.h>
+ 
+ #define ASSERT(clause) if( !clause) { fprintf(stderr, "Assertion '%s' failed at %s:%d\n", #clause, __FILE__, __LINE__ ); exit(-1); }
+ 
@@ -3,24 +3,24 @@

 let
  pname = "brave";
-  version = "1.88.138";
+  version = "1.89.132";

  allArchives = {
    aarch64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-8qsWJeHsSPukHbsYIssELvr5Sq6TIxnDzXak/eQrwYk=";
+      hash = "sha256-mYY8eyMWcwx6RuMNP5ucf6xd1NXfYO4nqXEkiTUtX0o=";
    };
    x86_64-linux = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Z1cXDihjzrVTj9XsG9ral8NMZSdPqL4q8VIZ2Ee05Qc=";
+      hash = "sha256-/SmzRSgmXM567D1YQdD/IfDaIe3RPLtgJMYvcOCwvZo=";
    };
    aarch64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-yDBGo/J2b5iu9e4NvXN3EgYEDYaMq1V9MVb9xeGHpHo=";
+      hash = "sha256-3f29ehqJNQjYJ+vh15ZI2UJEB1VdBfLL3VWv8CRasCw=";
    };
    x86_64-darwin = {
      url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-RzLlDoyqPdL51aDD4/3r+f8sO4Tz8Osso50fsFR3iBc=";
+      hash = "sha256-KIod2FbWck1OUATr/vKK+vgwIih3Lha48MAdt5qNIAk=";
    };
  };

@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "buffrs";
-  version = "0.12.2";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "helsing-ai";
    repo = "buffrs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-xwIJeXbXBotx/1ZsvCSaUlttkTYi2Ceq6MvFPwp2bj8=";
+    hash = "sha256-DTA30wVgThUu76AHWcpxAiOQZf92N6hMDPUHOUjg1vA=";
  };

-  cargoHash = "sha256-d8eCd6WKRX4RJKA9Z5D2Or9MgxU0VMqt/FoF1GnryAI=";
+  cargoHash = "sha256-c8Y81+IUpOWWlCsnltFWgbWW9I2ZkardzT94wGTKMVo=";

  # Disabling tests meant to work over the network, as they will fail
  # inside the builder.
@@ -12,11 +12,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "c2000-cgt";
-  version = "22.6.1.LTS";
+  version = "25.11.0.LTS";

  src = fetchurl {
    url = "https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-xqxJ05PLfM/${finalAttrs.version}/ti_cgt_c2000_${finalAttrs.version}_linux-x64_installer.bin";
-    hash = "sha256-h+exdlyD7Bj3LZTDVME8jHesInaUUUUmFiIKJR+rM9o=";
+    hash = "sha256-vkxV7/D3I4Uf7q3KBwdjEq9rn4DTPNMUm1NSuMYQEbM=";
  };

  dontUnpack = true;
@@ -40,11 +40,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "calibre";
-  version = "9.6.0";
+  version = "9.7.0";

  src = fetchurl {
    url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xNdA1QoMLjisM68Q6BU2bL0tCEagba/KMAjqr+Lwm+o=";
+    hash = "sha256-FmEflROGdI6DSBlCPgk4k1dV5AIwHvB6pY+E9ItpQgE=";
  };

  patches =
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-deny";
-  version = "0.19.0";
+  version = "0.19.1";

  src = fetchFromGitHub {
    owner = "EmbarkStudios";
    repo = "cargo-deny";
    tag = finalAttrs.version;
-    hash = "sha256-kDjRP+UXYzsXTrcsPbomtATzDVTSZqXoRXf6qqCGOZw=";
+    hash = "sha256-iS0MDeQhUCP/JBT9Lyos3s+zCeL5qe83lvsMGz7Hndg=";
  };

-  cargoHash = "sha256-Lu1KhQmsQGvzgozFTcv9/hY3ZXOuaxkv0I+QPmAdZBU=";
+  cargoHash = "sha256-LuUlPBLcThaN36ZAUbjAZ4+M/526WJBGUlUAfmNVKvs=";

  nativeBuildInputs = [
    pkg-config
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-readme";
-  version = "3.3.1";
+  version = "3.3.2";

  src = fetchFromGitHub {
    owner = "webern";
    repo = "cargo-readme";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
+    sha256 = "sha256-p8QQNACU9lFig0vBQrb1u2T44Icwk10OBjGzaVLj7kk=";
  };

-  cargoHash = "sha256-24D+ZcMGZN175LZNcNW8F5IsStk4au4xB0ZFe95EjPk=";
+  cargoHash = "sha256-kfXDMBqS4/QC+khQhQ2Jrer8TuFKlnZFS3IZ2lcVOR8=";

  # disable doc tests
  cargoTestFlags = [
@@ -0,0 +1,47 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  __structuredAttrs = true;
+
+  pname = "cargo-sbom";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "psastras";
+    repo = "sbom-rs";
+    tag = "cargo-sbom-v${finalAttrs.version}";
+    hash = "sha256-U11tUXhUD0RjnTuTSmQwBD7OSsYXBfeofDfURDwbGrc=";
+  };
+
+  cargoHash = "sha256-a0tGBTCLvYUObFeZwSxEqRPpMkEZdsO4kHnExUMrNWk=";
+
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  checkFlags = [
+    "--skip=test_cargo_binary_cyclonedx_1_5_example"
+    "--skip=test_cargo_binary_cyclonedx_1_6_example"
+    "--skip=test_cargo_binary_cyclonedx_example"
+    "--skip=test_cargo_binary_spdx_example"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Create software bill of materials (SBOM) for Rust";
+    homepage = "https://github.com/psastras/sbom-rs";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+    ];
+    platforms = lib.platforms.all;
+    mainProgram = "cargo-sbom";
+  };
+})
@@ -16,14 +16,14 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "cargo-update";
-  version = "19.0.1";
+  version = "20.0.0";

  src = fetchCrate {
    inherit (finalAttrs) pname version;
-    hash = "sha256-XK5ky0t8IdQRVsDU6VDB+HzWzgn4uXhlvOS66GPCVn8=";
+    hash = "sha256-J/FujtsQF8WfHFoHJ3r2M+vv8WVh4cxDFw07JntnW2g=";
  };

-  cargoHash = "sha256-/teRXWO3alCU4i4WsQaojCNAXVm/DnpxbYysCEb/Ohg=";
+  cargoHash = "sha256-bH8Mg7QQbbXlF7fxwWEFYmYQD1CmDM+g4GhFPZwLy/M=";

  nativeBuildInputs = [
    cmake
@@ -24,18 +24,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "cartero";
-  version = "25.0";
+  version = "26.0";

  src = fetchFromGitHub {
    owner = "danirod";
    repo = "cartero";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-XUf5Gfg+ZyyzcbZYSxFTM4ot84FF2bgGJoQg2ZAIZ3g=";
+    hash = "sha256-EBQqJuIcgpLtRu5DcAaWnCiFyiuuG+DCkdAWsoWwn3E=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit (finalAttrs) pname version src;
-    hash = "sha256-T1OR8okOm5hFYsRLqqNYhP39Av/veHnoomkC29/JyAY=";
+    hash = "sha256-Te6foGMcy8q0u6wn/D4RkhoOEjke5HTv3xxaS2EbiIE=";
  };

  nativeBuildInputs = [
@@ -3,7 +3,6 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  libx11,
 }:

 buildGoModule (finalAttrs: {
@@ -17,10 +16,9 @@ buildGoModule (finalAttrs: {
    sha256 = "sha256-2Feb2+7UJ+39waO9rFyT3ZDlEdS5s3uLuxUiDh4iuJE=";
  };

-  # clipboard functionality not working on Darwin
-  doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libx11 ];
+  ldflags = [
+    "-X main.Version=${finalAttrs.version}"
+  ];

  vendorHash = null;

@@ -1,12 +1,12 @@
 {
  "name": "@anthropic-ai/claude-code",
-  "version": "2.1.92",
+  "version": "2.1.97",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@anthropic-ai/claude-code",
-      "version": "2.1.92",
+      "version": "2.1.97",
      "license": "SEE LICENSE IN README.md",
      "bin": {
        "claude": "cli.js"
@@ -15,14 +15,14 @@
 }:
 buildNpmPackage (finalAttrs: {
  pname = "claude-code";
-  version = "2.1.92";
+  version = "2.1.97";

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-CLLCtVK3TeXFZ8wBnRRHNc2MoUt7lTdMJwz8sZHpkFM=";
+    hash = "sha256-J92ILqBJmXyAueUPZ+HYZY0ls3OfN2EAhFyQHTOQF5A=";
  };

-  npmDepsHash = "sha256-5LvH7fG5pti2SiXHQqgRxfFpxaXxzrmGxIoPR4dGE+8=";
+  npmDepsHash = "sha256-0fZu5r/zQjUSbm49FhZSqiIyMKdmH050NSxoVWd3XoU=";

  strictDeps = true;

@@ -0,0 +1,11 @@
+diff --git a/src/path.h b/src/path.h
+--- a/src/path.h
+++ b/src/path.h
+@@ -232,7 +232,7 @@
+ 	 */
+ 	path operator+(std::string const & str) const {
+ 		path p(*this);
+-		p.append(str);
+		p.push_back(str);
+ 		return p;
+ 	}
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
  patches = [
    # fix compile error in configure.ac
    ./fix-big-endian-config-check.diff
+    # Fix GCC 15 build: path::operator+ calls a nonexistent append() member.
+    ./fix-path-operator-plus.diff
  ];

  nativeBuildInputs = [
@@ -11,7 +11,6 @@

 let
  inherit (stdenv) hostPlatform;
-  finalCommandLineArgs = "--update=false " + commandLineArgs;

  sourcesJson = lib.importJSON ./sources.json;
  sources = lib.mapAttrs (
@@ -24,9 +23,8 @@ let
  source = sources.${hostPlatform.system};
 in
 buildVscode rec {
-  inherit useVSCodeRipgrep;
+  inherit commandLineArgs useVSCodeRipgrep;
  inherit (sourcesJson) version vscodeVersion;
-  commandLineArgs = finalCommandLineArgs;

  pname = "cursor";

@@ -1,22 +1,22 @@
 {
-  "version": "3.0.12",
+  "version": "3.0.16",
  "vscodeVersion": "1.105.1",
  "sources": {
    "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/x64/Cursor-3.0.12-x86_64.AppImage",
-      "hash": "sha256-dUAF18h48nzLW+pjcAGeY0c7jZVbwD/3ceczZXxKJv0="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/x64/Cursor-3.0.16-x86_64.AppImage",
+      "hash": "sha256-/kBlLvaF3/7WSEI6ika6opgUVDQVo7vLVLsgG8htEpk="
    },
    "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/linux/arm64/Cursor-3.0.12-aarch64.AppImage",
-      "hash": "sha256-6RJaoJtx2YYr21174CfwxVYdjHoDXLAj19ekUA7E3Ck="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/linux/arm64/Cursor-3.0.16-aarch64.AppImage",
+      "hash": "sha256-tG75z9SPVaH6cgN75XW1ZKRyj689Yd97cbQZSvQtPrA="
    },
    "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-ct29cI2vrcy/E4nODVgdVf+pCm7faj3VlcaUws7cOps="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-8pGWntBuY6hwIuQ3x5yF93j0++3gB+wg/KsVfIVWUgI="
    },
    "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/a80ff7dfcaa45d7750f6e30be457261379c29b06/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-7igCfkYPRVdwKzakKxYpY0cgqfbpneHJIfcUv3KfRKk="
+      "url": "https://downloads.cursor.com/production/475871d112608994deb2e3065dfb7c6b0baa0c54/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-HHd3CpSlGpuRUjakSCBRp3q3RYhiOapBKqblRNiQaZI="
    }
  }
 }
@@ -11,11 +11,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "container";
-  version = "0.9.0";
+  version = "0.11.0";

  src = fetchurl {
-    url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-installer-signed.pkg";
-    hash = "sha256-6KQysR85bVzlDkTqFPAvffkP/O9EHJFrL6krY+lfWAE=";
+    url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
+    hash = "sha256-kGNqRgOmaeurQZuuHh2dMijAFWxJAiY8ksGdBQMPQEo=";
  };

  nativeBuildInputs = [
@@ -2,21 +2,46 @@
  lib,
  flutter341,
  fetchFromGitHub,
+  runCommand,
+  nix-update-script,
+  yq-go,
+  _experimental-update-script-combinators,
 }:

 flutter341.buildFlutterApplication rec {
  pname = "convertall";
-  version = "1.0.2";
+  version = "1.0.3";

  src = fetchFromGitHub {
    owner = "doug-101";
    repo = "ConvertAll";
    tag = "v${version}";
-    hash = "sha256-esc2xhL0Jx5SaqM0GnnVzdtnSN9bX8zln66We/2RqoA=";
+    hash = "sha256-f9HfLfxY2G/3rZoWJ1xLeGmkdFiIyUFkr65Jf8QMqjY=";
  };

  pubspecLock = lib.importJSON ./pubspec.lock.json;

+  passthru = {
+    pubspecSource =
+      runCommand "pubspec.lock.json"
+        {
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
+        }
+        ''
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
+        '';
+    updateScript = _experimental-update-script-combinators.sequence [
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "convertall.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+    ];
+  };
+
  meta = {
    homepage = "https://convertall.bellz.org";
    description = "Graphical unit converter";
@@ -4,11 +4,11 @@
      "dependency": "transitive",
      "description": {
        "name": "archive",
-        "sha256": "a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813",
+        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.9"
    },
    "args": {
      "dependency": "transitive",
@@ -24,11 +24,11 @@
      "dependency": "direct main",
      "description": {
        "name": "async",
-        "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.12.0"
+      "version": "2.13.0"
    },
    "boolean_selector": {
      "dependency": "transitive",
@@ -44,21 +44,21 @@
      "dependency": "transitive",
      "description": {
        "name": "characters",
-        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+        "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.4.1"
    },
    "checked_yaml": {
      "dependency": "transitive",
      "description": {
        "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
    },
    "cli_util": {
      "dependency": "transitive",
@@ -90,16 +90,6 @@
      "source": "hosted",
      "version": "1.19.1"
    },
-    "crypto": {
-      "dependency": "transitive",
-      "description": {
-        "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.6"
-    },
    "cupertino_icons": {
      "dependency": "transitive",
      "description": {
@@ -110,45 +100,55 @@
      "source": "hosted",
      "version": "1.0.8"
    },
+    "dart_numerics": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_numerics",
+        "sha256": "47408d4890551636204851325e5649bf1a1616ebc325184c36722a1716cbaba4",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.0.6"
+    },
    "decimal": {
      "dependency": "direct main",
      "description": {
        "name": "decimal",
-        "sha256": "24a261d5d5c87e86c7651c417a5dbdf8bcd7080dd592533910e8d0505a279f21",
+        "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.3.3"
+      "version": "3.2.4"
    },
    "eval_ex": {
      "dependency": "direct main",
      "description": {
        "name": "eval_ex",
-        "sha256": "3f8853d996ee41955f2232ad3730e95698fb1040d03f6ebc6ab01f1c2bc3be53",
+        "sha256": "a99e20fb004275b38f27f186718a157d4d8687e69f75b5780e6c02b9cc9e6c0d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.1.8"
+      "version": "1.2.0"
    },
    "fake_async": {
      "dependency": "transitive",
      "description": {
        "name": "fake_async",
-        "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
    },
    "ffi": {
      "dependency": "transitive",
      "description": {
        "name": "ffi",
-        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+        "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
    },
    "file": {
      "dependency": "transitive",
@@ -170,21 +170,21 @@
      "dependency": "direct dev",
      "description": {
        "name": "flutter_launcher_icons",
-        "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.14.3"
+      "version": "0.14.4"
    },
    "flutter_lints": {
      "dependency": "direct dev",
      "description": {
        "name": "flutter_lints",
-        "sha256": "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.2"
+      "version": "6.0.0"
    },
    "flutter_markdown_selectionarea": {
      "dependency": "direct main",
@@ -222,11 +222,11 @@
      "dependency": "transitive",
      "description": {
        "name": "http",
-        "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f",
+        "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.6.0"
    },
    "http_parser": {
      "dependency": "transitive",
@@ -242,61 +242,71 @@
      "dependency": "transitive",
      "description": {
        "name": "image",
-        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.5.4"
+      "version": "4.8.0"
+    },
+    "intl": {
+      "dependency": "transitive",
+      "description": {
+        "name": "intl",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.20.2"
    },
    "json_annotation": {
      "dependency": "transitive",
      "description": {
        "name": "json_annotation",
-        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "4.9.0"
+      "version": "4.11.0"
    },
    "leak_tracker": {
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker",
-        "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "10.0.8"
+      "version": "11.0.2"
    },
    "leak_tracker_flutter_testing": {
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
    },
    "leak_tracker_testing": {
      "dependency": "transitive",
      "description": {
        "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
    },
    "lints": {
      "dependency": "transitive",
      "description": {
        "name": "lints",
-        "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290",
+        "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.0.0"
+      "version": "6.1.0"
    },
    "markdown": {
      "dependency": "transitive",
@@ -312,31 +322,31 @@
      "dependency": "transitive",
      "description": {
        "name": "matcher",
-        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+        "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.12.17"
+      "version": "0.12.19"
    },
    "material_color_utilities": {
      "dependency": "transitive",
      "description": {
        "name": "material_color_utilities",
-        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.11.1"
+      "version": "0.13.0"
    },
    "meta": {
      "dependency": "transitive",
      "description": {
        "name": "meta",
-        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.16.0"
+      "version": "1.17.0"
    },
    "nested": {
      "dependency": "transitive",
@@ -352,21 +362,21 @@
      "dependency": "direct main",
      "description": {
        "name": "package_info_plus",
-        "sha256": "cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.0.0"
+      "version": "9.0.0"
    },
    "package_info_plus_platform_interface": {
      "dependency": "transitive",
      "description": {
        "name": "package_info_plus_platform_interface",
-        "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.2.1"
    },
    "path": {
      "dependency": "transitive",
@@ -412,11 +422,11 @@
      "dependency": "transitive",
      "description": {
        "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.2"
    },
    "platform": {
      "dependency": "transitive",
@@ -442,21 +452,21 @@
      "dependency": "transitive",
      "description": {
        "name": "posix",
-        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.5.0"
    },
    "provider": {
      "dependency": "direct main",
      "description": {
        "name": "provider",
-        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5+1"
    },
    "rational": {
      "dependency": "transitive",
@@ -472,41 +482,81 @@
      "dependency": "transitive",
      "description": {
        "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
    },
    "shared_preferences": {
      "dependency": "direct main",
      "description": {
        "name": "shared_preferences",
-        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
+        "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
    },
    "shared_preferences_android": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.21"
    },
    "shared_preferences_foundation": {
      "dependency": "transitive",
      "description": {
        "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.6"
    },
    "shared_preferences_linux": {
      "dependency": "transitive",
@@ -558,11 +608,11 @@
      "dependency": "transitive",
      "description": {
        "name": "source_span",
-        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+        "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "1.10.1"
+      "version": "1.10.2"
    },
    "stack_trace": {
      "dependency": "transitive",
@@ -608,11 +658,21 @@
      "dependency": "transitive",
      "description": {
        "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.10"
+    },
+    "tuple": {
+      "dependency": "transitive",
+      "description": {
+        "name": "tuple",
+        "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
    },
    "typed_data": {
      "dependency": "transitive",
@@ -628,51 +688,51 @@
      "dependency": "direct main",
      "description": {
        "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
    },
    "url_launcher_android": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.28"
    },
    "url_launcher_ios": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.1"
    },
    "url_launcher_linux": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_linux",
-        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
    },
    "url_launcher_macos": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.5"
    },
    "url_launcher_platform_interface": {
      "dependency": "transitive",
@@ -688,21 +748,21 @@
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.2"
    },
    "url_launcher_windows": {
      "dependency": "transitive",
      "description": {
        "name": "url_launcher_windows",
-        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "3.1.4"
+      "version": "3.1.5"
    },
    "vector_math": {
      "dependency": "transitive",
@@ -718,41 +778,41 @@
      "dependency": "transitive",
      "description": {
        "name": "vm_service",
-        "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "14.3.1"
+      "version": "15.0.2"
    },
    "web": {
      "dependency": "transitive",
      "description": {
        "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.5.1"
+      "version": "1.1.1"
    },
    "win32": {
      "dependency": "transitive",
      "description": {
        "name": "win32",
-        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "5.12.0"
+      "version": "5.15.0"
    },
    "window_manager": {
      "dependency": "direct main",
      "description": {
        "name": "window_manager",
-        "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "0.3.9"
+      "version": "0.5.1"
    },
    "xdg_directories": {
      "dependency": "transitive",
@@ -768,11 +828,11 @@
      "dependency": "transitive",
      "description": {
        "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
        "url": "https://pub.dev"
      },
      "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
    },
    "yaml": {
      "dependency": "transitive",
@@ -786,7 +846,7 @@
    }
  },
  "sdks": {
-    "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "dart": ">=3.10.0 <4.0.0",
+    "flutter": ">=3.38.0"
  }
 }
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "copilot-language-server";
-  version = "1.463.0";
+  version = "1.467.0";

  src = fetchzip {
    url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-mxmHXLxWGb+cHrRgctX2PHGAVy4ZTY1+7C9gzeh0vdc=";
+    hash = "sha256-JSxuYBeMKTiBOSQk4IGcst0YYcXGi4V0D4EkJfEbPzo=";
    stripRoot = false;
  };

@@ -4,7 +4,7 @@
  fetchFromGitHub,
  which,
  sqlite,
-  lua5_1,
+  lua5_4,
  perl,
  python3,
  zlib,
@@ -27,13 +27,13 @@

 stdenv.mkDerivation rec {
  pname = "crawl${lib.optionalString tileMode "-tiles"}";
-  version = "0.33.1";
+  version = "0.34.1";

  src = fetchFromGitHub {
    owner = "crawl";
    repo = "crawl";
    rev = version;
-    hash = "sha256-GXrYLGoQ1UwDHs+kLLcaBNpJ2BVMv4NhmpyfNFxPmg8=";
+    hash = "sha256-exntfZbGEDBwFA8AHhOoBPIXw/MDrHx5oxrxPDixpCc=";
  };

  # Patch hard-coded paths and remove force library builds
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {

  # Still unstable with luajit
  buildInputs = [
-    lua5_1
+    lua5_4
    zlib
    sqlite
    ncurses
@@ -11,16 +11,16 @@

 buildGo126Module (finalAttrs: {
  pname = "crush";
-  version = "0.55.0";
+  version = "0.56.0";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "crush";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7rndFGEeRiCd9wSu/TSjbvMVSIb2JMmLEqaIFdR0av4=";
+    hash = "sha256-JtqgEI09kRg/uW/2fxMQL5+cmODO2y6aW1e5OXTH2LY=";
  };

-  vendorHash = "sha256-leQHNLt3WebIvV/2nY+Lo+SVOV2SQ8EL9Mopu4lro9s=";
+  vendorHash = "sha256-n5pqIxN2TwiEWd3ZzFHqYSIKYPsMYAip3kDRx4ajuck=";

  ldflags = [
    "-s"
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'cucumber'
+gem 'cucumber', '10.2.0'
@@ -1,45 +1,49 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    bigdecimal (3.1.9)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
    builder (3.3.0)
-    cucumber (9.2.1)
+    cucumber (10.2.0)
+      base64 (~> 0.2)
      builder (~> 3.2)
-      cucumber-ci-environment (> 9, < 11)
-      cucumber-core (> 13, < 14)
-      cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 28)
-      cucumber-html-formatter (> 20.3, < 22)
-      cucumber-messages (> 19, < 25)
+      cucumber-ci-environment (> 9, < 12)
+      cucumber-core (> 15, < 17)
+      cucumber-cucumber-expressions (> 17, < 20)
+      cucumber-html-formatter (> 21, < 23)
      diff-lcs (~> 1.5)
+      logger (~> 1.6)
      mini_mime (~> 1.1)
      multi_test (~> 1.1)
-      sys-uname (~> 1.2)
-    cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.3)
-      cucumber-gherkin (>= 27, < 28)
-      cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (> 5, < 7)
-    cucumber-cucumber-expressions (17.1.0)
+      sys-uname (~> 1.3)
+    cucumber-ci-environment (11.0.0)
+    cucumber-core (16.2.0)
+      cucumber-gherkin (> 36, < 40)
+      cucumber-messages (> 31, < 33)
+      cucumber-tag-expressions (> 6, < 9)
+    cucumber-cucumber-expressions (19.0.0)
      bigdecimal
-    cucumber-gherkin (27.0.0)
-      cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.9.0)
-      cucumber-messages (> 19, < 28)
-    cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.2)
+    cucumber-gherkin (39.0.0)
+      cucumber-messages (>= 31, < 33)
+    cucumber-html-formatter (22.3.0)
+      cucumber-messages (> 23, < 33)
+    cucumber-messages (32.2.0)
+    cucumber-tag-expressions (8.1.0)
    diff-lcs (1.6.2)
-    ffi (1.17.2)
+    ffi (1.17.3)
+    logger (1.7.0)
+    memoist3 (1.0.0)
    mini_mime (1.1.5)
    multi_test (1.1.0)
-    sys-uname (1.3.1)
+    sys-uname (1.5.0)
      ffi (~> 1.1)
+      memoist3 (~> 1.0.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  cucumber
+  cucumber (= 10.2.0)

 BUNDLED WITH
-   2.6.6
+   2.7.2
@@ -1,13 +1,23 @@
 {
+  base64 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
  bigdecimal = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "19y406nx17arzsbc515mjmr6k5p59afprspa1k423yd9cp8d61wb";
      type = "gem";
    };
-    version = "3.1.9";
+    version = "4.0.1";
  };
  builder = {
    groups = [ "default" ];
@@ -21,14 +31,14 @@
  };
  cucumber = {
    dependencies = [
+      "base64"
      "builder"
      "cucumber-ci-environment"
      "cucumber-core"
      "cucumber-cucumber-expressions"
-      "cucumber-gherkin"
      "cucumber-html-formatter"
-      "cucumber-messages"
      "diff-lcs"
+      "logger"
      "mini_mime"
      "multi_test"
      "sys-uname"
@@ -37,20 +47,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cbi1g6qwdh38z2jxm8a1mc63iz887108747c99s3g452hwn2hgs";
+      sha256 = "0n41b80fg8bz49m9rhms1g1zai2wl4m3z1841yv5h27lxhqvvvgx";
      type = "gem";
    };
-    version = "9.2.1";
+    version = "10.2.0";
  };
  cucumber-ci-environment = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cc6w7dqlmnp59ymi7pyspm3w4m7fn37x6b18pziv62wr373yvmv";
+      sha256 = "1qnif57qqcvaz361jkbg43pnzn80jac0ys7gklymn08b3ng9mxqd";
      type = "gem";
    };
-    version = "10.0.1";
+    version = "11.0.0";
  };
  cucumber-core = {
    dependencies = [
@@ -62,10 +72,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0i2k5j3l8yy1367hzmg7x3xy984bnmihnzjh0ic8s2nwb3b2h770";
+      sha256 = "02wprwvf2f3ffzvbrzv8clxvm11p6s7gcjd3wpwfwbzlbjlmhasr";
      type = "gem";
    };
-    version = "13.0.3";
+    version = "16.2.0";
  };
  cucumber-cucumber-expressions = {
    dependencies = [ "bigdecimal" ];
@@ -73,10 +83,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "14fkk7bfzm9cyacgcyzgkjc3nblflz4rcnlyz0pzd1ypwpqrvgm1";
+      sha256 = "0fnrr6hzcgg5ayfmf26f3vvm8c1418x9jiibsjzcjakk0kr8y81k";
      type = "gem";
    };
-    version = "17.1.0";
+    version = "19.0.0";
  };
  cucumber-gherkin = {
    dependencies = [ "cucumber-messages" ];
@@ -84,10 +94,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "063p0slf6fvigdn3jynp5pjf9b05byyyi0jhsyapy46hq4984sif";
+      sha256 = "0m9yb7icwn4s1clah4x495qjwaya50050fzfbhy1rx0hx63ivxa6";
      type = "gem";
    };
-    version = "27.0.0";
+    version = "39.0.0";
  };
  cucumber-html-formatter = {
    dependencies = [ "cucumber-messages" ];
@@ -95,30 +105,30 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "18bfg6gpijjbka0pp7604src1ajjkmsr79nyvr6zjgw4j0nvdsfn";
+      sha256 = "0a873ll5305g8gbp4sbf4006pn4bck6c491qbwxdgnw8ap88wxpr";
      type = "gem";
    };
-    version = "21.9.0";
+    version = "22.3.0";
  };
  cucumber-messages = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "06d7dnixz68ivngf6qflmi6xrjshjyi85gmyjrl07pbmhqi6r2nh";
+      sha256 = "06kk01xnpgkiw1jnpdw9azrxmyry4fqji2k7pw3rvpgprin0bi22";
      type = "gem";
    };
-    version = "22.0.0";
+    version = "32.2.0";
  };
  cucumber-tag-expressions = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0vcifp1fiha6yqi36m26n1vr8sz3dpnn5966hcz4a3dq43lf947p";
+      sha256 = "089fynlhyzcjng7x8ffda1gafdi1yfv2k4y9m7r5p3jgcnvc9n4v";
      type = "gem";
    };
-    version = "6.1.2";
+    version = "8.1.0";
  };
  diff-lcs = {
    groups = [ "default" ];
@@ -135,10 +145,30 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
+      sha256 = "0k1xaqw2jk13q3ss7cnyvkp8fzp75dk4kazysrxgfd1rpgvkk7qf";
      type = "gem";
    };
-    version = "1.17.2";
+    version = "1.17.3";
+  };
+  logger = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  memoist3 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0vyma0mpjibqigzl6j9lij7zh3kvqlyi88qc0mia6l7i5i044vk8";
+      type = "gem";
+    };
+    version = "1.0.0";
  };
  mini_mime = {
    groups = [ "default" ];
@@ -161,14 +191,17 @@
    version = "1.1.0";
  };
  sys-uname = {
-    dependencies = [ "ffi" ];
+    dependencies = [
+      "ffi"
+      "memoist3"
+    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "177l8rrqnb4rxf657mw28sgvgc8a2m7nlqcbdbra5m4xga0ypcxp";
+      sha256 = "0lrh3h15s3mpf0sa5cf7jwwr9wjlkjaf9qim8519cdsqpihnja0m";
      type = "gem";
    };
-    version = "1.3.1";
+    version = "1.5.0";
  };
 }
@@ -6,19 +6,19 @@
  pkg-config,
  imagemagick,
  libimagequant,
-  lua,
+  luajit,
  makeBinaryWrapper,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "cwal";
-  version = "0.8.2";
+  version = "0.8.4";

  src = fetchFromGitHub {
    owner = "nitinbhat972";
    repo = "cwal";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-CvC7I0/Obn/IEXmbr8Hs7YqUk6NPgduJpDCNCHwU8lA=";
+    hash = "sha256-/5l/Wc85ElB0V1j2tCW5CXKJKvhz6vb6V696d8UPM0c=";
  };

  strictDeps = true;
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    imagemagick
    libimagequant
-    lua
+    luajit
  ];

  postFixup = ''
@@ -15,16 +15,16 @@

 buildGoModule (finalAttrs: {
  pname = "dcp";
-  version = "0.22.11";
+  version = "0.23.0";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "dcp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-pf3vUmdUHUuPts7bwzjxGF3RXpWXz3HaHujz8UKSPbs=";
+    hash = "sha256-gpMH6oeFbfRuRiIoLXTeqCSyaGr6aS9Y1zq5x1bEiZw=";
  };

-  vendorHash = "sha256-n+F7YPU6/UfxN1nZ+K5UvIR7vav/trRPWdLc1izpNAU=";
+  vendorHash = "sha256-JO8++V4LyzX6aDdZNdzDD3EqdUdVvT4Jsjh/e6nqVgs=";

  # This is required so we:
  # - Delete an inconsistent vendor directory from upstream
--- a/Show More
+++ b/Show More