diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2062ccd7c14a..69bbc48c9099 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,6 +3,9 @@ name: Build on: workflow_call: inputs: + artifact-prefix: + required: true + type: string baseBranch: required: true type: string @@ -100,5 +103,5 @@ jobs: contains(fromJSON(inputs.baseBranch).type, 'primary') uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: - name: nixos-manual-${{ matrix.name }} + name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }} path: nixos-manual diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index d6e6ca7a05ba..b037b29c9558 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -3,6 +3,9 @@ name: Eval on: workflow_call: inputs: + artifact-prefix: + required: true + type: string mergedSha: required: true type: string @@ -110,7 +113,7 @@ jobs: MATRIX_SYSTEM: ${{ matrix.system }} MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }} run: | - nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \ + nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ --arg chunkSize 8000 \ --argstr nixPath "$MATRIX_VERSION" \ @@ -119,19 +122,29 @@ jobs: # Note: Keep the same further down in sync! - name: Evaluate the ${{ matrix.system }} output paths at the target commit - if: inputs.targetSha env: MATRIX_SYSTEM: ${{ matrix.system }} - # This is very quick, because it pulls the eval results from Cachix. run: | - nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \ + TARGET_DRV=$(nix-instantiate nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \ --argstr evalSystem "$MATRIX_SYSTEM" \ --arg chunkSize 8000 \ - --argstr nixPath "nixVersions.latest" \ - --out-link target + --argstr nixPath "nixVersions.latest") + + # Try to fetch this from Cachix a few times, for up to 30 seconds. This avoids running Eval + # twice in the Merge Queue, when a later item finishes Eval at the merge commit earlier. + for _i in {1..6}; do + # Using --max-jobs 0 will cause nix-build to fail if this can't be substituted from cachix. + if nix-build "$TARGET_DRV" --max-jobs 0; then + break + fi + sleep 5 + done + + # Either fetches from Cachix or runs Eval itself. The fallback is required + # for pull requests into wip-branches without merge queue. + nix-build "$TARGET_DRV" --out-link target - name: Compare outpaths against the target branch - if: inputs.targetSha env: MATRIX_SYSTEM: ${{ matrix.system }} run: | @@ -142,16 +155,15 @@ jobs: --out-link diff - name: Upload outpaths diff and stats - if: inputs.targetSha uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: - name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }} + name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }} path: diff/* compare: runs-on: ubuntu-24.04-arm needs: [eval] - if: inputs.targetSha && !cancelled() && !failure() + if: ${{ !cancelled() && !failure() }} permissions: statuses: write timeout-minutes: 5 @@ -169,7 +181,7 @@ jobs: - name: Download output paths and eval stats for all systems uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0 with: - pattern: diff-* + pattern: ${{ inputs.artifact-prefix }}diff-* path: diff merge-multiple: true @@ -182,6 +194,12 @@ jobs: --arg diffDir ./diff \ --out-link combined + - name: Upload the maintainer list + uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 + with: + name: ${{ inputs.artifact-prefix }}maintainers + path: combined/maintainers.json + - name: Compare against the target branch env: AUTHOR_ID: ${{ github.event.pull_request.user.id }} @@ -202,7 +220,7 @@ jobs: - name: Upload the comparison results uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0 with: - name: comparison + name: ${{ inputs.artifact-prefix }}comparison path: comparison/* - name: Add eval summary to commit statuses @@ -250,6 +268,7 @@ jobs: - name: Add version comparison table to job summary uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 env: + ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }} SYSTEMS: ${{ inputs.systems }} VERSIONS: ${{ needs.versions.outputs.versions }} with: @@ -257,6 +276,7 @@ jobs: const { readFileSync } = require('node:fs') const path = require('node:path') + const prefix = process.env.ARTIFACT_PREFIX const systems = JSON.parse(process.env.SYSTEMS) const versions = JSON.parse(process.env.VERSIONS) @@ -272,7 +292,7 @@ jobs: [{ data: version }].concat( systems.map((system) => { try { - const artifact = path.join('versions', `${version}-diff-${system}`) + const artifact = path.join('versions', `${prefix}${version}-diff-${system}`) const time = Math.round( parseFloat( readFileSync( diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 24ab1095ea7d..fe3d8fcc27d0 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -4,6 +4,9 @@ on: merge_group: workflow_call: inputs: + artifact-prefix: + required: true + type: string mergedSha: required: true type: string @@ -54,7 +57,9 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} with: + artifact-prefix: ${{ inputs.artifact-prefix }} mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} + targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }} systems: ${{ needs.prepare.outputs.systems }} # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 56017f0b4943..8a305a953933 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -3,6 +3,10 @@ name: PR on: pull_request_target: workflow_call: + inputs: + artifact-prefix: + required: true + type: string secrets: CACHIX_AUTH_TOKEN: required: true @@ -90,6 +94,7 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} with: + artifact-prefix: ${{ inputs.artifact-prefix }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} systems: ${{ needs.prepare.outputs.systems }} @@ -116,6 +121,8 @@ jobs: uses: ./.github/workflows/reviewers.yml secrets: OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }} + with: + artifact-prefix: ${{ inputs.artifact-prefix }} build: name: Build @@ -124,6 +131,7 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} with: + artifact-prefix: ${{ inputs.artifact-prefix }} baseBranch: ${{ needs.prepare.outputs.baseBranch }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml index 6d23e1dde9b7..b5d0ada43b9d 100644 --- a/.github/workflows/reviewers.yml +++ b/.github/workflows/reviewers.yml @@ -7,6 +7,10 @@ on: pull_request_target: types: [ready_for_review] workflow_call: + inputs: + artifact-prefix: + required: true + type: string secrets: OWNER_APP_PRIVATE_KEY: required: true @@ -91,6 +95,8 @@ jobs: - name: Wait for comparison to be done uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 id: eval + env: + ARTIFACT: ${{ inputs.artifact-prefix }}comparison with: script: | const run_id = (await github.rest.actions.listWorkflowRuns({ @@ -111,7 +117,7 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, run_id, - name: 'comparison' + name: process.env.ARTIFACT, }) if (result.data.total_count > 0) return await new Promise(resolve => setTimeout(resolve, 5000)) @@ -128,7 +134,7 @@ jobs: with: run-id: ${{ steps.eval.outputs.run-id }} github-token: ${{ github.token }} - pattern: comparison + pattern: ${{ inputs.artifact-prefix }}comparison path: comparison merge-multiple: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 67b416a6dfb2..4cac4b3f0bb6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,6 +79,7 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} with: + artifact-prefix: mg- mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} @@ -95,3 +96,5 @@ jobs: secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }} + with: + artifact-prefix: pr- diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix index 65a558d8be60..969622ee16f1 100644 --- a/ci/eval/compare/utils.nix +++ b/ci/eval/compare/utils.nix @@ -22,7 +22,7 @@ rec { splittedPath = lib.splitString "." packagePlatformPath; # ["python312Packages" "numpy" "aarch64-linux"] -> ["python312Packages" "numpy"] - packagePath = lib.sublist 0 (lib.length splittedPath - 1) splittedPath; + packagePath = lib.init splittedPath; # "python312Packages.numpy" name = lib.concatStringsSep "." packagePath; diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 9cc5ad6857b7..75b2eb9cba5d 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -111,6 +111,7 @@ let --option allow-import-from-derivation false \ --query --available \ --out-path --json \ + --meta \ --show-trace \ --arg chunkSize "$chunkSize" \ --arg myChunk "$myChunk" \ @@ -204,6 +205,7 @@ let fi cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json + cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json ''; diff = callPackage ./diff.nix { }; @@ -232,6 +234,14 @@ let }) ' > $out/combined-diff.json + # Combine maintainers from all systems + cat ${diffDir}/*/maintainers.json | jq -s ' + add | group_by(.package) | map({ + key: .[0].package, + value: map(.maintainers) | flatten | unique + }) | from_entries + ' > $out/maintainers.json + mkdir -p $out/before/stats for d in ${diffDir}/before/*; do cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d") diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix index 692e2ec60194..bb8ba8088c7f 100644 --- a/ci/eval/diff.nix +++ b/ci/eval/diff.nix @@ -76,11 +76,36 @@ let afterAttrs = getAttrs after; diffAttrs = diff beforeAttrs afterAttrs; diffJson = writeText "diff.json" (builtins.toJSON diffAttrs); + + # The maintainer list is not diffed, but just taken as is, to provide a map + # of maintainers on the target branch. A list of GitHub IDs is sufficient for + # all our purposes and reduces size massively. + meta = lib.importJSON "${after}/${evalSystem}/meta.json"; + maintainers = lib.pipe meta [ + (lib.mapAttrsToList ( + k: v: { + # splits off the platform suffix + package = lib.pipe k [ + (lib.splitString ".") + lib.init + (lib.concatStringsSep ".") + ]; + maintainers = map (m: m.githubId) v.maintainers or [ ]; + } + )) + # Some paths don't have a platform suffix, those will appear with an empty package here. + (lib.filter ({ package, maintainers }: package != "" && maintainers != [ ])) + ]; + maintainersJson = writeText "maintainers.json" (builtins.toJSON maintainers); in runCommand "diff" { } '' mkdir -p $out/${evalSystem} - cp -r ${before} $out/before - cp -r ${after} $out/after + cp -r --no-preserve=mode ${before} $out/before + cp -r --no-preserve=mode ${after} $out/after + # JSON files will be processed above explicitly, so avoid copying over + # the source files to keep the artifacts smaller. + find $out/before $out/after -iname '*.json' -delete cp ${diffJson} $out/${evalSystem}/diff.json + cp ${maintainersJson} $out/${evalSystem}/maintainers.json '' diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index f0d240098c41..f0b561d480e5 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -202,6 +202,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has _Default value:_ `false`. +`meta` (Attribute Set) + +: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes. + `contents` **DEPRECATED** : This attribute is deprecated, and users are encouraged to use `copyToRoot` instead. @@ -635,6 +639,10 @@ This allows the function to produce reproducible images. _Default value:_ `false`. +`meta` (Attribute Set) + +: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes. + `passthru` (Attribute Set; _optional_) : Use this to pass any attributes as [`passthru`](#chap-passthru) for the resulting derivation. diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md index fb71a78d6eb3..da46e0ee8f7d 100644 --- a/doc/packages/darwin-builder.section.md +++ b/doc/packages/darwin-builder.section.md @@ -64,13 +64,15 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519 builders-use-substitutes = true ``` -To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: +To allow Nix to connect to the default remote builder, which does not run on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`: ``` Host linux-builder Hostname localhost HostKeyAlias linux-builder Port 31022 + User builder + IdentityFile /etc/nix/builder_ed25519 ``` … and then restart your Nix daemon to apply the change: @@ -79,6 +81,8 @@ Host linux-builder $ sudo launchctl kickstart -k system/org.nixos.nix-daemon ``` +Note that if the builder is running and you have created the above ssh conf file, you can ssh into the builder with `sudo ssh builder@linux-builder`. + ## Example flake usage {#sec-darwin-builder-example-flake} ```nix diff --git a/lib/customisation.nix b/lib/customisation.nix index 9319fad0b822..30747f7fde7e 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -864,4 +864,139 @@ rec { transformDrv ; }; + + /** + Removes a prefix from the attribute names of a cross index. + + A cross index (short for "Cross Platform Pair Index") is a 6-field structure + organizing values by cross-compilation platform relationships. + + # Inputs + + `prefix` + : The prefix to remove from cross index attribute names + + `crossIndex` + : A cross index with prefixed names + + # Type + + ``` + renameCrossIndexFrom :: String -> AttrSet -> AttrSet + ``` + + # Examples + + :::{.example} + ## `lib.customisation.renameCrossIndexFrom` usage example + + ```nix + renameCrossIndexFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... } + => { buildBuild = ...; buildHost = ...; ... } + ``` + ::: + */ + renameCrossIndexFrom = prefix: x: { + buildBuild = x."${prefix}BuildBuild"; + buildHost = x."${prefix}BuildHost"; + buildTarget = x."${prefix}BuildTarget"; + hostHost = x."${prefix}HostHost"; + hostTarget = x."${prefix}HostTarget"; + targetTarget = x."${prefix}TargetTarget"; + }; + + /** + Adds a prefix to the attribute names of a cross index. + + A cross index (short for "Cross Platform Pair Index") is a 6-field structure + organizing values by cross-compilation platform relationships. + + # Inputs + + `prefix` + : The prefix to add to cross index attribute names + + `crossIndex` + : A cross index to be prefixed + + # Type + + ``` + renameCrossIndexTo :: String -> AttrSet -> AttrSet + ``` + + # Examples + + :::{.example} + ## `lib.customisation.renameCrossIndexTo` usage example + + ```nix + renameCrossIndexTo "self" { buildBuild = ...; buildHost = ...; ... } + => { selfBuildBuild = ...; selfBuildHost = ...; ... } + ``` + ::: + */ + renameCrossIndexTo = prefix: x: { + "${prefix}BuildBuild" = x.buildBuild; + "${prefix}BuildHost" = x.buildHost; + "${prefix}BuildTarget" = x.buildTarget; + "${prefix}HostHost" = x.hostHost; + "${prefix}HostTarget" = x.hostTarget; + "${prefix}TargetTarget" = x.targetTarget; + }; + + /** + Takes a function and applies it pointwise to each field of a cross index. + + A cross index (short for "Cross Platform Pair Index") is a 6-field structure + organizing values by cross-compilation platform relationships. + + # Inputs + + `f` + : Function to apply to each cross index value + + `crossIndex` + : A cross index to transform + + # Type + + ``` + mapCrossIndex :: (a -> b) -> AttrSet -> AttrSet + ``` + + # Examples + + :::{.example} + ## `lib.customisation.mapCrossIndex` usage example + + ```nix + mapCrossIndex (x: x * 10) { buildBuild = 1; buildHost = 2; ... } + => { buildBuild = 10; buildHost = 20; ... } + ``` + + ```nix + # Extract a package from package sets + mapCrossIndex (pkgs: pkgs.hello) crossIndexedPackageSets + ``` + ::: + */ + mapCrossIndex = + f: + { + buildBuild, + buildHost, + buildTarget, + hostHost, + hostTarget, + targetTarget, + }: + { + buildBuild = f buildBuild; + buildHost = f buildHost; + buildTarget = f buildTarget; + hostHost = f hostHost; + hostTarget = f hostTarget; + targetTarget = f targetTarget; + }; } diff --git a/lib/default.nix b/lib/default.nix index 157e4e2be278..e10332ca58dd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -397,6 +397,9 @@ let makeScopeWithSplicing makeScopeWithSplicing' extendMkDerivation + renameCrossIndexFrom + renameCrossIndexTo + mapCrossIndex ; inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate; inherit (self.generators) mkLuaInline; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d12c27c34bbc..2ec670262649 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -4741,4 +4741,82 @@ runTests { expected = "/non-existent/this/does/not/exist/for/real/please-dont-mess-with-your-local-fs/default.nix"; }; + # Tests for cross index utilities + + testRenameCrossIndexFrom = { + expr = lib.renameCrossIndexFrom "pkgs" { + pkgsBuildBuild = "dummy-build-build"; + pkgsBuildHost = "dummy-build-host"; + pkgsBuildTarget = "dummy-build-target"; + pkgsHostHost = "dummy-host-host"; + pkgsHostTarget = "dummy-host-target"; + pkgsTargetTarget = "dummy-target-target"; + }; + expected = { + buildBuild = "dummy-build-build"; + buildHost = "dummy-build-host"; + buildTarget = "dummy-build-target"; + hostHost = "dummy-host-host"; + hostTarget = "dummy-host-target"; + targetTarget = "dummy-target-target"; + }; + }; + + testRenameCrossIndexTo = { + expr = lib.renameCrossIndexTo "self" { + buildBuild = "dummy-build-build"; + buildHost = "dummy-build-host"; + buildTarget = "dummy-build-target"; + hostHost = "dummy-host-host"; + hostTarget = "dummy-host-target"; + targetTarget = "dummy-target-target"; + }; + expected = { + selfBuildBuild = "dummy-build-build"; + selfBuildHost = "dummy-build-host"; + selfBuildTarget = "dummy-build-target"; + selfHostHost = "dummy-host-host"; + selfHostTarget = "dummy-host-target"; + selfTargetTarget = "dummy-target-target"; + }; + }; + + testMapCrossIndex = { + expr = lib.mapCrossIndex (x: x * 10) { + buildBuild = 1; + buildHost = 2; + buildTarget = 3; + hostHost = 4; + hostTarget = 5; + targetTarget = 6; + }; + expected = { + buildBuild = 10; + buildHost = 20; + buildTarget = 30; + hostHost = 40; + hostTarget = 50; + targetTarget = 60; + }; + }; + + testMapCrossIndexString = { + expr = lib.mapCrossIndex (x: "prefix-${x}") { + buildBuild = "bb"; + buildHost = "bh"; + buildTarget = "bt"; + hostHost = "hh"; + hostTarget = "ht"; + targetTarget = "tt"; + }; + expected = { + buildBuild = "prefix-bb"; + buildHost = "prefix-bh"; + buildTarget = "prefix-bt"; + hostHost = "prefix-hh"; + hostTarget = "prefix-ht"; + targetTarget = "prefix-tt"; + }; + }; + } diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 421e363b2260..869eb3f0fda5 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -379,6 +379,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. +- Netdata removed support for non cloud deployments in version 2, so the `withCloud` option has been removed. + - The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot. - Default file names of images generated by several builders in `system.build` have been changed as outlined in the table below. diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix index 659499a24258..b470783126e7 100644 --- a/nixos/modules/security/doas.nix +++ b/nixos/modules/security/doas.nix @@ -7,8 +7,6 @@ let cfg = config.security.doas; - inherit (pkgs) doas; - mkUsrString = user: toString user; mkGrpString = group: ":${toString group}"; @@ -67,6 +65,8 @@ in ''; }; + package = lib.mkPackageOption pkgs "doas" { }; + wheelNeedsPassword = lib.mkOption { type = with lib.types; bool; default = true; @@ -256,11 +256,11 @@ in setuid = true; owner = "root"; group = "root"; - source = "${doas}/bin/doas"; + source = lib.getExe cfg.package; }; environment.systemPackages = [ - doas + cfg.package ]; security.pam.services.doas = { diff --git a/nixos/modules/security/soteria.nix b/nixos/modules/security/soteria.nix index 1e2b59e5714d..3b2f8349c4e5 100644 --- a/nixos/modules/security/soteria.nix +++ b/nixos/modules/security/soteria.nix @@ -36,8 +36,8 @@ in wants = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; + script = lib.getExe cfg.package; serviceConfig = { - ExecStart = lib.getExe cfg.package; Type = "simple"; Restart = "on-failure"; RestartSec = 1; diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix index f58ca9d9819a..570c556ef849 100644 --- a/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/nixos/modules/services/blockchain/ethereum/geth.nix @@ -206,43 +206,6 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = - let - args = lib.cli.toCommandLineShellGNU { } { - inherit (cfg) - syncmode - gcmode - port - maxpeers - ; - nousb = true; - ipcdisable = true; - datadir = dataDir; - ${cfg.network} = true; - - http = cfg.http.enable; - "http.addr" = if cfg.http.enable then cfg.http.address else null; - "http.port" = if cfg.http.enable then cfg.http.port else null; - "http.api" = if cfg.http.apis != null then lib.concatStringsSep "," cfg.http.apis else null; - - ws = cfg.websocket.enable; - "ws.addr" = if cfg.websocket.enable then cfg.websocket.address else null; - "ws.port" = if cfg.websocket.enable then cfg.websocket.port else null; - "ws.api" = if cfg.websocket.apis != null then lib.concatStringsSep "," cfg.websocket.apis else null; - - metrics = cfg.metrics.enable; - "metrics.addr" = if cfg.metrics.enable then cfg.metrics.address else null; - "metrics.port" = if cfg.metrics.enable then cfg.metrics.port else null; - - "authrpc.addr" = cfg.authrpc.address; - "authrpc.port" = cfg.authrpc.port; - "authrpc.vhosts" = lib.concatStringsSep "," cfg.authrpc.vhosts; - "authrpc.jwtsecret" = - if cfg.authrpc.jwtsecret != "" then cfg.authrpc.jwtsecret else "${dataDir}/geth/jwtsecret"; - }; - in - "${lib.getExe cfg.package} ${args} ${lib.escapeShellArgs cfg.extraArgs}"; - DynamicUser = true; Restart = "always"; StateDirectory = stateDir; @@ -254,6 +217,37 @@ in PrivateDevices = "true"; MemoryDenyWriteExecute = "true"; }; + + script = '' + ${cfg.package}/bin/geth \ + --nousb \ + --ipcdisable \ + ${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \ + --syncmode ${cfg.syncmode} \ + --gcmode ${cfg.gcmode} \ + --port ${toString cfg.port} \ + --maxpeers ${toString cfg.maxpeers} \ + ${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \ + ${ + lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}'' + } \ + ${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \ + ${ + lib.optionalString ( + cfg.websocket.apis != null + ) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}'' + } \ + ${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \ + --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \ + ${ + if (cfg.authrpc.jwtsecret != "") then + ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}'' + else + ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret'' + } \ + ${lib.escapeShellArgs cfg.extraArgs} \ + --datadir ${dataDir} + ''; } )) ) eachGeth; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 94f2bfaa28ac..46e7c7c2550a 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -362,7 +362,6 @@ in ''; serviceConfig = { Slice = "kubernetes.slice"; - CPUAccounting = true; MemoryAccounting = true; Restart = "on-failure"; RestartSec = "1000ms"; diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index a0d244337be8..8467e4b297c1 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -99,8 +99,10 @@ in description = "BOINC Client"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + script = '' + exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag} + ''; serviceConfig = { - ExecStart = "${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}"; User = "boinc"; Nice = 10; }; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 989053da173b..4d01d4533f67 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -475,13 +475,15 @@ in ''} ''; - environment.SLURM_CONF = configPath; + script = '' + export SLURM_CONF=${configPath} + exec ${cfg.package}/bin/slurmdbd -D + ''; serviceConfig = { RuntimeDirectory = "slurmdbd"; Type = "simple"; PIDFile = "/run/slurmdbd.pid"; - ExecStart = "${lib.getExe' cfg.package "slurmdbd"} -D"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 49b0f88d9674..d1718d3bca9d 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -172,9 +172,12 @@ in serviceConfig.Restart = "always"; serviceConfig.User = "minetest"; serviceConfig.Group = "minetest"; - serviceConfig.StateDirectory = "minetest"; - serviceConfig.WorkingDirectory = "/var/lib/minetest"; - serviceConfig.ExecStart = "${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}"; + + script = '' + cd /var/lib/minetest + + exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags} + ''; }; }; } diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix index ba627c009efd..3bb53ce4603a 100644 --- a/nixos/modules/services/hardware/pommed.nix +++ b/nixos/modules/services/hardware/pommed.nix @@ -51,7 +51,7 @@ in systemd.services.pommed = { description = "Pommed Apple Hotkeys Daemon"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.pommed_light} -f"; + script = "${pkgs.pommed_light}/bin/pommed -f"; }; }; } diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index 0bf3a636c18e..d02cc7484991 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -79,7 +79,6 @@ in after = [ "network.target" ]; environment.ZIGBEE2MQTT_DATA = cfg.dataDir; serviceConfig = { - ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} --no-preserve=mode ${configFile} '${cfg.dataDir}/configuration.yaml'"; ExecStart = "${cfg.package}/bin/zigbee2mqtt"; User = "zigbee2mqtt"; Group = "zigbee2mqtt"; @@ -130,6 +129,9 @@ in ]; UMask = "0077"; }; + preStart = '' + cp --no-preserve=mode ${configFile} "${cfg.dataDir}/configuration.yaml" + ''; }; users.users.zigbee2mqtt = { diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix index 8cc99e84c9bf..2280c4349144 100644 --- a/nixos/modules/services/logging/heartbeat.nix +++ b/nixos/modules/services/logging/heartbeat.nix @@ -67,10 +67,12 @@ in systemd.services.heartbeat = { description = "heartbeat log shipper"; wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p "${cfg.stateDir}"/{data,logs} + ''; serviceConfig = { User = "nobody"; AmbientCapabilities = "cap_net_raw"; - ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.stateDir}'/data '${cfg.stateDir}'/logs"; ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\""; }; }; diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix index acd178234ab7..af178a3838d2 100644 --- a/nixos/modules/services/logging/journalbeat.nix +++ b/nixos/modules/services/logging/journalbeat.nix @@ -71,12 +71,12 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "elasticsearch.service" ]; after = [ "elasticsearch.service" ]; + preStart = '' + mkdir -p ${cfg.stateDir}/data + mkdir -p ${cfg.stateDir}/logs + ''; serviceConfig = { StateDirectory = cfg.stateDir; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/data" - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/logs" - ]; ExecStart = '' ${cfg.package}/bin/journalbeat \ -c ${journalbeatYml} \ diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix index d9f0ccd39d97..efb53de0b484 100644 --- a/nixos/modules/services/logging/journaldriver.nix +++ b/nixos/modules/services/logging/journaldriver.nix @@ -91,12 +91,12 @@ in config = mkIf cfg.enable { systemd.services.journaldriver = { description = "Stackdriver Logging journal forwarder"; + script = "${pkgs.journaldriver}/bin/journaldriver"; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = lib.getExe pkgs.journaldriver; Restart = "always"; DynamicUser = true; diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 4bf59a783df1..f346070441b3 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -66,11 +66,14 @@ in wantedBy = [ "multi-user.target" ]; stopIfChanged = false; + preStart = '' + ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax + ''; + serviceConfig = { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStartPre = "${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax"; ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 6b3e7c3e599d..4c04d1f1f5dd 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -79,6 +79,7 @@ in config = lib.mkIf cfg.enable { systemd.services.syslog-ng = { description = "syslog-ng daemon"; + preStart = "mkdir -p /{var,run}/syslog-ng"; wantedBy = [ "multi-user.target" ]; after = [ "multi-user.target" ]; # makes sure hostname etc is set serviceConfig = { @@ -86,7 +87,6 @@ in PIDFile = pidFile; StandardOutput = "null"; Restart = "on-failure"; - ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/syslog-ng /run/syslog-ng"; ExecStart = "${cfg.package}/sbin/syslog-ng ${lib.concatStringsSep " " syslogngOptions}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix index dc67ccaaad66..9ee7cf8ee44b 100644 --- a/nixos/modules/services/mail/cyrus-imap.nix +++ b/nixos/modules/services/mail/cyrus-imap.nix @@ -342,7 +342,6 @@ in User = if (cfg.user == null) then "cyrus" else cfg.user; Group = if (cfg.group == null) then "cyrus" else cfg.group; Type = "simple"; - ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock"; ExecStart = "${cyrus-imapdPkg}/libexec/master -l $LISTENQUEUE -C /etc/imapd.conf -M /etc/cyrus.conf -p /run/cyrus/master.pid -D"; Restart = "on-failure"; RestartSec = "1s"; @@ -368,6 +367,9 @@ in RestrictNamespaces = true; RestrictRealtime = true; }; + preStart = '' + mkdir -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock + ''; }; environment.systemPackages = [ cyrus-imapdPkg ]; }; diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix index 168bbdd5a1a9..2fefcd6b68a2 100644 --- a/nixos/modules/services/mail/dkimproxy-out.nix +++ b/nixos/modules/services/mail/dkimproxy-out.nix @@ -109,8 +109,10 @@ in chown -R dkimproxy-out:dkimproxy-out "${keydir}" fi ''; + script = '' + exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile} + ''; serviceConfig = { - ExecStart = "${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}"; User = "dkimproxy-out"; PermissionsStartOnly = true; }; diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index a8b1cf76f351..6dc278f89f29 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -245,13 +245,13 @@ wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger + ''; + serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "rm"} -f /var/spool/nullmailer/trigger" - "${lib.getExe' pkgs.coreutils "mkfifo"} -m 660 /var/spool/nullmailer/trigger" - ]; ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send"; Restart = "always"; }; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 67a97f6a244f..463757fa8440 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -210,13 +210,13 @@ in description = "Postfix Greylisting Service"; wantedBy = [ "multi-user.target" ]; before = [ "postfix.service" ]; + preStart = '' + mkdir -p /var/postgrey + chown postgrey:postgrey /var/postgrey + chmod 0770 /var/postgrey + ''; serviceConfig = { Type = "simple"; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/postgrey" - "${lib.getExe' pkgs.coreutils "chown"} postgrey:postgrey /var/postgrey" - "${lib.getExe' pkgs.coreutils "chmod"} 0770 /var/postgrey" - ]; ExecStart = '' ${pkgs.postgrey}/bin/postgrey \ ${bind-flag} \ diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index 3c1fc27e45f8..34004da62ef7 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -162,16 +162,17 @@ in "network.target" ]; + preStart = + if useLegacyStorage then + '' + mkdir -p ${cfg.dataDir}/data/blobs + '' + else + '' + mkdir -p ${cfg.dataDir}/db + ''; + serviceConfig = { - ExecStartPre = - if useLegacyStorage then - '' - ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/data/blobs - '' - else - '' - ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/db - ''; ExecStart = [ "" "${lib.getExe cfg.package} --config=${configFile}" diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index edfefac1fdf2..e258fb20b7ea 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -88,11 +88,14 @@ in wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + # There should be only one autofs service managed by systemd, so this should be safe. + rm -f /tmp/autofs-running + ''; + serviceConfig = { Type = "forking"; PIDFile = "/run/autofs.pid"; - # There should be only one autofs service managed by systemd, so this should be safe. - ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f /tmp/autofs-running"; ExecStart = "${pkgs.autofs5}/bin/automount ${lib.optionalString cfg.debug "-d"} -p /run/autofs.pid -t ${builtins.toString cfg.timeout} ${autoMaster}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix index 3de6ccb1896e..b216459b2d9b 100644 --- a/nixos/modules/services/misc/dictd.nix +++ b/nixos/modules/services/misc/dictd.nix @@ -78,7 +78,7 @@ in # with code 143 instead of exiting with code 0. serviceConfig.SuccessExitStatus = [ 143 ]; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8"; + script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8"; }; }; } diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index ea364d68c36a..f4abe2c8bf86 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -143,9 +143,11 @@ in description = "Docker Container Registry"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + script = '' + ${cfg.package}/bin/registry serve ${configFile} + ''; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} serve ${configFile}"; User = "docker-registry"; WorkingDirectory = cfg.storagePath; AmbientCapabilities = lib.mkIf (cfg.port < 1024) "cap_net_bind_service"; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index aa94368d61d2..d9f52af7fe72 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -100,13 +100,13 @@ in { after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p ${dataDir} + chown -R errbot:errbot ${dataDir} + ''; serviceConfig = { User = "errbot"; Restart = "on-failure"; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${dataDir}" - "${lib.getExe' pkgs.coreutils "chown"} -R errbot:errbot ${dataDir}" - ]; ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py"; PermissionsStartOnly = true; }; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index a6793362d188..ccfa63d3823d 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -138,13 +138,17 @@ in description = "Gollum wiki"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + path = [ pkgs.git ]; + + preStart = '' + # This is safe to be run on an existing repo + git init ${cfg.stateDir} + ''; serviceConfig = { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; - # This is safe to be run on an existing repo - ExecStartPre = "${lib.getExe pkgs.git} init ${cfg.stateDir}"; ExecStart = '' ${cfg.package}/bin/gollum \ --port ${toString cfg.port} \ diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 04759856ac7a..14bb792790a7 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -664,9 +664,6 @@ in serviceConfig = { User = cfg.user; WorkingDirectory = cfg.dataDir; - ExecStart = "${manage}/bin/paperless-manage document_exporter ${cfg.exporter.directory} ${ - lib.cli.toCommandLineShellGNU { } cfg.exporter.settings - }"; }; unitConfig = let @@ -685,7 +682,13 @@ in OnFailure = services; OnSuccess = services; }; + enableStrictShellChecks = true; path = [ manage ]; + script = '' + paperless-manage document_exporter ${cfg.exporter.directory} ${ + lib.cli.toCommandLineShellGNU { } cfg.exporter.settings + } + ''; }; }) ] diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 716eed8d35cd..b72e6186c1cd 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -40,8 +40,8 @@ in systemd.services.svnserve = { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - services.ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.svnBaseDir}"; - services.ExecStart = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid"; + preStart = "mkdir -p ${cfg.svnBaseDir}"; + script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid"; }; }; } diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix index 10d28c390a38..549b3ad5fa3d 100644 --- a/nixos/modules/services/misc/tandoor-recipes.nix +++ b/nixos/modules/services/misc/tandoor-recipes.nix @@ -119,12 +119,6 @@ in after = lib.optional cfg.database.createLocally "postgresql.target"; serviceConfig = { - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "ln"} -sf ${manage} tandoor-recipes-manage" - - # Let django migrate the DB as needed - "${lib.getExe pkg} migrate" - ]; ExecStart = '' ${pkg.python.pkgs.gunicorn}/bin/gunicorn recipes.wsgi ''; @@ -178,6 +172,13 @@ in wantedBy = [ "multi-user.target" ]; + preStart = '' + ln -sf ${manage} tandoor-recipes-manage + + # Let django migrate the DB as needed + ${pkg}/bin/tandoor-recipes migrate + ''; + environment = env // { PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/tandoor-recipes"; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 380f49fbba01..4b9cc658bf4a 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -139,9 +139,9 @@ in serviceOpts = { after = [ "pgbouncer.service" ]; - serviceConfig.ExecStart = concatStringsSep " " ( + script = concatStringsSep " " ( [ - "${escapeShellArg (getExe cfg.package)}" + "exec -- ${escapeShellArg (getExe cfg.package)}" "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" ] ++ optionals (cfg.connectionString != null) [ diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index 938033a8583f..f360aa86c7b8 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -108,16 +108,17 @@ in daemontools djbdns ]; - environment.FORWARDONLY = lib.mkIf cfg.forwardOnly "1"; preStart = '' rm -rf /var/lib/dnscache dnscache-conf dnscache dnscache /var/lib/dnscache ${config.services.dnscache.ip} rm -rf /var/lib/dnscache/root ln -sf ${dnscache-root} /var/lib/dnscache/root ''; - serviceConfig.StateDirectory = "dnscache"; - serviceConfig.WorkingDirectory = "/var/lib/dnscache"; - serviceConfig.ExecStart = "/var/lib/dnscache/run"; + script = '' + cd /var/lib/dnscache/ + ${lib.optionalString cfg.forwardOnly "export FORWARDONLY=1"} + exec ./run + ''; }; }; } diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 569734f6d70b..cd766f919579 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -13,9 +13,11 @@ let wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; wants = [ "network.target" ]; + preStart = '' + ${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout + ''; serviceConfig = { - ExecStartPre = "${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout"; ExecStart = "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + lib.optionalString cfg.debug " -xx"; ExecReload = [ diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index 1504a93d9203..95e19636edaf 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -152,7 +152,7 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${ircdService}/bin/control start"; + script = "${ircdService}/bin/control start"; }; }; } diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix index 4a938f50652e..ebc3af2cec0f 100644 --- a/nixos/modules/services/networking/ncps.nix +++ b/nixos/modules/services/networking/ncps.nix @@ -275,9 +275,12 @@ in wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up + ''; + serviceConfig = lib.mkMerge [ { - ExecStartPre = "${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up"; ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}"; User = "ncps"; Group = "ncps"; diff --git a/nixos/modules/services/networking/nghttpx/default.nix b/nixos/modules/services/networking/nghttpx/default.nix index a9ae12ac6c62..40eba4849adc 100644 --- a/nixos/modules/services/networking/nghttpx/default.nix +++ b/nixos/modules/services/networking/nghttpx/default.nix @@ -115,9 +115,11 @@ in nghttpx = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + script = '' + ${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile} + ''; serviceConfig = { - ExecStart = "${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile}"; Restart = "on-failure"; RestartSec = 60; }; diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix index 4a1a36244cca..669a6e208deb 100644 --- a/nixos/modules/services/networking/nm-file-secret-agent.nix +++ b/nixos/modules/services/networking/nm-file-secret-agent.nix @@ -125,7 +125,7 @@ in after = [ "NetworkManager.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ nmFileSecretAgentConfigFile ]; - serviceConfig.ExecStart = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}"; + script = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}"; }; }; } diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index e3c38cf2dfd6..159da0913995 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -32,7 +32,7 @@ with lib; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "${lib.getExe pkgs.oidentd} -u oidentd -g nogroup"; + script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup"; }; users.users.oidentd = { diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix index bc255ffc6ba9..5c76a7de5036 100644 --- a/nixos/modules/services/networking/oink.nix +++ b/nixos/modules/services/networking/oink.nix @@ -84,8 +84,8 @@ in description = "Dynamic DNS client for Porkbun"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + script = "${cfg.package}/bin/oink -c ${oinkConfig}"; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} -c ${oinkConfig}"; Restart = "on-failure"; RestartSec = "10"; }; diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix index 38678156fd03..4b92a230842d 100644 --- a/nixos/modules/services/networking/opengfw.nix +++ b/nixos/modules/services/networking/opengfw.nix @@ -374,22 +374,21 @@ in after = [ "network.target" ]; path = with pkgs; [ iptables ]; + preStart = '' + ${optionalString (rules != null) "ln -sf ${rules} rules.yaml"} + ${optionalString (settings != null) "ln -sf ${settings} config.yaml"} + ''; + + script = '' + ${config.security.wrapperDir}/OpenGFW \ + -f ${cfg.logFormat} \ + -l ${cfg.logLevel} \ + ${optionalString (cfg.pcapReplay != null) "-p ${cfg.pcapReplay}"} \ + -c config.yaml \ + rules.yaml + ''; + serviceConfig = rec { - ExecStartPre = - lib.optionals (rules != null) [ "${lib.getExe' pkgs.coreutils "ln"} -sf ${rules} rules.yaml" ] - ++ lib.optionals (settings != null) [ - "${lib.getExe' pkgs.coreutils "ln"} -sf ${settings} config.yaml" - ]; - ExecStart = - let - args = lib.cli.toCommandLineShellGNU { } { - f = cfg.logFormat; - l = cfg.logLevel; - p = cfg.pcapReplay; - c = "config.yaml"; - }; - in - "${config.security.wrapperDir}/OpenGFW ${args} rules.yaml"; WorkingDirectory = cfg.dir; ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID"; Restart = "always"; diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix index 9006a8b97e7b..cfe7f934bf36 100644 --- a/nixos/modules/services/networking/ostinato.nix +++ b/nixos/modules/services/networking/ostinato.nix @@ -108,7 +108,9 @@ in systemd.services.drone = { description = "Ostinato agent-controller"; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${pkg}/bin/drone ${toString cfg.port} ${configFile}"; + script = '' + ${pkg}/bin/drone ${toString cfg.port} ${configFile} + ''; }; }; diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix index ee7d1458ed70..9b5bdb9d3690 100644 --- a/nixos/modules/services/networking/pangolin.nix +++ b/nixos/modules/services/networking/pangolin.nix @@ -241,6 +241,11 @@ in requires = [ "network.target" ]; after = [ "network.target" ]; + preStart = '' + mkdir -p ${cfg.dataDir}/config + cp -f ${cfgFile} ${cfg.dataDir}/config/config.yml + ''; + serviceConfig = { User = "pangolin"; Group = "fossorial"; @@ -312,11 +317,6 @@ in "~@swap:EPERM" "~@timer:EPERM" ]; - - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/config" - "${lib.getExe' pkgs.coreutils "cp"} -f ${cfgFile} ${cfg.dataDir}/config/config.yml" - ]; ExecStart = lib.getExe cfg.package; }; }; diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix index abc78b5d569b..cda55cc2a7e8 100644 --- a/nixos/modules/services/networking/pdnsd.nix +++ b/nixos/modules/services/networking/pdnsd.nix @@ -80,13 +80,13 @@ in systemd.services.pdnsd = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + mkdir -p "${cfg.cacheDir}" + touch "${cfg.cacheDir}/pdnsd.cache" + chown -R ${pdnsdUser}:${pdnsdGroup} "${cfg.cacheDir}" + ''; description = "pdnsd"; serviceConfig = { - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.cacheDir}'" - "${lib.getExe' pkgs.coreutils "touch"} '${cfg.cacheDir}/pdnsd.cache'" - "${lib.getExe' pkgs.coreutils "chown"} -R ${pdnsdUser}:${pdnsdGroup} '${cfg.cacheDir}'" - ]; ExecStart = "${pdnsd}/bin/pdnsd -c ${pdnsdConf}"; }; }; diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix index 1c4ef08fdc7f..852dcc8ff431 100644 --- a/nixos/modules/services/networking/redsocks.nix +++ b/nixos/modules/services/networking/redsocks.nix @@ -276,7 +276,7 @@ in description = "Redsocks"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.redsocks} -c ${configfile}"; + script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}"; }; networking.firewall.extraCommands = iptables; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 5990c0d4fa2e..d15f8689dd73 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -337,12 +337,12 @@ in serviceConfig = { User = cfg.user; Restart = "on-failure"; - ExecStartPre = [ - "${cfg.package}/bin/smokeping --check --config=${configPath}" - "${cfg.package}/bin/smokeping --static --config=${configPath}" - ]; ExecStart = "${cfg.package}/bin/smokeping --config=/etc/smokeping.conf --nodaemon"; }; + preStart = '' + ${cfg.package}/bin/smokeping --check --config=${configPath} + ${cfg.package}/bin/smokeping --static --config=${configPath} + ''; }; systemd.tmpfiles.rules = [ diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix index 6a9d64a97cc2..f05e1fe30112 100644 --- a/nixos/modules/services/networking/supybot.nix +++ b/nixos/modules/services/networking/supybot.nix @@ -104,12 +104,14 @@ in documentation = [ "https://limnoria.readthedocs.io/" ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + # This needs to be created afresh every time + rm -f '${cfg.stateDir}/supybot.cfg.bak' + ''; startLimitIntervalSec = 5 * 60; # 5 min startLimitBurst = 1; serviceConfig = { - # This needs to be created afresh every time - ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f '${cfg.stateDir}/supybot.cfg.bak'"; ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg"; PIDFile = "/run/supybot.pid"; User = "supybot"; diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index b673d29bb40e..0b6e110d2caa 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -240,8 +240,10 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}"; }; + script = '' + ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags} + ''; }; boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") { diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix index 4a3ef4d1c426..a8104c2e1b88 100644 --- a/nixos/modules/services/networking/thelounge.nix +++ b/nixos/modules/services/networking/thelounge.nix @@ -112,11 +112,11 @@ in systemd.services.thelounge = { description = "The Lounge web IRC client"; wantedBy = [ "multi-user.target" ]; + preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; environment.THELOUNGE_PACKAGES = mkIf (cfg.plugins != [ ]) "${plugins}"; serviceConfig = { User = "thelounge"; StateDirectory = baseNameOf dataDir; - ExecStartPre = "${lib.getExe' pkgs.coreutils "ln"} -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; ExecStart = "${getExe cfg.package} start"; }; }; diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix index 709f751ee825..145357b828b1 100644 --- a/nixos/modules/services/networking/tinydns.nix +++ b/nixos/modules/services/networking/tinydns.nix @@ -58,11 +58,10 @@ with lib; ln -sf ${pkgs.writeText "tinydns-data" config.services.tinydns.data} data tinydns-data ''; - serviceConfig = { - StateDirectory = "tinydns"; - WorkingDirectory = "/var/lib/tinydns"; - ExecStart = "/var/lib/tinydns/run"; - }; + script = '' + cd /var/lib/tinydns + exec ./run + ''; }; }; } diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 4688e410cee4..112c86187666 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -43,19 +43,20 @@ with lib; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + mkdir -p /run/toxvpn || true + chown toxvpn /run/toxvpn + ''; + + path = [ pkgs.toxvpn ]; + + script = '' + exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${ + lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers + } + ''; + serviceConfig = { - ExecStart = - let - args = lib.cli.toCommandLineShellGNU { } { - i = config.services.toxvpn.localip; - l = "/run/toxvpn/control"; - u = "toxvpn"; - p = config.services.toxvpn.port; - a = config.services.toxvpn.auto_add_peers; - }; - in - "${lib.getExe pkgs.toxvpn} ${args}"; - RuntimeDirectory = "toxvpn"; KillMode = "process"; Restart = "on-success"; Type = "notify"; diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix index 14baae06bc89..4e9edf6bb23d 100644 --- a/nixos/modules/services/networking/twingate.nix +++ b/nixos/modules/services/networking/twingate.nix @@ -17,7 +17,7 @@ in config = lib.mkIf cfg.enable { systemd.packages = [ cfg.package ]; systemd.services.twingate = { - serviceConfig.ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/"; + preStart = "cp -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/"; wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index f1be424e075a..d33b4d97519b 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -143,7 +143,8 @@ in description = "xinetd server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.xinetd} -syslog daemon -dontfork -stayalive -f ${configFile}"; + path = [ pkgs.xinetd ]; + script = "exec xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; }; }; } diff --git a/nixos/modules/services/networking/xray.nix b/nixos/modules/services/networking/xray.nix index fc638f7ce766..1d0d514d2e48 100644 --- a/nixos/modules/services/networking/xray.nix +++ b/nixos/modules/services/networking/xray.nix @@ -93,8 +93,10 @@ with lib; description = "xray Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + script = '' + exec "${cfg.package}/bin/xray" -config "$CREDENTIALS_DIRECTORY/config.json" + ''; serviceConfig = { - ExecStart = "${cfg.package}/bin/xray -config %d/config.json"; DynamicUser = true; LoadCredential = "config.json:${settingsFile}"; CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 0673070d1ee6..96cf4cc7148d 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -91,14 +91,14 @@ in enable = true; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}" - "${lib.getExe' pkgs.coreutils "chown"} ${cfg.user} ${cfg.dataDir}" - ]; serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}"; serviceConfig.PrivateTmp = "yes"; serviceConfig.User = cfg.user; serviceConfig.Group = cfg.group; + preStart = '' + mkdir -p ${cfg.dataDir} + chown ${cfg.user} ${cfg.dataDir} + ''; }; }; } diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix index 72179533cfe8..ae42d30168ab 100644 --- a/nixos/modules/services/scheduling/prefect.nix +++ b/nixos/modules/services/scheduling/prefect.nix @@ -173,7 +173,6 @@ in ProtectKernelLogs = true; ProtectControlGroups = true; MemoryAccounting = true; - CPUAccounting = true; ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}"; Restart = "always"; @@ -216,7 +215,6 @@ in ProtectKernelLogs = true; ProtectControlGroups = true; MemoryAccounting = true; - CPUAccounting = true; ExecStart = '' ${pkgs.prefect}/bin/prefect worker start \ --pool ${poolName} \ diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index 33c0be9e788a..059337e3a425 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -375,10 +375,10 @@ in }) // instance.environmentVariables; + preStart = "${execCommand} ${configArg} validate-config"; serviceConfig = { User = instance.user; Group = instance.group; - ExecStartPre = "${execCommand} ${configArg} validate-config"; ExecStart = "${execCommand} ${configArg}"; Restart = "always"; RestartSec = "5s"; diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix index a2e00ca35a82..6a744e572101 100644 --- a/nixos/modules/services/security/certmgr.nix +++ b/nixos/modules/services/security/certmgr.nix @@ -34,6 +34,11 @@ let [ spec ] ) (lib.attrValues cfg.specs) ); + + preStart = '' + ${lib.concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map lib.escapeShellArg specPaths)} + ${cfg.package}/bin/certmgr -f ${certmgrYaml} check + ''; in { options.services.certmgr = { @@ -210,14 +215,11 @@ in wants = [ "network-online.target" ]; after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + inherit preStart; serviceConfig = { Restart = "always"; RestartSec = "10s"; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${lib.escapeShellArgs specPaths}" - "${lib.getExe cfg.package} -f ${certmgrYaml} check" - ]; ExecStart = "${cfg.package}/bin/certmgr -f ${certmgrYaml}"; }; }; diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index 6152a57ffb8c..21bedc4fabd2 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -55,8 +55,10 @@ in "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + preStart = '' + /run/current-system/sw/bin/rm -fv /run/hologram.sock + ''; serviceConfig = { - ExecStartPre = "/run/current-system/sw/bin/rm -fv /run/hologram.sock"; ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; }; }; diff --git a/nixos/modules/services/web-apps/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix index bd01d6470186..5829b7c3e0dd 100644 --- a/nixos/modules/services/web-apps/bluemap.nix +++ b/nixos/modules/services/web-apps/bluemap.nix @@ -298,8 +298,10 @@ in Type = "oneshot"; Group = "nginx"; UMask = "026"; - ExecStart = "${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r"; }; + script = '' + ${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r + ''; }; systemd.timers."render-bluemap-maps" = lib.mkIf cfg.enableRender { diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index a0ec5fe4134b..bec59aa779e1 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -383,44 +383,37 @@ in cloudlog-upload-lotw = { description = "Upload QSOs to LoTW if certs have been provided"; enable = cfg.upload-lotw.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/lotw_upload"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload"; }; cloudlog-update-lotw-users = { description = "Update LOTW Users Database"; enable = cfg.update-lotw-users.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/load_users"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users"; }; cloudlog-update-dok = { description = "Update DOK File for autocomplete"; enable = cfg.update-dok.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_dok"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok"; }; cloudlog-update-clublog-scp = { description = "Update Clublog SCP Database File"; enable = cfg.update-clublog-scp.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_clublog_scp"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp"; }; cloudlog-update-wwff = { description = "Update WWFF File for autocomplete"; enable = cfg.update-wwff.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_wwff"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff"; }; cloudlog-upload-qrz = { description = "Upload QSOs to QRZ Logbook"; enable = cfg.upload-qrz.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/qrz/upload"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload"; }; cloudlog-update-sota = { description = "Update SOTA File for autocomplete"; enable = cfg.update-sota.enable; - serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_sota"; - serviceConfig.Type = "oneshot"; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota"; }; }; timers = { diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix index a5b74025318c..0d08ed6f168c 100644 --- a/nixos/modules/services/web-apps/discourse.nix +++ b/nixos/modules/services/web-apps/discourse.nix @@ -17,7 +17,10 @@ let upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15; postgresqlPackage = - if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql; + if config.services.postgresql.enable then + config.services.postgresql.finalPackage + else + pkgs.postgresql; postgresqlVersion = lib.getVersion postgresqlPackage; @@ -540,7 +543,7 @@ in assertions = [ { assertion = (cfg.database.host != null) -> (cfg.database.passwordFile != null); - message = "When services.gitlab.database.host is customized, services.discourse.database.passwordFile must be set!"; + message = "When services.discourse.database.host is customized, services.discourse.database.passwordFile must be set!"; } { assertion = cfg.hostname != ""; @@ -694,6 +697,9 @@ in services.postgresql = lib.mkIf databaseActuallyCreateLocally { enable = true; + extensions = ps: [ + ps.pgvector + ]; ensureUsers = [ { name = "discourse"; } ]; }; @@ -719,6 +725,7 @@ in psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'discourse'" | grep -q 1 || psql -tAc 'CREATE DATABASE "discourse" OWNER "discourse"' psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS hstore" + psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS vector" ''; serviceConfig = { @@ -805,8 +812,11 @@ in cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ + cp -r ${cfg.package.assets.generated}/* /run/discourse/assets-generated/ ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads ln -sf /var/lib/discourse/backups /run/discourse/public/backups + # discourse creates images in this folder, and by default it only has u=rx + chmod 750 /run/discourse/public/images ( umask u=rwx,g=,o= @@ -839,6 +849,7 @@ in "assets/javascripts/plugins" "public" "sockets" + "assets-generated" ]; RuntimeDirectoryMode = "0750"; StateDirectory = map (p: "discourse/" + p) [ diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix index 6733a95d706c..969615e6490a 100644 --- a/nixos/modules/services/web-apps/galene.nix +++ b/nixos/modules/services/web-apps/galene.nix @@ -133,16 +133,19 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = '' + ${optionalString (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) '' + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ''} + ''; + serviceConfig = mkMerge [ { Type = "simple"; User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; - ExecStartPre = lib.mkIf (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) [ - "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem" - "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem" - ]; ExecStart = '' ${cfg.package}/bin/galene \ ${optionalString (cfg.insecure) "-insecure"} \ diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix index 54ddf7f542b6..6a74cda886a1 100644 --- a/nixos/modules/services/web-apps/glitchtip.nix +++ b/nixos/modules/services/web-apps/glitchtip.nix @@ -236,8 +236,11 @@ in glitchtip = commonService // { description = "GlitchTip"; + preStart = '' + ${lib.getExe pkg} migrate + ''; + serviceConfig = commonServiceConfig // { - ExecStartPre = "${lib.getExe pkg} migrate"; ExecStart = '' ${lib.getExe python.pkgs.gunicorn} \ --bind=${cfg.listenAddress}:${toString cfg.port} \ diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix index ea97222f25e0..eec40a8a07f9 100644 --- a/nixos/modules/services/web-apps/healthchecks.nix +++ b/nixos/modules/services/web-apps/healthchecks.nix @@ -237,13 +237,14 @@ in wantedBy = [ "healthchecks.target" ]; after = [ "healthchecks-migration.service" ]; + preStart = '' + ${pkg}/opt/healthchecks/manage.py collectstatic --no-input + ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input + '' + + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress"; + serviceConfig = commonConfig // { Restart = "always"; - ExecStartPre = [ - "${pkg}/opt/healthchecks/manage.py collectstatic --no-input" - "${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input" - ] - ++ lib.optionals (cfg.settings.DEBUG != "True") [ "${pkg}/opt/healthchecks/manage.py compress" ]; ExecStart = '' ${pkgs.python3Packages.gunicorn}/bin/gunicorn hc.wsgi \ --bind ${cfg.listenAddress}:${toString cfg.port} \ diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix index 934afe082dae..081bfa763f9b 100644 --- a/nixos/modules/services/web-apps/mediagoblin.nix +++ b/nixos/modules/services/web-apps/mediagoblin.nix @@ -310,6 +310,19 @@ in in { mediagoblin-celeryd = lib.recursiveUpdate serviceDefaults { + # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug + # https://todo.sr.ht/~mediagoblin/mediagoblin/57 + preStart = '' + cp --remove-destination ${ + pkgs.writeText "mediagoblin.ini" ( + lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings) + + "\n" + + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } { + inherit (cfg.settings.mediagoblin) plugins; + } + ) + } /var/lib/mediagoblin/mediagoblin.ini + ''; serviceConfig = { Environment = [ "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery" @@ -318,19 +331,6 @@ in "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini" "PASTE_CONFIG=${pasteConfig}" ]; - # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug - # https://todo.sr.ht/~mediagoblin/mediagoblin/57 - ExecStartPre = '' - ${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${ - pkgs.writeText "mediagoblin.ini" ( - lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings) - + "\n" - + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } { - inherit (cfg.settings.mediagoblin) plugins; - } - ) - } /var/lib/mediagoblin/mediagoblin.ini - ''; ExecStart = "${lib.getExe' finalPackage "celery"} worker --loglevel=INFO"; }; unitConfig.Description = "MediaGoblin Celery"; @@ -345,16 +345,16 @@ in "mediagoblin-celeryd.service" "postgresql.target" ]; + preStart = '' + cp --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini + ${lib.getExe' finalPackage "gmg"} dbupdate + ''; serviceConfig = { Environment = [ "CELERY_ALWAYS_EAGER=false" "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}" "GST_PLUGIN_PATH=${GST_PLUGIN_PATH}" ]; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini" - "${lib.getExe' finalPackage "gmg"} dbupdate" - ]; ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini"; }; unitConfig.Description = "Mediagoblin"; diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 3a94f943b426..dac5f508aa70 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -18,6 +18,14 @@ let cfg = config.services.miniflux; boolToInt = b: if b then 1 else 0; + + pgbin = "${config.services.postgresql.package}/bin"; + # The hstore extension is no longer needed as of v2.2.14 + # and would prevent Miniflux from starting. + preStart = pkgs.writeScript "miniflux-pre-start" '' + #!${pkgs.runtimeShell} + ${pgbin}/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore" + ''; in { @@ -133,9 +141,7 @@ in serviceConfig = { Type = "oneshot"; User = config.services.postgresql.superUser; - # The hstore extension is no longer needed as of v2.2.14 - # and would prevent Miniflux from starting. - ExecStart = ''${config.services.postgresql.package}/bin/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"''; + ExecStart = preStart; }; }; diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix index d1f147fdfa11..c601943479cf 100644 --- a/nixos/modules/services/web-apps/misskey.nix +++ b/nixos/modules/services/web-apps/misskey.nix @@ -326,19 +326,19 @@ in environment = { MISSKEY_CONFIG_YML = "/run/misskey/default.yml"; }; + preStart = '' + install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml + '' + + (lib.optionalString (cfg.database.passwordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml + '') + + (lib.optionalString (cfg.redis.passwordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml + '') + + (lib.optionalString (cfg.meilisearch.keyFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml + ''); serviceConfig = { - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "install"} -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml" - ] - ++ (lib.optionals (cfg.database.passwordFile != null) [ - "${lib.getExe pkgs.replace-secret} '@DATABASE_PASSWORD@' '${cfg.database.passwordFile}' /run/misskey/default.yml" - ]) - ++ (lib.optionals (cfg.redis.passwordFile != null) [ - "${lib.getExe pkgs.replace-secret} '@REDIS_PASSWORD@' '${cfg.redis.passwordFile}' /run/misskey/default.yml" - ]) - ++ (lib.optionals (cfg.meilisearch.keyFile != null) [ - "${lib.getExe pkgs.replace-secret} '@MEILISEARCH_KEY@' '${cfg.meilisearch.keyFile}' /run/misskey/default.yml" - ]); ExecStart = "${cfg.package}/bin/misskey migrateandstart"; RuntimeDirectory = "misskey"; RuntimeDirectoryMode = "700"; diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix index 8afba754315f..1a97c88900f9 100644 --- a/nixos/modules/services/web-apps/nexus.nix +++ b/nixos/modules/services/web-apps/nexus.nix @@ -142,8 +142,9 @@ in fi ''; + script = "${cfg.package}/bin/nexus run"; + serviceConfig = { - ExecStart = "${cfg.package}/bin/nexus run"; User = cfg.user; Group = cfg.group; PrivateTmp = true; diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index eb110d4362c0..086cf8b31213 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -200,7 +200,6 @@ in requires = [ "postgresql.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction"; Type = "oneshot"; RemainAfterExit = true; User = "part-db"; @@ -208,6 +207,10 @@ in restartTriggers = [ cfg.package ]; + script = '' + set -euo pipefail + ${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction + ''; }; phpfpm-part-db = { diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix index 046122e3b704..40533ae760e1 100644 --- a/nixos/modules/services/web-apps/peering-manager.nix +++ b/nixos/modules/services/web-apps/peering-manager.nix @@ -307,8 +307,11 @@ in ] ++ lib.optionals (cfg.environmentFile != null) [ "peering-manager-config.service" ]; + preStart = '' + ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input + ''; + serviceConfig = { - ExecStartPre = "${pkg}/bin/peering-manager remove_stale_contenttypes --no-input"; ExecStart = '' ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \ --bind ${cfg.listenAddress}:${toString cfg.port} \ diff --git a/nixos/modules/services/web-apps/silverbullet.nix b/nixos/modules/services/web-apps/silverbullet.nix index 6d14842ebebc..789fafb68f7f 100644 --- a/nixos/modules/services/web-apps/silverbullet.nix +++ b/nixos/modules/services/web-apps/silverbullet.nix @@ -95,6 +95,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + preStart = lib.mkIf (!lib.hasPrefix "/var/lib/" cfg.spaceDir) "mkdir -p '${cfg.spaceDir}'"; serviceConfig = { Type = "simple"; User = "${cfg.user}"; @@ -103,9 +104,6 @@ in StateDirectory = lib.mkIf (lib.hasPrefix "/var/lib/" cfg.spaceDir) ( lib.last (lib.splitString "/" cfg.spaceDir) ); - ExecStartPre = lib.mkIf ( - !lib.hasPrefix "/var/lib/" cfg.spaceDir - ) "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.spaceDir}'"; ExecStart = "${lib.getExe cfg.package} --port ${toString cfg.listenPort} --hostname '${cfg.listenAddress}' '${cfg.spaceDir}' " + lib.concatStringsSep " " cfg.extraArgs; diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix index 4533d322d2b8..6634e4894546 100644 --- a/nixos/modules/services/web-apps/wakapi.nix +++ b/nixos/modules/services/web-apps/wakapi.nix @@ -143,6 +143,10 @@ in ++ optional (cfg.database.dialect == "postgres") "postgresql.target"; wantedBy = [ "multi-user.target" ]; + script = '' + exec ${getExe cfg.package} -config ${settingsFile} + ''; + serviceConfig = { Environment = mkMerge [ (mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}") @@ -153,8 +157,6 @@ in (lib.optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile) ++ (lib.optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile); - ExecStart = "${getExe cfg.package} -config ${settingsFile}"; - User = config.users.users.wakapi.name; Group = config.users.users.wakapi.group; diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix index 719f6401103e..331c31fefc9b 100644 --- a/nixos/modules/services/web-servers/h2o/default.nix +++ b/nixos/modules/services/web-servers/h2o/default.nix @@ -443,7 +443,6 @@ in ++ builtins.map (certName: "acme-${certName}.service") acmeCertNames.all; serviceConfig = { - ExecStartPre = "${h2oExe} --mode 'test'"; ExecStart = "${h2oExe} --mode 'master'"; ExecReload = [ "${h2oExe} --mode 'test'" @@ -484,6 +483,8 @@ in AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilitiesBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; + + preStart = "${h2oExe} --mode 'test'"; }; # This service waits for all certificates to be available before reloading diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index 516f887022b8..88bd1071b35b 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -93,7 +93,7 @@ in config = mkIf config.services.jboss.enable { systemd.services.jboss = { description = "JBoss server"; - serviceConfig.ExecStart = "${jbossService}/bin/control start"; + script = "${jbossService}/bin/control start"; wantedBy = [ "multi-user.target" ]; }; }; diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix index 48903742a919..d9a9631fba92 100644 --- a/nixos/modules/system/boot/systemd/user.nix +++ b/nixos/modules/system/boot/systemd/user.nix @@ -71,7 +71,7 @@ in systemd.user.extraConfig = mkOption { default = ""; type = types.lines; - example = "DefaultCPUAccounting=yes"; + example = "DefaultTimeoutStartSec=60"; description = '' Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for available options. diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix index 407aa261b764..83113c1902df 100644 --- a/nixos/modules/virtualisation/waagent.nix +++ b/nixos/modules/virtualisation/waagent.nix @@ -370,7 +370,6 @@ in Type = "simple"; Restart = "always"; Slice = "azure.slice"; - CPUAccounting = true; MemoryAccounting = true; }; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0e1146e54052..bcb00f3b067f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -14,10 +14,15 @@ # where said tests are unsupported. # Example callTest that just extracts the derivation from the test: # callTest = t: t.test; - -with pkgs.lib; - let + inherit (pkgs.lib) + isAttrs + isFunction + mapAttrs + elem + recurseIntoAttrs + ; + # TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected) # TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix discoverTests = @@ -667,7 +672,7 @@ in guacamole-server = runTest ./guacamole-server.nix; guix = handleTest ./guix { }; gvisor = runTest ./gvisor.nix; - h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; }; + h2o = import ./web-servers/h2o { inherit runTest; }; hadoop = import ./hadoop { inherit handleTestOn; package = pkgs.hadoop; @@ -737,13 +742,13 @@ in immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix; immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix; incron = runTest ./incron.nix; - incus = pkgs.recurseIntoAttrs ( + incus = recurseIntoAttrs ( handleTest ./incus { lts = false; inherit system pkgs; } ); - incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; }); + incus-lts = recurseIntoAttrs (handleTest ./incus { inherit system pkgs; }); influxdb = runTest ./influxdb.nix; influxdb2 = runTest ./influxdb2.nix; initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix; @@ -754,7 +759,7 @@ in initrdNetwork = runTest ./initrd-network.nix; input-remapper = runTest ./input-remapper.nix; inspircd = runTest ./inspircd.nix; - installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { }); + installed-tests = recurseIntoAttrs (handleTest ./installed-tests { }); installer = handleTest ./installer.nix { }; installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { }; intune = runTest ./intune.nix; @@ -808,7 +813,7 @@ in ksm = runTest ./ksm.nix; kthxbye = runTest ./kthxbye.nix; kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { }; - kubo = import ./kubo { inherit recurseIntoAttrs runTest; }; + kubo = import ./kubo { inherit runTest; }; lact = runTest ./lact.nix; ladybird = runTest ./ladybird.nix; languagetool = runTest ./languagetool.nix; @@ -891,7 +896,7 @@ in man = runTest ./man.nix; mariadb-galera = handleTest ./mysql/mariadb-galera.nix { }; marytts = runTest ./marytts.nix; - mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); + mastodon = recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; }); mate = runTest ./mate.nix; mate-wayland = runTest ./mate-wayland.nix; matomo = runTest ./matomo.nix; @@ -953,7 +958,7 @@ in mopidy = runTest ./mopidy.nix; morph-browser = runTest ./morph-browser.nix; mosquitto = runTest ./mosquitto.nix; - movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; }; + movim = import ./web-apps/movim { inherit runTest; }; mpd = runTest ./mpd.nix; mpv = runTest ./mpv.nix; mtp = runTest ./mtp.nix; @@ -1410,7 +1415,7 @@ in suricata = runTest ./suricata.nix; suwayomi-server = import ./suwayomi-server.nix { inherit runTest; - lib = pkgs.lib; + inherit (pkgs) lib; }; svnserve = runTest ./svnserve.nix; swap-file-btrfs = runTest ./swap-file-btrfs.nix; diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index e4b15cd10076..fdf427291497 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -29,7 +29,7 @@ in nodes.discourse = { nodes, ... }: { - virtualisation.memorySize = 2048; + virtualisation.memorySize = 4096; virtualisation.cores = 4; virtualisation.useNixStoreImage = true; virtualisation.writableStore = false; diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix index 629922fc366d..a28df9823ebf 100644 --- a/nixos/tests/kubo/default.nix +++ b/nixos/tests/kubo/default.nix @@ -1,5 +1,5 @@ -{ recurseIntoAttrs, runTest }: -recurseIntoAttrs { +{ lib, runTest }: +lib.recurseIntoAttrs { kubo = runTest ./kubo.nix; kubo-fuse = runTest ./kubo-fuse.nix; } diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix index 64610e584e01..3f215febda7c 100644 --- a/nixos/tests/paperless.nix +++ b/nixos/tests/paperless.nix @@ -116,9 +116,9 @@ assert "1 timers listed." in timers, "incorrect number of timers" # Double check that our attrset option override works as expected - cmdline = node.succeed("systemctl cat paperless-exporter | grep ExecStart | grep 'paperless-manage' | cut -f 2 -d=") + cmdline = node.succeed("grep 'paperless-manage' $(systemctl cat paperless-exporter | grep ExecStart | cut -f 2 -d=)") print(f"Exporter command line {cmdline!r}") - assert cmdline.strip().endswith("paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail"), "Unexpected exporter command line" + assert cmdline.strip() == "paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail", "Unexpected exporter command line" test_paperless(simple) simple.send_monitor_command("quit") diff --git a/nixos/tests/web-apps/movim/default.nix b/nixos/tests/web-apps/movim/default.nix index 7da1e7d88e67..daeb386b7563 100644 --- a/nixos/tests/web-apps/movim/default.nix +++ b/nixos/tests/web-apps/movim/default.nix @@ -1,6 +1,5 @@ -{ recurseIntoAttrs, runTest }: - -recurseIntoAttrs { +{ lib, runTest }: +lib.recurseIntoAttrs { ejabberd-h2o = runTest ./ejabberd-h2o.nix; prosody-nginx = runTest ./prosody-nginx.nix; } diff --git a/nixos/tests/web-servers/h2o/default.nix b/nixos/tests/web-servers/h2o/default.nix index d4a74ba71728..a9ddbda4acc5 100644 --- a/nixos/tests/web-servers/h2o/default.nix +++ b/nixos/tests/web-servers/h2o/default.nix @@ -1,6 +1,5 @@ -{ recurseIntoAttrs, runTest }: - -recurseIntoAttrs { +{ lib, runTest }: +lib.recurseIntoAttrs { basic = runTest ./basic.nix; mruby = runTest ./mruby.nix; tls-recommendations = runTest ./tls-recommendations.nix; diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index cc082bf5a22d..f9e5c7367dcd 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -53,7 +53,6 @@ ncurses, nixosTests, pkg-config, - recurseIntoAttrs, sigtool, sqlite, replaceVars, @@ -496,7 +495,7 @@ stdenv.mkDerivation (finalAttrs: { inherit withNativeCompilation; inherit withTreeSitter; inherit withXwidgets; - pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); + pkgs = lib.recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); tests = { inherit (nixosTests) emacs-daemon; withPackages = callPackage ./build-support/wrapper-test.nix { diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 2f5f9c7b07f8..5b5568892ec5 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -128,7 +128,7 @@ let } ); in -pkgs.recurseIntoAttrs rec { +pkgs.lib.recurseIntoAttrs rec { inherit nmt; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f046d7edbe55..6606a112481e 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -74,12 +74,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2025-10-18"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "98435447243eb80a7c228b1447f14f3294d39739"; - sha256 = "1dv8x5yh0hzshlybxnb786pcpcqsqn8adzmhlmqfx23d0326y2dw"; + rev = "a7138a0ee04d8af42c262554eccee168bbf1454f"; + sha256 = "115hnj4mkpqkyal3d1w3drs1jrxp4lhiz0bfqpak5n58j2ly8678"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.hydraPlatforms = [ ]; @@ -204,12 +204,12 @@ final: prev: { LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2025-10-20"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "e8a1d8b6286f82d75e5830de5ea93bd7622cec8c"; - sha256 = "0kb5aasd3kaz67yc1arrbk9h5qs40lmbpi8pkd55h0d686nfrb0w"; + rev = "064e61058b6bbaef02a6143662628d105695b8e5"; + sha256 = "0lh0japff6lywy17kfa20aws9p81ig8g9fpzm6jxh6w0xhnhzzb1"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; meta.hydraPlatforms = [ ]; @@ -217,12 +217,12 @@ final: prev: { LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-10-17"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "8614aeec5dae1739129c1207b88f749ba71f7f35"; - sha256 = "1j9h013xsr4xyackm8x752hmcpdjvvhgcj91j2232c75l1bsyha7"; + rev = "37ef81678d288d21272ada4cb85b2c0769bcd50b"; + sha256 = "1q1p6v9xarr2viyscrmg04j57dd298piraqz4xr75rh1w50lry3x"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; meta.hydraPlatforms = [ ]; @@ -412,12 +412,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-10-20"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "960a5cf992c033170499ccc7003df59734ed40a8"; - sha256 = "0v9amvvi8vscbzl2shffhn8bh1jjwvxzlx6n3absc4sd2zcjzyjv"; + rev = "3b0d7d781589ce98ce577202d25d07741ffcf479"; + sha256 = "0zswfigqlic5rn9l3762x9383qhhwcx6bvswgs0ak8srlbd5zwng"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.hydraPlatforms = [ ]; @@ -778,12 +778,12 @@ final: prev: { ale = buildVimPlugin { pname = "ale"; - version = "2025-09-06"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "4217461c4859c4fac31ce3d2e22574218f244cf5"; - sha256 = "044q1zgaz4r6s1b8v1d0k9ib50d81cm97byb10zaj3x0bq7r4f5m"; + rev = "b9d7f56471084e7ac8070c90315170ef703217ff"; + sha256 = "18ld6cai28xgf084ar77j1nm6ym50yk18365h1scfn4mg9vjbxqn"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.hydraPlatforms = [ ]; @@ -817,12 +817,12 @@ final: prev: { alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2025-07-09"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "2b3cbcdd980cae1e022409289245053f62fb50f6"; - sha256 = "1ngim3ia9qbv1sxkscryvbn8xkw95rna5iy724yxgnq5sqxxg1jc"; + rev = "3979b01cb05734331c7873049001d3f2bb8477f4"; + sha256 = "12l57r2hl62b5kj9m2qr8gixybmp3p8k40dnripji5i8hyjw39jv"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; meta.hydraPlatforms = [ ]; @@ -830,12 +830,12 @@ final: prev: { amp-nvim = buildVimPlugin { pname = "amp.nvim"; - version = "2025-10-19"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "amp.nvim"; - rev = "f25e09cd3552fb74c29fcf86e9902ffce09f36d4"; - sha256 = "0da7m3r6ficdpxfywrcw8k5iydxknfz4mcxvqr1ib4ns390561zx"; + rev = "621f1ca375fc2887d30a4ac32a8b6c582d28f9c0"; + sha256 = "09f3md3khk5ccvhf897ddp387qjkvwwz5d9wjvlafb06cdixlagz"; }; meta.homepage = "https://github.com/sourcegraph/amp.nvim/"; meta.hydraPlatforms = [ ]; @@ -1038,12 +1038,12 @@ final: prev: { asyncomplete-lsp-vim = buildVimPlugin { pname = "asyncomplete-lsp.vim"; - version = "2025-10-09"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete-lsp.vim"; - rev = "4b0cc02bef04f0f3ae196aacacc2156e0b842d29"; - sha256 = "1hw2mv0wr9gw37g697sllznwbsqkdxackfvahywh172ph5bximai"; + rev = "d5d91e1ad70edb00368c11d3e81008835ac14dd1"; + sha256 = "0fp7vv5qh4mpg9plrzax3iy8jy6g815vpjlg83f0nqvcky8k3bk7"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; meta.hydraPlatforms = [ ]; @@ -1142,12 +1142,12 @@ final: prev: { augment-vim = buildVimPlugin { pname = "augment.vim"; - version = "2025-10-02"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "augmentcode"; repo = "augment.vim"; - rev = "3e357e385d59c1e641543f85e539c65021dc21b8"; - sha256 = "0wsj5b3khfy2jwc276s4bjwpxs2vpc1hpaqqpdql2kj0dzqlfxv1"; + rev = "96e8d6d16268e9fc2b0b1cc98ec754effa24690e"; + sha256 = "0fkdyr8ak3j7jkccgcndzjkfxgx8mwjhb082lxw12sdaq9amgi6m"; }; meta.homepage = "https://github.com/augmentcode/augment.vim/"; meta.hydraPlatforms = [ ]; @@ -1168,12 +1168,12 @@ final: prev: { auto-fix-return-nvim = buildVimPlugin { pname = "auto-fix-return.nvim"; - version = "2025-08-12"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "Jay-Madden"; repo = "auto-fix-return.nvim"; - rev = "b3b672ac05039ea7e1527e99064f4221166b0f84"; - sha256 = "1sfpbzznfkisslr21h4lv99fgd6kz3d5r0kdhiranjrj5wviqm5h"; + rev = "700458d7e5b87b9434a07701bbc64fe4de0df486"; + sha256 = "0s6ggdjap21l0pjlxjgk8izg8w4y4dz6983bmy11c7h9zb0iihrw"; }; meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/"; meta.hydraPlatforms = [ ]; @@ -1233,12 +1233,12 @@ final: prev: { auto-session = buildVimPlugin { pname = "auto-session"; - version = "2025-10-07"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "517a75727d28a4d1ee9c79b56dde239a5408778f"; - sha256 = "02zn9scv39hdl16k5qz35v33qvhxyql9cy8v7rzx1ajqxz9sxf5z"; + rev = "292492ab7af4bd8b9e37e28508bc8ce995722fd5"; + sha256 = "1bhnss104mn308ml5zhbpaw6cb0cn68bq8ws9g0268hr81frzx7p"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; meta.hydraPlatforms = [ ]; @@ -1403,12 +1403,12 @@ final: prev: { barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2025-08-12"; + version = "2025-10-20"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "549ee11d97057eae207bafa2c23c315942cca097"; - sha256 = "107d46s7d4ljvb4ra6m14z6zd64mbvpnzcwcnwxjsf68g4d6a4n6"; + rev = "fb4369940a07dda35fa4d7f54cf4a36aa00440e6"; + sha256 = "0pnryr8m5dj1h0ki11b2mzq9wkcd8lg0l0w4pkyrd51a3dfa6wv1"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; meta.hydraPlatforms = [ ]; @@ -1533,12 +1533,12 @@ final: prev: { blame-nvim = buildVimPlugin { pname = "blame.nvim"; - version = "2025-09-24"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "FabijanZulj"; repo = "blame.nvim"; - rev = "d5f4ad5c8ebca3caecc773dda5983709c5a5da8f"; - sha256 = "0vgwdb1x5vjsfw5xznnw00w9h1rfcc5h1cv4crfq8dh000iqmzr0"; + rev = "f3f6153ea94e1120f2776f22bbbd63c4aeebaf32"; + sha256 = "05q4wwz9rm1ycjg536ys3jsdqlnndhpm8jm6vb4wqlza3gqgm3h9"; }; meta.homepage = "https://github.com/FabijanZulj/blame.nvim/"; meta.hydraPlatforms = [ ]; @@ -1598,12 +1598,12 @@ final: prev: { blink-cmp-dictionary = buildVimPlugin { pname = "blink-cmp-dictionary"; - version = "2025-06-20"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "Kaiser-Yang"; repo = "blink-cmp-dictionary"; - rev = "43b701fe9728a704bc63e4667c5d8b398bf129b2"; - sha256 = "0zf7q6n7hl3p83f9idrryd0mzcw78ljgdcv5ak09946nh9nqsc5k"; + rev = "944b3b215b01303672d4213758db7c5c5a1e3c92"; + sha256 = "10lgn0pz7ywip8yq35fsbf7h8y16jfv4hqzhy72djx2bz2wrrjvv"; }; meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/"; meta.hydraPlatforms = [ ]; @@ -1689,12 +1689,12 @@ final: prev: { blink-copilot = buildVimPlugin { pname = "blink-copilot"; - version = "2025-09-30"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "fang2hou"; repo = "blink-copilot"; - rev = "5d35fd07fcc148be20442da1bdd2407e03263d7d"; - sha256 = "1686djbjrk3327d7varbzqwwfimz9irgpagl7yk8nnighfygz7mk"; + rev = "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39"; + sha256 = "0m3d88z83akivsjj7p07dgqmacpkalij3kziagkb6rf5d59dnfvh"; }; meta.homepage = "https://github.com/fang2hou/blink-copilot/"; meta.hydraPlatforms = [ ]; @@ -1702,12 +1702,12 @@ final: prev: { blink-emoji-nvim = buildVimPlugin { pname = "blink-emoji.nvim"; - version = "2025-05-24"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "moyiz"; repo = "blink-emoji.nvim"; - rev = "f22ce8cac02a6ece05368220f1e38bd34fe376f9"; - sha256 = "1vnx779arsm4n1sjjwhraczp07am0i2n4m13jqv7ij01vd4c9wd4"; + rev = "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06"; + sha256 = "1hzzbx8sjjlwm0b2mdbi6wgkc87cf089pp2i3kycw7z0jsyk41wi"; }; meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/"; meta.hydraPlatforms = [ ]; @@ -1728,12 +1728,12 @@ final: prev: { blink-ripgrep-nvim = buildVimPlugin { pname = "blink-ripgrep.nvim"; - version = "2025-10-20"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "166fe9ee93007ae87dd47f42dce6e14fbc46d41e"; - sha256 = "04w3fv6k148fc8kpfyr5bj4f3b7z8r4pw4inw20jirls2ds9yvc3"; + rev = "e6705fcfccc71636f93f7417296f6831303c30ac"; + sha256 = "1qgr8ikhmg5x1wwhqianm8ijkk7ip1d16an1f3ljc0q8h2sr9pm6"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; meta.hydraPlatforms = [ ]; @@ -1949,12 +1949,12 @@ final: prev: { catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2025-10-08"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "af58927c55c9f3272c940ff02b3cee94a1249f26"; - sha256 = "0gbaw3yqnxr75csl40rl3rc0ynsmvzc6jn78c07ksj0i510ib4n8"; + rev = "8c4125e3c746976ba025dc5d908fa22c6aa09486"; + sha256 = "0gfsia8p9si1wh3430rl5pklw48c0h3zmx6q5bkvm1ajidndfgrp"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; meta.hydraPlatforms = [ ]; @@ -2053,12 +2053,12 @@ final: prev: { checkmate-nvim = buildVimPlugin { pname = "checkmate.nvim"; - version = "2025-10-20"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "bngarren"; repo = "checkmate.nvim"; - rev = "4cc5de61f2527e8fef6884f366b3d3f29b32e0a1"; - sha256 = "0p9zmjx6fa6bs7159y6hgh5mhnw0gz493bz1g5wjw7gy7ljrzi89"; + rev = "ebc9cbc305865e7f4952cd938d83fd992206245f"; + sha256 = "0q9gssx8237lvhfr1f4zzvgalv5abggwv24sqd6m65lji9kfs8jd"; }; meta.homepage = "https://github.com/bngarren/checkmate.nvim/"; meta.hydraPlatforms = [ ]; @@ -2924,12 +2924,12 @@ final: prev: { cmp_yanky = buildVimPlugin { pname = "cmp_yanky"; - version = "2025-09-08"; + version = "2025-10-20"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "cmp_yanky"; - rev = "9ed96f1d474c3bf7d445e943dc5d4a4277c19019"; - sha256 = "0gfbdv29svr4bzk0c2psvq8ivss6y5qsd9nq6m1chvj6z9k25krl"; + rev = "feea98d9b4d3ced314dc59b0f967ac2097c0b045"; + sha256 = "087yan40lzzvkm2q3j7kxxh18x5hsg3v7mmn84xwvh07kq7kg6aj"; }; meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; meta.hydraPlatforms = [ ]; @@ -2937,12 +2937,12 @@ final: prev: { cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2025-10-02"; + version = "2025-09-06"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "b3fe7d51c7d07157a183c7f9c6ad0b562f491aa3"; - sha256 = "0kjdswy1n8z7cwybzl8lcc9nlnljv94gdjmfkh39jjh02yqw5f06"; + rev = "0cc17f3491feba19ed62b2d9622577f7822a0113"; + sha256 = "06mmdiissgwpwh298nhcn16sgf38w1aq0bcjh4jh0ksnmglmsqv2"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; meta.hydraPlatforms = [ ]; @@ -3015,12 +3015,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2025-10-16"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4fc88d4f70750e6896e0de317a231e49850bb374"; - sha256 = "09x7skhcwzblb60x2magi6ckyah2pw0r99qipdkj7mz6cs5yspyy"; + rev = "547b38eb42176194b326fdaa871685ec11d84c1d"; + sha256 = "01ppa31ksfgwgx68xbm672xrzc7cihhvdjff1f31bb7cwy36q3v3"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.hydraPlatforms = [ ]; @@ -3093,12 +3093,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "9d49b758de4a3f2c4c2e8a0561e6d126e47dad85"; - sha256 = "1nf3kszrllm480h2dp9rk3znanb56rf1ad07z12h69n20hf16qhb"; + rev = "50ea30ec76e1a2695164991a7480f0fa0662e9db"; + sha256 = "13dsgrwk6m9l35idcd5j6q0si6451yy66psr4wi97dzhw8lvfc41"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.hydraPlatforms = [ ]; @@ -3418,12 +3418,12 @@ final: prev: { conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-10-08"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed"; - sha256 = "0x1hi9na2d64r9vv6wm2azkdmhbvc5qpvwsp6akj21cvlvcnld7c"; + rev = "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081"; + sha256 = "1igspxqkqqv9f1fqh0sf6dlap1p8an8jl167a93v33c8ig2h6if9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -3432,12 +3432,12 @@ final: prev: { conjure = buildVimPlugin { pname = "conjure"; - version = "2025-10-17"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "4e0601be2ecd0f59e294b3f3d53c19b9f9285645"; - sha256 = "0244sbs4laqkw9d5pqgjsszlrxw1zybyffi3kkdm1cbva52x0qhz"; + rev = "c5da84f291ec7d9f9f6e449c8aeb28b4c2d01562"; + sha256 = "0cchd39g2hym8kmnrxqka84aj8cvhpv5x5syfysnirrkww8s6d9z"; }; meta.homepage = "https://github.com/Olical/conjure/"; meta.hydraPlatforms = [ ]; @@ -3510,12 +3510,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2025-10-17"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "3123983d00ae6859f8bc987d14ebb524bb41b618"; - sha256 = "0z9b7y7bda4vzxrv2z5rnvm17myv2fb59wz0b29dnhs130ackkic"; + rev = "93adf9844dcbe09a37e7a72eaa286d33d38bf628"; + sha256 = "1b741nmj241ixqc3rik0w1d8mdgqy1q73vr8pblqcz5937dr8j1a"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.hydraPlatforms = [ ]; @@ -3575,12 +3575,12 @@ final: prev: { coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2025-01-18"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "6ee3c221c308dca7071387267ac76c9272b184a9"; - sha256 = "1ckk38c9szyhdg3kn09hs3xpgnvywwq7fmyzkp2vsjcz87n7180r"; + rev = "2bd969a2bcd2624f9c260b1000957c7e665e308e"; + sha256 = "08k5dd2w0ix47gfdbhqrmdy27dgabvlfx7aysnkp55kl3c00rv4p"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; meta.hydraPlatforms = [ ]; @@ -3614,12 +3614,12 @@ final: prev: { cornelis = buildVimPlugin { pname = "cornelis"; - version = "2025-07-30"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "agda"; repo = "cornelis"; - rev = "37641138d8c65a00d417a0f3b9d041b6b5c1a9dc"; - sha256 = "0kaadvmg86j2094q39f53kq5sdwdy22z6h5pd9b4l3hnz7k85gkq"; + rev = "d18cb7c13c73f429a80536dc4c4f96eed2ffb51b"; + sha256 = "1lz3jzdzklhjx50z38vwz8ihhy38vwcxazvm1rx50z3adpwiw5mh"; }; meta.homepage = "https://github.com/agda/cornelis/"; meta.hydraPlatforms = [ ]; @@ -3796,12 +3796,12 @@ final: prev: { cutlass-nvim = buildVimPlugin { pname = "cutlass.nvim"; - version = "2023-12-18"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "gbprod"; repo = "cutlass.nvim"; - rev = "1ac7e4b53d79410be52a9e464d44c60556282b3e"; - sha256 = "0p00xjn6da7hj10vwnighsf1y0zmndfx9d2nb95whnq6awkbyr6f"; + rev = "d01b5c1943050fcda8edf5c89d4419c41a65890e"; + sha256 = "09hivhxpynvw1n8f2b2fzz7jq11vrm6dvyhj9qksikrgnabsiyh9"; }; meta.homepage = "https://github.com/gbprod/cutlass.nvim/"; meta.hydraPlatforms = [ ]; @@ -4186,12 +4186,12 @@ final: prev: { denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2025-08-24"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "a278b8342459e4687f24d4d575d72ff593326cee"; - sha256 = "1k1zcqf88z6yxxwvs0mjcharmykqis57jh505s37xaff2zvmb114"; + rev = "5cfca39988a36e42d81b925264fc846077a727e3"; + sha256 = "1mwan663n7hhfg7hzlw0fmvbpspsfm0q3f3dbni0mf3sg1kh4070"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; meta.hydraPlatforms = [ ]; @@ -4708,12 +4708,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-10-19"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "4c4e222929c07f9f92aca04a3555d5cf5b58971f"; - sha256 = "0h503rlqz2fgbmwqpf6aggc411sn6avc327wxwca3mynnzp1gfg4"; + rev = "97cf26a039a10f53bb5474ba7bf32fbc67eac592"; + sha256 = "1w9c595nhrdk5pxd510r0wrjzvnh68jj3i1r78v362llwm44j37q"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.hydraPlatforms = [ ]; @@ -4734,12 +4734,12 @@ final: prev: { ecolog-nvim = buildVimPlugin { pname = "ecolog.nvim"; - version = "2025-10-07"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "ph1losof"; repo = "ecolog.nvim"; - rev = "95ee6e265edbf682d6b2f35e857156009dec1861"; - sha256 = "07d36ailqv4wgk7ljszxgnzgj9rwdsidmxca52i7mfk3aaha2jxx"; + rev = "e4b2644a02d0b1c97a548ed93df6db13df90781f"; + sha256 = "07a1d8gzd8bwzsadzy0lnb78w61qbicz2dndj1fhlnkdlyzhmsz5"; }; meta.homepage = "https://github.com/ph1losof/ecolog.nvim/"; meta.hydraPlatforms = [ ]; @@ -4773,12 +4773,12 @@ final: prev: { edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "541705c0e2d67c8925d1c072ac11d30a644ca6a7"; - sha256 = "16hrqbbqlm070yj9a5swkc9k2qqb1n0v4gh6hnlgq6hn4igpmcp8"; + rev = "8bfd2808994a988c975694122f68624b8a219f5f"; + sha256 = "0hwingrqjxvvb2wpq5s6z08idqzi766svghbqd9zavpqjhzb2wfh"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; meta.hydraPlatforms = [ ]; @@ -4944,12 +4944,12 @@ final: prev: { everforest = buildVimPlugin { pname = "everforest"; - version = "2025-09-22"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "3fffb096f6ac11372944ac964c60f8af41d8809f"; - sha256 = "0fwcdbbr9plmgzrahdswvh9rd5di17bxsgxf5zpk2fsdhz58pg6b"; + rev = "0909c23a2b8cbc337cffe91fda36381747e88506"; + sha256 = "1m0mhqqmcicpyfmxzp57c7b7pcfm8vxy8iymsfq629xkdf2lqbqj"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; meta.hydraPlatforms = [ ]; @@ -5179,12 +5179,12 @@ final: prev: { flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "2febce67ff9cf7638d2569d17c41af02c38401eb"; - sha256 = "0j4wahallpj7xmq821mcvirdivf4qywdgd03m0i98gbgidp8lzfh"; + rev = "fcea7ff883235d9024dc41e638f164a450c14ca2"; + sha256 = "1xm26117d95qcnx2hpi8g469awmsr8wwdg1bmvipgjkzjys78y54"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; meta.hydraPlatforms = [ ]; @@ -5349,12 +5349,12 @@ final: prev: { fortune-nvim = buildVimPlugin { pname = "fortune.nvim"; - version = "2025-08-27"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "rubiin"; repo = "fortune.nvim"; - rev = "c5ad74c2eec74c6938ce813241ca1061ab1392eb"; - sha256 = "0vhwczrgczikc16vl0w66zyg3wz9j1m85cln9qh9y0hsxdd5ipbh"; + rev = "4df0e988dc3b9badcad98f4a9cbd340324d61269"; + sha256 = "0capain2pz50aqkrzhkhl74mx3j7ywak2i91mhcnzghfqx61csj1"; }; meta.homepage = "https://github.com/rubiin/fortune.nvim/"; meta.hydraPlatforms = [ ]; @@ -5804,12 +5804,12 @@ final: prev: { go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-10-02"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "db20146ef63322949af69b0955f80ee7d98145bd"; - sha256 = "06przzv69hzc600vawnjakmql3fn99m6jz0531n1y5hpbrik3k5s"; + rev = "eb92453bc049c156290ed402f90f74090aa86363"; + sha256 = "194xwv39i0ml4400pc7j5wy613vfa33jfgaz6633wqd2xy4jf6ih"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; meta.hydraPlatforms = [ ]; @@ -5921,12 +5921,12 @@ final: prev: { gruber-darker-nvim = buildVimPlugin { pname = "gruber-darker.nvim"; - version = "2025-10-16"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "blazkowolf"; repo = "gruber-darker.nvim"; - rev = "59643c57ae868a60968cca75bac5ec2de7695dc2"; - sha256 = "0vcj7idxkadqw8d12fcccxs3l3cb5vxlh0n1hm0kz6dqvbp78i5c"; + rev = "98a2e141981cbd5a194a97eae024bf55af854579"; + sha256 = "0bxv33isymnbdzf71w79pfxkwi8ylhjiq3ir9ws2as1d73nnl6lv"; }; meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; meta.hydraPlatforms = [ ]; @@ -6025,12 +6025,12 @@ final: prev: { guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2025-08-24"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "2fbf8449609ce522c36050e4e27235575c2d5439"; - sha256 = "01xbpd4nm4c1gcxg5yqyk7g4d1fbdzkyc1x1m6ba7laq7cf15zql"; + rev = "6bd5ad7941fc4c182f29c29a743eabc31fdac2e8"; + sha256 = "1m20rdxaxgdq8sp8d2mxsjj2snxwzjg06c7l5ixj9rcapy7a0npq"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; meta.hydraPlatforms = [ ]; @@ -6156,12 +6156,12 @@ final: prev: { haskell-scope-highlighting-nvim = buildVimPlugin { pname = "haskell-scope-highlighting.nvim"; - version = "2024-12-18"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "kiyoon"; repo = "haskell-scope-highlighting.nvim"; - rev = "0b6238e1c5b2a53093e7d99a433ecdd4efff5db1"; - sha256 = "013fa6vdjgw5jl7h9yvi68v8awg2zznrxz5gfgl6i1cv9ry2l900"; + rev = "0ee8d06ef1a900977c9517e4fb2a55e5b5cbb03d"; + sha256 = "0cdrxxp18lbsjjpssl68wp0ydqhpw9jmgxfn1hiqk26h718q4h14"; }; meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/"; meta.hydraPlatforms = [ ]; @@ -6221,12 +6221,12 @@ final: prev: { headhunter-nvim = buildVimPlugin { pname = "headhunter.nvim"; - version = "2025-10-06"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "StackInTheWild"; repo = "headhunter.nvim"; - rev = "45eff1653c27a19c47c8a2dfed4897d4a434408d"; - sha256 = "14p5kcn5drbfsklyvdajfgxyax6d5rpkn8qdnabibsqrw31bkj91"; + rev = "de8b66662e9c5309b133708d30b08a6d180a7cfd"; + sha256 = "0wwwyxcl5q60qvw1zqlp1g3r39gr8flgbyrd9905ixg30rr13z7z"; }; meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/"; meta.hydraPlatforms = [ ]; @@ -6260,12 +6260,12 @@ final: prev: { helm-ls-nvim = buildVimPlugin { pname = "helm-ls.nvim"; - version = "2025-09-11"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "qvalentin"; repo = "helm-ls.nvim"; - rev = "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db"; - sha256 = "01ad96y17yhwjr5a90v152r73j9a1qgx0r0gcaann4hs0328jfwz"; + rev = "142777b0ad47f0b007051b187602fad13f00557f"; + sha256 = "1c8lmq8gqv0zpw8a4bbbb3jpwk481a16hanav4yw88jnlvq3bm14"; }; meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/"; meta.hydraPlatforms = [ ]; @@ -6964,12 +6964,12 @@ final: prev: { jule-nvim = buildVimPlugin { pname = "jule.nvim"; - version = "2025-08-07"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "julelang"; repo = "jule.nvim"; - rev = "64f1cae1a5244d55136be3106b3f4edb30164f29"; - sha256 = "1mb3lniqh4vl3kqivvs88l53cz9jk9ry18560lbizmva3l7q3zrr"; + rev = "6c0b4ffed1c610d76bacaa91fdb09b501df5dada"; + sha256 = "1p68k55mbps2s3f0k5dbw2a6c0f7jfg57kvx3gzdmp0lc1ph10if"; }; meta.homepage = "https://github.com/julelang/jule.nvim/"; meta.hydraPlatforms = [ ]; @@ -7016,12 +7016,12 @@ final: prev: { kanagawa-paper-nvim = buildVimPlugin { pname = "kanagawa-paper.nvim"; - version = "2025-10-17"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "thesimonho"; repo = "kanagawa-paper.nvim"; - rev = "3ed25ea76837f6990bb7d9c7eef99001060d5a85"; - sha256 = "19c8286p428k02k4057a61xaqlgfyxfsbn877i389vv3izxh5kf9"; + rev = "f8d7de5293b6cb1ee0fb7833d10e277beae4966a"; + sha256 = "0axbw3ngkdnclj344v0zdrvr8nd08xnwzsqywdpk5pii3khfkscb"; }; meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/"; meta.hydraPlatforms = [ ]; @@ -7146,12 +7146,12 @@ final: prev: { kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-10-19"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "183bf444bfffe957fdb83c5aac53b10cd4dced00"; - sha256 = "1kxk9y1bsq66z7q27fbrr2i3ivvy2kvjcamnzgn3rhjzqjbc5rgb"; + rev = "9a9308b664f71159f1c150e8cfb18541b143a9e9"; + sha256 = "1vjyaav4cv89c5kr35x37fdd0avh2sy3kdvpg7lw226977iy0nvz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; @@ -7225,12 +7225,12 @@ final: prev: { lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2025-10-15"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "d74741ce1a588fe11900b5bcd5cd160b04998f60"; - sha256 = "1sxr9rlimjl0w0kw50jddv6mgnvcc4m28b6l48s8vw0xhcws5276"; + rev = "ccaaed19d7963bdc06000052eade993452b7ad86"; + sha256 = "10f7fkhkisbmw7fp0prd8j5wknyb5gk64lhlgx8l2q53iv7fq5qm"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; meta.hydraPlatforms = [ ]; @@ -7238,12 +7238,12 @@ final: prev: { lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2025-10-09"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1"; - sha256 = "1zyxqdhlqniy0z4nrvisd5fjc75wb6nx4i53621di8k6r3il2541"; + rev = "f0f5bbb9e5bfae5e6468f9359ffea3d151418176"; + sha256 = "08ki2mi4p1wdlkynapx8zrm36m7akvxybxxk7mg69ihdrkcrg6w1"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; meta.hydraPlatforms = [ ]; @@ -7251,12 +7251,12 @@ final: prev: { lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2025-10-08"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9"; - sha256 = "1jzpwh6r2zw27aygacbjgf2fsfvlxkbqwbcvmgcz4c16v53d9721"; + rev = "faf46237f0df43a29e12abd143ff1a0bbac27b7e"; + sha256 = "0xjsxpc4dilprms34yzkh845rd4fnlsirp5434xzi6yjrp1h4lax"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; meta.hydraPlatforms = [ ]; @@ -7303,12 +7303,12 @@ final: prev: { lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-10-18"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "17e1f63a6f2168f0ce5ec89d6480fd448b7854e3"; - sha256 = "1xkdk1dpy8bbwb9c9hc8r0pknkbnwnryv2kmr94hxda36h7g7c9n"; + rev = "4f2d243482fbf578db41c16f5c6b2dc34e0d1206"; + sha256 = "1jfqfsab8rly9rrn1wgg46qpk9m91caxkk0xjvm1hmwmg6qm4lbs"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; meta.hydraPlatforms = [ ]; @@ -7342,12 +7342,12 @@ final: prev: { leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-10-19"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "7068a0576694efb72798696de65155d503bcb0ef"; - sha256 = "0hganix9n2d6hks3i05hj1zgql310lq0wjwvyr3j6v2zbjjk1d5p"; + rev = "44e3a60a7a62069e5c9445b7a8104612d4f060cb"; + sha256 = "0g9r5356p8azann21i2bxx7p6h63k4lnk9vwlip8j9psw9mgmr7s"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; meta.hydraPlatforms = [ ]; @@ -7394,12 +7394,12 @@ final: prev: { lensline-nvim = buildVimPlugin { pname = "lensline.nvim"; - version = "2025-09-27"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "oribarilan"; repo = "lensline.nvim"; - rev = "9ae1e4a4d47533dc5bba301e790dcda44ec62be6"; - sha256 = "0p8cylbpdlh7xvxzk4g4jbq5r3wnxaarv5ka0nb781msqlhqphv8"; + rev = "ee938078aeee9751aafc20b055fcbb8aa579bb76"; + sha256 = "1m7mj353jkfsgj3ad6ciyx7ms00z30byq449vnws06b40wyv79hh"; }; meta.homepage = "https://github.com/oribarilan/lensline.nvim/"; meta.hydraPlatforms = [ ]; @@ -7745,12 +7745,12 @@ final: prev: { llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-10-16"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "59d3e7a5014f5eaffb2b340cfcb399a93c331fa2"; - sha256 = "01f0fkxvf6qqxm4zydk1z20cwyqk2w8dn2z12zwn1vcxrc5x8r4a"; + rev = "ade8966eff57dcbe4a359dd26fb1ea97378ea03c"; + sha256 = "11mkav5qd2ian851hkg65lks3sg4ijy1npnghnkchm4anmj8xymq"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; meta.hydraPlatforms = [ ]; @@ -8149,12 +8149,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2025-10-18"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - rev = "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9"; - sha256 = "1v96mcqnqfydyxl2yb8s88vjqllyqkm190rwrk3pfk40rfrxpp3d"; + rev = "3590d66effccc7376d8c3dbe45e8291f9fed2843"; + sha256 = "018hvw7amg33j6iffaj9yw6csscr1cgxg2i7irzwyd8h3gm2s5k8"; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.hydraPlatforms = [ ]; @@ -8487,12 +8487,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "2025-10-19"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.completion"; - rev = "0cb66df2123bf1c4dc5cf1843817452df427a93c"; - sha256 = "1r8izqix9n1w04wy9p5m1p0vkss9qrh1cwx9mk82afs8vkd7h534"; + rev = "2ab1c8078061a647b0867581a1dcedb046b9ce27"; + sha256 = "0gf5mfp0rafm534snd5np4zyqa3rk6d6izln3bzn9nqr370ba73d"; }; meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.hydraPlatforms = [ ]; @@ -8526,12 +8526,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "2025-10-03"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.diff"; - rev = "a2df2a9a485328c20252b7cadb11feb717020e45"; - sha256 = "1l7k6dg8w9yvr01mdv0j37fr8f0ada9whgjx4ybnwkr1039iz8hp"; + rev = "98fc732d5835eb7b6539f43534399b07b17f4e28"; + sha256 = "04xalxirbxwlxay6i4vqvva661lrw0q4lplgxyinn8nmrabfr996"; }; meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.hydraPlatforms = [ ]; @@ -8565,12 +8565,12 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-10-03"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.files"; - rev = "51db5ded1b7ac4dd8ca4c22c66f156dac5309304"; - sha256 = "025927ixm304qb8by37l4vgw7blafqbg6yasv99mzjq5xx469177"; + rev = "d5c1337441aff47768288e8562eb66ae8b5171a9"; + sha256 = "1fs75zshh1lkynm5wrs6y6g5c5wws8mibz1khvb7hh5v24gap383"; }; meta.homepage = "https://github.com/nvim-mini/mini.files/"; meta.hydraPlatforms = [ ]; @@ -8617,12 +8617,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2025-10-20"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hues"; - rev = "973b8d642cba3a98b97b3361ac165d3f953818cf"; - sha256 = "0gvjj0jcm961kylhaljaa279wmr0240isfh4hhsfqfrzz150jhgg"; + rev = "902810225edbf68a76dbbdc6a03a54a540af380e"; + sha256 = "18nciyjx5qlfj7x2q63ynyz8c9b3g9c7i33apgldc13lia1ysgrf"; }; meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.hydraPlatforms = [ ]; @@ -8747,12 +8747,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-10-20"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "14145d3769eacdb48aa1cfd21f1e244896a85f68"; - sha256 = "1vnfhfjfnw9i1wv8sxj34vrlflkv9klfiin6pdwirzdvp32p5s9k"; + rev = "ee4a4a4abed25e3d108d985b0553c5271f2f71aa"; + sha256 = "1bg5fkramwrx1d247x827rpigpmf83asqwj7ijffrp80djp15lwk"; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.hydraPlatforms = [ ]; @@ -8864,12 +8864,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "2025-10-09"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.surround"; - rev = "444e155147e2b5159dd28a65f9736254c16cb817"; - sha256 = "1b34pvaipvqwsb2kngzv5zvqrdmbr4q9v29qh1rwg80byifi33f4"; + rev = "3c73e2a4d20f46f8bcb610020db2be5fde8319fb"; + sha256 = "1b5anbvi5v7qpfpxk0rmz29lhxjjf18g5kaiy84gkfamwvd2y747"; }; meta.homepage = "https://github.com/nvim-mini/mini.surround/"; meta.hydraPlatforms = [ ]; @@ -8929,12 +8929,12 @@ final: prev: { minuet-ai-nvim = buildVimPlugin { pname = "minuet-ai.nvim"; - version = "2025-10-15"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "milanglacier"; repo = "minuet-ai.nvim"; - rev = "3fb81e155c4c0c86416427cf1e63d608a6303dca"; - sha256 = "0s4jyraw7lix23l35xkqgxfvpxqmkfm65gg7hy6cg5hwpx79767q"; + rev = "5d565cb23e0b365af14f9e9a2a45b2b46e7c4f3e"; + sha256 = "0mb7lqy3h7hnm035lclsh205nv92bg0d2ql06xhi02x10c807mn4"; }; meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/"; meta.hydraPlatforms = [ ]; @@ -8981,12 +8981,12 @@ final: prev: { modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2025-01-09"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "45b64561e109cd04de551b081fb947b4f856009e"; - sha256 = "1p0giz93qaz1y09p6i4lagphi50j8316wjlrfr3h152dv96s1b2s"; + rev = "0bc989b32a7ba3cab06cb79a433557384eb2a0be"; + sha256 = "18qn7h88wlgkf76kqwxsgwlc5hr2n30xxz8wridk41si5iv8lz9x"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; meta.hydraPlatforms = [ ]; @@ -9397,12 +9397,12 @@ final: prev: { neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-10-15"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "20244beec28b9d79ffb75fe1b1606f4dd8d476fc"; - sha256 = "1d234zk5pz1l5ydy0ixg463638yg5dwbci89iramma14sz62g6k3"; + rev = "146408d801da2e9d917ca275f86b788fe612df85"; + sha256 = "0ggyd84qslf6jpzv952g92jls2k7m1xd1h1p6ijs49ia0qd8gynd"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; meta.hydraPlatforms = [ ]; @@ -9423,12 +9423,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-10-17"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "0089570322ddbc953d87e1295d280d487e338574"; - sha256 = "0kwpibkq1khpyxhibs2fmrnnkfxgka6swq46rp16jk1rwxncqwzd"; + rev = "d2400cd4ba2efe9b3dc4e4b2a76f5fd362b7a136"; + sha256 = "03kp8d4kb61jf6b4x1c6badqiv5qdj3l1i4fw4x5yiy8mr945vih"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.hydraPlatforms = [ ]; @@ -9501,12 +9501,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "2025-10-13"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "0f48491ae0046796841aaa97d439267982fe72db"; - sha256 = "1srsjkianc6d3m8kv8haas5wyfw2b8vs2v6dinr2k0k32vqbc5z7"; + rev = "c6d00913f802acedfb93c01267e89185f25800ca"; + sha256 = "03f440mc8d5q7clwjzrw8l3d71vsg8v4a47mf5k8kiacj0qbc5v5"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.hydraPlatforms = [ ]; @@ -9776,12 +9776,12 @@ final: prev: { neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "f8743de8294e1d4c30c746c9ce80866c18253aee"; - sha256 = "0zz9xj0x5wpz61zl63kv0pmvqckj21pk834cw9s70dwr0b8iaffc"; + rev = "525325d904416eeea1be9140263b0991e7f7ec0c"; + sha256 = "0incbyxlnlh5msgyvpr0zzq7gcl7qlh6a0nyqj13kx167pmazh1k"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; meta.hydraPlatforms = [ ]; @@ -9816,12 +9816,12 @@ final: prev: { neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-10-20"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "72bb59f11110e5c26f0435ba4a3b2c5390a644ec"; - sha256 = "141x1801rg5l31zcdwxghzyphpr5ygky0zp3clxmwzr4ifa4zh22"; + rev = "122864eb2ceacf82a6354f3854443f2bcfca54d8"; + sha256 = "18w8dqsvynjccqbgf7vavhdayyhl5p8w4z8rnn9nz5n1xn88bdjq"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; meta.hydraPlatforms = [ ]; @@ -9829,12 +9829,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2025-10-17"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "08ce53f18ad82248ea37e806137f03f5bced3c65"; - sha256 = "02z1l70i79z66qyz1zw1w1kh3sx1045m4mgxfl0xn3j9byk762d5"; + rev = "fbdf5c3208007ccef1a8941e1229fc5f872c760e"; + sha256 = "12v734jk1sybzpl4584bbpb4vkr9fm2dqs1lyhmvnqrwm6mn2mrv"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.hydraPlatforms = [ ]; @@ -9842,12 +9842,12 @@ final: prev: { neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2025-09-24"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "2f657403aabab7d68eaa2cb9181dc4bb7fdd8a08"; - sha256 = "0kvys4bcv1zwybc4qcym18qlz1s0pj8c545nzychwp7m839yzqps"; + rev = "5dc15386a2b04080fd24901eb2450aaf787bd172"; + sha256 = "0fyw2nvljs0d6x98cnsr5bwgxxxmncddp2dlsbqprxfy867qdnzc"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; meta.hydraPlatforms = [ ]; @@ -9868,12 +9868,12 @@ final: prev: { neotest-mocha = buildVimPlugin { pname = "neotest-mocha"; - version = "2025-08-30"; + version = "2025-10-20"; src = fetchFromGitHub { owner = "adrigzr"; repo = "neotest-mocha"; - rev = "342664d54d2177cd0b21742ddf8c447ff278df46"; - sha256 = "1dnsgyh0ybx8sy9ryqklh61h967gq2d44phd1d39ghzjn60zv7al"; + rev = "bf24f5ba9bbb35ba5156b9642bccb80b8cc80eb0"; + sha256 = "03rh4wj0jdsm4zbk80whnrv0k1bb06cjjs29rfv30jd10xg0drh0"; }; meta.homepage = "https://github.com/adrigzr/neotest-mocha/"; meta.hydraPlatforms = [ ]; @@ -10024,12 +10024,12 @@ final: prev: { neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2025-08-20"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "cc78e880cce5dfc1187d144ed7251c746feff259"; - sha256 = "1fdxapbm08g1hqdk31261c2fnfr4vawgb9pg0kxglc8lkyrn2w8b"; + rev = "38caa8b5b969010b1dcae8ab1a569d7669a643d5"; + sha256 = "18a7gj7l6ahhbb1hpsmb9gh21dmcd0fkjzgl4cncq42rjby7ysyq"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; meta.hydraPlatforms = [ ]; @@ -10180,12 +10180,12 @@ final: prev: { nfnl = buildVimPlugin { pname = "nfnl"; - version = "2025-10-18"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "6a7fbe05718dc072851fa2b241dac950b0f2c026"; - sha256 = "1602jns47c5algr6gbxan1jk2db38hnv7kk03nm4q92ira3ncnl8"; + rev = "d439796e6ef940cca8c535559a9d204476e51633"; + sha256 = "0bgxqla1ircwy95wqvil1h021xwrqym79qx1h3nrn8zxmkdk0jrl"; }; meta.homepage = "https://github.com/Olical/nfnl/"; meta.hydraPlatforms = [ ]; @@ -10232,12 +10232,12 @@ final: prev: { nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-10-11"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "7818d2b40d1e35bd351d673c0ffef4f4bb9230c6"; - sha256 = "1mp7qqd6qfhw68pyr8xmx6bk3wjx7z3577jarqhgmya1nxmq2ndy"; + rev = "2a92a9291a461d99c01b4cdcc8fa41ec17a2209d"; + sha256 = "0p3wqwna2bv4c76iwgydcqrm39p1qm5zpgbyfsp0w9ycz9xhg78m"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; meta.hydraPlatforms = [ ]; @@ -10297,12 +10297,12 @@ final: prev: { nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-10-20"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "a6230cb4464fd94c6dcf98b84b678d1106296c2b"; - sha256 = "15wz4nf62j6a68nv1cchy0pi5kibw12d47hlx83ajdpmmd7n4x2b"; + rev = "3e9ea1b897bb4419477bada535a7108bea76cf9c"; + sha256 = "1phz299jhq63wczr793j8f5jzc1p0ka5g4faxba951fwcks5ivmc"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; meta.hydraPlatforms = [ ]; @@ -10362,12 +10362,12 @@ final: prev: { noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2025-10-18"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "db248375c12c5322fbb9b505c1dc6f08e4527684"; - sha256 = "1hsvqwq4g73i1ivcj50vbp16kn4mixsdrq89zcy9wzr3sm5qd4gb"; + rev = "5099348591f7d3ba9e547b1e631c694c65bbe0b9"; + sha256 = "12c28is03zyz8ba3qa33mmf9g0r6nb7iavxfqidbd2l0bmyqg79x"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; meta.hydraPlatforms = [ ]; @@ -10492,12 +10492,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-09-27"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "03b9718140375e7f3f5e4f3e04bc2b6c907440ec"; - sha256 = "1fh33a0bc6iwc45bfa9hbbvfp170n9j98iba3plfffn4yj4i2rwb"; + rev = "bea2af0a76c1098fac0988ad296aa028cad2a333"; + sha256 = "0fv4qx354mndv6mx6s0qnglm5qgm774x6cmcgawm045bcfp29crd"; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.hydraPlatforms = [ ]; @@ -10830,12 +10830,12 @@ final: prev: { nvim-dap-view = buildVimPlugin { pname = "nvim-dap-view"; - version = "2025-10-19"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "igorlfs"; repo = "nvim-dap-view"; - rev = "0746f356b6de4acb588ddc0ef91f0f734306cfe8"; - sha256 = "07j2354qsvpf6j0j2d7xxlsr8xhr6j10b38hm9sjqk75dnix8czp"; + rev = "8f50aca151fb6f539ebc9e0ded9fa05b1f8cb69f"; + sha256 = "00pamp59csgy8m3amwvydqlkbir5lq7z5cv29c11p2n4z2r6pz56"; }; meta.homepage = "https://github.com/igorlfs/nvim-dap-view/"; meta.hydraPlatforms = [ ]; @@ -11194,12 +11194,12 @@ final: prev: { nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2025-10-12"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "5d5f433824f3658fe6446318c432338f9c58c57d"; - sha256 = "1444sp9h4vyyammwzqi3b4mldk4ad4ipbrkv7yl3836czdgh4l04"; + rev = "d26c1fd42060fa9a5d076a78b478b0fc3825974a"; + sha256 = "1cx2jwb4smrf42crhbq94nsa0vy0ms43xwl10kkanc78vz5ap10i"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; meta.hydraPlatforms = [ ]; @@ -11259,12 +11259,12 @@ final: prev: { nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-10-11"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ac98db2f9f06a56498ec890a96928774eae412c3"; - sha256 = "0ncrknyldkaf2i053bkmzd7x58jflsyv6y5fr1wnbq26ynrxf245"; + rev = "e25994a1c2373784364852cd904cb39b6d75f227"; + sha256 = "18s6ngglynajysmvp0975lnbhavd1dckj87g0hyzbydrj73f401m"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; meta.hydraPlatforms = [ ]; @@ -11441,12 +11441,12 @@ final: prev: { nvim-origami = buildVimPlugin { pname = "nvim-origami"; - version = "2025-10-20"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-origami"; - rev = "4134748ba22da25cab9389fb7289e28750f96f5b"; - sha256 = "0mf45w5xsrxi49kr6w678y3ka2k87n565ypz6zral6q1k0ab2z9q"; + rev = "d42d11008a32f5f8c92bca6fd63f6782f197d114"; + sha256 = "06c086h6214c65g83z4ixvg1ifqsv8h56pcw5l9vwqfn413x02kw"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-origami/"; meta.hydraPlatforms = [ ]; @@ -11688,12 +11688,12 @@ final: prev: { nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2025-09-20"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "75de1782c781961e392efcca57601bf436f4d550"; - sha256 = "1ik23ii18ndh4fbv92m24cccwh7l5ms8m601phd99lm2q9pybipf"; + rev = "fcfa7e02323d57bfacc3a141f8a74498e1522064"; + sha256 = "0jnrxsiyid1g63px4rmjs4kbzgjpqw636fffkigvhb813nl0vw0i"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; meta.hydraPlatforms = [ ]; @@ -11740,12 +11740,12 @@ final: prev: { nvim-tinygit = buildVimPlugin { pname = "nvim-tinygit"; - version = "2025-10-13"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-tinygit"; - rev = "7a3e0707095880e6c9a7d32532b2196ede0bb8c9"; - sha256 = "1pd7wiap68lxg2a938l5drx0xnw010vsy06fvyidlvmvrfmp1mif"; + rev = "a2910ba000901071cbcf347d4dd5c4a9c63fd510"; + sha256 = "02sbv5c95c214gafhq3xb747hrf6ssfbkjjn3vlp142g5615bzmd"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/"; meta.hydraPlatforms = [ ]; @@ -11779,12 +11779,12 @@ final: prev: { nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2025-09-10"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "41847d3dafb5004464708a3db06b14f12bde548a"; - sha256 = "0p6pslcr1pqhz7nv66cnk6z5g1siwidzznbxr50zazb6rdpgqa7v"; + rev = "ec308c7827b5f8cb2dd0ad303a059c945dd21969"; + sha256 = "1x2q0y644n7pf6xzfwsayg5cy8kpihln955pggq8445c2avnrmj1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; meta.hydraPlatforms = [ ]; @@ -11857,12 +11857,12 @@ final: prev: { nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2025-10-20"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "a9742cbc1f95db9eaf3293bf8cd0622ca36542bb"; - sha256 = "1lppnjsa0v1nyqc4mh7lh63hdbbn403ili9xf1cbflxsqcjhz2bh"; + rev = "5ca4aaa6efdcc59be46b95a3e876300cfead05ef"; + sha256 = "10qgbb381xr5v18pyvg46mzccqcdzdh575pmss725smx5g0q1zwm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.hydraPlatforms = [ ]; @@ -11948,12 +11948,12 @@ final: prev: { nvim-unity = buildVimPlugin { pname = "nvim-unity"; - version = "2025-08-22"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "apyra"; repo = "nvim-unity"; - rev = "22aa4a977bbe4a9cd2c09617f43744eda76fb315"; - sha256 = "0hxpj6nh6w73mz29p4jpfapfc4nrmsnpcrw2cyggcrblfmm844f8"; + rev = "0305a5f21917ddf40d89a9467d8c153cf5cc82fa"; + sha256 = "13g95p2nqs4wpg3201077rm9bhq1mdg43fx8621qw7svkw9f8gyi"; }; meta.homepage = "https://github.com/apyra/nvim-unity/"; meta.hydraPlatforms = [ ]; @@ -12117,12 +12117,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2025-10-19"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - rev = "ac66c4f1daf612905c24ff2252942226a94d0329"; - sha256 = "044cxl4j7jp81x4dr2rk6q5rl2qva4mb0p7f9wcj6908dy4bnanp"; + rev = "1a1a475846a4cfa3cfedde1c59141d99b6212951"; + sha256 = "1ianli3dqpgwiyfhbfxs866bxsqn4m0c09nd4s3048sj6ay6g6pj"; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.hydraPlatforms = [ ]; @@ -12156,12 +12156,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-10-19"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "a6297cf215405c140c9e8f6a01b8e5d9aca794f2"; - sha256 = "1vrqz49k5ffa93r0xkvdgmp5vbaip4snbnk1k7s7sxwq0gv0g95v"; + rev = "4be7903a962875a47422110d0e9ff3e475db1d27"; + sha256 = "0d4mzs4by6nzd3hr8hw513gpmvs387zzz9vs8amdydf9crplkf9f"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.hydraPlatforms = [ ]; @@ -12377,12 +12377,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "2025-10-20"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "NickvanDyke"; repo = "opencode.nvim"; - rev = "2129d213f9dc8b125bae8eaaa80466cd018d92f2"; - sha256 = "0nrsyk53rr57281jzawk00m571zcddmxlqsm9nr8nmsdzns2ibrg"; + rev = "c7594f8727541ca5ca3b44aa4796b8ffcb0d1bad"; + sha256 = "0kc1bc39gp1d70va97270b1dp2brgnxb9j5g8qdan2mr51dhnzxs"; }; meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/"; meta.hydraPlatforms = [ ]; @@ -12703,12 +12703,12 @@ final: prev: { persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "51eef57272742b773468949f6bd0503ec3f83874"; - sha256 = "1qyf4c4raij7dc6d0z60zv0kn6rhnqvf48kps89q7jjz8rp5kz60"; + rev = "b20b2a7887bd39c1a356980b45e03250f3dce49c"; + sha256 = "1qzf0nbff2pihdh0y2fxsmws6rjssm4b1rv2bzv26dhckq986aq0"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; meta.hydraPlatforms = [ ]; @@ -12977,12 +12977,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - rev = "f38cb046123076a28eefac17978b5b5634be5b7e"; - sha256 = "1h4g126bzrxq10nk69k7fr0a3b4dlf1cdzc0wb4n7qz17fw1cqjm"; + rev = "06b363b62587279dad7ab9365bc24f2f4d5b71ac"; + sha256 = "0hw87j44j3vrx5irb3q3k2008if0ivmzhw0ihnkl8lyplxlan615"; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.hydraPlatforms = [ ]; @@ -13316,12 +13316,12 @@ final: prev: { refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2025-06-26"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "74b608dfee827c2372250519d433cc21cb083407"; - sha256 = "15byk3sjilrdnkg212mf7zbh5s7sdsc0m36lmzm7ccfvg5is9hmc"; + rev = "6784b54587e6d8a6b9ea199318512170ffb9e418"; + sha256 = "1wl2167fly4r3yzpkhl0qlprcn1p4n6p6cg6g1dy3sas8mzzan98"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.hydraPlatforms = [ ]; @@ -13407,12 +13407,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2025-10-17"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "475d3ad8cae486b0df6fc6050cf5b5ea1de42db8"; - sha256 = "0338an5ynjx36v1rql1s6pwmxzv85yvfa7gsa86fxsa76nf82wq5"; + rev = "10126effbafb74541b69219711dfb2c631e7ebf8"; + sha256 = "02la4cclxsaz7fqf805v7kz089vrgpc91fzn1sr9j27cgh3jsn4g"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.hydraPlatforms = [ ]; @@ -13538,12 +13538,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2025-10-07"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "7d8819239c5e2c4a0d8150da1c00fa583f761704"; - sha256 = "1vsswy5g8537kizy1wgnq4sk5hzazg5spc4skrlpmfs6h046pn6g"; + rev = "7ba2dd0a5628c5ad3d8cc5a22e66ece3efc371bc"; + sha256 = "0l7szb2f1f1mdbrbdm5wldh7xkn7mmwjmaphpa2k141kanfikp7q"; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.hydraPlatforms = [ ]; @@ -13603,12 +13603,12 @@ final: prev: { rzls-nvim = buildVimPlugin { pname = "rzls.nvim"; - version = "2025-07-20"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "tris203"; repo = "rzls.nvim"; - rev = "1798c64830547d711b14dc2f3f47da15584d8aab"; - sha256 = "1znmjcf6xd6b5mqggqj14h21gd5csal24h1y96hc168b7jaagyn8"; + rev = "bbfe0f5429cc74ca53815875faf4710c2a54f01b"; + sha256 = "0bgcpqcqx520fyhqzn9xqr1z4bpipw0wp2wbcwcw5y3gjsnc0dkp"; }; meta.homepage = "https://github.com/tris203/rzls.nvim/"; meta.hydraPlatforms = [ ]; @@ -13668,12 +13668,12 @@ final: prev: { schema-companion-nvim = buildVimPlugin { pname = "schema-companion.nvim"; - version = "2025-10-14"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "cenk1cenk2"; repo = "schema-companion.nvim"; - rev = "6317db88c58c3450dca1a63cef5942ce7e80940b"; - sha256 = "1m2pc7jn35q4cjwssj18dbpp78gfdmqmkh6yblzxs4kj4a7f0k0i"; + rev = "9a8cbeb9429958524331f49a4bd9c25cfbc2c208"; + sha256 = "0r8cha1k800c694vbwswmy640f7f1bwrgs6wyiidhbgffpqmq5is"; }; meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/"; meta.hydraPlatforms = [ ]; @@ -13863,12 +13863,12 @@ final: prev: { sidekick-nvim = buildVimPlugin { pname = "sidekick.nvim"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "folke"; repo = "sidekick.nvim"; - rev = "9941a1cf4eb7ca1cb9c155207a4249ff45e6123d"; - sha256 = "0f8zxzfq0q4lipkfc0dwbcsdnjhvmkz2frjw33bgpjf6ny73mcrc"; + rev = "317ada137f2b34cccc872b68f0a29d987cbce438"; + sha256 = "0bh948g2ggm6ic9n4b5m939hfxy8qw23i8mxywcricg673nvf7qr"; }; meta.homepage = "https://github.com/folke/sidekick.nvim/"; meta.hydraPlatforms = [ ]; @@ -13942,12 +13942,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-10-17"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "9a2614505a021d8fcac3278b12e5fe3f14b80441"; - sha256 = "0nsijjbjp0ka7srvqw7yajxsk4hj5zj13h6cbb3mpdd83k5p5bhn"; + rev = "6c7c64b6e1be6eb95fd9583c0969e0df625c6cd6"; + sha256 = "10bphggh0n9x81cc9yi33a2h0bb4vzxjmjkd7aw6l42sfgc1zvvd"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.hydraPlatforms = [ ]; @@ -14007,12 +14007,12 @@ final: prev: { snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2025-10-21"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "d293b21fe1a603dfb4757feb82ab3e67b78589f2"; - sha256 = "1qfjcx1d55b7lqikkhr326gs74h9lq9pdpadpd33wdjrbjgv0a09"; + rev = "0bc7c2631a3bb35a20e0e5938401765bb9516496"; + sha256 = "1avi0za8r7bfvadcsx71wsjchbxd8rparhjnk85s4p73wvindwrg"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; meta.hydraPlatforms = [ ]; @@ -14228,12 +14228,12 @@ final: prev: { splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2025-09-04"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "b55d5ba3e2b2649317925c21a68f90c8f28ec3e9"; - sha256 = "1q49bb0l5c9pdcp64p1hxw5xj5hvc72q8l6shnn75556bsafcx4x"; + rev = "cace6c962b67312fc1265d55337048e80d64ca90"; + sha256 = "1p9lxglifb75lz2b0kgvj7ibd7901b8y4410v55mp0m9914armzy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -14398,12 +14398,12 @@ final: prev: { styler-nvim = buildVimPlugin { pname = "styler.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "styler.nvim"; - rev = "aece087c9d4859bf30a5c1cd0a028593feff4b4a"; - sha256 = "1j7rx2m56rrcb6q0vwvkqngj25flaa1d6h3s3jc9rrn9q2jqkjlk"; + rev = "d73d868541a2536a96d057c793d53c50e5f407bb"; + sha256 = "16b0kwnay6pbhfg0q32ylrr4xqzyfsvv88nxy0vbazsp4hmqfiv8"; }; meta.homepage = "https://github.com/folke/styler.nvim/"; meta.hydraPlatforms = [ ]; @@ -15495,12 +15495,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-10-14"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "1cb11cc658ee24a9826e3b909ca0b0f5e60597c7"; - sha256 = "1bdps1x1ah1c8ahwqmivnkfy2g0m71mscjnymvmhzybx4bgfyg0f"; + rev = "994c13daf8e75011af82edf30fb0fd90c019a898"; + sha256 = "1cz0ggdpahy4rdckdik94dgj4i8zl8dz95y3yvw902qmqw377wwf"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.hydraPlatforms = [ ]; @@ -15573,12 +15573,12 @@ final: prev: { todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "19d461ddd543e938eb22505fb03fa878800270b6"; - sha256 = "1kpzji8al0dsxcilh3jkndxsfgnhm5nclw36hkgly5ksslnpg8s2"; + rev = "411503d3bedeff88484de572f2509c248e499b38"; + sha256 = "1cvijn65ashf7vlcl47b6f56gjkjdkxzag34w4lljg0q5bzyfkjl"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; meta.hydraPlatforms = [ ]; @@ -15613,12 +15613,12 @@ final: prev: { tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2025-10-19"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "e63c42a42b11cd6225f009dd949b9ee0fccc15ef"; - sha256 = "0fc0xwzjszxkn1779jghakc0l01k2d6g13ld10wvjvz84sph0ax8"; + rev = "2642dbb83333e0575d1c3436e1d837926871c5fb"; + sha256 = "0835zvgf1k6xszc4rz5pyb5cz1cyf95vj1q17nx48zz95p4vk0bl"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; meta.hydraPlatforms = [ ]; @@ -15692,12 +15692,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "2025-10-03"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "2f6fc4957bf428764863aa35f57549e9246a3943"; - sha256 = "1d6pswhz8alq4x37fhc0bldibzqmn1w05ipigk7xrbmkn2zb4a9k"; + rev = "5895593a4bccadd0a91988cbd3fe0908508e7451"; + sha256 = "0zwhivajzwf83n76zbpihy69qfpbxqy506m0z6m7cqgxj2yak9l7"; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.hydraPlatforms = [ ]; @@ -15745,12 +15745,12 @@ final: prev: { trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "c098362fe603d3922095e7db595961e020bdf2d0"; - sha256 = "1v4dx3ilmiwvspdwlfl7ia0zml8y0cb9jqlq5yzl6w3068b4m2di"; + rev = "d7494d8bc563f8ae8b3f35d78c7478cf842b0ab9"; + sha256 = "1m5gv12dskjcd8y8dlrz3678dp51f0qdkv0yz10wlnryqm8sk8c2"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; meta.hydraPlatforms = [ ]; @@ -15797,12 +15797,12 @@ final: prev: { ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "217ab9cc137fceb6659b53790bd25e608219abe1"; - sha256 = "1ds48xh1lsyixlhf5a9mjlg8zqs03c1chgsjh063q6a1w4rlg9mb"; + rev = "123a9fb12e7229342f807ec9e6de478b1102b041"; + sha256 = "1819dm9grjz6v6y6b80bxdl24q16hrnk1psnlypsldf0j5gbf4ir"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; meta.hydraPlatforms = [ ]; @@ -15862,12 +15862,12 @@ final: prev: { twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "c2650ddf665df997e4c7f57d7ef0e7352d4678a7"; - sha256 = "0ka59109zp5aikcc20n7s6dnmn64a2dx62pp320q3a8x3l39lq5p"; + rev = "664e752f4a219801265cc3fc18782b457b58c1e1"; + sha256 = "02mriiwfzlxparrjc742vcqcf5kb1qy6ljf4c2k7xgd1yk1cb82p"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; meta.hydraPlatforms = [ ]; @@ -15927,11 +15927,11 @@ final: prev: { typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "2025-10-19"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "e544812bba84b4f7976590f2b6c0dfbd099e1893"; + rev = "64469f832c4d214683c12e0fceba98055cb1ce3b"; sha256 = "13340nd2rvvh3s9nyrg0kp72pxy6dpsh6nbh3zpqd7simlz1ys44"; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; @@ -15940,12 +15940,12 @@ final: prev: { typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2025-04-27"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "323539709e29a537ff39dfce6c05f175a8921504"; - sha256 = "0di84i53g1azxr02jlfm9kzzg0fg1dprxn2llrm9in4wglxf9yix"; + rev = "235e0423ab8b1ec83a29d8b1a45cfbd6c0296382"; + sha256 = "0ydyx24d58zxr4gcsgm6750jyvx7nifb1w1sqwddz93n9a36fmnq"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; meta.hydraPlatforms = [ ]; @@ -15966,12 +15966,12 @@ final: prev: { ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2025-10-20"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "06e94d532bde24b1975d5f2e47a72760efbb4e55"; - sha256 = "0gja5agabzw7kffjh3fp9l7sj12qi2mdkg8n0m83gmhcpgv1zxh5"; + rev = "6a51446c2c8f09a7c207d2dc2aaa5bbbda36e093"; + sha256 = "05m9nz0gzk2cwik4ax8bhffgnv8xjvssfi4kimvwc3aghijr5z0h"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; meta.hydraPlatforms = [ ]; @@ -16057,12 +16057,12 @@ final: prev: { unison = buildVimPlugin { pname = "unison"; - version = "2025-10-17"; + version = "2025-10-31"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "be859728cbdbf7138c8536df418a475be4179a3d"; - sha256 = "0d10kabrf8pkzrn7b1p132d9hlxw5crychz77gs20yr4lhgw6jd6"; + rev = "ba185505e1f7d61961c0c23966f692306f31d460"; + sha256 = "0b1xlb2b4n24ykx3p6i3x4kw1lzdgg2bb4l283mf4qqc1zyavv9l"; }; meta.homepage = "https://github.com/unisonweb/unison/"; meta.hydraPlatforms = [ ]; @@ -16083,12 +16083,12 @@ final: prev: { url-open = buildVimPlugin { pname = "url-open"; - version = "2024-02-03"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "sontungexpt"; repo = "url-open"; - rev = "9f8f4a56ac709f26aa17d8ef921b272bf2262a30"; - sha256 = "0caphlqkvz8labx54ap7nasvyx5kgsnp49zw98cvrd43hn60mrsa"; + rev = "dce2a9bc51e4885ea80ca03da5b4d0f719aaf820"; + sha256 = "002560m8yhx87rlalssjlrhs9w0yx1rijim7kq59kr5jk12gcsrm"; }; meta.homepage = "https://github.com/sontungexpt/url-open/"; meta.hydraPlatforms = [ ]; @@ -16161,12 +16161,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2025-10-20"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "vague-theme"; repo = "vague.nvim"; - rev = "ac4ecdaa7c82ec806bfa6bfdf6ca71f44af51dc7"; - sha256 = "1m9qs7xp4wlmz5bhq7zi9y9nm7k9wbpfbd220842ga5ah2iwb1z6"; + rev = "5689afda42d60c8db12ff93dd6e1322f59e46a93"; + sha256 = "10qvvsxa5v3g1891wgjg6ga63a4gjis38vga0fd4gv2va6j0wn8i"; }; meta.homepage = "https://github.com/vague-theme/vague.nvim/"; meta.hydraPlatforms = [ ]; @@ -16187,12 +16187,12 @@ final: prev: { venv-selector-nvim = buildVimPlugin { pname = "venv-selector.nvim"; - version = "2025-10-21"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "linux-cultist"; repo = "venv-selector.nvim"; - rev = "9d528643ab17795c69dc42ce018120c397a36f8b"; - sha256 = "03jag019p5kfwghff0f1w0xk3sfkpza71pprpm7gnwxi49y77pvi"; + rev = "567dcd6cc555caf5163c99ca2ba6a86c661393e5"; + sha256 = "11xxidmjwbpcq6apwzc7bqxdxyb1d596lfvczzh9j5q1y0jjbpig"; }; meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/"; meta.hydraPlatforms = [ ]; @@ -18007,12 +18007,12 @@ final: prev: { vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2025-06-25"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea"; - sha256 = "1blbvnip3z25dp3mn5mzgcz96bbw6dqpa1myiih4bppgilvr77gw"; + rev = "a720490bd9dc02c5492e800aa08d4802f22b01f8"; + sha256 = "0im1nf4pnrldzrycrx12nv5qzas7i01m7iizmq6yqlxpnrqrjw4c"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; meta.hydraPlatforms = [ ]; @@ -18384,12 +18384,12 @@ final: prev: { vim-habamax = buildVimPlugin { pname = "vim-habamax"; - version = "2025-10-14"; + version = "2025-10-22"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-habamax"; - rev = "df3c672b244c5d3a7edeca11beba57a05e0936a8"; - sha256 = "0yrv378qizar8y31yhh8jvig8wrvx31a25wwk3yh7ihk9mwi4k0g"; + rev = "4d4192f17a15905ef2b0eca3c4bb5c93454cc6a8"; + sha256 = "05zmqc505r73l7k28g01fjagzysqbicxlyhchzjqsmj8iwrsdsnn"; }; meta.homepage = "https://github.com/habamax/vim-habamax/"; meta.hydraPlatforms = [ ]; @@ -18997,12 +18997,12 @@ final: prev: { vim-just = buildVimPlugin { pname = "vim-just"; - version = "2025-10-03"; + version = "2025-10-21"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "3deeee5998408ce5a0ff3959a0e6b4bce530c37e"; - sha256 = "0h8xpnn3d45ny7jys8yivcss8qsmv7p704rd25ag4l4nbw7ivv7m"; + rev = "c13e317dda76ea01c2521cbed2a5c552a96951bd"; + sha256 = "0c3ywicf0c4z2r633flz9is73008phzcfs5bp2iv3gk6cr7i51m1"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.hydraPlatforms = [ ]; @@ -19101,12 +19101,12 @@ final: prev: { vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2025-10-14"; + version = "2025-10-25"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "b5bc6ab65d325c53e39fb02d8f0dd42e2de5d72d"; - sha256 = "1s7186sdqslzv8ayqdiskbghfshk2id3axzj813l2krrfav6f4yk"; + rev = "225969f63ddaa6104fd4234d6bc17dd37deea567"; + sha256 = "1fqv9cg769cysblfbgr3kpiz4ggxsr20s07kr671sxz9hz2srfy1"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; meta.hydraPlatforms = [ ]; @@ -19283,12 +19283,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2025-10-18"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "a54b96b92b37d6f585bfa1a49d513c9203cd4a44"; - sha256 = "1bjl3nb2bv94xxil01m5ip83kphyw53wcbiyg01cfyj8h9k1kry6"; + rev = "fadc9609d2ccbf4ad6c70ab963e64176712d89f1"; + sha256 = "07hjjbgdvark1v9vmgm7f6lf8d5bd1y02sg4djpgsvz9bpzga9nn"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.hydraPlatforms = [ ]; @@ -19374,12 +19374,12 @@ final: prev: { vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2024-09-20"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51"; - sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"; + rev = "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397"; + sha256 = "1g7fjnnmwkic6q7d12vb500yn4v21ifjwd6n45iva5xy5d250ibf"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; meta.hydraPlatforms = [ ]; @@ -19543,12 +19543,12 @@ final: prev: { vim-moonfly-colors = buildVimPlugin { pname = "vim-moonfly-colors"; - version = "2025-10-11"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-moonfly-colors"; - rev = "8129169a07cb64fef644f73c3fd27db2e50e818a"; - sha256 = "0fmhi9xih3imgavxrda9znl6wm3h9y94mf8nm4nfxvmd9cc5va8l"; + rev = "ef85b89739bee184e204c89bc06280d62bd84039"; + sha256 = "1jgyn9pg0ikvf92nva8irybnnxgca1bsqvqczgbhicc2b251wvjm"; }; meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/"; meta.hydraPlatforms = [ ]; @@ -20648,12 +20648,12 @@ final: prev: { vim-sexp = buildVimPlugin { pname = "vim-sexp"; - version = "2025-10-19"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "guns"; repo = "vim-sexp"; - rev = "b5be9fa60bde76fcc8d87b2e5f247d70ee867279"; - sha256 = "1400h7m7yc5ri41ni6wfljz9wmp4x7nzv6sk2hj6xdwiydrikajf"; + rev = "d8df22690b146ce07fdaf49940e3214def76a69c"; + sha256 = "19g7jymp3qmh9mx1kpj9yksykm4lhrsdpbvkzpw4sfhhw2mzxk4c"; }; meta.homepage = "https://github.com/guns/vim-sexp/"; meta.hydraPlatforms = [ ]; @@ -20882,12 +20882,12 @@ final: prev: { vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2025-09-04"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "f371d635f6f6350d34bbb483e37e383db322d145"; - sha256 = "1jwqxjf9553hi41ynaw8xgffhz9gbkxkxcnhcbkzr179054kvz8x"; + rev = "ededcf7581962ee616cadab360d5966f3307f11a"; + sha256 = "1l9j1hs4r2pq9n4s5mysyfbrssrbsv3hclfjiwylci6vpb5jrmza"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; meta.hydraPlatforms = [ ]; @@ -20947,12 +20947,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2025-10-11"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "72ab51ebaf2fb09bd8e8f06dbceea360eda1b6e2"; - sha256 = "019dqi5j55appij3hajy58ykim832b2x1k3spxy5fj1lim6664gd"; + rev = "449ad78bdbb5d860a53988e0ca29c6d7912fa070"; + sha256 = "0zwl80y68aki3zky2j2sw785hfw5d4i25vg5a3nlp8s62k2s6ykf"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.hydraPlatforms = [ ]; @@ -21064,12 +21064,12 @@ final: prev: { vim-suda = buildVimPlugin { pname = "vim-suda"; - version = "2024-12-08"; + version = "2025-10-29"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-suda"; - rev = "9adda7d195222d4e2854efb2a88005a120296c47"; - sha256 = "1fg892y34zabvivs0h9afdbsh1vp0s590lfxaq5jaf0xn3g35az3"; + rev = "c492741b4679b3cdd4d9e34138209784e061d916"; + sha256 = "1rddfpvlvb6873id8dpvxkf2d2r67i8zfzsn1k1z1d44v741vjn9"; }; meta.homepage = "https://github.com/lambdalisue/vim-suda/"; meta.hydraPlatforms = [ ]; @@ -21923,12 +21923,12 @@ final: prev: { vimade = buildVimPlugin { pname = "vimade"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "ea27ed8da1f8be245d58d27ea5d89662a43b7e94"; - sha256 = "1j828z0vng9adz1v495bikpy5jgsxshkhjyb5hmw8zzjf5j9360m"; + rev = "27279c2fccc3c490cc6ca31c28bb0f6d84089eb4"; + sha256 = "0dplck7xfaxxgfphk1w9xfys04bsfijpbwxwm2cdkb48ihiva3g1"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; meta.hydraPlatforms = [ ]; @@ -22067,12 +22067,12 @@ final: prev: { vimux = buildVimPlugin { pname = "vimux"; - version = "2025-07-23"; + version = "2025-10-26"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "04f299e53eb81883da0edea6a57018067f3b4938"; - sha256 = "191z46bcgg9ajqbw2g34mvismqfi4gb94k35isp9dn4322lkhgk6"; + rev = "66d53eab51aa7d2c0f55f3ee2e381b923e705e37"; + sha256 = "0kjr181j55f5wy468w6h2nyvvpq13aqf06vm2vsfvnwwzycgmsfq"; }; meta.homepage = "https://github.com/preservim/vimux/"; meta.hydraPlatforms = [ ]; @@ -22171,12 +22171,12 @@ final: prev: { vs-tasks-nvim = buildVimPlugin { pname = "vs-tasks.nvim"; - version = "2025-10-15"; + version = "2025-10-27"; src = fetchFromGitHub { owner = "EthanJWright"; repo = "vs-tasks.nvim"; - rev = "99d8e41c18d188efcc04fcec19caa2c29999bb90"; - sha256 = "0by5767n3jzz3z07a21qyhmvas1wqvig4gz1b3mrhdl9fi1bdr1x"; + rev = "1dafea1a206590644d04a71159cd4f7651b6fb8e"; + sha256 = "1c7kb5hx46f9g87iryjjpbcif1al96dlh0am1k7zzddd5hyjyq1l"; }; meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/"; meta.hydraPlatforms = [ ]; @@ -22249,12 +22249,12 @@ final: prev: { which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "b4177e3eaf15fe5eb8357ebac2286d488be1ed00"; - sha256 = "05g22fvbi7yhjnq16cszryc1aqs68v9mcrwgaa9xz0glj9bpwz9p"; + rev = "3aab2147e74890957785941f0c1ad87d0a44c15a"; + sha256 = "1dwri7gxqgb58pfy829s0ns709m0nrcj1cgz2wj1k09qfffri9mc"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; meta.hydraPlatforms = [ ]; @@ -22301,12 +22301,12 @@ final: prev: { wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2025-09-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "75a491775b498e5eac1de9c440b67942bdeab2a6"; - sha256 = "1l4p93j5zi43n3i480pzx1s2p0w5yibvkihmliq4y3dqq0llw6f0"; + rev = "44b8a6cc97bcb1e647c20874334a28460de71d45"; + sha256 = "0kkjlwqgjvrngmq6vi0ms18yy1naxvvk1lqgzk5vmkpx43a9rda6"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; meta.hydraPlatforms = [ ]; @@ -22483,12 +22483,12 @@ final: prev: { wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2025-09-22"; + version = "2025-10-24"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "62437210d1da5a4343a74ab859b59c8ba0d682a2"; - sha256 = "0cr28yw7zg568qig3b0fpavrj15f3rx7vxihbkbd29x98f0xlpx3"; + rev = "0c53ebe0d8b74dc6c70632b3703eada3b74708ab"; + sha256 = "18bigy34qijb4q44lw0wq81p3k9ac5w29sm2f8686pdzsblh1q7j"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; meta.hydraPlatforms = [ ]; @@ -22496,12 +22496,12 @@ final: prev: { xeno-nvim = buildVimPlugin { pname = "xeno.nvim"; - version = "2025-08-27"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "kyza0d"; repo = "xeno.nvim"; - rev = "4a1d3946b5c3b9b581e76a84746a06b0977b1fed"; - sha256 = "1lbj321vz1gzgy4wdmzca74hrwzizy2i0645bqix0id4q3zm7lfd"; + rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb"; + sha256 = "13z0lq26g9yhzplsn3nm1prbvcgks1vjpz7q28m1hkkip6b9qcfd"; }; meta.homepage = "https://github.com/kyza0d/xeno.nvim/"; meta.hydraPlatforms = [ ]; @@ -22601,12 +22601,12 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-10-20"; + version = "2025-10-30"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "47e83f06a06ab319fc92168553cbdafbbac3fe84"; - sha256 = "0b05kv4f9xdps711n4pygf5vy937264j5aql31f2jl8g6jm80y7x"; + rev = "f710a9ebfa9aa6fdac9ee1bc636f8f92030c745c"; + sha256 = "0nrj069f2sqkfdh02b0r2hwady6xnz9x064h8mci2mb0008mqkv4"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.hydraPlatforms = [ ]; @@ -22692,12 +22692,12 @@ final: prev: { zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2025-10-08"; + version = "2025-10-28"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "438a59c33763d79e34ceb394e012c3bfd6aa1084"; - sha256 = "07h4a9ncnz2x4z8f46dvc60crylhpglh962axyz8j7kggsda9c2f"; + rev = "8564ce6d29ec7554eb9df578efa882d33b3c23a7"; + sha256 = "0kjiakg4w869j8pxjgzn0h9wi0wv40hzm6mc3igli7nv7ngp44mx"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; meta.hydraPlatforms = [ ]; @@ -22783,12 +22783,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "2025-10-14"; + version = "2025-10-23"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "2b30ba09bc05d52c0c7dcf486e14d43c824b5f7c"; - sha256 = "121rcg763ibjpl1zyzd678n50z9c8z4wps9hywnbwq1bdkxjn5cx"; + rev = "b4f5b0832311aa3b6ba624275d389ce8070f7aa6"; + sha256 = "05qyjmyvgqnr3qm5il4h85xapaf7ya8739sxbrgyx00gzjkrxzcx"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.hydraPlatforms = [ ]; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 4ba366e7b8b6..c2dd5c50f55f 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -242,12 +242,12 @@ }; c3 = buildGrammar { language = "c3"; - version = "0.0.0+rev=057a75d"; + version = "0.0.0+rev=e457069"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "057a75df0c866034d8edce989f701ee2cb0481d8"; - hash = "sha256-MeeyiX9ZozGDbTNbO/Tvs97tQyzic5pu2sIPgXow2ok="; + rev = "e4570693b8064a83cd7826795d5ef29400313d3c"; + hash = "sha256-gzlLKP/BE5sNM8tJ7ObKQNvd36CqWipFWhMkb4XqjjU="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; @@ -518,14 +518,14 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=e42b8de"; + version = "0.0.0+rev=2520c3f"; src = fetchFromGitHub { - owner = "the-mikedavis"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-diff"; - rev = "e42b8def4f75633568f1aecfe01817bf15164928"; - hash = "sha256-1ibGin1e6+geAQNoV/KLCBOoXYcZo7S5+Q2XgsZPIfU="; + rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed"; + hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4="; }; - meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff"; }; disassembly = buildGrammar { language = "disassembly"; @@ -562,12 +562,12 @@ }; dot = buildGrammar { language = "dot"; - version = "0.0.0+rev=71e2c52"; + version = "0.0.0+rev=80327ab"; src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; - rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118"; - hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0="; + rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d"; + hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y="; }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; @@ -1082,12 +1082,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=6efb596"; + version = "0.0.0+rev=2e88687"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c"; - hash = "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis="; + rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a"; + hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -1369,23 +1369,23 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=d626ec0"; + version = "0.0.0+rev=b23e85d"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-hyprlang"; - rev = "d626ec06e4d876fc41200a30b3e6f2b4714c7367"; - hash = "sha256-f8CjiLd2tof+zfr7ze/CxZWtKRqQv8sK9Q21ZxEg6C8="; + rev = "b23e85dded5d150ffee0ac83c01cbeb1520aad2f"; + hash = "sha256-COIl7ngqTzQQBxgmRNCwF8x7OHNGCrUa5G/hPrlXsmw="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang"; }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=3632e92"; + version = "0.0.0+rev=86d434e"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "3632e926ef4ba924b05993683111480af0d5c9e3"; - hash = "sha256-fywOjqJ0yrG/QayyBXdc2iOtaytdc9bqd1leQ8kxR/0="; + rev = "86d434e732f971ecec24571e0dcb6b14c8b19952"; + hash = "sha256-u+2KBpk9ctry5cHlvqarYS8l5ERFlWrs9D09u2C6cvI="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1624,12 +1624,12 @@ }; kitty = buildGrammar { language = "kitty"; - version = "0.0.0+rev=064d1b4"; + version = "0.0.0+rev=2e9b602"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "tree-sitter-kitty"; - rev = "064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5"; - hash = "sha256-DN6SWXZM1HedUtV7mDEEgictaI2V/pQHh5cg906qfO0="; + rev = "2e9b602ca676cac63887cca5a4535106f3475c82"; + hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0="; }; meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty"; }; @@ -1891,12 +1891,12 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=47c3f2c"; + version = "0.0.0+rev=6543579"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402"; - hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U="; + rev = "65435795eb4132d5eff66d62347050e863e5ebe5"; + hash = "sha256-s7oNzU7rTjejwgW9F28GayuxEe/Gn51+yQi7iPqgFfw="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -2692,14 +2692,13 @@ }; scfg = buildGrammar { language = "scfg"; - version = "0.0.0+rev=2f3709e"; + version = "0.0.0+rev=d850fd4"; src = fetchFromGitHub { owner = "rockorager"; repo = "tree-sitter-scfg"; - rev = "2f3709e7656fa2c443f92041c91a9f843f8cd625"; - hash = "sha256-2/n+pSR6Ojahm8iBnpNsQscrXQqzZflKBA42gX29u50="; + rev = "d850fd470445d73de318a21d734d1e09e29b773c"; + hash = "sha256-AnyOcQFA3N6AFZiG7eLS1xCm1qX6hko9lFV4oV9p/E8="; }; - generate = true; meta.homepage = "https://github.com/rockorager/tree-sitter-scfg"; }; scheme = buildGrammar { diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index da7e0ec094e0..2691a6020e82 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3190,6 +3190,7 @@ assertNoAdditions { "snacks.dashboard" "snacks.debug" "snacks.dim" + "snacks.explorer.init" "snacks.git" "snacks.image.convert" "snacks.image.image" @@ -4090,8 +4091,9 @@ assertNoAdditions { wiki-vim = super.wiki-vim.overrideAttrs { checkInputs = [ - # Optional telescope integration + # Optional picker integration self.telescope-nvim + self.fzf-lua ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index e094742ff39d..7a91185146f2 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.538"; - hash = "sha256-lJ9AnTNN9TkPDh9u2KV1BLn/fgZOWSOXNOTAdV+r6s4="; + version = "2.0.539"; + hash = "sha256-nNlEBm89sVQzLMfQjeE4uBUH/bH/mw8mYF+3/JfB78U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a4bc315f6f86..8c508700e94d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2476,8 +2476,8 @@ let mktplcRef = { publisher = "jeff-hykin"; name = "better-nix-syntax"; - version = "2.2.3"; - hash = "sha256-KhmkCMBWagi0JjZvupgaU7LA6hsGRE6SiHqdJlXyyX8="; + version = "2.3.0"; + hash = "sha256-Zb4RFs2qkSMeQKkNXk4brrZBDiRK4e08taOOgdRWQEk="; }; meta = { description = "Visual Studio Code extension providing Nix Syntax highlighting"; diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix index fe173e376ba5..d549af53f21e 100644 --- a/pkgs/applications/graphics/tesseract/default.nix +++ b/pkgs/applications/graphics/tesseract/default.nix @@ -1,9 +1,10 @@ { + lib, callPackage, - lowPrio, }: let + inherit (lib) lowPrio; base3 = callPackage ./tesseract3.nix { }; base4 = callPackage ./tesseract4.nix { }; base5 = callPackage ./tesseract5.nix { }; diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index 164ec577ac57..e5396ceae468 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-xY5V5Z6HVtkFzLzWOVRTKdms356OO0EKnG+Nymurowo="; + hash = "sha256-vMvCnYSj7y6ETGoudV1YJwI2bibXePSkR4nQ4T5HqTo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix deleted file mode 100644 index 097378626fe3..000000000000 --- a/pkgs/applications/misc/opentrack/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - pkgs, - mkDerivation, - lib, - callPackage, - fetchzip, - fetchFromGitHub, - cmake, - pkg-config, - ninja, - copyDesktopItems, - qtbase, - qttools, - opencv4, - procps, - eigen, - libXdmcp, - libevdev, - makeDesktopItem, - fetchurl, - fetchpatch, - wineWowPackages, - onnxruntime, -}: -let - version = "2023.3.0"; - - aruco = callPackage ./aruco.nix { }; - - # license.txt inside the zip file is MIT - xplaneSdk = fetchzip { - url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip"; - hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo="; - }; -in -mkDerivation { - pname = "opentrack"; - inherit version; - - src = fetchFromGitHub { - owner = "opentrack"; - repo = "opentrack"; - rev = "opentrack-${version}"; - hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4="; - }; - - patches = [ - # https://github.com/opentrack/opentrack/pull/1754 - (fetchpatch { - url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch"; - hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q="; - }) - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ninja - copyDesktopItems - ]; - buildInputs = [ - qtbase - qttools - opencv4 - procps - eigen - libXdmcp - libevdev - aruco - onnxruntime - ] - ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ]; - - env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; - dontWrapQtApps = true; - - cmakeFlags = [ - "-GNinja" - "-DCMAKE_BUILD_TYPE=Release" - "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" - "-DSDK_XPLANE=${xplaneSdk}" - ] - ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ]; - - postInstall = '' - wrapQtApp $out/bin/opentrack - ''; - - desktopItems = [ - (makeDesktopItem rec { - name = "opentrack"; - exec = "opentrack"; - icon = fetchurl { - url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png"; - hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ="; - }; - desktopName = name; - genericName = "Head tracking software"; - categories = [ "Utility" ]; - }) - ]; - - meta = { - homepage = "https://github.com/opentrack/opentrack"; - description = "Head tracking software for MS Windows, Linux, and Apple OSX"; - mainProgram = "opentrack"; - changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ zaninime ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3cbee60d213d..2397935afcba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -741,11 +741,11 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-FVDx8KH7foy1rZigDVEWMEalQ9nJnLkRjkJsFi0aEuM=", + "hash": "sha256-EjCL6RcTw+2uhfwgyiFRfsXYkkDHZqlSSzEcb4CRvIo=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.7.1", + "rev": "v6.7.3", "spdx": "MIT", "vendorHash": null }, @@ -1273,22 +1273,22 @@ "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo=" }, "sysdiglabs_sysdig": { - "hash": "sha256-b30SVfem2G3lBX9J5KGyxow0KK7kksOZLZ9135PyYPY=", + "hash": "sha256-hqcnyBWB7PWTTRCOczgF6hSBibvlGl+x9EkYn3vi4v8=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v3.0.1", + "rev": "v3.1.0", "spdx": "MPL-2.0", "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50=" }, "tailscale_tailscale": { - "hash": "sha256-hkqlstHLHBERVenwyVUew+b26liFQpRh99vIMI0TCBY=", + "hash": "sha256-EiaQKO4Pg+89Mc8nwSarKhHBtr+yEKWEyZ4i0LeOfu4=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.23.0", + "rev": "v0.24.0", "spdx": "MIT", - "vendorHash": "sha256-9VyRFLpwF/+5iidLdzilztAdv/YaujUKoRwIyLgiV6o=" + "vendorHash": "sha256-GhXplzkv0ouWSo4fNs7C0h87sFguhre6ez4d0Pgd/5w=" }, "telmate_proxmox": { "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=", diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9cd3aa0a7c18..886019af54f7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -579,10 +579,16 @@ rec { { name, compressor ? "gz", + meta ? { }, ... }@args: let - stream = streamLayeredImage (removeAttrs args [ "compressor" ]); + stream = streamLayeredImage ( + removeAttrs args [ + "compressor" + "meta" + ] + ); compress = compressorForImage compressor name; in runCommand "${baseNameOf name}.tar${compress.ext}" { @@ -592,6 +598,7 @@ rec { inherit stream; }; nativeBuildInputs = compress.nativeInputs; + inherit meta; } "${stream} | ${compress.compress} > $out" ); @@ -641,6 +648,8 @@ rec { includeNixDB ? false, # Deprecated. contents ? null, + # Meta options to set on the resulting derivation. + meta ? { }, }: let @@ -735,6 +744,7 @@ rec { lib.head ( lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath)) ); + inherit meta; } '' ${lib.optionalString (tag == null) '' @@ -1008,6 +1018,7 @@ rec { includeStorePaths ? true, includeNixDB ? false, passthru ? { }, + meta ? { }, # Pipeline used to produce docker layers. If not set, popularity contest # algorithm is used. If set, maxLayers is ignored as the author of the # pipeline can use one of the available functions (like "limit_layers") @@ -1233,6 +1244,7 @@ rec { isExe = true; }; nativeBuildInputs = [ makeWrapper ]; + inherit meta; } '' makeWrapper $streamScript $out --add-flags $conf diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index b904f188a4af..3293821f1dd5 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -77,6 +77,8 @@ let "${nginxPort}/tcp" = { }; }; }; + + meta.description = "Basic nginx docker image example"; }; in @@ -91,6 +93,8 @@ rec { paths = [ pkgs.bashInteractive ]; pathsToLink = [ "/bin" ]; }; + + meta.description = "Basic example image"; }; # 2. service example, layered on another image @@ -138,6 +142,8 @@ rec { Retries = 3; }; }; + + meta.description = "Service example, layered on another image"; }; # 3. another service example @@ -204,6 +210,8 @@ rec { "USER=nobody" ]; }; + + meta.description = "nix example to play with the container nix store"; }; # 7. example of adding something on top of an image pull by our diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix index 138ac8fb10cf..f24b4e44c07f 100644 --- a/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/pkgs/build-support/fetchnextcloudapp/default.nix @@ -39,6 +39,10 @@ applyPatches { ${if longDescription == null then null else "longDescription"} = longDescription; ${if homepage == null then null else "homepage"} = homepage; inherit maintainers teams; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # vendored deps, compiled vue templates, etc + ]; }; }; prePatch = '' diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix index d291c57429c1..71530bddff37 100644 --- a/pkgs/build-support/fetchpypi/default.nix +++ b/pkgs/build-support/fetchpypi/default.nix @@ -1,7 +1,7 @@ # `fetchPypi` function for fetching artifacts from PyPI. { + lib, fetchurl, - makeOverridable, }: let @@ -46,7 +46,7 @@ let compute (removeAttrs attrs [ "format" ]); in -makeOverridable ( +lib.makeOverridable ( { format ? "setuptools", sha256 ? "", diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix index 47b633da8faf..d686533f69e0 100644 --- a/pkgs/build-support/prefer-remote-fetch/default.nix +++ b/pkgs/build-support/prefer-remote-fetch/default.nix @@ -22,6 +22,12 @@ self: super: { fetchrepoproject = args: super.fetchrepoproject ({ preferLocalBuild = false; } // args); fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args); fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args); - fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args); + fetchurl = + fpArgs: + super.fetchurl ( + super.lib.extends (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) ( + super.lib.toFunction fpArgs + ) + ); mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args); } diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index c1099d396515..cd619c8ef3a4 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2247"; + version = "2.0.2250"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-IK94a6XOTOqyUnMPfjV3GzKUpf0WpPwINbhxzbTvAKA="; + hash = "sha256-Txh+ijQwl2x2FBQp5oWtmGdDRvDnmQoQYc1QShsFEo8="; }; - npmDepsHash = "sha256-sdCRKOtwDEixjCZdg1Tl5CXvfAcFOIWK7Iw17h1caOE="; + npmDepsHash = "sha256-V3Zm1vy333WfarVVUbnpeEKkXW3HBwVDO3JltRLVNSk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix index 98ebf26eb7ca..6622627602a2 100644 --- a/pkgs/by-name/an/anubis/package.nix +++ b/pkgs/by-name/an/anubis/package.nix @@ -15,21 +15,21 @@ buildGoModule (finalAttrs: { pname = "anubis"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "TecharoHQ"; repo = "anubis"; tag = "v${finalAttrs.version}"; - hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0="; + hash = "sha256-uuYPtkhHMP2WafV7iFMwuh8Bm39Mf7ww6H/io54dwCM="; }; - vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU="; + vendorHash = "sha256-0W3nBc4vu3hnQTDB561zmx/2rOYo7D+vo8jvx10cBUc="; npmDeps = fetchNpmDeps { name = "anubis-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs="; + hash = "sha256-KEQYF+LTSw0g3+wF4e8u31ERYsNVHlOjTMdDH6Q2/hI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 48dc20d37d26..26a9b78ba809 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "2.0.7"; + version = "2.0.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HunKXVuDGTdH+CzIQbtkN0oRMocQ7gVh6Mf6L7wlhAY="; + hash = "sha256-St4ZaZOgJhdMWr75V5OJAt/4JgOkvkCMmpYpn2mbxh0="; }; passthru.updateScript = nix-update-script { }; @@ -67,10 +67,10 @@ python3Packages.buildPythonApplication rec { # there is another "sleep", so choose the one with the space after it # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544 substitute sample/systemd/borgmatic.service \ - $out/lib/systemd/system/borgmatic.service \ - --replace /root/.local/bin/borgmatic $out/bin/borgmatic \ - --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \ - --replace "sleep " "${coreutils}/bin/sleep " + $out/lib/systemd/system/borgmatic.service \ + --replace-fail /root/.local/bin/borgmatic $out/bin/borgmatic \ + --replace-fail systemd-inhibit ${systemd}/bin/systemd-inhibit \ + --replace-fail "sleep " "${coreutils}/bin/sleep " ''; passthru.tests = { diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index cb38c191c8a7..2cbbacccb688 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,24 @@ let pname = "brave"; - version = "1.83.120"; + version = "1.84.132"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-DQX+HKNLakI6G7K53SmcmtmA+h7ZmvkcjUgd/k3C/cc="; + hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-E1IKc6ftBO88WVXa0RgjAFhtckBNm/hTQgxzMzK17PY="; + hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-aMyTGhxnExd1kaoHHTZu7UU42/WSOkB9PAyc8M0B/xU="; + hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0="; }; x86_64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-lTxFrmQzWWegmlyBc71fL81iTPqVLB3r8q2gqvrlM3o="; + hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8="; }; }; diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix index 9d7f988d7009..1e6be24d57a3 100644 --- a/pkgs/by-name/ca/cameractrls/package.nix +++ b/pkgs/by-name/ca/cameractrls/package.nix @@ -40,14 +40,14 @@ let in python3Packages.buildPythonApplication rec { pname = "cameractrls"; - version = "0.6.7"; + version = "0.6.8"; pyproject = false; src = fetchFromGitHub { owner = "soyersoyer"; repo = "cameractrls"; rev = "v${version}"; - hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw="; + hash = "sha256-kc5/HbtDZHJHR2loo8Zs555GRW6ynSdBLr3Uowo+OEA="; }; postPatch = '' diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 45dd91b43b7d..a8204ea3f101 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "capnproto-rust"; - version = "0.21.4"; + version = "0.23.2"; src = fetchCrate { crateName = "capnpc"; inherit version; - hash = "sha256-pJF0S6mRxPjpwa367eOUgc7GBeKgUwux1GgUIJE8JuI="; + hash = "sha256-dmLR1jMH90axlylkA3m48FK367c67o4CgIc+M6gKz0o="; }; - cargoHash = "sha256-nPDfBpY7WtNr1St6HAymWBLho5n0UXibqDjVA1vXeNg="; + cargoHash = "sha256-g3/SpeqVtNCu35jj7apAg64/R5R/m1Z2jbKMARph7jo="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 65d1bf40b199..80d267e35b8b 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -37,14 +37,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.488"; + version = "3.2.489"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-j1NcGruoYrZfaeKZZ6iNPg8k2v5L7srrSgaHXmX8eec="; + hash = "sha256-uh6yp3hPRv9+EtJbsN6cnOQeDNzlJNJOHeJeGmKP8rQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 3be9b3d74537..32896d0b6a1b 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.50.0"; + version = "0.53.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-8qNQ92VV0aog3USzeAMqWXws7kaQ//6/A/M85USTTXY="; + hash = "sha256-sDL7gpq73RyyTgi97sxWDq6mhqQiYLyvSN76H8Pp3Uk="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-T6Zt5U2aCJWflwKzTbJXwK+BeE7L6IP4WAmISitrpRg="; + cargoHash = "sha256-EXDvcCY1l2C/IVJLQtou11Lmcsrn8SBGCo8DexEjpbg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 70e6e4ab0cf3..8f1970e33872 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.388.0"; + version = "1.389.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-qFFLDy1/4w5Qlp3wcWlISoBMYVNHCsVLW27JBuoCcMk="; + hash = "sha256-QX3gSKV/FABXbeu1KzrSEyxFJU/xptSVvuxqTjTI9Go="; stripRoot = false; }; diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 0d4ec7a3bd24..61bf85bc841f 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -1,32 +1,24 @@ { lib, - buildGo125Module, + buildGoModule, fetchFromGitHub, nix-update-script, writableTmpDirAsHomeHook, versionCheckHook, }: -buildGo125Module (finalAttrs: { +buildGoModule (finalAttrs: { pname = "crush"; - version = "0.12.1"; + version = "0.13.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-uESS76cPJ/sYGbsTpaUKlF8g0y2+LYbF4zd7dAoKWWU="; + hash = "sha256-MKX26HptDwlwWvmP+9FDlFJzly5xKA0mNVsbeHi1zhg="; }; - vendorHash = "sha256-lqoAPp8EW2tW+QjwCuBgxZDbKT3XMvP3qwx/yES1mx4="; - - # rename TestMain to prevent it from running, as it panics in the sandbox. - postPatch = '' - substituteInPlace internal/llm/provider/openai_test.go \ - --replace-fail \ - "func TestMain" \ - "func DisabledTestMain" - ''; + vendorHash = "sha256-OiNmZKg+NN7Aoeao8L72Dvgz0moeaZGQ7KVJdvuWagY="; ldflags = [ "-s" @@ -37,6 +29,7 @@ buildGo125Module (finalAttrs: { let # these tests fail in the sandbox skippedTests = [ + "TestCoderAgent" "TestOpenAIClientStreamChoices" "TestGrepWithIgnoreFiles" "TestSearchImplementations" diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index b82f8e266ab2..bf9e1f77ef5f 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "darkly-qt${qtMajorVersion}"; - version = "0.5.23"; + version = "0.5.24"; src = fetchFromGitHub { owner = "Bali10050"; repo = "Darkly"; tag = "v${finalAttrs.version}"; - hash = "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q="; + hash = "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 44c8fdb3cf59..2742fbc51974 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -5,13 +5,12 @@ curl, runCommandLocal, unzip, - appimage-run, + appimageTools, addDriverRunpath, dbus, libGLU, xorg, buildFHSEnv, - buildFHSEnvChroot, bash, writeText, ocl-icd, @@ -38,7 +37,7 @@ let version = "20.2.2"; nativeBuildInputs = [ - (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; }) + appimageTools.appimage-exec addDriverRunpath copyDesktopItems unzip @@ -148,7 +147,7 @@ let mkdir -p $out test -e ${lib.escapeShellArg appimageName} - appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out + appimage-exec.sh -x $out ${lib.escapeShellArg appimageName} mkdir -p $out/{"Apple Immersive/Calibration",configs,DolbyVision,easyDCP,Extras,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT} runHook postInstall diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index c4ceef8920c7..fecee5b4328b 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.34.1"; + version = "0.34.2"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-9gQjO9u/wONqmJjt5ejztWlFkqsJ8HUyPp3j5OyZEz4="; + hash = "sha256-e3p2+QBoxyJu15fTb/7gH32zE4h8V2iDxbxoNMVqElM="; }; vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE="; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 34c4a78f9bfd..2554001f67c0 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -29,17 +29,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.5.3"; + version = "2.5.6"; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0="; + hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY="; }; - cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY="; + cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg="; patches = [ # Patch out the remote upgrade (deno update) check. @@ -53,10 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ./patches/0002-tests-replace-hardcoded-paths.patch ./patches/0003-tests-linux-no-chown.patch ./patches/0004-tests-darwin-fixes.patch - # some new TS tests don't identify `deno` location from parent actively - # running `deno` instance - # https://github.com/denoland/deno/pull/30914 - ./patches/0005-tests-fix-deno-path.patch ]; postPatch = '' # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857 @@ -182,6 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=watcher" "--skip=node_unit_tests::_fs_watch_test" "--skip=js_unit_tests::fs_events_test" + "--skip=js_unit_tests::utime_test" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959 diff --git a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch b/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch deleted file mode 100644 index aab217408237..000000000000 --- a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001 -From: 06kellyjac -Date: Fri, 3 Oct 2025 14:20:53 +0100 -Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests - -Currently most TS tests use `Deno.execPath()` to identify where `deno` lives -In the event deno is not on the `$PATH` these tests will fail. -If deno is on the `$PATH` you can end up testing the wrong instance of `deno`. ---- - tests/unit/process_test.ts | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts -index 7b82fe5ba782f5..1c26a6f990d1b0 100644 ---- a/tests/unit/process_test.ts -+++ b/tests/unit/process_test.ts -@@ -623,7 +623,7 @@ Deno.test( - - // @ts-ignore `Deno.run()` was soft-removed in Deno 2. - const p = Deno.run({ -- cmd: ["deno", "run", "--watch", tempFile], -+ cmd: [Deno.execPath(), "run", "--watch", tempFile], - stdout: "piped", - stderr: "null", - }); -@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World")); - - // @ts-ignore `Deno.run()` was soft-removed in Deno 2. - const p = Deno.run({ -- cmd: ["deno", "run", "--watch", tempFile], -+ cmd: [Deno.execPath(), "run", "--watch", tempFile], - stdout: "piped", - stderr: "null", - }); diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix index 167f39b29877..064d181d76fe 100644 --- a/pkgs/by-name/el/eliza/package.nix +++ b/pkgs/by-name/el/eliza/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "eliza"; - version = "0-unstable-2025-10-06"; + version = "0-unstable-2025-10-28"; src = fetchFromGitHub { owner = "anthay"; repo = "ELIZA"; - rev = "448707201101635eb4a56911d2d45f5b36e4a3cd"; - hash = "sha256-tCNuF+WbukSL9Sp8mCdjJUMRV4hlbCDsrMdpe8Xi84U="; + rev = "e4c47439232c162ca0d515c5f8e1a714a80fefc0"; + hash = "sha256-xHJLn/nxs8nWwXJE8p8fVhHzeIo1H3gxW5g4/jGCSx8="; }; doCheck = true; diff --git a/pkgs/by-name/el/elkhound/package.nix b/pkgs/by-name/el/elkhound/package.nix index 8f8daf2823ad..dc170614dccf 100644 --- a/pkgs/by-name/el/elkhound/package.nix +++ b/pkgs/by-name/el/elkhound/package.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs scripts + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" ''; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix index 9b971204ff7a..679e230e52cf 100644 --- a/pkgs/by-name/en/ente-desktop/package.nix +++ b/pkgs/by-name/en/ente-desktop/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchYarnDeps, nodejs, - electron_37, + electron_38, yarnConfigHook, copyDesktopItems, vips, @@ -15,12 +15,12 @@ imagemagick, }: let - electron = electron_37; + electron = electron_38; in stdenv.mkDerivation (finalAttrs: { pname = "ente-desktop"; - version = "1.7.14"; + version = "1.7.15"; src = fetchFromGitHub { owner = "ente-io"; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { "web" ]; tag = "photosd-v${finalAttrs.version}"; - hash = "sha256-UtKXg3SZxHo18VKuVP7W40SfZfa9ni+QJ7+GvGWptSA="; + hash = "sha256-QnJp+oHkRsb/uMobA33Hgo2VOzfDFDtJ6vchCAzyb+c="; }; sourceRoot = "${finalAttrs.src.name}/desktop"; @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { name = "ente-desktop-${finalAttrs.version}-offline-cache"; inherit (finalAttrs) src sourceRoot; - hash = "sha256-6o5TaqlgEQWZjde5cthiSVLVy5JiCHXApn7uXBWmTo0="; + hash = "sha256-dnjTH68lNqSD/RIiaYdip0U8a2RXCNanqF05WnhzjEA="; }; webOfflineCache = fetchYarnDeps { name = "ente-desktop-${finalAttrs.version}-web-offline-cache"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/web"; - hash = "sha256-gwOeznAp4nGu4spilkFl8Dbmdye3Wg8VnBLroSdUjUo="; + hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68="; }; nativeBuildInputs = [ @@ -145,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { iedame ]; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 36496b0a25e0..2b47cbd3b9d9 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2025-09-18"; + version = "2025-10-30"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-+5zXe+64tZD7zjZKXrAuv5ggBRb1ecKzKZSY2Knzklg="; + hash = "sha256-3e1NRjuLNgxKTEPTAhNp1rJNJ7ZQGnPZOXCCpuAYvLM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fa/fakehttp/package.nix b/pkgs/by-name/fa/fakehttp/package.nix new file mode 100644 index 000000000000..33629b69fe78 --- /dev/null +++ b/pkgs/by-name/fa/fakehttp/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libnetfilter_queue, + libnfnetlink, + libmnl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fakehttp"; + version = "0.9.18"; + + src = fetchFromGitHub { + owner = "MikeWang000000"; + repo = "FakeHTTP"; + tag = finalAttrs.version; + hash = "sha256-XjWveBsRJq5iNpk3e9lmVKMoB3q5tr4OiNY+kYEqtEE="; + }; + + buildInputs = [ + libnetfilter_queue + libnfnetlink + libmnl + ]; + + makeFlags = [ + "CROSS_PREFIX=${stdenv.cc.targetPrefix}" + "VERSION=${finalAttrs.version}" + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Obfuscate all your TCP connections into HTTP protocol"; + homepage = "https://github.com/MikeWang000000/FakeHTTP"; + changelog = "https://github.com/MikeWang000000/FakeHTTP/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "fakehttp"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index dba8c1a69e88..750be8e31532 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -7,6 +7,7 @@ makeWrapper, openjdk, libGL, + alsa-lib, makeDesktopItem, copyDesktopItems, imagemagick, @@ -106,7 +107,12 @@ maven.buildMavenPackage { chmod 555 $out/share/forge/$commandToInstall.sh PREFIX_CMD="" if [ "$commandToInstall" = "forge-adventure" ]; then - PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}" + PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + alsa-lib + ] + }" fi makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \ diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 37ece7f0cf99..3634b94d7875 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -9,44 +9,54 @@ compressDrvWeb, gitea, gzip, + nodejs, openssh, + pnpm, + stdenv, sqliteSupport ? true, nixosTests, - buildNpmPackage, }: let - frontend = buildNpmPackage { + frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; inherit (gitea) src version; - npmDepsHash = "sha256-86SIiBamHdilEWbwBk6usVU/tzdYTT3Zvph3w/ZVjTs="; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 2; + hash = "sha256-0p7P68BvO3hv0utUbnPpHSpGLlV7F9HHmOITvJAb/ww="; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; - # use webpack directly instead of 'make frontend' as the packages are already installed buildPhase = '' - BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack + make frontend ''; installPhase = '' mkdir -p $out cp -R public $out/ ''; - }; + }); in buildGoModule rec { pname = "gitea"; - version = "1.24.7"; + version = "1.25.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; tag = "v${gitea.version}"; - hash = "sha256-0UOzEVy7SqYVnH3dJCzS9/jvRg7F/uqjZgQvUhh7RoE="; + hash = "sha256-uBBL62Q/aigsCo0S0hwNooKljTn+OfcqoJxan6Ac0rM="; }; proxyVendor = true; - vendorHash = "sha256-t9KeK1S16xaPxfg+LYRp6/PuuxeEOgRF4GEvgKusDiI="; + vendorHash = "sha256-HHW7xgXJKnzj6HLKAUXKYIZgOKKbXVSK+YGSKCwBeLU="; outputs = [ "out" diff --git a/pkgs/by-name/gi/gitea/static-root-path.patch b/pkgs/by-name/gi/gitea/static-root-path.patch index 7f70329c6040..db2857cfe5ea 100644 --- a/pkgs/by-name/gi/gitea/static-root-path.patch +++ b/pkgs/by-name/gi/gitea/static-root-path.patch @@ -1,10 +1,10 @@ diff --git a/modules/setting/server.go b/modules/setting/server.go -index 183906268..fa02e8915 100644 +index 38e166e02a..bbe9af4718 100644 --- a/modules/setting/server.go +++ b/modules/setting/server.go -@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) { - OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() +@@ -351,7 +351,7 @@ func loadServerFrom(rootCfg ConfigProvider) { + RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol) + OfflineMode = sec.Key("OFFLINE_MODE").MustBool(true) if len(StaticRootPath) == 0 { - StaticRootPath = AppWorkPath + StaticRootPath = "@data@" diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index a460c4c5de58..b21069e3614f 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -42,5 +42,6 @@ buildGo124Module rec { cyberus ]; platforms = platforms.unix; + mainProgram = "registry"; }; } diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index e9d941a6a651..c298509da46c 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -170,11 +170,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.122"; + version = "142.0.7444.59"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-svzUxJiw5ldHwl413QV+9Egixes8D7tEmqFU+k94mlA="; + hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -272,11 +272,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "141.0.7390.123"; + version = "142.0.7444.60"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/adavkzngpjaayzmntr45fwn25nyq_141.0.7390.123/GoogleChrome-141.0.7390.123.dmg"; - hash = "sha256-06sXHnSG2x8+OSbgXcPsErgdmjypIlbylrb61Du6j7U="; + url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg"; + hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix index 481ac508b5e4..2d56ace21659 100644 --- a/pkgs/by-name/go/google-java-format/package.nix +++ b/pkgs/by-name/go/google-java-format/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-jUv6Lck4iCASp4nMaEl2ivpK+06wEwjGtx+R8I4sVQg="; + sha256 = "sha256-uO/EpRIkI5Kq7Y+21bqlNz5wUBkPY90FxnuOwlXAF/8="; }; dontUnpack = true; diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 8ce6cfd95c93..4c85ce0e4a52 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -12,14 +12,14 @@ }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "2.4.0"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; tag = "v${version}"; - hash = "sha256-jg29EEwPVTy1n6PYAxNqbyCsmmAxzRWD3vLCvvMd+6E="; + hash = "sha256-W/Za/k/XusZmPLiX4ER9XaQWG4jdkrIh7JualHeeqZM="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix index bb1918b01075..caba2f932eb2 100644 --- a/pkgs/by-name/ha/hath-rust/package.nix +++ b/pkgs/by-name/ha/hath-rust/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hath-rust"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "james58899"; repo = "hath-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-3fi18oarPXe9vUhn4MkyLWA4I2d6PtcbW+rpEYsq8/o="; + hash = "sha256-shixrhIl4bbZQrJea2Dx4bbeGXOaPvMKUHgHq+JfAWs="; }; - cargoHash = "sha256-/n4GwqK2i2YwH1q7U29PZh9JzDTuEbP3YRJktsknQeM="; + cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix index d2546ae30c22..641245ea7fb6 100644 --- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix +++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix @@ -12,23 +12,23 @@ buildNpmPackage (finalAttrs: { pname = "homebridge-config-ui-x"; - version = "5.6.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge-config-ui-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-RsUrJ6WR78yN+thKbrN53S32XNZ8N4pSDAzzhGso01A="; + hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4="; }; # Deps hash for the root package - npmDepsHash = "sha256-YFWbzhjUVMa9Do5TEVQPvXwwY9ap4j8kdbGVM2wCt4c="; + npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ="; # Deps src and hash for ui subdirectory npmDeps_ui = fetchNpmDeps { name = "npm-deps-ui"; src = "${finalAttrs.src}/ui"; - hash = "sha256-Y4rB1GzsFX9Uw+UeiYJPcD5+u2kpmZw0tWhsmzaWo04="; + hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q="; }; # Need to also run npm ci in the ui subdirectory diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 65f7df642424..8ec22f84aef2 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -9,7 +9,7 @@ cmake, ninja, pkg-config, - curl, + curlFull, # Websocket support libavif, angle, # libEGL libjxl, @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - curl + curlFull fast-float ffmpeg fontconfig diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix index 1ac2e6a8bcb2..79c0ebddfd0f 100644 --- a/pkgs/by-name/la/lammps-mpi/package.nix +++ b/pkgs/by-name/la/lammps-mpi/package.nix @@ -1,10 +1,10 @@ { + lib, lammps, mpi, - lowPrio, }: -lowPrio ( +lib.lowPrio ( lammps.override { extraBuildInputs = [ mpi diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/by-name/le/legendary-gl/package.nix similarity index 58% rename from pkgs/games/legendary-gl/default.nix rename to pkgs/by-name/le/legendary-gl/package.nix index 30b58df3f040..cf0c0dc8bb79 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/by-name/le/legendary-gl/package.nix @@ -2,43 +2,44 @@ lib, gitUpdater, fetchFromGitHub, - buildPythonApplication, - pythonOlder, - requests, - filelock, + python3Packages, }: -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "legendary-gl"; # Name in pypi version = "0.20.34"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6"; - sha256 = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ="; + hash = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ requests filelock ]; - disabled = pythonOlder "3.8"; + disabled = python3Packages.pythonOlder "3.8"; # no tests doCheck = false; pythonImportsCheck = [ "legendary" ]; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { description = "Free and open-source Epic Games Launcher alternative"; homepage = "https://github.com/derrod/legendary"; - license = licenses.gpl3; - maintainers = with maintainers; [ equirosa ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ equirosa ]; mainProgram = "legendary"; }; - - passthru.updateScript = gitUpdater { }; } diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 656354f80d7e..4d294e14732f 100644 --- a/pkgs/by-name/li/libretro-shaders-slang/package.nix +++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "libretro-shaders-slang"; - version = "0-unstable-2025-10-27"; + version = "0-unstable-2025-10-30"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "1e632419233373cc72c104467ca6f7b8229c7594"; - hash = "sha256-PrSZUi2II6ppks5U4c9VTG8C72fp5ZGuI0/dqAKd9IY="; + rev = "bb15fc268529cad6132f288f90e87c07c37212e3"; + hash = "sha256-EVthZs6zrqJYWpTPae8ZNxY9J69YauVxr45MQ0OXQc4="; }; dontConfigure = true; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 5176cb4f8354..52eebe83fa9f 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -8,7 +8,7 @@ nix-update-script, }: let - version = "0.4.2"; + version = "0.5.0"; in rustPlatform.buildRustPackage { pname = "lla"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "chaqchase"; repo = "lla"; tag = "v${version}"; - hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros="; + hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { installShellFiles ]; - cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA="; + cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8="; cargoBuildFlags = [ "--workspace" ]; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 39690af2f820..baa307d9ca99 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "loksh"; - version = "7.7"; + version = "7.8"; src = fetchFromGitHub { owner = "dimkr"; repo = "loksh"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc="; + hash = "sha256-daodwoq2NoJ343CWjtT6qqBirEIuHBWLQO9MkAN4s/Q="; }; outputs = [ diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix index 960f27cef605..052c7e694266 100644 --- a/pkgs/by-name/m1/m1n1/package.nix +++ b/pkgs/by-name/m1/m1n1/package.nix @@ -7,8 +7,30 @@ python3Packages, nix-update-script, nixos-icons, + buildPackages, customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png", + withChainloading ? false, }: + +let + stdenvOpts = { + targetPlatform.system = "aarch64-none-elf"; + targetPlatform.rust.rustcTarget = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat"; + targetPlatform.rust.rustcTargetSpec = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat"; + }; + rust = buildPackages.rust.override { + stdenv = lib.recursiveUpdate buildPackages.stdenv stdenvOpts; + }; + rustPackages = rust.packages.stable.overrideScope ( + f: p: { + rustc-unwrapped = p.rustc-unwrapped.override { + stdenv = lib.recursiveUpdate p.rustc-unwrapped.stdenv stdenvOpts; + }; + } + ); + rustPlatform = buildPackages.makeRustPlatform rustPackages; + +in stdenv.mkDerivation (finalAttrs: { pname = "m1n1"; version = "1.5.2"; @@ -17,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "AsahiLinux"; repo = "m1n1"; tag = "v${finalAttrs.version}"; - hash = "sha256-/TQpR/3OUM4OIrfv6cBgZigyLR0VKw6Rd1v9465wy3o="; + hash = "sha256-rxop5r+EVXnp1OVkGT6MUwcl6yNTJxJSJuruZiaou7g="; + fetchSubmodules = true; }; + cargoVendorDir = "."; + postPatch = lib.optionalString (customLogo != null) '' magick ${customLogo} -resize 128x128 data/custom_128.png magick ${customLogo} -resize 256x256 data/custom_256.png @@ -27,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ imagemagick + ] + ++ lib.optionals withChainloading [ + rustPackages.rustc + rustPackages.cargo + rustPlatform.cargoSetupHook ]; postConfigure = '' @@ -40,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "ARCH=${stdenv.cc.targetPrefix}" "RELEASE=1" - (lib.optionalString (customLogo != null) "LOGO=custom") - ]; + ] + ++ lib.optional (customLogo != null) "LOGO=custom" + ++ lib.optional withChainloading "CHAINLOADING=1"; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 2a3c004b978f..3eb5260d0b42 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "2.0.6"; + version = "2.0.8"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-v7AzQzYmhvqBdAK5wXd0tIe18y/BVeJP3Jp1eqfBmcE="; + hash = "sha256-VBXpbEdGWY5v9E0GT+2Q9hko8lZoVmE1T7FzrQL/cs4="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/maptool/package.nix b/pkgs/by-name/ma/maptool/package.nix index e1f71c3abf51..4a596f8a7874 100644 --- a/pkgs/by-name/ma/maptool/package.nix +++ b/pkgs/by-name/ma/maptool/package.nix @@ -13,11 +13,11 @@ }: let pname = "maptool"; - version = "1.18.5"; + version = "1.18.6"; repoBase = "https://github.com/RPTools/maptool"; src = fetchurl { url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst"; - hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU="; + hash = "sha256-QSJjXgzjoKIwTvIx6iWCHjleJTAAI7qnbcxZb8sygxY="; }; meta = with lib; { diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 3335cb72067c..4ba829f3b248 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.140.0"; + version = "1.141.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-nk1nOfJQOBgnlIAju+Q8+0Q0wTGaymhSQSdwecTJLUY="; + hash = "sha256-trn5+OOtubOOjlOjJ7WCgeMz2IAsxurHvPQYg/RkEX4="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 82bdb877d1c0..52c5c48ae386 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.168.1", + "version": "3.170.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_x86_64", - "hash": "sha256-guBC7Zuh5xT+d/lcJVwDLZ++tMy97mcLZo31XkkU2HM=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_x86_64", + "hash": "sha256-q5A4KELOl/rbWxrlBk2XjCOq4A/tFySx46FNhDanTsE=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_aarch64", - "hash": "sha256-ScKDz4nc4N0mjdaN2mBIJfXckZJZkQ32OValSl3JbQ8=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_aarch64", + "hash": "sha256-G8xrksOIqJ//kXYY7tdL9GzKFrt4ttPnviRnCUuyvuk=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal", - "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal", + "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal", - "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal", + "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y=" } } } diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix index d2b5528b1c03..2a5dc3e86229 100644 --- a/pkgs/by-name/mk/mkbrr/package.nix +++ b/pkgs/by-name/mk/mkbrr/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "mkbrr"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "autobrr"; repo = "mkbrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-LVSavGep3/mfDoDkj4uJ8WUTkhdeq+VEi2w7qr44DQg="; + hash = "sha256-WeBqMqxxb49tmlWVfL4EUBerNBgUspHZ0Ava1AVqmsY="; }; vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs="; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index bb1aca4119e2..edcb0195cebd 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -8,12 +8,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "models-dev"; - version = "0-unstable-2025-10-28"; + version = "0-unstable-2025-10-30"; src = fetchFromGitHub { owner = "sst"; repo = "models.dev"; - rev = "86138343a8c048caa813c17ac56fda39e92458bf"; - hash = "sha256-VYR9Sp7AKQ6abJg1Dyhr/GyYwGgE9XcuKHLW3an5/wY="; + rev = "b97ee9233088cb71668ee91a679d41b36ffae312"; + hash = "sha256-uN9hCqzELCpOLRtNqp5M/80pHqo2zmdXXfnqVqdIAjY="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index dae3483f249a..1496b01ddbe4 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "14.5.8"; + version = "15.0"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-82Y1QpnvXFKEXQtgUHCGh+2KYytbA+B1YwF0OtfvtSA="; + hash = "sha256-BD5pnPeE3PZHJKNoJE46Gm6i+ksc7wdl9Eq7pWqB84g="; }; }; diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix index d30ec4f40f85..9d7907a58b51 100644 --- a/pkgs/by-name/my/mymake/package.nix +++ b/pkgs/by-name/my/mymake/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mymake"; - version = "2.3.6"; + version = "2.4.1"; src = fetchFromGitHub { owner = "fstromback"; repo = "mymake"; tag = "v${finalAttrs.version}"; - hash = "sha256-UQjvxdOvD9O6TrzBFJwh3CistDGZM9HZbcwVPx1n4+A="; + hash = "sha256-FVY6Ep6619W3fMDRYdU/FdnltNUahkY33aVhz8kXEGU="; }; buildPhase = '' diff --git a/pkgs/by-name/ns/nsplist/package.nix b/pkgs/by-name/ns/nsplist/package.nix index 64cba193ce31..5b3007d3383c 100644 --- a/pkgs/by-name/ns/nsplist/package.nix +++ b/pkgs/by-name/ns/nsplist/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation { flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; description = "Parses .plist files"; diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index a26fdebf39b5..1aa961d3e26c 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2025-10-23"; + version = "2025-10-27"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "99017b8eac3d7d0e5ba01c7bf0cf9c6d38985536"; - sha256 = "sha256-/q9BRzRAzD5iepT2i0y72K4kPAZiJCPbX45boD2V7aU="; + rev = "136298e11073c7b34e5a977595c7ba5345ca910e"; + sha256 = "sha256-4yF9gqC1TJdLAOASp8nP1GTnA2OQVNXrjBlHyyYXDW0="; }; strictDeps = true; diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix index 511a3438fba2..f963e1eea386 100644 --- a/pkgs/by-name/ol/olivetin/package.nix +++ b/pkgs/by-name/ol/olivetin/package.nix @@ -86,13 +86,13 @@ buildGoModule ( { pname = "olivetin"; - version = "2025.10.27"; + version = "2025.10.30"; src = fetchFromGitHub { owner = "OliveTin"; repo = "OliveTin"; tag = finalAttrs.version; - hash = "sha256-iMfdOB2g1bNhkTaxuV9wUbslVmlKs+Ha5LL67IRgZm8="; + hash = "sha256-yzgyv/YLHXCU8h+c53qZQoY9dNOJdF0/EBBZJkN8Urc="; }; modRoot = "service"; diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix index c4a5fdc98f97..eb27d683be48 100644 --- a/pkgs/by-name/op/opcr-policy/package.nix +++ b/pkgs/by-name/op/opcr-policy/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E="; + sha256 = "sha256-T6awF6NXVsglYBBVzGfuIF42imXjqCwxUAI3RPZNmGo="; }; - vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k="; + vendorHash = "sha256-0oZpogeKMQW4SS4e2n5qK6nStYwB/nsHleftvrdXWrw="; ldflags = [ "-s" diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 9392b5ad3bf2..fc1e89340071 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.26.2"; + version = "0.27.0"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${version}"; - hash = "sha256-RSz8UCOJBcF4zRYURRqzJahfkX49hBq7/yiTWE3es3M="; + hash = "sha256-fQm6BlBqCztV3lqXTHwXece80TYJZ1bGoIJwGye3F2I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/by-name/op/opentrack/aruco.nix similarity index 51% rename from pkgs/applications/misc/opentrack/aruco.nix rename to pkgs/by-name/op/opentrack/aruco.nix index 291ff7ad24f9..7fabda370d71 100644 --- a/pkgs/applications/misc/opentrack/aruco.nix +++ b/pkgs/by-name/op/opentrack/aruco.nix @@ -4,38 +4,39 @@ cmake, fetchFromGitHub, opencv4, + opentrack, }: stdenv.mkDerivation { pname = "opentrack-aruco"; - version = "unstable-20190303"; + version = "0-unstable-2022-03-10"; src = fetchFromGitHub { owner = "opentrack"; repo = "aruco"; - rev = "12dc60efd61149227bd05c805208d9bcce308f6d"; - sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad"; + rev = "e08d336bd2c70859efd19622582817fe8eabe714"; + hash = "sha256-Wf5y//vxRWIZfOxwgZsPPTsUHliA3cbt2FOjouh4/rQ="; }; + strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ opencv4 ]; env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3"; - preInstall = '' - mkdir -p $out/include/aruco + installPhase = '' + runHook preInstall + + install -Dt $out/include/aruco ./src/include/aruco/* + install -Dt $out/lib ./src/libaruco.a + + runHook postInstall ''; - # copy headers required by main package - postInstall = '' - cp $src/src/*.h $out/include/aruco - ''; - - meta = with lib; { + meta = { homepage = "https://github.com/opentrack/aruco"; description = "C++ library for detection of AR markers based on OpenCV"; - license = licenses.isc; - maintainers = with maintainers; [ zaninime ]; + license = lib.licenses.isc; + maintainers = opentrack.meta.maintainers; }; } diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix new file mode 100644 index 000000000000..13e21edba534 --- /dev/null +++ b/pkgs/by-name/op/opentrack/package.nix @@ -0,0 +1,113 @@ +{ + stdenv, + lib, + callPackage, + fetchzip, + fetchFromGitHub, + cmake, + pkg-config, + ninja, + copyDesktopItems, + qt6, + opencv4, + procps, + eigen, + libXdmcp, + libevdev, + makeDesktopItem, + wineWowPackages, + onnxruntime, + nix-update-script, + withWine ? stdenv.targetPlatform.isx86_64, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "opentrack"; + version = "2024.1.1-unstable-2025-10-29"; + + src = fetchFromGitHub { + owner = "opentrack"; + repo = "opentrack"; + rev = "766808196cf63ddf9ceb102fba193582daceb9de"; + hash = "sha256-xS87LFAbnRg7uBbN7ARoGts3bNYkcpOm3xhojBepgIo="; + }; + + aruco = callPackage ./aruco.nix { }; + + xplaneSdk = fetchzip { + url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK411.zip"; + hash = "sha256-zay5QrHJctllVFl+JhlyTDzH68h5UoxncEt+TpW3UgI="; + # see license.txt inside the zip file + meta.license = lib.licenses.free; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + copyDesktopItems + ninja + pkg-config + qt6.wrapQtAppsHook + ] + ++ lib.optionals withWine [ wineWowPackages.stable ]; + + buildInputs = [ + finalAttrs.aruco + eigen + libXdmcp + libevdev + onnxruntime + opencv4 + procps + qt6.qtbase + qt6.qttools + ]; + + cmakeFlags = [ + (lib.cmakeBool "SDK_WINE" withWine) + (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a") + (lib.cmakeFeature "SDK_XPLANE" finalAttrs.xplaneSdk.outPath) + ]; + + postInstall = '' + install -Dt $out/share/icons/hicolor/256x256 $src/gui/images/opentrack.png + ''; + + # manually wrap just the main binary + dontWrapQtApps = true; + preFixup = '' + wrapQtApp $out/bin/opentrack + ''; + + desktopItems = [ + (makeDesktopItem { + name = "opentrack"; + exec = "opentrack"; + icon = "opentrack"; + desktopName = "opentrack"; + genericName = "Head tracking software"; + categories = [ "Utility" ]; + }) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version=branch" + "--version-regex" + "^opentrack-(.+)" + ]; + }; + + meta = { + homepage = "https://github.com/opentrack/opentrack"; + description = "Head tracking software for MS Windows, Linux, and Apple OSX"; + mainProgram = "opentrack"; + changelog = "https://github.com/opentrack/opentrack/releases"; + license = lib.licenses.isc; + maintainers = [ + lib.maintainers.nekowinston + lib.maintainers.zaninime + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 9c076d7cb760..daea4b4409c6 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.58.0"; + version = "0.59.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-+Bhyt01gTNWVOL0WG6pdjzbRqIfm2MUEHnbTGg3nG2k="; + hash = "sha256-aDwuMRceMxRCh9w89Q2ktpNWwmStg3KzggwhZUAAauk="; }; - cargoHash = "sha256-b7/UiIkeLddo9hUipqd7zLGvFumAjFolf/jODZ0qOQw="; + cargoHash = "sha256-BbPX+ZKMfLtKWBnrGBRfrl6d40rBQaWJLBg0Vv5UnZE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pl/plistcpp/package.nix b/pkgs/by-name/pl/plistcpp/package.nix index 4b1aea8d1218..73c4179960b3 100644 --- a/pkgs/by-name/pl/plistcpp/package.nix +++ b/pkgs/by-name/pl/plistcpp/package.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation { postPatch = '' sed -i "1i #include " src/Plist.cpp + + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 3dba95437a1b..715167c9f029 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -42,13 +42,13 @@ let }; pname = "pretix"; - version = "2025.8.0"; + version = "2025.9.0"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg="; + hash = "sha256-d0RunBCUUvS4tosbXWkEp7mvUKEOa5KgvIZK4XydN7I="; }; npmDeps = buildNpmPackage { @@ -56,7 +56,7 @@ let inherit version src; sourceRoot = "${src.name}/src/pretix/static/npm_dir"; - npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08="; + npmDepsHash = "sha256-0FQldyGJXFhXFv7L7ozAoWEfpUTo+d2pibWyhnJ4F7A="; dontBuild = true; diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix index 1e5b148b0981..037a94a8fde5 100644 --- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pretix-mollie"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-mollie"; tag = "v${version}"; - hash = "sha256-YdBDYpxKqb0UOkSU6zEYoLAtlUbkfDHUTIA538ILbjk="; + hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA="; }; build-system = [ diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix index a606f3480c8e..915c2f2028fb 100644 --- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix +++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pretix-zugferd"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretix"; repo = "pretix-zugferd"; rev = "v${version}"; - hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w="; + hash = "sha256-yBlbHhiA+Tk1IHnFqYxu0hrQHWQP8LrLHgzu9+OHyN4="; }; postPatch = '' diff --git a/pkgs/by-name/pr/prowlarr/deps.json b/pkgs/by-name/pr/prowlarr/deps.json index c8ca52167952..e22a3f1edb2e 100644 --- a/pkgs/by-name/pr/prowlarr/deps.json +++ b/pkgs/by-name/pr/prowlarr/deps.json @@ -11,18 +11,18 @@ }, { "pname": "Azure.Core", - "version": "1.38.0", - "hash": "sha256-gzWMtIZJgwtE51dTMzLCbN4KxmE4/bzdjb/NU86N1uY=" + "version": "1.47.1", + "hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak=" }, { "pname": "Azure.Identity", - "version": "1.11.4", - "hash": "sha256-J3nI80CQwS7fwRLnqBxqZNemxqP05rcn3x44YpIf2no=" + "version": "1.14.2", + "hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo=" }, { "pname": "BouncyCastle.Cryptography", - "version": "2.5.1", - "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" + "version": "2.6.1", + "hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo=" }, { "pname": "Castle.Core", @@ -31,15 +31,8 @@ }, { "pname": "coverlet.collector", - "version": "3.0.4-preview.27.ge7cb7c3b40", - "hash": "sha256-UiiFa/GfLf3gcKb1atAz5gwR0sIA7sA1GFKSbk6sIgM=", - "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg" - }, - { - "pname": "coverlet.core", - "version": "3.0.4-preview.27.ge7cb7c3b40", - "hash": "sha256-nIVBoe0qz5e5eDmrhlMslznVzXne6eXbd8T4m2c+Qb8=", - "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg" + "version": "6.0.4", + "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" }, { "pname": "Dapper", @@ -88,8 +81,13 @@ }, { "pname": "MailKit", - "version": "4.12.1", - "hash": "sha256-fwI0YTbwfzrvdkbATWGbv4D8ugOXgaPO/WFvGxQ9WS8=" + "version": "4.14.0", + "hash": "sha256-vAFqKaKvLUUiFbpu1mJdL/W5CIlb6rh3U6ef883g+Bs=" + }, + { + "pname": "Microsoft.ApplicationInsights", + "version": "2.23.0", + "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0=" }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", @@ -108,8 +106,8 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "1.1.1", - "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" }, { "pname": "Microsoft.Bcl.Cryptography", @@ -121,11 +119,6 @@ "version": "17.10.0", "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" - }, { "pname": "Microsoft.CSharp", "version": "4.7.0", @@ -133,19 +126,14 @@ }, { "pname": "Microsoft.Data.SqlClient", - "version": "6.0.2", - "hash": "sha256-QkvGoucU8jo4PXCCgZ10v5I5hG0gyaVA36rOcu3IBLA=" + "version": "6.1.1", + "hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0=" }, { "pname": "Microsoft.Data.SqlClient.SNI.runtime", "version": "6.0.2", "hash": "sha256-CQuJfjZYoRxfc07cSzUNCOOdzmUJu0p10J+WpcG2BJ0=" }, - { - "pname": "Microsoft.DotNet.PlatformAbstractions", - "version": "2.1.0", - "hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM=" - }, { "pname": "Microsoft.Extensions.Caching.Abstractions", "version": "8.0.0", @@ -206,11 +194,6 @@ "version": "2.0.0", "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection", - "version": "2.2.0", - "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M=" - }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.0", @@ -226,11 +209,6 @@ "version": "2.0.0", "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8=" }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "2.2.0", - "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s=" - }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "7.0.0", @@ -246,11 +224,6 @@ "version": "8.0.2", "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "2.1.0", - "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY=" - }, { "pname": "Microsoft.Extensions.Diagnostics", "version": "8.0.1", @@ -271,11 +244,6 @@ "version": "8.0.0", "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc=" }, - { - "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "2.0.1", - "hash": "sha256-QBdcLyJAHf10+RUlquXWTs155FZmHDRKbL0uzXZZPVw=" - }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", "version": "8.0.0", @@ -326,6 +294,11 @@ "version": "8.0.2", "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" + }, { "pname": "Microsoft.Extensions.Logging.Configuration", "version": "8.0.1", @@ -383,13 +356,13 @@ }, { "pname": "Microsoft.Identity.Client", - "version": "4.61.3", - "hash": "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA=" + "version": "4.73.1", + "hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc=" }, { "pname": "Microsoft.Identity.Client.Extensions.Msal", - "version": "4.61.3", - "hash": "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE=" + "version": "4.73.1", + "hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs=" }, { "pname": "Microsoft.IdentityModel.Abstractions", @@ -398,33 +371,33 @@ }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "7.5.0", - "hash": "sha256-C849ySgag1us+IfgbSsloz6HTKeuEkN14HGFv4OML1o=" + "version": "7.7.1", + "hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "7.5.0", - "hash": "sha256-TbU0dSLxUaTBxd9aLAlG4EeR2lrBE+6RJUlgefbqsQg=" + "version": "7.7.1", + "hash": "sha256-vGUx0HYrhDGQiHuIZoe4YOXx3UV9hT+a0krlPGJPQzw=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "7.5.0", - "hash": "sha256-RdUbGTvnbB11pmWxEKRaP6uPI2ITEcB/PxqgxHl33uM=" + "version": "7.7.1", + "hash": "sha256-JtQclRXgzsFBFnD+kgD59OILf7XkMD2czLupLZkc100=" }, { "pname": "Microsoft.IdentityModel.Protocols", - "version": "7.5.0", - "hash": "sha256-SX8JpQ4HzFzngmh9QHGVz2GH7TrUdX8WXBSkykQFFaU=" + "version": "7.7.1", + "hash": "sha256-PVS46Ut/2814hy0tdNLahG266hBmepw/fzZ9pku1PNg=" }, { "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect", - "version": "7.5.0", - "hash": "sha256-m4FYxiqNyU9FnqFJKcQnE7npc5HTulHdbk3bcooqWp8=" + "version": "7.7.1", + "hash": "sha256-zXRZLfgOG/0l8aF6mZuAVGWB3wYz5uTkTJwlucYPafw=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "7.5.0", - "hash": "sha256-AI74ljCROXqXcktxc9T80NpBvwDZeVnRlJz+ofk1RVs=" + "version": "7.7.1", + "hash": "sha256-WgbdkeG0R/f+4GJeXlj1WMpFyGv7+iW1JM9Pgt95UFk=" }, { "pname": "Microsoft.Net.Http.Headers", @@ -438,13 +411,13 @@ }, { "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + "version": "1.1.1", + "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -458,13 +431,13 @@ }, { "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + "version": "1.1.3", + "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=" }, { "pname": "Microsoft.OpenApi", @@ -477,15 +450,45 @@ "hash": "sha256-mx/iqHmBMwA8Ulot0n6YFVIKsU1Tx7q4Tru7MSjbEgQ=" }, { - "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "16.9.1", - "hash": "sha256-LZJLTWU2DOnuBiN/g+S+rwG2/BJtKrjydKnj3ujp98U=" + "pname": "Microsoft.Testing.Extensions.Telemetry", + "version": "1.7.3", + "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg=" + }, + { + "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", + "version": "1.7.3", + "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw=" + }, + { + "pname": "Microsoft.Testing.Extensions.VSTestBridge", + "version": "1.7.3", + "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM=" + }, + { + "pname": "Microsoft.Testing.Platform", + "version": "1.7.3", + "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA=" + }, + { + "pname": "Microsoft.Testing.Platform.MSBuild", + "version": "1.7.3", + "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM=" + }, + { + "pname": "Microsoft.TestPlatform.AdapterUtilities", + "version": "17.13.0", + "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.10.0", "hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4=" }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.13.0", + "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk=" + }, { "pname": "Microsoft.TestPlatform.TestHost", "version": "17.10.0", @@ -498,18 +501,13 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "4.7.0", - "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4=" + "version": "8.0.0", + "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ=" }, { "pname": "MimeKit", - "version": "4.12.0", - "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA=" - }, - { - "pname": "Mono.Cecil", - "version": "0.11.1", - "hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA=" + "version": "4.14.0", + "hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM=" }, { "pname": "Mono.Nat", @@ -554,13 +552,8 @@ }, { "pname": "Newtonsoft.Json", - "version": "13.0.3", - "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" - }, - { - "pname": "Newtonsoft.Json", - "version": "9.0.1", - "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + "version": "13.0.4", + "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk=" }, { "pname": "NLog", @@ -587,11 +580,6 @@ "version": "9.0.3", "hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o=" }, - { - "pname": "NuGet.Frameworks", - "version": "5.0.0", - "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI=" - }, { "pname": "NUnit", "version": "3.14.0", @@ -599,18 +587,18 @@ }, { "pname": "NUnit3TestAdapter", - "version": "4.2.1", - "hash": "sha256-g73i3yqr0KnC0etKcAw9CmB6ZFAFvpxZn88s1glsND4=" + "version": "5.1.0", + "hash": "sha256-5z470sFjV67wGHaw8KfmSloIAYe81Dokp0f8I6zXsDc=" }, { "pname": "NunitXml.TestLogger", - "version": "3.0.131", - "hash": "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg=" + "version": "3.1.20", + "hash": "sha256-T6/n9S5vnmznf2P7x5Vejciq8P2P+1OCrdKE2UmWQOw=" }, { "pname": "Polly", - "version": "8.6.0", - "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk=" + "version": "8.6.4", + "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I=" }, { "pname": "Polly.Contrib.WaitAndRetry", @@ -619,8 +607,8 @@ }, { "pname": "Polly.Core", - "version": "8.6.0", - "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8=" + "version": "8.6.4", + "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I=" }, { "pname": "RestSharp", @@ -737,11 +725,6 @@ "version": "4.3.0", "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" }, - { - "pname": "runtime.native.System", - "version": "4.0.0", - "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894=" - }, { "pname": "runtime.native.System", "version": "4.3.0", @@ -814,8 +797,8 @@ }, { "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" + "version": "4.3.1", + "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY=" }, { "pname": "runtime.unix.System.Diagnostics.Debug", @@ -971,6 +954,11 @@ "version": "1.4.2", "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, + { + "pname": "SourceGear.sqlite3", + "version": "3.50.4.2", + "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M=" + }, { "pname": "Swashbuckle.AspNetCore.Swagger", "version": "8.1.4", @@ -981,11 +969,6 @@ "version": "8.1.4", "hash": "sha256-m0ixgc45HCX2xrvrnhy3WYU/r/basjat535n4rN+vOY=" }, - { - "pname": "System.AppContext", - "version": "4.1.0", - "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs=" - }, { "pname": "System.AppContext", "version": "4.3.0", @@ -998,13 +981,8 @@ }, { "pname": "System.ClientModel", - "version": "1.0.0", - "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y=" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" + "version": "1.5.1", + "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow=" }, { "pname": "System.Collections", @@ -1062,15 +1040,9 @@ "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" }, { - "pname": "System.Data.SQLite.Core.Servarr", - "version": "1.0.115.5-18", - "hash": "sha256-H6QvKNKkW6PwHwDWAUVeXlqz9fJTEwIAS3YtcbOwpTc=", - "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" + "pname": "System.Data.SQLite", + "version": "2.0.2", + "hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck=" }, { "pname": "System.Diagnostics.Debug", @@ -1082,6 +1054,11 @@ "version": "4.3.0", "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "5.0.0", + "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" + }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", @@ -1092,11 +1069,6 @@ "version": "8.0.1", "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA=" }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, { "pname": "System.Diagnostics.Tools", "version": "4.3.0", @@ -1114,13 +1086,8 @@ }, { "pname": "System.Drawing.Common", - "version": "4.7.0", - "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" + "version": "8.0.19", + "hash": "sha256-KDCdLN8aKxQmQCe8D5iCyZKo2+mhx00tg7CqTILE/v0=" }, { "pname": "System.Dynamic.Runtime", @@ -1132,11 +1099,6 @@ "version": "8.0.1", "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=" }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" - }, { "pname": "System.Globalization", "version": "4.3.0", @@ -1154,13 +1116,8 @@ }, { "pname": "System.IdentityModel.Tokens.Jwt", - "version": "7.5.0", - "hash": "sha256-K3OUOGrTYKJdnRTHERdSZWTxb5QNL4wBKCahcswdKrc=" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" + "version": "7.7.1", + "hash": "sha256-6JfmtdChyt7zd/HKI+/T1HcyesEPx0NNMO/zFJ7lU2c=" }, { "pname": "System.IO", @@ -1177,11 +1134,6 @@ "version": "4.3.0", "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, { "pname": "System.IO.FileSystem", "version": "4.3.0", @@ -1192,11 +1144,6 @@ "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, { "pname": "System.IO.FileSystem.Primitives", "version": "4.3.0", @@ -1207,21 +1154,11 @@ "version": "8.0.0", "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" }, - { - "pname": "System.Linq", - "version": "4.1.0", - "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" - }, { "pname": "System.Linq", "version": "4.3.0", "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" - }, { "pname": "System.Linq.Expressions", "version": "4.3.0", @@ -1234,8 +1171,8 @@ }, { "pname": "System.Memory.Data", - "version": "1.0.2", - "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0=" + "version": "8.0.1", + "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, { "pname": "System.Net.Http", @@ -1257,16 +1194,6 @@ "version": "4.3.0", "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" - }, { "pname": "System.ObjectModel", "version": "4.3.0", @@ -1278,20 +1205,15 @@ "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { - "pname": "System.Reflection", - "version": "4.1.0", - "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" + "pname": "System.Private.Uri", + "version": "4.3.2", + "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=" }, { "pname": "System.Reflection", "version": "4.3.0", "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, { "pname": "System.Reflection.Emit", "version": "4.3.0", @@ -1302,81 +1224,41 @@ "version": "4.7.0", "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg=" }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, { "pname": "System.Reflection.Emit.ILGeneration", "version": "4.3.0", "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, { "pname": "System.Reflection.Emit.Lightweight", "version": "4.3.0", "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" - }, { "pname": "System.Reflection.Extensions", "version": "4.3.0", "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" }, - { - "pname": "System.Reflection.Metadata", - "version": "1.5.0", - "hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8=" - }, { "pname": "System.Reflection.Metadata", "version": "1.6.0", "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, { "pname": "System.Reflection.TypeExtensions", "version": "4.3.0", "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" - }, { "pname": "System.Resources.ResourceManager", "version": "4.3.0", "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" - }, { "pname": "System.Runtime", "version": "4.3.0", @@ -1392,41 +1274,21 @@ "version": "6.0.0", "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" - }, { "pname": "System.Runtime.Extensions", "version": "4.3.0", "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, { "pname": "System.Runtime.Handles", "version": "4.3.0", "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, { "pname": "System.Runtime.InteropServices", "version": "4.3.0", "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.0.0", - "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4=" - }, { "pname": "System.Runtime.InteropServices.RuntimeInformation", "version": "4.3.0", @@ -1442,11 +1304,6 @@ "version": "4.3.0", "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" - }, { "pname": "System.Security.AccessControl", "version": "4.7.0", @@ -1504,8 +1361,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "4.7.0", - "hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug=" + "version": "4.5.0", + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" }, { "pname": "System.Security.Cryptography.ProtectedData", @@ -1552,11 +1409,6 @@ "version": "8.0.1", "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8=" }, - { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" - }, { "pname": "System.Text.Encoding", "version": "4.3.0", @@ -1567,21 +1419,11 @@ "version": "8.0.0", "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=" }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" - }, { "pname": "System.Text.Encoding.Extensions", "version": "4.3.0", "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "4.7.2", - "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" - }, { "pname": "System.Text.Json", "version": "5.0.2", @@ -1589,44 +1431,24 @@ }, { "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" + "version": "8.0.6", + "hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes=" }, { "pname": "System.Text.RegularExpressions", "version": "4.3.0", "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" }, - { - "pname": "System.Threading", - "version": "4.0.11", - "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" - }, { "pname": "System.Threading", "version": "4.3.0", "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" - }, { "pname": "System.Threading.Tasks", "version": "4.3.0", "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, { "pname": "System.Threading.Tasks.Extensions", "version": "4.3.0", @@ -1662,21 +1484,11 @@ "version": "4.7.0", "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU=" }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" - }, { "pname": "System.Xml.ReaderWriter", "version": "4.3.0", "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" - }, { "pname": "System.Xml.XDocument", "version": "4.3.0", diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix index 69d6877a43e1..dc0dfdfb4343 100644 --- a/pkgs/by-name/pr/prowlarr/package.nix +++ b/pkgs/by-name/pr/prowlarr/package.nix @@ -19,7 +19,7 @@ applyPatches, }: let - version = "2.0.5.5160"; + version = "2.1.5.5216"; # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass # the already patched lockfile to `fetchYarnDeps`. src = applyPatches { @@ -27,7 +27,7 @@ let owner = "Prowlarr"; repo = "Prowlarr"; tag = "v${version}"; - hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0="; + hash = "sha256-/7U1V1/fF8fobVwQa/IzCGWIUIKMrSxTyj9KZhmfJ/E="; }; postPatch = '' mv src/NuGet.config NuGet.Config diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index cf265c7999b5..78273cb98b48 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "qwen-code"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "QwenLM"; repo = "qwen-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-5XC4Pwf+vuK1T3/bPptUejg8v9wj3izF80Mt+iqVr9Y="; + hash = "sha256-AciiXcSbRWZJ8+79h8Np2DphzUvxoJ1krsXw4rZxv/E="; }; - npmDepsHash = "sha256-Psj/5SDWBnsRJVJnJwXGUgVbqUnjoH6HpAqqFruHkYw="; + npmDepsHash = "sha256-MKpfLzmWIATAPEf8USr2ZJR8ZGTWKkdlXuA4ByYW/jg="; nativeBuildInputs = [ jq diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index f625eb94e134..6908f925be6b 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.10.20.00"; + version = "2025.10.27.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-SHJIDFhK5y+XxOS76pbSXW8Hr1Y5g0uhSw4km5usIsM="; + hash = "sha256-ykey6fdL9bjf+IfIAKzlIs5Pw/r2rAe6VB8BR1fUtz4="; }; - cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I="; + cargoHash = "sha256-aFDMVxWLeE8TtQCW5U2ULh9yJBc67vkXkPjgo+QPxYM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix index 7622cb01527b..efbbe77a34d8 100644 --- a/pkgs/by-name/ro/roon-server/package.nix +++ b/pkgs/by-name/ro/roon-server/package.nix @@ -16,7 +16,7 @@ stdenv, }: let - version = "2.55.1559"; + version = "2.56.1582"; urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version; in stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-eeQ6Gci63GRdN5HOtT5+RFgWcnpTeCG6hBk1bNKXYoE="; + hash = "sha256-LKuno7SpOpxx3JpM36tYlOHjJWWRLRjPiA096Bv/QvQ="; }; dontConfigure = true; diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix new file mode 100644 index 000000000000..d25cf32ca346 --- /dev/null +++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix @@ -0,0 +1,134 @@ +{ + lib, + rustPlatform, + fetchurl, + fetchFromGitHub, + copyDesktopItems, + makeDesktopItem, + makeWrapper, + pkg-config, + icoutils, + luajit, + zlib, + libxkbcommon, + vulkan-loader, + wayland, +}: + +let + icon = fetchurl { + url = "https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-Launcher/9ee18657fa6597c42811152604da4e6b73fac342/PathOfBuilding.ico"; + hash = "sha256-9EW4ld+xg7GLfd4dEY/xUCBMnKb3uu7LBq2Of3Gq1Y8="; + }; +in +rustPlatform.buildRustPackage rec { + pname = "rusty-path-of-building"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "meehl"; + repo = "rusty-path-of-building"; + rev = "v${version}"; + hash = "sha256-U2OWNV8bUNXo8/Sro+gV/o3O/D1lMWVlbX3tCONmGOk="; + }; + + cargoHash = "sha256-xB7nhCqUalGE0M762Zw7vVFKzz/TgnMU77xbEHorJ2U="; + + nativeBuildInputs = [ + pkg-config + icoutils + copyDesktopItems + makeWrapper + ]; + + buildInputs = [ + luajit + luajit.pkgs.lua-curl + luajit.pkgs.luautf8 + luajit.pkgs.luasocket + + # this is weird and vendored and should probably stay that way + (luajit.pkgs.buildLuaPackage { + pname = "lzip"; + inherit version; + src = "${src}/lua/libs/lzip"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zlib ]; + installFlags = [ "LUA_CMOD=$(out)/lib/lua/${luajit.luaversion}" ]; + }) + + wayland + ]; + + postInstall = '' + icotool -x ${icon} + + for size in 16 32 48 256; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + install -Dm 644 *PathOfBuilding*"$size"x"$size"*.png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png + done + ''; + + postFixup = '' + patchelf $out/bin/rusty-path-of-building \ + --add-rpath ${ + lib.makeLibraryPath [ + libxkbcommon + vulkan-loader + wayland + ] + } + + wrapProgram $out/bin/rusty-path-of-building \ + --set LUA_PATH "$LUA_PATH" \ + --set LUA_CPATH "$LUA_CPATH" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "rusty-path-of-building"; + desktopName = "Path of Building"; + comment = "Offline build planner for Path of Exile"; + exec = "rusty-path-of-building poe1"; + terminal = false; + type = "Application"; + icon = "pathofbuilding"; + categories = [ "Game" ]; + keywords = [ + "poe" + "pob" + "pobc" + "path" + "exile" + ]; + }) + (makeDesktopItem { + name = "rusty-path-of-building-2"; + desktopName = "Path of Building 2"; + comment = "Offline build planner for Path of Exile 2"; + exec = "rusty-path-of-building poe2"; + terminal = false; + type = "Application"; + icon = "pathofbuilding"; + categories = [ "Game" ]; + keywords = [ + "poe" + "pob" + "pobc" + "path" + "exile" + ]; + }) + ]; + + meta = { + description = "A cross-platform runtime for Path of Building and Path of Building 2."; + homepage = "https://github.com/meehl/rusty-path-of-building"; + changelog = "https://github.com/meehl/rusty-path-of-building/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ k900 ]; + mainProgram = "rusty-path-of-building"; + }; +} diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index aa009698916a..09c04b2381d3 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = version; - hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE="; + hash = "sha256-f9G2sCh49ChFcLaDALpfgrOwHh2mxMaUEQTeYffjXks="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index da9f0ed4387f..869dfbc265ed 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-6CKY5rIPI+8uKh1vjw9nBI01J8o7U4vlxEPJS7xaAVg="; + hash = "sha256-LG6JVeP5OmC/8OcUq+a3Xj/BTNB5C4XXhp0VVE8BZ6k="; }; kernel = buildGoModule { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-kDWOkAY6GiSp/oLkyLya2VYWmLz4fPxZPRKGlb2B8M4="; + vendorHash = "sha256-ZUSfehCqHUZyWHHisulg4x9v+YtnoktqaLDR7SjeGQo="; patches = [ (replaceVars ./set-pandoc-path.patch { @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; fetcherVersion = 1; - hash = "sha256-Q67JRE0XXjrIAyC30DDCtdh1Ja+9ME2mmIfh21Lx+mw="; + hash = "sha256-uAv/KTkLy/cvVctceBFA5xwlgGeSmbutgUP39zvZIhU="; }; sourceRoot = "${finalAttrs.src.name}/app"; diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 4effde335c3c..8ec3dafe8d38 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-10-24"; + version = "0-unstable-2025-10-29"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "6d2315cd1916ff6bc9ab3d6b3415e29da31df64d"; - hash = "sha256-GAxcKJHrvTPK2IvK3AEhNvYcFZw7mkaubXNiFnsiqDo="; + rev = "7849196f18cf4dd77298ae77c1b42ad53225c348"; + hash = "sha256-oDA81ow+KPy9d/iIhPxzYSl9wvcLvNM85X4CV5Jq5LQ="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; diff --git a/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch new file mode 100644 index 000000000000..be780aa3b149 --- /dev/null +++ b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch @@ -0,0 +1,13 @@ +diff --git a/SteamPrefill/Settings/AppConfig.cs b/SteamPrefill/Settings/AppConfig.cs +index 05215f9..394b13f 100644 +--- a/SteamPrefill/Settings/AppConfig.cs ++++ b/SteamPrefill/Settings/AppConfig.cs +@@ -36,7 +36,7 @@ namespace SteamPrefill.Settings + /// + /// Contains user configuration. Should not be deleted, doing so will reset the app back to defaults. + /// +- private static readonly string ConfigDir = Path.Combine(AppContext.BaseDirectory, "Config"); ++ private static readonly string ConfigDir = Path.Combine(Directory.GetCurrentDirectory(), "Config"); + + #region Serialization file paths + diff --git a/pkgs/by-name/st/steam-lancache-prefill/deps.json b/pkgs/by-name/st/steam-lancache-prefill/deps.json new file mode 100644 index 000000000000..03ae8464bfbc --- /dev/null +++ b/pkgs/by-name/st/steam-lancache-prefill/deps.json @@ -0,0 +1,232 @@ +[ + { + "pname": "AsyncFixer", + "version": "1.6.0", + "hash": "sha256-8MWfDkTyotnouLwZASK27lM32NoGCLPLr4sBBqPkJFI=" + }, + { + "pname": "AutoMapper", + "version": "11.0.1", + "hash": "sha256-47l2b8IWIyaOKl5KTpVAPeEL6ZMGlzoFCWby2QIrPfw=" + }, + { + "pname": "ByteSize", + "version": "2.1.1", + "hash": "sha256-ZPiO0zdDX3F9QkQLWLbkyeicRZZoOGnS5vo55RttS2w=" + }, + { + "pname": "Devlooped.SponsorLink", + "version": "0.10.5", + "hash": "sha256-m+eCuL8ifD/PJkyA70okbWYIDcp8ZV6mtDvnbthz6DQ=" + }, + { + "pname": "ErrorProne.NET.Structs", + "version": "0.1.2", + "hash": "sha256-B0kzqe24j0+X96JCtQWXZK3aWfFAYKIYvhrMePMfgPI=" + }, + { + "pname": "HexMate", + "version": "0.0.3", + "hash": "sha256-pA/wUH3+1CIXNmvpwedOOtfGA5uEMeis3XbSArol8r4=" + }, + { + "pname": "Intellenum", + "version": "1.0.0-beta.3", + "hash": "sha256-FdLXSwxvQNyZWjFjJnUvuk1LAxPvuch557w0qHvmdfw=" + }, + { + "pname": "JetBrains.Annotations", + "version": "2022.1.0", + "hash": "sha256-AgCfhDvBb/xOLxNvFoZPYuiSBWEhXihHTBvYqLS+WFM=" + }, + { + "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers", + "version": "3.3.4", + "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.5.0", + "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY=" + }, + { + "pname": "Microsoft.CSharp", + "version": "4.7.0", + "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0=" + }, + { + "pname": "Microsoft.IdentityModel.Abstractions", + "version": "6.34.0", + "hash": "sha256-Al1vWcfH//XZRKSg5JE2nEHMb8Z6kekMHccJEmYo9jU=" + }, + { + "pname": "Microsoft.IdentityModel.JsonWebTokens", + "version": "6.34.0", + "hash": "sha256-+h0uNBMx6zh/f96+WiSR6c89G1alBOCuTx+VpDxuATA=" + }, + { + "pname": "Microsoft.IdentityModel.Logging", + "version": "6.34.0", + "hash": "sha256-a0IPOjmYsIT2/HFAdhaN/32X3c8GYCFZ5sRiCGO2pDo=" + }, + { + "pname": "Microsoft.IdentityModel.Tokens", + "version": "6.34.0", + "hash": "sha256-lO/gLOFYkwCEm98Zn+4X20dXMwYoD+y4Urpx8n3mcu4=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.VisualStudio.Threading.Analyzers", + "version": "16.9.60", + "hash": "sha256-1ke2CCKndVws3lgfEuEhKgnm+h706XhfKcpBNyypcDU=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, + { + "pname": "NStack.Core", + "version": "0.17.1", + "hash": "sha256-sVuArQwL2dzytCei2fhCNg1Bcm4vntPb+PpXStk3rqM=" + }, + { + "pname": "protobuf-net", + "version": "3.2.30", + "hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE=" + }, + { + "pname": "protobuf-net.Core", + "version": "3.2.30", + "hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "Spectre.Console", + "version": "0.49.2-preview.0.67", + "hash": "sha256-e1BrfX8ME8Ob7ZVKx8VYExKNvLzHHxNJ1R+Yv2lVE3A=" + }, + { + "pname": "Spectre.Console.Analyzer", + "version": "1.0.0", + "hash": "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE=" + }, + { + "pname": "SteamKit2", + "version": "3.0.0-beta.5", + "hash": "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8=" + }, + { + "pname": "System.Collections.Immutable", + "version": "7.0.0", + "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + }, + { + "pname": "System.IdentityModel.Tokens.Jwt", + "version": "6.34.0", + "hash": "sha256-nv+tAb/Gw2W026gBgoAT53Oj5LOonHYGG1UntQheHpQ=" + }, + { + "pname": "System.IO.Hashing", + "version": "8.0.0", + "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.Cryptography.Cng", + "version": "4.5.0", + "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "5.0.0", + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "4.7.2", + "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io=" + }, + { + "pname": "System.Text.Json", + "version": "4.7.2", + "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "Terminal.Gui", + "version": "1.7.2", + "hash": "sha256-qt42B0L8Na3kRCKkzmPru8IoLcjyn6nosEJL7nb67aA=" + }, + { + "pname": "ThisAssembly.AssemblyInfo", + "version": "1.2.14", + "hash": "sha256-Sx9lTx51Nt8XlzuB7FI/8MVRYNw4Mm2lfQECBf3TXJU=" + }, + { + "pname": "Wcwidth", + "version": "1.0.0", + "hash": "sha256-weNqGgpKcVMkTtaMV5npzbLRbCPyI0tgkN+qmzeqIwo=" + } +] diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix new file mode 100644 index 000000000000..b1254d4f09ce --- /dev/null +++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + curl, + jq, + unzip, +}: + +buildDotnetModule (finalAttrs: { + pname = "steam-lancache-prefill"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "tpill90"; + repo = "steam-lancache-prefill"; + tag = "v${finalAttrs.version}"; + hash = "sha256-V3hegWhJCkQiE6pkGLRVKw6UcNNEt0dF9URSfBz3BEk="; + fetchSubmodules = true; + }; + + projectFile = "SteamPrefill/SteamPrefill.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + + executables = [ "SteamPrefill" ]; + + patches = [ ./current-dir-config.patch ]; + + nativeBuildInputs = [ + curl + jq + unzip + ]; + + postInstall = '' + rm -rf $out/lib/steam-lancache-prefill/update.sh + ''; + + meta = { + description = "Automatically fills a Lancache with games from Steam"; + homepage = "https://github.com/tpill90/steam-lancache-prefill"; + changelog = "https://github.com/tpill90/steam-lancache-prefill/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rhoriguchi ]; + mainProgram = "SteamPrefill"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 67bd8b05d94c..d2b09bc1f1d7 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.54.8"; + version = "2.55.4"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-iU2NFb97458ouDYuTwgCIYtBpM11MXPWS4hV/Q4IDMs="; + hash = "sha256-BJjNWZKqf59sl9+kVIRuBWF71X19wk8fbIJqlXDhM5Q="; }; - vendorHash = "sha256-JhPKfSFQxFwH5nIYIO3mACdDfURIhuISs1tANiCfWSk="; + vendorHash = "sha256-ASNo3T0ziPcMm/xXBnokyVWVTTq2ZEn4qg9yHjxinEA="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/teensy-cmake-macros/package.nix b/pkgs/by-name/te/teensy-cmake-macros/package.nix index 45098cb5ffb5..0461db32c00f 100644 --- a/pkgs/by-name/te/teensy-cmake-macros/package.nix +++ b/pkgs/by-name/te/teensy-cmake-macros/package.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: { }; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "CMake macros for building teensy projects"; platforms = platforms.all; diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix index eeff38ecea96..85ca39845bb7 100644 --- a/pkgs/by-name/te/temporal/package.nix +++ b/pkgs/by-name/te/temporal/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-oxn/78nQCvlEkSqabVV47siWSSnz32tpDOweqScPYvY="; + hash = "sha256-rUm1zHxM0KYPgKpK7w0XLU7aF3H6sECgSe/UtbNdgJM="; }; vendorHash = "sha256-HW2j8swbaWwU1i3udqlT8VyFreML6ZH14zWxF8L5NTQ="; diff --git a/pkgs/by-name/tr/tracefilegen/package.nix b/pkgs/by-name/tr/tracefilegen/package.nix index df37c0d8256e..d67b26451c2a 100644 --- a/pkgs/by-name/tr/tracefilegen/package.nix +++ b/pkgs/by-name/tr/tracefilegen/package.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/. ''; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)" + ''; + meta = with lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; mainProgram = "TraceFileGen"; diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index e6825050b51c..2a06e30892ea 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -6,7 +6,7 @@ nix-update-script, nodejs, pnpm, - testers, + versionCheckHook, }: let @@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; - fetcherVersion = 1; - hash = "sha256-/Y7KhdNeyUV2CQQWjhYBDDT24oE6UdBO6HTweUUaNqc="; + fetcherVersion = 2; + hash = "sha256-ztig1B10cQQy+4XKZjwwlCxGenwcU+C28TfTWHqZ59Y="; }; postPatch = '' @@ -91,9 +91,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; passthru.updateScript = nix-update-script { extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ]; diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index da6aec474562..b8eaa299e3bb 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: let - version = "4.18.10"; + version = "4.18.11"; desktopItem = makeDesktopItem { name = "unciv"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-8gp4h+fKK+gmwL8OnmfKb5pmO4mehClu8FeQe2KJiDk="; + hash = "sha256-k6jIvJvEfLgcYexpzjg7GFGGw9HhFGnhdShEX6zUxiQ="; }; dontUnpack = true; diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index fdc6171a71d1..38166cc31d10 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20251026234004"; + version = "20251028154325"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-bZM47aPNLvdkmmCFyie/dlUs9JdGPngkdmGrVzDl8as="; + hash = "sha256-ugNLlCfAhXvIPQTae3Z22rlpNG32RmIrIt/iilIj+iA="; }; vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU="; meta = with lib; { diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix index 64860aa4202d..4f143f3a7c12 100644 --- a/pkgs/by-name/vd/vdo/package.nix +++ b/pkgs/by-name/vd/vdo/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.3.1.1"; + version = "8.3.2.1"; src = fetchFromGitHub { owner = "dm-vdo"; repo = "vdo"; rev = version; - hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U="; + hash = "sha256-y3u9f17jMV9dwhfJrsW/GOqszVNvPLDyETfku1t3Djo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index 752de83ed93e..5333cdc423a5 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "vfox"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "version-fox"; repo = "vfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-lVhw2OB4TVkqYbI+kGvBX2RMisc+1aF3Sl6z/kshmZE="; + hash = "sha256-Dtu0A+BC/9sypnWvA8XOlmQFPsV5LUGCXpdarYeCdlU="; }; vendorHash = "sha256-+5hJMip3wAR1k6n21I3QFYe++nw4J4Ip+43EujQl2ec="; diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix index d8a12f381140..306d24e41939 100644 --- a/pkgs/by-name/wa/warp-plus/package.nix +++ b/pkgs/by-name/wa/warp-plus/package.nix @@ -1,30 +1,30 @@ { lib, - buildGoModule, + buildGo124Module, fetchFromGitHub, nix-update-script, - testers, - warp-plus, + versionCheckHook, }: -buildGoModule rec { +# fails with go 1.25, downgrade to 1.24 +# error tls.ConnectionState: struct field count mismatch: 17 vs 16 +buildGo124Module (finalAttrs: { pname = "warp-plus"; - version = "1.2.6-unstable-2025-09-13"; + version = "1.2.6-unstable-2025-10-28"; src = fetchFromGitHub { owner = "bepass-org"; repo = "warp-plus"; - rev = "4af9b2abfc4e79dceea41ac577f1683f62f57b8c"; - hash = "sha256-7i/06Qn+BRH/bWel9OvgVUAZZSwL2Euv179JDJNn2EE="; + rev = "3653f7519d2a08a36222accff6899522bb8b03d0"; + hash = "sha256-T0YTxQ7iciv5i7lw+bU00B6iYquzBwzYkAlOGZiKeWc="; }; vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY="; ldflags = [ "-s" - "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; patches = [ @@ -44,19 +44,18 @@ buildGoModule rec { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - passthru = { - updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - tests.version = testers.testVersion { - package = warp-plus; - command = "warp-plus version"; - }; - }; + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { + changelog = "https://github.com/bepass-org/warp-plus/releases"; description = "Warp + Psiphon, an anti censorship utility for Iran"; homepage = "https://github.com/bepass-org/warp-plus"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ phanirithvij ]; mainProgram = "warp-plus"; }; -} +}) diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index a729c9b9bfe4..2e37932cc914 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-10-05"; + version = "0-unstable-2025-10-14"; src = fetchFromGitHub { owner = "wezterm"; repo = "wezterm"; - rev = "db5d7437389eac5f63ad32e3b50d95b2b86065d1"; + rev = "64f2907c635b7bab407ac300b2261c77a85c1c8e"; fetchSubmodules = true; - hash = "sha256-4OzgrXsSq68CP6iImhqW896X6ekv2seg4kaH3md6QLs="; + hash = "sha256-o/SSN18DmoN5LsB9RvWuAw7voGevOR5DqPBheqmq7AI="; }; postPatch = '' diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 5fc7dbadb45d..e3654c0f667f 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + rust-jemalloc-sys, installShellFiles, nix-update-script, rustPlatform, @@ -21,6 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-4+1EURDrDYG4luaNV9KdRVojXY++H9LNNl2oINfWeLc="; + buildInputs = [ + rust-jemalloc-sys + ]; + nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles ]; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 72d5cde2e1c3..3f0dc69af3e4 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -8,7 +8,6 @@ { lib, config, - recurseIntoAttrs, generateSplicesForMkScope, makeScopeWithSplicing', writeScriptBin, @@ -92,9 +91,9 @@ let mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); - dotnet_10 = recurseIntoAttrs (callPackage ./10 { }); + dotnet_8 = lib.recurseIntoAttrs (callPackage ./8 { }); + dotnet_9 = lib.recurseIntoAttrs (callPackage ./9 { }); + dotnet_10 = lib.recurseIntoAttrs (callPackage ./10 { }); } ); }; diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 16d8441af83b..e4cf6e158f71 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -19,7 +19,6 @@ nugetPackageHook, xmlstarlet, pkgs, - recurseIntoAttrs, }: type: unwrapped: stdenvNoCC.mkDerivation (finalAttrs: { @@ -282,7 +281,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; } // lib.optionalAttrs (type == "sdk") { - buildDotnetModule = recurseIntoAttrs ( + buildDotnetModule = lib.recurseIntoAttrs ( (pkgs.appendOverlays [ (self: super: { dotnet-sdk = finalAttrs.finalPackage; diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 1aba286411bd..9bc67ee9ce6b 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -6,7 +6,6 @@ callPackage, isl_0_20, noSysDirs, - lowPrio, wrapCC, }@args: @@ -18,7 +17,7 @@ let majorVersion = lib.versions.major majorMinorVersion; atLeast = lib.versionAtLeast majorMinorVersion; attrName = "gcc${lib.replaceStrings [ "." ] [ "" ] majorMinorVersion}"; - pkg = lowPrio ( + pkg = lib.lowPrio ( wrapCC ( callPackage ./default.nix { inherit noSysDirs; diff --git a/pkgs/development/compilers/gcc/ng/default.nix b/pkgs/development/compilers/gcc/ng/default.nix index dd70df537853..a205ab6a055a 100644 --- a/pkgs/development/compilers/gcc/ng/default.nix +++ b/pkgs/development/compilers/gcc/ng/default.nix @@ -3,7 +3,6 @@ callPackage, stdenv, stdenvAdapters, - recurseIntoAttrs, gccVersions ? { }, patchesFn ? lib.id, buildPackages, @@ -44,7 +43,7 @@ let args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); in lib.nameValuePair attrName ( - recurseIntoAttrs ( + lib.recurseIntoAttrs ( callPackage ./common ( { inherit (stdenvAdapters) overrideCC; diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 28e29cb43a61..806cf214b4ea 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -1,5 +1,4 @@ { - lowPrio, pkgs, targetPackages, lib, @@ -190,14 +189,14 @@ makeScopeWithSplicing' { clang-unwrapped = self.libclang; - llvm-manpages = lowPrio ( + llvm-manpages = lib.lowPrio ( self.libllvm.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot } ); - clang-manpages = lowPrio ( + clang-manpages = lib.lowPrio ( self.libclang.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot @@ -261,7 +260,7 @@ makeScopeWithSplicing' { lldb = callPackage ./lldb { }; - lldb-manpages = lowPrio ( + lldb-manpages = lib.lowPrio ( self.lldb.override { enableManpages = true; python3 = pkgs.python3; # don't use python-boot diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index a5ad13cf0f39..bb986c4c3da9 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -6,7 +6,6 @@ targetPackages, stdenv, pkgs, - recurseIntoAttrs, # This is the default binutils, but with *this* version of LLD rather # than the default LLVM version's, if LLD is the choice. We use these for # the `useLLVM` bootstrapping below. @@ -56,7 +55,7 @@ let args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version); in lib.nameValuePair attrName ( - recurseIntoAttrs ( + lib.recurseIntoAttrs ( callPackage ./common ( { inherit (stdenvAdapters) overrideCC; diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index b68750a56154..8d6af23eae29 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -145,9 +145,5 @@ stdenv.mkDerivation (finalAttrs: { teams = [ lib.teams.zig ]; mainProgram = "zig"; platforms = lib.platforms.unix; - # Zig 0.15.1 fails some tests on x86_64-darwin thus we mark it broken - # see https://github.com/ziglang/zig/issues/24974 - broken = - stdenv.hostPlatform.system == "x86_64-darwin" && lib.versionAtLeast finalAttrs.version "0.15"; }; }) diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 69cd8532d738..a8559005be35 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -58,7 +58,7 @@ let ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;"; }; in -pkgs.recurseIntoAttrs { +lib.recurseIntoAttrs { checkInterpreterPath = let diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 068ccb189d93..d9c42c328551 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-YEapyEtvI0N9ey9UNbgRd15NyrCqRYJkmD+RuyysIRw="; + hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8="; }; - vendorHash = "sha256-0MH4Q5FY9nu5Jpz/iMIu99P8ptQY07t3qbXMp6J7bt4="; + vendorHash = "sha256-wDxrLsBA8TMc6Fk+voeHlxQNfJaaef1ydg0ppuJgO2E="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 22ea916e8758..ff12480ceb25 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -19,6 +19,7 @@ # dependencies beartype, crcmod, + cryptography, dill, fastavro, fasteners, @@ -63,14 +64,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.68.0"; + version = "2.69.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; tag = "v${version}"; - hash = "sha256-ENtvgu9qT1OPsDqFJQzKgIATE7F+S5I+AfoBT2iEL8M="; + hash = "sha256-7trrdGQ9jkzG+5/PyBMvHXjR0B4HjOxBhUuxXEcKkLg="; }; sourceRoot = "${src.name}/sdks/python"; @@ -123,6 +124,7 @@ buildPythonPackage rec { dependencies = [ beartype crcmod + cryptography dill fastavro fasteners @@ -254,10 +256,15 @@ buildPythonPackage rec { "test_reshuffle_custom_window_preserves_metadata_1" "test_reshuffle_default_window_preserves_metadata_1" - # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' - # https://github.com/apache/beam/issues/33854 + # Dill version 0.3.1.1 is required when using pickle_library=dill. + # Other versions of dill are untested with Apache Beam. + "LocalCombineFnLifecycleTest_0_dill" + "LocalCombineFnLifecycleTest_2_dill" "test_runner_overrides_default_pickler" + # Require internet access + "test_local_jar_fallback_to_google_maven_mirror" + # AssertionError: Lists differ "test_default_resources" "test_files_to_stage" diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix index 79db35a65e95..ac1eb455aa11 100644 --- a/pkgs/development/python-modules/curl-cffi/default.nix +++ b/pkgs/development/python-modules/curl-cffi/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, setuptools, + addBinToPathHook, curl-impersonate-chrome, cffi, certifi, @@ -24,14 +25,14 @@ buildPythonPackage rec { pname = "curl-cffi"; - version = "0.12.0"; + version = "0.14.0b2"; pyproject = true; src = fetchFromGitHub { owner = "lexiforest"; repo = "curl_cffi"; tag = "v${version}"; - hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM="; + hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw="; }; patches = [ ./use-system-libs.patch ]; @@ -47,13 +48,10 @@ buildPythonPackage rec { certifi ]; - env = lib.optionalAttrs stdenv.cc.isGNU { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - }; - pythonImportsCheck = [ "curl_cffi" ]; nativeCheckInputs = [ + addBinToPathHook charset-normalizer cryptography fastapi @@ -81,6 +79,8 @@ buildPythonPackage rec { disabledTestPaths = [ # test accesses network "tests/unittest/test_smoke.py::test_async" + # Runs out of memory while testing + "tests/unittest/test_websockets.py" ]; disabledTests = [ @@ -97,11 +97,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { changelog = "https://github.com/lexiforest/curl_cffi/releases/tag/${src.tag}"; description = "Python binding for curl-impersonate via cffi"; homepage = "https://curl-cffi.readthedocs.io"; - license = licenses.mit; - maintainers = with maintainers; [ chuangzhu ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chuangzhu ]; }; } diff --git a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch index 3dcec2e14c7c..6d30a47f0382 100644 --- a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch +++ b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch @@ -1,8 +1,6 @@ -diff --git a/scripts/build.py b/scripts/build.py -index b705a0d..9bfcaab 100644 --- a/scripts/build.py +++ b/scripts/build.py -@@ -105,7 +105,6 @@ def get_curl_libraries(): +@@ -141,7 +141,6 @@ def get_curl_libraries(): ffibuilder = FFI() system = platform.system() root_dir = Path(__file__).parent.parent @@ -10,7 +8,7 @@ index b705a0d..9bfcaab 100644 ffibuilder.set_source( -@@ -114,9 +113,7 @@ ffibuilder.set_source( +@@ -150,9 +149,7 @@ ffibuilder.set_source( #include "shim.h" """, # FIXME from `curl-impersonate` diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index f9d1671f9e26..91ec68a0a511 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "14.3.0"; + version = "14.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; tag = version; - hash = "sha256-DGcYIir2ckzCJ9423OiFwSi0xMXyox6RNYnhOGQhOuc="; + hash = "sha256-901TvjY5VzWLzQGBmTQ/K0giPt010+GH5eVWk58Pqng="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index dace1878608f..d7e62a3d31c3 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,16 +8,18 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202510291"; + version = "0.1.202510301"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-MApdvk2tVwvlE8F7nmBxex/NbNBlHHh2lmbwLMn0N+4="; + hash = "sha256-83vicOeL/CufgkOO+oKLbydv0Hu08kMcPxVjrQGzn3c="; }; + __darwinAllowLocalNetworking = true; + build-system = [ hatchling ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 81d65e2e7972..4d345816c264 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.37.0"; + version = "5.38.0"; pyproject = true; # Sources from Pypi exclude test fixtures @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; tag = "v${version}"; - hash = "sha256-fRTTXWkn1YBWW9xrFm3y6o7f8ZdYhObqVLSHAuiNHak="; + hash = "sha256-ToM3ur0bqU5xXCtO8ekZwpvM1bRxtwa7CqOzGJEyY7I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/loro/default.nix b/pkgs/development/python-modules/loro/default.nix index 32d7e528a6f8..706c4b241e1e 100644 --- a/pkgs/development/python-modules/loro/default.nix +++ b/pkgs/development/python-modules/loro/default.nix @@ -8,17 +8,17 @@ buildPythonPackage rec { pname = "loro"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Is+xliW9ckXpdH7p1DsQURwWo1d1o4z5FNx0hjxNvog="; + hash = "sha256-0i3BfL7GUu2L9if4AaCjLieoe0R2oquW9FoC0WPXM64="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-b1zzDVK/pdxkAUeksmZZ8sbgyrXtJbwAfpNxkH4PevY="; + hash = "sha256-pJJiwLHh10G9L+NZhxcCif2OP1cpjyNCaeG28YyYxmM="; }; build-system = [ diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 850224bbeb70..74594ae40a5f 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.21.0"; + version = "0.21.1"; pyproject = true; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole"; tag = version; - hash = "sha256-gsNdV6JvxsdlyPOSn07nTrvU4ju+3si3SQhyN8ZX/ac="; + hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc="; }; postPatch = diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index adad2c3a3c7b..6035a4a37efd 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; tag = "v${version}"; - hash = "sha256-g7eGajqFLgFWxNKefuYVWF439zVohU8W1j3w91nblEY="; + hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix index 2a408c9a2572..95288e479324 100644 --- a/pkgs/development/python-modules/nodriver/default.nix +++ b/pkgs/development/python-modules/nodriver/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nodriver"; - version = "0.47.0"; + version = "0.48.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-X8MRgqTbcl6lb8BCJpopoT5Vorr4Pf3XMKqFHdUmlgg="; + hash = "sha256-i7HsT9dZH3RFerJ49hFYEiXu0BVi44eRPm2wairAuC8="; }; disabled = pythonOlder "3.9"; diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 80818f8347eb..f8a4cc2115b0 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20251027"; + version = "1.0.2.20251030"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-anbYf4eCK8QIdLWYYx1PG4sImXK2lWMd0oAlsonvb1Q="; + hash = "sha256-vEQp18br81UIBQtfVW8XAsR3i9iMhTiPtDKQqyJhW9w="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index a9f460678924..b558d274f0e7 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "truenas"; repo = "py-SMART"; tag = "v${version}"; - hash = "sha256-eVrJ83MTIlu7sDrOoaXwiWqxYmDJFU8tf+pb3ui9N5w="; + hash = "sha256-h9FBAoNYLs5XvLxSajyktCCcNgiT7mIp472C+fbqZFA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix index f5674995960f..b441e1893743 100644 --- a/pkgs/development/python-modules/pyspelling/default.nix +++ b/pkgs/development/python-modules/pyspelling/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "pyspelling"; - version = "2.11"; + version = "2.12"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lMxu+pecJneWAa1mb42Yat9S0kezEzN61nqscWN0nQ4="; + hash = "sha256-ezl5EeRrf6fBBWsoZ8AugVR/yNALvNhEZWVd8j5J26o="; }; build-system = [ diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix index 5f831293e994..d70d39d7b379 100644 --- a/pkgs/development/python-modules/rigour/default.nix +++ b/pkgs/development/python-modules/rigour/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "rigour"; - version = "1.3.13"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "opensanctions"; repo = "rigour"; tag = "v${version}"; - hash = "sha256-mcQ1GqmNWv4/ul9oRw/+MnTEcIcn3OP0C5eXi4HWKMU="; + hash = "sha256-PxlYJQN2y+mqS48Cbd3/dCubzNzMVL+Q+MR5YJmAVtI="; }; build-system = [ diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix index d247f11c611f..395a46fe100a 100644 --- a/pkgs/development/python-modules/schedula/default.nix +++ b/pkgs/development/python-modules/schedula/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "schedula"; - version = "1.5.65"; + version = "1.5.69"; pyproject = true; src = fetchFromGitHub { owner = "vinci1it2000"; repo = "schedula"; tag = "v${version}"; - hash = "sha256-f67W6oyX7oEZSGXTth+FHOa8efj1tQ+B0taDDqjOSR8="; + hash = "sha256-4TIppCYfCIf5mEqBeuX/pP27RyAI40es1ULidb+i+o8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 736cc627d4b6..0745d055e92a 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -67,14 +67,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "2.39.0"; + version = "2.43.0"; pyproject = true; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; tag = version; - hash = "sha256-2M5Uvo8dl6hOqY13Eqjo4aKFySdlqEO8BHrPxZ/l+fw="; + hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 7a6b4a145468..6cd8f8bdfd60 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -3,21 +3,18 @@ buildPythonPackage, fetchFromGitHub, flit-core, - pythonOlder, }: buildPythonPackage rec { pname = "stdlibs"; - version = "2025.5.10"; + version = "2025.10.28"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "omnilib"; repo = "stdlibs"; tag = "v${version}"; - hash = "sha256-pvQZ+sRmad5m274wbIulHh5Tifim35uH7mz69jopVRw="; + hash = "sha256-1xdwYwkQqkPsa5yjrTUM0HxRVLJ+ZQvYwFpjIlW7jaY="; }; build-system = [ flit-core ]; @@ -30,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Overview of the Python stdlib"; homepage = "https://github.com/omnilib/stdlibs"; - changelog = "https://github.com/omnilib/stdlibs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/omnilib/stdlibs/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index d7df69bc30a1..10c60fc80aff 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,31 +1,25 @@ { lib, - better-exceptions, buildPythonPackage, fetchFromGitHub, - freezegun, - greenlet, hatch-fancy-pypi-readme, hatch-vcs, hatchling, - pretend, pytest-asyncio, pytestCheckHook, - rich, - simplejson, - twisted, + time-machine, }: buildPythonPackage rec { pname = "structlog"; - version = "25.4.0"; + version = "25.5.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; tag = version; - hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30="; + hash = "sha256-dY18eZ7IEzP/eKR7d2CjpTRr2KfXy+YmeZMueHkLSQY="; }; build-system = [ @@ -35,15 +29,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - better-exceptions - freezegun - greenlet - pretend pytest-asyncio pytestCheckHook - rich - simplejson - twisted + time-machine ]; pythonImportsCheck = [ "structlog" ]; diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix index 2af60a2115b0..e2a21306f432 100644 --- a/pkgs/development/python-modules/torchao/default.nix +++ b/pkgs/development/python-modules/torchao/default.nix @@ -104,6 +104,52 @@ buildPythonPackage rec { # FileNotFoundError: [Errno 2] No such file or directory: 'checkpoints/meta-llama/Llama-2-7b-chat-hf/model.pth' "test_gptq_mt" + + # KeyError: '_guards_fn + "test_add" + "test_add_relu" + "test_allow_exported_model_train_eval" + "test_allow_exported_model_train_eval_idempotent" + "test_conv2d" + "test_disallow_eval_train" + "test_dynamic_linear" + "test_fold_bn_erases_bn_node" + "test_fold_bn_erases_bn_node" + "test_maxpool2d" + "test_move_exported_model_bn_device_cpu" + "test_move_exported_model_dropout" + "test_move_exported_model_dropout_inplace" + "test_preserve_nn_module_stack" + "test_qat_bn_conv2d" + "test_qat_conv2d" + "test_qat_conv2d_binary" + "test_qat_conv2d_binary2" + "test_qat_conv2d_binary_unary" + "test_qat_conv2d_unary" + "test_qat_conv_bn_bias_derived_qspec" + "test_qat_conv_bn_fusion" + "test_qat_conv_bn_fusion_literal_args" + "test_qat_conv_bn_fusion_no_conv_bias" + "test_qat_conv_bn_per_channel_weight_bias" + "test_qat_conv_bn_relu_fusion" + "test_qat_conv_bn_relu_fusion_no_conv_bias" + "test_qat_conv_transpose_bn" + "test_qat_conv_transpose_bn_relu" + "test_qat_per_channel_weight_custom_dtype" + "test_qat_preserve_source_fn_stack" + "test_qat_qconv2d" + "test_qat_qconv2d_add" + "test_qat_qconv2d_add_relu" + "test_qat_qconv2d_hardswish" + "test_qat_qconv2d_hardtanh" + "test_qat_qconv2d_relu" + "test_qat_qconv2d_relu6" + "test_qat_qconv2d_silu" + "test_qat_update_shared_qspec" + "test_qdq" + "test_qdq_per_channel" + "test_reentrant" + "test_static_linear" ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # AssertionError: tensor(False) is not true @@ -135,6 +181,10 @@ buildPythonPackage rec { # RuntimeError: No packed_weights_format was selected "TestIntxOpaqueTensor" "test_accuracy_kleidiai" + + # RuntimeError: quantized engine NoQEngine is not supported + "test_smooth_linear_cpu" + "test_smooth_linear_edge_cases" ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # Flaky: [gw0] node down: keyboard-interrupt diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix index c2628967ccc5..a23d6b02e47c 100644 --- a/pkgs/development/python-modules/ttn-client/default.nix +++ b/pkgs/development/python-modules/ttn-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "ttn-client"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "angelnu"; repo = "thethingsnetwork_python_client"; tag = "v${version}"; - hash = "sha256-B3AN0VqMhQoqqPjUf/JTWYdyVQVXt+QsBbqsooDsuDE="; + hash = "sha256-PEkxEKet0nrowWJ4J3AqqqdecO4zSbTampz/Dx0QD2s="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 6eef16930505..f2144153303b 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.8.4"; + version = "9.8.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-vkRGSFWCOHcGUC5oBmgvCi1mNFp/SsHv5/bhceYVlY0="; + hash = "sha256-krEhiuE3Yd4w9zGpCzvR8X2w6M0dvPRZsavrtTNhKDA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 0a92d42fa9c4..62d734364025 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.6.3"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "vector"; tag = "v${version}"; - hash = "sha256-KwxQ2sA8cdHmTRbh23H5iTexMlWK2MxdA8XWpXscpfU="; + hash = "sha256-U1ttxt7Ba+NrcbslmkZT/d+ZdXrmk0teT5vGAcfLqF4="; }; build-system = [ diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index be9b1d2a9174..6654bafef12d 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -3,7 +3,6 @@ config, callPackage, newScope, - recurseIntoAttrs, symlinkJoin, fetchFromGitHub, boost179, @@ -33,7 +32,7 @@ let rocmUpdateScript = self.callPackage ./update.nix { }; ## ROCm ## - llvm = recurseIntoAttrs ( + llvm = lib.recurseIntoAttrs ( callPackage ./llvm/default.nix { # rocm-device-libs is used for .src only # otherwise would cause infinite recursion diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix index 6a5da56092d8..580948eea030 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/default.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix @@ -2,7 +2,6 @@ lib, newScope, python3, - recurseIntoAttrs, }: # Take packages from self first, then python.pkgs (and secondarily pkgs) lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { @@ -14,7 +13,7 @@ lib.makeScope (self: newScope (self.python.pkgs // self)) (self: { buildbot = self.callPackage ./master.nix { }; - buildbot-plugins = recurseIntoAttrs (self.callPackage ./plugins.nix { }); + buildbot-plugins = lib.recurseIntoAttrs (self.callPackage ./plugins.nix { }); buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index bc28480a125c..36975a26bcf7 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -3,7 +3,6 @@ stdenvNoCC, gccStdenv, lib, - recurseIntoAttrs, libsForQt5, newScope, perlPackages, diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 375f7b7eef29..4dc2b194966c 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -49,7 +49,7 @@ let callWithName = name: value: if lib.isFunction value then value name else value; buildOpenRASet = f: args: - pkgs.recurseIntoAttrs ( + lib.recurseIntoAttrs ( lib.mapAttrs callWithName ( f ( { @@ -65,7 +65,7 @@ let ); in -pkgs.recurseIntoAttrs rec { +lib.recurseIntoAttrs rec { # The whole attribute set is destructered to ensure those (and only those) attributes are given # and to provide defaults for those that are optional. buildOpenRAEngine = diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix deleted file mode 100644 index ad44114be3a7..000000000000 --- a/pkgs/games/path-of-building/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unzip, - meson, - ninja, - pkg-config, - qtbase, - qttools, - wrapQtAppsHook, - icoutils, - copyDesktopItems, - makeDesktopItem, - luajit, -}: -let - data = stdenv.mkDerivation (finalAttrs: { - pname = "path-of-building-data"; - version = "2.56.0"; - - src = fetchFromGitHub { - owner = "PathOfBuildingCommunity"; - repo = "PathOfBuilding"; - rev = "v${finalAttrs.version}"; - hash = "sha256-vzTMkrZgXtsCtEyxaDkea/MRj8tZDzDV3JAc440xrM8="; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = '' - # I have absolutely no idea how this file is generated - # and I don't think I want to know. The Flatpak also does this. - unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua - - # Install the actual data - cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out - - # Pretend this is an official build so we don't get the ugly "dev mode" warning - substituteInPlace $out/manifest.xml --replace ' $out/src/UpdateCheck.lua - ''; - }); -in -stdenv.mkDerivation { - pname = "path-of-building"; - version = "${data.version}-unstable-2023-04-09"; - - src = fetchFromGitHub { - owner = "ernstp"; - repo = "pobfrontend"; - rev = "9faa19aa362f975737169824c1578d5011487c18"; - hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - qttools - wrapQtAppsHook - icoutils - ] - ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; - - buildInputs = [ - qtbase - luajit - luajit.pkgs.lua-curl - luajit.pkgs.luautf8 - ]; - - installPhase = '' - runHook preInstall - install -Dm555 pobfrontend $out/bin/pobfrontend - - wrestool -x -t 14 ${data.src}/runtime/Path{space}of{space}Building.exe -o pathofbuilding.ico - icotool -x pathofbuilding.ico - - for size in 16 32 48 256; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - install -Dm 644 pathofbuilding*"$size"x"$size"*.png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png - done - rm pathofbuilding.ico - - runHook postInstall - ''; - - preFixup = '' - qtWrapperArgs+=( - --set LUA_PATH "$LUA_PATH" - --set LUA_CPATH "$LUA_CPATH" - --chdir "${data}" - ) - ''; - - desktopItems = [ - (makeDesktopItem { - name = "path-of-building"; - desktopName = "Path of Building"; - comment = "Offline build planner for Path of Exile"; - exec = "pobfrontend %U"; - terminal = false; - type = "Application"; - icon = "pathofbuilding"; - categories = [ "Game" ]; - keywords = [ - "poe" - "pob" - "pobc" - "path" - "exile" - ]; - mimeTypes = [ "x-scheme-handler/pob" ]; - }) - ]; - - passthru.data = data; - - meta = { - description = "Offline build planner for Path of Exile"; - homepage = "https://pathofbuilding.community/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.k900 ]; - mainProgram = "pobfrontend"; - broken = stdenv.hostPlatform.isDarwin; # doesn't find uic6 for some reason - }; -} diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index aa1b6de6dab0..d928f71c757d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.55"; - hash = "sha256-JxCRiUw8dwxsEhPrvNRRRRvVSTE6JFluLRZZ4C2yoqo="; + version = "6.12.56"; + hash = "sha256-+uMzNrX97n16vuMJU2J4l9gNwge46LQDVrPxSftpvyA="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "6.17.5"; - hash = "sha256-w07UZmKXZ59h5DVzqH2ECzIMmeXyLfrq83FcTN5TVXo="; + version = "6.17.6"; + hash = "sha256-SGaM42dN+pl0GAQRDmCR6QB0ET1loqfFwC7kUxTXEjw="; }; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index e6ec7052f1fc..d0f7d0a4e830 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -16,9 +16,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.17.2"; # zen + version = "6.17.6"; # zen suffix = "zen1"; # zen - sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen + sha256 = "0kkrfmxj1q7il7njc1s8fnn459rcgviyy5q2kbynasrqij5kdciy"; # zen isLqx = false; }; # ./update-zen.py lqx diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index e5c480935230..c357a3e7ebdc 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -28,7 +28,6 @@ multipath-tools, nixosTests, buildFHSEnv, - recurseIntoAttrs, }: # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well @@ -224,7 +223,7 @@ stdenv.mkDerivation rec { passthru.tests = { installer = nixosTests.installer.lvm; - lvm2 = recurseIntoAttrs nixosTests.lvm2; + lvm2 = lib.recurseIntoAttrs nixosTests.lvm2; # https://github.com/NixOS/nixpkgs/issues/369732 lvm2-fhs-env = buildFHSEnv { diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 81c297d1b898..8b0215338abb 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.13.0-unstable-2025-10-23"; + version = "0.13.0-unstable-2025-10-27"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "6465921a5adb3a3335494598463066a6c3540cb5"; - sha256 = "sha256-UKLJ+sf2g6BSbF+aNZ+QGcqVjFkV5GX9Sei6BCdqQL4="; + rev = "99c0bfca4f4875e8a602c9b4ffc698d9e5cc59a0"; + sha256 = "sha256-U+oDa8g5o8F5i2A81/glOPaTTrBv6dBEHdYht2jrVu4="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 207e1577328c..4b81f42b68ba 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -13,13 +13,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.22.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "timescale"; repo = "timescaledb"; tag = finalAttrs.version; - hash = "sha256-SEuxHbSxgTC4Uk6nnznVzUqvoZMGgF+KSMNzkYfgfpI="; + hash = "sha256-wgRaWxGr48p8xMc+yOQEN196KAKyptMCk/UFKn23cos="; }; nativeBuildInputs = [ cmake ]; @@ -101,13 +101,6 @@ postgresqlBuildExtension (finalAttrs: { maintainers = with lib.maintainers; [ kirillrdy ]; platforms = postgresql.meta.platforms; license = with lib.licenses; if enableUnfree then tsl else asl20; - broken = - lib.versionOlder postgresql.version "15" - || - # PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233 - # Check after next package update. - lib.warnIf (finalAttrs.version != "2.22.1") "Is postgresql18Packages.timescaledb still broken?" ( - lib.versionAtLeast postgresql.version "18" - ); + broken = lib.versionOlder postgresql.version "15"; }; }) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index a16f259a5c37..1d44b19da0df 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -10,6 +10,7 @@ callPackage, nixosTests, + defaultGemConfig, ruby_3_3, gzip, gnutar, @@ -34,6 +35,10 @@ procps, rsync, icu, + rustPlatform, + buildRubyGem, + rustc, + cargo, pnpm_9, svgo, nodejs, @@ -46,13 +51,13 @@ }: let - version = "3.4.7"; + version = "3.5.2"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-vidv5aa2r1YOcnvkqrk7ttuIk1bN5Ct7kMANl8kpEm0="; + sha256 = "sha256-8Uzb0cjC3PUrh6Nlu6OJ09GKD+8KZq/IUba2NXLm1JI="; }; ruby = ruby_3_3; @@ -117,9 +122,12 @@ let ); in stdenv.mkDerivation ( - removeAttrs args [ "bundlerEnvArgs" ] - // { + # Allow overriding the plugin name + { pluginName = if name != null then name else "${pname}-${version}"; + } + // removeAttrs args [ "bundlerEnvArgs" ] + // { dontConfigure = true; dontBuild = true; installPhase = '' @@ -168,54 +176,116 @@ let name = "discourse-ruby-env-${version}"; inherit version ruby; gemdir = ./rubyEnv; - gemset = - let - gems = import ./rubyEnv/gemset.nix; - in - gems - // { - mini_racer = gems.mini_racer // { - buildInputs = [ icu ]; + gemset = import ./rubyEnv/gemset.nix; + gemConfig = defaultGemConfig // { + mini_racer = attrs: { + buildInputs = [ icu ]; + dontBuild = false; + NIX_LDFLAGS = "-licui18n"; + }; + libv8-node = + attrs: + let + noopScript = writeShellScript "noop" "exit 0"; + linkFiles = writeShellScript "link-files" '' + cd ../.. + + mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ + ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a + + ln -s ${nodejs.libv8}/include vendor/v8/include + + mkdir -p ext/libv8-node + echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml + ''; + in + { dontBuild = false; - NIX_LDFLAGS = "-licui18n"; - }; - libv8-node = - let - noopScript = writeShellScript "noop" "exit 0"; - linkFiles = writeShellScript "link-files" '' - cd ../.. - - mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ - ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a - - ln -s ${nodejs.libv8}/include vendor/v8/include - - mkdir -p ext/libv8-node - echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml - ''; - in - gems.libv8-node - // { - dontBuild = false; - postPatch = '' - cp ${noopScript} libexec/build-libv8 - cp ${noopScript} libexec/build-monolith - cp ${noopScript} libexec/download-node - cp ${noopScript} libexec/extract-node - cp ${linkFiles} libexec/inject-libv8 - ''; - }; - mini_suffix = gems.mini_suffix // { - propagatedBuildInputs = [ libpsl ]; - dontBuild = false; - # Use our libpsl instead of the vendored one, which isn't - # available for aarch64. It has to be called - # libpsl.x86_64.so or it isn't found. postPatch = '' - cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so + cp ${noopScript} libexec/build-libv8 + cp ${noopScript} libexec/build-monolith + cp ${noopScript} libexec/download-node + cp ${noopScript} libexec/extract-node + cp ${linkFiles} libexec/inject-libv8 ''; }; + mini_suffix = attrs: { + propagatedBuildInputs = [ libpsl ]; + dontBuild = false; + # Use our libpsl instead of the vendored one, which isn't + # available for aarch64. It has to be called + # libpsl.x86_64.so or it isn't found. + postPatch = '' + cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so + ''; }; + tokenizers = attrs: { + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + hash = "sha256-ydSXo3wp13/mPgJv1HbavNurkd2KxuKzuJNHliPpn2I="; + }; + + dontBuild = false; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + disallowedReferences = [ + rustc.unwrapped + ]; + + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + ''; + + postInstall = '' + find $out -type f -name .rustc_info.json -delete + ''; + }; + tiktoken_ruby = attrs: { + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (buildRubyGem { inherit (attrs) gemName version source; }) + name + src + unpackPhase + nativeBuildInputs + ; + hash = "sha256-IABOxUymtFkF9sl1kRWAS5hM6GNJI6Y4VFICXdX7zF0="; + }; + + dontBuild = false; + + nativeBuildInputs = [ + cargo + rustc + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + ]; + + disallowedReferences = [ + rustc.unwrapped + ]; + + preInstall = '' + export CARGO_HOME="$PWD/../.cargo/" + ''; + + postInstall = '' + #ls $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib + #mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,} + find $out -type f -name .rustc_info.json -delete + ''; + }; + }; groups = [ "default" @@ -233,11 +303,13 @@ let pname = "discourse-assets"; inherit version src; fetcherVersion = 1; - hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y="; + hash = "sha256-npRKX5Lr2QrPD8OFBysDl30exP+FTnjMxFeR/Gv0Z0I="; }; nativeBuildInputs = runtimeDeps ++ [ - postgresql + (postgresql.withPackages (ps: [ + ps.pgvector + ])) redis uglify-js terser @@ -251,6 +323,7 @@ let "out" "javascripts" "node_modules" + "generated" ]; patches = [ @@ -274,6 +347,14 @@ let ]; env.RAILS_ENV = "production"; + env.DISCOURSE_DOWNLOAD_PRE_BUILT_ASSETS = "0"; + # Allow to use different bundler version than the lockfile has + env.BUNDLER_VERSION = pkgs.bundler.version; + + # requires full git and repository, even a src `leaveDotGit` is not enough. So patch this function to return the version + postPatch = '' + substituteInPlace script/assemble_ember_build.rb --replace-fail "def core_tree_hash" "def core_tree_hash; return \"v${version}\"" + ''; # We have to set up an environment that is close enough to # production ready or the assets:precompile task refuses to @@ -300,6 +381,7 @@ let psql -d postgres -tAc 'CREATE DATABASE "discourse" OWNER "discourse"' psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS hstore" + psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS vector" ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/${p.pluginName or ""}") plugins} @@ -310,6 +392,7 @@ let buildPhase = '' runHook preBuild + patchShebangs script/ bundle exec rake assets:precompile runHook postBuild @@ -322,9 +405,10 @@ let mv node_modules $node_modules - rm -r app/assets/javascripts/plugins + rm -rf app/assets/javascripts/plugins mv app/assets/javascripts $javascripts ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins + mv app/assets/generated $generated runHook postInstall ''; @@ -374,6 +458,10 @@ let # theme-transpiler over and over again. Which at the same time allows the removal # of javascript devDependencies from the runtime environment. ./prebuild-theme-transpiler.patch + + # Our app/assets/generated folder is a symlink, but the ruby File.mkdir_p doesn't allow + # a symlink in the way to the last directory. This patch explicitly resolves the symlink. + ./resolve_generated_assets_symlink.patch ]; postPatch = '' @@ -406,6 +494,7 @@ let ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/public $out/share/discourse/public + ln -sf /run/discourse/assets-generated $out/share/discourse/app/assets/generated ln -sf ${assets.node_modules} $out/share/discourse/node_modules ln -sf ${assets} $out/share/discourse/public.dist/assets rm -r $out/share/discourse/app/assets/javascripts diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix index 864bdb978d4f..df908dcb6b6d 100644 --- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix +++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix @@ -3,25 +3,10 @@ let callPackage = newScope args; in { - discourse-assign = callPackage ./discourse-assign { }; discourse-bbcode-color = callPackage ./discourse-bbcode-color { }; - discourse-calendar = callPackage ./discourse-calendar { }; - discourse-canned-replies = callPackage ./discourse-canned-replies { }; - discourse-chat-integration = callPackage ./discourse-chat-integration { }; - discourse-checklist = callPackage ./discourse-checklist { }; - discourse-data-explorer = callPackage ./discourse-data-explorer { }; discourse-docs = callPackage ./discourse-docs { }; - discourse-github = callPackage ./discourse-github { }; discourse-ldap-auth = callPackage ./discourse-ldap-auth { }; - discourse-math = callPackage ./discourse-math { }; - discourse-migratepassword = callPackage ./discourse-migratepassword { }; - discourse-oauth2-basic = callPackage ./discourse-oauth2-basic { }; - discourse-openid-connect = callPackage ./discourse-openid-connect { }; discourse-prometheus = callPackage ./discourse-prometheus { }; - discourse-reactions = callPackage ./discourse-reactions { }; discourse-saved-searches = callPackage ./discourse-saved-searches { }; - discourse-solved = callPackage ./discourse-solved { }; - discourse-spoiler-alert = callPackage ./discourse-spoiler-alert { }; - discourse-voting = callPackage ./discourse-voting { }; discourse-yearly-review = callPackage ./discourse-yearly-review { }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix deleted file mode 100644 index 610d60a3b915..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-assign"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-assign"; - rev = "261a47d119d200a8d922d008ad3d1667df869435"; - sha256 = "sha256-0OClWO70btM7EN7Vir1LIhCTeO5+2jtkP4RozoKzp+0="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-docs"; - maintainers = with maintainers; [ dpausp ]; - license = licenses.mit; - description = "Discourse Plugin for assigning users to a topic"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix index d1a09684cea5..0acecf9b617b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-bbcode-color"; - rev = "ecd4befeb4eae48aa0a37a88e5aca60e59730411"; - sha256 = "sha256-enpeXc6pE9+5EdbMIFsnWd++ixlHBKFRxbXmvJYJftg="; + rev = "14b8370160cda35568470a36a25e508eb8364609"; + sha256 = "sha256-3yIV5LKsYSDrhBwsalKZo9jY6j8kNzz99x/AJ95kPuk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-bbcode-color"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile deleted file mode 100644 index 76faf85df5e2..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -# gem "rails" -gem "rrule", "0.4.4", require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock deleted file mode 100644 index 15aafaf94c9c..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ /dev/null @@ -1,35 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (7.1.3.3) - base64 - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - base64 (0.2.0) - bigdecimal (3.1.8) - concurrent-ruby (1.2.3) - connection_pool (2.4.1) - drb (2.2.1) - i18n (1.14.5) - concurrent-ruby (~> 1.0) - minitest (5.23.1) - mutex_m (0.2.0) - rrule (0.4.4) - activesupport (>= 2.3) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - -PLATFORMS - ruby - -DEPENDENCIES - rrule (= 0.4.4) - -BUNDLED WITH - 2.5.9 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix deleted file mode 100644 index ddde5a700a26..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-calendar"; - bundlerEnvArgs.gemdir = ./.; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-calendar"; - rev = "8d09cf8503b78f4c72b47a7319c0f4b9ad0247e7"; - sha256 = "sha256-ES0/f/sv4Doao/MOdHYMwadRIVXb1I7FgSsl7790tio="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-calendar"; - maintainers = with maintainers; [ ryantm ]; - license = licenses.mit; - description = "Adds the ability to create a dynamic calendar in the first post of a topic"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix deleted file mode 100644 index 8fdcbcd0fa35..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ - activesupport = { - dependencies = [ - "base64" - "bigdecimal" - "concurrent-ruby" - "connection_pool" - "drb" - "i18n" - "minitest" - "mutex_m" - "tzinfo" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i"; - type = "gem"; - }; - version = "7.1.3.3"; - }; - base64 = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; - type = "gem"; - }; - version = "0.2.0"; - }; - bigdecimal = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; - type = "gem"; - }; - version = "3.1.8"; - }; - concurrent-ruby = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; - type = "gem"; - }; - version = "1.2.3"; - }; - connection_pool = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; - type = "gem"; - }; - version = "2.4.1"; - }; - drb = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; - type = "gem"; - }; - version = "2.2.1"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; - type = "gem"; - }; - version = "1.14.5"; - }; - minitest = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; - type = "gem"; - }; - version = "5.23.1"; - }; - mutex_m = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; - rrule = { - dependencies = [ "activesupport" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04h3q0ws0wswqj3mwjyv44yx59d9ima9a820ay9w5bwnlb73syj2"; - type = "gem"; - }; - version = "0.4.4"; - }; - tzinfo = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix deleted file mode 100644 index b6f6c113ea24..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-canned-replies"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-canned-replies"; - rev = "732598b6cdc86c74622bb15bfeaebb05611bbc25"; - sha256 = "sha256-t0emNsPT8o0ralUedt33ufH0VLl4/12lVBBCnzfdRxE="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-canned-replies"; - maintainers = with maintainers; [ talyz ]; - license = licenses.gpl2Only; - description = "Adds support for inserting a canned reply into the composer window via a UI"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix deleted file mode 100644 index d64aea099066..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-chat-integration"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-chat-integration"; - rev = "29ad813cd04812786780e1706cbc043810dea7d8"; - sha256 = "sha256-5mGnHLlw3qIGi8et3WV1RXnrPB+bySi3wQryKTa5wNg="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-chat-integration"; - maintainers = with maintainers; [ dpausp ]; - license = licenses.mit; - description = "This plugin integrates Discourse with a number of external chatroom systems"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix deleted file mode 100644 index d9934bc3d872..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-checklist"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-checklist"; - rev = "6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1"; - sha256 = "sha256-RIuoqZo7dW1DXbfbWhyyhCOGe4R5sLerzFW2TT0zO6U="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-checklist"; - maintainers = with maintainers; [ ryantm ]; - license = licenses.gpl2Only; - description = "Simple checklist rendering plugin for discourse"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix deleted file mode 100644 index d5b4a95b5c66..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-data-explorer"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-data-explorer"; - rev = "2ba204a1de2638a7959e588b88f3b6c7fcf7a70f"; - sha256 = "sha256-u8yGKANEyqm63/ZnJLe3u1nkNGZyX0wFUBIKU5GgjzY="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-data-explorer"; - maintainers = with maintainers; [ ryantm ]; - license = licenses.mit; - description = "SQL Queries for admins in Discourse"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 573bffa7808a..617da737f0af 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "4e42539cda9a54d7827bcdf51b6dfbcf56d24cc9"; - sha256 = "sha256-sv9Q0qEQVncQw3QLiro5YfVcHJAG8sJ0GTjduCZ0iP4="; + rev = "ff5d738a9f9d85847e6fc226f8324ad9cf466007"; + sha256 = "sha256-p5QYM6jbsqe9a3UouHdVimSxZeBvsoM/hb0UQ7iV1IM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile deleted file mode 100644 index c24a3e860d7c..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -# gem "rails" -gem "sawyer", "0.9.2" -gem "octokit", "5.6.1" diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock deleted file mode 100644 index f2931a5d4ad1..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ /dev/null @@ -1,33 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - faraday (2.12.3) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-net_http (3.4.0) - net-http (>= 0.5.0) - json (2.10.2) - logger (1.7.0) - net-http (0.6.0) - uri - octokit (5.6.1) - faraday (>= 1, < 3) - sawyer (~> 0.9) - public_suffix (6.0.1) - sawyer (0.9.2) - addressable (>= 2.3.5) - faraday (>= 0.17.3, < 3) - uri (1.0.3) - -PLATFORMS - ruby - -DEPENDENCIES - octokit (= 5.6.1) - sawyer (= 0.9.2) - -BUNDLED WITH - 2.5.22 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix deleted file mode 100644 index 972a06f778c0..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-github"; - bundlerEnvArgs.gemdir = ./.; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-github"; - rev = "59e5fc5692959c6c564ab0e09de364ccfedd6702"; - sha256 = "sha256-b+8eSw8Kbz2CZN16Rd7c8uyH5P1iYhOJmdXu1C5UclU="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-github"; - maintainers = with maintainers; [ talyz ]; - license = licenses.mit; - description = "Adds GitHub badges and linkback functionality"; - }; - -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix deleted file mode 100644 index 36d463ebb5c5..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ - addressable = { - dependencies = [ "public_suffix" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; - type = "gem"; - }; - version = "2.8.7"; - }; - faraday = { - dependencies = [ - "faraday-net_http" - "json" - "logger" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dxalpc0ldvjjmd7z95na9lm99d2baz48sf9axk3a6x3pn50ibdi"; - type = "gem"; - }; - version = "2.12.3"; - }; - faraday-net_http = { - dependencies = [ "net-http" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; - type = "gem"; - }; - version = "3.4.0"; - }; - json = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; - type = "gem"; - }; - version = "2.10.2"; - }; - logger = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; - type = "gem"; - }; - version = "1.7.0"; - }; - net-http = { - dependencies = [ "uri" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; - type = "gem"; - }; - version = "0.6.0"; - }; - octokit = { - dependencies = [ - "faraday" - "sawyer" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8"; - type = "gem"; - }; - version = "5.6.1"; - }; - public_suffix = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; - type = "gem"; - }; - version = "6.0.1"; - }; - sawyer = { - dependencies = [ - "addressable" - "faraday" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; - type = "gem"; - }; - version = "0.9.2"; - }; - uri = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; - type = "gem"; - }; - version = "1.0.3"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 898806d4b8f0..c93a3e115878 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -7,6 +7,7 @@ mkDiscoursePlugin { name = "discourse-ldap-auth"; bundlerEnvArgs.gemdir = ./.; + pluginName = "ldap"; src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix deleted file mode 100644 index db65b1d07a59..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-math"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-math"; - rev = "90a56a5b463546cba5017cf25168bae759bcbf77"; - sha256 = "sha256-q8cNRIHYEkaE6QkdsHu4tPwSw3LnCNgKjbyESBXheE0="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-math"; - maintainers = with maintainers; [ talyz ]; - license = licenses.mit; - description = "Official MathJax support for Discourse"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile deleted file mode 100644 index ba35ee28efa9..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -# gem "rails" -gem 'bcrypt', '3.1.13' -gem 'unix-crypt', '1.3.0' -gem 'ffi-compiler', '1.0.1', require: false -gem 'argon2', '2.2.0' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock deleted file mode 100644 index e806952546ee..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ /dev/null @@ -1,25 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - argon2 (2.2.0) - ffi (~> 1.15) - ffi-compiler (~> 1.0) - bcrypt (3.1.13) - ffi (1.17.0) - ffi-compiler (1.0.1) - ffi (>= 1.0.0) - rake - rake (13.2.1) - unix-crypt (1.3.0) - -PLATFORMS - ruby - -DEPENDENCIES - argon2 (= 2.2.0) - bcrypt (= 3.1.13) - ffi-compiler (= 1.0.1) - unix-crypt (= 1.3.0) - -BUNDLED WITH - 2.5.11 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix deleted file mode 100644 index 862e53fa4433..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-migratepassword"; - bundlerEnvArgs.gemdir = ./.; - src = fetchFromGitHub { - owner = "communiteq"; - repo = "discourse-migratepassword"; - rev = "a732ae244cd4125561fd225a67bae95ef5f738d0"; - sha256 = "sha256-EO+QnFTy3PgxZ92DZBm9sP8sFAny3ZpFw+faTX32j7Q="; - }; - meta = with lib; { - homepage = "https://github.com/communiteq/discourse-migratepassword"; - maintainers = with maintainers; [ ryantm ]; - license = licenses.gpl2Only; - description = "Support migrated password hashes"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix deleted file mode 100644 index d1c88454e8bc..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - argon2 = { - dependencies = [ - "ffi" - "ffi-compiler" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd"; - type = "gem"; - }; - version = "2.2.0"; - }; - bcrypt = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ai0m15jg3n0b22mimk09ppnga316dc7dyvz06w8rrqh5gy1lslp"; - type = "gem"; - }; - version = "3.1.13"; - }; - ffi = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; - type = "gem"; - }; - version = "1.17.0"; - }; - ffi-compiler = { - dependencies = [ - "ffi" - "rake" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; - type = "gem"; - }; - version = "1.0.1"; - }; - rake = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; - type = "gem"; - }; - version = "13.2.1"; - }; - unix-crypt = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq"; - type = "gem"; - }; - version = "1.3.0"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile deleted file mode 100644 index 7da32ec03949..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -source 'https://rubygems.org' - -group :development do - gem 'rubocop-discourse' -end diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock deleted file mode 100644 index 6a91a08c0e86..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock +++ /dev/null @@ -1,37 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.2) - parallel (1.22.1) - parser (3.1.1.0) - ast (~> 2.4.1) - rainbow (3.1.1) - regexp_parser (2.2.1) - rexml (3.2.5) - rubocop (1.26.1) - parallel (~> 1.10) - parser (>= 3.1.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.16.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.16.0) - parser (>= 3.1.1.0) - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.9.0) - rubocop (~> 1.19) - ruby-progressbar (1.11.0) - unicode-display_width (2.1.0) - -PLATFORMS - ruby - -DEPENDENCIES - rubocop-discourse - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix deleted file mode 100644 index 9cad18c9eb5b..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin rec { - name = "discourse-oauth2-basic"; - bundlerEnvArgs.gemdir = ./.; - src = fetchFromGitHub { - owner = "discourse"; - repo = name; - rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308"; - sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/${name}"; - license = licenses.mit; - description = "Basic OAuth2 plugin for use with Discourse"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix deleted file mode 100644 index 8bbea6576bf1..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix +++ /dev/null @@ -1,172 +0,0 @@ -{ - ast = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - parallel = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; - type = "gem"; - }; - version = "1.22.1"; - }; - parser = { - dependencies = [ "ast" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; - type = "gem"; - }; - version = "3.1.1.0"; - }; - rainbow = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - regexp_parser = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; - type = "gem"; - }; - version = "2.2.1"; - }; - rexml = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rubocop = { - dependencies = [ - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rexml" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl"; - type = "gem"; - }; - version = "1.26.1"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; - type = "gem"; - }; - version = "1.16.0"; - }; - rubocop-discourse = { - dependencies = [ - "rubocop" - "rubocop-rspec" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g"; - type = "gem"; - }; - version = "2.5.0"; - }; - rubocop-rspec = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; - type = "gem"; - }; - version = "2.9.0"; - }; - ruby-progressbar = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; - type = "gem"; - }; - version = "1.11.0"; - }; - unicode-display_width = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; - type = "gem"; - }; - version = "2.1.0"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile deleted file mode 100644 index 7da32ec03949..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -source 'https://rubygems.org' - -group :development do - gem 'rubocop-discourse' -end diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock deleted file mode 100644 index 0987b206fa66..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock +++ /dev/null @@ -1,37 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.1) - parallel (1.19.2) - parser (2.7.2.0) - ast (~> 2.4.1) - rainbow (3.0.0) - regexp_parser (1.8.1) - rexml (3.2.5) - rubocop (0.93.0) - parallel (~> 1.10) - parser (>= 2.7.1.5) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) - rexml - rubocop-ast (>= 0.6.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.7.1) - parser (>= 2.7.1.5) - rubocop-discourse (2.3.2) - rubocop (>= 0.69.0) - rubocop-rspec (>= 1.39.0) - rubocop-rspec (1.43.2) - rubocop (~> 0.87) - ruby-progressbar (1.10.1) - unicode-display_width (1.7.0) - -PLATFORMS - ruby - -DEPENDENCIES - rubocop-discourse - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix deleted file mode 100644 index df9095c817d6..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-openid-connect"; - bundlerEnvArgs.gemdir = ./.; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-openid-connect"; - rev = "e08efecc012a5ab8fa95084be93d4fd07ccebab9"; - sha256 = "sha256-v4UWFDdOFON+nHkH490kBQ4sXX7Mrp7KVhN1x9HML7w="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-openid-connect"; - maintainers = with maintainers; [ mkg20001 ]; - license = licenses.mit; - description = "Discourse plugin to integrate Discourse with an openid-connect login provider"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix deleted file mode 100644 index 37d643eb7d03..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix +++ /dev/null @@ -1,172 +0,0 @@ -{ - ast = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; - type = "gem"; - }; - version = "2.4.1"; - }; - parallel = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; - type = "gem"; - }; - version = "1.19.2"; - }; - parser = { - dependencies = [ "ast" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; - type = "gem"; - }; - version = "2.7.2.0"; - }; - rainbow = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; - type = "gem"; - }; - version = "3.0.0"; - }; - regexp_parser = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n"; - type = "gem"; - }; - version = "1.8.1"; - }; - rexml = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rubocop = { - dependencies = [ - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rexml" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a"; - type = "gem"; - }; - version = "0.93.0"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74"; - type = "gem"; - }; - version = "0.7.1"; - }; - rubocop-discourse = { - dependencies = [ - "rubocop" - "rubocop-rspec" - ]; - groups = [ "development" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10l2wwnvd4xccgqsyhxrhc5bw10b7an4awl0v90fw5xf2qdjiflw"; - type = "gem"; - }; - version = "2.3.2"; - }; - rubocop-rspec = { - dependencies = [ "rubocop" ]; - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sc0bwdxzfr8byxzwvfyf22lwzqcaa6ca7wzxx31mk7vvy7r7dhl"; - type = "gem"; - }; - version = "1.43.2"; - }; - ruby-progressbar = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; - type = "gem"; - }; - version = "1.10.1"; - }; - unicode-display_width = { - groups = [ - "default" - "development" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; - type = "gem"; - }; - version = "1.7.0"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index 349057769dd8..db3f2d84b027 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -10,8 +10,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-prometheus"; - rev = "f46906e1d555f6838d74ea38d5037264cc1020b0"; - sha256 = "sha256-czrxhH0L+vCZA8DKN6acW///iWJs9GIppEeaP2MOJBQ="; + rev = "a1e0ba671e13ceb9541a4d62d3ff7d206393d438"; + sha256 = "sha256-tZdRbLxUs4qPbN39g/y1dVCa0b+6Pk8uvCvsKVbUkMk="; }; patches = [ diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix deleted file mode 100644 index 6733d343c1d0..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-reactions"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-reactions"; - rev = "f87583d9054421869ba0de16c24ad15e32bbebe7"; - sha256 = "sha256-v2AkpSTF3VNgBUfvRMQ3BCw0nClWjcVTdKNn9yiByBM="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-reactions"; - maintainers = with maintainers; [ bbenno ]; - license = licenses.mit; - description = "Allows users to react to a post from a choice of emojis, rather than only the like heart"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix index 3c69b86189e0..0fe4190d41d6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-saved-searches"; - rev = "b78aae086e95255b1a1e91a01e2d56b45b7aead2"; - sha256 = "sha256-Wai+oZR+Pzjre6Th0kQDgvFOwfPRHlZkpKYYOUKNlx4="; + rev = "e9afd599d95fa79ba8a37316290c1a059e995e04"; + sha256 = "sha256-UtXDY3IxxM+JFOGZlN9mgiwrDImOAzJJuHNlhIdnotM="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-saved-searches"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix deleted file mode 100644 index 9c919190dad6..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-solved"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-solved"; - rev = "e82c6ae1ca38ccebb34669148f8de93a3028906e"; - sha256 = "sha256-KwpBCk4fjkZlSzgtc0OXvQupPd+aPb9nONyyALpEZhg="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-solved"; - maintainers = with maintainers; [ talyz ]; - license = licenses.mit; - description = "Allow accepted answers on topics"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix deleted file mode 100644 index 75f78b9d6b70..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-spoiler-alert"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-spoiler-alert"; - rev = "42b77ec048b9b386a8b25a22bfec6472817da465"; - sha256 = "sha256-BQeID+y9RvmcnuNsodOMXseVvre5QYxv+E/ul8bucUI="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-spoiler-alert"; - maintainers = with maintainers; [ talyz ]; - license = licenses.mit; - description = "Hide spoilers behind the spoiler-alert jQuery plugin"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix deleted file mode 100644 index ba4344edae74..000000000000 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - lib, - mkDiscoursePlugin, - fetchFromGitHub, -}: - -mkDiscoursePlugin { - name = "discourse-voting"; - src = fetchFromGitHub { - owner = "discourse"; - repo = "discourse-topic-voting"; - rev = "d779202749e56aaee2d548b538796fb5db1b9b7c"; - sha256 = "sha256-8YF7W5SXhI7TGJNZkx5or7bxI0MKiDtx10TE2ekBMuM="; - }; - meta = with lib; { - homepage = "https://github.com/discourse/discourse-voting"; - maintainers = with maintainers; [ dpausp ]; - license = licenses.gpl2Only; - description = "Adds the ability for voting on a topic within a specified category in Discourse"; - }; -} diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix index 2d9c8240f0bd..8043d24ad70f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix @@ -9,8 +9,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-yearly-review"; - rev = "439e0d78f1d8a0f387c0ec26f233a090ce82ef72"; - sha256 = "sha256-DXA5P7XnItBjP4H1J/G1cGbFddSDZh0wjMZiJ5JA9s8="; + rev = "a6baf4a5998a616091d94c31c23b9930409cd3e2"; + sha256 = "sha256-KP/lQqS47oGTz4Rw/+0p2LZVQEWdUtx0sRPxh3/Ua8A="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-yearly-review"; diff --git a/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch new file mode 100644 index 000000000000..895696d3c6e5 --- /dev/null +++ b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch @@ -0,0 +1,13 @@ +diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb +index a5a5b8f943..30faee615d 100644 +--- a/lib/plugin/instance.rb ++++ b/lib/plugin/instance.rb +@@ -1383,7 +1383,7 @@ class Plugin::Instance + contents = javascript_includes.map { |js| File.read(js) } + + if contents.present? +- ensure_directory(extra_js_file_path) ++ ensure_directory(File.realpath(extra_js_file_path)) + Discourse::Utils.atomic_write_file(extra_js_file_path, contents.join("\n;\n")) + else + begin diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index 869b2d548b3d..1f4e17fe1622 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -1,26 +1,24 @@ # frozen_string_literal: true +ruby "~> 3.3" + source "https://rubygems.org" # if there is a super emergency and rubygems is playing up, try #source 'http://production.cf.rubygems.org' gem "bootsnap", require: false, platform: :mri -gem "actionmailer", "~> 7.2.0" -gem "actionpack", "~> 7.2.0" -gem "actionview", "~> 7.2.0" -gem "activemodel", "~> 7.2.0" -gem "activerecord", "~> 7.2.0" -gem "activesupport", "~> 7.2.0" -gem "railties", "~> 7.2.0" -gem "sprockets-rails" +gem "actionmailer", "~> 8.0.0" +gem "actionpack", "~> 8.0.0" +gem "actionview", "~> 8.0.0" +gem "activemodel", "~> 8.0.0" +gem "activerecord", "~> 8.0.0" +gem "activesupport", "~> 8.0.0" +gem "railties", "~> 8.0.0" +gem "propshaft" gem "json" -# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals -# We intend to drop sprockets rather than upgrade to 4.x -gem "sprockets", "~> 3.7.3" - # this will eventually be added to rails, # allows us to precompile all our templates in the unicorn master gem "actionview_precompiler", require: false @@ -31,9 +29,11 @@ gem "mail" gem "mini_mime" gem "mini_suffix" -# config/initializers/006-mini_profiler.rb depends upon the RedisClient#call. -# Rework this when upgrading to redis client 5.0 and above. -gem "redis", "< 5.0" +# NOTE: hiredis-client is recommended for high performance use of Redis +# however a recent attempt at an upgrade lead to https://meta.discourse.org/t/rebuild-error/375387 +# for now we are sticking with the socked based implementation that is not sensitive to this issue +# gem "hiredis-client" +gem "redis" # This is explicitly used by Sidekiq and is an optional dependency. # We tell Sidekiq to use the namespace "sidekiq" which triggers this @@ -52,6 +52,7 @@ gem "active_model_serializers", "~> 0.8.3" gem "http_accept_language", require: false gem "discourse-fonts", require: "discourse_fonts" +gem "discourse-emojis", require: "discourse_emojis" gem "message_bus" @@ -61,6 +62,7 @@ gem "fastimage" gem "aws-sdk-s3", require: false gem "aws-sdk-sns", require: false +gem "aws-sdk-mediaconvert", require: false gem "excon", require: false gem "unf", require: false @@ -98,12 +100,12 @@ gem "rinku" gem "sidekiq" gem "mini_scheduler" -gem "execjs", require: false -gem "mini_racer", "0.17.pre13" +gem "mini_racer" gem "highline", require: false -gem "rack" +# When unicorn is not used anymore, we can use Rack 3 +gem "rack", "< 3" gem "rack-protection" # security gem "cbor", require: false @@ -116,22 +118,16 @@ gem "net-imap", require: false gem "net-pop", require: false gem "digest", require: false -# Gems used only for assets and not required in production environments by default. -# Allow everywhere for now cause we are allowing asset debugging in production -group :assets do - gem "uglifier" -end +gem "goldiloader", require: false group :test do gem "capybara", require: false gem "webmock", require: false - gem "fakeweb", require: false gem "simplecov", require: false - gem "selenium-webdriver", "~> 4.14", require: false - gem "selenium-devtools", require: false gem "test-prof" gem "rails-dom-testing", require: false gem "minio_runner", require: false + gem "capybara-playwright-driver" end group :test, :development do @@ -154,10 +150,9 @@ group :test, :development do gem "rswag-specs" - gem "annotate" + gem "annotaterb" gem "syntax_tree" - gem "syntax_tree-disable_ternary" gem "rspec-multi-mock" end @@ -173,11 +168,11 @@ end if ENV["ALLOW_DEV_POPULATE"] == "1" gem "discourse_dev_assets" - gem "faker", "~> 2.16" + gem "faker" else group :development, :test do gem "discourse_dev_assets" - gem "faker", "~> 2.16" + gem "faker" end end @@ -292,3 +287,28 @@ end gem "dry-initializer", "~> 3.1" gem "parallel" + +# for discourse-zendesk-plugin +gem "inflection", require: false +gem "multipart-post", require: false +gem "faraday-multipart", require: false +gem "zendesk_api", require: false + +# for discourse-subscriptions +gem "stripe", require: false + +# for discourse-github +gem "sawyer", require: false +gem "octokit", require: false + +# for discourse-ai +gem "tokenizers", require: false +gem "tiktoken_ruby", require: false +gem "discourse_ai-tokenizers", require: false +gem "ed25519" # TODO: remove this as existing ssl gem should handle this +gem "Ascii85", require: false +gem "ruby-rc4", require: false +gem "hashery", require: false +gem "ttfunk", require: false +gem "afm", require: false +gem "pdf-reader", require: false diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index c05f581c03f3..5958232a8a70 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -1,26 +1,26 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (7.2.2.1) - actionpack (= 7.2.2.1) - actionview (= 7.2.2.1) - activejob (= 7.2.2.1) - activesupport (= 7.2.2.1) + Ascii85 (2.0.1) + actionmailer (8.0.2.1) + actionpack (= 8.0.2.1) + actionview (= 8.0.2.1) + activejob (= 8.0.2.1) + activesupport (= 8.0.2.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.2.2.1) - actionview (= 7.2.2.1) - activesupport (= 7.2.2.1) + actionpack (8.0.2.1) + actionview (= 8.0.2.1) + activesupport (= 8.0.2.1) nokogiri (>= 1.8.5) - racc - rack (>= 2.2.4, < 3.2) + rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actionview (7.2.2.1) - activesupport (= 7.2.2.1) + actionview (8.0.2.1) + activesupport (= 8.0.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) @@ -29,16 +29,16 @@ GEM actionview (>= 6.0.a) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (7.2.2.1) - activesupport (= 7.2.2.1) + activejob (8.0.2.1) + activesupport (= 8.0.2.1) globalid (>= 0.3.6) - activemodel (7.2.2.1) - activesupport (= 7.2.2.1) - activerecord (7.2.2.1) - activemodel (= 7.2.2.1) - activesupport (= 7.2.2.1) + activemodel (8.0.2.1) + activesupport (= 8.0.2.1) + activerecord (8.0.2.1) + activemodel (= 8.0.2.1) + activesupport (= 8.0.2.1) timeout (>= 0.4.0) - activesupport (7.2.2.1) + activesupport (8.0.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -50,47 +50,54 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - annotate (3.2.0) - activerecord (>= 3.2, < 8.0) - rake (>= 10.4, < 14.0) - ast (2.4.2) - aws-eventstream (1.3.0) - aws-partitions (1.894.0) - aws-sdk-core (3.191.3) + afm (1.0.0) + annotaterb (4.18.0) + activerecord (>= 6.0.0) + activesupport (>= 6.0.0) + ast (2.4.3) + aws-eventstream (1.4.0) + aws-partitions (1.1134.0) + aws-sdk-core (3.227.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) - aws-sdk-core (~> 3, >= 3.191.0) + logger + aws-sdk-kms (1.99.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-mediaconvert (1.165.0) + aws-sdk-core (~> 3, >= 3.227.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.182.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sdk-sns (1.72.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sdk-sns (1.96.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) - benchmark (0.4.0) + base64 (0.3.0) + benchmark (0.4.1) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) - bigdecimal (3.1.9) + bigdecimal (3.2.2) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) - bootsnap (1.18.4) + bootsnap (1.18.6) msgpack (~> 1.2) builder (3.3.0) - bullet (8.0.0) + bullet (8.0.8) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (11.1.3) + byebug (12.0.0) capybara (3.40.0) addressable matrix @@ -100,14 +107,18 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - cbor (0.5.9.8) + capybara-playwright-driver (0.5.7) + addressable + capybara + playwright-ruby-client (>= 1.16.0) + cbor (0.5.10.1) certified (1.0.0) - cgi (0.4.1) + cgi (0.5.0) chunky_png (1.4.0) coderay (1.1.3) colored2 (4.0.3) concurrent-ruby (1.3.5) - connection_pool (2.5.0) + connection_pool (2.5.3) cose (1.3.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) @@ -116,63 +127,93 @@ GEM bigdecimal rexml crass (1.0.6) - css_parser (1.21.0) + css_parser (1.21.1) addressable - csv (3.3.2) + csv (3.3.5) date (3.4.1) debug_inspector (1.2.0) - diff-lcs (1.5.1) - diffy (3.4.3) + diff-lcs (1.6.2) + diffy (3.4.4) digest (3.2.0) digest-xxhash (0.2.9) - discourse-fonts (0.0.18) + discourse-emojis (1.0.41) + discourse-fonts (0.0.19) discourse-seed-fu (2.3.12) activerecord (>= 3.1) activesupport (>= 3.1) - discourse_dev_assets (0.0.4) - faker (~> 2.16) + discourse_ai-tokenizers (0.3.1) + activesupport (>= 6.0) + tiktoken_ruby (~> 0.0.11.1) + tokenizers (~> 0.5.4) + discourse_dev_assets (0.0.5) + faker (~> 3.5.1) literate_randomizer docile (1.4.1) - drb (2.2.1) + drb (2.2.3) dry-initializer (3.2.0) + ed25519 (1.4.0) email_reply_trimmer (0.2.0) + erb (5.0.2) erubi (1.13.1) - excon (1.2.3) - execjs (2.10.0) + excon (1.2.5) + logger exifr (1.4.1) - extralite-bundle (2.8.2) - fabrication (2.31.0) - faker (2.23.0) + extralite-bundle (2.13) + fabrication (3.0.0) + faker (3.5.2) i18n (>= 1.8.11, < 2) - fakeweb (1.3.0) - faraday (2.12.2) + faraday (2.13.4) faraday-net_http (>= 2.0, < 3.5) json logger - faraday-net_http (3.4.0) + faraday-multipart (1.1.1) + multipart-post (~> 2.0) + faraday-net_http (3.4.1) net-http (>= 0.5.0) - faraday-retry (2.2.1) + faraday-retry (2.3.2) faraday (~> 2.0) fast_blank (1.0.1) fastimage (2.3.1) - ffi (1.17.1) - ffi (1.17.1-arm64-darwin) - ffi (1.17.1-x86_64-darwin) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) fspath (3.1.2) globalid (1.2.1) activesupport (>= 6.1) - google-protobuf (4.29.3) + goldiloader (5.4.0) + activerecord (>= 6.1, < 8.1) + activesupport (>= 6.1, < 8.1) + google-protobuf (4.32.0) bigdecimal rake (>= 13) - google-protobuf (4.29.3-arm64-darwin) + google-protobuf (4.32.0-aarch64-linux-gnu) bigdecimal rake (>= 13) - google-protobuf (4.29.3-x86_64-darwin) + google-protobuf (4.32.0-aarch64-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-x86_64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-x86_64-linux-musl) bigdecimal rake (>= 13) guess_html_encoding (0.0.11) hana (1.3.7) - hashdiff (1.1.2) + hashdiff (1.2.0) + hashery (2.1.2) hashie (5.0.0) highline (3.1.2) reline @@ -188,15 +229,16 @@ GEM progress (~> 3.0, >= 3.0.1) image_size (3.4.0) in_threads (1.6.0) - io-console (0.8.0) - irb (1.15.1) + inflection (1.0.0) + io-console (0.8.1) + irb (1.15.2) pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso8601 (0.13.0) jmespath (1.6.2) - json (2.9.1) - json-schema (5.1.1) + json (2.13.2) + json-schema (5.2.2) addressable (~> 2.8) bigdecimal (~> 3.1) json_schemer (2.4.0) @@ -207,10 +249,14 @@ GEM jwt (2.10.1) base64 kgio (2.11.4) - language_server-protocol (3.17.0.4) - libv8-node (22.7.0.4) - libv8-node (22.7.0.4-arm64-darwin) - libv8-node (22.7.0.4-x86_64-darwin) + language_server-protocol (3.17.0.5) + libv8-node (24.1.0.0) + libv8-node (24.1.0.0-aarch64-linux) + libv8-node (24.1.0.0-arm64-darwin) + libv8-node (24.1.0.0-x86_64-darwin) + libv8-node (24.1.0.0-x86_64-linux) + libv8-node (24.1.0.0-x86_64-linux-musl) + lint_roller (1.1.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -222,8 +268,8 @@ GEM railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - logster (2.20.0) - loofah (2.24.0) + logster (2.20.1) + loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) lru_redux (1.1.0) @@ -233,50 +279,67 @@ GEM net-imap net-pop net-smtp - matrix (0.4.2) + matrix (0.4.3) maxminddb (0.1.22) memory_profiler (1.1.0) - message_bus (4.3.8) + message_bus (4.4.1) rack (>= 1.1.3) messageformat-wrapper (1.1.0) mini_racer (>= 0.6.3) method_source (1.1.0) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2025.0812) mini_mime (1.1.5) mini_portile2 (2.8.9) - mini_racer (0.17.0.pre13) - libv8-node (~> 22.7.0.4) + mini_racer (0.19.0) + libv8-node (~> 24.1.0.0) mini_scheduler (0.18.0) sidekiq (>= 6.5, < 8.0) mini_sql (1.6.0) mini_suffix (0.3.3) ffi (~> 1.9) - minio_runner (0.1.2) - minitest (5.25.4) + minio_runner (1.0.0) + minitest (5.25.5) mocha (2.7.1) ruby2_keywords (>= 0.0.5) - msgpack (1.7.5) - multi_json (1.15.0) - multi_xml (0.7.1) + msgpack (1.8.0) + multi_json (1.17.0) + multi_xml (0.7.2) bigdecimal (~> 3.1) + multipart-post (2.4.1) mustache (1.1.1) net-http (0.6.0) uri - net-imap (0.5.5) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol nio4r (2.7.4) - nokogiri (1.18.2) + nokogiri (1.18.9) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.2-arm64-darwin) + nokogiri (1.18.9-aarch64-linux-gnu) racc (~> 1.4) - nokogiri (1.18.2-x86_64-darwin) + nokogiri (1.18.9-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.9-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.9-arm-linux-musl) + racc (~> 1.4) + nokogiri (1.18.9-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.9-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.9-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.9-x86_64-linux-musl) racc (~> 1.4) oauth (1.1.0) oauth-tty (~> 1.0, >= 1.0.1) @@ -290,22 +353,26 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) - oj (3.16.9) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + oj (3.16.11) bigdecimal (>= 3.0) ostruct (>= 0.2) - omniauth (1.9.2) + omniauth (2.1.2) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) + rack (>= 2.2.3) + rack-protection omniauth-facebook (9.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.4.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.8.2) + omniauth-github (2.0.0) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-google-oauth2 (1.0.1) jwt (>= 2.0) oauth2 (~> 1.1) - omniauth (~> 1.1) - omniauth-oauth2 (>= 1.6) + omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) omniauth-oauth (1.2.1) oauth omniauth (>= 1.0, < 3) @@ -319,40 +386,60 @@ GEM openssl (3.3.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) - optimist (3.2.0) - ostruct (0.6.1) - parallel (1.26.3) - parallel_tests (4.9.0) + optimist (3.2.1) + ostruct (0.6.3) + parallel (1.27.0) + parallel_tests (5.4.0) parallel - parser (3.3.7.0) + parser (3.3.9.0) ast (~> 2.4.1) racc - pg (1.5.9) + pdf-reader (2.15.0) + Ascii85 (>= 1.0, < 3.0, != 2.0.0) + afm (>= 0.2.1, < 2) + hashery (~> 2.0) + ruby-rc4 + ttfunk + pg (1.6.1) + pg (1.6.1-aarch64-linux) + pg (1.6.1-aarch64-linux-musl) + pg (1.6.1-arm64-darwin) + pg (1.6.1-x86_64-darwin) + pg (1.6.1-x86_64-linux) + pg (1.6.1-x86_64-linux-musl) + playwright-ruby-client (1.54.1) + concurrent-ruby (>= 1.1.6) + mime-types (>= 3.0) pp (0.6.2) prettyprint prettier_print (1.2.1) prettyprint (0.2.0) + prism (1.4.0) progress (3.6.0) - pry (0.14.2) + propshaft (1.2.1) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.10.1) - byebug (~> 11.0) - pry (>= 0.13, < 0.15) + pry-byebug (3.11.0) + byebug (~> 12.0) + pry (>= 0.13, < 0.16) pry-rails (0.3.11) pry (>= 0.13.0) pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - psych (5.2.3) + psych (5.2.6) date stringio - public_suffix (6.0.1) + public_suffix (6.0.2) puma (6.6.0) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.10) - rack-mini-profiler (3.3.1) + rack (2.2.17) + rack-mini-profiler (4.0.1) rack (>= 1.2.0) rack-protection (3.2.0) base64 (>= 0.1.0) @@ -364,23 +451,23 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails_failover (2.2.0) - activerecord (>= 6.1, < 8.0) + rails_failover (2.3.0) + activerecord (>= 6.1, < 9.0) concurrent-ruby - railties (>= 6.1, < 8.0) - rails_multisite (6.1.0) - activerecord (>= 6.0) - railties (>= 6.0) - railties (7.2.2.1) - actionpack (= 7.2.2.1) - activesupport (= 7.2.2.1) + railties (>= 6.1, < 9.0) + rails_multisite (7.0.0) + activerecord (>= 7.1) + railties (>= 7.1) + railties (8.0.2.1) + actionpack (= 8.0.2.1) + activesupport (= 8.0.2.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) @@ -388,62 +475,67 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) raindrops (0.20.1) - rake (13.2.1) + rake (13.3.0) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbtrace (0.5.1) + rb_sys (0.9.106) + rbtrace (0.5.2) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.9.0) - rdoc (6.11.0) + rdoc (6.14.2) + erb psych (>= 4.0.0) - redcarpet (3.6.0) - redis (4.8.1) + redcarpet (3.6.1) + redis (5.4.0) + redis-client (>= 0.22.0) + redis-client (0.25.2) + connection_pool redis-namespace (1.11.0) redis (>= 4) - regexp_parser (2.10.0) - reline (0.6.0) + regexp_parser (2.11.2) + reline (0.6.2) io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) rexml (3.4.1) rinku (2.0.6) rotp (6.3.0) - rouge (4.5.1) - rqrcode (2.2.0) + rouge (4.6.0) + rqrcode (3.1.0) chunky_png (~> 1.0) - rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) + rqrcode_core (~> 2.0) + rqrcode_core (2.0.0) rrule (0.6.0) activesupport (>= 2.3) - rspec (3.13.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.2) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-html-matchers (0.10.0) nokogiri (~> 1) rspec (>= 3.0.0.a) - rspec-mocks (3.13.2) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-multi-mock (0.3.1) rspec (>= 3.7.0) - rspec-rails (7.1.0) - actionpack (>= 7.0) - activesupport (>= 7.0) - railties (>= 7.0) + rspec-rails (8.0.2) + actionpack (>= 7.2) + activesupport (>= 7.2) + railties (>= 7.2) rspec-core (~> 3.13) rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.2) + rspec-support (3.13.4) rss (0.3.1) rexml rswag-specs (2.16.0) @@ -453,42 +545,52 @@ GEM rspec-core (>= 2.14) rtlcss (0.2.1) mini_racer (>= 0.6.3) - rubocop (1.71.1) + rubocop (1.79.2) json (~> 2.3) - language_server-protocol (>= 3.17.0) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.38.0, < 2.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.38.0) - parser (>= 3.3.1.0) - rubocop-capybara (2.21.0) - rubocop (~> 1.41) - rubocop-discourse (3.9.3) + rubocop-ast (1.46.0) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-capybara (2.22.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-discourse (3.12.1) activesupport (>= 6.1) - rubocop (>= 1.59.0) - rubocop-capybara (>= 2.0.0) - rubocop-factory_bot (>= 2.0.0) - rubocop-rails (>= 2.25.0) + lint_roller (>= 1.1.0) + rubocop (>= 1.73.2) + rubocop-capybara (>= 2.22.0) + rubocop-factory_bot (>= 2.27.0) + rubocop-rails (>= 2.30.3) rubocop-rspec (>= 3.0.1) - rubocop-rspec_rails (>= 2.30.0) - rubocop-factory_bot (2.26.1) - rubocop (~> 1.61) - rubocop-rails (2.29.1) + rubocop-rspec_rails (>= 2.31.0) + rubocop-factory_bot (2.27.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-rails (2.33.3) activesupport (>= 4.2.0) + lint_roller (~> 1.1) rack (>= 1.1) - rubocop (>= 1.52.0, < 2.0) - rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.4.0) - rubocop (~> 1.61) - rubocop-rspec_rails (2.30.0) - rubocop (~> 1.61) - rubocop-rspec (~> 3, >= 3.0.1) - ruby-prof (1.7.1) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.44.0, < 2.0) + rubocop-rspec (3.6.0) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-rspec_rails (2.31.0) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-rspec (~> 3.5) + ruby-prof (1.7.2) + base64 ruby-progressbar (1.13.0) + ruby-rc4 (0.1.5) ruby-readability (0.7.2) guess_html_encoding (>= 0.0.4) nokogiri (>= 1.6.0) @@ -497,115 +599,151 @@ GEM sanitize (7.0.0) crass (~> 1.0.2) nokogiri (>= 1.16.8) - sass-embedded (1.77.5) - google-protobuf (>= 3.25, < 5.0) + sass-embedded (1.90.0) + google-protobuf (~> 4.31) rake (>= 13) - sass-embedded (1.77.5-arm64-darwin) - google-protobuf (>= 3.25, < 5.0) - sass-embedded (1.77.5-x86_64-darwin) - google-protobuf (>= 3.25, < 5.0) - sassc-embedded (1.77.7) - sass-embedded (~> 1.77) + sass-embedded (1.90.0-aarch64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-aarch64-linux-musl) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-arm-linux-gnueabihf) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-arm-linux-musleabihf) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-arm64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-x86_64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-x86_64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.90.0-x86_64-linux-musl) + google-protobuf (~> 4.31) + sassc-embedded (1.80.5) + sass-embedded (~> 1.80) + sawyer (0.9.2) + addressable (>= 2.3.5) + faraday (>= 0.17.3, < 3) securerandom (0.4.1) - selenium-devtools (0.135.0) - selenium-webdriver (~> 4.2) - selenium-webdriver (4.31.0) - base64 (~> 0.2) - logger (~> 1.4) - rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2, < 3.0) - websocket (~> 1.0) - shoulda-matchers (6.4.0) + shoulda-matchers (6.5.0) activesupport (>= 5.2.0) - sidekiq (6.5.12) - connection_pool (>= 2.2.5, < 3) - rack (~> 2.0) - redis (>= 4.5.0, < 5) + sidekiq (7.3.9) + base64 + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.13.1) + simplecov-html (0.13.2) simplecov_json_formatter (0.1.4) simpleidn (0.2.3) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) - sprockets (3.7.5) - base64 - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) - sqlite3 (2.5.0) + snaky_hash (2.0.3) + hashie (>= 0.1.0, < 6) + version_gem (>= 1.1.8, < 3) + sqlite3 (2.7.3) mini_portile2 (~> 2.8.0) - sqlite3 (2.5.0-arm64-darwin) - sqlite3 (2.5.0-x86_64-darwin) + sqlite3 (2.7.3-aarch64-linux-gnu) + sqlite3 (2.7.3-aarch64-linux-musl) + sqlite3 (2.7.3-arm-linux-gnu) + sqlite3 (2.7.3-arm-linux-musl) + sqlite3 (2.7.3-arm64-darwin) + sqlite3 (2.7.3-x86_64-darwin) + sqlite3 (2.7.3-x86_64-linux-gnu) + sqlite3 (2.7.3-x86_64-linux-musl) sshkey (3.0.0) stackprof (0.2.27) - stringio (3.1.2) - syntax_tree (6.2.0) + stringio (3.1.7) + stripe (11.1.0) + syntax_tree (6.3.0) prettier_print (>= 1.2.0) - syntax_tree-disable_ternary (1.0.0) test-prof (1.4.4) - thor (1.3.2) + thor (1.4.0) + tiktoken_ruby (0.0.11.1) + rb_sys (= 0.9.106) + tiktoken_ruby (0.0.11.1-aarch64-linux) + tiktoken_ruby (0.0.11.1-arm-linux) + tiktoken_ruby (0.0.11.1-arm64-darwin) + tiktoken_ruby (0.0.11.1-x86_64-darwin) + tiktoken_ruby (0.0.11.1-x86_64-linux) + tiktoken_ruby (0.0.11.1-x86_64-linux-musl) timeout (0.4.3) + tokenizers (0.5.5) + rb_sys + tokenizers (0.5.5-aarch64-linux) + tokenizers (0.5.5-aarch64-linux-musl) + tokenizers (0.5.5-arm64-darwin) + tokenizers (0.5.5-x86_64-darwin) + tokenizers (0.5.5-x86_64-linux) + tokenizers (0.5.5-x86_64-linux-musl) trilogy (2.9.0) + ttfunk (1.8.0) + bigdecimal (~> 3.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.1) + tzinfo-data (1.2025.2) tzinfo (>= 1.0.0) - uglifier (4.2.1) - execjs (>= 0.3.0, < 3) unf (0.2.0) - unicode-display_width (3.1.4) + unicode-display_width (3.1.5) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) - uniform_notifier (1.16.0) - uri (1.0.2) + uniform_notifier (1.17.0) + uri (1.0.3) useragent (0.16.11) - version_gem (1.1.4) + version_gem (1.1.8) web-push (3.0.1) jwt (~> 2.0) openssl (~> 3.0) - webmock (3.24.0) + webmock (3.25.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.9.1) - websocket (1.2.11) xpath (3.2.0) nokogiri (~> 1.8) yaml-lint (0.1.2) yard (0.9.37) - zeitwerk (2.7.1) + zeitwerk (2.7.3) + zendesk_api (1.38.0.rc1) + faraday (> 2.0.0) + faraday-multipart + hashie (>= 3.5.2, < 6.0.0) + inflection + mini_mime + multipart-post (~> 2.0) PLATFORMS - arm64-darwin-21 - arm64-darwin-22 - arm64-darwin-23 - arm64-darwin-24 + aarch64-linux-gnu + aarch64-linux-musl + arm-linux + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin ruby - x86_64-darwin-22 - x86_64-darwin-23 - x86_64-darwin-24 + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES - actionmailer (~> 7.2.0) - actionpack (~> 7.2.0) - actionview (~> 7.2.0) + Ascii85 + actionmailer (~> 8.0.0) + actionpack (~> 8.0.0) + actionview (~> 8.0.0) actionview_precompiler active_model_serializers (~> 0.8.3) - activemodel (~> 7.2.0) - activerecord (~> 7.2.0) - activesupport (~> 7.2.0) + activemodel (~> 8.0.0) + activerecord (~> 8.0.0) + activesupport (~> 8.0.0) addressable - annotate + afm + annotaterb + aws-sdk-mediaconvert aws-sdk-s3 aws-sdk-sns better_errors @@ -614,6 +752,7 @@ DEPENDENCIES bullet byebug capybara + capybara-playwright-driver cbor certified cgi (>= 0.3.6) @@ -625,25 +764,30 @@ DEPENDENCIES diffy digest digest-xxhash + discourse-emojis discourse-fonts discourse-seed-fu + discourse_ai-tokenizers discourse_dev_assets dry-initializer (~> 3.1) + ed25519 email_reply_trimmer excon - execjs extralite-bundle fabrication - faker (~> 2.16) - fakeweb + faker faraday + faraday-multipart faraday-retry fast_blank fastimage + goldiloader + hashery highline htmlentities http_accept_language image_optim + inflection iso8601 json json_schemer @@ -660,19 +804,21 @@ DEPENDENCIES message_bus messageformat-wrapper mini_mime - mini_racer (= 0.17.pre13) + mini_racer mini_scheduler mini_sql mini_suffix minio_runner mocha multi_json + multipart-post mustache net-http net-imap net-pop net-smtp nokogiri + octokit oj omniauth omniauth-facebook @@ -682,24 +828,26 @@ DEPENDENCIES omniauth-twitter parallel parallel_tests + pdf-reader pg + propshaft pry-byebug pry-rails pry-stack_explorer puma - rack + rack (< 3) rack-mini-profiler rack-protection rails-dom-testing rails_failover rails_multisite - railties (~> 7.2.0) + railties (~> 8.0.0) rake rb-fsevent rbtrace rchardet redcarpet - redis (< 5.0) + redis redis-namespace rinku rotp @@ -715,27 +863,27 @@ DEPENDENCIES rubocop-discourse ruby-prof ruby-progressbar + ruby-rc4 ruby-readability rubyzip sanitize sassc-embedded - selenium-devtools - selenium-webdriver (~> 4.14) + sawyer shoulda-matchers sidekiq simplecov - sprockets (~> 3.7.3) - sprockets-rails sqlite3 sshkey stackprof + stripe syntax_tree - syntax_tree-disable_ternary test-prof thor + tiktoken_ruby + tokenizers trilogy + ttfunk tzinfo-data - uglifier unf unicorn web-push @@ -743,6 +891,356 @@ DEPENDENCIES yaml-lint yard zeitwerk + zendesk_api + +CHECKSUMS + Ascii85 (2.0.1) sha256=15cb5d941808543cbb9e7e6aea3c8ec3877f154c3461e8b3673e97f7ecedbe5a + actionmailer (8.0.2.1) sha256=0de14d8d04541eab130858cb2f0697266be42de1afe1104bc43d7998137ddb9c + actionpack (8.0.2.1) sha256=61e7e11a31dbe5152ca57221788bdca42ef302c4cc53b4c8993d68dce8982b0a + actionview (8.0.2.1) sha256=2ea6d20ccb0b7b84a221a940ac06853ce99235e4ecb4947815839c7c5ecbf347 + actionview_precompiler (0.4.0) sha256=33b6bd6ec4c1b856e02fdf5f6512c9eb4a92ac1c0545e941b3e354b7d540ed1c + active_model_serializers (0.8.4) sha256=7350e3d3b6a5946bbec033241d908013cc85ff4d584230e6aa074225547c754c + activejob (8.0.2.1) sha256=d6e5f2da07ec8efac13a38af1752416770dc74e95783f7b252506d707aa32b89 + activemodel (8.0.2.1) sha256=17bab6cdb86531844113df22f864480a89a276bf0318246e628f99e0ac077ec4 + activerecord (8.0.2.1) sha256=a6556e7bdd53f3889d18d2aa3a7ff115fd6c5e1463dd06f97fb88d06b58c6df1 + activesupport (8.0.2.1) sha256=0405a76fd1ca989975d9ae00d46a4d3979bdf3817482d846b63affa84bd561c6 + addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232 + afm (1.0.0) sha256=5bd4d6f6241e7014ef090985ec6f4c3e9745f6de0828ddd58bc1efdd138f4545 + annotaterb (4.18.0) sha256=a07ec5d3e8f063308dbbf17970a74155434504a3c3887511cd94fbc83c4f4294 + ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383 + aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b + aws-partitions (1.1134.0) sha256=28f5f6156777ac346904a79ce6cb3b14a521e3866fee12a0da86d7b500266d3e + aws-sdk-core (3.227.0) sha256=99071fc5e3ca9347873fd114574319740c3041745df3c74e27875bd912dfc79e + aws-sdk-kms (1.99.0) sha256=ba292fc3ffd672532aae2601fe55ff424eee78da8e23c23ba6ce4037138275a8 + aws-sdk-mediaconvert (1.165.0) sha256=d955a571cd8b0407c0778e1d0f2333a70bf9ab48e36c81da8c5b317db24001e4 + aws-sdk-s3 (1.182.0) sha256=d0fc3579395cb6cb69bf6e975240ce031fc673190e74c8dddbdd6c18572b450d + aws-sdk-sns (1.96.0) sha256=f92b3c7203c53181b1cafb3dbbea85f330002ad696175bda829cfef359fa6dd4 + aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00 + base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b + benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce + better_errors (2.10.1) sha256=f798f1bac93f3e775925b7fcb24cffbcf0bb62ee2210f5350f161a6b75fc0a73 + bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc + binding_of_caller (1.0.1) sha256=2b2902abff4246ddcfbc4da9b69bc4a019e22aeb300c2ff6289a173d4b90b29a + bootsnap (1.18.6) sha256=0ae2393c1e911e38be0f24e9173e7be570c3650128251bf06240046f84a07d00 + builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f + bullet (8.0.8) sha256=b4b9905eb6b803d9a0ba620944ed79c8bb27ff3ca90ef8f8e39ff21db5b7c542 + byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e + capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef + capybara-playwright-driver (0.5.7) sha256=875a1928077d56be8b484f84674901a2374752d7842d93de2045bbede1aad242 + cbor (0.5.10.1) sha256=79cdf79f18dcd9ee97e0b849c6d573e5a2e3ddc1954d180f384d6ed2612b6df0 + certified (1.0.0) sha256=aa4cdf0e90e7ee96f6e0ce3daae39eaa8f0486124e0d92daf64d2105aeb9069c + cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da + chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe + coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b + colored2 (4.0.3) sha256=63e1038183976287efc43034f5cca17fb180b4deef207da8ba78d051cbce2b37 + concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6 + connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b + cose (1.3.1) sha256=d5d4dbcd6b035d513edc4e1ab9bc10e9ce13b4011c96e3d1b8fe5e6413fd6de5 + cppjieba_rb (0.4.4) sha256=319a7ab57b6ec28a8d1b223487ecd114432f1930d7740db2f99c1991e6c8faaf + crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49 + crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d + css_parser (1.21.1) sha256=6cfd3ffc0a97333b39d2b1b49c95397b05e0e3b684d68f77ec471ba4ec2ef7c7 + csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f + date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f + debug_inspector (1.2.0) sha256=9bdfa02eebc3da163833e6a89b154084232f5766087e59573b70521c77ea68a2 + diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 + diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3 + digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991 + digest-xxhash (0.2.9) sha256=a989d8309c03c4136a4bea9981ec0a146a2750de7f3dfb7b5624a3038aa598d7 + discourse-emojis (1.0.41) sha256=b322e1de3849ae437152e267ab35101b57f27303ac7136af482962e48c63cc2a + discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033 + discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4 + discourse_ai-tokenizers (0.3.1) sha256=a7752f2f7b4b29fea148e2c893b287a1478c4dc8828f684c09e51d5a33bbc373 + discourse_dev_assets (0.0.5) sha256=a09a801a210aa3f7247dd382dfd73b389d4bd02be86be675eca2d451f9898285 + docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e + drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 + dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3 + ed25519 (1.4.0) sha256=16e97f5198689a154247169f3453ef4cfd3f7a47481fde0ae33206cdfdcac506 + email_reply_trimmer (0.2.0) sha256=05843fa5ee1a2037235f1f3c876e922f613e2b4406fea5bb14212d1708d6c525 + erb (5.0.2) sha256=d30f258143d4300fb4ecf430042ac12970c9bb4b33c974a545b8f58c1ec26c0f + erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9 + excon (1.2.5) sha256=ca040bb61bc0059968f34a17115a00d2db8562e3c0c5c5c7432072b551c85a9d + exifr (1.4.1) sha256=768374cc6b6ff3743acba57c1c35229bdd8c6b9fbc1285952047fc1215c4b894 + extralite-bundle (2.13) sha256=0d00338dd3b348f44a02bb9e93db3714231e7240a48320f1ee3a1db5197db3cc + fabrication (3.0.0) sha256=a6a0bfad9071348ad3cb1701df788524b888c0cdd044b988893e7509f7463be3 + faker (3.5.2) sha256=f9a80291b2e3f259801d1dd552f0732fe04dce5d1f74e798365bc0413789c473 + faraday (2.13.4) sha256=c719ff52cfd0dbaeca79dd83ed3aeea3f621032abf8bc959d1c05666157cac26 + faraday-multipart (1.1.1) sha256=77a18ff40149030fd1aef55bb4fc7a67ce46419a8a3fcd010e28c2526e8d8903 + faraday-net_http (3.4.1) sha256=095757fae7872b94eac839c08a1a4b8d84fd91d6886cfbe75caa2143de64ab3b + faraday-retry (2.3.2) sha256=2402d2029032ebd238a2046221e67f6ef0da78c5a8ce8cd4f8b9c62e4d6451d1 + fast_blank (1.0.1) sha256=269fc30414fed4e6403bc4a49081e1ea539f8b9226e59276ed1efaefabaa17ea + fastimage (2.3.1) sha256=23c629f1f3e7d61bcfcc06c25b3d2418bc6bf41d2e615dbf5132c0e3b63ecce9 + ffi (1.17.2) sha256=297235842e5947cc3036ebe64077584bff583cd7a4e94e9a02fdec399ef46da6 + ffi (1.17.2-aarch64-linux-gnu) sha256=c910bd3cae70b76690418cce4572b7f6c208d271f323d692a067d59116211a1a + ffi (1.17.2-aarch64-linux-musl) sha256=69e6556b091d45df83e6c3b19d3c54177c206910965155a6ec98de5e893c7b7c + ffi (1.17.2-arm-linux-gnu) sha256=d4a438f2b40224ae42ec72f293b3ebe0ba2159f7d1bd47f8417e6af2f68dbaa5 + ffi (1.17.2-arm-linux-musl) sha256=977dfb7f3a6381206dbda9bc441d9e1f9366bf189a634559c3b7c182c497aaa3 + ffi (1.17.2-arm64-darwin) sha256=54dd9789be1d30157782b8de42d8f887a3c3c345293b57ffb6b45b4d1165f813 + ffi (1.17.2-x86_64-darwin) sha256=981f2d4e32ea03712beb26e55e972797c2c5a7b0257955d8667ba58f2da6440e + ffi (1.17.2-x86_64-linux-gnu) sha256=05d2026fc9dbb7cfd21a5934559f16293815b7ce0314846fee2ac8efbdb823ea + ffi (1.17.2-x86_64-linux-musl) sha256=97c0eb3981414309285a64dc4d466bd149e981c279a56371ef811395d68cb95c + fspath (3.1.2) sha256=b5ac9bafb97e2c8f8f9e303cd98ebd484be76fe9aa588bc4d01c6d99e78c9d75 + globalid (1.2.1) sha256=70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9 + goldiloader (5.4.0) sha256=277a86ff424b963bc9d98d8f4d10bb7eea0eb010d3209893dea7092302350b73 + google-protobuf (4.32.0) sha256=e64bdc0280e9bb9233fa3f62b72a5c4d1522679c5cb4485b0fec726d0b6b96ab + google-protobuf (4.32.0-aarch64-linux-gnu) sha256=764c3e3e4e4952f798746e5933375f50609572aa964b767d7ab0f96a57fca788 + google-protobuf (4.32.0-aarch64-linux-musl) sha256=17d1442d5e266b96362c35fde23722797344083eddef459fe58731babcc7f52e + google-protobuf (4.32.0-arm64-darwin) sha256=c2a3508af783e0b72171a400c54040be7f65523126cb83f1686d521ef20f5b9b + google-protobuf (4.32.0-x86_64-darwin) sha256=60098f391bbb47c31df8f8fb7f86f307606bf560877f6253f9f142f024d86895 + google-protobuf (4.32.0-x86_64-linux-gnu) sha256=0813ffbb2cade07e757be35a32036455d52cb18856e34666b508c492925d747b + google-protobuf (4.32.0-x86_64-linux-musl) sha256=d26307111f43a27065f38128d744b6e3fcebfb6c6c1595d3755787cda6eebced + guess_html_encoding (0.0.11) sha256=cab6468b945f38673fc41ad147fbbc89693b3c6c34b03b071e2ed669a603e098 + hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d + hashdiff (1.2.0) sha256=c984f13e115bfc9953332e8e83bd9d769cfde9944e2d54e07eb9df7b76e140b5 + hashery (2.1.2) sha256=d239cc2310401903f6b79d458c2bbef5bf74c46f3f974ae9c1061fb74a404862 + hashie (5.0.0) sha256=9d6c4e51f2a36d4616cbc8a322d619a162d8f42815a792596039fc95595603da + highline (3.1.2) sha256=67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a + htmlentities (4.3.4) sha256=125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da + http_accept_language (2.1.1) sha256=0043f0d55a148cf45b604dbdd197cb36437133e990016c68c892d49dbea31634 + i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f + image_optim (0.31.4) sha256=5bffd0891268e8d189d46ee4b8599918581bba1032d244e6ace4779a434776c0 + image_size (3.4.0) sha256=c6a580513fe74947e25e5d3f0aea1e33add6c20f7d0007efa65504317b7f029a + in_threads (1.6.0) sha256=91a7e6138d279dc632f59b8a9a409e47148948e297c0f69c92f9a2479a182149 + inflection (1.0.0) sha256=ceba9b26fc28b9af82e33e822d28f78a4312af75687efec81d5ef1062498d355 + io-console (0.8.1) sha256=1e15440a6b2f67b6ea496df7c474ed62c860ad11237f29b3bd187f054b925fcb + irb (1.15.2) sha256=222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba + iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2 + jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1 + json (2.13.2) sha256=02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68 + json-schema (5.2.2) sha256=60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5 + json_schemer (2.4.0) sha256=56cb6117bb5748d925b33ad3f415b513d41d25d0bbf57fe63c0a78ff05597c24 + jwt (2.10.1) sha256=e6424ae1d813f63e761a04d6284e10e7ec531d6f701917fadcd0d9b2deaf1cc5 + kgio (2.11.4) sha256=bda7a2146115998a5b07154e708e0ac02c38dcee7e793c33e2e14f600fdfffc6 + language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc + libv8-node (24.1.0.0) sha256=2f0e9ac629c4c5753eaf7001952bb6dce4eb596f3dc0df3049ee7d9cfb9471cd + libv8-node (24.1.0.0-aarch64-linux) sha256=fe7787bdb082d1101f65d8f42572ec6c634776a334d82b9fedded152e1d4f358 + libv8-node (24.1.0.0-arm64-darwin) sha256=f34bdd85787a32a16db137ffbe83feb1cd09f4d69ff3c43cd2f0a675656ee16b + libv8-node (24.1.0.0-x86_64-darwin) sha256=243cfae376d7d54b02fb9e8cfd2a2a08e791d066fb78252925a825f05805083b + libv8-node (24.1.0.0-x86_64-linux) sha256=0857486e64f7bd4133d4aa607c42d0abade1ab53dffcbfd30f12e0b7dba8f157 + libv8-node (24.1.0.0-x86_64-linux-musl) sha256=080a243ac014054780cc0d0be2c18b93642a139d09622c0cfd1ebc8614d24437 + lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87 + listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67 + literate_randomizer (0.4.0) sha256=05073c9b383983b1ed7e26c40b963468e91bc86e663b3eeff3a4af91b84217b1 + logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203 + lograge (0.14.0) sha256=42371a75823775f166f727639f5ddce73dd149452a55fc94b90c303213dc9ae1 + logstash-event (1.2.02) sha256=89a7dc60fac67070a5f60ba07409e541b09cb58906c391e90cb74b9f217467ae + logster (2.20.1) sha256=a84bbe58e7f99c4eb0246ea3a952ed87950f63aeea3cdbe7147018d10cc9a2a8 + loofah (2.24.1) sha256=655a30842b70ec476410b347ab1cd2a5b92da46a19044357bbd9f401b009a337 + lru_redux (1.1.0) sha256=ee71d0ccab164c51de146c27b480a68b3631d5b4297b8ffe8eda1c72de87affb + lz4-ruby (0.3.3) sha256=011be5ee230cfddc8308d4e2e0b05300c7bc755a887de799377ca6c5b6aede89 + mail (2.8.1) sha256=ec3b9fadcf2b3755c78785cb17bc9a0ca9ee9857108a64b6f5cfc9c0b5bfc9ad + matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b + maxminddb (0.1.22) sha256=50933be438fbed9dceabef4163eab41884bd8830d171fdb8f739bee769c4907e + memory_profiler (1.1.0) sha256=79a17df7980a140c83c469785905409d3027ca614c42c086089d128b805aa8f8 + message_bus (4.4.1) sha256=719ec5c3167e6571030dee0f43eafa99dbf68ae67fca6fd63c265ff55c0c2adb + messageformat-wrapper (1.1.0) sha256=ecea879626e412d1bc841c457dacfcbb1a62cf88ca83573e4ea34bb371f160bc + method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5 + mime-types (3.7.0) sha256=dcebf61c246f08e15a4de34e386ebe8233791e868564a470c3fe77c00eed5e56 + mime-types-data (3.2025.0812) sha256=3b94426896fa1390304fb8c6fe23b69c2c6f471aa2bb0b59bd2ddc532bea0538 + mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef + mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289 + mini_racer (0.19.0) sha256=9152694738db8b145ced843126e2a391f908732c069cb97bbc909c2bac16bbc1 + mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503 + mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee + mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7 + minio_runner (1.0.0) sha256=ca0fc56a90c63b65a26cda632938c9075046835d41f4b9d1e165b0550eae0538 + minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756 + mocha (2.7.1) sha256=8f7d538d5d3ebc75fc788b3d92fbab913a93a78462d2a3ce99d1bdde7af7f851 + msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732 + multi_json (1.17.0) sha256=76581f6c96aebf2e85f8a8b9854829e0988f335e8671cd1a56a1036eb75e4a1b + multi_xml (0.7.2) sha256=307a96dc48613badb7b2fc174fd4e62d7c7b619bc36ea33bfd0c49f64f5787ce + multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8 + mustache (1.1.1) sha256=90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0 + net-http (0.6.0) sha256=9621b20c137898af9d890556848c93603716cab516dc2c89b01a38b894e259fb + net-imap (0.5.9) sha256=d95905321e1bd9f294ffc7ff8697be218eee1ec96c8504c0960964d0a0be33fc + net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3 + net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8 + net-smtp (0.5.1) sha256=ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736 + nio4r (2.7.4) sha256=d95dee68e0bb251b8ff90ac3423a511e3b784124e5db7ff5f4813a220ae73ca9 + nokogiri (1.18.9) sha256=ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33 + nokogiri (1.18.9-aarch64-linux-gnu) sha256=5bcfdf7aa8d1056a7ad5e52e1adffc64ef53d12d0724fbc6f458a3af1a4b9e32 + nokogiri (1.18.9-aarch64-linux-musl) sha256=55e9e6ca46c4ad1715e313f407d8481d15be1e3b65d9f8e52ba1c124d01676a7 + nokogiri (1.18.9-arm-linux-gnu) sha256=fe611ae65880e445a9c0f650d52327db239f3488626df4173c05beafd161d46e + nokogiri (1.18.9-arm-linux-musl) sha256=935605e14c0ba17da18d203922440bf6c0676c602659278d855d4622d756a324 + nokogiri (1.18.9-arm64-darwin) sha256=eea3f1f06463ff6309d3ff5b88033c4948d0da1ab3cc0a3a24f63c4d4a763979 + nokogiri (1.18.9-x86_64-darwin) sha256=e0d2deb03d3d7af8016e8c9df5ff4a7d692159cefb135cbb6a4109f265652348 + nokogiri (1.18.9-x86_64-linux-gnu) sha256=b52f5defedc53d14f71eeaaf990da66b077e1918a2e13088b6a96d0230f44360 + nokogiri (1.18.9-x86_64-linux-musl) sha256=e69359d6240c17e64cc9f43970d54f13bfc7b8cc516b819228f687e953425e69 + oauth (1.1.0) sha256=38902b7f0f5ed91e858d6353f5e1e06b2c16a8aa0fd91984671eab1a1d1cddeb + oauth-tty (1.0.5) sha256=34e25c307da4509d4deec266ff3690bbf42e391355f496201c029268862d8b17 + oauth2 (1.4.11) sha256=6739fcc8872bc94f476b0cae3e8bd78a56d8364b1b79b0757794c25e152d5c10 + octokit (5.6.1) sha256=48efb2c2aa83c2c394358f073d35ad71d4ac0f14870cd00ceebd3ef3949fe495 + oj (3.16.11) sha256=2aab609d2bc896529bd3c70d737f591c13932a640ba6164a0f7e414efdb052b1 + omniauth (2.1.2) sha256=def03277298b8f8a5d3ff16cdb2eb5edb9bffed60ee7dda24cc0c89b3ae6a0ce + omniauth-facebook (9.0.0) sha256=440ad8dd9edc9ebec1fd6607b787667c8ce70d2969c2030d7e9ca42a271af854 + omniauth-github (2.0.0) sha256=1ca26576125a97e27d3f8dc39cd98853d7382dd0fc04a40d3b9ec345ee378649 + omniauth-google-oauth2 (1.0.1) sha256=2ed7a4ac8d98ab824c95e0d6760784abf1248262b3ba2ab56ec7ebd7074d12a6 + omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8 + omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745 + omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264 + openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79 + openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80 + optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e + ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912 + parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130 + parallel_tests (5.4.0) sha256=89413fc46e8f6d8e309b0cb1162287ead1c7e9d41a1fee344a73fab4dc14a248 + parser (3.3.9.0) sha256=94d6929354b1a6e3e1f89d79d4d302cc8f5aa814431a6c9c7e0623335d7687f2 + pdf-reader (2.15.0) sha256=c5025750bec8de7b11cfd1d1ccc2b944d2782c3638cd15b5ee1531d1206c0886 + pg (1.6.1) sha256=e210a75e5f702954537e73bb82f90dfbe0c6d9273c018cd0e93e779181028e6b + pg (1.6.1-aarch64-linux) sha256=2dc057589c4df67240bd52c68303a00a91299329bc7573b7447faee42331e214 + pg (1.6.1-aarch64-linux-musl) sha256=24e0c42594601c5021d3243e0e5e6e74d70de83b152d5bcb616ae49d6cac84c0 + pg (1.6.1-arm64-darwin) sha256=3b502915de30cf5983d62aabae927cb7c3628b0ca46cdf3a6b888af4ff7f42b3 + pg (1.6.1-x86_64-darwin) sha256=c8930170622c39ee24b318a2265655b5f8f34628444ee00e4ae44068865309f7 + pg (1.6.1-x86_64-linux) sha256=6ac0d5c8efafc3f22a7eca2a264300037598fabe27a88e5029bc0e6d90caeb1f + pg (1.6.1-x86_64-linux-musl) sha256=419a8e971ef122fb758a296424cb245a369c05a797b6c4787902d7d30eefa494 + playwright-ruby-client (1.54.1) sha256=c097731a9c027ed5a54adaac61ad9e62a318c2ace86fce7c3f85bbd7767682e2 + pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff + prettier_print (1.2.1) sha256=a72838b5f23facff21f90a5423cdcdda19e4271092b41f4ea7f50b83929e6ff9 + prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193 + prism (1.4.0) sha256=dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e + progress (3.6.0) sha256=360ed306dfa43d6174e847d563c70736dca249e2333cfec4b0387306c86cd573 + propshaft (1.2.1) sha256=e9b91daf52f21152f851a59f8621af53ffb4dc4401f9b5f8fe16065190b98654 + pry (0.15.2) sha256=12d54b8640d3fa29c9211dd4ffb08f3fd8bf7a4fd9b5a73ce5b59c8709385b6b + pry-byebug (3.11.0) sha256=0b0abb7d309bc7f00044d512a3c8567274f7012b944b38becc8440439a1cea72 + pry-rails (0.3.11) sha256=a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d + pry-stack_explorer (0.6.1) sha256=a2dbea9b47c4ad00cf5c1ce21499f8128b915089e90015f7bafb6e9453baf340 + psych (5.2.6) sha256=814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e + public_suffix (6.0.2) sha256=bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394 + puma (6.6.0) sha256=f25c06873eb3d5de5f0a4ebc783acc81a4ccfe580c760cfe323497798018ad87 + racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f + rack (2.2.17) sha256=5fe02a1ca80d6fb2271dba00985ee2962d6f5620b6f46dfed89f5301ac4699dd + rack-mini-profiler (4.0.1) sha256=485810c23211f908196c896ea10cad72ed68780ee2998bec1f1dfd7558263d78 + rack-protection (3.2.0) sha256=3c74ba7fc59066453d61af9bcba5b6fe7a9b3dab6f445418d3b391d5ea8efbff + rack-session (1.0.2) sha256=a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76 + rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463 + rackup (1.0.1) sha256=ba86604a28989fe1043bff20d819b360944ca08156406812dca6742b24b3c249 + rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d + rails-html-sanitizer (1.6.2) sha256=35fce2ca8242da8775c83b6ba9c1bcaad6751d9eb73c1abaa8403475ab89a560 + rails_failover (2.3.0) sha256=eed6ea0674fd6f9f6b070ad297ad2ead121ecf9202920f6068b6a4f29d9491c9 + rails_multisite (7.0.0) sha256=7aacf364ed86d2bee73fb679cbfe6c343ce89067b9746b3d5857fffc57f036f2 + railties (8.0.2.1) sha256=54e40e1771fc2878f572d5a4e076cddb057ba8d4d471f8b7d9bfc61bc1301d4c + rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a + raindrops (0.20.1) sha256=aa0eb9ff6834f2d9e232ba688bd49cb30be893bc5a3452e74722c94c1fab4730 + rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493 + rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe + rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e + rb_sys (0.9.106) sha256=b64d5e4bb33aefa0acec5d829162f211a8f9e5bfe08780ed298c637c7229527c + rbtrace (0.5.2) sha256=a2d7d222ab81363aaa0e91337ddbf70df834885d401a80ea0339d86c71f31895 + rchardet (1.9.0) sha256=26889486cdd83b378652baf7603f71d93e431bb11bc237b4cd8c65151af4a590 + rdoc (6.14.2) sha256=9fdd44df130f856ae70cc9a264dfd659b9b40de369b16581f4ab746e42439226 + redcarpet (3.6.1) sha256=d444910e6aa55480c6bcdc0cdb057626e8a32c054c29e793fa642ba2f155f445 + redis (5.4.0) sha256=798900d869418a9fc3977f916578375b45c38247a556b61d58cba6bb02f7d06b + redis-client (0.25.2) sha256=aa37e34c29da39fdb0b8663e7a649adb0923959cd4a9351befe2cd19e6f8d6f0 + redis-namespace (1.11.0) sha256=e91a1aa2b2d888b6dea1d4ab8d39e1ae6fac3426161feb9d91dd5cca598a2239 + regexp_parser (2.11.2) sha256=5e5e9c1485ffd8de53ab1d2807affd81f617f72967dfc64fc75a69e2cbf0ff98 + reline (0.6.2) sha256=1dad26a6008872d59c8e05244b119347c9f2ddaf4a53dce97856cd5f30a02846 + request_store (1.7.0) sha256=e1b75d5346a315f452242a68c937ef8e48b215b9453a77a6c0acdca2934c88cb + rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca + rinku (2.0.6) sha256=8b60670e3143f3db2b37efa262971ce3619ec23092045498ef9f077d82828d7d + rotp (6.3.0) sha256=75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854 + rouge (4.6.0) sha256=10198622df0ef919796da5686a9cc116a49280805e1ed4b851c97ef677eddd7a + rqrcode (3.1.0) sha256=e2d5996375f6e9a013823c289ed575dbea678b8e0388574302c1fac563f098af + rqrcode_core (2.0.0) sha256=1e40b823ab57a96482a417fff5dd5c33645a00cea6ef5d9e342fecc5ef91d9ab + rrule (0.6.0) sha256=bd123b4df7eb086a6388d9c47e8ecaad3708433d11c57a195a50d4d0dd4e9616 + rspec (3.13.1) sha256=b9f9a58fa915b8d94a1d6b3195fe6dd28c4c34836a6097015142c4a9ace72140 + rspec-core (3.13.5) sha256=ab3f682897c6131c67f9a17cfee5022a597f283aebe654d329a565f9937a4fa3 + rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836 + rspec-html-matchers (0.10.0) sha256=d424bfeb0104884478be299b6695b56c2d0432bb77dc9cedecb5138e91c0e9ae + rspec-mocks (3.13.5) sha256=e4338a6f285ada9fe56f5893f5457783af8194f5d08884d17a87321d5195ea81 + rspec-multi-mock (0.3.1) sha256=289470f28d1d9dcdecabf70e9a14f97b0dc7e3dba090dfbe4c98c64ebd53794c + rspec-rails (8.0.2) sha256=113139a53f5d068d4f48d1c29ad5f982013ed9b0daa69d7f7b266eda5d433ace + rspec-support (3.13.4) sha256=184b1814f6a968102b57df631892c7f1990a91c9a3b9e80ef892a0fc2a71a3f7 + rss (0.3.1) sha256=b46234c04551b925180f8bedfc6f6045bf2d9998417feda72f300e7980226737 + rswag-specs (2.16.0) sha256=8ba26085c408b0bd2ed21dc8015c80f417c7d34c63720ab7133c2549b5bd2a91 + rtlcss (0.2.1) sha256=213d5a00bf61267f93a7a516d699d77e1cc5f396743abb33c01e3f3243a7bf60 + rubocop (1.79.2) sha256=d3f42a7d197952c2a163719c5462fea827710a435b18bfb7070c6eedd2e90391 + rubocop-ast (1.46.0) sha256=0da7f6ad5b98614f89b74f11873c191059c823eae07d6ffd40a42a3338f2232b + rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c + rubocop-discourse (3.12.1) sha256=ebf7e2224f053047372071419052828c3e3a01bccb14ea1f282ac143547df9bc + rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe + rubocop-rails (2.33.3) sha256=848c011b58c1292f3066246c9eb18abf6ffcfbce28bc57c4ab888bbec79af74b + rubocop-rspec (3.6.0) sha256=c0e4205871776727e54dee9cc91af5fd74578001551ba40e1fe1a1ab4b404479 + rubocop-rspec_rails (2.31.0) sha256=775375e18a26a1184a812ef3054b79d218e85601b9ae897f38f8be24dddf1f45 + ruby-prof (1.7.2) sha256=270424fcac37e611f2d15a55226c4628e234f8434e1d7c25ca8a2155b9fc4340 + ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33 + ruby-rc4 (0.1.5) sha256=00cc40a39d20b53f5459e7ea006a92cf584e9bc275e2a6f7aa1515510e896c03 + ruby-readability (0.7.2) sha256=7351ddc89ac62ecdd35336acb1313ac29dc1dad9745d59f25109ec2215c6580c + ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef + rubyzip (2.4.1) sha256=8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615 + sanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984 + sass-embedded (1.90.0) sha256=e1ebd6dcc2c94f30bab081e9b35a7a0579abdff51fee7032bef68298ae6c44d5 + sass-embedded (1.90.0-aarch64-linux-gnu) sha256=e8ce5d2b026a63564a07691b50f1481849ed46afa3e92c3b760150efb6aebab8 + sass-embedded (1.90.0-aarch64-linux-musl) sha256=8df2c75b68ca0c55e3d0ad910c647d34ac8b0fd2869128864c370cde0170efe8 + sass-embedded (1.90.0-arm-linux-gnueabihf) sha256=a150421af6900fce707edcde12b4d5f6c9b85f11256ec26383363ce6611244a2 + sass-embedded (1.90.0-arm-linux-musleabihf) sha256=4e125094f86cc3d7577f7fef67ece0e874d4ea790467e698e7ce169d1a518dd9 + sass-embedded (1.90.0-arm64-darwin) sha256=c3ff4f4b3cb692a16b31b1a678deb6ffb2704f6aee6a8552fa63153f2f9c9c8d + sass-embedded (1.90.0-x86_64-darwin) sha256=cc7770bfbc34bc0c4ad7740523c5ed63500fda44b1c088ec9bc1a53206bdb52c + sass-embedded (1.90.0-x86_64-linux-gnu) sha256=cfcead0b72810818186459b14e587a94aa8bb15a167185898154f7b9d5a63036 + sass-embedded (1.90.0-x86_64-linux-musl) sha256=fffd0ee0dff16fa2ce572228fa7d4f5ed1f9aff6b2b6a79af92cb2000a7b5a71 + sassc-embedded (1.80.5) sha256=b2720c938de54e9798bea17bc044ea0df05f552acec30b8e9a79060cceb9cb3e + sawyer (0.9.2) sha256=fa3a72d62a4525517b18857ddb78926aab3424de0129be6772a8e2ba240e7aca + securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1 + shoulda-matchers (6.5.0) sha256=ef6b572b2bed1ac4aba6ab2c5ff345a24b6d055a93a3d1c3bfc86d9d499e3f44 + sidekiq (7.3.9) sha256=1108712e1def89002b28e3545d5ae15d4a57ffd4d2c25d97bb1360988826b5a7 + simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 + simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246 + simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 + simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29 + snaky_hash (2.0.3) sha256=25a3d299566e8153fb02fa23fd9a9358845950f7a523ddbbe1fa1e0d79a6d456 + sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57 + sqlite3 (2.7.3-aarch64-linux-gnu) sha256=00bab7e2ceb7e911b0a2c516bcb9ec0aa7ee57b9b231419e1788515319ac4317 + sqlite3 (2.7.3-aarch64-linux-musl) sha256=035dca6c5bc0f45bb059f33cf774e96462563e460a2d5bd48972562bf3a78c8b + sqlite3 (2.7.3-arm-linux-gnu) sha256=c22a2593a8274cba5fc55be415cfddab3ff5d3275b5a78878daf214bf2a60db1 + sqlite3 (2.7.3-arm-linux-musl) sha256=e735bea1c81eceff2e1b3388e6bccbcbf5c81405f7dbd69b5c80b3b4c4a92c89 + sqlite3 (2.7.3-arm64-darwin) sha256=133772f4312a9d0fa0c16aab7c2abdda2ee93f47dded0f353a2981f7b9d2b9b4 + sqlite3 (2.7.3-x86_64-darwin) sha256=a857e364e858d79e634c66c02c130f79c633f0035d422b3381be9958859771f4 + sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865 + sqlite3 (2.7.3-x86_64-linux-musl) sha256=4307278661bbe0a619da7a5da25f4417f6826246ee7b4a56a5c10c3731d5256a + sshkey (3.0.0) sha256=655ba351d6e01a48dfe59d65530af8975c777b8cc57a061770de3228ff2d11cd + stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c + stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa + stripe (11.1.0) sha256=a76e82cc7e4d2433803ca5fbe9453d019df376236f0b9fbcb7f36e6dd327f98d + syntax_tree (6.3.0) sha256=56e25a9692c798ec94c5442fe94c5e94af76bef91edc8bb02052cbdecf35f13d + test-prof (1.4.4) sha256=1a59513ed9d33a1f5ca17c0b89da4e70f60a91c83ec62e9a873dbb99141353ef + thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d + tiktoken_ruby (0.0.11.1) sha256=adffa735711bf1b19554423c82ba2e2be4a77d7776186cbaf19f837680f8cb8b + tiktoken_ruby (0.0.11.1-aarch64-linux) sha256=1ffcfcf1a7ac561e2e08996a60b3ee4213923b02184d29da2eb76c3be0c54001 + tiktoken_ruby (0.0.11.1-arm-linux) sha256=2f1b79eadf62c2ea2691821f1d1c008b402e0e48d9baef2fc52d648b0744b7a5 + tiktoken_ruby (0.0.11.1-arm64-darwin) sha256=9b0f2a863bf6dbad2c78f95d8566e39fbb2293be552a7cc16a93e638a0b823e1 + tiktoken_ruby (0.0.11.1-x86_64-darwin) sha256=554c84d14e66a7cef277b00ec26ce6c201d6b94d223f8d71397b1287cda11d78 + tiktoken_ruby (0.0.11.1-x86_64-linux) sha256=ab56c936876c2ccba41fd8dc6588097e6555345ad0bdf5f4204be771a3637618 + tiktoken_ruby (0.0.11.1-x86_64-linux-musl) sha256=fd52104cbeb14471136f8519a07eef457ca84d01693bfb9b92b150a1fb3f42f6 + timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e + tokenizers (0.5.5) sha256=7bf1600567a3f253ec3f24da51af338437ecd1c638874122a9c57ea1724f4d92 + tokenizers (0.5.5-aarch64-linux) sha256=55ac300cdcefcb4dccbe5b1577920d3ab47dab404c4e70a442aa5c97f084790d + tokenizers (0.5.5-aarch64-linux-musl) sha256=ddd23414ef60e15860a1ec804496ff053aa817956036594923a086c2897c492a + tokenizers (0.5.5-arm64-darwin) sha256=3a1606ce6aa918d89eea816b2de4cba9a7b5ad76ba1b42ad3ff44f6ff6208a85 + tokenizers (0.5.5-x86_64-darwin) sha256=892594b0406c9890d45b4a2fbf16d75e7075472029a48fd84b776d5ee9863e17 + tokenizers (0.5.5-x86_64-linux) sha256=e9681afe50dc74beed880bed08d385ebb1d22d51831d9169e285f3836306730c + tokenizers (0.5.5-x86_64-linux-musl) sha256=f5ccc321a58b58b45ee85042ea384fb0f99600361ecd1260f77bfd020b8bdb0a + trilogy (2.9.0) sha256=a2d63b663ba68a4758e15d1f9afb228f5d16efc7fe7cea68699e1c106ef6067f + ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca + tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b + tzinfo-data (1.2025.2) sha256=a92375a1fbb47d38fe88fd514c40a38cc8f97d168da2a6479f15185e86470939 + unf (0.2.0) sha256=e6bcc2e101d80e3f9459753db747d5926aada1aaaf61e629e93359da9a5b04ab + unicode-display_width (3.1.5) sha256=bf566817855ee7ee3adcf7bace0d5906cb14401417db59193f8a5fcedf02dd4e + unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a + unicorn (6.1.0) sha256=45dd987add4c2b084c1880a68373af42797a704ad7441faff9b14b4982aa0fc0 + uniform_notifier (1.17.0) sha256=db4787ed2ad168ccb0ad4027a45811e1c9e2f8275682fee72697e6ce1c6d6ca7 + uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011 + useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844 + version_gem (1.1.8) sha256=a964767ecbe36551b9ff2e59099548c27569f2f7f94bdb09f609d76393a8e008 + web-push (3.0.1) sha256=5b4dd2f2bba3bd8951da6416492fe920a6f203d14d3080f943c5d01c0cc4b18d + webmock (3.25.1) sha256=ab9d5d9353bcbe6322c83e1c60a7103988efc7b67cd72ffb9012629c3d396323 + webrick (1.9.1) sha256=b42d3c94f166f3fb73d87e9b359def9b5836c426fc8beacf38f2184a21b2a989 + xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e + yaml-lint (0.1.2) sha256=e3960b171766ae187338a169815e99fe10fcb0d9c22b1c539e8d57e114324c8a + yard (0.9.37) sha256=a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992 + zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85 + zendesk_api (1.38.0.rc1) sha256=9ebe2575d223ed1c0651b2d10df6c010141cda49d524c38532b472f7e8bb3f7a + +RUBY VERSION + ruby 3.3.1p55 BUNDLED WITH - 2.6.9 + 2.5.22 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 81bfd5bf56dd..248c7b7f5dcc 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -12,17 +12,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh"; + sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; actionpack = { dependencies = [ "actionview" "activesupport" "nokogiri" - "racc" "rack" "rack-session" "rack-test" @@ -38,10 +37,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp"; + sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; actionview = { dependencies = [ @@ -59,10 +58,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39"; + sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; actionview_precompiler = { dependencies = [ "actionview" ]; @@ -95,10 +94,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj"; + sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -110,10 +109,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643"; + sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; activerecord = { dependencies = [ @@ -129,10 +128,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr"; + sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; activesupport = { dependencies = [ @@ -147,6 +146,7 @@ "minitest" "securerandom" "tzinfo" + "uri" ]; groups = [ "default" @@ -156,10 +156,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4"; + sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -176,10 +176,20 @@ }; version = "2.8.7"; }; - annotate = { + afm = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ia5iw9xvvy1igaxsa08vvv4b5ry9ipyr18917pi8w0y4kvddm2v"; + type = "gem"; + }; + version = "1.0.0"; + }; + annotaterb = { dependencies = [ "activerecord" - "rake" + "activesupport" ]; groups = [ "development" @@ -188,10 +198,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs"; + sha256 = "15229wyciywlrl8pb263lc24ahsm86kp0ygipf6k0qzhx39wazm0"; type = "gem"; }; - version = "3.2.0"; + version = "4.18.0"; + }; + Ascii85 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nmyxpngg5rycyryhq9l9hapz1y3iqyflskyksxkqm0832a5vjqm"; + type = "gem"; + }; + version = "2.0.1"; }; ast = { groups = [ @@ -202,46 +222,48 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm"; type = "gem"; }; - version = "2.4.2"; + version = "2.4.3"; }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fhym2gsm9kzl74nvzk3hhw288n1l77kxinhik43p37ayranzcv5"; + sha256 = "0gkd4q0bbmw6vah15vkghvij398l7g5yd7570ilk9b3pcwazdx98"; type = "gem"; }; - version = "1.894.0"; + version = "1.1134.0"; }; aws-sdk-core = { dependencies = [ "aws-eventstream" "aws-partitions" "aws-sigv4" + "base64" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; + sha256 = "17n7vw9djnw74x7cgwsxfi0k033l351mf56i7y3lg4yawg2iy1wr"; type = "gem"; }; - version = "3.191.3"; + version = "3.227.0"; }; aws-sdk-kms = { dependencies = [ @@ -252,10 +274,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf"; + sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; type = "gem"; }; - version = "1.77.0"; + version = "1.99.0"; + }; + aws-sdk-mediaconvert = { + dependencies = [ + "aws-sdk-core" + "aws-sigv4" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1r0182r7scavikd82v7392mzj2x76cihy7cffz00f14brmqsamfr"; + type = "gem"; + }; + version = "1.165.0"; }; aws-sdk-s3 = { dependencies = [ @@ -267,10 +303,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s"; + sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; type = "gem"; }; - version = "1.143.0"; + version = "1.182.0"; }; aws-sdk-sns = { dependencies = [ @@ -281,10 +317,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ql1y276lfk27dyisk8ak1wdnysklw2dcir3kgy05glzzc9j4z1w"; + sha256 = "1m3dz9cz7zlwhbd5n5wnsqm00c7khpmbnggvraqq2cf50dr3qazr"; type = "gem"; }; - version = "1.72.0"; + version = "1.96.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -292,23 +328,31 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.8.0"; + version = "1.12.1"; }; base64 = { groups = [ "default" + "development" "test" ]; - platforms = [ ]; + platforms = [ + { + engine = "maglev"; + } + { + engine = "ruby"; + } + ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; }; benchmark = { groups = [ @@ -319,10 +363,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; better_errors = { dependencies = [ @@ -355,10 +399,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r"; type = "gem"; }; - version = "3.1.9"; + version = "3.2.2"; }; binding_of_caller = { dependencies = [ "debug_inspector" ]; @@ -387,10 +431,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c"; + sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha"; type = "gem"; }; - version = "1.18.4"; + version = "1.18.6"; }; builder = { groups = [ @@ -415,10 +459,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kfyg2j6a4sg94sajnmy0scv9dxjh7jka9dlil1fzpx137g2zw3p"; + sha256 = "0hn5nysivwlzwgwgh3m97kzjgfy8g7nl82b2pahdj0xqnrg91fdl"; type = "gem"; }; - version = "8.0.0"; + version = "8.0.8"; }; byebug = { groups = [ @@ -435,10 +479,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl"; type = "gem"; }; - version = "11.1.3"; + version = "12.0.0"; }; capybara = { dependencies = [ @@ -460,15 +504,30 @@ }; version = "3.40.0"; }; + capybara-playwright-driver = { + dependencies = [ + "addressable" + "capybara" + "playwright-ruby-client" + ]; + groups = [ "test" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7"; + type = "gem"; + }; + version = "0.5.7"; + }; cbor = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; + sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr"; type = "gem"; }; - version = "0.5.9.8"; + version = "0.5.10.1"; }; certified = { groups = [ @@ -488,10 +547,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3"; + sha256 = "1njrjznc2j5xqqw71sp9130b9hyv59h2gfrf6yaf4in1n9dzd6gy"; type = "gem"; }; - version = "0.4.1"; + version = "0.5.0"; }; chunky_png = { groups = [ "default" ]; @@ -556,10 +615,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3"; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; }; cose = { dependencies = [ @@ -622,20 +681,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0625073hwx41c246v9dvkp0rk0xgh9d0sc0gm73dbmlxnjwgalv7"; + sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc"; type = "gem"; }; - version = "1.21.0"; + version = "1.21.1"; }; csv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g"; + sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.5"; }; date = { groups = [ @@ -673,20 +732,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; + sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.2"; }; diffy = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22"; + sha256 = "1qs7drxvyzk3dg22xgblc12lq5kww9hhj7vpn8ay3l42rasllf3r"; type = "gem"; }; - version = "3.4.3"; + version = "3.4.4"; }; digest = { groups = [ "default" ]; @@ -708,15 +767,25 @@ }; version = "0.2.9"; }; + discourse-emojis = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0anccf6f8qi992pkcwdc0drz4mqv20ssnrz2a9ql7bj973gf28mk"; + type = "gem"; + }; + version = "1.0.41"; + }; discourse-fonts = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18bj5d0hf7bwy0pppah55aawg7yn61sjgjhh03j5lcnkxl9mrlm7"; + sha256 = "0cq0ds6c2hz1qs2f3skdbs9pqy4dkl1jfm3778q0hnb1f7bdvm3q"; type = "gem"; }; - version = "0.0.18"; + version = "0.0.19"; }; discourse-seed-fu = { dependencies = [ @@ -732,6 +801,21 @@ }; version = "2.3.12"; }; + discourse_ai-tokenizers = { + dependencies = [ + "activesupport" + "tiktoken_ruby" + "tokenizers" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wy3pcrml7g51566i3w2r16qqix1hyr97j7292hzwaabgcpjyxd7"; + type = "gem"; + }; + version = "0.3.1"; + }; discourse_dev_assets = { dependencies = [ "faker" @@ -744,10 +828,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1"; + sha256 = "11c2i7wm3m52xisycsz85g84p79q7gbxz0nkgljgg8qa44d816m0"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.5"; }; docile = { groups = [ @@ -763,14 +847,18 @@ version = "1.4.1"; }; drb = { - groups = [ "default" ]; + groups = [ + "default" + "development" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.3"; }; dry-initializer = { groups = [ "default" ]; @@ -782,6 +870,16 @@ }; version = "3.2.0"; }; + ed25519 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n"; + type = "gem"; + }; + version = "1.4.0"; + }; email_reply_trimmer = { groups = [ "default" ]; platforms = [ ]; @@ -792,6 +890,20 @@ }; version = "0.2.0"; }; + erb = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03vcq8g8rxdq8njp9j9k9fxwjw19q4m08c7lxjs0yc6l8f0ja3yk"; + type = "gem"; + }; + version = "5.0.2"; + }; erubi = { groups = [ "default" @@ -814,27 +926,15 @@ version = "1.13.1"; }; excon = { + dependencies = [ "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1am69fn9nzj2pa05fd02q4zbzn1g7c9w5g52yjzdsbhm1x9n9g95"; + sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a"; type = "gem"; }; - version = "1.2.3"; - }; - execjs = { - groups = [ - "assets" - "default" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb"; - type = "gem"; - }; - version = "2.10.0"; + version = "1.2.5"; }; exifr = { groups = [ "default" ]; @@ -851,10 +951,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1x73a43hjw7f9vwlhfax4rmp7hpwaadvcamnbw31hh94bx3i71lv"; + sha256 = "1k5kglcva79sxvqj10x481r1w8ql6zdr77mv095g8j5ksf6k600d"; type = "gem"; }; - version = "2.8.2"; + version = "2.13"; }; fabrication = { groups = [ @@ -864,10 +964,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1al5iv3as21l5clci0b5cg27z136pan7gkj7plp4l0w83c6z2y9c"; + sha256 = "1qrv8vvhjx9yi64bji6hrp08if14hmwdy08prg9qld3ij2nvz856"; type = "gem"; }; - version = "2.31.0"; + version = "3.0.0"; }; faker = { dependencies = [ "i18n" ]; @@ -878,20 +978,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; + sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r"; type = "gem"; }; - version = "2.23.0"; - }; - fakeweb = { - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a09z9nb369bvwpghncgd5y4f95lh28w0q258srh02h22fz9dj8y"; - type = "gem"; - }; - version = "1.3.0"; + version = "3.5.2"; }; faraday = { dependencies = [ @@ -903,10 +993,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; + sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7"; type = "gem"; }; - version = "2.12.2"; + version = "2.13.4"; + }; + faraday-multipart = { + dependencies = [ "multipart-post" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp"; + type = "gem"; + }; + version = "1.1.1"; }; faraday-net_http = { dependencies = [ "net-http" ]; @@ -914,10 +1015,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.1"; }; faraday-retry = { dependencies = [ "faraday" ]; @@ -925,10 +1026,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1"; + sha256 = "1laici6jximrz3a8rkm8qmwdmw3fgzk22qh4l8wd5srjj01d40i4"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.2"; }; fast_blank = { groups = [ "default" ]; @@ -976,10 +1077,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6"; + sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; type = "gem"; }; - version = "1.17.1"; + version = "1.17.2"; }; fspath = { groups = [ "default" ]; @@ -1002,6 +1103,20 @@ }; version = "1.2.1"; }; + goldiloader = { + dependencies = [ + "activerecord" + "activesupport" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wqb6l1262d7vs9rh86k22q0xskypc84v3wdv74kp5jb8bzqcyi7"; + type = "gem"; + }; + version = "5.4.0"; + }; google-protobuf = { dependencies = [ "bigdecimal" @@ -1011,10 +1126,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rmmp533ypc5c2r3ks8zqxchqkf1g8laig87f7hdfmwz0p07cmcs"; + sha256 = "1awndc5nswpc1xdlid2wkikj45adbhmbfqizz8rr5fz9h01dqjz6"; type = "gem"; }; - version = "4.29.3"; + version = "4.32.0"; }; guess_html_encoding = { groups = [ "default" ]; @@ -1044,10 +1159,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c"; + sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169"; type = "gem"; }; - version = "1.1.2"; + version = "1.2.0"; + }; + hashery = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj"; + type = "gem"; + }; + version = "2.1.2"; }; hashie = { groups = [ "default" ]; @@ -1142,6 +1267,16 @@ }; version = "1.6.0"; }; + inflection = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mfkk0j0dway3p4gwzk8fnpi4hwaywl2v0iywf1azf98zhk9pfnf"; + type = "gem"; + }; + version = "1.0.0"; + }; io-console = { groups = [ "default" @@ -1151,10 +1286,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd"; + sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; irb = { dependencies = [ @@ -1170,10 +1305,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r"; + sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.2"; }; iso8601 = { groups = [ "default" ]; @@ -1204,10 +1339,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; + sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82"; type = "gem"; }; - version = "2.9.1"; + version = "2.13.2"; }; json-schema = { dependencies = [ @@ -1222,10 +1357,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk"; + sha256 = "1ma0k5889hzydba2ci8lqg87pxsh9zabz7jchm9cbacwsw7axgk0"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.2"; }; json_schemer = { dependencies = [ @@ -1283,20 +1418,34 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164"; + sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px"; type = "gem"; }; - version = "3.17.0.4"; + version = "3.17.0.5"; }; libv8-node = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ki1vjkq8nhmlz7rqi1ic0mjmbjsa7d1bgcvkzdl4q9vhaa5dzvn"; + sha256 = "1kbijkxrqzgf94qdzh1xdxcypr6wnqmra0bhmwz7bif45739l3ig"; type = "gem"; }; - version = "22.7.0.4"; + version = "24.1.0.0"; + }; + lint_roller = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c"; + type = "gem"; + }; + version = "1.1.0"; }; listen = { dependencies = [ @@ -1373,10 +1522,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bmvpa5mk779rgl4s4qy8nyhjh1lpf5gn4pmv40xyalnv2whryf3"; + sha256 = "1a52r46d263h2kkxng7amrihz5c7xm9ak8vf4jq4x77rwxcbwjx8"; type = "gem"; }; - version = "2.20.0"; + version = "2.20.1"; }; loofah = { dependencies = [ @@ -1391,10 +1540,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1"; + sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5"; type = "gem"; }; - version = "2.24.0"; + version = "2.24.1"; }; lru_redux = { groups = [ "default" ]; @@ -1450,10 +1599,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0"; type = "gem"; }; - version = "0.4.2"; + version = "0.4.3"; }; maxminddb = { groups = [ "default" ]; @@ -1488,10 +1637,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15xqp7pnicjh2868fsc6fmxw8cw32bpiaqpc5bz8cwdib09ns3qk"; + sha256 = "1nra1ifgapr67kb6zjkzws5gdnwrzbm463zf1l1p2rby2v1wb7ki"; type = "gem"; }; - version = "4.3.8"; + version = "4.4.1"; }; messageformat-wrapper = { dependencies = [ "mini_racer" ]; @@ -1518,6 +1667,36 @@ }; version = "1.1.0"; }; + mime-types = { + dependencies = [ + "logger" + "mime-types-data" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw"; + type = "gem"; + }; + version = "3.7.0"; + }; + mime-types-data = { + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f05x8mm7p1dpmchpfx2393nyb4wnqizximq9wq904zsjrl4551v"; + type = "gem"; + }; + version = "3.2025.0812"; + }; mini_mime = { groups = [ "default" @@ -1552,10 +1731,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "168a3crdgakm9mk5yrqlqsrx587rm7sk1f2l7sfs9cg87f7xb7ji"; + sha256 = "1hdv2sn2p74hpixvk7065irhiycilgi2ccc4xmf192yv713njlli"; type = "gem"; }; - version = "0.17.0.pre13"; + version = "0.19.0"; }; mini_scheduler = { dependencies = [ "sidekiq" ]; @@ -1594,10 +1773,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c0bld2bpnfrld7g0pli3pp3b1z3a21cgahhw70i5cjr33sx88pi"; + sha256 = "0f05mq75bc35w78vkx21bn1lcl07r4w2jqysdji6afy6j1mca3ya"; type = "gem"; }; - version = "0.1.2"; + version = "1.0.0"; }; minitest = { groups = [ @@ -1608,10 +1787,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw"; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; type = "gem"; }; - version = "5.25.4"; + version = "5.25.5"; }; mocha = { dependencies = [ "ruby2_keywords" ]; @@ -1639,20 +1818,20 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a5fsgchkpcca4wf3pipbb2jbj523l7fbaq37j10cr0yymwlkc7z"; + sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0"; }; multi_json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; multi_xml = { dependencies = [ "bigdecimal" ]; @@ -1660,10 +1839,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg"; + sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; + }; + multipart-post = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq"; + type = "gem"; + }; + version = "2.4.1"; }; mustache = { groups = [ "default" ]; @@ -1695,10 +1884,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ak8w6ypw4lba1y1mdmqwvkrh84ps6h9kd7hn029h9k85j9sirmb"; + sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr"; type = "gem"; }; - version = "0.5.5"; + version = "0.5.9"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -1728,10 +1917,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z"; + sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.1"; }; nio4r = { groups = [ "default" ]; @@ -1756,10 +1945,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gzqcs1kkykj8lrnbxc1iwr1wqmmaml8l6wyxdvy0vqq6gxiqyck"; + sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc"; type = "gem"; }; - version = "1.18.2"; + version = "1.18.9"; }; oauth = { dependencies = [ @@ -1804,6 +1993,20 @@ }; version = "1.4.11"; }; + octokit = { + dependencies = [ + "faraday" + "sawyer" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8"; + type = "gem"; + }; + version = "5.6.1"; + }; oj = { dependencies = [ "bigdecimal" @@ -1813,24 +2016,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "091kbavd1rfiwr6kn1laladspyk67y6hdlsdilz752nqxm9w3ibg"; + sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara"; type = "gem"; }; - version = "3.16.9"; + version = "3.16.11"; }; omniauth = { dependencies = [ "hashie" "rack" + "rack-protection" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; + sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; type = "gem"; }; - version = "1.9.2"; + version = "2.1.2"; }; omniauth-facebook = { dependencies = [ "omniauth-oauth2" ]; @@ -1852,10 +2056,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; + sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.0"; }; omniauth-google-oauth2 = { dependencies = [ @@ -1868,10 +2072,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a"; + sha256 = "19hj9l3xgsy7dssjmfmkca129wdbhh3pdmp0jm685awqinna9mrf"; type = "gem"; }; - version = "0.8.2"; + version = "1.0.1"; }; omniauth-oauth = { dependencies = [ @@ -1949,20 +2153,20 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "073pk2rhyjq2vhdiz3xh2s884r15cvprw1yfjs7h9bmwdf1f9j81"; + sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c"; type = "gem"; }; - version = "3.2.0"; + version = "3.2.1"; }; ostruct = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.3"; }; parallel = { groups = [ @@ -1973,10 +2177,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq"; + sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; type = "gem"; }; - version = "1.26.3"; + version = "1.27.0"; }; parallel_tests = { dependencies = [ "parallel" ]; @@ -1987,10 +2191,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nikqa0h9znbg31p3hl4y3280sqggjd7m47gmjydxw6iasm66l09"; + sha256 = "0j522kfb9ykk98sfw7qssklwglgahwi1dc8ckcq8wvcgdv23yhc9"; type = "gem"; }; - version = "4.9.0"; + version = "5.4.0"; }; parser = { dependencies = [ @@ -2005,20 +2209,54 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16qi2qhpszm842awxghmsp64yvvawafq96w5jw98irz3f4bh2jbl"; + sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll"; type = "gem"; }; - version = "3.3.7.0"; + version = "3.3.9.0"; + }; + pdf-reader = { + dependencies = [ + "Ascii85" + "afm" + "hashery" + "ruby-rc4" + "ttfunk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11h8dhhd2c8mxssibk9q6qn7ilj4p71crlfirw8pppn8pr85f0n5"; + type = "gem"; + }; + version = "2.15.0"; }; pg = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn"; + sha256 = "0swf0a0r2xryx788q09w4zcwdq7v1pwq5fvkgr9m8abhbxgaf472"; type = "gem"; }; - version = "1.5.9"; + version = "1.6.1"; + }; + playwright-ruby-client = { + dependencies = [ + "concurrent-ruby" + "mime-types" + ]; + groups = [ + "default" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ql2frvdgfw57xycwvz8mk11i8v2ksnn3b6s9ajxazh2khd775y0"; + type = "gem"; + }; + version = "1.54.1"; }; pp = { dependencies = [ "prettyprint" ]; @@ -2063,6 +2301,20 @@ }; version = "0.2.0"; }; + prism = { + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw"; + type = "gem"; + }; + version = "1.4.0"; + }; progress = { groups = [ "default" ]; platforms = [ ]; @@ -2073,19 +2325,38 @@ }; version = "3.6.0"; }; - pry = { + propshaft = { dependencies = [ - "coderay" - "method_source" + "actionpack" + "activesupport" + "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + sha256 = "0m46p68521hnzvwbby818kfb9zskmwhqd7x5a7w544gjaapivfg9"; type = "gem"; }; - version = "0.14.2"; + version = "1.2.1"; + }; + pry = { + dependencies = [ + "coderay" + "method_source" + ]; + groups = [ + "default" + "development" + "test" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j"; + type = "gem"; + }; + version = "0.15.2"; }; pry-byebug = { dependencies = [ @@ -2096,10 +2367,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; + sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb"; type = "gem"; }; - version = "3.10.1"; + version = "3.11.0"; }; pry-rails = { dependencies = [ "pry" ]; @@ -2142,10 +2413,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; + sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.6"; }; public_suffix = { groups = [ @@ -2156,10 +2427,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; puma = { dependencies = [ "nio4r" ]; @@ -2202,10 +2473,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; + sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z"; type = "gem"; }; - version = "2.2.10"; + version = "2.2.17"; }; rack-mini-profiler = { dependencies = [ "rack" ]; @@ -2213,10 +2484,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00d80wjavaakhs177b7g542qs3n55kj4icjkwj0lbxcmaxyxxw1b"; + sha256 = "0y1x4rc7bz8x3zn8p6g21rw6ivbjml6a2vl9dhchiy8i6b110n28"; type = "gem"; }; - version = "3.3.1"; + version = "4.0.1"; }; rack-protection = { dependencies = [ @@ -2294,10 +2565,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5"; + sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rails-html-sanitizer = { dependencies = [ @@ -2327,10 +2598,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pvwgm413fza8q1zc3mmzx504wiljm9d7b9qrkzfzsb2yzpidxs2"; + sha256 = "1jcijjfz595nd1h0z4h2jb7iw4md5snrglha0xmryvzxfh3fmmpf"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rails_multisite = { dependencies = [ @@ -2341,10 +2612,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1al624kvcxa5ijprali9gxp0bqv1w1573iswb5fkg4p2i4xvimvv"; + sha256 = "1winy1bzrzspb0ynnx5rcy8fhg1ldkzcnydn7zkvxll6xmjg7b3s"; type = "gem"; }; - version = "6.1.0"; + version = "7.0.0"; }; railties = { dependencies = [ @@ -2364,10 +2635,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3"; + sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l"; type = "gem"; }; - version = "7.2.2.1"; + version = "8.0.2.1"; }; rainbow = { groups = [ @@ -2412,10 +2683,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + sha256 = "14s4jdcs1a4saam9qmzbsa2bsh85rj9zfxny5z315x3gg0nhkxcn"; type = "gem"; }; - version = "13.2.1"; + version = "13.3.0"; }; rb-fsevent = { groups = [ @@ -2445,6 +2716,16 @@ }; version = "0.11.1"; }; + rb_sys = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0z2j55r7qqwc57nq11z0pzjzka0iy9i930jxxjna1vrsnd5mwkdn"; + type = "gem"; + }; + version = "0.9.106"; + }; rbtrace = { dependencies = [ "ffi" @@ -2462,10 +2743,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; + sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; rchardet = { groups = [ "default" ]; @@ -2478,7 +2759,10 @@ version = "1.9.0"; }; rdoc = { - dependencies = [ "psych" ]; + dependencies = [ + "erb" + "psych" + ]; groups = [ "default" "development" @@ -2487,30 +2771,42 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy"; + sha256 = "09lj8d16wx5byj0nbcb9wc6v9farsvgn98n91kknm18g2ggl9pcz"; type = "gem"; }; - version = "6.11.0"; + version = "6.14.2"; }; redcarpet = { groups = [ "generic_import" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca"; + sha256 = "0iglapqs4av4za9yfaac0lna7s16fq2xn36wpk380m55d8792i6l"; type = "gem"; }; - version = "3.6.0"; + version = "3.6.1"; }; redis = { + dependencies = [ "redis-client" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; + sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br"; type = "gem"; }; - version = "4.8.1"; + version = "5.4.0"; + }; + redis-client = { + dependencies = [ "connection_pool" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1w6nz3k1kkg2xwdkbaflkjaj62fvk9j7lgk6p2qgsffs556f6dxa"; + type = "gem"; + }; + version = "0.25.2"; }; redis-namespace = { dependencies = [ "redis" ]; @@ -2532,10 +2828,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb"; + sha256 = "167zy35y4sasqx7wdpv757vigxl1znphfa0xmd9xxn7zhla9qpjy"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; reline = { dependencies = [ "io-console" ]; @@ -2547,10 +2843,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp"; + sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.2"; }; request_store = { dependencies = [ "rack" ]; @@ -2611,10 +2907,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a"; + sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h"; type = "gem"; }; - version = "4.5.1"; + version = "4.6.0"; }; rqrcode = { dependencies = [ @@ -2625,20 +2921,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3"; + sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2"; type = "gem"; }; - version = "2.2.0"; + version = "3.1.0"; }; rqrcode_core = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg"; + sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y"; type = "gem"; }; - version = "1.2.0"; + version = "2.0.0"; }; rrule = { dependencies = [ "activesupport" ]; @@ -2664,10 +2960,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; + sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr"; type = "gem"; }; - version = "3.13.0"; + version = "3.13.1"; }; rspec-core = { dependencies = [ "rspec-support" ]; @@ -2679,10 +2975,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl"; + sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.5"; }; rspec-expectations = { dependencies = [ @@ -2697,10 +2993,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; + sha256 = "0dl8npj0jfpy31bxi6syc7jymyd861q277sfr6jawq2hv6hx791k"; type = "gem"; }; - version = "3.13.3"; + version = "3.13.5"; }; rspec-html-matchers = { dependencies = [ @@ -2732,10 +3028,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; + sha256 = "10gajm8iscl7gb8q926hyna83bw3fx2zb4sqdzjrznjs51pqlcz4"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.5"; }; rspec-multi-mock = { dependencies = [ "rspec" ]; @@ -2768,10 +3064,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0izfwfb9bfb5q3wjgjc85b9nlkribqn8vk75zadafv08qilmnn4l"; + sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i"; type = "gem"; }; - version = "7.1.0"; + version = "8.0.2"; }; rspec-support = { groups = [ @@ -2782,10 +3078,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf"; + sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq"; type = "gem"; }; - version = "3.13.2"; + version = "3.13.4"; }; rss = { dependencies = [ "rexml" ]; @@ -2832,6 +3128,7 @@ dependencies = [ "json" "language_server-protocol" + "lint_roller" "parallel" "parser" "rainbow" @@ -2848,13 +3145,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ypwxjy2cp44278m9ljg3s937n2cd6x4yskcyzf1k9m3hkjd3pyk"; + sha256 = "1483x79fsvhc0yvvy62v8c5729x8zri5973icfhw4lkr35yjmx6k"; type = "gem"; }; - version = "1.71.1"; + version = "1.79.2"; }; rubocop-ast = { - dependencies = [ "parser" ]; + dependencies = [ + "parser" + "prism" + ]; groups = [ "default" "development" @@ -2863,13 +3163,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg"; + sha256 = "0ar3y8w36am483ynyzg0x8iwhn8h34y8f4agny4lyqcqbfnzd9qd"; type = "gem"; }; - version = "1.38.0"; + version = "1.46.0"; }; rubocop-capybara = { - dependencies = [ "rubocop" ]; + dependencies = [ + "lint_roller" + "rubocop" + ]; groups = [ "default" "development" @@ -2878,14 +3181,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; + sha256 = "030wymq0jrblrdswl1lncj60dhcg5wszz6708qzsbziyyap8rn6f"; type = "gem"; }; - version = "2.21.0"; + version = "2.22.1"; }; rubocop-discourse = { dependencies = [ "activesupport" + "lint_roller" "rubocop" "rubocop-capybara" "rubocop-factory_bot" @@ -2900,13 +3204,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13n46107615lc8lkx4dh38hpzv4qxx4a0m6dvf0r21zxnvz7ysyl"; + sha256 = "1g7rgma47h9a50gyl56bph0klglch9990hbi40vlfc059wif5xzb"; type = "gem"; }; - version = "3.9.3"; + version = "3.12.1"; }; rubocop-factory_bot = { - dependencies = [ "rubocop" ]; + dependencies = [ + "lint_roller" + "rubocop" + ]; groups = [ "default" "development" @@ -2915,14 +3222,15 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd"; + sha256 = "1zkkhldrdacv4gn58dc591jxjnw5d767frzywm41i33p2rclnx4x"; type = "gem"; }; - version = "2.26.1"; + version = "2.27.1"; }; rubocop-rails = { dependencies = [ "activesupport" + "lint_roller" "rack" "rubocop" "rubocop-ast" @@ -2935,13 +3243,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ahpgc22shmkk1n96rz3islcpx5sgg4z3mblynjz8qjxipsgrhj1"; + sha256 = "0jzpkb3vx2w8mg25gg18rvxzqvxziaqrwv14cqq2yaf1b0dh3344"; type = "gem"; }; - version = "2.29.1"; + version = "2.33.3"; }; rubocop-rspec = { - dependencies = [ "rubocop" ]; + dependencies = [ + "lint_roller" + "rubocop" + ]; groups = [ "default" "development" @@ -2950,13 +3261,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11a89mzbby49hbd8nhkjrxpr8bq24fafl728mjkk15ccd8xw28c7"; + sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60"; type = "gem"; }; - version = "3.4.0"; + version = "3.6.0"; }; rubocop-rspec_rails = { dependencies = [ + "lint_roller" "rubocop" "rubocop-rspec" ]; @@ -2968,12 +3280,13 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; + sha256 = "0i8zvzfj9gpq71zqkbmr05bfh66jg55hbwrfh551i896ibhpalvp"; type = "gem"; }; - version = "2.30.0"; + version = "2.31.0"; }; ruby-prof = { + dependencies = [ "base64" ]; groups = [ "development" ]; platforms = [ { @@ -2985,10 +3298,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "097ac9ns2j29zj5fw08libz8izibrlfgg6vkj55d4bzrii296qq2"; + sha256 = "0h23zjwma8car8jpq7af8gw39qi88rn24mass7r13ripmky28117"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; ruby-progressbar = { groups = [ @@ -3004,6 +3317,16 @@ }; version = "1.13.0"; }; + ruby-rc4 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00"; + type = "gem"; + }; + version = "0.1.5"; + }; ruby-readability = { dependencies = [ "guess_html_encoding" @@ -3068,10 +3391,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; + sha256 = "1ma4djp9i0pnpqr71vhzypgsny85g9db7sc1n2x30ky9qbfddsz1"; type = "gem"; }; - version = "1.77.5"; + version = "1.90.0"; }; sassc-embedded = { dependencies = [ "sass-embedded" ]; @@ -3079,10 +3402,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07pddxi18asxzkn652kvgh43dl1b0nf5p8ha62yhg2r0vzapzzvv"; + sha256 = "0gnbp770q1krka70phyf59amzw0dx92c0yx1psc9fkp5in9hqwmj"; type = "gem"; }; - version = "1.77.7"; + version = "1.80.5"; + }; + sawyer = { + dependencies = [ + "addressable" + "faraday" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; + type = "gem"; + }; + version = "0.9.2"; }; securerandom = { groups = [ @@ -3098,34 +3435,6 @@ }; version = "0.4.1"; }; - selenium-devtools = { - dependencies = [ "selenium-webdriver" ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1v2i8bmf92fb6c3cs7wnkxw48mgk3b8r2dib947h62ll7qgyqqiq"; - type = "gem"; - }; - version = "0.135.0"; - }; - selenium-webdriver = { - dependencies = [ - "base64" - "logger" - "rexml" - "rubyzip" - "websocket" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1s80s7mgpwpfj4df2f43f5im37ks884xkbcxd9fxpk93xs7dicnx"; - type = "gem"; - }; - version = "4.31.0"; - }; shoulda-matchers = { dependencies = [ "activesupport" ]; groups = [ @@ -3135,25 +3444,27 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch"; + sha256 = "0i1zkr4rsvf8pz1x38wkb82nsjx28prmyb5blsmw86pd5cmmfszg"; type = "gem"; }; - version = "6.4.0"; + version = "6.5.0"; }; sidekiq = { dependencies = [ + "base64" "connection_pool" + "logger" "rack" - "redis" + "redis-client" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl"; + sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i"; type = "gem"; }; - version = "6.5.12"; + version = "7.3.9"; }; simplecov = { dependencies = [ @@ -3178,10 +3489,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx"; + sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.2"; }; simplecov_json_formatter = { groups = [ @@ -3215,40 +3526,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s"; + sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5"; type = "gem"; }; - version = "2.0.1"; - }; - sprockets = { - dependencies = [ - "base64" - "concurrent-ruby" - "rack" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj"; - type = "gem"; - }; - version = "3.7.5"; - }; - sprockets-rails = { - dependencies = [ - "actionpack" - "activesupport" - "sprockets" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59"; - type = "gem"; - }; - version = "3.5.2"; + version = "2.0.3"; }; sqlite3 = { dependencies = [ "mini_portile2" ]; @@ -3256,10 +3537,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sqshkafxa1r34yj4yxisd4kddmjq9jrhx6azqy3z71nwqv01yl7"; + sha256 = "0mxz46b3vrjgmg7wr3iaaffrraqgxrhr1pizx8n2y4s1jg6zxcnj"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.3"; }; sshkey = { groups = [ "default" ]; @@ -3297,10 +3578,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; + sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.7"; + }; + stripe = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "13gr4z9nsvpknyy9y2vg4dvg77817m2ykyx57j03692dgv684vm7"; + type = "gem"; + }; + version = "11.1.0"; }; syntax_tree = { dependencies = [ "prettier_print" ]; @@ -3311,23 +3602,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g9l9acknjr2yz8ynfxbcrwx2ws3wh96pfzdb31g66k08v1022m5"; + sha256 = "0ggi6p7xxjsj42q8pp0yz6z7dbwlbr6fjbs4qnafr667jab5mqjn"; type = "gem"; }; - version = "6.2.0"; - }; - syntax_tree-disable_ternary = { - groups = [ - "development" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0gdi6zx4hqpxd81zas3dlw1jrdp98fvsqj4p7f42x5lhpfzz04zc"; - type = "gem"; - }; - version = "1.0.0"; + version = "6.3.0"; }; test-prof = { groups = [ "test" ]; @@ -3348,10 +3626,21 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; + sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; + }; + tiktoken_ruby = { + dependencies = [ "rb_sys" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "12ybz207d0wzy6x6q63nfxysgr1b5sx84g22ajav3w8vf4ssgzxd"; + type = "gem"; + }; + version = "0.0.11.1"; }; timeout = { groups = [ @@ -3367,6 +3656,17 @@ }; version = "0.4.3"; }; + tokenizers = { + dependencies = [ "rb_sys" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14jd9xra2zn5m4i431rqqv8yqdw46fpm3ni47zn57wm3cw2n1wbv"; + type = "gem"; + }; + version = "0.5.5"; + }; trilogy = { groups = [ "migrations" ]; platforms = [ ]; @@ -3377,6 +3677,17 @@ }; version = "2.9.0"; }; + ttfunk = { + dependencies = [ "bigdecimal" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ji0kn8jkf1rpskv3ijzxvqwixg4p6sk8kg0vmwyjinci7jcgjx7"; + type = "gem"; + }; + version = "1.8.0"; + }; tzinfo = { dependencies = [ "concurrent-ruby" ]; groups = [ @@ -3398,21 +3709,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d"; + sha256 = "0f898y35w60mkx3sd8ld2ryzkj4cld04qlgxi3z3hzdlzfhpa8x9"; type = "gem"; }; - version = "1.2025.1"; - }; - uglifier = { - dependencies = [ "execjs" ]; - groups = [ "assets" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1apmqsad2y1avffh79f4lfysfppz94fvpyi7lkkj3z8bn60jpm3m"; - type = "gem"; - }; - version = "4.2.1"; + version = "1.2025.2"; }; unf = { groups = [ "default" ]; @@ -3434,10 +3734,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc"; + sha256 = "0knx0bgwwpwa7wcmknqp2i019jq6b46wxfppvhxfxrsyhlbnhmmz"; type = "gem"; }; - version = "3.1.4"; + version = "3.1.5"; }; unicode-emoji = { groups = [ @@ -3485,20 +3785,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr"; + sha256 = "19vcdlfcxrlp4vkzx0jn4zwf5jg125ca89s0mnqcqs6i5bnqfiyv"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; uri = { - groups = [ "default" ]; + groups = [ + "default" + "development" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk"; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; useragent = { groups = [ @@ -3519,10 +3823,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6"; + sha256 = "0270m29n7mq9yq4xnjzryzr6jxf292ahjn9fzywm2rg3rdz7cr59"; type = "gem"; }; - version = "1.1.4"; + version = "1.1.8"; }; web-push = { dependencies = [ @@ -3548,10 +3852,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy"; + sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db"; type = "gem"; }; - version = "3.24.0"; + version = "3.25.1"; }; webrick = { groups = [ @@ -3567,19 +3871,6 @@ }; version = "1.9.1"; }; - websocket = { - groups = [ - "default" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp"; - type = "gem"; - }; - version = "1.2.11"; - }; xpath = { dependencies = [ "nokogiri" ]; groups = [ @@ -3624,9 +3915,27 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89"; + sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.3"; + }; + zendesk_api = { + dependencies = [ + "faraday" + "faraday-multipart" + "hashie" + "inflection" + "mini_mime" + "multipart-post" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0yizpglgfwml6a2w696m97d1q50hq3v0vldja431rv93s9sjbgly"; + type = "gem"; + }; + version = "1.38.0.rc1"; }; } diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py index 13dbf283c881..c859394bf11f 100755 --- a/pkgs/servers/web-apps/discourse/update.py +++ b/pkgs/servers/web-apps/discourse/update.py @@ -280,25 +280,11 @@ def update_mail_receiver(rev): def update_plugins(): """Update plugins to their latest revision.""" plugins = [ - {'name': 'discourse-assign'}, {'name': 'discourse-bbcode-color'}, - {'name': 'discourse-calendar'}, - {'name': 'discourse-canned-replies'}, - {'name': 'discourse-chat-integration'}, - {'name': 'discourse-checklist'}, - {'name': 'discourse-data-explorer'}, {'name': 'discourse-docs'}, - {'name': 'discourse-github'}, {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, - {'name': 'discourse-math'}, - {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, - {'name': 'discourse-openid-connect'}, {'name': 'discourse-prometheus'}, - {'name': 'discourse-reactions'}, {'name': 'discourse-saved-searches'}, - {'name': 'discourse-solved'}, - {'name': 'discourse-spoiler-alert'}, - {'name': 'discourse-voting', 'repo_name': "discourse-topic-voting"}, {'name': 'discourse-yearly-review'}, ] diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index a2f9025ba9d3..5beaebc8e937 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.87.4"; + version = "1.0.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-gsQPDbKTzsXV8y8/xMxmhJM6pI+zDkx/r1Zk83ixb7k="; + hash = "sha256-2EKI1Zp4bx3SFTxyBm/RtqIbFk1Lv4bkM0on+7xCuso="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-/bWDFIGElBc1lMODKTxmSkal9c4L1iTPd521/DVYyxo="; + hash = "sha256-QhwNC+a33WKxSUbv8o/9yMIeGMgjVE+6hKOj4VCoiWo="; }; configurePhase = '' diff --git a/pkgs/servers/web-apps/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix index 08a1907646b7..6a607d957902 100644 --- a/pkgs/servers/web-apps/pingvin-share/default.nix +++ b/pkgs/servers/web-apps/pingvin-share/default.nix @@ -1,7 +1,7 @@ { + lib, callPackage, fetchFromGitHub, - recurseIntoAttrs, }: let @@ -14,7 +14,7 @@ let }; in -recurseIntoAttrs { +lib.recurseIntoAttrs { backend = callPackage ./backend.nix { inherit src version; }; frontend = callPackage ./frontend.nix { inherit src version; }; diff --git a/pkgs/servers/web-apps/szurubooru/default.nix b/pkgs/servers/web-apps/szurubooru/default.nix index d2c5339b245f..22da5573b36c 100644 --- a/pkgs/servers/web-apps/szurubooru/default.nix +++ b/pkgs/servers/web-apps/szurubooru/default.nix @@ -1,7 +1,7 @@ { callPackage, fetchFromGitHub, - recurseIntoAttrs, + lib, }: let @@ -14,7 +14,7 @@ let }; in -recurseIntoAttrs { +lib.recurseIntoAttrs { client = callPackage ./client.nix { inherit src version; }; server = callPackage ./server.nix { inherit src version; }; } diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix index 88c58169d2a6..633bacc8f7a5 100644 --- a/pkgs/test/cuda/default.nix +++ b/pkgs/test/cuda/default.nix @@ -1,17 +1,16 @@ { lib, pkgs, - recurseIntoAttrs, }: let getTests = cps: - recurseIntoAttrs { + lib.recurseIntoAttrs { inherit (cps) saxpy; inherit (cps.tests) cuda-library-samples; }; in -recurseIntoAttrs ( +lib.recurseIntoAttrs ( lib.mapAttrs (_: getTests) { inherit (pkgs) cudaPackages diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 62e29d24ce0b..8864de64dc76 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -1,16 +1,30 @@ -{ pkgs, callPackage }: - -with pkgs; - +{ pkgs }: +let + inherit (pkgs) callPackages callPackage stdenv; + inherit (pkgs.lib) + recurseIntoAttrs + attrNames + pipe + hasPrefix + hasSuffix + filter + genAttrs + optionals + filterAttrs + meta + concatMapAttrs + optionalAttrs + ; + inherit (pkgs.lib.strings) toJSON; +in { cc-wrapper = - with builtins; let pkgNames = (attrNames pkgs); llvmTests = let - pkgSets = lib.pipe pkgNames [ - (filter (lib.hasPrefix "llvmPackages")) + pkgSets = pipe pkgNames [ + (filter (hasPrefix "llvmPackages")) # Are aliases. (filter (n: n != "llvmPackages_latest")) (filter (n: n != "llvmPackages_9")) @@ -23,7 +37,7 @@ with pkgs; (filter (n: n != "llvmPackages_16")) (filter (n: n != "llvmPackages_17")) ]; - tests = lib.genAttrs pkgSets ( + tests = genAttrs pkgSets ( name: recurseIntoAttrs { clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; }; @@ -34,10 +48,10 @@ with pkgs; tests; gccTests = let - pkgSets = lib.pipe (attrNames pkgs) ( + pkgSets = pipe (attrNames pkgs) ( [ - (filter (lib.hasPrefix "gcc")) - (filter (lib.hasSuffix "Stdenv")) + (filter (hasPrefix "gcc")) + (filter (hasSuffix "Stdenv")) (filter (n: n != "gccCrossLibcStdenv")) (filter (n: n != "gcc49Stdenv")) (filter (n: n != "gcc6Stdenv")) @@ -49,7 +63,7 @@ with pkgs; (filter (n: n != "gcc12Stdenv")) ] ++ - lib.optionals + optionals ( !( (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64) @@ -57,11 +71,11 @@ with pkgs; ) ) [ - (filter (n: !lib.hasSuffix "MultiStdenv" n)) + (filter (n: !hasSuffix "MultiStdenv" n)) ] ); in - lib.genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; }); + genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; }); in recurseIntoAttrs { default = callPackage ./cc-wrapper { }; @@ -70,9 +84,8 @@ with pkgs; name = "cc-wrapper-supported"; builtGCC = let - inherit (lib) filterAttrs; - sets = lib.pipe gccTests [ - (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc)) + sets = pipe gccTests [ + (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.stdenv.cc)) # Broken (filterAttrs (n: _: n != "gccMultiStdenv")) ]; @@ -81,10 +94,9 @@ with pkgs; builtLLVM = let - inherit (lib) filterAttrs; - sets = lib.pipe llvmTests [ - (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc)) - (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc)) + sets = pipe llvmTests [ + (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc)) + (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc)) ]; in toJSON sets; @@ -105,12 +117,12 @@ with pkgs; hardeningFlags = recurseIntoAttrs (callPackage ./cc-wrapper/hardening.nix { }); hardeningFlags-gcc = recurseIntoAttrs ( callPackage ./cc-wrapper/hardening.nix { - stdenv = gccStdenv; + stdenv = pkgs.gccStdenv; } ); hardeningFlags-clang = recurseIntoAttrs ( callPackage ./cc-wrapper/hardening.nix { - stdenv = llvmPackages.stdenv; + stdenv = pkgs.llvmPackages.stdenv; } ); @@ -122,8 +134,8 @@ with pkgs; hooks = recurseIntoAttrs (callPackage ./hooks { }); - cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; - cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.gccMultiStdenv; }; + cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.clangMultiStdenv; }; compress-drv = callPackage ../build-support/compress-drv/test.nix { }; @@ -131,7 +143,7 @@ with pkgs; fetchtorrent = recurseIntoAttrs (callPackages ../build-support/fetchtorrent/tests.nix { }); fetchpatch = recurseIntoAttrs (callPackages ../build-support/fetchpatch/tests.nix { }); fetchpatch2 = recurseIntoAttrs ( - callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; } + callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = pkgs.fetchpatch2; } ); fetchDebianPatch = recurseIntoAttrs (callPackages ../build-support/fetchdebianpatch/tests.nix { }); fetchzip = recurseIntoAttrs (callPackages ../build-support/fetchzip/tests.nix { }); @@ -199,7 +211,7 @@ with pkgs; # Enable sanitizers in the tests only, to avoid the performance cost in regular usage. # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734 sanitizers = - pkgs.lib.optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64)) + optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64)) [ "undefined" "address" @@ -215,12 +227,12 @@ with pkgs; # Accumulate all passthru.tests from arrayUtilities into a single attribute set. arrayUtilities = recurseIntoAttrs ( - lib.concatMapAttrs ( + concatMapAttrs ( name: value: - lib.optionalAttrs (value ? passthru.tests) { + optionalAttrs (value ? passthru.tests) { ${name} = value.passthru.tests; } - ) arrayUtilities + ) pkgs.arrayUtilities ); srcOnly = callPackage ../build-support/src-only/tests.nix { }; diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix index 4cc738cfaebe..33d3342f3854 100644 --- a/pkgs/test/nixos-functions/default.nix +++ b/pkgs/test/nixos-functions/default.nix @@ -22,7 +22,7 @@ let }; in lib.optionalAttrs (stdenv.hostPlatform.isLinux) ( - pkgs.recurseIntoAttrs { + lib.recurseIntoAttrs { nixos-test = (pkgs.nixos { system.nixos = dummyVersioning; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index a6f52963cd8a..75e8ee2c2af4 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,8 +1,8 @@ { + lib, vimUtils, vim-full, vimPlugins, - pkgs, }: let inherit (vimUtils) buildVimPlugin; @@ -10,7 +10,7 @@ let packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; in -pkgs.recurseIntoAttrs { +lib.recurseIntoAttrs { vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 679ef32cef10..4963885fb804 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.202.0"; + version = "3.205.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-x64.tar.gz"; - sha256 = "118nzhyb6xh6x2qpqjvbdc9p7r2a84r52g69n8pfqik5y1fh0lnk"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-x64.tar.gz"; + sha256 = "14pqc1qvkb8jp2wisld02qm6zf68i3i3iyymiwgg2ngr1ps40191"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-amd64.tar.gz"; @@ -17,48 +17,48 @@ sha256 = "0r7hc0vvf95a87pk6v4sm7m1i9li9ymhijvwsxzjdbpmjcp65ywg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-amd64.tar.gz"; - sha256 = "10mz7gv2bm93hvkvqvhsvqhkcziyci2wbxmqj9ggplgv44k49w68"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-amd64.tar.gz"; + sha256 = "08s73nag5wb4i473krk87718p91q87xjp62riscffzv0xn68x343"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz"; sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-amd64.tar.gz"; - sha256 = "0032ax8kazj8gxmxz6sgffv5r7y67vp92xwzlfpq4y6jlqiapwi9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-amd64.tar.gz"; + sha256 = "1nl1rzgxci67wj0l1gg89r8zxp284w0pjcqaxjmr8bv4whny5r01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-amd64.tar.gz"; - sha256 = "1f1zj1m3alz9zvdab9fvqrlzjafzwx21wpnifi7fs3sf27p1vs2l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-amd64.tar.gz"; + sha256 = "11sgjzwspiyjimaqaad4rv8zfri1gk3cpi18cbxqvl02qc45nl2c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz"; sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-amd64.tar.gz"; - sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-amd64.tar.gz"; + sha256 = "0i952s6ib6k21fzwwa5cb5xrb280an4lyfk26szm4nvmyy623jf7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-amd64.tar.gz"; sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-amd64.tar.gz"; - sha256 = "0gjhdf6ai64k3kkdfvprpszc93b6yim622kk4m76s15kpcnnlnzz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-amd64.tar.gz"; + sha256 = "03r7s8g17gpp5zhckjmii67hlkpp49nwlx7jcr6bipd7g21isx1b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-amd64.tar.gz"; - sha256 = "00gkdgb6s0wqjl6m69sc8dz320aiy2s751qqn73894jyaqa8v9zk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-amd64.tar.gz"; + sha256 = "1r0yrm3x1762ysbb3cm78avs8cjmsaqgknyypn7zmq1fr1hs6n22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-amd64.tar.gz"; - sha256 = "1bgbnmkc0g4yqspv9bfn7zmyf0rykibyshmjrjmhr3q32jz9ffyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-amd64.tar.gz"; + sha256 = "0y6s7hyj6zlnpjbahgm4zcb6iknhy2q6mamq639n214a22s1a1mp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-amd64.tar.gz"; - sha256 = "1vd4wcpkwb01wb3916nna3wwqhbym234jj6ggyayw0mawhrx52rm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-amd64.tar.gz"; + sha256 = "1623gjdclwyvgavcmksjyb76k8a3arzdwsi8336san9dg3jxsdhq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-amd64.tar.gz"; @@ -77,12 +77,12 @@ sha256 = "04m8b9d1dsfm3kw3n214g46i946fgn56j0k10dzfa2l023y491gc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz"; - sha256 = "192bz3xl0hiy3k68fgcb9mw6j1hb6ngrahf53h8zb7agikzwiy3m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-amd64.tar.gz"; + sha256 = "0f07prmwm0rgd5r2amd3fxm9cpnfrgj2282d6iczl7pnnl5jn7wp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-amd64.tar.gz"; - sha256 = "0bl8r0d2zyd2yfx1wv84gxjjq5mp2kw52sv4vqpqihmzvcwr0rcv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-amd64.tar.gz"; + sha256 = "1ayscjrlsib4lgh86kp5c4acccqfm1wcv8d6p34rhd12xj1zw72h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -101,12 +101,12 @@ sha256 = "11zb5z8yzb87irf7sqc8b664wibicwk6vnmbshsrf41nv4lrys1r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-amd64.tar.gz"; - sha256 = "1vvdn7p0m9kyb62r0g52ypidbm7060mhaz1iy0zd7915whxk900p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-amd64.tar.gz"; + sha256 = "1ysfm0iq2g2x8ml4dlisyf5g5lfdwjzf8spzc2670kk11vxsb0sy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-amd64.tar.gz"; - sha256 = "0sawhhcmnhgwdv3wl05z65parmrc74mgk2cpyhgp0hcvbpgagknj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-amd64.tar.gz"; + sha256 = "05h57r3r5cwdb9pb4nh9k4y2rfww2csarqaydayi4qr2xwgq09p3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-amd64.tar.gz"; @@ -117,12 +117,12 @@ sha256 = "1wyl8xr07b8gj933w7lxip36mc7xxqwb9i46826il7w67gb2vfb4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-amd64.tar.gz"; - sha256 = "1n3ndir2n1pq4mmnbkiqvv0rf3w4dgz3a9b221vimsi2lks212kw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-amd64.tar.gz"; + sha256 = "12xw7fc5xsdbjlwbxwp0jdyv89l2af0hh6b2890fh1g83jp80rxs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-amd64.tar.gz"; - sha256 = "18iaybm8sqg468a8fan2dm1lsyybch3l1wiawvz5qyh6ap5x2fv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-amd64.tar.gz"; + sha256 = "0gphzxkpr7fk8jw5mqldqp1vk2l0xlrcjy7lycwc71921nid3knn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-amd64.tar.gz"; @@ -141,20 +141,20 @@ sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-amd64.tar.gz"; - sha256 = "0vdrh5ss7vlmyv0a0mvrj2w9mrsazqrl7hcvwn5riym4ba0daq03"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-amd64.tar.gz"; + sha256 = "168a1hqpildnal3xnivpimlmfr9dgkcrc1fp03www96qvnwa5b0c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz"; sha256 = "070kb73yix9aha55x9n4h6f4khp9a8wylqgvzdhsa7c7k35fx6q5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-amd64.tar.gz"; - sha256 = "0p3rjsppf2zl7xwcs9qr2s262bxkilvzy8yi7nybydhfscl1rmrr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-amd64.tar.gz"; + sha256 = "1yr8pi9w343h555l6bxfzxrf04y7s4lxqnvjw89594nl30ldz866"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-amd64.tar.gz"; - sha256 = "0pbf995jvp3fkvnqdv2ds0zf3yr88rh61i9q4ab7b3141hsghvha"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-amd64.tar.gz"; + sha256 = "0x71yr3hvpwhnvrj51fzvbyw9sbdzkb8l58a4xn2rg6xw1sbx23r"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-x64.tar.gz"; - sha256 = "0qrz36gn6rszklz2i4rshhzsfqiz3kndfmzmiqba764hanfddj77"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-x64.tar.gz"; + sha256 = "1vscn2idp2qjrmz9gzykb4jqcyyipkndyjk8r424qp95v6w6vrkb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-amd64.tar.gz"; @@ -175,48 +175,48 @@ sha256 = "0mw37ncmm78j9gx7nw3400jrmzirqkwqhp957p36q193gnsd4747"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-amd64.tar.gz"; - sha256 = "1b8lwjbvppj7ssncfwqync169ydz7m8wx3zkxdvc8yw4ggcl2kxs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-amd64.tar.gz"; + sha256 = "0wd7gsghsbchb2gj6yv7lis8ni640dhrklgjipgbw61zhv6ib0ci"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz"; sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-amd64.tar.gz"; - sha256 = "0xy3z460nw89i0zjj5bn0qwpqc18xcas4zk3wgvvrsk7v0jj1cin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-amd64.tar.gz"; + sha256 = "1nxfxi3gj92lqyqiagh31j5gd6s4ah24k96pgja50xvpsbsz3kbj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-amd64.tar.gz"; - sha256 = "0iq60sxszffaqv6anh4hi2bx963k462g6y0ylpwx0662wi7d6m5w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-amd64.tar.gz"; + sha256 = "120cdkrw9rqj6p8pqh3g13khciqnzfr6w7lcg3q5k8fvbj8inyn1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz"; sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-amd64.tar.gz"; - sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-amd64.tar.gz"; + sha256 = "0a7lrp0xrpcd4hsnwcjzfbxihl0hcw39c6bhprpa4f1lzi4fdgv5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-amd64.tar.gz"; sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-amd64.tar.gz"; - sha256 = "0l1r3qdmf90g0fpi0jvac0v4phksnwqjhihx6rcnrcpc9ihfr2pa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-amd64.tar.gz"; + sha256 = "019w76n8zksz62chnbdfhbjar2z1g3359pamahdcm415kdghhar2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-amd64.tar.gz"; - sha256 = "1n3afyncwk16cbkc8wch3370z08b2vabpvpp8g55xarhqvqk1qpz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-amd64.tar.gz"; + sha256 = "1p435crgs1cgqn9z7rplrdac60rwizk2ifxg2r9vpvcmv36z1c04"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-amd64.tar.gz"; - sha256 = "1wgcbn02r9xv9lanfssm85ac9y1p712ba2jg2jh0hb9mmx7dvhrl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-amd64.tar.gz"; + sha256 = "15jjn9hs0g63g484skwavyc7p9yi4z81qs3bfb2bmarnzmw21amc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-amd64.tar.gz"; - sha256 = "1vpp01zh6g2p3s1x061hrkzl83qcahf5mw6cdhl0m0h425mbzvam"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-amd64.tar.gz"; + sha256 = "1w7rbyh800vx13j05d3gkbqccl5ib64lczywvbz541ra03gnrcss"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-amd64.tar.gz"; @@ -235,12 +235,12 @@ sha256 = "1hphg8mhpgzmm9hz12fdpzjgrx35b4bhxinm74slw8fki3vpgqdl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz"; - sha256 = "0bsfi36kihw2334gs39z9gwm6gwr0bypbcx7wfckj5zzml94jg6y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-amd64.tar.gz"; + sha256 = "1d2chprn9xjdm9qrvdzma3r5f0v457ksfxbc98i753ncqr7cnzf3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-amd64.tar.gz"; - sha256 = "01kncjmknz9ynhjyp06gn5n1d8010k4riz2zzh2sgsq9icvphh3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-amd64.tar.gz"; + sha256 = "0bwar26bw474k216659gqzc5ghk7pmww9s1pn24d230zp19g17ps"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -259,12 +259,12 @@ sha256 = "1v309axkjh9gv8cy3y7wpdq7b88129b5p5q030qdrk2hzalxvvrh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-amd64.tar.gz"; - sha256 = "0pzc0girgfy3p03rxzwm6n9g72x2qinn4g151dmwl0mdgn0bh8rh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-amd64.tar.gz"; + sha256 = "1yabhr80yvnwzvn0gd95kpicng99j8m06y6cdz9lwq63kycsnghc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-amd64.tar.gz"; - sha256 = "18hxq1kmaxb6xjajcm84zjc3crpaqh412mkrs0xai97p3pbdfkzn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-amd64.tar.gz"; + sha256 = "0sw0382d4inkbgah62b8s7wszjd2lj39ybq96skl72vsizkp0njw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-amd64.tar.gz"; @@ -275,12 +275,12 @@ sha256 = "0vjjki7lzx4kxi91qfsm07vs2jz4nl3l816hcn3kkj22ypnx11w2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-amd64.tar.gz"; - sha256 = "1b3znzx5m20xlvmgj9njmip7q32fs6hm62zfckra73bqh2mc9492"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-amd64.tar.gz"; + sha256 = "0zbmrhh5f19r9rg3pcmry325l2lfpam9j6krqdbcwsals971qvw6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-amd64.tar.gz"; - sha256 = "1cyh4zlaayyg4x6qzgc8pxm7kvc6b2xjm93v9rb25vbxb4yjv1nw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "1vafsy1ah61y3qwiv3cc8y8lx6c9pimr0hnknah22k6cxshm0bg9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-amd64.tar.gz"; @@ -299,20 +299,20 @@ sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-amd64.tar.gz"; - sha256 = "097kjmmyqdwaa9ghn228d52sjj2ypr3kqbgkfxvjmq494b5mf74s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-amd64.tar.gz"; + sha256 = "15hyg61id2r7b7l6279grabvfphhj22ffi4y0q20zzypx98xr599"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz"; sha256 = "1c38gqm2vk9fwxyqmzzf27p8xdis9pa8ikj9pgwyjaf208b63gir"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-amd64.tar.gz"; - sha256 = "0jrzy2dm6wnkxwk97njhvyw36gy9l1axcw2962drilc60zdc82mb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-amd64.tar.gz"; + sha256 = "0yph0sjsyicb3z2bhw1xw1rn7v930vygsgwww4n1zmy6p8059z4a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-amd64.tar.gz"; - sha256 = "1h43zanz810i2p0x12hp60r6k5rfkr5lvh49l32090xj1v6cr8la"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-amd64.tar.gz"; + sha256 = "115g6sn2sxd9vpzv1a01hah91cnd1irfzif7k8xj5aisixdmfyhh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-arm64.tar.gz"; - sha256 = "0jv19av1060gh0q8hlllbqlg4m8lzkpassajhjh1r5ncqf27y5hy"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-arm64.tar.gz"; + sha256 = "0i80py5r711k58yh14c5d8vhlsl5jd5f41gxfqq3gllhwy3q54db"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-arm64.tar.gz"; @@ -333,48 +333,48 @@ sha256 = "16jd9hrv60jy6qzl57h9fmk955ll05ng7cfmn4af1vjsyay6knjl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-arm64.tar.gz"; - sha256 = "11hbjq49a1znx38xk81q2gp2pdq99c8sz166xxb2cmrv84bm2xfi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-arm64.tar.gz"; + sha256 = "0jy2za4z4f63i51a06nwy1pv4nma9rl46pl39gkkgq5kslhgah5h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz"; sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-arm64.tar.gz"; - sha256 = "0v9a59cbzs5s9vylmbwfb5chydccdy1xkhp90ci2lz52yik45lg5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-arm64.tar.gz"; + sha256 = "0mx7yx96xnalrpsqc4dp14gck7p8hciasgkkk89v3dsjmjlk1wwi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-arm64.tar.gz"; - sha256 = "1lwr5cbf3g3zkk8mvdd17b8bmsjkxbzjg15y2lzsxb294r677b3l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-arm64.tar.gz"; + sha256 = "04sq78vzcyc8dm3cx0f5gizkdwy03j2fsw3vcjxpk75pkkhxh2gf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz"; sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-arm64.tar.gz"; - sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-arm64.tar.gz"; + sha256 = "15p2gh2cqkz5rxnq5b5bx30mha02hcd3df44lwh9qb4lbjlfdzfv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-arm64.tar.gz"; sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-arm64.tar.gz"; - sha256 = "1l2a54qjgh5blwx8mw2i52m5yhff3izqirlh17ws3l04xcldd4d9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-arm64.tar.gz"; + sha256 = "1x5iqm07zjf637w14pzhhifgi7vs1imvqjqr2xmi1z5cqfjknm5j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-arm64.tar.gz"; - sha256 = "15n44dya58sqpirhpiicp1x6w9x15qf94a6vamk2h6jbzpfi7c03"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-arm64.tar.gz"; + sha256 = "06y78vlb3s36n900v44l0av126xr0gaf192ciq6435cr0b4v80h3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-arm64.tar.gz"; - sha256 = "0d02sl9l4mqhm6mb9rxdc0pc6dr7qkd6zzm4y3ff8dv84qn8sy9n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-arm64.tar.gz"; + sha256 = "14hgjf71j5fsxzfibb6gv7adn0cap9lsz44xdcczgs1xc206ng6k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-arm64.tar.gz"; - sha256 = "033lry88mpn9vfqim26hkjg13dc0jl9sqn28zhld1asx7sqbck3y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-arm64.tar.gz"; + sha256 = "1zs5ar106zxv8np22n5c1kph65z35pbwgd32wn1vx5lgkz0jry7x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-arm64.tar.gz"; @@ -393,12 +393,12 @@ sha256 = "111rblka8wz87pqd9v27gmv4lz5048kwdj9i252r7bnd1gw92i4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz"; - sha256 = "1nfsgjfas5md9k67n90hcvcza7gg2iwp9wivmfzf49vz2k25iz44"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-arm64.tar.gz"; + sha256 = "0nnap94wign1vydi56k29s0cp1xgdngm1yj3hwz5s02fkhkcvw6f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-arm64.tar.gz"; - sha256 = "0jynj7qz66jl47982gvg47fkdbgifb4030225vxz85a705ingjdl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-arm64.tar.gz"; + sha256 = "01w6y0pmpc9c81hpck2nqin0hk9s3ijdcg1a4jicaw9g6j716gsp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -417,12 +417,12 @@ sha256 = "0l33hzkgcm9lr39k7dndga36k3f0agbsj7q4wx0rwhfabz1fgcd1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-arm64.tar.gz"; - sha256 = "0by18hd8zyfl0xac4wanz5lq6sw6wmkclvy0va9cjpfgns916qsk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-arm64.tar.gz"; + sha256 = "0b2yrfxxrkwxsp76ihv06vibwg86lpyz2c92mi49bldrp767ibys"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-arm64.tar.gz"; - sha256 = "1gd9l1zdkg5faqlfvc5rl9gqchndxhxp742mx21hizhmp4rsv577"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-arm64.tar.gz"; + sha256 = "1y2a451m6qhb0z1g304axwm4hcbdwba3rl8pdfj4c4ifkiaxm0mr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-arm64.tar.gz"; @@ -433,12 +433,12 @@ sha256 = "0arnnishqszj7s9a2azjk0a61n2sp3wb97snj9xpj9bp243w5lmf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-arm64.tar.gz"; - sha256 = "02jix4w49n9mal8wg6ixgxvnd865ml7zx0lnz6prckfrzgrj36ih"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-arm64.tar.gz"; + sha256 = "0a5gl6fpl6w8bcy1bl1z7dynrpm42kg0hq45hzhs7h667bgaqkzs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-arm64.tar.gz"; - sha256 = "05fwkafsjv5gd23fzkb2hv3xah9vvqr4w2sc9sjrzcwzghiw0pbh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-arm64.tar.gz"; + sha256 = "02b1alm53isvmzs7crgjqbpyskr3l2nnzwkxvfkhpsa3rbpnf42f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-arm64.tar.gz"; @@ -457,20 +457,20 @@ sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-arm64.tar.gz"; - sha256 = "1csiv24nmg1c8vb0ay36lsw7dpfim5hr9b3rhdawpsyjdi5s4hsd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-arm64.tar.gz"; + sha256 = "185rjhfcr8hh7vxyb91dfsmq7vc78z17qrvn0gn7bxf2sd0zfnap"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz"; sha256 = "1rfzj89s7avim702aqvkrmsg4d1qzajw1k5pr24jzrs4xiyarkzb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-arm64.tar.gz"; - sha256 = "1sbxv37pi1yy6dvjz0yifj44l68mscxaf033a7nbgb3281r15lq1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-arm64.tar.gz"; + sha256 = "0gc31g4wmv9h5ygaiykas0kjrk3dfmdpzabs5k493d8zcqyk2219"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-arm64.tar.gz"; - sha256 = "113czcq1fm2dywn8q5v1z5lyz4l30b1433hrdjnfkr8qwzxncr48"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-arm64.tar.gz"; + sha256 = "1pqwam73vz01zvr569643918n4vfvlnaqx0ljc8wvij42fvbdfgs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-arm64.tar.gz"; - sha256 = "1nb7g3dyv4a2fgr738a6mpf88n7pfmbbggq5l746kgg1jpzd2ald"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-arm64.tar.gz"; + sha256 = "07bxw10xcm5s8c8zssqh461v9rj4c5l27nzxzg84q3vyzil02460"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-arm64.tar.gz"; @@ -491,48 +491,48 @@ sha256 = "1fig9bn080dbnibm0dp76ygyg1g2sv2295kyyknx3wlap0nrj2w3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-arm64.tar.gz"; - sha256 = "1cglc5a507fy973wkk062wd22yn1pwn1pdn2laqqlk0n6y1hp33y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-arm64.tar.gz"; + sha256 = "0p87dqzhpra4s1hxnzc63xk1pvw2n6pa8nxisgbrlrf4bxy229wq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz"; sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-arm64.tar.gz"; - sha256 = "1a13wviv678k1ls57vwvffkk6qa5fdc55zw2byid910m2bjs7bz0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-arm64.tar.gz"; + sha256 = "1dz54wc5aw9rfhwx2hrmvdfl9xd3fd26jx00f5asb4gjlirasdhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-arm64.tar.gz"; - sha256 = "0k0kmjqc5iq3dhcvrxkz6d7kbj2q1s0cigqjqp7qpj5ppyss901g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-arm64.tar.gz"; + sha256 = "0jqpviykdsvb6zfk021wl27i2aa1v7mv08kalxn73r8zbj2hh1ls"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz"; sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-arm64.tar.gz"; - sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-arm64.tar.gz"; + sha256 = "0pqyd2qgng49g0cvmn5nvcqsymwgakyc75p6swb2c94h6pp4x4bc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-arm64.tar.gz"; sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-arm64.tar.gz"; - sha256 = "1cr924w029hah14j9cq0rsy2k0arph8r7dcmhi6zimw3wm0168dd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-arm64.tar.gz"; + sha256 = "1kiq9771rqz935bfnrl06c561xw7g583a9hm1dn4yclssn02pshf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-arm64.tar.gz"; - sha256 = "1lva9jp2fbz58gfgsdbwlyrdd60wpy1xy55af7f8dmabgcc8j391"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-arm64.tar.gz"; + sha256 = "1dwncdxq6rxi1ip9vv52amdmh78wgynymn5sc6b3dh8q1sx6ghdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-arm64.tar.gz"; - sha256 = "06gdvb7d5mj7ggnjifi86nb2n7hyzv79rq5wh2dfl0fkf19qam69"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-arm64.tar.gz"; + sha256 = "0ys4nb53gbddv8rgb8daz5qbw2gigk90gl9g5iqyrdjlsv7cv4w8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-arm64.tar.gz"; - sha256 = "0v50vs1d1cm6dgfjz9adzka34hbws3j6hwr1s3vxk6f6apx9p3x0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-arm64.tar.gz"; + sha256 = "048paqhq05a74rrp1rcsx1kaxsszhpb4shxgb5l74xii9fdklwm2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-arm64.tar.gz"; @@ -551,12 +551,12 @@ sha256 = "0nd7hv0yf40xc566wg76k8h91ig88lvd6y0f0ffsjfyb40kgm7sc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz"; - sha256 = "13il7mq0g853x1nllvxnhbhflrlqx8i11p4xkg46bvshay15xh9x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-arm64.tar.gz"; + sha256 = "17naiz9k71dc0ax1x7843slna1cycjgd9yvy5xhg5613rrl7h4nc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-arm64.tar.gz"; - sha256 = "0mf0pxpxjb2fpz4px3dg4b699fqvzf56crvrj00vyc6ld5hmmnpm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-arm64.tar.gz"; + sha256 = "06g373h6i1ps7sd0nclcgvaparg4bv94s5c9ps5izxvhl87bcbf6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -575,12 +575,12 @@ sha256 = "0fjlp0afa5z6x85ldw8bwl4zgxz2rmwinihw1vbqa33pyjrk08xn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-arm64.tar.gz"; - sha256 = "1kkbgmhgp02qzxsh37m9x3jahwjnq5ls9dhjhgbxjjq6xalcqf79"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-arm64.tar.gz"; + sha256 = "02fpl2jrawswcyhiqfgjrhhxc153pdgij3f5kpjqdn1h6dyhv4iz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-arm64.tar.gz"; - sha256 = "0n1wmplyj2c5qhaq0gplphi8p2i7g4jwrnlwzkv0m1wixrlx3fw5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-arm64.tar.gz"; + sha256 = "034pw70i8n12gr69ng5xj2cci11v1d47fsw6j5mgmck5mrsjjr0i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-arm64.tar.gz"; @@ -591,12 +591,12 @@ sha256 = "0k7w2a1zppw1pgy077iidvnlic21ynw4w7f15z3hw793inzj2wm3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-arm64.tar.gz"; - sha256 = "1bb3bzybmfi5blagh13bm6q1avjbp80lmjdv4q5yc2dbfbs653xi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-arm64.tar.gz"; + sha256 = "0vygxiqrx70i03d3p1mmc26zkai4cxzwjzjf6bszz6cmqvnc5pnr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-arm64.tar.gz"; - sha256 = "1f409m7ls96vvx6x6lsfydp2vn809wy58s5cbh5p8s390s30q2zf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-arm64.tar.gz"; + sha256 = "0hzrqqk78hgxrn3fxmnmy9y8l5011ifs6smbs2wrm9na9lag3frb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-arm64.tar.gz"; @@ -615,20 +615,20 @@ sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-arm64.tar.gz"; - sha256 = "1p3nb3aazr47kiprq7k3js6x8jk87dsql6d4qkn6c60mbrm9mlal"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-arm64.tar.gz"; + sha256 = "0r80rz0fs8w4iqnq1rsqxqvbs1plfr7hvlsr2dik4k8ngiwvbfps"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz"; sha256 = "03qhd6p77d40dbcvr6ifw6ii37303jmcqhns63r8gmpbfkdg52a2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-arm64.tar.gz"; - sha256 = "1x3g6j9adkc1k937s271zqwk82w9w07fkm4d8dwcv85sf1m1phhj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-arm64.tar.gz"; + sha256 = "1q3qqlyzfc77ybp2q5mspyrh9c1h1m4p9mzq0l1z6hzn6r41z4n5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-arm64.tar.gz"; - sha256 = "1ga7zvw6przmkbcpi3vq081g4bh8p4bzrfhi3jyxd6kh4slb3g9d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-arm64.tar.gz"; + sha256 = "0mnya4lc1aabxwzm44k5k72xlz0ng0aiy3rkikvcdk0c3mmckyrk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix index 7eefb18fcc60..8f2512a1c229 100644 --- a/pkgs/tools/games/minecraft/optifine/default.nix +++ b/pkgs/tools/games/minecraft/optifine/default.nix @@ -1,5 +1,4 @@ { - recurseIntoAttrs, callPackage, lib, }: @@ -11,6 +10,6 @@ # To do so, change directory to nixpkgs root, and do: # $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true -recurseIntoAttrs ( +lib.recurseIntoAttrs ( lib.mapAttrs (name: value: callPackage ./generic.nix value) (lib.importJSON ./versions.json) ) diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index abea3e32a139..7fc2b6177fc7 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -1,7 +1,6 @@ { lib, stdenv, - recurseIntoAttrs, fetchgit, pkg-config, autoreconfHook, @@ -212,7 +211,7 @@ let }; }; in -recurseIntoAttrs ( +lib.recurseIntoAttrs ( libs // { inherit gawkextlib buildExtension; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index ade00aa8a608..f23fcc28b61e 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -42,7 +42,6 @@ makeFontsConf, useFixedHashes ? true, extraMirrors ? [ ], - recurseIntoAttrs, nixfmt, luajit, }: @@ -543,7 +542,7 @@ let license = licenses.scheme-infraonly; }; - combined = recurseIntoAttrs ( + combined = lib.recurseIntoAttrs ( lib.genAttrs [ "scheme-basic" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0bf044175aac..a8f9b06c4ad8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -246,8 +246,8 @@ mapAliases { llvmPackages_latest = llvmPackages_21; llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated. - clang18Stdenv = lowPrio llvmPackages_18.stdenv; - clang19Stdenv = lowPrio llvmPackages_19.stdenv; + clang18Stdenv = lib.lowPrio llvmPackages_18.stdenv; + clang19Stdenv = lib.lowPrio llvmPackages_19.stdenv; # Various to preserve autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo @@ -497,6 +497,7 @@ mapAliases { docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15 dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12 dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27 + dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30 dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11 dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27 dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16 @@ -687,6 +688,7 @@ mapAliases { hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10 hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20 himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11 + hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30 hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20 hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28 hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11 @@ -925,6 +927,7 @@ mapAliases { llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09 loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27 + lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30 LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27 luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27 lxd = throw " @@ -968,6 +971,7 @@ mapAliases { mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09 mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12 mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12 + makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30 manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25 mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26 marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27 @@ -1156,6 +1160,7 @@ mapAliases { paperless-ng = throw "'paperless-ng' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2025-10-27 parcellite = throw "'parcellite' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-10-03 patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27 + path-of-building = lib.warnOnInstantiate "'path-of-building' has been replaced by 'rusty-path-of-building'" rusty-path-of-building; # Added 2025-10-30 paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27 pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23 pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29 @@ -1290,6 +1295,7 @@ mapAliases { railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27 rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27 rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27 + recurseIntoAttrs = warnAlias "'recurseIntoAttrs' has been removed from pkgs, use `lib.recurseIntoAttrs` instead" lib.recurseIntoAttrs; # Added 2025-10-30 redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16 redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01 redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27 @@ -1406,6 +1412,7 @@ mapAliases { StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27 strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19 strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19 + stringsWithDeps = warnAlias "'stringsWithDeps' has been removed from pkgs, use `lib.stringsWithDeps` instead" lib.stringsWithDeps; # Added 2025-10-30 subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17 sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20 substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f924889c22fa..dc8144c1cfcb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12,6 +12,17 @@ config, overlays, }: +let + # Add inherited lib functions only here, so they are not exported from pkgs + inherit (lib) + lowPrio + hiPrio + recurseIntoAttrs + dontRecurseIntoAttrs + makeOverridable + ; +in + res: pkgs: super: with pkgs; @@ -32,6 +43,12 @@ with pkgs; # all-packages.nix) _type = "pkgs"; + ### Helper functions. + inherit lib config overlays; + + # For convenience, allow callers to get the path to Nixpkgs. + path = ../..; + # A stdenv capable of building 32-bit binaries. # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux, # it's just the plain stdenv. @@ -91,35 +108,13 @@ with pkgs; gccStdenvNoLibs = mkStdenvNoLibs gccStdenv; clangStdenvNoLibs = mkStdenvNoLibs clangStdenv; - # For convenience, allow callers to get the path to Nixpkgs. - path = ../..; - - ### Helper functions. - inherit lib config overlays; - - # do not import 'appendToName' to get consistent package-names with the same - # set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519 - inherit (lib) lowPrio hiPrio makeOverridable; - - inherit (lib) recurseIntoAttrs; - - # This is intended to be the reverse of recurseIntoAttrs, as it is - # defined now it exists mainly for documentation purposes, but you - # can also override this with recurseIntoAttrs to recurseInto all - # the Attrs which is useful for testing massive changes. Ideally, - # every package subset not marked with recurseIntoAttrs should be - # marked with this. - inherit (lib) dontRecurseIntoAttrs; - - stringsWithDeps = lib.stringsWithDeps; - ### Evaluating the entire Nixpkgs naively will likely fail, make failure fast AAAAAASomeThingsFailToEvaluate = throw '' This pseudo-package is likely not the only part of Nixpkgs that fails to evaluate. You should not evaluate entire Nixpkgs without measures to handle failing packages. ''; - tests = lib.recurseIntoAttrs (callPackages ../test { }); + tests = recurseIntoAttrs (callPackages ../test { }); defaultPkgConfigPackages = # We don't want nix-env -q to enter this, because all of these are aliases. @@ -2185,7 +2180,7 @@ with pkgs; mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { }; - nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { }); + nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { }); seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; seabios-csm = seabios.override { ___build-type = "csm"; }; @@ -3638,8 +3633,6 @@ with pkgs; sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { }; - opentrack = libsForQt5.callPackage ../applications/misc/opentrack { }; - openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -5555,7 +5548,7 @@ with pkgs; cbqn-standalone-replxx = cbqn-bootstrap.phase0-replxx; # Below, the classic self-bootstrapping process - cbqn-bootstrap = lib.dontRecurseIntoAttrs { + cbqn-bootstrap = dontRecurseIntoAttrs { # Use clang to compile CBQN if we aren't already. # CBQN's upstream primarily targets and tests clang which means using gcc # will result in slower binaries and on some platforms failing/broken builds. @@ -8170,7 +8163,7 @@ with pkgs; nvidia-docker ; - nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); + nvidia-vaapi-driver = hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { }); nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { }; @@ -9263,13 +9256,13 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.recurseIntoAttrs ( + home-assistant-custom-components = recurseIntoAttrs ( lib.packagesFromDirectoryRecursive { inherit (home-assistant.python.pkgs) callPackage; directory = ../servers/home-assistant/custom-components; } ); - home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs ( + home-assistant-custom-lovelace-modules = recurseIntoAttrs ( lib.packagesFromDirectoryRecursive { inherit callPackage; directory = ../servers/home-assistant/custom-lovelace-modules; @@ -10939,7 +10932,7 @@ with pkgs; emacsPackagesFor = emacs: import ./emacs-packages.nix { - inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs; + inherit lib; emacs' = emacs; pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; @@ -11003,7 +10996,7 @@ with pkgs; python = python3; }; }; - gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; + gnuradioPackages = recurseIntoAttrs gnuradio.pkgs; goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { }; @@ -11681,7 +11674,7 @@ with pkgs; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; - magnetophonDSP = lib.recurseIntoAttrs { + magnetophonDSP = recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { }; @@ -11937,7 +11930,7 @@ with pkgs; inherit (darwin) DarwinTools; }; - open-music-kontrollers = lib.recurseIntoAttrs { + open-music-kontrollers = recurseIntoAttrs { eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; mephisto = callPackage ../applications/audio/open-music-kontrollers/mephisto.nix { }; @@ -12568,7 +12561,7 @@ with pkgs; # more usecases when wrapping neovim. The interface is being actively worked on # so expect breakage. use wrapNeovim instead if you want a stable alternative wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; - wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); + wrapNeovim = neovim-unwrapped: makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix { lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; }; @@ -13182,8 +13175,6 @@ with pkgs; leela-zero = libsForQt5.callPackage ../games/leela-zero { }; - legendary-gl = python3Packages.callPackage ../games/legendary-gl { }; - liquidwar = callPackage ../games/liquidwar { guile = guile_2_0; }; @@ -13245,8 +13236,6 @@ with pkgs; papermc = papermcServers.papermc; - path-of-building = qt6Packages.callPackage ../games/path-of-building { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; pokerth = libsForQt5.callPackage ../games/pokerth { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6d9d9fab80d6..8a35e3a59feb 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -5,7 +5,6 @@ fetchzip, callPackage, newScope, - recurseIntoAttrs, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, @@ -42,7 +41,7 @@ let }; mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { }); - contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs { }); + contribs = lib.recurseIntoAttrs (callPackage ../development/coq-modules/contribs { }); aac-tactics = callPackage ../development/coq-modules/aac-tactics { }; addition-chains = callPackage ../development/coq-modules/addition-chains { }; @@ -337,6 +336,6 @@ rec { coqPackages_9_0 = mkCoqPackages coq_9_0; coqPackages_9_1 = mkCoqPackages coq_9_1; - coqPackages = recurseIntoAttrs coqPackages_9_0; + coqPackages = lib.recurseIntoAttrs coqPackages_9_0; coq = coqPackages.coq; } diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index c1eaf78f1532..6055b609e506 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -15,11 +15,9 @@ */ { + lib, pkgs', emacs', - makeScope, - makeOverridable, - dontRecurseIntoAttrs, }: let @@ -73,9 +71,9 @@ let }; in -makeScope pkgs'.newScope ( +lib.makeScope pkgs'.newScope ( self: - makeOverridable ( + lib.makeOverridable ( { pkgs ? pkgs', lib ? pkgs.lib, @@ -122,7 +120,7 @@ makeScope pkgs'.newScope ( # Propagate overridden scope emacs = emacs'.overrideAttrs (old: { passthru = (old.passthru or { }) // { - pkgs = dontRecurseIntoAttrs self; + pkgs = lib.dontRecurseIntoAttrs self; }; }); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 827685681415..fc7eae850cbb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -217,7 +217,7 @@ in pkgs.lib.attrNames compiler ); in - pkgs.recurseIntoAttrs ( + pkgs.lib.recurseIntoAttrs ( pkgs.lib.genAttrs nativeBignumGhcNames ( name: compiler.${name}.override { enableNativeBignum = true; } ) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index c5f7ebd013fa..a890010cd152 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -1,10 +1,14 @@ { pkgs }: - -with pkgs; - +let + inherit (pkgs) + stdenv + callPackage + config + lib + ; +in { inherit (pkgs) openjfx17 openjfx21 openjfx23; - compiler = lib.recurseIntoAttrs ( let # merge meta.platforms of both packages so that dependent packages and hydra build them @@ -56,7 +60,7 @@ with pkgs; openjdk11-bootstrap = temurin-bin.jdk-11; openjdk17-bootstrap = temurin-bin.jdk-17; - temurin-bin = recurseIntoAttrs ( + temurin-bin = lib.recurseIntoAttrs ( let temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix { inherit (pkgs) lib callPackage stdenv; @@ -68,7 +72,7 @@ with pkgs; lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux ); - semeru-bin = recurseIntoAttrs ( + semeru-bin = lib.recurseIntoAttrs ( let semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix { inherit (pkgs) lib callPackage; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 4e00998806b0..ee013f4ef37d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -5,9 +5,6 @@ config, buildPackages, callPackage, - makeOverridable, - recurseIntoAttrs, - dontRecurseIntoAttrs, stdenv, stdenvNoCC, newScope, @@ -19,9 +16,20 @@ # - Update packageAliases.linux_latest to the latest version # - Update linux_latest_hardened when the patches become available -with linuxKernel; - let + inherit (lib) recurseIntoAttrs dontRecurseIntoAttrs; + inherit (linuxKernel) + kernels + kernelPatches + manualConfig + packages + packagesFor + packageAliases + vanillaPackages + rtPackages + rpiPackages + ; + markBroken = drv: drv.overrideAttrs ( diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index ccff7dba3fd0..cb09d08eed98 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -9,7 +9,7 @@ packageOverrides = super: with super; - lib.mapAttrs (_: set: recurseIntoAttrs set) { + lib.mapAttrs (_: set: lib.recurseIntoAttrs set) { inherit (super) rPackages sourceHanPackages diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e4334ca2a112..f3c74406a29f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20051,7 +20051,7 @@ self: super: with self; { wasmer-compiler-singlepass ; - wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); + wasmerPackages = lib.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); wasserstein = callPackage ../development/python-modules/wasserstein { }; diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix index 1d84b16196f1..a4fc9459776b 100644 --- a/pkgs/top-level/rocq-packages.nix +++ b/pkgs/top-level/rocq-packages.nix @@ -5,7 +5,6 @@ fetchzip, callPackage, newScope, - recurseIntoAttrs, ocamlPackages_4_14, fetchpatch, makeWrapper, @@ -93,6 +92,6 @@ rec { rocqPackages_9_0 = mkRocqPackages rocq-core_9_0; rocqPackages_9_1 = mkRocqPackages rocq-core_9_1; - rocqPackages = recurseIntoAttrs rocqPackages_9_0; + rocqPackages = lib.recurseIntoAttrs rocqPackages_9_0; rocq-core = rocqPackages.rocq-core; } diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index fe4566bb175e..24fbb5e4eabf 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -17,48 +17,30 @@ lib: pkgs: actuallySplice: let + inherit (lib.customisation) mapCrossIndex renameCrossIndexFrom; spliceReal = - { - pkgsBuildBuild, - pkgsBuildHost, - pkgsBuildTarget, - pkgsHostHost, - pkgsHostTarget, - pkgsTargetTarget, - }: + inputs: let mash = # Other pkgs sets - pkgsBuildBuild - // pkgsBuildTarget - // pkgsHostHost - // pkgsTargetTarget + inputs.buildBuild + // inputs.buildTarget + // inputs.hostHost + // inputs.targetTarget # The same pkgs sets one probably intends - // pkgsBuildHost - // pkgsHostTarget; + // inputs.buildHost + // inputs.hostTarget; merge = name: { inherit name; value = let defaultValue = mash.${name}; # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity. - valueBuildBuild = pkgsBuildBuild.${name} or { }; - valueBuildHost = pkgsBuildHost.${name} or { }; - valueBuildTarget = pkgsBuildTarget.${name} or { }; - valueHostHost = pkgsHostHost.${name} or { }; - valueHostTarget = pkgsHostTarget.${name} or { }; - valueTargetTarget = pkgsTargetTarget.${name} or { }; + value' = mapCrossIndex (x: x.${name} or { }) inputs; + augmentedValue = defaultValue // { - __spliced = - (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; }) - // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; }) - // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; }) - // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; }) - // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; }) - // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) { - targetTarget = valueTargetTarget; - }); + __spliced = lib.filterAttrs (k: v: inputs.${k} ? ${name}) value'; }; # Get the set of outputs of a derivation. If one derivation fails to # evaluate we don't want to diverge the entire splice, so we fall back @@ -76,27 +58,12 @@ let # on to splice them together. if lib.isDerivation defaultValue then augmentedValue - // spliceReal { - pkgsBuildBuild = tryGetOutputs valueBuildBuild; - pkgsBuildHost = tryGetOutputs valueBuildHost; - pkgsBuildTarget = tryGetOutputs valueBuildTarget; - pkgsHostHost = tryGetOutputs valueHostHost; - pkgsHostTarget = getOutputs valueHostTarget; - pkgsTargetTarget = tryGetOutputs valueTargetTarget; - # Just recur on plain attrsets - } + // spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; }) else if lib.isAttrs defaultValue then - spliceReal { - pkgsBuildBuild = valueBuildBuild; - pkgsBuildHost = valueBuildHost; - pkgsBuildTarget = valueBuildTarget; - pkgsHostHost = valueHostHost; - pkgsHostTarget = valueHostTarget; - pkgsTargetTarget = valueTargetTarget; - # Don't be fancy about non-derivations. But we could have used used - # `__functor__` for functions instead. - } + spliceReal value' else + # Don't be fancy about non-derivations. But we could have used used + # `__functor__` for functions instead. defaultValue; }; in @@ -111,7 +78,7 @@ let pkgsHostTarget, pkgsTargetTarget, }@args: - if actuallySplice then spliceReal args else pkgsHostTarget; + if actuallySplice then spliceReal (renameCrossIndexFrom "pkgs" args) else pkgsHostTarget; splicedPackages = splicePackages {